From b4f8838b15342670c31753a484abf0129e3c9653 Mon Sep 17 00:00:00 2001
From: jcduff <jcduff@localhost>
Date: Thu, 23 Oct 2008 14:04:24 +0000
Subject: [PATCH] The commit will bring the following features : - An updated version of the underlying database. BDB JE 3.3 is now used. - Attribute API refactoring providing a better abstraction and offering improved performances. - A new GUI called the Control-Panel to replace the Status-Panel: the specifications for this GUI are available on OpenDS Wiki and contains a link to a mockup. See <https://www.opends.org/wiki/page/ControlPanelUISpecification>. - Some changes in the replication protocol to implement "Assured Replication Mode". The specifications are on OpenDS Wiki at <https://www.opends.org/wiki/page/AssuredMode> and section 7 described some of the replication changes required to support this. Assured Replication is not finished, but the main replication protocol changes to support it are done. As explained by Gilles on an email on the Dev mailing list (http://markmail.org/message/46rgo3meq3vriy4a), with these changes the newer versions of OpenDS may not be able to replicate with OpenDS 1.0 instances. - Support for Service Tags on the platforms where the functionality is available and enabled. Specifications are published at <https://www.opends.org/wiki/page/OpenDSServiceTagEnabled>. For more information on Service Tags see <http://wikis.sun.com/display/ServiceTag/Sun+Service+Tag+FAQ>. - The Admin Connector service. In order to provide agentry of the OpenDS server at any time, a new service has been added, dedicated to the administration, configuration and monitoring of the server. An overview of the Admin Connector service and it's use is available on the OpenDS wiki <https://www.opends.org/wiki/page/ManagingAdministrationTrafficToTheServer> - Updates to the various command line tools to support the Admin Connector service. - Some internal re-architecting of the server to put the foundation of future developments such as virtual directory services. The new NetworkGroups and WorkFlow internal services which have been specified in <https://www.opends.org/wiki/page/BasicOperationRoutingThroughNetworkGroup> are now implemented. - Many bug fixes...
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java | 113
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 265
opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskTool.java | 17
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java | 82
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java | 272
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java | 310
opendj-sdk/opends/src/server/org/opends/server/extensions/VirtualStaticGroup.java | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java | 81
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationMonitor.java | 35
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 12
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupPluginConfiguration.xml | 82
opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml | 257
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java | 37
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx.png | 0
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java | 489
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java | 158
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_cleanup.xml | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java | 41
opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java | 14
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml | 53
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java | 1567
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml | 31
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java | 4
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/ResourceLimits.java | 485
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/ReferralLimitExceededException.java | 51
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java | 29
opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java | 17
opendj-sdk/opends/src/server/org/opends/server/types/Schema.java | 31
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java | 109
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java | 7
opendj-sdk/opends/resource/bin/status-panel.bat | 6
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml | 10
opendj-sdk/opends/src/server/org/opends/server/replication/server/DbHandler.java | 44
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java | 3
opendj-sdk/opends/src/server/org/opends/server/core/WorkflowConfigManager.java | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 948
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java | 480
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java | 38
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java | 44
opendj-sdk/opends/src/server/org/opends/server/servicetag/SwordFishIdConfiguration.java | 117
opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java | 799
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java | 541
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java | 39
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java | 284
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java | 15
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java | 44
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java | 886
opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java | 94
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/InitializeAllReplicationUserData.java | 39
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java | 222
opendj-sdk/opends/src/server/org/opends/server/types/Modification.java | 39
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml | 2
opendj-sdk/opends/resource/schema/02-config.ldif | 234
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java | 84
opendj-sdk/opends/src/messages/messages/core.properties | 30
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java | 112
opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupCriteria.java | 336
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml | 22
opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java | 12
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java | 102
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java | 12
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/downarrow.png | 0
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java | 246
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java | 8
opendj-sdk/opends/src/server/org/opends/server/replication/common/StatusMachineEvent.java | 135
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-rule-folder.png | 0
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigChangeListener.java | 42
opendj-sdk/opends/src/server/org/opends/server/admin/AdministrationConnector.java | 617
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml | 10
opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java | 109
opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java | 10
opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml | 254
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java | 4
opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java | 59
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java | 296
opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java | 2
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Installation.java | 35
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java | 375
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java | 415
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java | 98
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/OnlineUpdateException.java | 61
opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperationBasis.java | 31
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/Action.java | 83
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-directory.png | 0
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java | 1796
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java | 104
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/Category.java | 71
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/ActionButton.java | 231
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java | 17
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicy.java | 595
opendj-sdk/opends/src/server/org/opends/server/schema/AciSyntax.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java | 35
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java | 28
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java | 291
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java | 593
opendj-sdk/opends/build.xml | 65
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml | 2
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowMsg.java | 143
opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml | 5
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml | 15
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-class.png | 0
opendj-sdk/opends/src/server/org/opends/server/workflowelement/WorkflowElement.java | 39
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml | 5
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java | 12
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowProbeMsg.java | 80
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/package-info.java | 36
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java | 138
opendj-sdk/opends/src/server/org/opends/server/types/Attributes.java | 415
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java | 17
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 7589 ++
opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java | 2
opendj-sdk/opends/src/server/org/opends/server/core/WorkflowImpl.java | 39
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml | 2
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 2129
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml | 66
opendj-sdk/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java | 51
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java | 14
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowserEventListener.java | 43
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml | 5
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ChangeNumberControlPluginConfiguration.xml | 74
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java | 672
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java | 208
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 131
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/package-info.java | 34
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java | 66
opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java | 583
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/InitializeReplicationUserData.java | 115
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/IndexTask.java | 133
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/package-info.java | 34
opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 22
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ListenerThread.java | 20
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java | 115
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StartStopTask.java | 136
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java | 205
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplayThread.java | 6
opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/TopologyMsg.java | 351
opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-generic.png | 0
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java | 188
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartMsg.java | 304
opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java | 9
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java | 434
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationUserData.java | 98
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml | 41
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java | 965
opendj-sdk/opends/src/server/org/opends/server/util/cli/CommandBuilder.java | 5
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/SocketSession.java | 22
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax.png | 0
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java | 8
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml | 2
opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java | 24
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java | 50
opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerWriter.java | 99
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml | 299
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/package-info.java | 34
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTask.java | 112
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java | 61
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java | 37
opendj-sdk/opends/lib/je.jar | 0
opendj-sdk/opends/src/server/org/opends/server/tools/ManageTasks.java | 5
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java | 189
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java | 194
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java | 229
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml | 8
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java | 7
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java | 806
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java | 1943
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AdministrationConnectorConfiguration.xml | 166
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java | 130
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml | 8
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java | 196
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/SearchAbandonException.java | 77
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/FilterTextField.java | 348
opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java | 156
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JECompressedSchema.java | 101
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java | 70
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java | 3
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupCriterion.java | 63
opendj-sdk/opends/resource/config/config.ldif | 64
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/StatusReplicationUserData.java | 60
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatThread.java | 2
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/package-info.java | 49
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml | 2
opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java | 7
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java | 11
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java | 134
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java | 44
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java | 286
opendj-sdk/opends/src/messages/messages/admin.properties | 9
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_blowfish.xml | 2
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java | 98
opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java | 4
opendj-sdk/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 167
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java | 61
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml | 4
opendj-sdk/opends/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java | 14
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java | 287
opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java | 30
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java | 368
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java | 1382
opendj-sdk/opends/src/messages/messages/extension.properties | 2
opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java | 23
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml | 3
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java | 84
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/UpdateComparatorTest.java | 9
opendj-sdk/opends/src/messages/messages/replication.properties | 123
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusPanel.java | 706
opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java | 743
opendj-sdk/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java | 12
opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx.png | 0
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml | 4
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java | 4
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ProtocolVersion.java | 50
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml | 5
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java | 247
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java | 464
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java | 486
opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java | 19
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_cleanup.xml | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java | 2351
opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/3server_topology.txt | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java | 284
opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCliArgumentParser.java | 183
opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java | 64
opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java | 185
opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionEvent.java | 71
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java | 49
opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java | 95
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java | 4
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml | 1
opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java | 204
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java | 180
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java | 43
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml | 2
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/BindDnCriteria.java | 86
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java | 346
opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java | 16
opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java | 60
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java | 30
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java | 8
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml | 14
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java | 222
opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCli.java | 1246
opendj-sdk/opends/src/server/org/opends/server/replication/common/StatusMachine.java | 148
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml | 74
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java | 65
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java | 9
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml | 108
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java | 63
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml | 2
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java | 51
opendj-sdk/opends/src/server/org/opends/server/core/WorkflowTopologyNode.java | 18
opendj-sdk/opends/src/server/org/opends/server/replication/server/LightweightServerHandler.java | 118
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliException.java | 63
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java | 826
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/required.gif | 0
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java | 570
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java | 748
opendj-sdk/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java | 105
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java | 8
opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java | 14
opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java | 34
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java | 916
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_cleanup.xml | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java | 38
opendj-sdk/opends/src/server/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java | 562
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java | 375
opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java | 10
opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/Info.plist | 42
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml | 7
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/AddToGroupTask.java | 310
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/EntryMsg.java | 138
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java | 81
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/PrintStreamListener.java | 45
opendj-sdk/opends/src/server/org/opends/server/replication/common/AssuredMode.java | 81
opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml | 2
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java | 39
opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java | 29
opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java | 14
opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java | 7
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 143
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java | 5
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupNamingContexts.java | 182
opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java | 1205
opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/MacOS/JavaApplicationStub | 0
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml | 5
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java | 10
opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml | 92
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/HistVal.java | 87
opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskEntry.java | 17
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java | 4
opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java | 864
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 63
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml | 40
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java | 64
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java | 249
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java | 61
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ChangeStatusMsg.java | 142
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMsg.java | 260
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java | 47
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-suffix.png | 0
opendj-sdk/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java | 114
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 914
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java | 249
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/TitlePanel.java | 118
opendj-sdk/opends/src/server/org/opends/server/replication/common/RSInfo.java | 140
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomAttributeTreeNode.java | 61
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/TreePanel.java | 131
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java | 37
opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java | 23
opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java | 2
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatMsg.java | 85
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java | 313
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CheckEntrySyntaxException.java | 81
opendj-sdk/opends/resource/bin/dsreplication.bat | 2
opendj-sdk/opends/resource/bin/status.bat | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml | 2
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java | 78
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml | 1
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-ro.png | 0
opendj-sdk/opends/src/server/org/opends/server/servicetag/SwordFishIDParser.java | 118
opendj-sdk/opends/tests/unit-tests-testng/resource/config-changes.ldif | 5
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java | 173
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/package-info.java | 34
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupResourceLimitsConfiguration.xml | 304
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupCriteriaConfiguration.xml | 213
opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java | 1
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java | 721
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/LDAPEntryReader.java | 206
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java | 77
opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java | 411
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/rightarrow.png | 0
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java | 2
opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagAlreadyExistsException.java | 66
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionEvent.java | 69
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml | 2
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/package-info.java | 40
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java | 9
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 13
opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java | 100
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml | 44
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java | 10
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java | 5
opendj-sdk/opends/src/messages/messages/utility.properties | 4
opendj-sdk/opends/src/messages/messages/plugin.properties | 10
opendj-sdk/opends/src/server/org/opends/server/core/DefaultCompressedSchema.java | 89
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java | 288
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 183
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 10
opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/api/AccessLogPublisher.java | 676
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java | 525
opendj-sdk/opends/src/server/org/opends/server/admin/ClassLoaderProvider.java | 133
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml | 62
opendj-sdk/opends/src/server/org/opends/server/replication/common/ServerStatus.java | 134
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/package-info.java | 33
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java | 126
opendj-sdk/opends/src/server/org/opends/server/core/QueueingStrategy.java | 48
opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java | 31
opendj-sdk/opends/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java | 4
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDbEnv.java | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax-folder.png | 0
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java | 8
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml | 13
opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java | 141
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java | 25
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/UpdateToReplay.java | 8
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml | 1
opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java | 57
opendj-sdk/opends/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java | 7
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SortValues.java | 2
opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagException.java | 64
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java | 101
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java | 651
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml | 7
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadErrorEvent.java | 82
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ErrorPanel.java | 121
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java | 25
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml | 2
opendj-sdk/opends/src/server/org/opends/server/api/Backend.java | 78
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java | 2230
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml | 1
opendj-sdk/opends/src/server/org/opends/server/servicetag/Util.java | 229
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml | 2
opendj-sdk/opends/src/server/org/opends/server/plugins/NetworkGroupPlugin.java | 453
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java | 206
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/MonoServerReplicationUserData.java | 117
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/field-locked.png | 0
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java | 1363
opendj-sdk/opends/src/server/org/opends/server/monitors/MemoryUsageMonitorProvider.java | 11
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_cleanup.xml | 8
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml | 6
opendj-sdk/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java | 3
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java | 10
opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java | 19
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsTest.java | 213
opendj-sdk/opends/src/server/org/opends/server/core/RootDseWorkflowTopology.java | 1
opendj-sdk/opends/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 24
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java | 262
opendj-sdk/opends/src/server/org/opends/server/tasks/DisconnectClientTask.java | 8
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java | 21
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java | 1315
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/DisableReplicationUserData.java | 161
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedEvent.java | 72
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java | 744
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java | 79
opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java | 14
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java | 416
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java | 292
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java | 179
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml | 38
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java | 32
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml | 2
opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/clear-filter.png | 0
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java | 7
opendj-sdk/opends/src/messages/messages/protocol.properties | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java | 190
opendj-sdk/opends/src/messages/messages/tools.properties | 31
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/DbHandlerTest.java | 266
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeOperation.java | 24
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java | 916
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java | 245
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java | 49
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java | 9
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupPolicy.java | 46
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java | 101
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java | 96
opendj-sdk/opends/src/server/org/opends/server/servicetag/Registry.java | 436
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationChangeEvent.java | 72
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CustomTree.java | 340
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java | 105
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-attr.png | 0
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 148
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java | 60
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java | 549
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml | 12
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backend_cleanup.xml | 10
opendj-sdk/opends/src/ads/org/opends/admin/ads/ADSContext.java | 8
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 5
opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangeNumber.java | 66
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VLVIndex.java | 5
opendj-sdk/opends/src/server/org/opends/server/replication/server/MsgQueue.java | 54
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java | 113
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java | 60
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml | 5
opendj-sdk/opends/src/server/org/opends/server/types/VirtualAttribute.java | 365
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-referral.png | 0
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml | 94
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeModifyOperation.java | 85
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java | 12
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml | 10
opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperationBasis.java | 1
opendj-sdk/opends/src/server/org/opends/server/tools/status/package-info.java | 36
opendj-sdk/opends/src/messages/messages/dsconfig.properties | 7
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/package-info.java | 34
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java | 3
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java | 9
opendj-sdk/opends/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java | 32
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java | 8
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 787
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/PortCriteria.java | 85
opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml | 2
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java | 37
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/RoutableMsg.java | 113
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java | 1225
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationIterator.java | 10
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartSessionMsg.java | 276
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MainMenuBar.java | 171
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-folder.png | 0
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java | 314
opendj-sdk/opends/resource/bin/status | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java | 96
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java | 112
opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java | 62
opendj-sdk/opends/src/server/org/opends/server/extensions/DynamicGroup.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java | 60
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java | 875
opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java | 471
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java | 632
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java | 770
opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java | 17
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java | 169
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml | 20
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoMultiple.java | 237
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml | 3
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml | 5
opendj-sdk/opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt | 2
opendj-sdk/opends/src/server/org/opends/server/types/Entry.java | 1427
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java | 157
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_customconf.xml | 18
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupConfiguration.xml | 74
opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java | 45
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml | 12
opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java | 62
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml | 4
opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml | 30
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml | 7
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StopServerTask.java | 101
opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java | 40
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java | 224
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml | 22
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java | 219
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml | 4
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java | 61
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml | 39
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedEvent.java | 72
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardAttributeTreeNode.java | 61
opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java | 1998
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml | 4
opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java | 12
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedListener.java | 41
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java | 938
opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/PostExternalInitializationUserData.java | 39
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java | 68
opendj-sdk/opends/src/messages/messages/quicksetup.properties | 38
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml | 3
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java | 88
opendj-sdk/opends/resource/servicetag/opends.uuids.properties | 10
opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java | 324
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java | 29
opendj-sdk/opends/resource/bin/control-panel | 37
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml | 5
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationAttributeTreeNode.java | 61
opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java | 17
opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java | 8
opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java | 1090
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddMsg.java | 153
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java | 9
opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java | 16
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 1531
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ProcessReader.java | 132
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java | 41
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java | 57
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/BasicExpander.java | 65
opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMsg.java | 524
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-folder.png | 0
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java | 1008
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java | 77
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java | 441
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java | 167
opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml | 20
opendj-sdk/opends/src/server/org/opends/server/core/BindOperationBasis.java | 30
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml | 147
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-attr-folder.png | 0
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/MoveEvent.java | 68
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml | 10
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/PreExternalInitializationUserData.java | 61
opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDS.icns | 0
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java | 12
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml | 28
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/RestartServerTask.java | 194
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java | 37
opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperationBasis.java | 1
opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java | 13
opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java | 53
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowserEvent.java | 91
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java | 431
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java | 99
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml | 39
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml | 62
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml | 51
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java | 108
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml | 5
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java | 14
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml | 2
opendj-sdk/opends/src/server/org/opends/server/backends/TrustStoreBackend.java | 74
opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/basic_topology.txt | 2
opendj-sdk/opends/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml | 13
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java | 1297
opendj-sdk/opends/src/server/org/opends/server/core/SynchronousStrategy.java | 50
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java | 14
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java | 45
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java | 25
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml | 7
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java | 16
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/package-info.java | 35
opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java | 12
opendj-sdk/opends/src/server/org/opends/server/backends/LDIFBackend.java | 8
opendj-sdk/opends/resource/bin/status-panel | 6
opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java | 4
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml | 26
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 2161
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java | 260
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java | 6
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml | 1
opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTag.java | 554
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java | 490
opendj-sdk/opends/resource/config/tools.properties | 31
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java | 22
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/BasicNodeError.java | 76
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java | 157
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java | 301
opendj-sdk/opends/src/server/org/opends/server/loggers/AccessLogger.java | 358
opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskClient.java | 1
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java | 42
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml | 4
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedListener.java | 48
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml | 6
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java | 3
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java | 108
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadEvent.java | 70
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationData.java | 18
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java | 412
opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java | 55
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java | 188
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java | 18
opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/PkgInfo | 1
opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java | 42
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BinaryValue.java | 243
opendj-sdk/opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java | 938
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_rfc_tests.xml | 4
opendj-sdk/opends/resource/bin/control-panel.bat | 58
opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BaseDNPanel.java | 187
opendj-sdk/opends/src/messages/messages/task.properties | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowseActionListener.java | 265
opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableListModel.java | 145
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java | 400
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java | 583
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-class-folder.png | 0
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java | 414
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml | 139
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java | 954
opendj-sdk/opends/src/server/org/opends/server/monitors/ClientConnectionMonitorProvider.java | 15
opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorRequestMsg.java | 120
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java | 10
opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java | 166
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoSingle.java | 44
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java | 6
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java | 56
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java | 125
opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java | 57
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java | 4
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PendingChanges.java | 24
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml | 7
opendj-sdk/opends/src/server/org/opends/server/types/AbstractAttribute.java | 324
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java | 185
opendj-sdk/opends/src/server/org/opends/server/servicetag/package-info.java | 36
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-group.png | 0
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml | 2
opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java | 63
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddContext.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/RootNode.java | 48
opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java | 2064
opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java | 82
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java | 429
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml | 47
opendj-sdk/opends/resource/bin/dsreplication | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java | 33
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewDomainPanel.java | 125
opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java | 31
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml | 1
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/DataReplicationPanel.java | 23
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/package-info.java | 34
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java | 6
opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java | 10
opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java | 12
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java | 83
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java | 456
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java | 23
opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java | 247
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx-folder.png | 0
opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java | 50
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java | 3
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java | 122
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 703
opendj-sdk/opends/src/server/org/opends/server/types/AttributeBuilder.java | 1829
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-ppol.png | 0
opendj-sdk/opends/src/server/org/opends/server/replication/server/StatusAnalyzer.java | 252
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionListener.java | 43
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java | 107
opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java | 2299
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java | 458
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java | 146
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MainActionsPane.java | 396
opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml | 6
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java | 66
opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml | 4
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/SecurityCriteria.java | 75
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/AuthMethodCriteria.java | 108
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupDescriptor.java | 135
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml | 1
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java | 26
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java | 298
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java | 311
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java | 345
opendj-sdk/opends/tests/staf-tests/shared/python/replication.py | 6
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java | 28
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml | 15
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java | 88
opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java | 40
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java | 32
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java | 4
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java | 691
opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java | 197
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java | 593
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java | 371
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 2088
opendj-sdk/opends/src/server/org/opends/server/core/AddOperationBasis.java | 52
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_cleanup.xml | 10
opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_customconf.xml | 18
opendj-sdk/opends/src/server/org/opends/server/servicetag/SystemEnvironment.java | 100
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java | 15
opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml | 206
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/IconPool.java | 403
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java | 109
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java | 83
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml | 3
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java | 615
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/MoveListener.java | 45
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java | 275
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java | 81
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewUserPanel.java | 387
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/IpFilterCriteria.java | 82
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java | 135
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StartServerTask.java | 76
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java | 349
opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java | 59
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java | 64
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java | 86
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml | 7
opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java | 5
opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagDoesNotExistException.java | 65
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadListener.java | 48
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java | 2
opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java | 33
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java | 4
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java | 10
opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java | 34
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/package-info.java | 35
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DoneMsg.java | 118
opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml | 7
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupRequestFilteringPolicyConfiguration.xml | 228
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/clear-filter-down.png | 0
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml | 10
opendj-sdk/opends/src/server/org/opends/server/core/CompareOperationBasis.java | 1
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java | 19
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/GenerationIdChecksum.java | 87
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_cleanup.xml | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml | 31
opendj-sdk/opends/src/server/org/opends/server/util/EmbeddedUtils.java | 1
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java | 6
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml | 4
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java | 2
opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java | 10
opendj-sdk/opends/src/messages/messages/servicetag.properties | 62
opendj-sdk/opends/src/server/org/opends/server/replication/server/UpdateComparator.java | 10
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java | 1041
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 657
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-ou.png | 0
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml | 225
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/OfflineUpdateException.java | 60
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_cleanup.xml | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java | 725
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java | 62
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java | 283
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml | 2
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/UpdateMsg.java | 632
opendj-sdk/opends/src/messages/src/org/opends/messages/Category.java | 5
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java | 95
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml | 4
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml | 1
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java | 15
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ComputeBestServerTest.java | 346
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java | 190
opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedEvent.java | 70
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ResetGenerationIdMsg.java | 127
opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java | 48
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java | 164
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java | 130
opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java | 13
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 30
opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java | 254
opendj-sdk/opends/src/server/org/opends/server/replication/common/ServerState.java | 37
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml | 10
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ErrorMsg.java | 214
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java | 979
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java | 76
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java | 372
opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java | 23
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java | 130
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java | 393
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java | 37
opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java | 10
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml | 12
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java | 220
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java | 465
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeAddOperation.java | 70
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AckMsg.java | 280
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PendingChange.java | 12
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ProtocolSession.java | 46
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataReplicationOptions.java | 2
opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java | 292
opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml | 11
opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml | 5
opendj-sdk/opends/src/ads/org/opends/admin/ads/util/BlindTrustManager.java | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java | 73
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java | 372
opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryButton.java | 120
opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java | 98
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml | 1
opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagRegistration.java | 449
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java | 6
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java | 80
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java | 12
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/package-info.java | 36
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/package-info.java | 34
opendj-sdk/opends/src/server/org/opends/server/core/WorkQueueStrategy.java | 49
opendj-sdk/opends/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java | 117
opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagDefinition.java | 121
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java | 216
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CannotRenameException.java | 50
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java | 29
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java | 126
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java | 93
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/TLSSocketSession.java | 20
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-user.png | 0
opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java | 18
opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java | 329
opendj-sdk/opends/src/messages/messages/admin_tool.properties | 1626
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/EnableReplicationUserData.java | 303
opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java | 6
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java | 250
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java | 759
opendj-sdk/opends/src/server/org/opends/server/replication/common/DSInfo.java | 250
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml | 47
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java | 280
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml | 2
opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java | 14
opendj-sdk/opends/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java | 291
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java | 4
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java | 534
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java | 729
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroup.java | 939
/dev/null | 125
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml | 1
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttributeInfo.java | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java | 48
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java | 72
opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java | 65
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java | 634
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java | 1071
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-rule.png | 0
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 9
949 files changed, 136,445 insertions(+), 17,247 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index 3792b76..e95966c 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -175,11 +175,21 @@
<!-- The build target that should be used for nightly builds. -->
<target name="nightly"
- depends="checkstyle,dsml,srczip,javadoc,docgen,coverage,testallwithcoverage"
+ depends="nightlybuild,nightlytests"
description="Perform all processing needed for nightly builds.">
</target>
+ <!-- The build target that should be used for build part of nightly builds. -->
+ <target name="nightlybuild"
+ depends="checkstyle,dsml,srczip,javadoc,docgen"
+ description="Perform all processing related to build for nightly builds.">
+ </target>
+ <!-- The build target that should be used for test part of nightly builds. -->
+ <target name="nightlytests"
+ depends="coverage,testallwithcoverage"
+ description="Perform all processing related to unit tests for nightly builds.">
+ </target>
<!-- The build target that should be used for weekly builds. -->
@@ -271,11 +281,14 @@
<genmsg sourceProps="${msg.prop.dir}/runtime_information.properties"
destJava="${msg.javagen.dir}/org/opends/messages/RuntimeMessages.java">
</genmsg>
+ <genmsg sourceProps="${msg.prop.dir}/servicetag.properties"
+ destJava="${msg.javagen.dir}/org/opends/messages/ServiceTagMessages.java">
+ </genmsg>
</target>
<!-- Remove all dynamically-generated build files. -->
- <target name="clean" depends="cleanadmin,cleanmessages,cleansnmp"
+ <target name="clean" depends="init,cleanadmin,cleanmessages,cleansnmp"
description="Clean up any files generated during the build process">
<delete dir="${build.dir}" />
@@ -384,6 +397,14 @@
</or>
</condition>
+ <condition property="isadmingendirpresent">
+ <available file="${admin.src.dir}" type="dir" />
+ </condition>
+
+ <condition property="ismsggendirpresent">
+ <available file="${msg.javagen.dir}" type="dir" />
+ </condition>
+
</target>
@@ -865,6 +886,7 @@
<mkdir dir="${pdir}/config/messages" />
<mkdir dir="${pdir}/config/MakeLDIF" />
<mkdir dir="${pdir}/config/snmp/security" />
+ <mkdir dir="${pdir}/config/servicetag" />
<mkdir dir="${pdir}/db" />
<mkdir dir="${pdir}/import-tmp" />
<mkdir dir="${pdir}/changelogDb" />
@@ -874,11 +896,11 @@
<mkdir dir="${pdir}/lib/extensions" />
<mkdir dir="${pdir}/locks" />
<mkdir dir="${pdir}/logs" />
- <mkdir dir="${pdir}/bin/StatusPanel.app" />
- <mkdir dir="${pdir}/bin/StatusPanel.app/Contents" />
- <mkdir dir="${pdir}/bin/StatusPanel.app/Contents/MacOS" />
- <mkdir dir="${pdir}/bin/StatusPanel.app/Contents/Resources" />
- <mkdir dir="${pdir}/bin/StatusPanel.app/Contents/Resources/Java" />
+ <mkdir dir="${pdir}/bin/ControlPanel.app" />
+ <mkdir dir="${pdir}/bin/ControlPanel.app/Contents" />
+ <mkdir dir="${pdir}/bin/ControlPanel.app/Contents/MacOS" />
+ <mkdir dir="${pdir}/bin/ControlPanel.app/Contents/Resources" />
+ <mkdir dir="${pdir}/bin/ControlPanel.app/Contents/Resources/Java" />
<mkdir dir="${pdir}/QuickSetup.app" />
<mkdir dir="${pdir}/QuickSetup.app/Contents" />
<mkdir dir="${pdir}/QuickSetup.app/Contents/MacOS" />
@@ -950,6 +972,10 @@
<copy todir="${pdir}/config/schema">
<fileset dir="${resource.dir}/schema" />
</copy>
+
+ <copy todir="${pdir}/config/servicetag">
+ <fileset dir="${resource.dir}/servicetag" />
+ </copy>
<copy todir="${pdir}/config/messages">
<fileset dir="${resource.dir}/messages" />
@@ -1004,12 +1030,12 @@
<include name="Uninstall.app/Contents/MacOS/JavaApplicationStub" />
</fileset>
</chmod>
- <copy todir="${pdir}/bin/StatusPanel.app">
- <fileset dir="${resource.dir}/mac/StatusPanel.app" />
+ <copy todir="${pdir}/bin/ControlPanel.app">
+ <fileset dir="${resource.dir}/mac/ControlPanel.app" />
</copy>
<chmod perm="755">
<fileset dir="${pdir}/bin">
- <include name="StatusPanel.app/Contents/MacOS/JavaApplicationStub" />
+ <include name="ControlPanel.app/Contents/MacOS/JavaApplicationStub" />
</fileset>
</chmod>
@@ -1033,7 +1059,7 @@
<zipfileset dir="${package.dir}" includes="${SHORT_NAME}-${VERSION_NUMBER_STRING}"
filemode="644" dirmode="700" />
<zipfileset dir="${package.dir}" includes="${SHORT_NAME}-${VERSION_NUMBER_STRING}/**/*"
- excludes="${SHORT_NAME}-${VERSION_NUMBER_STRING}/bin/*,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_client-script.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_script-util.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_server-script.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_mixed-script.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/setup,${SHORT_NAME}-${VERSION_NUMBER_STRING}/uninstall,${SHORT_NAME}-${VERSION_NUMBER_STRING}/upgrade,${SHORT_NAME}-${VERSION_NUMBER_STRING}/QuickSetup.app/Contents/MacOS/JavaApplicationStub,${SHORT_NAME}-${VERSION_NUMBER_STRING}/Uninstall.app/Contents/MacOS/JavaApplicationStub,${SHORT_NAME}-${VERSION_NUMBER_STRING}/bin/StatusPanel.app/Contents/MacOS/JavaApplicationStub"
+ excludes="${SHORT_NAME}-${VERSION_NUMBER_STRING}/bin/*,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_client-script.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_script-util.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_server-script.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_mixed-script.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/setup,${SHORT_NAME}-${VERSION_NUMBER_STRING}/uninstall,${SHORT_NAME}-${VERSION_NUMBER_STRING}/upgrade,${SHORT_NAME}-${VERSION_NUMBER_STRING}/QuickSetup.app/Contents/MacOS/JavaApplicationStub,${SHORT_NAME}-${VERSION_NUMBER_STRING}/Uninstall.app/Contents/MacOS/JavaApplicationStub,${SHORT_NAME}-${VERSION_NUMBER_STRING}/bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
filemode="644" dirmode="755" />
<zipfileset dir="${package.dir}"
includes="${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_client-script.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_script-util.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_server-script.sh,${SHORT_NAME}-${VERSION_NUMBER_STRING}/lib/_mixed-script.sh"
@@ -1043,7 +1069,7 @@
filemode="755" dirmode="755" />
<zipfileset dir="${package.dir}" includes="${SHORT_NAME}-${VERSION_NUMBER_STRING}/bin/README_WINDOWS.txt"
filemode="644" dirmode="755" />
- <zipfileset dir="${package.dir}" includes="${SHORT_NAME}-${VERSION_NUMBER_STRING}/setup,${SHORT_NAME}-${VERSION_NUMBER_STRING}/uninstall,${SHORT_NAME}-${VERSION_NUMBER_STRING}/upgrade,${SHORT_NAME}-${VERSION_NUMBER_STRING}/QuickSetup.app/Contents/MacOS/JavaApplicationStub,${SHORT_NAME}-${VERSION_NUMBER_STRING}/Uninstall.app/Contents/MacOS/JavaApplicationStub,${SHORT_NAME}-${VERSION_NUMBER_STRING}/bin/StatusPanel.app/Contents/MacOS/JavaApplicationStub"
+ <zipfileset dir="${package.dir}" includes="${SHORT_NAME}-${VERSION_NUMBER_STRING}/setup,${SHORT_NAME}-${VERSION_NUMBER_STRING}/uninstall,${SHORT_NAME}-${VERSION_NUMBER_STRING}/upgrade,${SHORT_NAME}-${VERSION_NUMBER_STRING}/QuickSetup.app/Contents/MacOS/JavaApplicationStub,${SHORT_NAME}-${VERSION_NUMBER_STRING}/Uninstall.app/Contents/MacOS/JavaApplicationStub,${SHORT_NAME}-${VERSION_NUMBER_STRING}/bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
filemode="755" dirmode="755" />
</zip>
<property name="package.built" value="true"/>
@@ -1268,7 +1294,7 @@
<include name="*.jar"/>
</fileset>
<dirset dir="${classes.dir}"/>
- </path>
+ </path>
<nbjpdastart addressproperty="jpda.address" name="Directory Server" transport="dt_socket">
<classpath refid="cp"/>
</nbjpdastart>
@@ -1354,6 +1380,7 @@
</java>
</target>
+
<!-- Internal target to prepare to generate a code coverage report. -->
<target name="coverage">
<property name="coverage.enabled" value="true" />
@@ -2176,7 +2203,7 @@
<!-- Remove all dynamically-generated build files. -->
- <target name="cleanadmin" description="Clean up any generated source files for admin">
+ <target name="cleanadmin" if="isadmingendirpresent" description="Clean up any generated source files for admin">
<delete includeemptydirs="true">
<fileset dir="${admin.src.dir}" includes="**/*" />
</delete>
@@ -2193,7 +2220,7 @@
</target>
<!-- Remove all dynamically-generated build files. -->
- <target name="cleanmessages" description="Clean up any generated source files for messages">
+ <target name="cleanmessages" if="ismsggendirpresent" description="Clean up any generated source files for messages">
<delete includeemptydirs="true">
<fileset dir="${msg.javagen.dir}" includes="**/*" />
</delete>
@@ -2355,7 +2382,13 @@
<jar jarfile="${pdir}/lib/extensions/snmp-mib2605.jar"
basedir="${classes.dir}"
includes="org/opends/server/snmp/**"
- compress="true" index="true" />
+ compress="true" index="true" >
+ <manifest>
+ <attribute name="Extension-Name" value="snmp-mib2605"/>
+ <attribute name="Implementation-Version" value="${VERSION_NUMBER_STRING}"/>
+ <attribute name="Revision-Number" value="${REVISION_NUMBER}"/>
+ </manifest>
+ </jar>
<echo message="SNMP Extension is built"/>
<echo message="${pdir}/lib/extensions/snmp-mib2605.jar"/>
</target>
diff --git a/opendj-sdk/opends/lib/je.jar b/opendj-sdk/opends/lib/je.jar
index 5aea9ab..cf8d03d 100644
--- a/opendj-sdk/opends/lib/je.jar
+++ b/opendj-sdk/opends/lib/je.jar
Binary files differ
diff --git a/opendj-sdk/opends/resource/bin/control-panel b/opendj-sdk/opends/resource/bin/control-panel
new file mode 100644
index 0000000..d8a2b27
--- /dev/null
+++ b/opendj-sdk/opends/resource/bin/control-panel
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.
+
+
+# This script may be used to display the control panel.
+OPENDS_INVOKE_CLASS="org.opends.guitools.controlpanel.ControlPanelLauncher"
+export OPENDS_INVOKE_CLASS
+
+SCRIPT_NAME="control-panel"
+export SCRIPT_NAME
+
+SCRIPT_DIR=`dirname "${0}"`
+"${SCRIPT_DIR}/../lib/_client-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/control-panel.bat b/opendj-sdk/opends/resource/bin/control-panel.bat
new file mode 100644
index 0000000..17017af
--- /dev/null
+++ b/opendj-sdk/opends/resource/bin/control-panel.bat
@@ -0,0 +1,58 @@
+
+@echo off
+rem CDDL HEADER START
+rem
+rem The contents of this file are subject to the terms of the
+rem Common Development and Distribution License, Version 1.0 only
+rem (the "License"). You may not use this file except in compliance
+rem with the License.
+rem
+rem You can obtain a copy of the license at
+rem trunk/opends/resource/legal-notices/OpenDS.LICENSE
+rem or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+rem See the License for the specific language governing permissions
+rem and limitations under the License.
+rem
+rem When distributing Covered Code, include this CDDL HEADER in each
+rem file and include the License file at
+rem trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+rem add the following below this CDDL HEADER, with the fields enclosed
+rem by brackets "[]" replaced with your own identifying information:
+rem Portions Copyright [yyyy] [name of copyright owner]
+rem
+rem CDDL HEADER END
+rem
+rem
+rem Copyright 2006-2008 Sun Microsystems, Inc.
+
+setlocal
+for %%i in (%~sf0) do set DIR_HOME=%%~dPsi..
+
+set INSTANCE_ROOT=%DIR_HOME%
+
+set SCRIPT_NAME=control-panel
+
+rem Set environment variables
+set SCRIPT_UTIL_CMD=set-full-environment
+call "%INSTANCE_ROOT%\lib\_script-util.bat"
+if NOT %errorlevel% == 0 exit /B %errorlevel%
+
+if "%~1" == "" goto callLaunch
+goto callJava
+
+:callLaunch
+"%DIR_HOME%\lib\winlauncher.exe" launch "%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.guitools.controlpanel.ControlPanelLauncher
+goto end
+
+:callJava
+"%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.guitools.controlpanel.ControlPanelLauncher %*
+
+rem return part
+if %errorlevel% == 50 goto version
+goto end
+
+:version
+rem version information was requested. Return code should be 0.
+exit /B 0
+
+:end
diff --git a/opendj-sdk/opends/resource/bin/dsreplication b/opendj-sdk/opends/resource/bin/dsreplication
index a5b2304..e785f31 100644
--- a/opendj-sdk/opends/resource/bin/dsreplication
+++ b/opendj-sdk/opends/resource/bin/dsreplication
@@ -27,7 +27,7 @@
# This script may be used to perform some replication specific operations.
-OPENDS_INVOKE_CLASS="org.opends.guitools.replicationcli.ReplicationCliMain"
+OPENDS_INVOKE_CLASS="org.opends.server.tools.dsreplication.ReplicationCliMain"
export OPENDS_INVOKE_CLASS
SCRIPT_NAME="dsreplication"
diff --git a/opendj-sdk/opends/resource/bin/dsreplication.bat b/opendj-sdk/opends/resource/bin/dsreplication.bat
index b16c3b8..88e5398 100644
--- a/opendj-sdk/opends/resource/bin/dsreplication.bat
+++ b/opendj-sdk/opends/resource/bin/dsreplication.bat
@@ -27,6 +27,6 @@
setlocal
-set OPENDS_INVOKE_CLASS="org.opends.guitools.replicationcli.ReplicationCliMain"
+set OPENDS_INVOKE_CLASS="org.opends.server.tools.dsreplication.ReplicationCliMain"
set SCRIPT_NAME=dsreplication
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/status b/opendj-sdk/opends/resource/bin/status
index 5cab99b..e608190 100644
--- a/opendj-sdk/opends/resource/bin/status
+++ b/opendj-sdk/opends/resource/bin/status
@@ -27,7 +27,7 @@
# This script may be used to display the status panel.
-OPENDS_INVOKE_CLASS="org.opends.guitools.statuspanel.StatusCli"
+OPENDS_INVOKE_CLASS="org.opends.server.tools.status.StatusCli"
export OPENDS_INVOKE_CLASS
SCRIPT_NAME="status"
diff --git a/opendj-sdk/opends/resource/bin/status-panel b/opendj-sdk/opends/resource/bin/status-panel
index 381973c..d8a2b27 100644
--- a/opendj-sdk/opends/resource/bin/status-panel
+++ b/opendj-sdk/opends/resource/bin/status-panel
@@ -26,11 +26,11 @@
# Copyright 2008 Sun Microsystems, Inc.
-# This script may be used to display the status panel.
-OPENDS_INVOKE_CLASS="org.opends.guitools.statuspanel.StatusPanelLauncher"
+# This script may be used to display the control panel.
+OPENDS_INVOKE_CLASS="org.opends.guitools.controlpanel.ControlPanelLauncher"
export OPENDS_INVOKE_CLASS
-SCRIPT_NAME="status-panel"
+SCRIPT_NAME="control-panel"
export SCRIPT_NAME
SCRIPT_DIR=`dirname "${0}"`
diff --git a/opendj-sdk/opends/resource/bin/status-panel.bat b/opendj-sdk/opends/resource/bin/status-panel.bat
index 25d1c88..3dc1b99 100644
--- a/opendj-sdk/opends/resource/bin/status-panel.bat
+++ b/opendj-sdk/opends/resource/bin/status-panel.bat
@@ -40,7 +40,7 @@
cd /d %CUR_DIR%
-set SCRIPT_NAME=status-panel
+set SCRIPT_NAME=control-panel
rem Set environment variables
set SCRIPT_UTIL_CMD=set-full-environment
@@ -52,12 +52,12 @@
:callLaunch
if exist "%INSTALL_ROOT%\lib\set-java-args.bat" DO call "%INSTALL_ROOT%\lib\set-java-args.bat"
-"%INSTALL_ROOT%\lib\winlauncher.exe" launch "%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.guitools.statuspanel.StatusPanelLauncher
+"%INSTALL_ROOT%\lib\winlauncher.exe" launch "%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.guitools.controlpanel.ControlPanelLauncher
goto end
:callJava
if exist "%INSTALL_ROOT%\lib\set-java-args.bat" DO call "%INSTALL_ROOT%\lib\set-java-args.bat"
-"%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.guitools.statuspanel.StatusPanelLauncher %*
+"%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.guitools.controlpanel.ControlPanelLauncher %*
rem return part
if %errorlevel% == 50 goto version
diff --git a/opendj-sdk/opends/resource/bin/status.bat b/opendj-sdk/opends/resource/bin/status.bat
index 18cde91..a7b423e 100644
--- a/opendj-sdk/opends/resource/bin/status.bat
+++ b/opendj-sdk/opends/resource/bin/status.bat
@@ -27,6 +27,6 @@
setlocal
-set OPENDS_INVOKE_CLASS="org.opends.guitools.statuspanel.StatusCli"
+set OPENDS_INVOKE_CLASS="org.opends.server.tools.status.StatusCli"
set SCRIPT_NAME=status
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/config/config.ldif b/opendj-sdk/opends/resource/config/config.ldif
index ecfb9f5..2107319 100644
--- a/opendj-sdk/opends/resource/config/config.ldif
+++ b/opendj-sdk/opends/resource/config/config.ldif
@@ -1618,6 +1618,39 @@
ds-cfg-type: uid
ds-cfg-invoke-for-internal-operations: true
+dn: cn=Network Group,cn=Plugins,cn=config
+objectClass: top
+objectClass: ds-cfg-plugin
+objectClass: ds-cfg-network-group-plugin
+cn: Network Group
+ds-cfg-java-class: org.opends.server.plugins.NetworkGroupPlugin
+ds-cfg-enabled: true
+ds-cfg-invoke-for-internal-operations: false
+ds-cfg-plugin-type: postConnect
+ds-cfg-plugin-type: preParseAdd
+ds-cfg-plugin-type: preParseBind
+ds-cfg-plugin-type: preParseCompare
+ds-cfg-plugin-type: preParseDelete
+ds-cfg-plugin-type: preParseExtended
+ds-cfg-plugin-type: preParseModify
+ds-cfg-plugin-type: preParseModifyDn
+ds-cfg-plugin-type: preParseSearch
+ds-cfg-plugin-type: preParseUnbind
+ds-cfg-plugin-type: postResponseBind
+ds-cfg-plugin-type: postResponseExtended
+
+dn: cn=Change Number Control,cn=Plugins,cn=config
+objectClass: top
+objectClass: ds-cfg-plugin
+objectClass: ds-cfg-change-number-control-plugin
+cn: Change Number Control
+ds-cfg-enabled: true
+ds-cfg-plugin-type: postOperationAdd
+ds-cfg-plugin-type: postOperationDelete
+ds-cfg-plugin-type: postOperationModify
+ds-cfg-plugin-type: postOperationModifyDn
+ds-cfg-java-class: org.opends.server.plugins.ChangeNumberControlPlugin
+
dn: cn=Root DNs,cn=config
objectClass: top
objectClass: ds-cfg-root-dn
@@ -2220,6 +2253,37 @@
ds-cfg-num-worker-threads: 24
ds-cfg-max-work-queue-capacity: 0
+dn: cn=Administration Connector,cn=config
+objectClass: top
+objectClass: ds-cfg-administration-connector
+cn: Administration Connector
+ds-cfg-listen-address: 0.0.0.0
+ds-cfg-listen-port: 4444
+ds-cfg-ssl-cert-nickname: admin-cert
+ds-cfg-key-manager-provider: cn=Administration,cn=Key Manager Providers,cn=config
+ds-cfg-trust-manager-provider: cn=Administration,cn=Trust Manager Providers,cn=config
+
+dn: cn=Administration,cn=Key Manager Providers,cn=config
+objectClass: top
+objectClass: ds-cfg-key-manager-provider
+objectClass: ds-cfg-file-based-key-manager-provider
+cn: Administration
+ds-cfg-java-class: org.opends.server.extensions.FileBasedKeyManagerProvider
+ds-cfg-enabled: true
+ds-cfg-key-store-type: JKS
+ds-cfg-key-store-file: config/admin-keystore
+ds-cfg-key-store-pin-file: config/admin-keystore.pin
+
+dn: cn=Administration,cn=Trust Manager Providers,cn=config
+objectClass: top
+objectClass: ds-cfg-trust-manager-provider
+objectClass: ds-cfg-file-based-trust-manager-provider
+cn: Administration
+ds-cfg-java-class: org.opends.server.extensions.FileBasedTrustManagerProvider
+ds-cfg-enabled: true
+ds-cfg-trust-store-type: JKS
+ds-cfg-trust-store-file: config/admin-truststore
+
dn: cn=Extensions,cn=config
objectClass: top
objectClass: ds-cfg-branch
diff --git a/opendj-sdk/opends/resource/config/tools.properties b/opendj-sdk/opends/resource/config/tools.properties
index 5da8560..cddb8dd 100644
--- a/opendj-sdk/opends/resource/config/tools.properties
+++ b/opendj-sdk/opends/resource/config/tools.properties
@@ -28,21 +28,26 @@
# can be overridden on a per-client basis by prefixing
# the argument name with the name of the client.
# hostname=localhost
-# port=389
+# port=4444
# bindDN=cn=directory manager
-# useSSL=false
-# useStartTLS=false
-# Default dsconfig argument values. This overrides the
+# Default ldapcompare argument values. This overrides the
# default value for the "port" argument defined above.
-# dsconfig.port=1389
+# ldapcompare.port=389
-# Default dsframework argument values. This overrides
-# the default value for the "port" argument defined
-# above.
-# dsframework.port=1389
+# Default ldapdelete argument values. This overrides the
+# default value for the "port" argument defined above.
+# ldapdelete.port=389
-# Default stop-ds argument values. This overrides
-# the default value for the "port" argument defined
-# above.
-# stop-ds.port=1389
+# Default ldapmodify argument values. This overrides the
+# default value for the "port" argument defined above.
+# ldapmodify.port=389
+
+# Default ldappasswordmodify argument values. This overrides the
+# default value for the "port" argument defined above.
+# ldappasswordmodify.port=389
+
+# Default ldapsearch argument values. This overrides the
+# default value for the "port" argument defined above.
+# ldapsearch.port=389
+
diff --git a/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/Info.plist b/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/Info.plist
new file mode 100644
index 0000000..859934d
--- /dev/null
+++ b/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/Info.plist
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleAllowMixedLocalizations</key>
+ <string>true</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>JavaApplicationStub</string>
+ <key>CFBundleGetInfoString</key>
+ <string>OpenDS Control Panel</string>
+ <key>CFBundleIconFile</key>
+ <string>OpenDS.icns</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>OpenDS Control Panel</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>Java</key>
+ <dict>
+ <key>ClassPath</key>
+ <array>
+ <string>$JAVAROOT/../../../../../lib/quicksetup.jar</string>
+ <string>$JAVAROOT/../../../../../lib/activation.jar</string>
+ <string>$JAVAROOT/../../../../../lib/aspectjrt.jar</string>
+ <string>$JAVAROOT/../../../../../lib/OpenDS.jar</string>
+ <string>$JAVAROOT/../../../../../lib/mail.jar</string>
+ <string>$JAVAROOT/../../../../../lib/je.jar</string>
+ </array>
+ <key>JVMVersion</key>
+ <string>1.5+</string>
+ <key>MainClass</key>
+ <string>org.opends.guitools.controlpanel.ControlPanelLauncher</string>
+ </dict>
+</dict>
+</plist>
diff --git a/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/MacOS/JavaApplicationStub b/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/MacOS/JavaApplicationStub
new file mode 100755
index 0000000..4190041
--- /dev/null
+++ b/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/MacOS/JavaApplicationStub
Binary files differ
diff --git a/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/PkgInfo b/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/PkgInfo
new file mode 100644
index 0000000..bd04210
--- /dev/null
+++ b/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/PkgInfo
@@ -0,0 +1 @@
+APPL????
\ No newline at end of file
diff --git a/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDS.icns b/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDS.icns
new file mode 100644
index 0000000..dad9cbb
--- /dev/null
+++ b/opendj-sdk/opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDS.icns
Binary files differ
diff --git a/opendj-sdk/opends/resource/schema/02-config.ldif b/opendj-sdk/opends/resource/schema/02-config.ldif
index b4a5b9e..00e4eeb 100644
--- a/opendj-sdk/opends/resource/schema/02-config.ldif
+++ b/opendj-sdk/opends/resource/schema/02-config.ldif
@@ -841,14 +841,6 @@
NAME 'ds-task-import-ldif-file'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.459
- NAME 'ds-task-import-template-file'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
- X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.460
- NAME 'ds-task-import-random-seed'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
- X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.170
NAME 'ds-task-import-append'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
@@ -2118,7 +2110,7 @@
X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.436
NAME 'ds-cfg-workflow-id'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.437
@@ -2127,12 +2119,12 @@
X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.438
NAME 'ds-cfg-workflow-element-id'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.439
NAME 'ds-cfg-workflow-element'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.440
@@ -2220,6 +2212,148 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.459
+ NAME 'ds-task-import-template-file'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.460
+ NAME 'ds-task-import-random-seed'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.461
+ NAME 'ds-cfg-allowed-auth-method'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.462
+ NAME 'ds-cfg-allowed-ldap-port'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.463
+ NAME 'ds-cfg-bind-dn-filter'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.464
+ NAME 'ds-cfg-ip-address-filter'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.465
+ NAME 'ds-cfg-is-security-mandatory'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.466
+ NAME 'ds-cfg-user-entry-filter'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.467
+ NAME 'ds-cfg-priority'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.468
+ NAME 'ds-cfg-max-connections'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.469
+ NAME 'ds-cfg-max-connections-from-same-ip'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.470
+ NAME 'ds-cfg-max-ops-per-connection'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.471
+ NAME 'ds-cfg-max-concurrent-ops-per-connection'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.472
+ NAME 'ds-cfg-search-size-limit'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.473
+ NAME 'ds-cfg-search-time-limit'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.474
+ NAME 'ds-cfg-min-substring-length'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.475
+ NAME 'ds-cfg-referral-policy'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.476
+ NAME 'ds-cfg-referral-bind-policy'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.477
+ NAME 'ds-cfg-referral-hop-limit'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.478
+ NAME 'ds-cfg-assured-type'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.479
+ NAME 'ds-cfg-assured-sd-level'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.480
+ NAME 'ds-cfg-assured-timeout'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.481
+ NAME 'ds-cfg-group-id'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.482
+ NAME 'ds-cfg-referrals-url'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.483
+ NAME 'ds-cfg-degraded-status-threshold'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+ SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.484
+ NAME 'ds-cfg-allowed-operations'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.485
+ NAME 'ds-cfg-allowed-attributes'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.486
+ NAME 'ds-cfg-prohibited-attributes'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.487
+ NAME 'ds-cfg-allowed-search-scopes'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.488
+ NAME 'ds-cfg-allowed-subtrees'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+ X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.489
+ NAME 'ds-cfg-prohibited-subtrees'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+ X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.1
NAME 'ds-cfg-access-control-handler'
SUP top
@@ -2770,7 +2904,12 @@
ds-cfg-max-send-delay $
ds-cfg-window-size $
ds-cfg-heartbeat-interval $
- ds-cfg-isolation-policy )
+ ds-cfg-isolation-policy $
+ ds-cfg-assured-type $
+ ds-cfg-assured-sd-level $
+ ds-cfg-assured-timeout $
+ ds-cfg-group-id $
+ ds-cfg-referrals-url)
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.58
NAME 'ds-cfg-length-based-password-validator'
@@ -2876,7 +3015,10 @@
ds-cfg-window-size $
ds-cfg-queue-size $
ds-cfg-replication-db-directory $
- ds-cfg-replication-purge-delay )
+ ds-cfg-replication-purge-delay $
+ ds-cfg-group-id $
+ ds-cfg-assured-timeout $
+ ds-cfg-degraded-status-threshold)
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.65
NAME 'ds-backup-directory'
@@ -3695,8 +3837,9 @@
SUP top
STRUCTURAL
MUST ( ds-cfg-network-group-id $
- ds-cfg-enabled $
- ds-cfg-workflow )
+ ds-cfg-priority $
+ ds-cfg-enabled )
+ MAY ds-cfg-workflow
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.177
NAME 'ds-cfg-workflow'
@@ -3745,3 +3888,64 @@
ds-cfg-java-class $
ds-cfg-enabled )
X-ORIGIN 'OpenDS Directory Server' )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.183
+ NAME 'ds-cfg-administration-connector'
+ SUP top
+ STRUCTURAL
+ MUST ( cn $
+ ds-cfg-listen-port $
+ ds-cfg-key-manager-provider $
+ ds-cfg-trust-manager-provider $
+ ds-cfg-ssl-cert-nickname )
+ MAY ( ds-cfg-listen-address )
+ X-ORIGIN 'OpenDS Directory Server' )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.184
+ NAME 'ds-cfg-network-group-criteria'
+ SUP top
+ STRUCTURAL
+ MUST (cn)
+ MAY ( ds-cfg-allowed-auth-method $
+ ds-cfg-allowed-ldap-port $
+ ds-cfg-bind-dn-filter $
+ ds-cfg-ip-address-filter $
+ ds-cfg-is-security-mandatory $
+ ds-cfg-user-entry-filter)
+ X-ORIGIN 'OpenDS Directory Server' )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.185
+ NAME 'ds-cfg-network-group-resource-limits'
+ SUP top
+ STRUCTURAL
+ MUST (cn)
+ MAY ( ds-cfg-max-connections $
+ ds-cfg-max-connections-from-same-ip $
+ ds-cfg-max-ops-per-connection $
+ ds-cfg-max-concurrent-ops-per-connection $
+ ds-cfg-search-size-limit $
+ ds-cfg-search-time-limit $
+ ds-cfg-min-substring-length $
+ ds-cfg-referral-policy $
+ ds-cfg-referral-bind-policy $
+ ds-cfg-referral-hop-limit)
+ X-ORIGIN 'OpenDS Directory Server' )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.186
+ NAME 'ds-cfg-network-group-plugin'
+ SUP ds-cfg-plugin
+ STRUCTURAL
+ X-ORIGIN 'OpenDS Directory Server' )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.187
+ NAME 'ds-cfg-change-number-control-plugin'
+ SUP ds-cfg-plugin
+ STRUCTURAL
+ X-ORIGIN 'OpenDS Directory Server' )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.188
+ NAME 'ds-cfg-network-group-request-filtering-policy'
+ SUP top
+ STRUCTURAL
+ MUST (cn)
+ MAY ( ds-cfg-allowed-operations $
+ ds-cfg-allowed-attributes $
+ ds-cfg-prohibited-attributes $
+ ds-cfg-allowed-search-scopes $
+ ds-cfg-allowed-subtrees $
+ ds-cfg-prohibited-subtrees )
+ X-ORIGIN 'OpenDS Directory Server' )
diff --git a/opendj-sdk/opends/resource/servicetag/opends.uuids.properties b/opendj-sdk/opends/resource/servicetag/opends.uuids.properties
new file mode 100644
index 0000000..3c70f2e
--- /dev/null
+++ b/opendj-sdk/opends/resource/servicetag/opends.uuids.properties
@@ -0,0 +1,10 @@
+org.opends.server.servicetag.productname=OpenDS
+org.opends.server.servicetag.version=2.0
+org.opends.server.servicetag.uuid=urn:uuid:98acc202-57f7-11dd-9496-080020a9ed93
+org.opends.server.servicetag.parent=Unknown
+org.opends.server.servicetag.parenturn=Unknown
+org.opends.server.servicetag.vendor=Opends.org
+
+
+
+
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AdministrationConnectorConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AdministrationConnectorConfiguration.xml
new file mode 100644
index 0000000..2fc8871
--- /dev/null
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AdministrationConnectorConfiguration.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! -->
+<adm:managed-object name="administration-connector"
+ plural-name="administration-connectors"
+ package="org.opends.server.admin.std"
+ xmlns:adm="http://www.opends.org/admin"
+ xmlns:ldap="http://www.opends.org/admin-ldap">
+ <adm:synopsis>
+ The
+ <adm:user-friendly-name />
+ is used to interact with administration tools using LDAP.
+ </adm:synopsis>
+ <adm:description>
+ It is a dedicated entry point for administration.
+ </adm:description>
+ <adm:tag name="core-server" />
+ <adm:profile name="ldap">
+ <ldap:object-class>
+ <ldap:name>ds-cfg-administration-connector</ldap:name>
+ <ldap:superior>top</ldap:superior>
+ </ldap:object-class>
+ </adm:profile>
+ <adm:property-reference name="listen-port" />
+ <adm:property name="listen-address" multi-valued="true">
+ <adm:synopsis>
+ Specifies the address or set of addresses on which this
+ <adm:user-friendly-name />
+ should listen for connections from LDAP clients.
+ </adm:synopsis>
+ <adm:description>
+ Multiple addresses may be provided as separate values for this
+ attribute. If no values are provided, then the
+ <adm:user-friendly-name />
+ listens on all interfaces.
+ </adm:description>
+ <adm:requires-admin-action>
+ <adm:server-restart />
+ </adm:requires-admin-action>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>0.0.0.0</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:ip-address />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-listen-address</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+ <adm:property name="key-manager-provider" mandatory="true">
+ <adm:synopsis>
+ Specifies the name of the key manager that is used with
+ the
+ <adm:user-friendly-name />
+ .
+ </adm:synopsis>
+ <adm:requires-admin-action>
+ <adm:server-restart />
+ </adm:requires-admin-action>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:aggregation relation-name="key-manager-provider"
+ parent-path="/">
+ <adm:constraint>
+ <adm:synopsis>
+ The referenced key manager provider must be enabled.
+ </adm:synopsis>
+ <adm:target-is-enabled-condition>
+ <adm:contains property="enabled" value="true" />
+ </adm:target-is-enabled-condition>
+ </adm:constraint>
+ </adm:aggregation>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-key-manager-provider</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+ <adm:property name="trust-manager-provider" mandatory="true">
+ <adm:synopsis>
+ Specifies the name of the trust manager that is used with
+ the
+ <adm:user-friendly-name />
+ .
+ </adm:synopsis>
+ <adm:requires-admin-action>
+ <adm:server-restart />
+ </adm:requires-admin-action>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:aggregation relation-name="trust-manager-provider"
+ parent-path="/">
+ <adm:constraint>
+ <adm:synopsis>
+ The referenced trust manager provider must be enabled.
+ </adm:synopsis>
+ <adm:target-is-enabled-condition>
+ <adm:contains property="enabled" value="true" />
+ </adm:target-is-enabled-condition>
+ </adm:constraint>
+ </adm:aggregation>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-trust-manager-provider</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+ <adm:property name="ssl-cert-nickname" mandatory="true">
+ <adm:synopsis>
+ Specifies the nickname (also called the alias) of the certificate
+ that the
+ <adm:user-friendly-name />
+ will use when performing SSL communication.
+ </adm:synopsis>
+ <adm:requires-admin-action>
+ <adm:server-restart />
+ </adm:requires-admin-action>
+ <adm:default-behavior>
+ <adm:alias>
+ <adm:synopsis>Let the server decide.</adm:synopsis>
+ </adm:alias>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:string></adm:string>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-ssl-cert-nickname</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+</adm:managed-object>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ChangeNumberControlPluginConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ChangeNumberControlPluginConfiguration.xml
new file mode 100644
index 0000000..7a21192
--- /dev/null
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ChangeNumberControlPluginConfiguration.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! -->
+<adm:managed-object name="change-number-control-plugin"
+ plural-name="change-number-control-plugins" package="org.opends.server.admin.std"
+ extends="plugin" xmlns:adm="http://www.opends.org/admin"
+ xmlns:ldap="http://www.opends.org/admin-ldap">
+ <adm:synopsis>
+ The
+ <adm:user-friendly-name />
+ returns the change number generated by the replication subsystem.
+ </adm:synopsis>
+ <adm:description>
+ The <adm:user-friendly-name /> returns the change number generated
+ by the Multi-Master Replication subsystem when :
+ - the Multi-Master Replication is configured and enabled
+ - the request is a write operation (add, delete, moidfy, moddn)
+ - the control is part of a request.
+ If all of the above are true, the response contains a control response
+ with a string representing the change number.
+ The implementation for the chnage number control plug-in is contained
+ in the org.opends.server.plugins.ChangeNumberControlPlugin class. It must be
+ configured with the postOperationAdd, postOperationDelete,
+ postOperationModify and postOperationModifyDN plug-in types,
+ but it does not have any other custom configuration.
+ </adm:description>
+ <adm:profile name="ldap">
+ <ldap:object-class>
+ <ldap:name>ds-cfg-change-number-control-plugin</ldap:name>
+ <ldap:superior>ds-cfg-plugin</ldap:superior>
+ </ldap:object-class>
+ </adm:profile>
+ <adm:property-override name="java-class" advanced="true">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>org.opends.server.plugins.ChangeNumberControlPlugin</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+ <adm:property-override name="plugin-type" advanced="true">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>postOperationAdd</adm:value>
+ <adm:value>postOperationDelete</adm:value>
+ <adm:value>postOperationModify</adm:value>
+ <adm:value>postOperationModifyDN</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+</adm:managed-object>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml
index 2b8c027..287471e 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml
@@ -414,7 +414,7 @@
</adm:property>
<adm:property name="max-request-size" advanced="true">
<adm:synopsis>
- Specifies the size of the largest LDAP request message that will
+ Specifies the size in bytes of the largest LDAP request message that will
be allowed by this LDAP Connection handler.
</adm:synopsis>
<adm:description>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupConfiguration.xml
index 91d77fe..35c5eff 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupConfiguration.xml
@@ -42,6 +42,55 @@
<ldap:superior>top</ldap:superior>
</ldap:object-class>
</adm:profile>
+
+ <adm:relation name="network-group-criteria"
+ managed-object-name="network-group-criteria">
+ <adm:synopsis>
+ Specifies the set of criteria associated to this network group.
+ </adm:synopsis>
+ <adm:description>
+ A client connection can belong to a <adm:user-friendly-name /> only
+ if it matches all the criteria defined for this
+ <adm:user-friendly-name />.
+ </adm:description>
+ <adm:one-to-zero-or-one />
+ <adm:profile name="ldap">
+ <ldap:rdn-sequence>cn=Criteria</ldap:rdn-sequence>
+ </adm:profile>
+ </adm:relation>
+
+ <adm:relation name="network-group-resource-limits"
+ managed-object-name="network-group-resource-limits">
+ <adm:synopsis>
+ Specifies the set of resource limits enforced by this
+ <adm:user-friendly-name />.
+ </adm:synopsis>
+ <adm:description>
+ All client connections belonging to a <adm:user-friendly-name />
+ must comply with the resource limits policy.
+ </adm:description>
+ <adm:one-to-zero-or-one />
+ <adm:profile name="ldap">
+ <ldap:rdn-sequence>cn=ResourceLimits</ldap:rdn-sequence>
+ </adm:profile>
+ </adm:relation>
+
+ <adm:relation name="network-group-request-filtering-policy"
+ managed-object-name="network-group-request-filtering-policy">
+ <adm:synopsis>
+ Specifies the request filtering policy enforced by this
+ <adm:user-friendly-name />.
+ </adm:synopsis>
+ <adm:description>
+ All client connections belonging to a <adm:user-friendly-name />
+ must comply with the request filtering policy.
+ </adm:description>
+ <adm:one-to-zero-or-one />
+ <adm:profile name="ldap">
+ <ldap:rdn-sequence>cn=RequestFilteringPolicy</ldap:rdn-sequence>
+ </adm:profile>
+ </adm:relation>
+
<adm:property name="enabled" mandatory="true">
<adm:synopsis>
Indicates whether the
@@ -82,11 +131,32 @@
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="workflow" mandatory="true" read-only="true"
- multi-valued="true">
+ <adm:property name="priority" mandatory="true">
+ <adm:synopsis>
+ Specifies the order in which the network groups are evaluated.
+ </adm:synopsis>
+ <adm:description>
+ A client connection is first compared against network group with
+ priority 1. If the client connection does not match the network group
+ criteria, the client connection is compared against network group
+ with priority 2 etc...
+ </adm:description>
+ <adm:syntax>
+ <adm:integer lower-limit="0"/>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-priority</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+ <adm:property name="workflow" multi-valued="true">
<adm:synopsis>
Identifies the workflows in the network group.
</adm:synopsis>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
<adm:syntax>
<adm:aggregation relation-name="workflow" parent-path="/">
<adm:constraint>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupCriteriaConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupCriteriaConfiguration.xml
new file mode 100644
index 0000000..dcb8982
--- /dev/null
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupCriteriaConfiguration.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! -->
+<adm:managed-object name="network-group-criteria" plural-name="network-group-criteria"
+ package="org.opends.server.admin.std"
+ xmlns:adm="http://www.opends.org/admin"
+ xmlns:ldap="http://www.opends.org/admin-ldap">
+
+ <adm:synopsis>
+ The <adm:user-friendly-name /> is used to classify incoming connections.
+ </adm:synopsis>
+
+ <adm:tag name="core-server" />
+
+ <adm:profile name="ldap">
+ <ldap:object-class>
+ <ldap:name>ds-cfg-network-group-criteria</ldap:name>
+ <ldap:superior>top</ldap:superior>
+ </ldap:object-class>
+ </adm:profile>
+
+ <adm:property name="allowed-auth-method" multi-valued="true">
+ <adm:synopsis>
+ Specifies the allowed authorization methods for a client connection to
+ match the <adm:user-friendly-name />.
+ </adm:synopsis>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:enumeration>
+ <adm:value name="anonymous">
+ <adm:synopsis>
+ Anonymous connections.
+ </adm:synopsis>
+ </adm:value>
+ <adm:value name="simple">
+ <adm:synopsis>
+ Simple bind connections, with bind DN and password.
+ </adm:synopsis>
+ </adm:value>
+ <adm:value name="sasl">
+ <adm:synopsis>
+ SASL/external connections, with a certificate containing the
+ user authentication.
+ </adm:synopsis>
+ </adm:value>
+ </adm:enumeration>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-allowed-auth-method</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="allowed-ldap-port" multi-valued="true">
+ <adm:synopsis>
+ Specifies the allowed LDAP ports for the client connection to match the
+ <adm:user-friendly-name />.
+ </adm:synopsis>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:enumeration>
+ <adm:value name="ldap">
+ <adm:synopsis>
+ Connection over ldap port.
+ </adm:synopsis>
+ </adm:value>
+ <adm:value name="ldaps">
+ <adm:synopsis>
+ Connection over ldaps port.
+ </adm:synopsis>
+ </adm:value>
+ </adm:enumeration>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-allowed-ldap-port</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="bind-dn-filter" multi-valued="true">
+ <adm:synopsis>
+ Specifies a bind DN filter for the client connection to match the
+ <adm:user-friendly-name />.
+ </adm:synopsis>
+ <adm:description>
+ A valid bind DN filter is a string composed of zero or more
+ wildcards. A double wildcard ** replaces one or more RDN
+ components (as in uid=dmiller,**,dc=example,dc=com). A simple
+ wildcard * replaces either a whole RDN, or a whole type, or a
+ value substring (as in uid=bj*,ou=people,dc=example,dc=com).
+ </adm:description>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:string />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-bind-dn-filter</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="ip-address-filter" multi-valued="true">
+ <adm:synopsis>
+ Specifies an IP address filter for the <adm:user-friendly-name />.
+ </adm:synopsis>
+ <adm:description>
+ A valid IP address mask can be one of the followings:
+ 129.34.55.67
+ 129.*.78.55
+ .sun.com
+ foo.sun.com
+ foo.*.sun.*
+ 128.*.*.*
+ 129.45.23.67/22
+ 128.33.21.21/32
+ *.*.*.*
+ 129.45.67.34/0
+ foo.com
+ foo
+ 2001:fecd:ba23:cd1f:dcb1:1010:9234:4088/124
+ 2001:fecd:ba23:cd1f:dcb1:1010:9234:4088
+ [2001:fecd:ba23:cd1f:dcb1:1010:9234:4088]/45
+ ::/128
+ ::1/128
+ ::
+ </adm:description>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:ip-address-mask />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-ip-address-filter</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="is-security-mandatory">
+ <adm:synopsis>
+ Specifies whether security is mandatory for the
+ <adm:user-friendly-name />.
+ </adm:synopsis>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ false
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:boolean />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-is-security-mandatory</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="user-entry-filter">
+ <adm:synopsis>
+ Specifies a search filter that the entry of a bound client
+ must match.
+ </adm:synopsis>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:string />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-user-entry-filter</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+</adm:managed-object>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupPluginConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupPluginConfiguration.xml
new file mode 100644
index 0000000..810decf
--- /dev/null
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupPluginConfiguration.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! -->
+<adm:managed-object name="network-group-plugin"
+ plural-name="network-group-plugins" package="org.opends.server.admin.std"
+ extends="plugin" xmlns:adm="http://www.opends.org/admin"
+ xmlns:ldap="http://www.opends.org/admin-ldap"
+ hidden="true">
+
+ <adm:synopsis>
+ The
+ <adm:user-friendly-name />
+ allows to group connections into different network groups and
+ enforce specific resource limit policies for each network group.
+ </adm:synopsis>
+
+ <adm:description>
+ The
+ <adm:user-friendly-name />
+ creates network groups based on client connection criteria. Each network
+ group defines resource limit policies applied to all its connections.
+ </adm:description>
+
+ <adm:profile name="ldap">
+ <ldap:object-class>
+ <ldap:name>ds-cfg-network-group-plugin</ldap:name>
+ <ldap:superior>ds-cfg-plugin</ldap:superior>
+ </ldap:object-class>
+ </adm:profile>
+
+ <adm:property-override name="java-class" advanced="true">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>org.opends.server.plugins.NetworkGroupPlugin</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
+ <adm:property-override name="plugin-type" advanced="true">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>postconnect</adm:value>
+ <adm:value>preparseadd</adm:value>
+ <adm:value>preparsebind</adm:value>
+ <adm:value>preparsecompare</adm:value>
+ <adm:value>preparsedelete</adm:value>
+ <adm:value>preparseextended</adm:value>
+ <adm:value>preparsemodify</adm:value>
+ <adm:value>preparsemodifydn</adm:value>
+ <adm:value>preparsesearch</adm:value>
+ <adm:value>preparseunbind</adm:value>
+ <adm:value>postresponsebind</adm:value>
+ <adm:value>postresponseextended</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
+</adm:managed-object>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupRequestFilteringPolicyConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupRequestFilteringPolicyConfiguration.xml
new file mode 100644
index 0000000..4c83f24
--- /dev/null
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupRequestFilteringPolicyConfiguration.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Copyright 2008 Sun Microsystems, Inc.
+ ! -->
+<adm:managed-object name="network-group-request-filtering-policy"
+ plural-name="network-group-request-filtering-policies"
+ package="org.opends.server.admin.std"
+ xmlns:adm="http://www.opends.org/admin"
+ xmlns:ldap="http://www.opends.org/admin-ldap">
+
+ <adm:synopsis>
+ The
+ <adm:user-friendly-name /> is used to define the type of requests
+ allowed in the network group.
+ </adm:synopsis>
+
+ <adm:tag name="core-server" />
+
+ <adm:profile name="ldap">
+ <ldap:object-class>
+ <ldap:name>ds-cfg-network-group-request-filtering-policy</ldap:name>
+ <ldap:superior>top</ldap:superior>
+ </ldap:object-class>
+ </adm:profile>
+
+ <adm:property name="allowed-operations" mandatory="false" multi-valued="true">
+ <adm:synopsis>
+ Specifies which operations are allowed in the network group.
+ </adm:synopsis>
+ <adm:description>
+ When this attribute is specified, only the listed operations are
+ allowed in the network group. If the attribute is not defined, all
+ the operations are allowed.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:enumeration>
+ <adm:value name="add">
+ <adm:synopsis>Add operations.</adm:synopsis>
+ </adm:value>
+ <adm:value name="bind">
+ <adm:synopsis>Bind operations.</adm:synopsis>
+ </adm:value>
+ <adm:value name="compare">
+ <adm:synopsis>Compare operations</adm:synopsis>
+ </adm:value>
+ <adm:value name="delete">
+ <adm:synopsis>Delete operations</adm:synopsis>
+ </adm:value>
+ <adm:value name="extended">
+ <adm:synopsis>Extended operations</adm:synopsis>
+ </adm:value>
+ <adm:value name="inequality-search">
+ <adm:synopsis>Inequality Search operations</adm:synopsis>
+ </adm:value>
+ <adm:value name="modify">
+ <adm:synopsis>Modify operations</adm:synopsis>
+ </adm:value>
+ <adm:value name="rename">
+ <adm:synopsis>Rename operations</adm:synopsis>
+ </adm:value>
+ <adm:value name="search">
+ <adm:synopsis>Search operations</adm:synopsis>
+ </adm:value>
+ </adm:enumeration>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-allowed-operations</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="allowed-attributes" mandatory="false" multi-valued="true">
+ <adm:synopsis>
+ Specifies which attributes are allowed in search and compare operations.
+ </adm:synopsis>
+ <adm:description>
+ When this attribute is specified, only the listed attributes are allowed
+ in search and compare operations. If it is not set, all the attributes
+ are allowed, except those listed in ds-cfg-prohibited-attributes.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:string />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-allowed-attributes</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="prohibited-attributes" mandatory="false"
+ multi-valued="true">
+ <adm:synopsis>
+ Specifies which attributes are not allowed in search and compare
+ operations.
+ </adm:synopsis>
+ <adm:description>
+ When this attribute is specified, all the listed attributes are prohibited
+ in search and compare operations. It should not be used in conjunction
+ with ds-cfg-allowed-attributes.
+
+ </adm:description>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:string />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-prohibited-attributes</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="allowed-search-scopes" mandatory="false"
+ multi-valued="true">
+ <adm:synopsis>
+ Specifies which search scopes are allowed in the network group.
+ </adm:synopsis>
+ <adm:description>
+ When this attribute is specified, only the listed scopes are
+ allowed in the network group. If it is not set, all search scopes are
+ allowed.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:enumeration>
+ <adm:value name="base">
+ <adm:synopsis>Base-object search.</adm:synopsis>
+ </adm:value>
+ <adm:value name="one">
+ <adm:synopsis>One-level search.</adm:synopsis>
+ </adm:value>
+ <adm:value name="sub">
+ <adm:synopsis>Whole subtree search</adm:synopsis>
+ </adm:value>
+ <adm:value name="children">
+ <adm:synopsis>Subordinate subtree search</adm:synopsis>
+ </adm:value>
+ </adm:enumeration>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-allowed-search-scopes</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="allowed-subtrees" mandatory="false"
+ multi-valued="true">
+ <adm:synopsis>
+ Specifies which subtrees are exposed to clients.
+ </adm:synopsis>
+ <adm:description>
+ When this attribute is specified, only the listed subtrees are exposed. If
+ it is not set, all the substrees are exposed. Note that
+ ds-cfg-prohibited-subtrees restricts the list of exposed subtrees.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:dn />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-allowed-subtrees</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="prohibited-subtrees" mandatory="false"
+ multi-valued="true">
+ <adm:synopsis>
+ Specifies which subtrees are not exposed to clients. Each prohibited
+ subtree must be subordinate to an allowed subtree.
+ </adm:synopsis>
+ <adm:description>
+ When this attribute is specified, all the listed subtrees cannot be
+ accessed.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:undefined />
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:dn />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-prohibited-subtrees</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+</adm:managed-object>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupResourceLimitsConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupResourceLimitsConfiguration.xml
new file mode 100644
index 0000000..c31e2e9
--- /dev/null
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupResourceLimitsConfiguration.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! -->
+<adm:managed-object name="network-group-resource-limits"
+ plural-name="network-group-resource-limits"
+ package="org.opends.server.admin.std"
+ xmlns:adm="http://www.opends.org/admin"
+ xmlns:ldap="http://www.opends.org/admin-ldap">
+
+ <adm:synopsis>
+ The
+ <adm:user-friendly-name /> are used to define resource limits
+ enforced by the network group.
+ </adm:synopsis>
+
+ <adm:tag name="core-server" />
+
+ <adm:profile name="ldap">
+ <ldap:object-class>
+ <ldap:name>ds-cfg-network-group-resource-limits</ldap:name>
+ <ldap:superior>top</ldap:superior>
+ </ldap:object-class>
+ </adm:profile>
+
+ <adm:property name="max-connections" mandatory="false">
+ <adm:synopsis>
+ Specifies the maximum number of connections in the network group.
+ </adm:synopsis>
+ <adm:description>
+ A value of 0 means that no limit is enforced.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>0</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="0"/>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-max-connections</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="max-connections-from-same-ip"
+ mandatory="false">
+ <adm:synopsis>
+ Specifies the maximum number of connections from the same client
+ (identified by its IP address).
+ </adm:synopsis>
+ <adm:description>
+ A value of 0 means that no limit is enforced.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>0</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="0"/>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-max-connections-from-same-ip</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="max-ops-per-connection" mandatory="false">
+ <adm:synopsis>
+ Specifies the maximum number of operations per connection.
+ </adm:synopsis>
+ <adm:description>
+ A value of 0 means that no limit is enforced.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>0</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="0"/>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-max-ops-per-connection</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="max-concurrent-ops-per-connection"
+ mandatory="false">
+ <adm:synopsis>
+ Specifies the maximum number of concurrent operations per connection.
+ </adm:synopsis>
+ <adm:description>
+ A value of 0 means that no limit is enforced.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>0</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="0"/>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-max-concurrent-ops-per-connection
+ </ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="search-size-limit" mandatory="false">
+ <adm:synopsis>
+ Specifies the maximum number of entries that the Directory Server
+ should return to the client during a search operation.
+ </adm:synopsis>
+ <adm:description>
+ A value of 0 indicates that no size limit is enforced. Note that this
+ is the network-group limit, but it may be overridden on a
+ per-user basis.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>1000</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="0"/>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-search-size-limit</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="search-time-limit" mandatory="false">
+ <adm:synopsis>
+ Specifies the maximum length of time that the Directory Server should
+ spend processing a search operation.
+ </adm:synopsis>
+ <adm:description>
+ A value of 0 seconds indicates that no time limit is enforced. Note that
+ this is the network group time limit, but it may be overridden
+ on a per-user basis.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>60 seconds</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:duration base-unit="s" lower-limit="0" />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-search-time-limit</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="min-substring-length" mandatory="false">
+ <adm:synopsis>
+ Specifies the minimum length for a search substring.
+ </adm:synopsis>
+ <adm:description>
+ Search operations with short search substring are likely to match
+ a high number of entries and might degrade performances. A value of 0
+ indicates that no limit is enforced.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>0</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="0"/>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-min-substring-length</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="referral-policy" mandatory="false">
+ <adm:synopsis>
+ Specifies the referral policy.
+ </adm:synopsis>
+ <adm:description>
+ The referral policy defines the behavior when a referral is
+ received. The server can either discard the referral, forward
+ the referral to the client or follow the referral.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>forward</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:enumeration>
+ <adm:value name="discard">
+ <adm:synopsis>Discard referrals.</adm:synopsis>
+ </adm:value>
+ <adm:value name="forward">
+ <adm:synopsis>Forward referrals.</adm:synopsis>
+ </adm:value>
+ <adm:value name="follow">
+ <adm:synopsis>Follow referrals</adm:synopsis>
+ </adm:value>
+ </adm:enumeration>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-referral-policy</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="referral-bind-policy" mandatory="false">
+ <adm:synopsis>
+ Specifies the referral bind policy.
+ </adm:synopsis>
+ <adm:description>
+ The referral bind policy is used only when the referral policy
+ is set to "follow". It specifies whether the referral is followed
+ with the client bind DN and password or anonymously.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>anonymous</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:enumeration>
+ <adm:value name="anonymous">
+ <adm:synopsis>Follow referrals anonymously.</adm:synopsis>
+ </adm:value>
+ <adm:value name="use-password">
+ <adm:synopsis>
+ Follow referrals with the client bind DN and password.
+ </adm:synopsis>
+ </adm:value>
+ </adm:enumeration>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-referral-bind-policy</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+ <adm:property name="referral-hop-limit" mandatory="false">
+ <adm:synopsis>
+ Specifies the maximum number of hops when following referrals.
+ </adm:synopsis>
+ <adm:description>
+ A value of 0 means that no limit is enforced.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>0</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="0"/>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-referral-hop-limit</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+
+</adm:managed-object>
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
index 6d993f5..363c9a9 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationDomainConfiguration.xml
@@ -193,4 +193,151 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+ <adm:property name="assured-type" mandatory="false" advanced="true">
+ <adm:synopsis>
+ Defines the assured mode of the replicated domain.
+ </adm:synopsis>
+ <adm:description>
+ The assured mode can be disable or enabled. When enabled, two sub modes
+ are available: Safe Data or Safe Read modes.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>not-assured</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:enumeration>
+ <adm:value name="not-assured">
+ <adm:synopsis>
+ Updates sent for replication (for being replayed on other LDAP
+ servers of the topology) are sent without waiting for any
+ aknowledgement and the LDAP client call returns immediately.
+ </adm:synopsis>
+ </adm:value>
+ <adm:value name="safe-data">
+ <adm:synopsis>
+ Assured mode is enabled in Safe Data sub mode: updates sent for
+ replication are subject to acknowledgement defined by the
+ assured-sd-level property. After acknowlegement is received, LDAP
+ client call returns.
+ </adm:synopsis>
+ </adm:value>
+ <adm:value name="safe-read">
+ <adm:synopsis>
+ Assured mode is enabled in Safe Read sub mode: updates sent for
+ replication are subject to acknowledgement of LDAP servers of the
+ topology having the same group id than us (defined with
+ assured-sr-group-id property). After acknowlegement is received,
+ LDAP client call returns.
+ </adm:synopsis>
+ </adm:value>
+ </adm:enumeration>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-assured-type</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+ <adm:property name="assured-sd-level" mandatory="false" advanced="true">
+ <adm:synopsis>
+ The level of acknowledgment for Safe Data assured sub mode.
+ </adm:synopsis>
+ <adm:description>
+ When assured mode configured in Safe Data mode, this value defines the
+ number of replication servers that should acknowledge the sent update
+ before the LDAP client call can return.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>1</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="1" upper-limit="127"></adm:integer>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-assured-sd-level</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+ <adm:property name="assured-timeout" mandatory="false" advanced="true">
+ <adm:synopsis>
+ The timeout value when waiting for assured mode acknowledgements.
+ </adm:synopsis>
+ <adm:description>
+ Defines the amount of milliseconds the server will wait for assured
+ acknowledgements (in either Safe Data or Safe Read assured sub modes)
+ before returning anyway the LDAP client call.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>1000ms</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:duration base-unit="ms" lower-limit="1" />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-assured-timeout</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+ <adm:property name="group-id" mandatory="false" advanced="true">
+ <adm:synopsis>
+ The group id associated with this replicated domain.
+ </adm:synopsis>
+ <adm:description>
+ This value defines the group id of the replicated domain. The replication
+ system will preferably connect and send updates to replicate to a
+ replication server with the same group id as him.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>1</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="1" upper-limit="127"></adm:integer>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-group-id</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+ <adm:property name="referrals-url" multi-valued="true" mandatory="false"
+ advanced="true">
+ <adm:synopsis>
+ The URLs other LDAP servers should you to refer to us.
+ </adm:synopsis>
+ <adm:description>
+ URLs used by peer servers of the topology to refer to us through LDAP
+ referrals. If this attribute is not defined, every URLs available to
+ access this server will be used. If defined, only URLs specified here will
+ be used.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:undefined/>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:string>
+ <adm:pattern>
+ <adm:regex>^ldap://.+$</adm:regex>
+ <adm:usage>LDAP URL</adm:usage>
+ <adm:synopsis>
+ A LDAP URL compliant with RFC 2255.
+ </adm:synopsis>
+ </adm:pattern>
+ </adm:string>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-referrals-url</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
</adm:managed-object>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
index 90395fc..6b2b3fc 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
@@ -191,4 +191,78 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+ <adm:property name="group-id" mandatory="false">
+ <adm:synopsis>
+ The group id for the replication server.
+ </adm:synopsis>
+ <adm:description>
+ This value defines the group id of the replication server. The replication
+ system of a LDAP server uses the group id of the replicated domain and
+ tries to connect, if possible, to a replication with the same group id.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>1</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="1" upper-limit="127"></adm:integer>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-group-id</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+ <adm:property name="assured-timeout" mandatory="false">
+ <adm:synopsis>
+ The timeout value when waiting for assured mode acknowledgements.
+ </adm:synopsis>
+ <adm:description>
+ Defines the amount of milliseconds the replication server will wait for
+ assured acknowledgements (in either Safe Data or Safe Read assured sub
+ modes) before forgetting them and answer to the entity that sent an update
+ and is waiting for acknowledgment.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>1000ms</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:duration base-unit="ms" lower-limit="1" />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-assured-timeout</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
+ <adm:property name="degraded-status-threshold" mandatory="false">
+ <adm:synopsis>
+ The number of pending changes as threshold value for putting a directory
+ server in degraded status.
+ </adm:synopsis>
+ <adm:description>
+ This value represents a number of pending changes a replication server has
+ in queue for sending to a directory server. Once this value is crossed,
+ the matching directory server goes in degraded status. When number of
+ pending changes goes back under this value, the directory server is put
+ back in normal status. 0 means status analyzer is disabled and directory
+ servers are never put in degraded status.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>5000</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:integer lower-limit="0"></adm:integer>
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-degraded-status-threshold</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
</adm:managed-object>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml
index 0f4f5aa..845a6f6 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RootConfiguration.xml
@@ -415,7 +415,7 @@
</cli:relation>
</adm:profile>
</adm:relation>
- <adm:relation name="network-group" hidden="true">
+ <adm:relation name="network-group">
<adm:one-to-many naming-property="network-group-id" />
<adm:profile name="ldap">
<ldap:rdn-sequence>cn=Network Groups,cn=config</ldap:rdn-sequence>
@@ -426,7 +426,7 @@
</cli:relation>
</adm:profile>
</adm:relation>
- <adm:relation name="workflow" hidden="true">
+ <adm:relation name="workflow">
<adm:one-to-many naming-property="workflow-id" />
<adm:profile name="ldap">
<ldap:rdn-sequence>cn=Workflows,cn=config</ldap:rdn-sequence>
@@ -437,7 +437,7 @@
</cli:relation>
</adm:profile>
</adm:relation>
- <adm:relation name="workflow-element" hidden="true">
+ <adm:relation name="workflow-element">
<adm:one-to-many naming-property="workflow-element-id" />
<adm:profile name="ldap">
<ldap:rdn-sequence>
@@ -450,6 +450,12 @@
</cli:relation>
</adm:profile>
</adm:relation>
+ <adm:relation name="administration-connector">
+ <adm:one-to-one />
+ <adm:profile name="ldap">
+ <ldap:rdn-sequence>cn=Administration Connector,cn=config</ldap:rdn-sequence>
+ </adm:profile>
+ </adm:relation>
<adm:relation name="extension">
<adm:one-to-many />
<adm:profile name="ldap">
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/ADSContext.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/ADSContext.java
index 1621110..9f0e028 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/ADSContext.java
+++ b/opendj-sdk/opends/src/ads/org/opends/admin/ads/ADSContext.java
@@ -125,6 +125,10 @@
*/
LDAPS_PORT("ldapsport",ADSPropertySyntax.INTEGER),
/**
+ * The administration connector port of the server.
+ */
+ ADMIN_PORT("adminport",ADSPropertySyntax.INTEGER),
+ /**
* The certificate used by the server.
*/
CERTIFICATE("certificate",ADSPropertySyntax.STRING),
@@ -149,6 +153,10 @@
*/
LDAPS_ENABLED("ldapsEnabled",ADSPropertySyntax.BOOLEAN),
/**
+ * Whether ADMIN is enabled or not.
+ */
+ ADMIN_ENABLED("adminEnabled",ADSPropertySyntax.BOOLEAN),
+ /**
* Whether StartTLS is enabled or not.
*/
STARTTLS_ENABLED("startTLSEnabled",ADSPropertySyntax.BOOLEAN),
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
index c954372..d6b39d4 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
+++ b/opendj-sdk/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
@@ -76,6 +76,10 @@
*/
LDAPS_PORT,
/**
+ * The associated value is an Integer.
+ */
+ ADMIN_PORT,
+ /**
* The associated value is an ArrayList of Boolean.
*/
LDAP_ENABLED,
@@ -86,6 +90,10 @@
/**
* The associated value is an ArrayList of Boolean.
*/
+ ADMIN_ENABLED,
+ /**
+ * The associated value is an ArrayList of Boolean.
+ */
STARTTLS_ENABLED,
/**
* The associated value is an ArrayList of Integer.
@@ -375,9 +383,46 @@
}
/**
+ * Returns the URL to access this server using the administration connector.
+ * Returns <CODE>null</CODE> if the server cannot get the administration
+ * connector.
+ * @return the URL to access this server using the administration connector.
+ */
+ public String getAdminConnectorURL()
+ {
+ String adminConnectorUrl = null;
+ String host = getHostName();
+ int port = -1;
+
+ if (!serverProperties.isEmpty())
+ {
+ ArrayList s = (ArrayList)serverProperties.get(
+ ServerProperty.ADMIN_ENABLED);
+ ArrayList p = (ArrayList)serverProperties.get(
+ ServerProperty.ADMIN_PORT);
+ if (s != null)
+ {
+ for (int i=0; i<s.size(); i++)
+ {
+ if (Boolean.TRUE.equals(s.get(i)))
+ {
+ port = (Integer)p.get(i);
+ break;
+ }
+ }
+ }
+ }
+ if (port != -1)
+ {
+ adminConnectorUrl = ConnectionUtils.getLDAPUrl(host, port, true);
+ }
+ return adminConnectorUrl;
+ }
+
+ /**
* Returns a String of type host-name:port-number for the server. If
* the provided securePreferred is set to true the port that will be used
- * (if LDAPS is enabled) will be the LDAPS port.
+ * will be the administration connector port.
* @param securePreferred whether to try to use the secure port as part
* of the returning String or not.
* @return a String of type host-name:port-number for the server.
@@ -407,8 +452,8 @@
if (securePreferred)
{
s = (ArrayList)serverProperties.get(
- ServerProperty.LDAPS_ENABLED);
- p = (ArrayList)serverProperties.get(ServerProperty.LDAPS_PORT);
+ ServerProperty.ADMIN_ENABLED);
+ p = (ArrayList)serverProperties.get(ServerProperty.ADMIN_PORT);
if (s != null)
{
for (int i=0; i<s.size(); i++)
@@ -426,14 +471,14 @@
{
boolean secure;
- Object v = adsProperties.get(ADSContext.ServerProperty.LDAPS_ENABLED);
+ Object v = adsProperties.get(ADSContext.ServerProperty.ADMIN_ENABLED);
secure = securePreferred && "true".equalsIgnoreCase(String.valueOf(v));
try
{
if (secure)
{
port = Integer.parseInt((String)adsProperties.get(
- ADSContext.ServerProperty.LDAPS_PORT));
+ ADSContext.ServerProperty.ADMIN_PORT));
}
else
{
@@ -462,7 +507,9 @@
ServerProperty [] props =
{
ServerProperty.LDAP_PORT, ServerProperty.LDAPS_PORT,
- ServerProperty.LDAP_ENABLED, ServerProperty.LDAPS_ENABLED
+ ServerProperty.ADMIN_PORT,
+ ServerProperty.LDAP_ENABLED, ServerProperty.LDAPS_ENABLED,
+ ServerProperty.ADMIN_ENABLED
};
for (ServerProperty prop : props) {
ArrayList s = (ArrayList) serverProperties.get(prop);
@@ -478,8 +525,10 @@
ADSContext.ServerProperty.HOST_NAME,
ADSContext.ServerProperty.LDAP_PORT,
ADSContext.ServerProperty.LDAPS_PORT,
+ ADSContext.ServerProperty.ADMIN_PORT,
ADSContext.ServerProperty.LDAP_ENABLED,
- ADSContext.ServerProperty.LDAPS_ENABLED
+ ADSContext.ServerProperty.LDAPS_ENABLED,
+ ADSContext.ServerProperty.ADMIN_ENABLED
};
for (int i=0; i<props.length; i++)
{
@@ -550,6 +599,7 @@
{
{ServerProperty.LDAP_ENABLED, ServerProperty.LDAP_PORT},
{ServerProperty.LDAPS_ENABLED, ServerProperty.LDAPS_PORT},
+ {ServerProperty.ADMIN_ENABLED, ServerProperty.ADMIN_PORT},
{ServerProperty.JMX_ENABLED, ServerProperty.JMX_PORT},
{ServerProperty.JMXS_ENABLED, ServerProperty.JMXS_PORT}
};
@@ -559,6 +609,8 @@
ADSContext.ServerProperty.LDAP_PORT},
{ADSContext.ServerProperty.LDAPS_ENABLED,
ADSContext.ServerProperty.LDAPS_PORT},
+ {ADSContext.ServerProperty.ADMIN_ENABLED,
+ ADSContext.ServerProperty.ADMIN_PORT},
{ADSContext.ServerProperty.JMX_ENABLED,
ADSContext.ServerProperty.JMX_PORT},
{ADSContext.ServerProperty.JMXS_ENABLED,
@@ -644,6 +696,7 @@
updateLdapConfiguration(desc, ctx, filter);
+ updateAdminConnectorConfiguration(desc, ctx, filter);
updateJmxConfiguration(desc, ctx, filter);
updateReplicas(desc, ctx, filter);
updateReplication(desc, ctx, filter);
@@ -715,6 +768,44 @@
}
}
+ private static void updateAdminConnectorConfiguration(ServerDescriptor desc,
+ InitialLdapContext ctx, TopologyCacheFilter cacheFilter)
+ throws NamingException
+ {
+ SearchControls ctls = new SearchControls();
+ ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ ctls.setReturningAttributes(
+ new String[] {
+ "ds-cfg-listen-port",
+ "objectclass"
+ });
+ String filter = "(objectclass=ds-cfg-administration-connector)";
+
+ LdapName jndiName = new LdapName("cn=config");
+ NamingEnumeration listeners = ctx.search(jndiName, filter, ctls);
+
+ Integer adminConnectorPort = null;
+
+ // we should have a single administration connector
+ if (listeners.hasMore()) {
+ SearchResult sr = (SearchResult) listeners.next();
+ String port = getFirstValue(sr, "ds-cfg-listen-port");
+ adminConnectorPort = new Integer(port);
+ }
+
+ // Even if we have a single port, use an array to be consistent with
+ // other protocols.
+ ArrayList<Integer> adminPorts = new ArrayList<Integer>();
+ ArrayList<Boolean> adminEnabled = new ArrayList<Boolean>();
+ if (adminConnectorPort != null)
+ {
+ adminPorts.add(adminConnectorPort);
+ adminEnabled.add(Boolean.TRUE);
+ }
+ desc.serverProperties.put(ServerProperty.ADMIN_PORT, adminPorts);
+ desc.serverProperties.put(ServerProperty.ADMIN_ENABLED, adminEnabled);
+ }
+
private static void updateJmxConfiguration(ServerDescriptor desc,
InitialLdapContext ctx, TopologyCacheFilter cacheFilter)
throws NamingException
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/BlindTrustManager.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/BlindTrustManager.java
index 9fcc755..0e4d671 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/BlindTrustManager.java
+++ b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/BlindTrustManager.java
@@ -34,7 +34,7 @@
/**
* An X509TrustManager which trusts everything.
*/
-class BlindTrustManager implements X509TrustManager {
+public class BlindTrustManager implements X509TrustManager {
/**
* {@inheritDoc}
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
index 8b41a68..7d7880f 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
@@ -44,6 +44,7 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import javax.naming.ldap.Control;
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.StartTlsRequest;
import javax.naming.ldap.StartTlsResponse;
@@ -230,6 +231,60 @@
}
/**
+ * Clones the provided InitialLdapContext and returns a connection using
+ * the same parameters.
+ * @param ctx hte connection to be cloned.
+ * @param timeout the timeout to establish the connection.
+ * @param trustManager the trust manager to be used to connect.
+ * @param keyManager the key manager to be used to connect.
+ * @return the new InitialLdapContext connected to the server.
+ * @throws NamingException if there was an error creating the new connection.
+ */
+ public static InitialLdapContext cloneInitialLdapContext(
+ final InitialLdapContext ctx, int timeout, TrustManager trustManager,
+ KeyManager keyManager) throws NamingException
+ {
+ Hashtable<?, ?> env = ctx.getEnvironment();
+ Hashtable<?, ?> newEnv = new Hashtable<Object, Object>(env);
+ Control[] ctls = ctx.getConnectControls();
+ Control[] newCtls = null;
+ if (ctls != null)
+ {
+ newCtls = new Control[ctls.length];
+ for (int i=0; i<ctls.length; i++)
+ {
+ newCtls[i] = ctls[i];
+ }
+ }
+ /* Contains the DirContext and the Exception if any */
+ final Object[] pair = new Object[] {null, null};
+ final Hashtable fEnv = env;
+ final TrustManager fTrustManager = trustManager;
+ final KeyManager fKeyManager = keyManager;
+ final Control[] fNewCtls = newCtls;
+
+ Thread t = new Thread(new Runnable() {
+ public void run() {
+ try {
+ if (isSSL(ctx) || isStartTLS(ctx))
+ {
+ TrustedSocketFactory.setCurrentThreadTrustManager(fTrustManager,
+ fKeyManager);
+ }
+ pair[0] = new InitialLdapContext(fEnv, fNewCtls);
+
+ } catch (NamingException ne) {
+ pair[1] = ne;
+
+ } catch (RuntimeException re) {
+ pair[1] = re;
+ }
+ }
+ });
+ return getInitialLdapContext(t, pair, timeout);
+ }
+
+ /**
* Creates an LDAP+StartTLS connection and returns the corresponding
* LdapContext.
* This method first creates an LdapContext with anonymous bind. Then it
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
index fba082a..ee567d7 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
+++ b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
@@ -368,6 +368,24 @@
}
/**
+ * Returns the administration connector URL for the given server properties.
+ * It returns NULL if according to the server properties no administration
+ * connector URL can be generated.
+ * @param serverProperties the server properties to be used to generate
+ * the administration connector URL.
+ * @return the administration connector URL for the given server properties.
+ */
+ private String getAdminConnectorUrl(
+ Map<ServerProperty,Object> serverProperties)
+ {
+ String adminUrl = null;
+ adminUrl = "ldaps://"+getHostNameForLdapUrl(serverProperties)+":"+
+ serverProperties.get(ServerProperty.ADMIN_PORT);
+
+ return adminUrl;
+ }
+
+ /**
* Returns the host name to be used to generate an LDAP URL based on the
* contents of the provided server properties.
* @param serverProperties the server properties.
@@ -415,6 +433,7 @@
LinkedHashSet<PreferredConnection> ldapUrls =
new LinkedHashSet<PreferredConnection>();
+ String adminConnectorUrl = getAdminConnectorUrl(serverProperties);
String ldapsUrl = getLdapsUrl(serverProperties);
String startTLSUrl = getStartTlsLdapUrl(serverProperties);
String ldapUrl = getLdapUrl(serverProperties);
@@ -425,7 +444,11 @@
for (PreferredConnection connection : preferredLDAPURLs)
{
String url = connection.getLDAPURL();
- if (url.equalsIgnoreCase(ldapsUrl) &&
+ if (url.equalsIgnoreCase(adminConnectorUrl))
+ {
+ ldapUrls.add(connection);
+ }
+ else if (url.equalsIgnoreCase(ldapsUrl) &&
connection.getType() == PreferredConnection.Type.LDAPS)
{
ldapUrls.add(connection);
@@ -442,6 +465,12 @@
}
}
+ if (adminConnectorUrl != null)
+ {
+ ldapUrls.add(
+ new PreferredConnection(adminConnectorUrl,
+ PreferredConnection.Type.LDAPS));
+ }
if (ldapsUrl != null)
{
ldapUrls.add(
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
new file mode 100644
index 0000000..67cb47c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
@@ -0,0 +1,125 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel;
+
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JFrame;
+import javax.swing.UIManager;
+import javax.swing.WindowConstants;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.ui.ControlCenterMainPane;
+import org.opends.guitools.controlpanel.ui.MainMenuBar;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.AdminToolMessages;
+
+/**
+ * The class that is in charge of creating the main dialog of the ControlPanel
+ * and the ControlCenterInfo (the data structure that is used by all the GUI
+ * components and that contains information about the server status and server
+ * configuration).
+ */
+public class ControlPanel
+{
+ private JFrame dlg;
+ private ControlPanelInfo info;
+ private ControlCenterMainPane controlCenterPane;
+
+ /**
+ * Main method that is used for testing purposes. The control-panel
+ * command-line is launched through the ControlPanelLauncher (which displays
+ * a splash screen and calls the <code>initialize</code> and
+ * <code>createAndDisplayMethods</code>.
+ * @param args the arguments that are passed.
+ */
+ public static void main(String[] args) {
+ try
+ {
+ UIManager.setLookAndFeel(
+ UIManager.getSystemLookAndFeelClassName());
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ }
+ final ControlPanel test = new ControlPanel();
+ test.initialize(args);
+ javax.swing.SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ test.createAndDisplayGUI();
+ }
+ });
+ }
+
+ /**
+ * Method that creates the ControlCenterInfo object that will be in all the
+ * control panel. Here it basically reads the configuration of the
+ * configuration file.
+ * @param args the arguments that are passed in the command line.
+ */
+ public void initialize(String[] args)
+ {
+ info = ControlPanelInfo.getInstance();
+ info.regenerateDescriptor();
+ info.startPooling(ControlPanelInfo.DEFAULT_POOLING);
+ }
+
+ /**
+ * Creates the main Control Panel dialog and displays it.
+ */
+ public void createAndDisplayGUI()
+ {
+// Create and set up the content pane.
+ controlCenterPane = new ControlCenterMainPane(info);
+ // Create and set up the window.
+ dlg = new JFrame();
+ dlg.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+ final MainMenuBar menuBar = new MainMenuBar(info);
+ dlg.addWindowListener(new WindowAdapter() {
+ public void windowClosing(WindowEvent e) {
+ menuBar.quitClicked();
+ }
+ });
+ dlg.setJMenuBar(menuBar);
+ dlg.setTitle(AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get().toString());
+ dlg.setContentPane(controlCenterPane);
+
+ dlg.pack();
+ Utilities.centerOnScreen(dlg);
+ dlg.setVisible(true);
+ if (info.getServerDescriptor().getStatus() ==
+ ServerDescriptor.ServerStatus.STARTED)
+ {
+ controlCenterPane.getLoginDialog().setVisible(true);
+ controlCenterPane.getLoginDialog().toFront();
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
new file mode 100644
index 0000000..322a854
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -0,0 +1,393 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.tools.ToolConstants.*;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+import org.opends.guitools.controlpanel.util.ControlPanelLog;
+import org.opends.messages.AdminToolMessages;
+import org.opends.messages.Message;
+import org.opends.quicksetup.Installation;
+import org.opends.quicksetup.QuickSetupLog;
+import org.opends.quicksetup.util.Utils;
+import org.opends.server.util.ServerConstants;
+import org.opends.server.util.StaticUtils;
+import org.opends.server.util.args.ArgumentException;
+import org.opends.server.util.args.ArgumentParser;
+import org.opends.server.util.args.BooleanArgument;
+
+/**
+ * The class that is invoked directly by the control-panel command-line. This
+ * class basically displays a splash screen and then calls the methods in
+ * ControlPanel. It also is in charge of detecting whether there are issues
+ * with the
+ *
+ */
+public class ControlPanelLauncher
+{
+ static private ArgumentParser argParser;
+
+ /** Prefix for log files. */
+ static public final String LOG_FILE_PREFIX = "opends-control-panel-";
+
+ /** Suffix for log files. */
+ static public final String LOG_FILE_SUFFIX = ".log";
+
+ static private final Logger LOG =
+ Logger.getLogger(ControlPanelLauncher.class.getName());
+
+ /**
+ * Main method invoked by the control-panel script.
+ * @param args the arguments.
+ */
+ public static void main(String[] args)
+ {
+ try {
+ ControlPanelLog.initLogFileHandler(
+ File.createTempFile(LOG_FILE_PREFIX, LOG_FILE_SUFFIX));
+ } catch (Throwable t) {
+ System.err.println("Unable to initialize log");
+ t.printStackTrace();
+ }
+
+ argParser = new ArgumentParser(ControlPanelLauncher.class.getName(),
+ INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION.get(), false);
+ BooleanArgument showUsage;
+ String scriptName;
+ if (Utils.isWindows()) {
+ scriptName = Installation.WINDOWS_CONTROLPANEL_FILE_NAME;
+ } else {
+ scriptName = Installation.UNIX_CONTROLPANEL_FILE_NAME;
+ }
+ if (System.getProperty(ServerConstants.PROPERTY_SCRIPT_NAME) == null)
+ {
+ System.setProperty(ServerConstants.PROPERTY_SCRIPT_NAME, scriptName);
+ }
+ try
+ {
+ showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
+ OPTION_LONG_HELP,
+ INFO_DESCRIPTION_USAGE.get());
+ argParser.addArgument(showUsage);
+ argParser.setUsageArgument(showUsage);
+ }
+ catch (Throwable t)
+ {
+ System.err.println("ERROR: "+t);
+ t.printStackTrace();
+ }
+
+// Validate user provided data
+ try
+ {
+ argParser.parseArguments(args);
+ }
+ catch (ArgumentException ae)
+ {
+ Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
+ System.err.println(message);
+ System.out.println(Message.raw(argParser.getUsage()));
+
+ System.exit(ErrorReturnCode.ERROR_PARSING_ARGS.getReturnCode());
+ }
+ if (!argParser.usageOrVersionDisplayed())
+ {
+ int exitCode = launchControlPanel(args);
+ if (exitCode != 0)
+ {
+ String logFileName = null;
+ if (QuickSetupLog.getLogFile() != null)
+ {
+ logFileName = QuickSetupLog.getLogFile().toString();
+ }
+ if (logFileName != null)
+ {
+ System.err.println(StaticUtils.wrapText(
+ ERR_CONTROL_PANEL_LAUNCHER_GUI_LAUNCH_FAILED_DETAILS.get(
+ logFileName),
+ Utils.getCommandLineMaxLineWidth()));
+ }
+ else
+ {
+ System.err.println(StaticUtils.wrapText(
+ ERR_CONTROL_PANEL_LAUNCHER_GUI_LAUNCH_FAILED.get(),
+ Utils.getCommandLineMaxLineWidth()));
+ }
+ System.exit(exitCode);
+ }
+ }
+ }
+
+ /**
+ * Launches the graphical status panel. It is launched in a
+ * different thread that the main thread because if we have a problem with the
+ * graphical system (for instance the DISPLAY environment variable is not
+ * correctly set) the native libraries will call exit. However if we launch
+ * this from another thread, the thread will just be killed.
+ *
+ * This code also assumes that if the call to ControlPanelSplashScreen.main
+ * worked (and the splash screen was displayed) we will never get out of it
+ * (we will call a System.exit() when we close the graphical status dialog).
+ *
+ * @params String[] args the arguments used to call the
+ * ControlPanelSplashScreen main method.
+ * @return 0 if everything worked fine, or 1 if we could not display properly
+ * the ControlPanelSplashScreen.
+ */
+ private static int launchControlPanel(final String[] args)
+ {
+ final int[] returnValue = { -1 };
+ Thread t = new Thread(new Runnable()
+ {
+ public void run()
+ {
+ try
+ {
+ // Setup MacOSX native menu bar before AWT is loaded.
+ Utils.setMacOSXMenuBar(
+ AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get());
+ try
+ {
+ UIManager.setLookAndFeel(
+ UIManager.getSystemLookAndFeelClassName());
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING, "Error setting look and feel: "+t, t);
+ }
+
+ ControlPanelSplashScreen.main(args);
+ returnValue[0] = 0;
+ }
+ catch (Throwable t)
+ {
+ if (ControlPanelLog.isInitialized())
+ {
+ LOG.log(Level.WARNING, "Error launching GUI: "+t);
+ StringBuilder buf = new StringBuilder();
+ while (t != null)
+ {
+ StackTraceElement[] stack = t.getStackTrace();
+ for (int i = 0; i < stack.length; i++)
+ {
+ buf.append(stack[i].toString()+"\n");
+ }
+
+ t = t.getCause();
+ if (t != null)
+ {
+ buf.append("Root cause:\n");
+ }
+ }
+ LOG.log(Level.WARNING, buf.toString());
+ }
+ }
+ }
+ });
+ /*
+ * This is done to avoid displaying the stack that might occur if there are
+ * problems with the display environment.
+ */
+ PrintStream printStream = System.err;
+ System.setErr(Utils.getEmptyPrintStream());
+ t.start();
+ try
+ {
+ t.join();
+ }
+ catch (InterruptedException ie)
+ {
+ /* An error occurred, so the return value will be -1. We got nothing to
+ do with this exception. */
+ }
+ System.setErr(printStream);
+ return returnValue[0];
+ }
+}
+
+/**
+ * The enumeration containing the different return codes that the command-line
+ * can have.
+ *
+ */
+enum ErrorReturnCode
+{
+ /**
+ * Successful display of the status.
+ */
+ SUCCESSFUL(0),
+ /**
+ * We did no have an error but the status was not displayed (displayed
+ * version or usage).
+ */
+ SUCCESSFUL_NOP(0),
+ /**
+ * Unexpected error (potential bug).
+ */
+ ERROR_UNEXPECTED(1),
+ /**
+ * Cannot parse arguments.
+ */
+ ERROR_PARSING_ARGS(2),
+ /**
+ * User cancelled (for instance not accepting the certificate proposed) or
+ * could not use the provided connection parameters in interactive mode.
+ */
+ USER_CANCELLED_OR_DATA_ERROR(3),
+ /**
+ * This occurs for instance when the authentication provided by the user is
+ * not valid.
+ */
+ ERROR_READING_CONFIGURATION_WITH_LDAP(4);
+
+ private int returnCode;
+ private ErrorReturnCode(int returnCode)
+ {
+ this.returnCode = returnCode;
+ }
+
+ /**
+ * Returns the corresponding return code value.
+ * @return the corresponding return code value.
+ */
+ public int getReturnCode()
+ {
+ return returnCode;
+ }
+};
+
+/**
+ * The splash screen for the control panel.
+ *
+ */
+class ControlPanelSplashScreen extends org.opends.quicksetup.SplashScreen
+{
+ private static final long serialVersionUID = 4472839063380302713L;
+
+ private static ControlPanel controlPanel;
+
+ private static final Logger LOG =
+ Logger.getLogger(ControlPanelLauncher.class.getName());
+
+ /**
+ * The main method for this class.
+ * It can be called from the event thread and outside the event thread.
+ * @param args arguments to be passed to the method ControlPanel.initialize
+ */
+ public static void main(String[] args)
+ {
+ ControlPanelSplashScreen screen = new ControlPanelSplashScreen();
+ screen.display(args);
+ }
+
+
+ /**
+ * This methods constructs the ControlPanel object.
+ * This method assumes that is being called outside the event thread.
+ * @param args arguments to be passed to the method ControlPanel.initialize.
+ */
+ protected void constructApplication(String[] args)
+ {
+ try
+ {
+ controlPanel = new ControlPanel();
+ controlPanel.initialize(args);
+ } catch (Throwable t)
+ {
+ if (ControlPanelLog.isInitialized())
+ {
+ LOG.log(Level.SEVERE, "Error launching GUI: "+t, t);
+ }
+ InternalError error =
+ new InternalError("Failed to invoke initialize method");
+ error.initCause(t);
+ throw error;
+ }
+ }
+
+ /**
+ * This method displays the StatusPanel dialog.
+ * @see org.opends.guitools.controlpanel.ControlPanel#createAndDisplayGUI()
+ * This method assumes that is being called outside the event thread.
+ */
+ protected void displayApplication()
+ {
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ try
+ {
+ LOG.log(Level.INFO, "going to call createAndDisplayGUI.");
+ controlPanel.createAndDisplayGUI();
+ LOG.log(Level.INFO, "called createAndDisplayGUI.");
+ } catch (Throwable t)
+ {
+ LOG.log(Level.SEVERE, "Error displaying GUI: "+t, t);
+ InternalError error =
+ new InternalError("Failed to invoke display method");
+ error.initCause(t);
+ throw error;
+ }
+ }
+ };
+ if (SwingUtilities.isEventDispatchThread())
+ {
+ runnable.run();
+ }
+ else
+ {
+ try
+ {
+ SwingUtilities.invokeAndWait(runnable);
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.SEVERE, "Error calling SwingUtilities.invokeAndWait: "+t,
+ t);
+ InternalError error =
+ new InternalError(
+ "Failed to invoke SwingUtilities.invokeAndWait method");
+ error.initCause(t);
+ throw error;
+ }
+ }
+ }
+}
+
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java
new file mode 100644
index 0000000..942d6c8
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java
@@ -0,0 +1,81 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.browser;
+
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+
+/**
+ * This is an abstract class that is extended to search for nodes or
+ * to refresh the contents of the nodes.
+ */
+public abstract class AbstractNodeTask implements Runnable {
+
+ BasicNode node;
+ boolean cancelled;
+
+ /**
+ * The constructor of the node searcher.
+ * @param node the node to be searched/refreshed.
+ */
+ protected AbstractNodeTask(BasicNode node) {
+ this.node = node;
+ cancelled = false;
+ }
+
+
+ /**
+ * Returns the node that is being searched/refreshed.
+ * @return the node that is being searched/refreshed.
+ */
+ public BasicNode getNode() {
+ return node;
+ }
+
+
+ /**
+ * Cancels the searching/refreshing process.
+ *
+ */
+ public void cancel() {
+ cancelled = true;
+ }
+
+ /**
+ * Tells whether the search/refresh operation is cancelled.
+ * @return <CODE>true</CODE> if the operation is cancelled and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isCancelled() {
+ return cancelled;
+ }
+
+ /**
+ * The method that is called to refresh/search the node.
+ */
+ public abstract void run();
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/BasicNodeError.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/BasicNodeError.java
new file mode 100644
index 0000000..a9c8e78
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/BasicNodeError.java
@@ -0,0 +1,76 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.browser;
+
+
+/**
+ * Error record.
+ * We group all the error variables in one class to decrease the number of
+ * variables in BasicNode.
+ */
+public class BasicNodeError {
+ private NodeRefresher.State state;
+ private Exception exception;
+ private Object arg;
+
+ /**
+ * The constructor of the BasicNodeError.
+ * @param state the state of the refresher when the exception occurred.
+ * @param x the exception.
+ * @param arg the argument of the exception.
+ */
+ public BasicNodeError(NodeRefresher.State state, Exception x, Object arg) {
+ this.state = state;
+ exception = x;
+ this.arg = arg;
+ }
+
+ /**
+ * Returns the state of the refresher when the exception occurred.
+ * @return the state of the refresher when the exception occurred.
+ */
+ public NodeRefresher.State getState() {
+ return state;
+ }
+
+ /**
+ * Returns the exception.
+ * @return the exception.
+ */
+ public Exception getException() {
+ return exception;
+ }
+
+ /**
+ * Returns the argument of the exception.
+ * @return the argument of the exception.
+ */
+ public Object getArg() {
+ return arg;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java
new file mode 100644
index 0000000..fe98d71
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/BrowserController.java
@@ -0,0 +1,2351 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.browser;
+
+import java.awt.Font;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.ManageReferralControl;
+import javax.naming.ldap.SortControl;
+import javax.naming.ldap.SortKey;
+import javax.swing.Icon;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.event.TreeExpansionEvent;
+import javax.swing.event.TreeExpansionListener;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+
+import org.opends.admin.ads.ADSContext;
+import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.guitools.controlpanel.event.BrowserEvent;
+import org.opends.guitools.controlpanel.event.BrowserEventListener;
+import org.opends.guitools.controlpanel.event.ReferralAuthenticationListener;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
+import org.opends.guitools.controlpanel.ui.nodes.RootNode;
+import org.opends.guitools.controlpanel.ui.nodes.SuffixNode;
+import org.opends.guitools.controlpanel.ui.renderer.BrowserCellRenderer;
+import org.opends.guitools.controlpanel.util.NumSubordinateHacker;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.quicksetup.Constants;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.types.LDAPURL;
+
+/**
+ * This is the main class of the LDAP entry browser. It is in charge of
+ * updating a tree that is passed as parameter. Every instance of
+ * BrowserController is associated with a unique JTree.
+ * The different visualization options are passed to BrowserController using
+ * some setter and getter methods (the user can specify for instance whether
+ * the entries must be sorted or not).
+ */
+public class BrowserController
+implements TreeExpansionListener, ReferralAuthenticationListener
+{
+ /**
+ * The mask used to display the number of ACIs or not.
+ */
+ public final static int DISPLAY_ACI_COUNT = 0x01;
+
+ /**
+ * The list of attributes that are used to sort the entries (if the sorting
+ * option is used).
+ */
+ public static final String[] SORT_ATTRIBUTES = {"cn", "givenname", "o", "ou",
+ "sn", "uid"};
+
+ /**
+ * This is a key value. It is used to specify that the attribute that should
+ * be used to display the entry is the RDN attribute.
+ */
+ public static final String RDN_ATTRIBUTE = "rdn attribute";
+
+ /**
+ * The filter used to retrieve all the entries.
+ */
+ public static final String ALL_OBJECTS_FILTER =
+ "(|(objectClass=*)(objectClass=ldapsubentry))";
+
+ private JTree tree;
+ private DefaultTreeModel treeModel;
+ private RootNode rootNode;
+ private int displayFlags;
+ private String displayAttribute;
+ private boolean showAttributeName;
+ private InitialLdapContext ctxConfiguration;
+ private InitialLdapContext ctxUserData;
+ boolean followReferrals;
+ boolean sorted;
+ boolean showContainerOnly;
+ private boolean automaticExpand;
+ private boolean automaticallyExpandedNode;
+ private String[] containerClasses;
+ private NumSubordinateHacker numSubordinateHacker;
+ private int queueTotalSize;
+ private int maxChildren = 0;
+ private Collection<BrowserEventListener> listeners =
+ new ArrayList<BrowserEventListener>();
+ private LDAPConnectionPool connectionPool;
+ private IconPool iconPool;
+
+ private NodeSearcherQueue refreshQueue;
+
+ private String filter;
+
+ /**
+ * Constructor of the BrowserController.
+ * @param tree the tree that must be updated.
+ * @param cpool the connection pool object that will provide the connections
+ * to be used.
+ * @param ipool the icon pool to be used to retrieve the icons that will be
+ * used to render the nodes in the tree.
+ */
+ public BrowserController(JTree tree, LDAPConnectionPool cpool,
+ IconPool ipool)
+ {
+ this.tree = tree;
+ iconPool = ipool;
+ rootNode = new RootNode();
+ rootNode.setIcon(iconPool.getIconForRootNode());
+ treeModel = new DefaultTreeModel(rootNode);
+ tree.setModel(treeModel);
+ tree.addTreeExpansionListener(this);
+ tree.setCellRenderer(new BrowserCellRenderer());
+ displayFlags = DISPLAY_ACI_COUNT;
+ displayAttribute = RDN_ATTRIBUTE;
+ followReferrals = true;
+ sorted = false;
+ showContainerOnly = true;
+ containerClasses = new String[0];
+ queueTotalSize = 0;
+ connectionPool = cpool;
+ connectionPool.addReferralAuthenticationListener(this);
+
+ refreshQueue = new NodeSearcherQueue("New red", 2);
+
+ // NUMSUBORDINATE HACK
+ // Create an empty hacker to avoid null value test.
+ // However this value will be overriden by full hacker.
+ numSubordinateHacker = new NumSubordinateHacker();
+ }
+
+
+ /**
+ * Set the connection for accessing the directory. Since we must use
+ * different controls when searching the configuration and the user data,
+ * two connections must be provided (this is done to avoid synchronization
+ * issues).
+ * @param ctxConfiguration the connection to be used to retrieve the data in
+ * the configuration base DNs.
+ * @param ctxUserData the connection to be used to retrieve the data in the
+ * user base DNs.
+ * @throws NamingException if an error occurs.
+ */
+ public void setConnections(InitialLdapContext ctxConfiguration,
+ InitialLdapContext ctxUserData) throws NamingException {
+ String rootNodeName;
+ if (ctxConfiguration != null)
+ {
+ this.ctxConfiguration = ctxConfiguration;
+ this.ctxUserData = ctxUserData;
+
+ this.ctxConfiguration.setRequestControls(
+ getConfigurationRequestControls());
+ this.ctxUserData.setRequestControls(getRequestControls());
+ rootNodeName = ConnectionUtils.getHostName(ctxConfiguration) + ":" +
+ ConnectionUtils.getPort(ctxConfiguration);
+ }
+ else {
+ rootNodeName = "";
+ }
+ rootNode.setDisplayName(rootNodeName);
+ startRefresh(null);
+ }
+
+
+ /**
+ * Return the connection for accessing the directory configuration.
+ * @return the connection for accessing the directory configuration.
+ */
+ public InitialLdapContext getConfigurationConnection() {
+ return ctxConfiguration;
+ }
+
+ /**
+ * Return the connection for accessing the directory user data.
+ * @return the connection for accessing the directory user data.
+ */
+ public InitialLdapContext getUserDataConnection() {
+ return ctxUserData;
+ }
+
+
+ /**
+ * Return the JTree controlled by this controller.
+ * @return the JTree controlled by this controller.
+ */
+ public JTree getTree() {
+ return tree;
+ }
+
+
+ /**
+ * Return the connection pool used by this controller.
+ * If a client class adds authentication to the connection
+ * pool, it must inform the controller by calling notifyAuthDataChanged().
+ * @return the connection pool used by this controller.
+ */
+ public LDAPConnectionPool getConnectionPool() {
+ return connectionPool;
+ }
+
+
+ /**
+ * Return the icon pool used by this controller.
+ * @return the icon pool used by this controller.
+ */
+ public IconPool getIconPool() {
+ return iconPool;
+ }
+
+ /**
+ * Tells wether the given suffix is in the tree or not.
+ * @param suffixDn the DN of the suffix to be analyzed.
+ * @return <CODE>true</CODE> if the provided String is the DN of a suffix
+ * and <CODE>false</CODE> otherwise.
+ */
+ public boolean hasSuffix(String suffixDn) {
+ return (findSuffixNode(suffixDn, rootNode) != null);
+ }
+
+ /**
+ * Add an LDAP suffix to this controller.
+ * A new node is added in the JTree and a refresh is started.
+ * @param suffixDn the DN of the suffix.
+ * @param parentSuffixDn the DN of the parent suffix (or <CODE>null</CODE> if
+ * there is no parent DN).
+ * @return the TreePath of the new node.
+ */
+ public TreePath addSuffix(String suffixDn, String parentSuffixDn) {
+ SuffixNode parentNode;
+ if (parentSuffixDn != null) {
+ parentNode = findSuffixNode(parentSuffixDn, rootNode);
+ if (parentNode == null) {
+ throw new IllegalArgumentException("Invalid suffix dn " +
+ parentSuffixDn);
+ }
+ }
+ else {
+ parentNode = rootNode;
+ }
+ int index = findChildNode(parentNode, suffixDn);
+ if (index >= 0) { // A node has alreay this dn -> bug
+ throw new IllegalArgumentException("Duplicate suffix dn " + suffixDn);
+ }
+ else {
+ index = - (index + 1);
+ }
+ SuffixNode newNode = new SuffixNode(suffixDn);
+ treeModel.insertNodeInto(newNode, parentNode, index);
+ startRefreshNode(newNode, null, true);
+
+ return new TreePath(treeModel.getPathToRoot(newNode));
+ }
+
+ /**
+ * Add an LDAP suffix to this controller.
+ * A new node is added in the JTree and a refresh is started.
+ * @param nodeDn the DN of the node to be added.
+ * @return the TreePath of the new node.
+ */
+ public TreePath addNodeUnderRoot(String nodeDn) {
+ SuffixNode parentNode = rootNode;
+ int index = findChildNode(parentNode, nodeDn);
+ if (index >= 0) { // A node has alreay this dn -> bug
+ throw new IllegalArgumentException("Duplicate node dn " + nodeDn);
+ }
+ else {
+ index = - (index + 1);
+ }
+ BasicNode newNode = new BasicNode(nodeDn);
+ treeModel.insertNodeInto(newNode, parentNode, index);
+ startRefreshNode(newNode, null, true);
+
+ return new TreePath(treeModel.getPathToRoot(newNode));
+ }
+
+
+
+ /**
+ * Remove the suffix from this controller.
+ * The controller updates the JTree and returns the TreePath
+ * of the parent node.
+ * @param suffixDn the DN of the suffix to be removed.
+ * @return the TreePath of the parent node of the removed node.
+ */
+ public TreePath removeSuffix(String suffixDn) {
+ TreePath result = null;
+ BasicNode node = findSuffixNode(suffixDn, rootNode);
+ TreeNode parentNode = node.getParent();
+ /* If the parent is null... the node is no longer in the tree */
+ if (parentNode != null) {
+ removeOneNode(node);
+ result = new TreePath(treeModel.getPathToRoot(parentNode));
+ }
+ return result;
+ }
+
+
+ /**
+ * Remove all the suffixes.
+ * The controller removes all the nodes from the JTree except the root.
+ * @return the TreePath of the root node.
+ */
+ public TreePath removeAllUnderRoot() {
+ stopRefresh();
+ removeAllChildNodes(rootNode, false /* Delete suffixes */);
+ return new TreePath(treeModel.getPathToRoot(rootNode));
+ }
+
+
+ /**
+ * Return the display flags.
+ * @return the display flags.
+ */
+ public int getDisplayFlags() {
+ return displayFlags;
+ }
+
+
+ /**
+ * Set the display flags and call startRefresh().
+ * @param flags the display flags to be set.
+ */
+ public void setDisplayFlags(int flags) {
+ displayFlags = flags;
+ startRefresh(null);
+ }
+
+ /**
+ * Set the display attribute (the attribute that will be used to retrieve
+ * the string that will appear in the tree when rendering the node).
+ * This routine collapses the JTree and invokes startRefresh().
+ * @param displayAttribute the display attribute to be used.
+ */
+ public void setDisplayAttribute(String displayAttribute) {
+ this.displayAttribute = displayAttribute;
+ stopRefresh();
+ removeAllChildNodes(rootNode, true /* Keep suffixes */);
+ startRefresh(null);
+ }
+
+ /**
+ * Returns the attribute used to display the entry.
+ * RDN_ATTRIBUTE is the rdn is used.
+ * @return the attribute used to display the entry.
+ */
+ public String getDisplayAttribute() {
+ return displayAttribute;
+ }
+
+ /**
+ * Says wether to show the attribute name or not.
+ * This routine collapses the JTree and invokes startRefresh().
+ * @param showAttributeName whether to show the attribute name or not.
+ */
+ public void showAttributeName(boolean showAttributeName) {
+ this.showAttributeName = showAttributeName;
+ stopRefresh();
+ removeAllChildNodes(rootNode, true /* Keep suffixes */);
+ startRefresh(null);
+ }
+
+ /**
+ * Says wether we are showing the attribute name or not.
+ * @return <CODE>true</CODE> if we are showing the attribute name and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isAttributeNameShown() {
+ return showAttributeName;
+ }
+
+ /**
+ * Sets the maximum number of children to display for a node.
+ * 0 if there is no limit
+ * @param maxChildren the maximum number of children to display for a node.
+ */
+ public void setMaxChildren(int maxChildren) {
+ this.maxChildren = maxChildren;
+ }
+
+ /**
+ * Return the maximum number of children to display.
+ * @return the maximum number of children to display.
+ */
+ public int getMaxChildren() {
+ return maxChildren;
+ }
+
+ /**
+ * Return true if this controller follows referrals.
+ * @return <CODE>true</CODE> if this controller follows referrals and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean getFollowReferrals() {
+ return followReferrals;
+ }
+
+
+ /**
+ * Enable/display the following of referrals.
+ * This routine starts a refresh on each referral node.
+ * @param followReferrals whether to follow referrals or not.
+ */
+ public void setFollowReferrals(boolean followReferrals) {
+ this.followReferrals = followReferrals;
+ startRefreshReferralNodes(rootNode);
+ }
+
+
+ /**
+ * Return true if entries are displayed sorted.
+ * @return <CODE>true</CODE> if entries are displayed sorted and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isSorted() {
+ return sorted;
+ }
+
+
+ /**
+ * Enable/disable entry sort.
+ * This routine collapses the JTree and invokes startRefresh().
+ * @param sorted whether to sort the entries or not.
+ * @throws NamingException if there is an error updating the request controls
+ * of the internal connections.
+ */
+ public void setSorted(boolean sorted) throws NamingException {
+ stopRefresh();
+ removeAllChildNodes(rootNode, true /* Keep suffixes */);
+ this.sorted = sorted;
+ ctxConfiguration.setRequestControls(getConfigurationRequestControls());
+ ctxUserData.setRequestControls(getRequestControls());
+ connectionPool.setRequestControls(getRequestControls());
+ startRefresh(null);
+ }
+
+
+ /**
+ * Return true if only container entries are displayed.
+ * An entry is a container if:
+ * - it has some children
+ * - or its class is one of the container classes
+ * specified with setContainerClasses().
+ * @return <CODE>true</CODE> if only container entries are displayed and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isShowContainerOnly() {
+ return showContainerOnly;
+ }
+
+
+ /**
+ * Enable or disable container display and call startRefresh().
+ * @param showContainerOnly whether to display only containers or all the
+ * entries.
+ */
+ public void setShowContainerOnly(boolean showContainerOnly) {
+ this.showContainerOnly = showContainerOnly;
+ startRefresh(null);
+ }
+
+
+ /**
+ * Find the BrowserNodeInfo associated to a TreePath and returns
+ * the describing IBrowserNodeInfo.
+ * @param path the TreePath associated with the node we are searching.
+ * @return the BrowserNodeInfo associated to the TreePath.
+ */
+ public BrowserNodeInfo getNodeInfoFromPath(TreePath path) {
+ BasicNode node = (BasicNode)path.getLastPathComponent();
+ return new BrowserNodeInfoImpl(node);
+ }
+
+
+ /**
+ * Return the array of container classes for this controller.
+ * Warning: the returned array is not cloned.
+ * @return the array of container classes for this controller.
+ */
+ public String[] getContainerClasses() {
+ return containerClasses;
+ }
+
+
+ /**
+ * Set the list of container classes and calls startRefresh().
+ * Warning: the array is not cloned.
+ * @param containerClasses the lis of container classes.
+ */
+ public void setContainerClasses(String[] containerClasses) {
+ this.containerClasses = containerClasses;
+ startRefresh(null);
+ }
+
+
+ /**
+ * NUMSUBORDINATE HACK
+ * Make the hacker public so that RefreshTask can use it.
+ * @return the NumSubordinateHacker object used by the controller.
+ */
+ public NumSubordinateHacker getNumSubordinateHacker() {
+ return numSubordinateHacker;
+ }
+
+
+ /**
+ * NUMSUBORDINATE HACK
+ * Set the hacker. Note this method does not trigger any
+ * refresh. The caller is supposed to do it afterward.
+ * @param h the NumSubordinateHacker.
+ */
+ public void setNumSubordinateHacker(NumSubordinateHacker h) {
+ if (h == null) {
+ throw new IllegalArgumentException("hacker cannot be null");
+ }
+ numSubordinateHacker = h;
+ }
+
+ /**
+ * Add a BrowserEventListener to this controller.
+ * @param l the listener to be added.
+ */
+ public void addBrowserEventListener(BrowserEventListener l) {
+ listeners.add(l);
+ }
+
+
+ /**
+ * Remove a BrowserEventListener from this controller.
+ * @param l the listener to be removed.
+ */
+ public void removeBrowserEventListener(BrowserEventListener l) {
+ listeners.remove(l);
+ }
+
+
+ /**
+ * Notify this controller that an entry has been added.
+ * The controller adds a new node in the JTree and starts refreshing this new
+ * node.
+ * This routine returns the tree path about the new entry.
+ * @param parentInfo the parent node of the entry added.
+ * @param newEntryDn the dn of the entry to be added.
+ * @return the tree path associated with the new entry.
+ */
+ public TreePath notifyEntryAdded(BrowserNodeInfo parentInfo,
+ String newEntryDn) {
+ BasicNode parentNode = parentInfo.getNode();
+ BasicNode childNode = new BasicNode(newEntryDn);
+ int childIndex;
+ if (sorted) {
+ childIndex = findChildNode(parentNode, newEntryDn);
+ if (childIndex >= 0) {
+ throw new IllegalArgumentException("Duplicate DN " + newEntryDn);
+ }
+ else {
+ childIndex = - (childIndex + 1);
+ }
+ }
+ else {
+ childIndex = parentNode.getChildCount();
+ }
+ parentNode.setLeaf(false);
+ treeModel.insertNodeInto(childNode, parentNode, childIndex);
+ startRefreshNode(childNode, null, false);
+ return new TreePath(treeModel.getPathToRoot(childNode));
+ }
+
+
+ /**
+ * Notify this controller that a entry has been deleted.
+ * The controller removes the corresponding node from the JTree and returns
+ * the TreePath of the parent node.
+ * @param nodeInfo the node to be deleted.
+ * @return the tree path associated with the parent of the deleted node.
+ */
+ public TreePath notifyEntryDeleted(BrowserNodeInfo nodeInfo) {
+ TreePath result = null;
+ BasicNode node = nodeInfo.getNode();
+ if (node == rootNode) {
+ throw new IllegalArgumentException("Root node cannot be removed");
+ }
+ TreeNode parentNode = node.getParent();
+
+ /* If the parent is null... the node is no longer in the tree */
+ if (parentNode != null) {
+ removeOneNode(node);
+ result = new TreePath(treeModel.getPathToRoot(parentNode));
+ }
+ return result;
+ }
+
+
+ /**
+ * Notify this controller that an entry has changed.
+ * The controller starts refreshing the corresponding node.
+ * Child nodes are not refreshed.
+ * @param nodeInfo the node that changed.
+ */
+ public void notifyEntryChanged(BrowserNodeInfo nodeInfo) {
+ BasicNode node = nodeInfo.getNode();
+ startRefreshNode(node, null, false);
+ }
+
+ /**
+ * Notify this controller that a child entry has changed.
+ * The controller has to refresh the corresponding node and (if necessary)
+ * itself.
+ * @param nodeInfo the parent of the node that changed.
+ * @param dn the DN of the entry that changed.
+ */
+ public void notifyChildEntryChanged(BrowserNodeInfo nodeInfo, String dn) {
+ BasicNode node = nodeInfo.getNode();
+ startRefreshNode(node, null, true);
+ }
+
+ /**
+ * Notify this controller that a child entry has been added.
+ * The controller has to refresh the corresponding node and (if necessary)
+ * itself.
+ * @param nodeInfo the parent of the node that was added.
+ * @param dn the DN of the entry that was added.
+ */
+ public void notifyChildEntryAdded(BrowserNodeInfo nodeInfo, String dn) {
+ BasicNode node = nodeInfo.getNode();
+ startRefreshNode(node, null, true);
+ }
+
+ /**
+ * Notify this controller that a child entry has been deleted.
+ * The controller has to refresh the corresponding node and (if necessary)
+ * itself.
+ * @param nodeInfo the parent of the node that was deleted.
+ * @param dn the DN of the entry that was deleted.
+ */
+ public void notifyChildEntryDeleted(BrowserNodeInfo nodeInfo, String dn) {
+ BasicNode node = nodeInfo.getNode();
+ if (node.getParent() != null) {
+ startRefreshNode((BasicNode) node.getParent(), null, true);
+ } else {
+ startRefreshNode(node, null, true);
+ }
+ }
+
+
+ /**
+ * Notify this controller that authentication data have changed in the
+ * connection pool.
+ */
+ public void notifyAuthDataChanged() {
+ notifyAuthDataChanged(null);
+ }
+
+ /**
+ * Notify this controller that authentication data have changed in the
+ * connection pool for the specified url.
+ * The controller starts refreshing the node which represent entries from the
+ * url.
+ * @param url the URL of the connection that changed.
+ */
+ public void notifyAuthDataChanged(LDAPURL url) {
+ // TODO: temporary implementation
+ // we should refresh only nodes :
+ // - whose URL matches 'url'
+ // - whose errorType == ERROR_SOLVING_REFERRAL and
+ // errorArg == url
+ startRefreshReferralNodes(rootNode);
+ }
+
+
+ /**
+ * Start a refresh from the specified node.
+ * If some refresh are on-going on descendent nodes, they are stopped.
+ * If nodeInfo is null, refresh is started from the root.
+ * @param nodeInfo the node to be refreshed.
+ */
+ public void startRefresh(BrowserNodeInfo nodeInfo) {
+ BasicNode node;
+ if (nodeInfo == null) {
+ node = rootNode;
+ }
+ else {
+ node = nodeInfo.getNode();
+ }
+ stopRefreshNode(node);
+ startRefreshNode(node, null, true);
+ }
+
+
+ /**
+ * Equivalent to startRefresh(null).
+ */
+ public void startRefresh() {
+ startRefresh(null);
+ }
+
+
+ /**
+ * Stop the current refreshing.
+ * Nodes being expanded are collapsed.
+ */
+ public void stopRefresh() {
+ stopRefreshNode(rootNode);
+ // TODO: refresh must be stopped in a clean state.
+ }
+
+
+ /**
+ * Shutdown the controller : all the backgroup threads are stopped.
+ * After this call, the controller is no longer usable.
+ */
+ public void shutDown() {
+ tree.removeTreeExpansionListener(this);
+ refreshQueue.shutdown();
+ connectionPool.flush();
+ }
+
+ /**
+ * Start refreshing the whole tree from the specified node.
+ * We queue a refresh which:
+ * - updates the base node
+ * - is recursive
+ * @param node the parent node that will be refreshed.
+ * @param localEntry the local entry corresponding to the node.
+ * @param recursive whether the refresh must be executed recursively or not.
+ */
+ void startRefreshNode(BasicNode node, SearchResult localEntry,
+ boolean recursive) {
+ if (node == rootNode) {
+ // For the root node, readBaseEntry is meaningless.
+ if (recursive) {
+ // The root cannot be queued directly.
+ // We need to queue each child individually.
+ Enumeration e = rootNode.children();
+ while (e.hasMoreElements()) {
+ BasicNode child = (BasicNode)e.nextElement();
+ startRefreshNode(child, null, true);
+ }
+ }
+ }
+ else {
+ refreshQueue.queue(new NodeRefresher(node, this, localEntry, recursive));
+ // The task does not *see* suffixes.
+ // So we need to propagate the refresh on
+ // the subsuffixes if any.
+ if (recursive && (node instanceof SuffixNode)) {
+ Enumeration e = node.children();
+ while (e.hasMoreElements()) {
+ BasicNode child = (BasicNode)e.nextElement();
+ if (child instanceof SuffixNode) {
+ startRefreshNode(child, null, true);
+ }
+ }
+ }
+ }
+ }
+
+
+
+
+ /**
+ * Stop refreshing below this node.
+ * TODO: this method is very costly when applied to something else than the
+ * root node.
+ * @param node the node where the refresh must stop.
+ */
+ void stopRefreshNode(BasicNode node) {
+ if (node == rootNode) {
+ refreshQueue.cancelAll();
+ }
+ else {
+ Enumeration e = node.children();
+ while (e.hasMoreElements()) {
+ BasicNode child = (BasicNode)e.nextElement();
+ stopRefreshNode(child);
+ }
+ refreshQueue.cancelForNode(node);
+ }
+ }
+
+
+
+ /**
+ * Call startRefreshNode() on each referral node accessible from parentNode.
+ * @param parentNode the parent node.
+ */
+ void startRefreshReferralNodes(BasicNode parentNode) {
+ Enumeration e = parentNode.children();
+ while (e.hasMoreElements()) {
+ BasicNode child = (BasicNode)e.nextElement();
+ if ((child.getReferral() != null) || (child.getRemoteUrl() != null)) {
+ startRefreshNode(child, null, true);
+ }
+ else {
+ startRefreshReferralNodes(child);
+ }
+ }
+ }
+
+
+
+ /**
+ * Remove all the children below parentNode *without changing the leaf state*.
+ * If specified, it keeps the SuffixNode and recurse on them. Inform the tree
+ * model.
+ * @param parentNode the parent node.
+ * @param keepSuffixes whether the suffixes should be kept or not.
+ */
+ void removeAllChildNodes(BasicNode parentNode, boolean keepSuffixes) {
+ for (int i = parentNode.getChildCount() - 1; i >= 0; i--) {
+ BasicNode child = (BasicNode)parentNode.getChildAt(i);
+ if ((child instanceof SuffixNode) && keepSuffixes) {
+ removeAllChildNodes(child, true);
+ child.setRefreshNeededOnExpansion(true);
+ }
+ else {
+ child.removeFromParent();
+ }
+ }
+ treeModel.nodeStructureChanged(parentNode);
+ }
+
+ /**
+ * For BrowserController private use. When a node is expanded, refresh it
+ * if it needs it (to search the children for instance).
+ * @param event the tree expansion event.
+ */
+ public void treeExpanded(TreeExpansionEvent event) {
+ if (!automaticallyExpandedNode)
+ {
+ automaticExpand = false;
+ }
+ BasicNode basicNode = (BasicNode)event.getPath().getLastPathComponent();
+ if (basicNode.isRefreshNeededOnExpansion()) {
+ basicNode.setRefreshNeededOnExpansion(false);
+ // Starts a recursive refresh which does not read the base entry
+ startRefreshNode(basicNode, null, true);
+ }
+ }
+
+
+ /**
+ * For BrowserController private use. When a node is collapsed the refresh
+ * tasks on it are canceled.
+ * @param event the tree collapse event.
+ */
+ public void treeCollapsed(TreeExpansionEvent event) {
+ Object node = event.getPath().getLastPathComponent();
+ if (!(node instanceof RootNode)) {
+ BasicNode basicNode = (BasicNode)node;
+ stopRefreshNode(basicNode);
+ }
+ }
+
+ /**
+ * Sets which is the inspected node. This method simply marks the selected
+ * node in the tree so that it can have a different rendering. This is
+ * useful for instance when the right panel has a list of entries to which
+ * the menu action apply, to make a difference between the selected node in
+ * the tree (to which the action in the main menu will not apply) and the
+ * selected nodes in the right pane.
+ * @param node the selected node.
+ */
+ public void setInspectedNode(BrowserNodeInfo node) {
+ BrowserCellRenderer renderer = (BrowserCellRenderer)tree.getCellRenderer();
+ if (node == null) {
+ renderer.setInspectedNode(null);
+ } else {
+ renderer.setInspectedNode(node.getNode());
+ }
+ }
+
+
+ /**
+ * Routines for the task classes
+ * =============================
+ *
+ * Note that these routines only read controller variables.
+ * They do not alter any variable: so they can be safely
+ * called by task threads without synchronize clauses.
+ */
+
+
+ /**
+ * The tree model created by the controller and assigned
+ * to the JTree.
+ * @return the tree model.
+ */
+ public DefaultTreeModel getTreeModel() {
+ return treeModel;
+ }
+
+ /**
+ * Sets the filter that must be used by the browser controller to retrieve
+ * entries.
+ * @param filter the LDAP filter.
+ */
+ public void setFilter(String filter)
+ {
+ this.filter = filter;
+ }
+
+ /**
+ * Returns the filter that is being used to search the entries.
+ * @return the filter that is being used to search the entries.
+ */
+ public String getFilter()
+ {
+ return filter;
+ }
+
+ /**
+ * Returns the filter used to make a object base search.
+ * @return the filter used to make a object base search.
+ */
+ String getObjectSearchFilter()
+ {
+ return ALL_OBJECTS_FILTER;
+ }
+
+
+ /**
+ * Return the LDAP search filter to use for searching child entries.
+ * If showContainerOnly is true, the filter will select only the
+ * container entries. If not, the filter will select all the children.
+ * @return the LDAP search filter to use for searching child entries.
+ */
+ String getChildSearchFilter() {
+ String result;
+ if (showContainerOnly) {
+ if (followReferrals) {
+ /* In the case we are following referrals, we have to consider referrals
+ as nodes.
+ Suppose the following scenario: a referral points to a remote entry
+ that has children (node), BUT the referral entry in the local server
+ has no children. It won't be included in the filter and it won't
+ appear in the tree. But what we are displaying is the remote entry,
+ the result is that we have a NODE that does not appear in the tree and
+ so the user cannot browse it.
+
+ This has some side effects:
+ If we cannot follow the referral, a leaf will appear on the tree (as it
+ if were a node).
+ If the referral points to a leaf entry, a leaf will appear on the tree
+ (as if it were a node).
+
+ This is minor compared to the impossibility of browsing a subtree with
+ the NODE/LEAF layout.
+ */
+ result = "(|(&(hasSubordinates=true)"+filter+")(objectClass=referral)";
+ } else {
+ result = "(|(&(hasSubordinates=true)"+filter+")";
+ }
+ for (int i = 0; i < containerClasses.length; i++) {
+ result += "(objectClass=" + containerClasses[i] + ")";
+ }
+ result += ")";
+ }
+ else {
+ result = filter;
+ }
+
+ return result;
+ }
+
+
+
+
+ /**
+ * Return the LDAP connection to reading the base entry of a node.
+ * @param node the node for which we want the LDAP connection.
+ * @throws NamingException if there is an error retrieving the connection.
+ * @return the LDAP connection to reading the base entry of a node.
+ */
+ InitialLdapContext findConnectionForLocalEntry(BasicNode node)
+ throws NamingException {
+ return findConnectionForLocalEntry(node, isConfigurationNode(node));
+ }
+
+ /**
+ * Return the LDAP connection to reading the base entry of a node.
+ * @param node the node for which we want toe LDAP connection.
+ * @param isConfigurationNode whether the node is a configuration node or not.
+ * @throws NamingException if there is an error retrieving the connection.
+ * @return the LDAP connection to reading the base entry of a node.
+ */
+ InitialLdapContext findConnectionForLocalEntry(BasicNode node,
+ boolean isConfigurationNode)
+ throws NamingException {
+ InitialLdapContext result;
+ if (node == rootNode) {
+ result = ctxConfiguration;
+ }
+ else {
+ BasicNode parent = (BasicNode)node.getParent();
+ if (parent != null) {
+ result = findConnectionForDisplayedEntry(parent, isConfigurationNode);
+ } else {
+ if (isConfigurationNode)
+ {
+ result = ctxConfiguration;
+ }
+ else
+ {
+ result = ctxUserData;
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Returns whether a given node is a configuration node or not.
+ * @param node the node to analyze.
+ * @return <CODE>true</CODE> if the node is a configuration node and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean isConfigurationNode(BasicNode node)
+ {
+ boolean isConfigurationNode = false;
+ if (node instanceof SuffixNode)
+ {
+ String dn = node.getDN();
+ if (Utilities.areDnsEqual(dn, ADSContext.getAdministrationSuffixDN()) ||
+ Utilities.areDnsEqual(dn, ConfigConstants.DN_DEFAULT_SCHEMA_ROOT) ||
+ Utilities.areDnsEqual(dn, ConfigConstants.DN_TASK_ROOT) ||
+ Utilities.areDnsEqual(dn, ConfigConstants.DN_CONFIG_ROOT) ||
+ Utilities.areDnsEqual(dn, ConfigConstants.DN_MONITOR_ROOT) ||
+ Utilities.areDnsEqual(dn, ConfigConstants.DN_TRUST_STORE_ROOT) ||
+ Utilities.areDnsEqual(dn, ConfigConstants.DN_BACKUP_ROOT) ||
+ Utilities.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN))
+ {
+ isConfigurationNode = true;
+ }
+ }
+ else if (node instanceof RootNode)
+ {
+ isConfigurationNode = true;
+ }
+ else
+ {
+ BasicNode parentNode = (BasicNode)node.getParent();
+ return isConfigurationNode(parentNode);
+ }
+
+ return isConfigurationNode;
+ }
+
+ /**
+ * Return the LDAP connection to search the displayed entry (which can be the
+ * local or remote entry).
+ * @param node the node for which we want toe LDAP connection.
+ * @return the LDAP connection to search the displayed entry.
+ * @throws NamingException if there is an error retrieving the connection.
+ */
+ public InitialLdapContext findConnectionForDisplayedEntry(BasicNode node)
+ throws NamingException {
+ return findConnectionForDisplayedEntry(node, isConfigurationNode(node));
+ }
+
+
+ /**
+ * Return the LDAP connection to search the displayed entry (which can be the
+ * local or remote entry).
+ * @param node the node for which we want toe LDAP connection.
+ * @param isConfigurationNode whether the node is a configuration node or not.
+ * @return the LDAP connection to search the displayed entry.
+ * @throws NamingException if there is an error retrieving the connection.
+ */
+ InitialLdapContext findConnectionForDisplayedEntry(BasicNode node,
+ boolean isConfigurationNode)
+ throws NamingException {
+ InitialLdapContext result;
+ if (followReferrals && (node.getRemoteUrl() != null)) {
+ result = connectionPool.getConnection(node.getRemoteUrl());
+ }
+ else {
+ result = findConnectionForLocalEntry(node, isConfigurationNode);
+ }
+ return result;
+ }
+
+
+
+ /**
+ * Release a connection returned by selectConnectionForChildEntries() or
+ * selectConnectionForBaseEntry().
+ * @param ctx the connection to be released.
+ */
+ void releaseLDAPConnection(InitialLdapContext ctx) {
+ if ((ctx != this.ctxConfiguration) &&
+ (ctx != this.ctxUserData))
+ {
+ // Thus it comes from the connection pool
+ connectionPool.releaseConnection(ctx);
+ }
+ }
+
+
+ /**
+ * Returns the local entry URL for a given node.
+ * @param node the node.
+ * @return the local entry URL for a given node.
+ */
+ LDAPURL findUrlForLocalEntry(BasicNode node) {
+ LDAPURL result;
+ if (node == rootNode) {
+ result = LDAPConnectionPool.makeLDAPUrl(ctxConfiguration, "");
+ }
+ else {
+ BasicNode parent = (BasicNode)node.getParent();
+ if (parent != null) {
+ LDAPURL parentUrl = findUrlForDisplayedEntry(parent);
+ result = LDAPConnectionPool.makeLDAPUrl(parentUrl, node.getDN());
+ } else {
+ result = LDAPConnectionPool.makeLDAPUrl(ctxConfiguration, node.getDN());
+ }
+ }
+ return result;
+ }
+
+
+ /**
+ * Returns the displayed entry URL for a given node.
+ * @param node the node.
+ * @return the displayed entry URL for a given node.
+ */
+ LDAPURL findUrlForDisplayedEntry(BasicNode node) {
+ LDAPURL result;
+ if (followReferrals && (node.getRemoteUrl() != null)) {
+ result = node.getRemoteUrl();
+ }
+ else {
+ result = findUrlForLocalEntry(node);
+ }
+ return result;
+ }
+
+
+ /**
+ * Returns the DN to use for searching children of a given node.
+ * In most cases, it's node.getDN(). However if node has referral data
+ * and _followReferrals is true, the result is calculated from the
+ * referral resolution.
+ *
+ * @param node the node.
+ * @return the DN to use for searching children of a given node.
+ */
+ String findBaseDNForChildEntries(BasicNode node) {
+ String result;
+
+ if (followReferrals && (node.getRemoteUrl() != null)) {
+ result = node.getRemoteUrl().getRawBaseDN();
+ }
+ else {
+ result = node.getDN();
+ }
+ return result;
+ }
+
+
+
+ /**
+ * Tells whether a node is displaying a remote entry.
+ * @param node the node.
+ * @return <CODE>true</CODE> if the node displays a remote entry and
+ * <CODE>false</CODE> otherwise.
+ */
+ boolean isDisplayedEntryRemote(BasicNode node) {
+ boolean result = false;
+ if (followReferrals) {
+ if (node == rootNode) {
+ result = false;
+ }
+ else if (node.getRemoteUrl() != null) {
+ result = true;
+ }
+ else {
+ BasicNode parent = (BasicNode)node.getParent();
+ if (parent != null) {
+ result = isDisplayedEntryRemote(parent);
+ }
+ }
+ }
+
+ return result;
+ }
+
+
+ /**
+ * Returns the list of attributes for the red search.
+ * @return the list of attributes for the red search.
+ */
+ String[] getAttrsForRedSearch() {
+ ArrayList<String> v = new ArrayList<String>();
+
+ v.add("objectClass");
+ v.add("numsubordinates");
+ v.add("ref");
+ if ((displayFlags & DISPLAY_ACI_COUNT) != 0) {
+ v.add("aci");
+ }
+ if (!displayAttribute.equals(RDN_ATTRIBUTE)) {
+ v.add(displayAttribute);
+ }
+
+ String[] result = new String[v.size()];
+ v.toArray(result);
+ return result;
+ }
+
+
+ /**
+ * Returns the list of attributes for the green search.
+ * @return the list of attributes for the green search.
+ */
+ String[] getAttrsForGreenSearch() {
+ if (!displayAttribute.equals(RDN_ATTRIBUTE)) {
+ return new String[] {
+ "aci",
+ displayAttribute};
+ } else {
+ return new String[] {
+ "aci"
+ };
+ }
+ }
+
+ /**
+ * Returns the list of attributes for the black search.
+ * @return the list of attributes for the black search.
+ */
+ String[] getAttrsForBlackSearch() {
+ if (!displayAttribute.equals(RDN_ATTRIBUTE)) {
+ return new String[] {
+ "objectClass",
+ "numsubordinates",
+ "ref",
+ "aci",
+ displayAttribute};
+ } else {
+ return new String[] {
+ "objectClass",
+ "numsubordinates",
+ "ref",
+ "aci"
+ };
+ }
+ }
+
+ /**
+ * Returns the basic search controls.
+ * @return the basic search controls.
+ */
+ SearchControls getBasicSearchControls() {
+ SearchControls searchControls = new SearchControls();
+ searchControls.setCountLimit(maxChildren);
+ return searchControls;
+ }
+
+ /**
+ * Returns the request controls to search user data.
+ * @return the request controls to search user data.
+ */
+ Control[] getRequestControls()
+ {
+ Control ctls[] = new Control[sorted ? 2 : 1];
+ ctls[0] = new ManageReferralControl(true);
+ if (sorted) {
+ SortKey[] keys = new SortKey[SORT_ATTRIBUTES.length];
+ for (int i=0; i<keys.length; i++) {
+ keys[i] = new SortKey(SORT_ATTRIBUTES[i]);
+ }
+ try
+ {
+ ctls[1] = new SortControl(keys, true);
+ }
+ catch (IOException ioe)
+ {
+ // Bug
+ throw new IllegalStateException("Unexpected encoding exception: "+ioe,
+ ioe);
+ }
+ }
+ return ctls;
+ }
+
+ /**
+ * Returns the request controls to search configuration data.
+ * @return the request controls to search configuration data.
+ */
+ Control[] getConfigurationRequestControls()
+ {
+ Control ctls[] = new Control[0];
+ return ctls;
+ }
+
+
+ /**
+ * Callbacks invoked by task classes
+ * =================================
+ *
+ * The routines below are invoked by the task classes; they
+ * update the nodes and the tree model.
+ *
+ * To ensure the consistency of the tree model, these routines
+ * are not invoked directly by the task classes: they are
+ * invoked using SwingUtilities.invokeAndWait() (each of the
+ * methods XXX() below has a matching wrapper invokeXXX()).
+ *
+ */
+
+ /**
+ * Invoked when the refresh task has finished the red operation.
+ * It has read the attributes of the base entry ; the result of the
+ * operation is:
+ * - an LDAPEntry if successful
+ * - an Exception if failed
+ * @param task the task that progressed.
+ * @param oldState the previous state of the task.
+ * @param newState the new state of the task.
+ * @throws NamingException if there is an error reading entries.
+ */
+ private void refreshTaskDidProgress(NodeRefresher task,
+ NodeRefresher.State oldState,
+ NodeRefresher.State newState) throws NamingException {
+ BasicNode node = task.getNode();
+ boolean nodeChanged = false;
+
+ //task.dump();
+
+ // Manage events
+ if (oldState == NodeRefresher.State.QUEUED) {
+ checkUpdateEvent(true);
+ }
+ if (task.isInFinalState()) {
+ checkUpdateEvent(false);
+ }
+
+ if (newState == NodeRefresher.State.FAILED) {
+ // In case of NameNotFoundException, we simply remove the node from the
+ // tree.
+ // Except when it's due a to referral resolution: we keep the node
+ // in order the user can fix the referral.
+ if (isNameNotFoundException(task.getException()) &&
+ (oldState != NodeRefresher.State.SOLVING_REFERRAL)) {
+ removeOneNode(node);
+ }
+ else {
+ if (oldState == NodeRefresher.State.SOLVING_REFERRAL) {
+ node.setRemoteUrl(task.getRemoteUrl());
+ if (task.getRemoteEntry() != null) {
+ /* This is the case when there are multiple hops in the referral
+ and so we have a remote referral entry but not the entry that it
+ points to */
+ updateNodeRendering(node, task.getRemoteEntry());
+ }
+ /* It is a referral and we try to follow referrals.
+ We remove its children (that are supposed to be
+ entries on the remote server).
+ If this referral entry has children locally (even if this goes
+ against the recommendation of the standards) these children will
+ NOT be displayed. */
+ node.setLeaf(true);
+ removeAllChildNodes(node, true /* Keep suffixes */);
+ }
+ node.setError(new BasicNodeError(oldState, task.getException(),
+ task.getExceptionArg()));
+ nodeChanged = updateNodeRendering(node, task.getDisplayedEntry());
+ }
+ }
+ else if ((newState == NodeRefresher.State.CANCELLED) &&
+ (newState == NodeRefresher.State.INTERRUPTED)) {
+
+ // Let's collapse task.getNode()
+ tree.collapsePath(new TreePath(treeModel.getPathToRoot(node)));
+
+ // TODO: should we reflect this situation visually ?
+ }
+ else {
+
+ if ((oldState != NodeRefresher.State.SEARCHING_CHILDREN) &&
+ (newState == NodeRefresher.State.SEARCHING_CHILDREN)) {
+ // The children search is going to start
+ if (canDoDifferentialUpdate(task)) {
+ Enumeration e = node.children();
+ while (e.hasMoreElements()) {
+ BasicNode child = (BasicNode)e.nextElement();
+ child.setObsolete(true);
+ }
+ }
+ else {
+ removeAllChildNodes(node, true /* Keep suffixes */);
+ }
+ }
+
+ if (oldState == NodeRefresher.State.READING_LOCAL_ENTRY) {
+ /* The task is going to try to solve the referral if there's one.
+ If succeeds we will update the remote url. Set it to null for
+ the case when there was a referral and it has been deleted */
+ node.setRemoteUrl((String)null);
+ SearchResult localEntry = task.getLocalEntry();
+ nodeChanged = updateNodeRendering(node, localEntry);
+ }
+ else if (oldState == NodeRefresher.State.SOLVING_REFERRAL) {
+ node.setRemoteUrl(task.getRemoteUrl());
+ updateNodeRendering(node, task.getRemoteEntry());
+ nodeChanged = true;
+ }
+ else if (oldState == NodeRefresher.State.DETECTING_CHILDREN) {
+ if (node.isLeaf() != task.isLeafNode()) {
+ node.setLeaf(task.isLeafNode());
+ updateNodeRendering(node, task.getDisplayedEntry());
+ nodeChanged = true;
+ if (node.isLeaf()) {
+ /* We didn't detect any child: remove the previously existing
+ * ones */
+ removeAllChildNodes(node, false /* Remove suffixes */);
+ }
+ }
+ }
+ else if (oldState == NodeRefresher.State.SEARCHING_CHILDREN) {
+
+ updateChildNodes(task);
+ if (newState == NodeRefresher.State.FINISHED) {
+ // The children search is finished
+ if (canDoDifferentialUpdate(task)) {
+ // Remove obsolete child nodes
+ // Note: we scan in the reverse order to preserve indexes
+ for (int i = node.getChildCount()-1; i >= 0; i--) {
+ BasicNode child = (BasicNode)node.getChildAt(i);
+ if (child.isObsolete()) {
+ removeOneNode(child);
+ }
+ }
+ }
+ // The node may have become a leaf.
+ if (node.getChildCount() == 0) {
+ node.setLeaf(true);
+ updateNodeRendering(node, task.getDisplayedEntry());
+ nodeChanged = true;
+ }
+ }
+ if (node.isSizeLimitReached())
+ {
+ fireEvent(BrowserEvent.Type.SIZE_LIMIT_REACHED);
+ }
+ }
+
+ if (newState == NodeRefresher.State.FINISHED) {
+ if (node.getError() != null) {
+ node.setError(null);
+ nodeChanged = updateNodeRendering(node, task.getDisplayedEntry());
+ }
+ }
+ }
+
+
+ if (nodeChanged) {
+ treeModel.nodeChanged(task.getNode());
+ }
+
+ if (node.isLeaf() && (node.getChildCount() >= 1)) {
+ throw new IllegalStateException("Inconsistent node: " + node.getDN());
+ }
+
+ }
+
+
+ /**
+ * Commodity method that calls the method refreshTaskDidProgress in the event
+ * thread.
+ * @param task the task that progressed.
+ * @param oldState the previous state of the task.
+ * @param newState the new state of the task.
+ * @throws InterruptedException if an errors occurs invoking the method.
+ */
+ void invokeRefreshTaskDidProgress(final NodeRefresher task,
+ final NodeRefresher.State oldState,
+ final NodeRefresher.State newState)
+ throws InterruptedException {
+
+ Runnable r = new Runnable() {
+ public void run() {
+ try {
+ refreshTaskDidProgress(task, oldState, newState);
+ }
+ catch(Exception x) {
+ x.printStackTrace();
+ }
+ }
+ };
+ swingInvoke(r);
+ }
+
+
+
+ /**
+ * Core routines shared by the callbacks above
+ * ===========================================
+ */
+
+ /**
+ * Updates the child nodes for a given task.
+ * @param task the task.
+ * @throws NamingException if an error occurs.
+ */
+ private void updateChildNodes(NodeRefresher task) throws NamingException {
+ BasicNode parent = task.getNode();
+ ArrayList<Integer> insertIndex = new ArrayList<Integer>();
+ ArrayList<Integer> changedIndex = new ArrayList<Integer>();
+ boolean differential = canDoDifferentialUpdate(task);
+
+ // NUMSUBORDINATE HACK
+ // To avoid testing each child to the hacker,
+ // we verify here if the parent node is parent of
+ // any entry listed in the hacker.
+ // In most case, the dontTrust flag will false and
+ // no overhead will be caused in the child loop.
+ LDAPURL parentUrl = findUrlForDisplayedEntry(parent);
+ boolean dontTrust = numSubordinateHacker.containsChildrenOf(parentUrl);
+
+ // Walk through the entries
+ for (SearchResult entry : task.getChildEntries())
+ {
+ BasicNode child;
+
+ // Search a child node matching the DN of the entry
+ int index;
+ if (differential) {
+// System.out.println("Differential mode -> starting to search");
+ index = findChildNode(parent, entry.getName());
+// System.out.println("Differential mode -> ending to search");
+ }
+ else {
+ index = - (parent.getChildCount() + 1);
+ }
+
+ // If no node matches, we create a new node
+ if (index < 0) {
+ // -(index + 1) is the location where to insert the new node
+ index = -(index + 1);
+ child = new BasicNode(entry.getName());
+ parent.insert(child, index);
+ updateNodeRendering(child, entry);
+ insertIndex.add(new Integer(index));
+// System.out.println("Inserted " + child.getDN() + " at " + index);
+ }
+ else { // Else we update the existing one
+ child = (BasicNode)parent.getChildAt(index);
+ if (updateNodeRendering(child, entry)) {
+ changedIndex.add(new Integer(index));
+ }
+ // The node is no longer obsolete
+ child.setObsolete(false);
+ }
+
+ // NUMSUBORDINATE HACK
+ // Let's see if child has subordinates or not.
+ // Thanks to slapd, we cannot always trust the
+ // numSubOrdinates attribute. If the child entry's DN
+ // is found in the hacker's list, then we ignore
+ // the numSubordinate attribute... :((
+ int numSubOrdinates = child.getNumSubOrdinates();
+ boolean hasNoSubOrdinates;
+ if ((numSubOrdinates == 0) && dontTrust) {
+ LDAPURL childUrl = findUrlForDisplayedEntry(child);
+ if (numSubordinateHacker.contains(childUrl)) {
+ // The numSubOrdinates we have is unreliable.
+ // child may potentially have subordinates.
+ hasNoSubOrdinates = false;
+// System.out.println("numSubordinates of " + childUrl +
+// " is not reliable");
+ }
+ else {
+ // We can trust this 0 value
+ hasNoSubOrdinates = true;
+ }
+ }
+ else {
+ hasNoSubOrdinates = (numSubOrdinates == 0);
+ }
+
+
+
+ // Propagate the refresh
+ // Note: logically we should unconditionaly call:
+ // startRefreshNode(child, false, true);
+ //
+ // However doing that saturates _refreshQueue
+ // with many nodes. And, by design, RefreshTask
+ // won't do anything on a node if:
+ // - this node has no subordinates
+ // - *and* this node has no referral data
+ // So we test these conditions here and
+ // skip the call to startRefreshNode() if
+ // possible.
+ //
+ // The exception to this is the case where the
+ // node had children (in the tree). In this case
+ // we force the refresh. See bug 5015115
+ //
+ if (!hasNoSubOrdinates ||
+ (child.getReferral() != null) ||
+ (child.getChildCount() > 0)) {
+ startRefreshNode(child, entry, true);
+ }
+ }
+
+
+ // Inform the tree model that we have created some new nodes
+ if (insertIndex.size() >= 1) {
+ treeModel.nodesWereInserted(parent, intArrayFromCollection(insertIndex));
+ }
+ if (changedIndex.size() >= 1) {
+ treeModel.nodesChanged(parent, intArrayFromCollection(changedIndex));
+ }
+ }
+
+
+
+ /**
+ * Tells wheter a differential update can be made in the provided task.
+ * @param task the task.
+ * @return <CODE>true</CODE> if a differential update can be made and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean canDoDifferentialUpdate(NodeRefresher task) {
+ return (
+ (task.getNode().getChildCount() >= 1) &&
+ (task.getNode().getNumSubOrdinates() <= 100)
+ );
+ }
+
+
+ /**
+ * Recompute the rendering props of a node (text, style, icon) depending on.
+ * - the state of this node
+ * - the LDAPEntry displayed by this node
+ * @param node the node to be rendered.
+ * @param entry the search result for the entry that the node represents.
+ */
+ private boolean updateNodeRendering(BasicNode node, SearchResult entry)
+ throws NamingException {
+ if (entry != null) {
+ // Get the numsubordinates
+ node.setNumSubOrdinates(getNumSubOrdinates(entry));
+ node.setReferral(getReferral(entry));
+ Set<String> ocValues = ConnectionUtils.getValues(entry, "objectClass");
+ if (ocValues != null) {
+ String[] array = new String[ocValues.size()];
+ ocValues.toArray(array);
+ node.setObjectClassValues(array);
+ }
+ }
+ // Get the aci count
+ int aciCount;
+
+ if (((displayFlags & DISPLAY_ACI_COUNT) != 0) && (entry != null)) {
+ Set<String> aciValues = ConnectionUtils.getValues(entry, "aci");
+ if (aciValues != null) {
+ aciCount = aciValues.size();
+ }
+ else {
+ aciCount = 0;
+ }
+ }
+ else {
+ aciCount = 0;
+ }
+
+ // Select the icon according the objectClass,...
+ int modifiers = 0;
+ if (node.isLeaf() && (node.getNumSubOrdinates() <= 0)) {
+ modifiers |= IconPool.MODIFIER_LEAF;
+ }
+ if (node.getReferral() != null) {
+ modifiers |= IconPool.MODIFIER_REFERRAL;
+ }
+ if (node.getError() != null) {
+ if (node.getError().getException() != null)
+ {
+ node.getError().getException().printStackTrace();
+ }
+ modifiers |= IconPool.MODIFIER_ERROR;
+ }
+ SortedSet<String> objectClasses = new TreeSet<String>();
+ if (entry != null) {
+ Set<String> ocs = ConnectionUtils.getValues(entry, "objectClass");
+ if (ocs != null)
+ {
+ objectClasses.addAll(ocs);
+ }
+ }
+ Icon newIcon;
+ if (node instanceof SuffixNode)
+ {
+ newIcon = iconPool.getSuffixIcon();
+ }
+ else
+ {
+ newIcon = iconPool.getIcon(objectClasses, modifiers);
+ }
+
+ // Contruct the icon text according the dn, the aci count...
+ StringBuilder sb2 = new StringBuilder();
+ if (aciCount >= 1) {
+ sb2.append(String.valueOf(aciCount));
+ if (aciCount == 1) {
+ sb2.append(" aci");
+ }
+ else {
+ sb2.append(" acis");
+ }
+ }
+
+ StringBuilder sb1 = new StringBuilder();
+ if (node instanceof SuffixNode) {
+ if (entry != null) {
+ sb1.append(entry.getName());
+ }
+ } else {
+ boolean useRdn = true;
+ if (!displayAttribute.equals(RDN_ATTRIBUTE) &&
+ (entry != null)) {
+ String value = ConnectionUtils.getFirstValue(entry,displayAttribute);
+ if (value != null) {
+ if (showAttributeName) {
+ value = displayAttribute+"="+value;
+ }
+ sb1.append(value);
+ useRdn = false;
+ }
+ }
+ if (useRdn) {
+ String rdn;
+ if (followReferrals && (node.getRemoteUrl() != null)) {
+ if (showAttributeName) {
+ rdn = node.getRemoteRDNWithAttributeName();
+ } else {
+ rdn = node.getRemoteRDN();
+ }
+ }
+ else {
+ if (showAttributeName) {
+ rdn = node.getRDNWithAttributeName();
+ } else {
+ rdn = node.getRDN();
+ }
+ }
+ sb1.append(rdn);
+ }
+ }
+ if (sb2.length() >= 1) {
+ sb1.append(" (");
+ sb1.append(sb2);
+ sb1.append(")");
+ }
+ String newDisplayName = sb1.toString();
+
+ // Select the font style according referral
+ int newStyle = 0;
+ if (isDisplayedEntryRemote(node)) {
+ newStyle |= Font.ITALIC;
+ }
+
+ // Determine if the rendering needs to be updated
+ boolean changed = (
+ (node.getIcon() != newIcon) ||
+ (node.getDisplayName() != newDisplayName) ||
+ (node.getFontStyle() != newStyle)
+ );
+ if (changed) {
+ node.setIcon(newIcon);
+ node.setDisplayName(newDisplayName);
+ node.setFontStyle(newStyle);
+ }
+
+
+ return changed;
+ }
+
+
+ /**
+ * Find a child node matching a given DN.
+ *
+ * result >= 0 result is the index of the node matching childDn.
+ * result < 0 -(result + 1) is the index at which the new node must be
+ * inserted.
+ * @param parent the parent node of the node that is being searched.
+ * @param childDn the DN of the entry that is being searched.
+ * @return the index of the node matching childDn.
+ */
+ public int findChildNode(BasicNode parent, String childDn) {
+ int childCount = parent.getChildCount();
+ int i = 0;
+ while ((i < childCount) &&
+ !childDn.equals(((BasicNode)parent.getChildAt(i)).getDN())) {
+ i++;
+ }
+ if (i >= childCount) { // Not found
+ i = -(childCount + 1);
+ }
+
+ return i;
+ }
+
+ /**
+ * Remove a single node from the tree model.
+ * It takes care to cancel all the tasks associated to this node.
+ * @param node the node to be removed.
+ */
+ private void removeOneNode(BasicNode node) {
+ stopRefreshNode(node);
+ treeModel.removeNodeFromParent(node);
+ }
+
+
+ /**
+ * BrowserEvent management
+ * =======================
+ *
+ * This method computes the total size of the queues,
+ * compares this value with the last computed and
+ * decides if an update event should be fired or not.
+ *
+ * It's invoked by task classes through SwingUtilities.invokeLater()
+ * (see the wrapper below). That means the event handling routine
+ * (processBrowserEvent) is executed in the event thread.
+ * @param taskIsStarting whether the task is starting or not.
+ */
+ private void checkUpdateEvent(boolean taskIsStarting) {
+ int newSize = refreshQueue.size();
+ if (!taskIsStarting) {
+ newSize = newSize - 1;
+ }
+ if (newSize != queueTotalSize) {
+ if ((queueTotalSize == 0) && (newSize >= 1)) {
+ fireEvent(BrowserEvent.Type.UPDATE_START);
+ }
+ else if ((queueTotalSize >= 1) && (newSize == 0)) {
+ fireEvent(BrowserEvent.Type.UPDATE_END);
+ }
+ queueTotalSize = newSize;
+ }
+ }
+
+ /**
+ * Returns the size of the queue containing the different tasks. It can be
+ * used to know if there are search operations ongoing.
+ * @return the number of RefreshTask operations ongoing (or waiting to start).
+ */
+ public int getQueueSize()
+ {
+ return refreshQueue.size();
+ }
+
+
+ /**
+ * Fires a BrowserEvent.
+ * @param type the type of the event.
+ */
+ private void fireEvent(BrowserEvent.Type type) {
+ BrowserEvent event = new BrowserEvent(this, type);
+ for (BrowserEventListener listener : listeners)
+ {
+ listener.processBrowserEvent(event);
+ }
+ }
+
+
+ /**
+ * Miscellaneous private routines
+ * ==============================
+ */
+
+
+ /**
+ * Find a SuffixNode in the tree model.
+ * @param suffixDn the dn of the suffix node.
+ * @param suffixNode the node from which we start searching.
+ * @return the SuffixNode associated with the provided DN. <CODE>null</CODE>
+ * if nothing is found.
+ */
+ SuffixNode findSuffixNode(String suffixDn, SuffixNode suffixNode) {
+ SuffixNode result;
+
+ if (Utilities.areDnsEqual(suffixNode.getDN(), suffixDn)) {
+ result = suffixNode;
+ }
+ else {
+ int childCount = suffixNode.getChildCount();
+ if (childCount == 0) {
+ result = null;
+ }
+ else {
+ BasicNode child;
+ int i = 0;
+ boolean found = false;
+ do {
+ child = (BasicNode)suffixNode.getChildAt(i) ;
+ if (Utilities.areDnsEqual(child.getDN(), suffixDn)) {
+ found = true;
+ }
+ i++;
+ }
+ while ((i < childCount) && !found);
+ if (!found) {
+ result = null;
+ }
+ else if (child instanceof SuffixNode) {
+ result = (SuffixNode)child;
+ }
+ else {
+ // A node matches suffixDn however it's not a suffix node.
+ // There's a bug in the caller.
+ throw new IllegalArgumentException(suffixDn +" is not a suffix node");
+ }
+ }
+ }
+
+ return result;
+ }
+
+
+
+ /**
+ * Return <CODE>true</CODE> if x is a non <code>null</code>
+ * NameNotFoundException.
+ * @return <CODE>true</CODE> if x is a non <code>null</code>
+ * NameNotFoundException.
+ */
+ private boolean isNameNotFoundException(Object x) {
+ boolean result;
+ if ((x != null) && (x instanceof NameNotFoundException))
+ {
+ result = true;
+ }
+ else {
+ result = false;
+ }
+ return result;
+ }
+
+
+
+ /**
+ * Get the value of the numsubordinates attribute.
+ * If numsubordinates is not present, returns 0.
+ * @param entry the entry to analyze.
+ * @throws NamingException if an error occurs.
+ * @return the value of the numsubordinate attribute. 0 if the attribute
+ * could not be found.
+ */
+ public static int getNumSubOrdinates(SearchResult entry)
+ throws NamingException
+ {
+ int result;
+
+ String v = ConnectionUtils.getFirstValue(entry, "numsubordinates");
+ if (v == null) {
+ result = 0;
+ }
+ else {
+ try {
+ result = Integer.parseInt(v);
+ }
+ catch(NumberFormatException x) {
+ result = 0;
+ }
+ }
+
+ return result;
+ }
+
+
+ /**
+ * Returns the value of the 'ref' attribute.
+ * <CODE>null</CODE> if the attribute is not present.
+ * @param entry the entry to analyze.
+ * @throws NamingException if an error occurs.
+ * @return the value of the ref attribute. <CODE>null</CODE> if the attribute
+ * could not be found.
+ */
+ public static String[] getReferral(SearchResult entry) throws NamingException
+ {
+ String[] result = null;
+ Set<String> values = ConnectionUtils.getValues(entry, "objectClass");
+ if (values != null) {
+ for (String value : values)
+ {
+ boolean isReferral = value.equalsIgnoreCase("referral");
+ if (isReferral)
+ {
+ Set<String> refValues = ConnectionUtils.getValues(entry, "ref");
+ if (refValues != null)
+ {
+ result = new String[refValues.size()];
+ refValues.toArray(result);
+ break;
+ }
+ }
+ break;
+ }
+ }
+ return result;
+ }
+
+
+ /**
+ * Returns true if the node is expanded.
+ * @param node the node to analyze.
+ * @return <CODE>true</CODE> if the node is expanded and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean nodeIsExpanded(BasicNode node) {
+ TreePath tp = new TreePath(treeModel.getPathToRoot(node));
+ return tree.isExpanded(tp);
+ }
+
+ /**
+ * Expands node. Must be run from the event thread. This is called
+ * when the node is automatically expanded.
+ * @param node the node to expand.
+ */
+ public void expandNode(BasicNode node) {
+ automaticallyExpandedNode = true;
+ TreePath tp = new TreePath(treeModel.getPathToRoot(node));
+ tree.expandPath(tp);
+ tree.fireTreeExpanded(tp);
+ automaticallyExpandedNode = false;
+ }
+
+
+
+ /**
+ * Collection utilities
+ */
+ /**
+ * Returns an array of integer from a Collection of Integer objects.
+ * @param v the Collection of Integer objects.
+ * @return an array of int from a Collection of Integer objects.
+ */
+ static int[] intArrayFromCollection(Collection<Integer> v) {
+ int[] result = new int[v.size()];
+ int i = 0;
+ for (Integer value : v)
+ {
+ result[i] = value;
+ i++;
+ }
+ return result;
+ }
+
+ /**
+ * Returns an array of SearchResult from a Collection of SearchResult objects.
+ * @param v the Collection of SearchResult objects.
+ * @return an array of SearchResult from a Collection of SearchResult objects.
+ */
+ static SearchResult[] entryArrayFromCollection(Collection<SearchResult> v) {
+ SearchResult[] result = new SearchResult[v.size()];
+ v.toArray(result);
+ return result;
+ }
+
+ /**
+ * Returns an array of BasicNode from a Collection of BasicNode objects.
+ * @param v the Collection of BasicNode objects.
+ * @return an array of BasicNode from a Collection of BasicNode objects.
+ */
+ static BasicNode[] nodeArrayFromCollection(Collection<BasicNode> v) {
+ BasicNode[] result = new BasicNode[v.size()];
+ v.toArray(result);
+ return result;
+ }
+
+
+
+ /**
+ * For debugging purpose: allows to switch easily
+ * between invokeLater() and invokeAndWait() for
+ * experimentation...
+ * @param r the runnable to be invoked.
+ * @throws InterruptedException if there is an error invoking SwingUtilities.
+ */
+ static void swingInvoke(Runnable r)
+ throws InterruptedException {
+ try {
+ SwingUtilities.invokeAndWait(r);
+ }
+ catch(InterruptedException x) {
+ throw x;
+ }
+ catch(InvocationTargetException x) {
+ // Probably a very big trouble...
+ x.printStackTrace();
+ }
+ }
+
+
+ /**
+ * The default implementaion of the BrowserNodeInfo interface.
+ */
+ class BrowserNodeInfoImpl implements BrowserNodeInfo
+ {
+ BasicNode node;
+ LDAPURL url;
+ boolean isRemote;
+ boolean isSuffix;
+ boolean isRootNode;
+ String[] referral;
+ int numSubOrdinates;
+ int errorType;
+ Exception errorException;
+ Object errorArg;
+ String[] objectClassValues;
+ String toString;
+
+ /**
+ * The constructor of this object.
+ * @param node the node in the tree that is used.
+ */
+ public BrowserNodeInfoImpl(BasicNode node) {
+ this.node = node;
+ url = findUrlForDisplayedEntry(node);
+
+ isRootNode = node instanceof RootNode;
+ isRemote = isDisplayedEntryRemote(node);
+ isSuffix = node instanceof SuffixNode;
+ referral = node.getReferral();
+ numSubOrdinates = node.getNumSubOrdinates();
+ objectClassValues = node.getObjectClassValues();
+ if (node.getError() != null) {
+ BasicNodeError error = node.getError();
+ switch(error.getState()) {
+ case READING_LOCAL_ENTRY:
+ errorType = ERROR_READING_ENTRY;
+ break;
+ case SOLVING_REFERRAL:
+ errorType = ERROR_SOLVING_REFERRAL;
+ break;
+ case DETECTING_CHILDREN:
+ case SEARCHING_CHILDREN:
+ errorType = ERROR_SEARCHING_CHILDREN;
+ break;
+
+ }
+ errorException = error.getException();
+ errorArg = error.getArg();
+ }
+ StringBuilder sb = new StringBuilder();
+ sb.append(getURL());
+ if (getReferral() != null) {
+ sb.append(" -> ");
+ sb.append(getReferral());
+ }
+ toString = sb.toString();
+ }
+
+ /**
+ * Returns the node associated with this object.
+ * @return the node associated with this object.
+ */
+ public BasicNode getNode() {
+ return node;
+ }
+
+ /**
+ * Returns the LDAP URL associated with this object.
+ * @return the LDAP URL associated with this object.
+ */
+ public LDAPURL getURL() {
+ return url;
+ }
+
+ /**
+ * Tells whether this is a root node or not.
+ * @return <CODE>true</CODE> if this is a root node and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isRootNode() {
+ return isRootNode;
+ }
+
+ /**
+ * Tells whether this is a suffix node or not.
+ * @return <CODE>true</CODE> if this is a suffix node and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isSuffix() {
+ return isSuffix;
+ }
+
+ /**
+ * Tells whether this is a remote node or not.
+ * @return <CODE>true</CODE> if this is a remote node and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isRemote() {
+ return isRemote;
+ }
+
+ /**
+ * Returns the list of referral associated with this node.
+ * @return the list of referral associated with this node.
+ */
+ public String[] getReferral() {
+ return referral;
+ }
+
+ /**
+ * Returns the number of subordinates of the entry associated with this
+ * node.
+ * @return the number of subordinates of the entry associated with this
+ * node.
+ */
+ public int getNumSubOrdinates() {
+ return numSubOrdinates;
+ }
+
+ /**
+ * Returns the error type associated we got when refreshing the node.
+ * <CODE>null</CODE> if no error was found.
+ * @return the error type associated we got when refreshing the node.
+ * <CODE>null</CODE> if no error was found.
+ */
+ public int getErrorType() {
+ return errorType;
+ }
+
+ /**
+ * Returns the exception associated we got when refreshing the node.
+ * <CODE>null</CODE> if no exception was found.
+ * @return the exception associated we got when refreshing the node.
+ * <CODE>null</CODE> if no exception was found.
+ */
+ public Exception getErrorException() {
+ return errorException;
+ }
+
+ /**
+ * Returns the error argument associated we got when refreshing the node.
+ * <CODE>null</CODE> if no error argument was found.
+ * @return the error argument associated we got when refreshing the node.
+ * <CODE>null</CODE> if no error argument was found.
+ */
+ public Object getErrorArg() {
+ return errorArg;
+ }
+
+ /**
+ * Return the tree path associated with the node in the tree.
+ * @return the tree path associated with the node in the tree.
+ */
+ public TreePath getTreePath() {
+ return new TreePath(treeModel.getPathToRoot(node));
+ }
+
+ /**
+ * Returns the object class values of the entry associated with the node.
+ * @return the object class values of the entry associated with the node.
+ */
+ public String[] getObjectClassValues() {
+ return objectClassValues;
+ }
+
+ /**
+ * Returns a String representation of the object.
+ * @return a String representation of the object.
+ */
+ public String toString() {
+ return toString;
+ }
+
+ /**
+ * Compares the provide node with this object.
+ * @param node the node.
+ * @return <CODE>true</CODE> if the node info represents the same node as
+ * this and <CODE>false</CODE> otherwise.
+ */
+ public boolean representsSameNode(BrowserNodeInfo node) {
+ boolean representsSameNode = false;
+ if (node != null) {
+ representsSameNode = node.getNode() == node;
+ }
+ return representsSameNode;
+ }
+ }
+
+
+ /**
+ * Returns whether we are in automatic expand mode. This mode is used when
+ * the user specifies a filter and all the nodes are automatically expanded.
+ * @return <CODE>true</CODE> if we are in automatic expand mode and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isAutomaticExpand()
+ {
+ return automaticExpand;
+ }
+
+
+ /**
+ * Sets the automatic expand mode.
+ * @param automaticExpand whether to expand automatically the nodes or not.
+ */
+ public void setAutomaticExpand(boolean automaticExpand)
+ {
+ this.automaticExpand = automaticExpand;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/IconPool.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/IconPool.java
new file mode 100644
index 0000000..41914b6
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/IconPool.java
@@ -0,0 +1,403 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.browser;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Canvas;
+import java.awt.Image;
+import java.awt.MediaTracker;
+import java.awt.image.ColorModel;
+import java.awt.image.ImageObserver;
+import java.awt.image.MemoryImageSource;
+import java.awt.image.PixelGrabber;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.SortedSet;
+
+import javax.swing.ImageIcon;
+
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.quicksetup.ui.UIFactory;
+
+/**
+ * This class is used as a cache containing the icons that are used by the
+ * BrowserController to update the nodes. It keeps some icons associated with
+ * some entry types, to suffixes, to the root node, etc.
+ */
+public class IconPool {
+
+ /**
+ * Mask for the leaf node.
+ */
+ public static final int MODIFIER_LEAF = 0x01;
+ /**
+ * Mask for the referral node.
+ */
+ public static final int MODIFIER_REFERRAL = 0x02;
+ /**
+ * Mask for the node that has an error.
+ */
+ public static final int MODIFIER_ERROR = 0x04;
+
+ private HashMap<String, ImageIcon> iconTable =
+ new HashMap<String, ImageIcon>();
+ private HashMap<String, String> pathTable = new HashMap<String, String>();
+ private HashMap<String, String> descriptionTable =
+ new HashMap<String, String>();
+ private ImageIcon defaultLeafIcon;
+ private ImageIcon suffixIcon;
+ private ImageIcon defaultContainerIcon;
+ private ImageIcon rootNodeIcon;
+ private ImageIcon errorIcon;
+ private ImageIcon errorMaskIcon;
+ private ImageIcon referralMaskIcon;
+
+ /**
+ * The path that contains the icons.
+ */
+ public static final String IMAGE_PATH =
+ "org/opends/guitools/controlpanel/images";
+
+
+ private static final String[] ICON_PATH = {
+ "person", "ds-user.png",
+ "organization", "ds-folder.png",
+ "organizationalunit", "ds-ou.png",
+ "groupofuniquenames", "ds-group.png",
+ "groupofurls", "ds-group.png",
+ "ds-virtual-static-group", "ds-group.png",
+ "passwordpolicy", "ds-ppol.png"
+ };
+
+ private static final String[] DESCRIPTION = {
+ "person", INFO_PERSON_ICON_DESCRIPTION.get().toString(),
+ "organization", INFO_ORGANIZATION_ICON_DESCRIPTION.get().toString(),
+ "organizationalunit",
+ INFO_ORGANIZATIONAL_UNIT_ICON_DESCRIPTION.get().toString(),
+ "groupofuniquenames", INFO_STATIC_GROUP_ICON_DESCRIPTION.get().toString(),
+ "groupofurls", INFO_DYNAMIC_GROUP_ICON_DESCRIPTION.get().toString(),
+ "ds-virtual-static-group",
+ INFO_VIRTUAL_STATIC_GROUP_ICON_DESCRIPTION.get().toString(),
+ "passwordpolicy", INFO_PASSWORD_POLICY_ICON_DESCRIPTION.get().toString()
+ };
+
+ private String GENERIC_OBJECT_DESCRIPTION = "Generic entry";
+
+ /**
+ * The default constructor.
+ *
+ */
+ public IconPool() {
+ // Recopy ICON_PATH in pathTable for fast access
+ for (int i = 0; i < ICON_PATH.length; i = i+2) {
+ pathTable.put(ICON_PATH[i], ICON_PATH[i+1]);
+ }
+ for (int i = 0; i < DESCRIPTION.length; i = i+2) {
+ descriptionTable.put(DESCRIPTION[i], DESCRIPTION[i+1]);
+ }
+ }
+
+
+ /**
+ * If objectClass is null, a default icon is used.
+ * @param objectClasses the objectclass values of the entry for which we want
+ * an icon.
+ * @param modifiers the modifiers associated with the entry (if there was
+ * an error, if it is a referral, etc.).
+ * @return the icon corresponding to the provided object classes and
+ * modifiers.
+ */
+ public ImageIcon getIcon(SortedSet<String> objectClasses, int modifiers) {
+ ImageIcon result;
+
+ String key = makeKey(objectClasses, modifiers);
+ result = iconTable.get(key);
+ if (result == null) {
+ result = makeIcon(objectClasses, modifiers);
+ iconTable.put(key, result);
+ }
+
+ return result;
+ }
+
+ /**
+ * Creates an icon for a given path.
+ * @param path the path of the icon.
+ * @param description the description of the icon
+ * @return the associated ImageIcon.
+ */
+ private ImageIcon createIcon(String path, String description)
+ {
+ ImageIcon icon = Utilities.createImageIcon(path);
+ if (description != null)
+ {
+ icon.setDescription(description);
+ }
+ return icon;
+ }
+
+ /**
+ * Returns the icon associated with a leaf node.
+ * @return the icon associated with a leaf node.
+ */
+ public ImageIcon getDefaultLeafIcon() {
+ if (defaultLeafIcon == null) {
+ defaultLeafIcon = createIcon(IMAGE_PATH + "/ds-generic.png",
+ GENERIC_OBJECT_DESCRIPTION);
+ }
+ return defaultLeafIcon;
+ }
+
+
+ /**
+ * Returns the icon associated with a container node.
+ * @return the icon associated with a container node.
+ */
+ public ImageIcon getDefaultContainerIcon() {
+ if (defaultContainerIcon == null) {
+ defaultContainerIcon = createIcon(IMAGE_PATH + "/ds-folder.png",
+ "Folder entry");
+ }
+ return defaultContainerIcon;
+ }
+
+ /**
+ * Returns the icon associated with a suffix node.
+ * @return the icon associated with a suffix node.
+ */
+ public ImageIcon getSuffixIcon() {
+ if (suffixIcon == null) {
+ suffixIcon = createIcon(IMAGE_PATH + "/ds-suffix.png",
+ "Suffix entry");
+ }
+ return suffixIcon;
+ }
+
+ /**
+ * Returns the icon associated with a root node.
+ * @return the icon associated with a root node.
+ */
+ public ImageIcon getIconForRootNode() {
+ if (rootNodeIcon == null) {
+ rootNodeIcon = createIcon(IMAGE_PATH + "/ds-directory.png",
+ "Root entry");
+ }
+ return rootNodeIcon;
+ }
+
+ /**
+ * Returns the icon associated with a node for which an error occurred.
+ * @return the icon associated with a node for which an error occurred.
+ */
+ public ImageIcon getErrorIcon() {
+ if (errorIcon == null) {
+ errorIcon = UIFactory.getImageIcon(UIFactory.IconType.ERROR);
+ }
+ return errorIcon;
+ }
+
+
+ /**
+ * Returns the icon associated with the error mask icon.
+ * @return the icon associated with the error mask icon.
+ */
+ public ImageIcon getErrorMaskIcon() {
+ if (errorMaskIcon == null) {
+ errorMaskIcon = UIFactory.getImageIcon(UIFactory.IconType.ERROR);
+ }
+ return errorMaskIcon;
+ }
+
+
+ /**
+ * Returns the icon associated with the referral mask icon.
+ * @return the icon associated with the referral mask icon.
+ */
+ public ImageIcon getReferralMaskIcon() {
+ if (referralMaskIcon == null) {
+ referralMaskIcon = createIcon(IMAGE_PATH + "/ds-referral.png",
+ "Referral mask");
+ }
+ return referralMaskIcon;
+ }
+
+
+ /**
+ * Returns an icon for a given objectclass applying some modifiers.
+ * @param objectClasses the objectclasses of the entry
+ * @param modifiers the modifiers of the icon (if the entry is inactivated,
+ * if it is a referral...).
+ * @return an icon for a given objectclass applying some modifiers.
+ */
+ private ImageIcon makeIcon(Set<String> objectClasses, int modifiers) {
+ ImageIcon result;
+
+ // Find the icon associated to the object class
+ if ((objectClasses == null) || (objectClasses.size() == 0)) {
+ result = getDefaultContainerIcon();
+ }
+ else {
+ String iconFile = null;
+ for (String value : objectClasses)
+ {
+ iconFile = pathTable.get(value.toLowerCase());
+ if (iconFile != null)
+ {
+ break;
+ }
+ }
+ if (iconFile == null) {
+ if ((modifiers & MODIFIER_LEAF) != 0) {
+ result = getDefaultLeafIcon();
+ }
+ else {
+ result = getDefaultContainerIcon();
+ }
+ }
+ else {
+ String description = null;
+ for (String value : objectClasses)
+ {
+ description = descriptionTable.get(value.toLowerCase());
+ if (description != null)
+ {
+ break;
+ }
+ }
+ if (description == null)
+ {
+ description = GENERIC_OBJECT_DESCRIPTION;
+ }
+ result = createIcon(IMAGE_PATH + "/" + iconFile,
+ description);
+ }
+ }
+
+ // Alter this icon according the modifiers
+ if ((modifiers & MODIFIER_REFERRAL) != 0) {
+ result = getReferralMaskIcon();
+ }
+ if ((modifiers & MODIFIER_ERROR) != 0) {
+ result = maskedIcon(result, getErrorMaskIcon());
+ }
+
+ return result;
+ }
+
+
+ private String makeKey(SortedSet<String> ocValues, int modifiers) {
+ // TODO: verify the performance of IconPool.makeKey()
+ StringBuilder result = new StringBuilder();
+ if(ocValues != null) {
+ result.append(Utilities.getStringFromCollection(ocValues, ""));
+ }
+ result.append(String.valueOf(modifiers));
+ return result.toString();
+ }
+
+
+
+ /**
+ * Returns a RemoteImage corresponding to the superposition of the icon
+ * Image and the mask Image.
+ *
+ * @param icon the RemoteImage that we want to bar.
+ * @param mask the ImageIcond to be used as mask.
+ * @return a RemoteImage corresponding to the superposition of the icon
+ * Image and the mask Image.
+ */
+ public static ImageIcon maskedIcon(ImageIcon icon, ImageIcon mask) {
+ ImageIcon fReturn;
+ int TRANSPARENT = 16711165; // The value of a transparent pixel
+
+ int h = icon.getIconHeight();
+ int w = icon.getIconWidth();
+
+ if (mask.getImageLoadStatus() != MediaTracker.COMPLETE) {
+ return null;
+ }
+ Image maskImage = mask.getImage();
+
+ Image scaledMaskImage = maskImage.getScaledInstance(w, h ,
+ Image.SCALE_SMOOTH);
+
+ ImageIcon scaledMask = new ImageIcon(scaledMaskImage);
+ if (scaledMask.getImageLoadStatus() != MediaTracker.COMPLETE) {
+ return null;
+ }
+
+ int[] iconPixels = new int[w * h];
+ try {
+ PixelGrabber pg =
+ new PixelGrabber(icon.getImage(), 0, 0, w, h, iconPixels, 0, w);
+ pg.grabPixels();
+
+ if ((pg.status() & ImageObserver.ABORT) !=0) {
+ return null;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ int[] filterPixels = new int[w * h];
+ try {
+ PixelGrabber pgf =
+ new PixelGrabber(scaledMask.getImage(), 0, 0, w, h, filterPixels, 0, w);
+ pgf.grabPixels();
+
+ if ((pgf.status() & ImageObserver.ABORT) !=0) {
+ fReturn = null;
+ return fReturn;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fReturn = null;
+ return fReturn;
+ }
+
+
+ int[] newPixels = new int[w * h];
+
+ for( int i = 0; i < h; i++)
+ for (int j = 0; j < w; j++)
+ if (filterPixels[j + i*w] != TRANSPARENT) {
+ newPixels[j + i*w] = filterPixels[j + i*w];
+ } else {
+ newPixels[j + i*w] = iconPixels[j + i*w];
+ }
+ Canvas component = new Canvas();
+
+ Image newImage = component.getToolkit().createImage(
+ new MemoryImageSource(
+ w, h, ColorModel.getRGBdefault(), newPixels, 0, w));
+ fReturn = new ImageIcon(newImage, icon.getDescription());
+
+ return fReturn;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
new file mode 100644
index 0000000..11811e26
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
@@ -0,0 +1,634 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.browser;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.InitialLdapContext;
+import javax.net.ssl.KeyManager;
+
+import org.opends.admin.ads.util.ApplicationTrustManager;
+import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.guitools.controlpanel.event.ReferralAuthenticationListener;
+import org.opends.server.types.LDAPURL;
+import org.opends.server.types.SearchScope;
+
+/**
+ * An LDAPConnectionPool is a pool of LDAPConnection.
+ * <BR><BR>
+ * When a client class needs to access an LDAPUrl, it simply passes
+ * this URL to getConnection() and gets an LDAPConnection back.
+ * When the client has finished with this LDAPConnection, it *must*
+ * pass it releaseConnection() which will take care of its disconnection
+ * or caching.
+ * <BR><BR>
+ * LDAPConnectionPool maintains a pool of authentications. This pool
+ * is populated using registerAuth(). When getConnection() has created
+ * a new connection for accessing a host:port, it looks in the authentication
+ * pool if any authentication is available for this host:port and, if yes,
+ * tries to bind the connection. If no authentication is available, the
+ * returned connection is simply connected (ie anonymous bind).
+ * <BR><BR>
+ * LDAPConnectionPool shares connections and maintains a usage counter
+ * for each connection: two calls to getConnection() withe the same URL
+ * will return the same connection. Two calls to releaseConnection() will
+ * be needed to make the connection 'potentially disconnectable'.
+ * <BR><BR>
+ * releaseConnection() does not disconnect systematically a connection
+ * whose usage counter is null. It keeps it connected a while (TODO:
+ * to be implemented).
+ * <BR><BR>
+ * TODO: synchronization is a bit simplistic...
+ */
+public class LDAPConnectionPool {
+
+ HashMap<String, AuthRecord> authTable = new HashMap<String, AuthRecord>();
+ HashMap<String, ConnectionRecord> connectionTable =
+ new HashMap<String, ConnectionRecord>();
+
+ ArrayList<ReferralAuthenticationListener> listeners;
+
+ private Control[] requestControls = new Control[] {};
+ private ApplicationTrustManager trustManager;
+
+ /**
+ * Returns <CODE>true</CODE> if the connection passed is registered in the
+ * connection pool, <CODE>false</CODE> otherwise.
+ * @param ctx the connection.
+ * @return <CODE>true</CODE> if the connection passed is registered in the
+ * connection pool, <CODE>false</CODE> otherwise.
+ */
+ public boolean isConnectionRegistered(InitialLdapContext ctx) {
+ boolean isConnectionRegistered = false;
+ for (String key : connectionTable.keySet())
+ {
+ ConnectionRecord cr = connectionTable.get(key);
+ if (cr.ctx != null) {
+ isConnectionRegistered =
+ ConnectionUtils.getHostName(cr.ctx).equals(
+ ConnectionUtils.getHostName(ctx)) &&
+ (ConnectionUtils.getPort(cr.ctx) == ConnectionUtils.getPort(ctx)) &&
+ ConnectionUtils.getBindDN(cr.ctx).equals(
+ ConnectionUtils.getBindDN(ctx)) &&
+ ConnectionUtils.getBindPassword(cr.ctx).equals(
+ ConnectionUtils.getBindPassword(ctx)) &&
+ (ConnectionUtils.isSSL(cr.ctx) == ConnectionUtils.isSSL(ctx)) &&
+ (ConnectionUtils.isStartTLS(cr.ctx) == ConnectionUtils.isStartTLS(ctx));
+ }
+ if (isConnectionRegistered)
+ {
+ break;
+ }
+ }
+ return isConnectionRegistered;
+ }
+
+ /**
+ * Registers a connection in this connection pool.
+ * @param ctx the connection to be registered.
+ */
+ public void registerConnection(InitialLdapContext ctx) {
+ registerAuth(ctx);
+ LDAPURL url = makeLDAPUrl(
+ ConnectionUtils.getHostName(ctx),
+ ConnectionUtils.getPort(ctx),
+ "",
+ ConnectionUtils.isSSL(ctx)
+ );
+ String key = makeKeyFromLDAPUrl(url);
+ ConnectionRecord cr = new ConnectionRecord();
+ cr.ctx = ctx;
+ cr.counter = 1;
+ cr.disconnectAfterUse = false;
+ connectionTable.put(key, cr);
+ }
+
+ /**
+ * Unregisters a connection from this connection pool.
+ * @param ctx the connection to be unregistered.
+ * @throws NamingException if there is a problem unregistering the connection.
+ */
+ public void unregisterConnection(InitialLdapContext ctx)
+ throws NamingException
+ {
+ LDAPURL url = makeLDAPUrl(
+ ConnectionUtils.getHostName(ctx),
+ ConnectionUtils.getPort(ctx),
+ "",
+ ConnectionUtils.isSSL(ctx));
+ unRegisterAuth(url);
+ String key = makeKeyFromLDAPUrl(url);
+ connectionTable.remove(key);
+ }
+
+ /**
+ * Adds a referral authentication listener.
+ * @param listener the referral authentication listener.
+ */
+ public void addReferralAuthenticationListener(
+ ReferralAuthenticationListener listener) {
+ if (listeners == null) {
+ listeners = new ArrayList<ReferralAuthenticationListener>();
+ }
+ listeners.add(listener);
+ }
+
+ /**
+ * Removes a referral authentication listener.
+ * @param listener the referral authentication listener.
+ */
+ public void removeReferralAuthenticationListener(
+ ReferralAuthenticationListener listener) {
+ if (listeners != null) {
+ listeners.remove(listener);
+ }
+ }
+
+ /**
+ * Returns an LDAPConnection for accessing the specified url.
+ * If no connection are available for the protocol/host/port
+ * of the URL, getConnection() makes a new one and call connect().
+ * If authentication data available for this protocol/host/port,
+ * getConnection() call bind() on the new connection.
+ * If connect() or bind() failed, getConnection() forward the
+ * LDAPException.
+ * When getConnection() succeeds, the returned connection must
+ * be passed to releaseConnection() after use.
+ * @param ldapUrl the LDAP URL to which the connection must connect.
+ * @return a connection to the provided LDAP URL.
+ * @throws NamingException if there was an error connecting.
+ */
+ public InitialLdapContext getConnection(LDAPURL ldapUrl)
+ throws NamingException {
+ String key = makeKeyFromLDAPUrl(ldapUrl);
+ ConnectionRecord cr;
+
+ synchronized(this) {
+ cr = connectionTable.get(key);
+ if (cr == null) {
+ cr = new ConnectionRecord();
+ cr.ctx = null;
+ cr.counter = 1;
+ cr.disconnectAfterUse = false;
+ connectionTable.put(key, cr);
+ }
+ else {
+ cr.counter++;
+ }
+ }
+
+ synchronized(cr) {
+ try {
+ if (cr.ctx == null) {
+ cr.ctx = createLDAPConnection(ldapUrl,
+ authTable.get(key));
+ cr.ctx.setRequestControls(requestControls);
+ }
+ }
+ catch(NamingException x) {
+ synchronized (this) {
+ cr.counter--;
+ if (cr.counter == 0) {
+ connectionTable.remove(key);
+ }
+ }
+ throw x;
+ }
+ }
+
+ return cr.ctx;
+ }
+
+ /**
+ * Sets the request controls to be used by the connections of this connection
+ * pool.
+ * @param ctls the request controls.
+ * @throws NamingException if an error occurs updating the connections.
+ */
+ public synchronized void setRequestControls(Control[] ctls)
+ throws NamingException
+ {
+ requestControls = ctls;
+ for (ConnectionRecord cr : connectionTable.values())
+ {
+ if (cr.ctx != null)
+ {
+ cr.ctx.setRequestControls(requestControls);
+ }
+ }
+ }
+
+
+ /**
+ * Release an LDAPConnection created by getConnection().
+ * The connection should be considered as virtually disconnected
+ * and not be used anymore.
+ * @param ctx the connection to be released.
+ */
+ public synchronized void releaseConnection(InitialLdapContext ctx) {
+
+ String targetKey = null;
+ ConnectionRecord targetRecord = null;
+ synchronized(this) {
+ for (String key : connectionTable.keySet()) {
+ ConnectionRecord cr = connectionTable.get(key);
+ if (cr.ctx == ctx) {
+ targetKey = key;
+ targetRecord = cr;
+ if (targetKey != null)
+ {
+ break;
+ }
+ }
+ }
+ }
+
+ if (targetRecord == null) { // ldc is not in _connectionTable -> bug
+ throw new IllegalArgumentException("Invalid LDAP connection");
+ }
+ else {
+ synchronized(targetRecord) {
+ targetRecord.counter--;
+ if ((targetRecord.counter == 0) && targetRecord.disconnectAfterUse) {
+ disconnectAndRemove(targetRecord);
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Disconnect the connections which are not being used.
+ * Connections being used will be disconnected as soon
+ * as they are released.
+ */
+ public synchronized void flush() {
+ for (ConnectionRecord cr : connectionTable.values())
+ {
+ if (cr.counter <= 0) {
+ disconnectAndRemove(cr);
+ }
+ else {
+ cr.disconnectAfterUse = true;
+ }
+ }
+ }
+
+
+ /**
+ * Register authentication data.
+ * If authentication data are already available for the protocol/host/port
+ * specified in the LDAPURl, they are replaced by the new data.
+ * If true is passed as 'connect' parameter, registerAuth() creates the
+ * connection and attemps to connect() and bind() . If connect() or bind()
+ * fail, registerAuth() forwards the NamingException and does not register
+ * the authentication data.
+ * @param ldapUrl the LDAP URL of the server.
+ * @param dn the bind DN.
+ * @param pw the password.
+ * @param connect whether to connect or not to the server with the
+ * provided authentication (for testing purposes).
+ * @throws NamingException if an error occurs connecting.
+ */
+ public void registerAuth(LDAPURL ldapUrl, String dn, String pw,
+ boolean connect)
+ throws NamingException {
+
+ String key = makeKeyFromLDAPUrl(ldapUrl);
+ AuthRecord ar;
+ ar = new AuthRecord();
+ ar.ldapUrl = ldapUrl;
+ ar.dn = dn;
+ ar.password = pw;
+
+ if (connect) {
+ InitialLdapContext ctx = createLDAPConnection(ldapUrl, ar);
+ ctx.close();
+ }
+
+ synchronized(this) {
+ authTable.put(key, ar);
+ ConnectionRecord cr = connectionTable.get(key);
+ if (cr != null) {
+ if (cr.counter <= 0) {
+ disconnectAndRemove(cr);
+ }
+ else {
+ cr.disconnectAfterUse = true;
+ }
+ }
+ }
+ notifyListeners();
+
+ }
+
+
+ /**
+ * Register authentication data from an existing connection.
+ * This routine recreates the LDAP URL corresponding to
+ * the connection and passes it to registerAuth(LDAPURL).
+ * @param ctx the connection that we retrieve the authentication information
+ * from.
+ */
+ public void registerAuth(InitialLdapContext ctx) {
+ LDAPURL url = makeLDAPUrl(
+ ConnectionUtils.getHostName(ctx),
+ ConnectionUtils.getPort(ctx),
+ "",
+ ConnectionUtils.isSSL(ctx));
+ try {
+ registerAuth(url, ConnectionUtils.getBindDN(ctx),
+ ConnectionUtils.getBindPassword(ctx), false);
+ }
+ catch (NamingException x) {
+ throw new IllegalStateException("Bug");
+ }
+ }
+
+
+ /**
+ * Unregister authentication data.
+ * If for the given url there's a connection, try to bind as anonymous.
+ * If unbind fails throw NamingException.
+ * @param ldapUrl the url associated with the authentication to be
+ * unregistered.
+ * @throws NamingException if the unbind fails.
+ */
+ public void unRegisterAuth(LDAPURL ldapUrl) throws NamingException {
+ String key = makeKeyFromLDAPUrl(ldapUrl);
+
+ authTable.remove(key);
+ notifyListeners();
+ }
+
+ /**
+ * Get authentication DN registered for this url.
+ * @param ldapUrl the LDAP URL for which we want to get authentication DN.
+ * @return the bind DN of the authentication.
+ */
+ public synchronized String getAuthDN(LDAPURL ldapUrl) {
+ String result;
+ String key = makeKeyFromLDAPUrl(ldapUrl);
+ AuthRecord ar = authTable.get(key);
+ if (ar == null) {
+ result = null;
+ }
+ else {
+ result = ar.dn;
+ }
+ return result;
+ }
+
+
+ /**
+ * Get authentication password registered for this url.
+ * @param ldapUrl the LDAP URL for which we want to get authentication
+ * password.
+ * @return the password of the authentication.
+ */
+ public synchronized String getAuthPassword(LDAPURL ldapUrl) {
+ String result;
+ String key = makeKeyFromLDAPUrl(ldapUrl);
+ AuthRecord ar = authTable.get(key);
+ if (ar == null) {
+ result = null;
+ }
+ else {
+ result = ar.password;
+ }
+ return result;
+ }
+
+
+ /**
+ * Disconnect the connection associated to a record
+ * and remove the record from connectionTable.
+ * @param cr the ConnectionRecord to remove.
+ */
+ private void disconnectAndRemove(ConnectionRecord cr)
+ {
+ String key = makeKeyFromRecord(cr);
+ connectionTable.remove(key);
+ try
+ {
+ cr.ctx.close();
+ }
+ catch (NamingException x)
+ {
+ // Bizarre. However it's not really a problem here.
+ }
+ }
+
+ /**
+ * Notifies the listeners that a referral authentication change happened.
+ *
+ */
+ private void notifyListeners()
+ {
+ for (ReferralAuthenticationListener listener : listeners)
+ {
+ listener.notifyAuthDataChanged();
+ }
+ }
+
+ /**
+ * Make the key string for an LDAP URL.
+ * @param url the LDAP URL.
+ * @return the key to be used in Maps for the provided LDAP URL.
+ */
+ private static String makeKeyFromLDAPUrl(LDAPURL url) {
+ String protocol = isSecureLDAPUrl(url) ? "LDAPS" : "LDAP";
+ return protocol + ":" + url.getHost() + ":" + url.getPort();
+ }
+
+
+ /**
+ * Make the key string for an connection record.
+ * @param rec the connection record.
+ * @return the key to be used in Maps for the provided connection record.
+ */
+ private static String makeKeyFromRecord(ConnectionRecord rec) {
+ String protocol = ConnectionUtils.isSSL(rec.ctx) ? "LDAPS" : "LDAP";
+ return protocol + ":" + ConnectionUtils.getHostName(rec.ctx) + ":" +
+ ConnectionUtils.getPort(rec.ctx);
+ }
+
+ /**
+ * Creates an LDAP Connection for a given LDAP URL and using the
+ * authentication of a AuthRecord.
+ * @param ldapUrl the LDAP URL.
+ * @param ar the authentication information.
+ * @return a connection.
+ * @throws NamingException if an error occurs when connecting.
+ */
+ private InitialLdapContext createLDAPConnection(LDAPURL ldapUrl,
+ AuthRecord ar) throws NamingException
+ {
+ InitialLdapContext ctx;
+
+ if (isSecureLDAPUrl(ldapUrl))
+ {
+ ctx = ConnectionUtils.createLdapsContext(ldapUrl.toString(), ar.dn,
+ ar.password, ConnectionUtils.getDefaultLDAPTimeout(), null,
+ getTrustManager() , getKeyManager());
+ }
+ else
+ {
+ ctx = ConnectionUtils.createLdapContext(ldapUrl.toString(), ar.dn,
+ ar.password, ConnectionUtils.getDefaultLDAPTimeout(), null);
+ }
+ return ctx;
+ }
+
+ /**
+ * Sets the ApplicationTrustManager used by the connection pool to
+ * connect to servers.
+ * @param trustManager the ApplicationTrustManager.
+ */
+ public void setTrustManager(ApplicationTrustManager trustManager)
+ {
+ this.trustManager = trustManager;
+ }
+
+ /**
+ * Returns the ApplicationTrustManager used by the connection pool to
+ * connect to servers.
+ * @return the ApplicationTrustManager used by the connection pool to
+ * connect to servers.
+ */
+ public ApplicationTrustManager getTrustManager()
+ {
+ return trustManager;
+ }
+
+ private KeyManager getKeyManager()
+ {
+// TODO: we should get it from ControlPanelInfo
+ return null;
+ }
+
+ /**
+ * Returns whether the URL is ldaps URL or not.
+ * @param url the URL.
+ * @return <CODE>true</CODE> if the LDAP URL is secure and <CODE>false</CODE>
+ * otherwise.
+ */
+ public static boolean isSecureLDAPUrl(LDAPURL url) {
+ return !LDAPURL.DEFAULT_SCHEME.equalsIgnoreCase(url.getScheme());
+ }
+
+
+ /**
+ * Make an url from the specified arguments.
+ * @param host the host.
+ * @param port the port.
+ * @param dn the dn.
+ * @param secure whether it is a secure URL or not.
+ * @return an LDAP URL from the specified arguments.
+ */
+ public static LDAPURL makeLDAPUrl(String host, int port, String dn,
+ boolean secure) {
+ return new LDAPURL(
+ secure ? "ldaps" : LDAPURL.DEFAULT_SCHEME,
+ host,
+ port,
+ dn,
+ null, // no attributes
+ SearchScope.BASE_OBJECT,
+ null, // No filter
+ null); // No extensions
+ }
+
+
+ /**
+ * Make an url from the specified arguments.
+ * @param ctx the connection to the server.
+ * @param dn the base DN of the URL.
+ * @return an LDAP URL from the specified arguments.
+ */
+ public static LDAPURL makeLDAPUrl(InitialLdapContext ctx, String dn) {
+ return new LDAPURL(
+ ConnectionUtils.isSSL(ctx) ? "ldaps" : LDAPURL.DEFAULT_SCHEME,
+ ConnectionUtils.getHostName(ctx),
+ ConnectionUtils.getPort(ctx),
+ dn,
+ null, // No attributes
+ SearchScope.BASE_OBJECT,
+ null,
+ null); // No filter
+ }
+
+
+ /**
+ * Make an url from the specified arguments.
+ * @param url an LDAP URL to use as base of the new LDAP URL.
+ * @param dn the base DN for the new LDAP URL.
+ * @return an LDAP URL from the specified arguments.
+ */
+ public static LDAPURL makeLDAPUrl(LDAPURL url, String dn) {
+ return new LDAPURL(
+ url.getScheme(),
+ url.getHost(),
+ url.getPort(),
+ dn,
+ null, // no attributes
+ SearchScope.BASE_OBJECT,
+ null, // No filter
+ null); // No extensions
+ }
+
+ /**
+ * Returns a collection of AuthRecord.
+ * @return a collection of AuthRecord.
+ */
+ Collection getRegisteredAuthentication() {
+ return authTable.values();
+ }
+}
+
+/**
+ * A struct representing authentication data.
+ */
+class AuthRecord {
+ LDAPURL ldapUrl;
+ String dn;
+ String password;
+}
+
+/**
+ * A struct representing an active connection.
+ */
+class ConnectionRecord {
+ InitialLdapContext ctx;
+ int counter;
+ boolean disconnectAfterUse;
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
new file mode 100644
index 0000000..d238712
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -0,0 +1,948 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.browser;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+import javax.naming.InterruptedNamingException;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.SizeLimitExceededException;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapName;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreeNode;
+
+import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.messages.AdminToolMessages;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.LDAPURL;
+import org.opends.server.types.RDN;
+
+/**
+ * The class that is in charge of doing the LDAP searches required to update a
+ * node: search the local entry, detect if it has children, retrieve the
+ * attributes required to render the node, etc.
+ */
+class NodeRefresher extends AbstractNodeTask {
+
+ /**
+ * The enumeration containing all the states the refresher can have.
+ *
+ */
+ enum State
+ {
+ /**
+ * The refresher is queued, but not started.
+ */
+ QUEUED,
+ /**
+ * The refresher is reading the local entry.
+ */
+ READING_LOCAL_ENTRY,
+ /**
+ * The refresher is solving a referral.
+ */
+ SOLVING_REFERRAL,
+ /**
+ * The refresher is detecting whether the entry has children or not.
+ */
+ DETECTING_CHILDREN,
+ /**
+ * The refresher is searching for the children of the entry.
+ */
+ SEARCHING_CHILDREN,
+ /**
+ * The refresher is finished.
+ */
+ FINISHED,
+ /**
+ * The refresher is cancelled.
+ */
+ CANCELLED,
+ /**
+ * The refresher has been interrupted.
+ */
+ INTERRUPTED,
+ /**
+ * The refresher has failed.
+ */
+ FAILED
+ };
+
+ BrowserController controller;
+ State state;
+ boolean recursive;
+
+ SearchResult localEntry;
+ SearchResult remoteEntry;
+ LDAPURL remoteUrl;
+ boolean isLeafNode;
+ ArrayList<SearchResult> childEntries = new ArrayList<SearchResult>();
+ boolean differential;
+ Exception exception;
+ Object exceptionArg;
+
+
+ /**
+ * The constructor of the refresher object.
+ * @param node the node on the tree to be updated.
+ * @param ctlr the BrowserController.
+ * @param localEntry the local entry corresponding to the node.
+ * @param recursive whether this task is recursive or not (children must be
+ * searched).
+ */
+ public NodeRefresher(BasicNode node, BrowserController ctlr,
+ SearchResult localEntry, boolean recursive) {
+ super(node);
+ controller = ctlr;
+ state = State.QUEUED;
+ this.recursive = recursive;
+
+ this.localEntry = localEntry;
+ }
+
+
+ /**
+ * Returns the local entry the refresher is handling.
+ * @return the local entry the refresher is handling.
+ */
+ public SearchResult getLocalEntry() {
+ return localEntry;
+ }
+
+
+ /**
+ * Returns the remote entry for the node. It will be <CODE>null</CODE> if
+ * the entry is not a referral.
+ * @return the remote entry for the node.
+ */
+ public SearchResult getRemoteEntry() {
+ return remoteEntry;
+ }
+
+ /**
+ * Returns the URL of the remote entry. It will be <CODE>null</CODE> if
+ * the entry is not a referral.
+ * @return the URL of the remote entry.
+ */
+ public LDAPURL getRemoteUrl() {
+ return remoteUrl;
+ }
+
+
+ /**
+ * Tells whether the node is a leaf or not.
+ * @return <CODE>true</CODE> if the node is a leaf and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isLeafNode() {
+ return isLeafNode;
+ }
+
+
+ /**
+ * Returns the child entries of the node.
+ * @return the child entries of the node.
+ */
+ public ArrayList<SearchResult> getChildEntries() {
+ return childEntries;
+ }
+
+ /**
+ * Returns whether this refresher object is working on differential mode or
+ * not.
+ * @return <CODE>true</CODE> if the refresher is working on differential
+ * mode and <CODE>false</CODE> otherwise.
+ */
+ public boolean isDifferential() {
+ return differential;
+ }
+
+ /**
+ * Returns the exception that occurred during the processing. It returns
+ * <CODE>null</CODE> if no exception occurred.
+ * @return the exception that occurred during the processing.
+ */
+ public Exception getException() {
+ return exception;
+ }
+
+
+ /**
+ * Returns the argument of the exception that occurred during the processing.
+ * It returns <CODE>null</CODE> if no exception occurred or if the exception
+ * has no arguments.
+ * @return the argument exception that occurred during the processing.
+ */
+ public Object getExceptionArg() {
+ return exceptionArg;
+ }
+
+
+ /**
+ * Returns the displayed entry in the browser. This depends on the
+ * visualization options in the BrowserController.
+ * @return the remote entry if the entry is a referral and the
+ * BrowserController is following referrals and the local entry otherwise.
+ */
+ public SearchResult getDisplayedEntry() {
+ SearchResult result;
+ if (controller.getFollowReferrals() && (remoteEntry != null)) {
+ result = remoteEntry;
+ }
+ else {
+ result = localEntry;
+ }
+ return result;
+ }
+
+ /**
+ * Returns the LDAP URL of the displayed entry in the browser. This depends
+ * on the visualization options in the BrowserController.
+ * @return the remote entry LDAP URL if the entry is a referral and the
+ * BrowserController is following referrals and the local entry LDAP URL
+ * otherwise.
+ */
+ public LDAPURL getDisplayedUrl() {
+ LDAPURL result;
+ if (controller.getFollowReferrals() && (remoteUrl != null)) {
+ result = remoteUrl;
+ }
+ else {
+ result = controller.findUrlForLocalEntry(getNode());
+ }
+ return result;
+ }
+
+ /**
+ * Returns whether the refresh is over or not.
+ * @return <CODE>true</CODE> if the refresh is over and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isInFinalState() {
+ return (
+ (state == State.FINISHED) ||
+ (state == State.CANCELLED) ||
+ (state == State.FAILED) ||
+ (state == State.INTERRUPTED)
+ );
+ }
+
+ /**
+ * The method that actually does the refresh.
+ */
+ public void run() {
+ final BasicNode node = getNode();
+
+ try {
+ boolean checkExpand = false;
+ if (localEntry == null) {
+ changeStateTo(State.READING_LOCAL_ENTRY);
+ runReadLocalEntry();
+ }
+ if (controller.getFollowReferrals() && isReferralEntry(localEntry)) {
+ changeStateTo(State.SOLVING_REFERRAL);
+ runSolveReferral();
+ }
+ if (node.isLeaf()) {
+ changeStateTo(State.DETECTING_CHILDREN);
+ runDetectChildren();
+ }
+ if (controller.nodeIsExpanded(node) && recursive) {
+ changeStateTo(State.SEARCHING_CHILDREN);
+ runSearchChildren();
+ /* If the node is not expanded, we have to refresh its children
+ when we expand it */
+ } else if (recursive && (!node.isLeaf() || !isLeafNode)) {
+ node.setRefreshNeededOnExpansion(true);
+ checkExpand = true;
+ }
+ changeStateTo(State.FINISHED);
+ if (checkExpand && mustAutomaticallyExpand(node))
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ controller.expandNode(node);
+ }
+ });
+ }
+ }
+ catch (NamingException ne)
+ {
+ exception = ne;
+ exceptionArg = null;
+ }
+ catch(SearchAbandonException x) {
+ exception = x.getException();
+ exceptionArg = x.getArg();
+ try {
+ changeStateTo(x.getState());
+ }
+ catch(SearchAbandonException xx) {
+ // We've done all what we can...
+ }
+ }
+ }
+
+ /**
+ * Tells whether a custom filter is being used (specified by the user in the
+ * browser dialog) or not.
+ * @return <CODE>true</CODE> if a custom filter is being used and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean useCustomFilter()
+ {
+ return !controller.getFilter().equals(BrowserController.ALL_OBJECTS_FILTER);
+ }
+
+ /**
+ * Performs the search in the case the user specified a custom filter.
+ * @param node the parent node we perform the search from.
+ * @param ctx the connection to be used.
+ * @throws NamingException if a problem occurred.
+ */
+ private void searchForCustomFilter(BasicNode node, InitialLdapContext ctx)
+ throws NamingException
+ {
+ SearchControls ctls = controller.getBasicSearchControls();
+ ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ ctls.setReturningAttributes(new String[]{"dn"});
+ ctls.setCountLimit(1);
+ NamingEnumeration<SearchResult> s = ctx.search(new LdapName(node.getDN()),
+ controller.getFilter(),
+ ctls);
+ if (!s.hasMoreElements())
+ {
+ throw new NameNotFoundException("Entry "+node.getDN()+
+ " does not verify filter "+controller.getFilter());
+ }
+ }
+
+ /**
+ * Performs the search in the case the user specified a custom filter.
+ * @param dn the parent DN we perform the search from.
+ * @param ctx the connection to be used.
+ * @throws NamingException if a problem occurred.
+ */
+ private void searchForCustomFilter(String dn, InitialLdapContext ctx)
+ throws NamingException
+ {
+ SearchControls ctls = controller.getBasicSearchControls();
+ ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ ctls.setReturningAttributes(new String[]{});
+ ctls.setCountLimit(1);
+ NamingEnumeration<SearchResult> s = ctx.search(new LdapName(dn),
+ controller.getFilter(),
+ ctls);
+ if (!s.hasMoreElements())
+ {
+ throw new NameNotFoundException("Entry "+dn+
+ " does not verify filter "+controller.getFilter());
+ }
+ }
+
+ /**
+ * Read the local entry associated to the current node.
+ */
+ private void runReadLocalEntry() throws SearchAbandonException {
+ BasicNode node = getNode();
+ InitialLdapContext ctx = null;
+
+ try {
+ ctx = controller.findConnectionForLocalEntry(node);
+
+ if (useCustomFilter())
+ {
+ // Check that the entry verifies the filter
+ searchForCustomFilter(node, ctx);
+ }
+
+ SearchControls ctls = controller.getBasicSearchControls();
+ ctls.setReturningAttributes(controller.getAttrsForRedSearch());
+ ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
+
+ NamingEnumeration<SearchResult> s = ctx.search(new LdapName(node.getDN()),
+ controller.getObjectSearchFilter(),
+ ctls);
+ if (s.hasMore())
+ {
+ localEntry = s.next();
+ localEntry.setName(node.getDN());
+ }
+ if (localEntry == null) {
+ /* Not enough rights to read the entry or the entry simply does not
+ exist */
+ throw new NameNotFoundException("Can't find entry: "+node.getDN());
+ }
+ throwAbandonIfNeeded(null);
+ }
+ catch(NamingException x) {
+ throwAbandonIfNeeded(x);
+ }
+ finally {
+ if (ctx != null) {
+ controller.releaseLDAPConnection(ctx);
+ }
+ }
+ }
+
+ /**
+ * Solve the referral associated to the current node.
+ * This routine assumes that node.getReferral() is non null
+ * and that BrowserController.getFollowReferrals() == true.
+ * It also protect the browser against looping referrals by
+ * limiting the number of hops.
+ * @throws SearchAbandonException if the hop count limit for referrals has
+ * been exceeded.
+ * @throws NamingException if an error occurred searching the entry.
+ */
+ private void runSolveReferral()
+ throws SearchAbandonException, NamingException {
+ int hopCount = 0;
+ String[] referral = getNode().getReferral();
+ while ((referral != null) && (hopCount < 10)) {
+ readRemoteEntry(referral);
+ referral = BrowserController.getReferral(remoteEntry);
+ hopCount++;
+ }
+ if (referral != null) { // -> hopCount has reached the max
+ throwAbandonIfNeeded(new ReferralLimitExceededException(
+ AdminToolMessages.ERR_REFERRAL_LIMIT_EXCEEDED.get(hopCount)));
+ }
+ }
+
+ /**
+ * Searches for the remote entry.
+ * @param referral the referral list to be used to search the remote entry.
+ * @throws SearchAbandonException if an error occurs.
+ */
+ private void readRemoteEntry(String[] referral)
+ throws SearchAbandonException {
+ LDAPConnectionPool connectionPool = controller.getConnectionPool();
+ LDAPURL url = null;
+ SearchResult entry = null;
+ String remoteDn = null;
+ Exception lastException = null;
+ Object lastExceptionArg = null;
+
+ int i = 0;
+ while ((i < referral.length) && (entry == null)) {
+ InitialLdapContext ctx = null;
+ try {
+ url = LDAPURL.decode(referral[i], false);
+ ctx = connectionPool.getConnection(url);
+ remoteDn = url.getRawBaseDN();
+ if ((remoteDn == null) ||
+ remoteDn.equals("")) {
+ /* The referral has not a target DN specified: we
+ have to use the DN of the entry that contains the
+ referral... */
+ if (remoteEntry != null) {
+ remoteDn = remoteEntry.getName();
+ } else {
+ remoteDn = localEntry.getName();
+ }
+ /* We have to recreate the url including the target DN
+ we are using */
+ url = new LDAPURL(url.getScheme(), url.getHost(), url.getPort(),
+ remoteDn, url.getAttributes(), url.getScope(), url.getRawFilter(),
+ url.getExtensions());
+ }
+ if (useCustomFilter())
+ {
+ // Check that the entry verifies the filter
+ searchForCustomFilter(remoteDn, ctx);
+ }
+ SearchControls ctls = controller.getBasicSearchControls();
+ ctls.setReturningAttributes(controller.getAttrsForBlackSearch());
+ ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
+ NamingEnumeration<SearchResult> sr = ctx.search(remoteDn,
+ controller.getObjectSearchFilter(),
+ ctls);
+ if (sr.hasMore())
+ {
+ entry = sr.next();
+ entry.setName(remoteDn);
+ }
+ throwAbandonIfNeeded(null);
+ }
+ catch(InterruptedNamingException x) {
+ throwAbandonIfNeeded(x);
+ }
+ catch(NamingException x) {
+ lastException = x;
+ lastExceptionArg = referral[i];
+ }
+ catch(DirectoryException de) {
+ lastException = de;
+ lastExceptionArg = referral[i];
+ }
+ finally {
+ if (ctx != null) {
+ connectionPool.releaseConnection(ctx);
+ }
+ }
+ i = i + 1;
+ }
+ if (entry == null) {
+ throw new SearchAbandonException(
+ State.FAILED, lastException, lastExceptionArg);
+ }
+ else {
+ remoteUrl = url;
+ remoteEntry = entry;
+ }
+ }
+
+ /**
+ * Tells whether the provided node must be automatically expanded or not.
+ * This is used when the user provides a custom filter, in this case we
+ * expand automatically the tree.
+ * @param node the node to analyze.
+ * @return <CODE>true</CODE> if the node must be expanded and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean mustAutomaticallyExpand(BasicNode node)
+ {
+ boolean mustAutomaticallyExpand = false;
+ if (controller.isAutomaticExpand())
+ {
+ // Limit the number of expansion levels to 3
+ int nLevels = 0;
+ TreeNode parent = node;
+ while (parent != null)
+ {
+ nLevels ++;
+ parent = parent.getParent();
+ }
+ mustAutomaticallyExpand = nLevels <= 4;
+ }
+ return mustAutomaticallyExpand;
+ }
+
+ /**
+ * Detects whether the entries has children or not.
+ * @throws SearchAbandonException if the search was abandoned.
+ * @throws NamingException if an error during the search occurred.
+ */
+ private void runDetectChildren()
+ throws SearchAbandonException, NamingException {
+ if (controller.isShowContainerOnly() || !isNumSubOrdinatesUsable()) {
+ runDetectChildrenManually();
+ }
+ else {
+ SearchResult entry = getDisplayedEntry();
+ isLeafNode = (BrowserController.getNumSubOrdinates(entry) == 0);
+ }
+ }
+
+
+ /**
+ * Detects whether the entry has children by performing a search using the
+ * entry as base DN.
+ * @throws SearchAbandonException if there is an error.
+ */
+ private void runDetectChildrenManually() throws SearchAbandonException {
+ BasicNode parentNode = getNode();
+ InitialLdapContext ctx = null;
+ NamingEnumeration<SearchResult> searchResults = null;
+
+ try {
+ // We set the search constraints so that only one entry is returned.
+ // It's enough to know if the entry has children or not.
+ SearchControls ctls = controller.getBasicSearchControls();
+ ctls.setCountLimit(1);
+ String[] attrs = {"dn"};
+ ctls.setReturningAttributes(attrs);
+ if (useCustomFilter())
+ {
+ ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ }
+ else
+ {
+ ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
+ }
+ // Send an LDAP search
+ ctx = controller.findConnectionForDisplayedEntry(parentNode);
+ searchResults = ctx.search(
+ new LdapName(controller.findBaseDNForChildEntries(parentNode)),
+ controller.getChildSearchFilter(),
+ ctls);
+
+ throwAbandonIfNeeded(null);
+
+ if (searchResults.hasMoreElements()) { // May be parentNode has children
+ isLeafNode = false;
+ }
+ else { // parentNode has no children
+ isLeafNode = true;
+ }
+ }
+ catch (NamingException x) {
+ throwAbandonIfNeeded(x);
+ }
+ finally {
+ if (ctx != null) {
+ controller.releaseLDAPConnection(ctx);
+ }
+ }
+ }
+
+
+ // NUMSUBORDINATE HACK
+ // numsubordinates is not usable if the displayed entry
+ // is listed in in the hacker.
+ // Note: *usable* means *usable for detecting children presence*.
+ private boolean isNumSubOrdinatesUsable() throws NamingException {
+ boolean result;
+ SearchResult entry = getDisplayedEntry();
+ int numSubOrdinates = BrowserController.getNumSubOrdinates(entry);
+ if (numSubOrdinates == 0) { // We must check
+ LDAPURL url = getDisplayedUrl();
+ if (controller.getNumSubordinateHacker().contains(url)) {
+ // The numSubOrdinate we have is unreliable.
+ result = false;
+// System.out.println("numSubOrdinates of " + url +
+// " is not reliable");
+ }
+ else {
+ result = true;
+ }
+ }
+ else { // Other values are usable
+ result = true;
+ }
+ return result;
+ }
+
+
+
+ /**
+ * Searchs for the children.
+ * @throws SearchAbandonException if an error occurs.
+ */
+ private void runSearchChildren() throws SearchAbandonException {
+ InitialLdapContext ctx = null;
+ BasicNode parentNode = getNode();
+ parentNode.setSizeLimitReached(false);
+ try {
+ // Send an LDAP search
+ SearchControls ctls = controller.getBasicSearchControls();
+ if (useCustomFilter())
+ {
+ ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ }
+ else
+ {
+ ctls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
+ }
+ ctls.setReturningAttributes(controller.getAttrsForRedSearch());
+ ctx = controller.findConnectionForDisplayedEntry(parentNode);
+ String parentDn = controller.findBaseDNForChildEntries(parentNode);
+ int parentComponents;
+ try
+ {
+ DN dn = DN.decode(parentDn);
+ parentComponents = dn.getNumComponents();
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Error decoding dn: "+parentDn+" . "+t,
+ t);
+ }
+ NamingEnumeration<SearchResult> entries = ctx.search(
+ new LdapName(parentDn),
+ controller.getChildSearchFilter(),
+ ctls);
+
+ while (entries.hasMore())
+ {
+ SearchResult r = entries.next();
+ String name;
+ if (r.getName().length() == 0)
+ {
+ continue;
+ }
+ else
+ {
+ name = r.getName()+","+parentDn;
+ }
+ boolean add = false;
+ if (useCustomFilter())
+ {
+ // Check that is an inmediate child: use a faster method by just
+ // comparing the number of components.
+ DN dn = null;
+ try
+ {
+ dn = DN.decode(name);
+ add = dn.getNumComponents() == parentComponents + 1;
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Error decoding dns: "+t, t);
+ }
+
+ if (!add)
+ {
+ // Is not a direct child. Check if the parent has been added,
+ // if it is the case, do not add the parent. If is not the case,
+ // search for the parent and add it.
+ RDN[] rdns = new RDN[parentComponents + 1];
+ int diff = dn.getNumComponents() - rdns.length;
+ for (int i=0; i < rdns.length; i++)
+ {
+ rdns[i] = dn.getRDN(i + diff);
+ }
+ final DN parentToAddDN = new DN(rdns);
+ boolean mustAddParent = true;
+ for (SearchResult addedEntry : childEntries)
+ {
+ try
+ {
+ DN addedDN = DN.decode(addedEntry.getName());
+ if (addedDN.equals(parentToAddDN))
+ {
+ mustAddParent = false;
+ break;
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Error decoding dn: "+
+ addedEntry.getName()+" . "+t, t);
+ }
+ }
+ if (mustAddParent)
+ {
+ final boolean resultValue[] = {true};
+ // Check the children added to the tree
+ try
+ {
+ SwingUtilities.invokeAndWait(new Runnable()
+ {
+ public void run()
+ {
+ for (int i=0; i<getNode().getChildCount(); i++)
+ {
+ BasicNode node = (BasicNode)getNode().getChildAt(i);
+ try
+ {
+ DN dn = DN.decode(node.getDN());
+ if (dn.equals(parentToAddDN))
+ {
+ resultValue[0] = false;
+ break;
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Error decoding dn: "+
+ node.getDN()+" . "+t, t);
+ }
+ }
+ }
+ });
+ }
+ catch (Throwable t)
+ {
+ // Ignore
+ }
+ mustAddParent = resultValue[0];
+ }
+ if (mustAddParent)
+ {
+ SearchResult parentResult = searchManuallyEntry(ctx,
+ parentToAddDN.toString());
+ childEntries.add(parentResult);
+ }
+ }
+ }
+ else
+ {
+ add = true;
+ }
+ if (add)
+ {
+ r.setName(name);
+ childEntries.add(r);
+ // Time to time we update the display
+ if (childEntries.size() >= 20) {
+ changeStateTo(State.SEARCHING_CHILDREN);
+ childEntries.clear();
+ }
+ }
+ throwAbandonIfNeeded(null);
+ }
+ }
+ catch (SizeLimitExceededException slee)
+ {
+ parentNode.setSizeLimitReached(true);
+ }
+ catch (NamingException x) {
+ throwAbandonIfNeeded(x);
+ }
+ finally {
+ if (ctx != null)
+ {
+ controller.releaseLDAPConnection(ctx);
+ }
+ }
+ }
+
+ /**
+ * Returns the entry for the given dn.
+ * The code assumes that the request controls are set in the connection.
+ * @param ctx the connection to be used.
+ * @param dn the DN of the entry to be searched.
+ * @throws NamingException if an error occurs.
+ */
+ private SearchResult searchManuallyEntry(InitialLdapContext ctx, String dn)
+ throws NamingException
+ {
+ SearchResult sr = null;
+// Send an LDAP search
+ SearchControls ctls = controller.getBasicSearchControls();
+ ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
+ ctls.setReturningAttributes(controller.getAttrsForRedSearch());
+ NamingEnumeration<SearchResult> entries = ctx.search(
+ new LdapName(dn),
+ controller.getObjectSearchFilter(),
+ ctls);
+
+ while (entries.hasMore())
+ {
+ sr = entries.next();
+ sr.setName(dn);
+ }
+ return sr;
+ }
+
+
+ /**
+ * Utilities
+ */
+
+
+ /**
+ * Change the state of the task and inform the BrowserController.
+ * @param newState the new state for the refresher.
+ */
+ private void changeStateTo(State newState) throws SearchAbandonException {
+ State oldState = state;
+ state = newState;
+ try {
+ controller.invokeRefreshTaskDidProgress(this, oldState, newState);
+ }
+ catch(InterruptedException x) {
+ throwAbandonIfNeeded(x);
+ }
+ }
+
+
+ /**
+ * Transform an exception into a TaskAbandonException.
+ * If no exception is passed, the routine checks if the task has
+ * been cancelled and throws an TaskAbandonException accordingly.
+ * @param x the exception.
+ * @throws SearchAbandonException if the task/refresher must be abandoned.
+ */
+ private void throwAbandonIfNeeded(Exception x) throws SearchAbandonException {
+ SearchAbandonException tax = null;
+ if (x != null) {
+ if ((x instanceof InterruptedException) ||
+ (x instanceof InterruptedNamingException)) {
+ tax = new SearchAbandonException(State.INTERRUPTED, x, null);
+ }
+ else {
+ tax = new SearchAbandonException(State.FAILED, x, null);
+ }
+ }
+ else if (isCancelled()) {
+ tax = new SearchAbandonException(State.CANCELLED, null, null);
+ }
+ if (tax != null) {
+ throw tax;
+ }
+ }
+
+
+ /**
+ * DEBUG : Dump the state of the task.
+ */
+ void dump() {
+ System.out.println("=============");
+ System.out.println(" node: " + getNode().getDN());
+ System.out.println(" recursive: " + recursive);
+ System.out.println(" differential: " + differential);
+
+ System.out.println(" state: " + state);
+ System.out.println(" localEntry: " + localEntry);
+ System.out.println(" remoteEntry: " + remoteEntry);
+ System.out.println(" remoteUrl: " + remoteUrl);
+ System.out.println(" isLeafNode: " + isLeafNode);
+ System.out.println(" exception: " + exception);
+ System.out.println(" exceptionArg: " + exceptionArg);
+ System.out.println("=============");
+ }
+
+
+ /**
+ * Checks that the entry's objectClass contains 'referral' and that the
+ * attribute 'ref' is present.
+ * @param entry the search result.
+ * @return <CODE>true</CODE> if the entry's objectClass contains 'referral'
+ * and the attribute 'ref' is present and <CODE>false</CODE> otherwise.
+ * @throws NamingException if an error occurs.
+ */
+ static boolean isReferralEntry(SearchResult entry) throws NamingException {
+ boolean result = false;
+ Set<String> ocValues = ConnectionUtils.getValues(entry, "objectClass");
+ if (ocValues != null) {
+ for (String value : ocValues)
+ {
+ boolean isReferral = value.equalsIgnoreCase("referral");
+
+ if (isReferral) {
+ result = (ConnectionUtils.getFirstValue(entry, "ref") != null);
+ break;
+ }
+ }
+ }
+ return result;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
new file mode 100644
index 0000000..4e36656
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
@@ -0,0 +1,246 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.browser;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+
+/**
+ * This is the class that contains all the AbstractNodeTask objects that
+ * are running or that are waiting to be executed. Basically BrowserController
+ * will listen for events and will create a AbstractNodeTask object that
+ * will add to this queue in order it to be asynchronously executed.
+ *
+ * The queue will basically start a certain number of threads and this threads
+ * will "consume" the AbstractNodeTask objects that are added to this queue.
+ *
+ */
+class NodeSearcherQueue implements Runnable {
+
+ private String name;
+ private ArrayList<AbstractNodeTask> waitingQueue =
+ new ArrayList<AbstractNodeTask>();
+ private HashMap<BasicNode, AbstractNodeTask> workingList =
+ new HashMap<BasicNode, AbstractNodeTask>();
+ private HashMap<BasicNode, BasicNode> cancelList =
+ new HashMap<BasicNode, BasicNode>();
+ private ThreadGroup threadGroup;
+
+
+ /**
+ * Construct a queue with the specified name.
+ * The name is for debugging purpose only.
+ * @param name the name of the queue.
+ * @param threadCount then number of threads that the queue will use.
+ */
+ public NodeSearcherQueue(String name, int threadCount) {
+ this.name = name;
+ threadGroup = new ThreadGroup(name);
+ for (int i = 0; i < threadCount; i++) {
+ Thread t = new Thread(threadGroup, this, name + "[" + i + "]");
+ t.setPriority(Thread.MIN_PRIORITY);
+ t.start();
+ }
+ }
+
+ /**
+ * Returns the name of this queue.
+ * @return the name of this queue.
+ */
+ public String getName() {
+ return name;
+ }
+
+
+ /**
+ * Shutdown this queue.
+ * All the associated threads are stopped.
+ */
+ public void shutdown() {
+ threadGroup.interrupt();
+ }
+
+
+ /**
+ * Add an object in this queue.
+ * If the object is already in the waiting sub-queue, it is silently ignored.
+ * @param nodeTask the task to be added.
+ */
+ public synchronized void queue(AbstractNodeTask nodeTask) {
+ if (nodeTask == null) throw new IllegalArgumentException("null argument");
+ waitingQueue.add(nodeTask);
+ notify();
+// System.out.println("Queued " + nodeTask + " in " + _name);
+ }
+
+
+ /**
+ * Cancel an object.
+ * If the object is in the waiting sub-queue, it's simply removed from.
+ * If the object is in the working subqueue, it's kept in place but marked as
+ * cancelled. It's the responsibility of the consumer to detect that and flush
+ * the object asap.
+ * @param node the node whose associated tasks must be cancelled.
+ */
+ public synchronized void cancelForNode(BasicNode node) {
+ if (node == null) throw new IllegalArgumentException("null argument");
+ // Remove all the associated tasks from the waiting queue
+ for (int i = waitingQueue.size()-1; i >= 0; i--) {
+ AbstractNodeTask task = waitingQueue.get(i);
+ if (task.getNode() == node) {
+ waitingQueue.remove(i);
+ }
+ }
+ // Mark the on-going task as cancelled
+ AbstractNodeTask task = workingList.get(node);
+ if (task != null) {
+ cancelList.put(node, node);
+ task.cancel();
+ }
+ notify();
+ }
+
+
+ /**
+ * Cancel all the object from this queue.
+ */
+ public synchronized void cancelAll() {
+ waitingQueue.clear();
+ for (BasicNode node : workingList.keySet())
+ {
+ AbstractNodeTask task = workingList.get(node);
+ cancelList.put(node, node);
+ task.cancel();
+ }
+ }
+
+
+
+ /**
+ * Fetch an object from this queue.
+ * The returned object is moved from the waiting sub-queue to the working
+ * sub-queue.
+ * @return the next object to be handled.
+ * @throws InterruptedException if the call to fetch was interrupted by
+ * another thread.
+ */
+ private synchronized AbstractNodeTask fetch() throws InterruptedException {
+ AbstractNodeTask result = null;
+
+ // Get the first obj from waitingQueue which is
+ // not in workingList yet.
+ do {
+ int waitingSize = waitingQueue.size();
+ int i = 0;
+ while ((i < waitingSize) && !canBeFetched(i)) {
+ i++;
+ }
+ if (i == waitingSize) { // Nothing found
+ wait();
+ }
+ else {
+ result = waitingQueue.get(i);
+ waitingQueue.remove(i);
+ workingList.put(result.getNode(), result);
+ }
+ }
+ while (result == null);
+
+// System.out.println("Fetched " + result + " from " + _name);
+
+ return result;
+ }
+
+ /**
+ * Whether the task in the waiting queue i can be fetched.
+ * @param i the index of the task.
+ * @return <CODE>true</CODE> if the task can be fetched and <CODE>false</CODE>
+ * otherwise.
+ */
+ private boolean canBeFetched(int i) {
+ AbstractNodeTask task = waitingQueue.get(i);
+ return workingList.get(task.getNode()) == null;
+ }
+
+
+ /**
+ * Flush an object from this queue.
+ * The object is removed from the working sub-queue.
+ * @param task the task to be flushed.
+ */
+ private synchronized void flush(AbstractNodeTask task) {
+ if (task == null) throw new IllegalArgumentException("null argument");
+ workingList.remove(task.getNode());
+ cancelList.remove(task.getNode());
+ notify();
+// System.out.println("Flushed " + task + " from " + _name);
+ }
+
+
+ /**
+ * Return the number of object in this queue (i.e. the number of object in
+ * both sub-queues).
+ * @return the number of objects in this queue.
+ */
+ public int size() {
+ return waitingQueue.size() + workingList.size();
+ }
+
+
+ /**
+ * The method that is executed by the different threads that are created in
+ * the NodeSearchQueue constructor.
+ * Basically this method fetches objects from the waiting queue and runs them.
+ */
+ public void run() {
+ boolean interrupted = false;
+
+ while (!interrupted) {
+ try {
+ // Fetch and process a node also
+ // taking care of update events
+ AbstractNodeTask task = fetch();
+ task.run();
+ flush(task);
+ }
+ catch(InterruptedException x) {
+ interrupted = true;
+ }
+ catch(Exception x) {
+ // At this level, either it's an interruption
+ // either it's a bug...
+ if (! (x instanceof InterruptedException)) {
+ x.printStackTrace();
+ }
+ }
+ }
+ }
+
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/ReferralLimitExceededException.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/ReferralLimitExceededException.java
new file mode 100644
index 0000000..4763e0a
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/ReferralLimitExceededException.java
@@ -0,0 +1,51 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.browser;
+
+import javax.naming.NamingException;
+
+import org.opends.messages.Message;
+
+/**
+ * The exception that is launched when we exceed the maximum number of hops
+ * following referrals.
+ *
+ */
+class ReferralLimitExceededException extends NamingException
+{
+ private static final long serialVersionUID = -5640515839144837865L;
+
+ /**
+ * Constructor of the exception.
+ * @param message the message associated with the exception.
+ */
+ public ReferralLimitExceededException(Message message)
+ {
+ super(message.toString());
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/SearchAbandonException.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/SearchAbandonException.java
new file mode 100644
index 0000000..7a30ec4
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/SearchAbandonException.java
@@ -0,0 +1,77 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.browser;
+
+/**
+ * The exception used by the NodeRefresher when the refresh process is
+ * cancelled, interrupted or something failed.
+ *
+ */
+class SearchAbandonException extends Exception {
+
+ private static final long serialVersionUID = 7768798649278383859L;
+ private NodeRefresher.State state;
+ private Exception x;
+ private Object arg;
+
+ /**
+ * The constructor for the class.
+ * @param state the state in which the refresher is.
+ * @param x the exception.
+ * @param arg the argument for the exception.
+ */
+ SearchAbandonException(NodeRefresher.State state, Exception x, Object arg) {
+ this.state = state;
+ this.x = x;
+ this.arg = arg;
+ }
+
+ /**
+ * Returns the state the refresher was when the exception occurred.
+ * @return the state the refresher was when the exception occurred.
+ */
+ NodeRefresher.State getState() {
+ return state;
+ }
+
+ /**
+ * Returns the exception.
+ * @return the exception.
+ */
+ Exception getException() {
+ return x;
+ }
+
+ /**
+ * Returns the argument of the exception.
+ * @return the argument of the exception.
+ */
+ Object getArg() {
+ return arg;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/package-info.java
new file mode 100644
index 0000000..657f2d3
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/package-info.java
@@ -0,0 +1,35 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Defines the main classes that are you used by the entry browser of the
+ * Control Panel. This includes the main browser class (BrowserController),
+ * the connection pool (LDAPConnectionPool), specific exceptions, etc.
+ * */
+package org.opends.guitools.controlpanel.browser;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
new file mode 100644
index 0000000..d92db88
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
@@ -0,0 +1,82 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+/**
+ * Abstract class used to describe the configuration of an index.
+ *
+ */
+public abstract class AbstractIndexDescriptor implements Comparable
+{
+ private String name;
+ private BackendDescriptor backend;
+ /**
+ * Constructor.
+ * @param name the name of the index.
+ * @param backend the backend where the index is defined.
+ */
+ protected AbstractIndexDescriptor(String name, BackendDescriptor backend)
+ {
+ this.name = name;
+ this.backend = backend;
+ }
+
+ /**
+ * Returns the name of the index.
+ * @return the name of the index.
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Returns the backend where the index is defined.
+ * @return the backend where the index is defined.
+ */
+ public BackendDescriptor getBackend()
+ {
+ return backend;
+ }
+
+ /**
+ * Sets which is the backend where the index is defined.
+ * @param backend the backend where the index is defined.
+ */
+ public void setBackend(BackendDescriptor backend)
+ {
+ this.backend = backend;
+ recalculateHashCode();
+ }
+
+ /**
+ * Method used to minimize the times the hashcode is calculated.
+ *
+ */
+ protected abstract void recalculateHashCode();
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
new file mode 100644
index 0000000..9ad3485
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
@@ -0,0 +1,250 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.opends.messages.AdminToolMessages;
+import org.opends.messages.Message;
+
+/**
+ * Table Model used to store information about indexes. It is used basically
+ * by the tables that appear on the right side of the 'Manage Indexes...'
+ * dialog when the user clicks on 'Indexes' or 'VLV Indexes'.
+ *
+ */
+public abstract class AbstractIndexTableModel extends SortableTableModel
+implements Comparator<AbstractIndexDescriptor>
+{
+ private Set<AbstractIndexDescriptor> data =
+ new HashSet<AbstractIndexDescriptor>();
+ private ArrayList<String[]> dataArray =
+ new ArrayList<String[]>();
+ private ArrayList<AbstractIndexDescriptor> indexArray =
+ new ArrayList<AbstractIndexDescriptor>();
+ private final String[] COLUMN_NAMES = getColumnNames();
+ /**
+ * The sort column of the table.
+ */
+ protected int sortColumn = 0;
+ /**
+ * Whether the sorting is ascending or descending.
+ */
+ protected boolean sortAscending = true;
+ private ControlPanelInfo info;
+
+
+ /**
+ * Sets the data for this table model.
+ * @param newData the data for this table model.
+ * @param info the control panel info.
+ */
+ public void setData(Set<AbstractIndexDescriptor> newData,
+ ControlPanelInfo info)
+ {
+ this.info = info;
+ if (!newData.equals(data))
+ {
+ data.clear();
+ data.addAll(newData);
+ updateDataArray();
+ fireTableDataChanged();
+ }
+ }
+
+ /**
+ * Updates the table model contents and sorts its contents depending on the
+ * sort options set by the user.
+ */
+ public void forceResort()
+ {
+ updateDataArray();
+ fireTableDataChanged();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getColumnCount()
+ {
+ return COLUMN_NAMES.length;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getRowCount()
+ {
+ return dataArray.size();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object getValueAt(int row, int col)
+ {
+ return dataArray.get(row)[col];
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getColumnName(int col) {
+ return COLUMN_NAMES[col];
+ }
+
+
+ /**
+ * Returns whether the sort is ascending or descending.
+ * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isSortAscending()
+ {
+ return sortAscending;
+ }
+
+ /**
+ * Sets whether to sort ascending of descending.
+ * @param sortAscending whether to sort ascending or descending.
+ */
+ public void setSortAscending(boolean sortAscending)
+ {
+ this.sortAscending = sortAscending;
+ }
+
+ /**
+ * Returns the column index used to sort.
+ * @return the column index used to sort.
+ */
+ public int getSortColumn()
+ {
+ return sortColumn;
+ }
+
+ /**
+ * Sets the column index used to sort.
+ * @param sortColumn column index used to sort..
+ */
+ public void setSortColumn(int sortColumn)
+ {
+ this.sortColumn = sortColumn;
+ }
+
+ /**
+ * Returns the index in the specified row.
+ * @param row the row.
+ * @return the index in the specified row.
+ */
+ public AbstractIndexDescriptor getIndexAt(int row)
+ {
+ return indexArray.get(row);
+ }
+
+ /**
+ * Returns the message to be displayed in the cell if an index must be
+ * rebuilt.
+ * @param index the index to be analyzed.
+ * @return the message to be displayed in the cell if an index must be
+ * rebuilt.
+ */
+ protected Message getRebuildRequiredString(AbstractIndexDescriptor index)
+ {
+ if (info.mustReindex(index))
+ {
+ return AdminToolMessages.INFO_INDEX_MUST_BE_REBUILT_CELL_VALUE.get();
+ }
+ else
+ {
+ return AdminToolMessages.INFO_INDEX_MUST_NOT_BE_REBUILT_CELL_VALUE.get();
+ }
+ }
+
+ /**
+ * Compares the names of the two indexes.
+ * @param i1 the first index.
+ * @param i2 the second index.
+ * @return the alphabetical comparison of the names of both indexes.
+ */
+ protected int compareNames(AbstractIndexDescriptor i1,
+ AbstractIndexDescriptor i2)
+ {
+ return i1.getName().compareTo(i2.getName());
+ }
+
+ /**
+ * Compares the rebuild messages for the two indexes.
+ * @param i1 the first index.
+ * @param i2 the second index.
+ * @return the alphabetical comparison of the rebuild required message of both
+ * indexes.
+ */
+ protected int compareRebuildRequired(AbstractIndexDescriptor i1,
+ AbstractIndexDescriptor i2)
+ {
+ return getRebuildRequiredString(i1).compareTo(getRebuildRequiredString(i2));
+ }
+
+ /**
+ * Updates the array data. This includes resorting it.
+ */
+ private void updateDataArray()
+ {
+ TreeSet<AbstractIndexDescriptor> sortedSet =
+ new TreeSet<AbstractIndexDescriptor>(this);
+ sortedSet.addAll(data);
+ dataArray.clear();
+ indexArray.clear();
+ for (AbstractIndexDescriptor index : sortedSet)
+ {
+ String[] s = getLine(index);
+ dataArray.add(s);
+ indexArray.add(index);
+ }
+ }
+
+
+ /**
+ * Returns the column names of the table.
+ * @return the column names of the table.
+ */
+ protected abstract String[] getColumnNames();
+ /**
+ * Returns the different cell values for a given index in a String array.
+ * @param index the index.
+ * @return the different cell values for a given index in a String array.
+ */
+ protected abstract String[] getLine(AbstractIndexDescriptor index);
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/Action.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/Action.java
new file mode 100644
index 0000000..9d6ec9e
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/Action.java
@@ -0,0 +1,83 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import org.opends.guitools.controlpanel.ui.StatusGenericPanel;
+import org.opends.messages.Message;
+
+/**
+ * The class that is used by the different action buttons on the left side of
+ * the main ControlPanel dialog.
+ *
+ */
+public class Action
+{
+ private Message name;
+
+ private Class<? extends StatusGenericPanel> associatedPanel;
+
+ /**
+ * Returns the name of the action.
+ * @return the name of the action.
+ */
+ public Message getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the name of the action.
+ * @param name the name of the action.
+ */
+ public void setName(Message name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Returns the class of the panel that is associated with this action
+ * (for instance the NewBaseDNPanel class is associated with the 'New
+ * Base DN' action.
+ * @return the class of the panel that is associated with this action.
+ */
+ public Class<? extends StatusGenericPanel> getAssociatedPanelClass()
+ {
+ return associatedPanel;
+ }
+
+ /**
+ * Sets the class of the panel that is associated with this action.
+ * @param associatedPanel the class of the panel that is associated with this
+ * action.
+ */
+ public void setAssociatedPanel(
+ Class<? extends StatusGenericPanel> associatedPanel)
+ {
+ this.associatedPanel = associatedPanel;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java
new file mode 100644
index 0000000..29fc70a
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java
@@ -0,0 +1,313 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.opends.admin.ads.ADSContext;
+
+/**
+ * The class that describes the backend configuration.
+ *
+ */
+public class BackendDescriptor
+{
+ private String backendID;
+ private SortedSet<BaseDNDescriptor> baseDns = new TreeSet<BaseDNDescriptor>();
+ private SortedSet<IndexDescriptor> indexes = new TreeSet<IndexDescriptor>();
+ private SortedSet<VLVIndexDescriptor> vlvIndexes =
+ new TreeSet<VLVIndexDescriptor>();
+ private int entries;
+ private boolean isConfigBackend;
+ private boolean isEnabled;
+ private Type type;
+ private int hashCode;
+
+ /**
+ * An enumeration describing the type of backend.
+ */
+ public enum Type
+ {
+ /**
+ * The backend is a local backend.
+ */
+ LOCAL_DB,
+ /**
+ * The backend is a LDIF backend.
+ */
+ LDIF,
+ /**
+ * The backend is a memory backend.
+ */
+ MEMORY,
+ /**
+ * The backend is a backup backend.
+ */
+ BACKUP,
+ /**
+ * The backend is a monitor backend.
+ */
+ MONITOR,
+ /**
+ * The backend is a task backend.
+ */
+ TASK,
+ /**
+ * The backend is another type of backend (for instance user defined).
+ */
+ OTHER
+ };
+
+ /**
+ * Constructor for this class.
+ * @param backendID the backend ID of the Backend.
+ * @param baseDns the base DNs associated with the Backend.
+ * @param indexes the indexes defined in the backend.
+ * @param vlvIndexes the VLV indexes defined in the backend.
+ * @param entries the number of entries in the Backend.
+ * @param isEnabled whether the backend is enabled or not.
+ * @param type the type of the backend.
+ */
+ public BackendDescriptor(String backendID,
+ Set<BaseDNDescriptor> baseDns,
+ Set<IndexDescriptor> indexes,
+ Set<VLVIndexDescriptor> vlvIndexes,
+ int entries, boolean isEnabled, Type type)
+ {
+ this.backendID = backendID;
+ this.baseDns.addAll(baseDns);
+ this.indexes.addAll(indexes);
+ this.vlvIndexes.addAll(vlvIndexes);
+ this.entries = entries;
+ isConfigBackend = isConfigBackend(backendID);
+ this.type = type;
+ this.isEnabled = isEnabled;
+ updateBaseDnsAndIndexes();
+ recalculateHashCode();
+ }
+
+ /**
+ * Returns the ID of the Backend.
+ * @return the ID of the Backend.
+ */
+ public String getBackendID()
+ {
+ return backendID;
+ }
+
+ /**
+ * Returns the Base DN objects associated with the backend.
+ * @return the Base DN objects associated with the backend.
+ */
+ public SortedSet<BaseDNDescriptor> getBaseDns()
+ {
+ return Collections.unmodifiableSortedSet(baseDns);
+ }
+
+ /**
+ * Returns the vlv index objects associated with the backend.
+ * @return the vlv index objects associated with the backend.
+ */
+ public SortedSet<VLVIndexDescriptor> getVLVIndexes()
+ {
+ return Collections.unmodifiableSortedSet(vlvIndexes);
+ }
+
+
+ /**
+ * Returns the index objects associated with the backend.
+ * @return the index objects associated with the backend.
+ */
+ public SortedSet<IndexDescriptor> getIndexes()
+ {
+ return Collections.unmodifiableSortedSet(indexes);
+ }
+
+ /**
+ * Return the number of entries in the backend.
+ * -1 indicates that the number of entries could not be found.
+ * @return the number of entries in the backend.
+ */
+ public int getEntries()
+ {
+ return entries;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object v)
+ {
+ boolean equals = false;
+ if (this != v)
+ {
+ if (v instanceof BackendDescriptor)
+ {
+ BackendDescriptor desc = (BackendDescriptor)v;
+ equals = getBackendID().equals(desc.getBackendID()) &&
+ (getEntries() == desc.getEntries());
+
+ if (equals)
+ {
+ equals = desc.getBaseDns().equals(getBaseDns());
+ }
+
+ if (equals)
+ {
+ equals = desc.getIndexes().equals(getIndexes());
+ }
+
+ if (equals)
+ {
+ equals = desc.getVLVIndexes().equals(getVLVIndexes());
+ }
+ }
+ }
+ else
+ {
+ equals = true;
+ }
+ return equals;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ /**
+ * Method called when one of the elements that affect the value of the
+ * hashcode is modified. It is used to minimize the time spent calculating
+ * hashCode.
+ *
+ */
+ private void recalculateHashCode()
+ {
+ hashCode = 0;
+ for (BaseDNDescriptor rep: getBaseDns())
+ {
+ hashCode += rep.hashCode();
+ }
+ hashCode += entries;
+ for (IndexDescriptor index : indexes)
+ {
+ hashCode += index.hashCode();
+ }
+ for (VLVIndexDescriptor index : vlvIndexes)
+ {
+ hashCode += index.hashCode();
+ }
+ }
+
+ /**
+ * Updates the base DNs and indexes contained in this backend so that they
+ * have a reference to this backend.
+ *
+ */
+ private void updateBaseDnsAndIndexes()
+ {
+ for (BaseDNDescriptor baseDN : baseDns)
+ {
+ baseDN.setBackend(this);
+ }
+ for (AbstractIndexDescriptor index : indexes)
+ {
+ index.setBackend(this);
+ }
+ for (AbstractIndexDescriptor index : vlvIndexes)
+ {
+ index.setBackend(this);
+ }
+ }
+
+ /**
+ * An convenience method to know if the provided ID corresponds to a
+ * configuration backend or not.
+ * @param id the backend ID to analyze
+ * @return <CODE>true</CODE> if the the id corresponds to a configuration
+ * backend and <CODE>false</CODE> otherwise.
+ */
+ private boolean isConfigBackend(String id)
+ {
+ return "tasks".equalsIgnoreCase(id) ||
+ "schema".equalsIgnoreCase(id) ||
+ "config".equalsIgnoreCase(id) ||
+ "monitor".equalsIgnoreCase(id) ||
+ "backup".equalsIgnoreCase(id) ||
+ ADSContext.getDefaultBackendName().equalsIgnoreCase(id) ||
+ "ads-truststore".equalsIgnoreCase(id) ||
+ "replicationchanges".equalsIgnoreCase(id);
+ }
+
+ /**
+ * Tells whether this is a configuration backend or not.
+ * @return <CODE>true</CODE> if this is a configuration backend and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isConfigBackend()
+ {
+ return isConfigBackend;
+ }
+
+ /**
+ * Sets the number of entries contained in this backend.
+ * @param entries the number of entries contained in this backend.
+ */
+ public void setEntries(int entries)
+ {
+ this.entries = entries;
+
+ // Recalculate hashCode
+ recalculateHashCode();
+ }
+
+ /**
+ * Returns the type of the backend.
+ * @return the type of the backend.
+ */
+ public Type getType()
+ {
+ return type;
+ }
+
+ /**
+ * Tells whether this backend is enabled or not.
+ * @return <CODE>true</CODE> if this is backend is enabled
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isEnabled()
+ {
+ return isEnabled;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupDescriptor.java
new file mode 100644
index 0000000..5b122f7
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupDescriptor.java
@@ -0,0 +1,135 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.io.File;
+import java.util.Date;
+
+import org.opends.server.types.BackupInfo;
+
+/**
+ * Class used to describe a backup.
+ */
+public class BackupDescriptor
+{
+ /**
+ * The different types of backups.
+ *
+ */
+ public enum Type
+ {
+ /**
+ * Full backup.
+ */
+ FULL,
+ /**
+ * Incremental backup.
+ */
+ INCREMENTAL
+ };
+ private Type type;
+ private Date creationDate;
+ private File path;
+ private String id;
+ private BackupInfo info;
+
+ /**
+ * The BackupDescriptor constructor.
+ * @param path the directory where the backup is located.
+ * @param creationDate the date of creation of the backup.
+ * @param type the type of backup.
+ * @param id the backup id.
+ */
+ public BackupDescriptor(File path, Date creationDate, Type type, String id)
+ {
+ this.path = path;
+ this.creationDate = creationDate;
+ this.type = type;
+ this.id = id;
+ }
+
+ /**
+ * The BackupDescriptor generated using a BackupInfo object.
+ * @param info the BackupInfo object that contains all the information about
+ * the backup.
+ */
+ public BackupDescriptor(BackupInfo info)
+ {
+ this.path = new File(info.getBackupDirectory().getPath());
+ this.creationDate = info.getBackupDate();
+ this.type = info.isIncremental() ? Type.INCREMENTAL : Type.FULL;
+ this.id = info.getBackupID();
+ this.info = info;
+ }
+
+ /**
+ * Returns the creation date of the backup.
+ * @return the creation date of the backup.
+ */
+ public Date getCreationDate()
+ {
+ return creationDate;
+ }
+
+ /**
+ * Returns the directory where the backup is located.
+ * @return the directory where the backup is located.
+ */
+ public File getPath()
+ {
+ return path;
+ }
+
+ /**
+ * Returns the type of the backup.
+ * @return the type of the backup.
+ */
+ public Type getType()
+ {
+ return type;
+ }
+
+ /**
+ * Returns the backup ID.
+ * @return the backup ID.
+ */
+ public String getID()
+ {
+ return id;
+ }
+
+ /**
+ * Returns the BackupInfo object associated with this backup. It might be
+ * <CODE>null</CODE>.
+ * @return the BackupInfo object associated with this backup.
+ */
+ public BackupInfo getBackupInfo()
+ {
+ return info;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
new file mode 100644
index 0000000..c25357c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
@@ -0,0 +1,108 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.util.ArrayList;
+
+import javax.swing.table.AbstractTableModel;
+
+/**
+ * The table used to display the backups.
+ *
+ */
+public class BackupTableModel extends AbstractTableModel
+{
+ private static final long serialVersionUID = -3511425157550147124L;
+ private ArrayList<BackupDescriptor> backups =
+ new ArrayList<BackupDescriptor>();
+ /**
+ * Clears the contents ot the table model.
+ *
+ */
+ public void clear()
+ {
+ backups.clear();
+ }
+
+ /**
+ * Adds a backup to the model.
+ * @param backup the backup to be added.
+ */
+ public void add(BackupDescriptor backup)
+ {
+ backups.add(backup);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object getValueAt(int row, int column)
+ {
+ switch (column)
+ {
+ case 0:
+ return get(row).getID();
+ case 1:
+ return get(row).getPath();
+ case 2:
+ return get(row).getCreationDate();
+ case 3:
+ return get(row).getType();
+ default:
+ throw new IllegalArgumentException("Invalid column: "+column);
+ }
+ }
+
+ /**
+ * Returns the row count.
+ * @return the row count.
+ */
+ public int getRowCount()
+ {
+ return backups.size();
+ }
+
+ /**
+ * Returns the column count.
+ * @return the column count.
+ */
+ public int getColumnCount()
+ {
+ return 4;
+ }
+
+ /**
+ * Gets the BackupDescriptor in a given row.
+ * @param row the row.
+ * @return the BackupDescriptor in a given row.
+ */
+ public BackupDescriptor get(int row)
+ {
+ return backups.get(row);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
new file mode 100644
index 0000000..31d64a7
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
@@ -0,0 +1,284 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import org.opends.server.types.DN;
+
+
+/**
+ * This class is used to represent a Base DN / Replica and is aimed to be
+ * used by the classes in the BackendTableModel class.
+ *
+ */
+public class BaseDNDescriptor implements Comparable
+{
+ /**
+ * An enumeration describing the type of base DN for a given backend.
+ */
+ public enum Type
+ {
+ /**
+ * The base DN is not replicated.
+ */
+ NOT_REPLICATED,
+ /**
+ * The base DN is replicated.
+ */
+ REPLICATED
+ };
+
+ private int nEntries;
+ private int missingChanges;
+ private BackendDescriptor backend;
+ private long ageOfOldestMissingChange;
+ private Type type;
+ private DN baseDn;
+ private int replicaID = -1;
+
+ private int hashCode;
+
+ /**
+ * Constructor for this class.
+ * @param type the type of replication.
+ * @param baseDn the base DN associated with the Replication.
+ * @param backend the backend containing this base DN.
+ * @param nEntries the number of entries for the base DN.
+ * @param ageOfOldestMissingChange the number of missing changes.
+ * @param missingChanges the number of missing changes.
+ */
+ public BaseDNDescriptor(Type type, DN baseDn, BackendDescriptor backend,
+ int nEntries, long ageOfOldestMissingChange, int missingChanges)
+ {
+ this.baseDn = baseDn;
+ this.backend = backend;
+ this.type = type;
+ this.nEntries = nEntries;
+ this.ageOfOldestMissingChange = ageOfOldestMissingChange;
+ this.missingChanges = missingChanges;
+
+ if (backend != null)
+ {
+ recalculateHashCode();
+ }
+ }
+
+ /**
+ * Return the String DN associated with the base DN..
+ * @return the String DN associated with the base DN.
+ */
+ public DN getDn()
+ {
+ return baseDn;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object v)
+ {
+ boolean equals = false;
+ if (this != v)
+ {
+ if (v instanceof BaseDNDescriptor)
+ {
+ BaseDNDescriptor desc = (BaseDNDescriptor)v;
+ equals = (getType() == desc.getType()) &&
+ getDn().equals(desc.getDn()) &&
+ (getAgeOfOldestMissingChange() == desc.getAgeOfOldestMissingChange()) &&
+ (getMissingChanges() == desc.getMissingChanges()) &&
+ getBackend().getBackendID().equals(
+ desc.getBackend().getBackendID()) &&
+ (getEntries() == desc.getEntries());
+ }
+ }
+ else
+ {
+ equals = true;
+ }
+ return equals;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compareTo(Object o)
+ {
+ int returnValue = -1;
+ if (o instanceof BaseDNDescriptor)
+ {
+ BaseDNDescriptor desc = (BaseDNDescriptor)o;
+ returnValue = desc.getDn().compareTo(getDn());
+ }
+ return returnValue;
+ }
+
+ /**
+ * Returns the number of entries in the backend for this base DN.
+ * @return the number of entries in the backend for this base DN.
+ */
+ public int getEntries()
+ {
+ return nEntries;
+ }
+
+ /**
+ * Returns the number of missing changes in the replication topology for
+ * this base DN.
+ * @return the number of missing changes in the replication topology for
+ * this base DN.
+ */
+ public int getMissingChanges()
+ {
+ return missingChanges;
+ }
+
+ /**
+ * Sets the number of missing changes in the replication topology for
+ * this base DN.
+ * @param missingChanges the missing changes.
+ */
+ public void setMissingChanges(int missingChanges)
+ {
+ this.missingChanges = missingChanges;
+ recalculateHashCode();
+ }
+
+ /**
+ * Returns the age of the oldest missing change in seconds in the
+ * replication topology for this base DN.
+ * @return the age of the oldest missing change in seconds in the
+ * replication topology for this base DN.
+ */
+ public long getAgeOfOldestMissingChange()
+ {
+ return ageOfOldestMissingChange;
+ }
+
+ /**
+ * Sets the age of the oldest missing change in seconds in the
+ * replication topology for this base DN.
+ * @param ageOfOldestMissingChange the age of the oldest missing change in
+ * seconds in the replication topology for this base DN.
+ */
+ public void setAgeOfOldestMissingChange(long ageOfOldestMissingChange)
+ {
+ this.ageOfOldestMissingChange = ageOfOldestMissingChange;
+ recalculateHashCode();
+ }
+
+ /**
+ * Returns the type for this base DN.
+ * @return the type for this base DN.
+ */
+ public Type getType()
+ {
+ return type;
+ }
+
+ /**
+ * Returns the backend where this base DN is defined.
+ * @return the backend where this base DN is defined.
+ */
+ public BackendDescriptor getBackend()
+ {
+ return backend;
+ }
+
+
+ /**
+ * Sets the backend of this base DN.
+ * @param backend the backend for this base DN.
+ */
+ public void setBackend(BackendDescriptor backend)
+ {
+ this.backend = backend;
+ recalculateHashCode();
+ }
+
+ /**
+ * Sets the type of this base DN.
+ * @param type the new type for this base DN.
+ */
+ public void setType(Type type)
+ {
+ this.type = type;
+ recalculateHashCode();
+ }
+
+ /**
+ * Sets the number of entries for this base DN in this database.
+ * @param nEntries the number of entries.
+ */
+ public void setEntries(int nEntries)
+ {
+ this.nEntries = nEntries;
+ recalculateHashCode();
+ }
+
+ /**
+ * Returns the ID of the replication domain associated with this base DN. -1
+ * if this base DN is not replicated.
+ * @return the ID of the replication domain associated with this base DN.
+ */
+ public int getReplicaID()
+ {
+ return replicaID;
+ }
+
+ /**
+ * Sets the ID of the replication domain associated with this base DN.
+ * @param replicaID the ID of the replication domain associated with this base
+ * DN.
+ */
+ public void setReplicaID(int replicaID)
+ {
+ this.replicaID = replicaID;
+ recalculateHashCode();
+ }
+
+ /**
+ * Method called when one of the elements that affect the value of the
+ * hashcode is modified. It is used to minimize the time spent calculating
+ * hashCode.
+ *
+ */
+ private void recalculateHashCode()
+ {
+ hashCode = (getType().toString() + getAgeOfOldestMissingChange() +
+ getDn() +
+ getBackend().getBackendID() + getMissingChanges()).hashCode();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
new file mode 100644
index 0000000..503c4a8
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
@@ -0,0 +1,651 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The table model used to display all the base DNs.
+ *
+ */
+public class BaseDNTableModel extends SortableTableModel
+implements Comparator<BaseDNDescriptor>
+{
+ private static final long serialVersionUID = -5650762484071136983L;
+ private HashSet<BaseDNDescriptor> data = new HashSet<BaseDNDescriptor>();
+ private ServerDescriptor.ServerStatus serverStatus;
+ private boolean isAuthenticated;
+
+ private ArrayList<String[]> dataArray =
+ new ArrayList<String[]>();
+ private String[] COLUMN_NAMES;
+ private int sortColumn = 0;
+ private boolean sortAscending = true;
+ private boolean displayReplicationInformation;
+
+ /**
+ * Key value to identify the case of a value not available because the server
+ * is down.
+ */
+ public static String NOT_AVAILABLE_SERVER_DOWN = "NOT_AVAILABLE_SERVER_DOWN";
+
+ /**
+ * Key value to identify the case of a value not available because
+ * authentication is required.
+ */
+ public static String NOT_AVAILABLE_AUTHENTICATION_REQUIRED =
+ "NOT_AVAILABLE_AUTHENTICATION_REQUIRED";
+
+ /**
+ * Key value to identify the case of a value not available.
+ */
+ public static String NOT_AVAILABLE = "NOT_AVAILABLE";
+
+ /**
+ * Constructor for this table model.
+ * @param displayReplicationInformation whether to display replication.
+ * monitoring information or not.
+ */
+ public BaseDNTableModel(boolean displayReplicationInformation)
+ {
+ this(displayReplicationInformation, true);
+ }
+
+ /**
+ * Constructor for this table model.
+ * @param displayReplicationInformation whether to display replication.
+ * @param wrapHeader whether to wrap the headers or not.
+ * monitoring information or not.
+ */
+ public BaseDNTableModel(boolean displayReplicationInformation,
+ boolean wrapHeader)
+ {
+ this.displayReplicationInformation = displayReplicationInformation;
+ if (wrapHeader)
+ {
+ COLUMN_NAMES = new String[] {
+ getHeader(INFO_BASEDN_COLUMN.get()),
+ getHeader(INFO_BACKENDID_COLUMN.get()),
+ getHeader(INFO_NUMBER_ENTRIES_COLUMN.get()),
+ getHeader(INFO_REPLICATED_COLUMN.get()),
+ getHeader(INFO_MISSING_CHANGES_COLUMN.get()),
+ getHeader(INFO_AGE_OF_OLDEST_MISSING_CHANGE_COLUMN.get())
+ };
+ }
+ else
+ {
+ COLUMN_NAMES = new String[] {
+ INFO_BASEDN_COLUMN.get().toString(),
+ INFO_BACKENDID_COLUMN.get().toString(),
+ INFO_NUMBER_ENTRIES_COLUMN.get().toString(),
+ INFO_REPLICATED_COLUMN.get().toString(),
+ INFO_MISSING_CHANGES_COLUMN.get().toString(),
+ INFO_AGE_OF_OLDEST_MISSING_CHANGE_COLUMN.get().toString()
+ };
+ }
+ }
+
+ /**
+ * Sets the data for this table model.
+ * @param newData the data for this table model.
+ * @param status the server status.
+ * @param isAuthenticated whether the user provided authentication or not.
+ */
+ public void setData(Set<BaseDNDescriptor> newData,
+ ServerDescriptor.ServerStatus status, boolean isAuthenticated)
+ {
+ if (!newData.equals(data) || (serverStatus != status) ||
+ (this.isAuthenticated != isAuthenticated))
+ {
+ serverStatus = status;
+ this.isAuthenticated = isAuthenticated;
+ data.clear();
+ data.addAll(newData);
+ updateDataArray();
+ fireTableDataChanged();
+ }
+ }
+
+ /**
+ * Updates the table model contents and sorts its contents depending on the
+ * sort options set by the user.
+ */
+ public void forceResort()
+ {
+ updateDataArray();
+ fireTableDataChanged();
+ }
+
+ /**
+ * Comparable implementation.
+ * @param desc1 the first replica descriptor to compare.
+ * @param desc2 the second replica descriptor to compare.
+ * @return 1 if according to the sorting options set by the user the first
+ * base DN descriptor must be put before the second descriptor, 0 if they
+ * are equivalent in terms of sorting and -1 if the second descriptor must
+ * be put before the first descriptor.
+ */
+ public int compare(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
+ {
+ int result = 0;
+ if (sortColumn == 0)
+ {
+ result = compareDns(desc1, desc2);
+
+ if (result == 0)
+ {
+ result = compareBackendIDs(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareEntries(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareRepl(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareMissingChanges(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareAgeOfOldestMissingChange(desc1, desc2);
+ }
+ }
+
+ if (sortColumn == 1)
+ {
+ result = compareBackendIDs(desc1, desc2);
+
+ if (result == 0)
+ {
+ result = compareDns(desc1, desc2);
+
+ }
+
+ if (result == 0)
+ {
+ result = compareEntries(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareRepl(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareMissingChanges(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareAgeOfOldestMissingChange(desc1, desc2);
+ }
+ }
+ else if (sortColumn == 2)
+ {
+ result = compareEntries(desc1, desc2);
+
+ if (result == 0)
+ {
+ result = compareBackendIDs(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareDns(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareRepl(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareMissingChanges(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareAgeOfOldestMissingChange(desc1, desc2);
+ }
+ }
+ else if (sortColumn == 3)
+ {
+ result = compareRepl(desc1, desc2);
+
+ if (result == 0)
+ {
+ result = compareBackendIDs(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareDns(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareEntries(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareMissingChanges(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareAgeOfOldestMissingChange(desc1, desc2);
+ }
+ }
+ else if (sortColumn == 4)
+ {
+ result = compareMissingChanges(desc1, desc2);
+
+ if (result == 0)
+ {
+ result = compareBackendIDs(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareDns(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareEntries(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareRepl(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareAgeOfOldestMissingChange(desc1, desc2);
+ }
+ }
+ else if (sortColumn == 5)
+ {
+ result = compareAgeOfOldestMissingChange(desc1, desc2);
+
+ if (result == 0)
+ {
+ result = compareBackendIDs(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareDns(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareEntries(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareRepl(desc1, desc2);
+ }
+
+ if (result == 0)
+ {
+ result = compareMissingChanges(desc1, desc2);
+ }
+ }
+
+ if (!sortAscending)
+ {
+ result = -result;
+ }
+
+ return result;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getColumnCount()
+ {
+ return displayReplicationInformation ? 6 : 4;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getRowCount()
+ {
+ return dataArray.size();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object getValueAt(int row, int col)
+ {
+ return dataArray.get(row)[col];
+ }
+
+ /**
+ * Updates the array data. This includes resorting it.
+ */
+ private void updateDataArray()
+ {
+ TreeSet<BaseDNDescriptor> sortedSet = new TreeSet<BaseDNDescriptor>(this);
+ sortedSet.addAll(data);
+ dataArray.clear();
+ for (BaseDNDescriptor desc : sortedSet)
+ {
+ String[] s = new String[6];
+
+ s[0] = Utilities.unescapeUtf8(desc.getDn().toString());
+
+ s[1] = desc.getBackend().getBackendID();
+
+ s[2] = getValueForEntries(desc);
+
+ s[3] = getStringForReplState(desc);
+
+ s[4] = getValueForMissingChanges(desc);
+
+ s[5] = getValueForOldestMissingChange(desc);
+
+ dataArray.add(s);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getColumnName(int col) {
+ return COLUMN_NAMES[col];
+ }
+
+ /**
+ * Returns whether the sort is ascending or descending.
+ * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isSortAscending()
+ {
+ return sortAscending;
+ }
+
+ /**
+ * Sets whether to sort ascending of descending.
+ * @param sortAscending whether to sort ascending or descending.
+ */
+ public void setSortAscending(boolean sortAscending)
+ {
+ this.sortAscending = sortAscending;
+ }
+
+ /**
+ * Returns the column index used to sort.
+ * @return the column index used to sort.
+ */
+ public int getSortColumn()
+ {
+ return sortColumn;
+ }
+
+ /**
+ * Sets the column index used to sort.
+ * @param sortColumn column index used to sort..
+ */
+ public void setSortColumn(int sortColumn)
+ {
+ this.sortColumn = sortColumn;
+ }
+
+ /*
+ * Several comparison methods to be able to sort the table model.
+ */
+ private int compareBackendIDs(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
+ {
+ return desc1.getBackend().getBackendID().compareTo(
+ desc2.getBackend().getBackendID());
+ }
+
+ private int compareEntries(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
+ {
+ int n1 = desc1.getEntries();
+ int n2 = desc2.getEntries();
+ return compareIntegers(n1, n2);
+ }
+
+ private int compareIntegers(int n1, int n2)
+ {
+ if (n1 == n2)
+ {
+ return 0;
+ }
+ if (n1 > n2)
+ {
+ return 1;
+ }
+ return -1;
+ }
+
+ private int compareLongs(long n1, long n2)
+ {
+ if (n1 == n2)
+ {
+ return 0;
+ }
+ if (n1 > n2)
+ {
+ return 1;
+ }
+ return -1;
+ }
+
+ private int compareDns(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
+ {
+ return Utilities.unescapeUtf8(desc1.getDn().toString()).compareTo(
+ Utilities.unescapeUtf8(desc2.getDn().toString()));
+ }
+
+ private int compareRepl(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
+ {
+ return (String.valueOf(desc1.getType()).compareTo(
+ String.valueOf(desc2.getType())));
+ }
+
+ private int compareMissingChanges(BaseDNDescriptor desc1,
+ BaseDNDescriptor desc2)
+ {
+ return compareIntegers(desc1.getMissingChanges(),
+ desc2.getMissingChanges());
+ }
+
+ private int compareAgeOfOldestMissingChange(BaseDNDescriptor desc1,
+ BaseDNDescriptor desc2)
+ {
+ return compareLongs(desc1.getAgeOfOldestMissingChange(),
+ desc2.getAgeOfOldestMissingChange());
+ }
+
+ /**
+ * Returns the Object describing the number of entries of a given Base DN.
+ * The Object will be an Integer.
+ * @param rep the Base DN object to handle.
+ * @return the Object describing the number of entries of a given Base DN.
+ */
+ private String getValueForEntries(BaseDNDescriptor rep)
+ {
+ String returnValue;
+ if (serverStatus != ServerDescriptor.ServerStatus.STARTED)
+ {
+ returnValue = NOT_AVAILABLE_SERVER_DOWN;
+ }
+ else if (!isAuthenticated)
+ {
+ returnValue = NOT_AVAILABLE_AUTHENTICATION_REQUIRED;
+ }
+ else
+ {
+ if (rep.getEntries() < 0)
+ {
+ returnValue = NOT_AVAILABLE;
+ }
+ else
+ {
+ returnValue = String.valueOf(rep.getEntries());
+ }
+ }
+ return returnValue;
+ }
+
+ /**
+ * Returns the Object describing the number of missing changes of a given Base
+ * DN. The Object will be a String unless the base DN is
+ * replicated and we could not find a valid value (in this case we return
+ * an Integer with the invalid value).
+ * @param rep the Base DN object to handle.
+ * @return the Object describing the number of missing changes of
+ * a given Base DN.
+ */
+ private String getValueForMissingChanges(BaseDNDescriptor rep)
+ {
+ String returnValue;
+ if (rep.getType() == BaseDNDescriptor.Type.REPLICATED)
+ {
+ if (serverStatus != ServerDescriptor.ServerStatus.STARTED)
+ {
+ returnValue = NOT_AVAILABLE_SERVER_DOWN;
+ }
+ else if (!isAuthenticated)
+ {
+ returnValue = NOT_AVAILABLE_AUTHENTICATION_REQUIRED;
+ }
+ else
+ {
+ if (rep.getMissingChanges() < 0)
+ {
+ returnValue = NOT_AVAILABLE;
+ }
+ else
+ {
+ returnValue = String.valueOf(rep.getMissingChanges());
+ }
+ }
+ }
+ else
+ {
+ returnValue = INFO_NOT_APPLICABLE_LABEL.get().toString();
+ }
+ return returnValue;
+ }
+
+ /**
+ * Returns the Object describing the age of oldest missing change of
+ * a given Base DN. The Object will be a String unless the base DN is
+ * replicated and we could not find a valid value (in this case we return
+ * an Integer with the invalid value).
+ * @param rep the Base DN object to handle.
+ * @return the Object describing the age of oldest missing change of
+ * a given Base DN.
+ */
+ private String getValueForOldestMissingChange(BaseDNDescriptor rep)
+ {
+ String returnValue;
+ if (rep.getType() == BaseDNDescriptor.Type.REPLICATED)
+ {
+ if (serverStatus != ServerDescriptor.ServerStatus.STARTED)
+ {
+ returnValue = NOT_AVAILABLE_SERVER_DOWN;
+ }
+ else if (!isAuthenticated)
+ {
+ returnValue = NOT_AVAILABLE_AUTHENTICATION_REQUIRED;
+ }
+ else
+ {
+ long age = rep.getAgeOfOldestMissingChange();
+ if (age > 0)
+ {
+ Date date = new Date(age);
+ returnValue = date.toString();
+ }
+ else
+ {
+ // Not available
+ returnValue = NOT_AVAILABLE;
+ }
+ }
+ }
+ else
+ {
+ returnValue = INFO_NOT_APPLICABLE_LABEL.get().toString();
+ }
+ return returnValue;
+ }
+
+ /**
+ * Returns the localized String describing the replication state of
+ * a given Base DN.
+ * @param rep the Base DN object to handle.
+ * @return the localized String describing the replication state of
+ * a given Base DN.
+ */
+ private String getStringForReplState(BaseDNDescriptor rep)
+ {
+ Message s;
+ if (rep.getType() == BaseDNDescriptor.Type.REPLICATED)
+ {
+ s = INFO_BASEDN_REPLICATED_LABEL.get();
+ }
+ else
+ {
+ s = INFO_BASEDN_NOT_REPLICATED_LABEL.get();
+ }
+ return s.toString();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BinaryValue.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
new file mode 100644
index 0000000..7a9fc9b
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
@@ -0,0 +1,243 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.io.File;
+import java.text.ParseException;
+
+import org.opends.server.util.Base64;
+
+/**
+ * Class used to represent Binary Values. This is required in particular
+ * when the user wants to use the value in a file. To be able to reflect
+ * this this object is used: it contains the binary itself, the base 64
+ * representation and the file that has been used.
+ *
+ */
+public class BinaryValue
+{
+ private Type type;
+ private String base64;
+ private byte[] bytes;
+ private File file;
+ private int hashCode;
+
+ /**
+ * The type of the binary value.
+ *
+ */
+ public enum Type
+ {
+ /**
+ * The binary value is provided as Base 64 string.
+ */
+ BASE64_STRING,
+ /**
+ * The binary value is provided as a byte array.
+ */
+ BYTE_ARRAY
+ }
+
+ /**
+ * This is done to force the use of the factory methods (createBase64 and
+ * createFromFile).
+ *
+ */
+ private BinaryValue()
+ {
+ }
+
+ /**
+ * Creates a binary value using a base64 string.
+ * @param base64 the base64 representation of the binary.
+ * @return the binary value.
+ * @throws ParseException if there is an error decoding the provided base64
+ * string.
+ */
+ public static BinaryValue createBase64(String base64) throws ParseException
+ {
+ BinaryValue value = new BinaryValue();
+ value.type = Type.BASE64_STRING;
+ value.base64 = base64;
+ value.bytes = value.getBytes();
+ value.hashCode = base64.hashCode();
+ return value;
+ }
+
+ /**
+ * Creates a binary value using an array of bytes.
+ * @param bytes the byte array.
+ * @return the binary value.
+ */
+ public static BinaryValue createBase64(byte[] bytes)
+ {
+ BinaryValue value = new BinaryValue();
+ value.type = Type.BASE64_STRING;
+ value.bytes = bytes;
+ value.base64 = value.getBase64();
+ value.hashCode = value.base64.hashCode();
+ return value;
+ }
+
+ /**
+ * Creates a binary value using an array of bytes and a file.
+ * @param bytes the bytes in the file.
+ * @param file the file the bytes were read from.
+ * @return the binary value.
+ */
+ public static BinaryValue createFromFile(byte[] bytes, File file)
+ {
+ BinaryValue value = new BinaryValue();
+ value.type = Type.BYTE_ARRAY;
+ value.bytes = bytes;
+ value.base64 = value.getBase64();
+ value.hashCode = value.base64.hashCode();
+ value.file = file;
+ return value;
+ }
+
+ /**
+ * Returns the base64 representation of the binary value.
+ * @return the base64 representation of the binary value.
+ */
+ public String getBase64()
+ {
+ if (base64 == null)
+ {
+ if (bytes != null)
+ {
+ base64 = Base64.encode(bytes);
+ }
+ }
+ return base64;
+ }
+
+ /**
+ * Returns the byte array of the binary value.
+ * @return the byte array of the binary value.
+ * @throws ParseException if this object was created using a base64 string
+ * and there was an error parsing it.
+ */
+ public byte[] getBytes() throws ParseException
+ {
+ if (bytes == null)
+ {
+ if (base64 != null)
+ {
+ bytes = Base64.decode(base64);
+ }
+ }
+ return bytes;
+ }
+
+ /**
+ * Return the type of the binary value.
+ * @return the type of the binary value.
+ */
+ public Type getType()
+ {
+ return type;
+ }
+
+ /**
+ * Return the file that was used to read the binary value.
+ * @return the file that was used to read the binary value.
+ */
+ public File getFile()
+ {
+ return file;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object o)
+ {
+ boolean equals = false;
+ if (o != null)
+ {
+ equals = this == o;
+ if (!equals)
+ {
+ equals = o instanceof BinaryValue;
+ if (equals)
+ {
+ BinaryValue candidate = (BinaryValue)o;
+ equals = candidate.getType() == getType();
+ if (equals)
+ {
+ if (file == null)
+ {
+ equals = candidate.getFile() == null;
+ }
+ else if (candidate.getFile() != null)
+ {
+ equals = file.equals(candidate.getFile());
+ }
+ else
+ {
+ equals = false;
+ }
+ }
+ if (equals)
+ {
+ if (type == Type.BASE64_STRING)
+ {
+ equals = candidate.getBase64().equals(getBase64());
+ }
+ else
+ {
+ try
+ {
+ equals = candidate.getBytes().length == getBytes().length;
+ for (int i=0; i<getBytes().length && equals; i++)
+ {
+ equals = bytes[i] == candidate.getBytes()[i];
+ }
+ }
+ catch (ParseException pe)
+ {
+ throw new IllegalStateException(
+ "Unexpected error getting bytes: "+pe, pe);
+ }
+ }
+ }
+ }
+ }
+ }
+ return equals;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return hashCode;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CannotRenameException.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CannotRenameException.java
new file mode 100644
index 0000000..ead2c0e
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CannotRenameException.java
@@ -0,0 +1,50 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import org.opends.messages.Message;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * Exception that occurs when the user ask to make a modification that is not
+ * handled by ModifyEntryTask.
+ * @see <CODE>org.opends.guitools.controlpanel.task.ModifyEntryTask</CODE>
+ */
+public class CannotRenameException extends OpenDsException
+{
+ private static final long serialVersionUID = 6445729932279305687L;
+
+ /**
+ * Constructor.
+ * @param msg the message describing why the entry cannot be renamed.
+ */
+ public CannotRenameException(Message msg)
+ {
+ super(msg);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
new file mode 100644
index 0000000..60f2410
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
@@ -0,0 +1,112 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+/**
+ * Class used in the combo box models. It is used to have special rendering in
+ * the combo boxes.
+ */
+public class CategorizedComboBoxElement
+{
+ private Object value;
+ private Type type;
+ private int hashCode;
+
+ /**
+ * The type of the element.
+ *
+ */
+ public enum Type
+ {
+ /**
+ * Category type (in a combo box containing base DNs the backends are of
+ * type category, for instance).
+ */
+ CATEGORY,
+ /**
+ * Regular type.
+ */
+ REGULAR
+ };
+
+ /**
+ * Constructor.
+ * @param value the value of the element.
+ * @param type the type of the element.
+ */
+ public CategorizedComboBoxElement(Object value, Type type)
+ {
+ this.value = value;
+ this.type = type;
+ this.hashCode = this.value.hashCode() + this.type.hashCode();
+ }
+
+ /**
+ * Returns the value.
+ * @return the value.
+ */
+ public Object getValue()
+ {
+ return value;
+ }
+
+ /**
+ * Returns the type of the element.
+ * @return the type of the element.
+ */
+ public Type getType()
+ {
+ return type;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object o)
+ {
+ boolean equals = false;
+ if (o != null)
+ {
+ if (o instanceof CategorizedComboBoxElement)
+ {
+ CategorizedComboBoxElement desc = (CategorizedComboBoxElement)o;
+ equals = (desc.getType() == getType()) &&
+ (getValue().equals(desc.getValue()));
+ }
+ }
+ return equals;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return hashCode;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/Category.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/Category.java
new file mode 100644
index 0000000..bccd09a
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/Category.java
@@ -0,0 +1,71 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.util.ArrayList;
+
+import org.opends.messages.Message;
+
+/**
+ * Class containing the different actions for a given category. For instance
+ * for the Category 'Indexes' the Actions are 'Manage Indexes...', 'Verify
+ * Indexes...' etc.
+ *
+ */
+public class Category
+{
+ private Message name;
+ private ArrayList<Action> actions = new ArrayList<Action>();
+
+ /**
+ * Returns the name of the category.
+ * @return the name of the category.
+ */
+ public Message getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the name of the category.
+ * @param name the name of the category.
+ */
+ public void setName(Message name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Returns the actions associated with this category.
+ * @return the actions associated with this category.
+ */
+ public ArrayList<Action> getActions()
+ {
+ return actions;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CheckEntrySyntaxException.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CheckEntrySyntaxException.java
new file mode 100644
index 0000000..737634c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CheckEntrySyntaxException.java
@@ -0,0 +1,81 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * The exception that occurs when the user is editing an entry and some of the
+ * provided data is not valid.
+ *
+ */
+public class CheckEntrySyntaxException extends OpenDsException
+{
+ private static final long serialVersionUID = 8145911071581212822L;
+ private List<Message> errors;
+ /**
+ * Constructor of the exception.
+ * @param errors the list of error description that were found.
+ */
+ public CheckEntrySyntaxException(List<Message> errors)
+ {
+ super(getMessage(errors));
+ this.errors = Collections.unmodifiableList(errors);
+ }
+
+ /**
+ * Returns the list of errors that were encountered.
+ * @return the list of errors that were encountered.
+ */
+ public List<Message> getErrors()
+ {
+ return errors;
+ }
+
+ /**
+ * Returns a single message using the provided messages. This method assumes
+ * that the messages have HTML format.
+ * @param errors the list of errors.
+ * @return a single message using the provided messages.
+ */
+ private static Message getMessage(List<Message> errors)
+ {
+ ArrayList<String> s = new ArrayList<String>();
+ for (Message error : errors)
+ {
+ s.add(error.toString());
+ }
+ return Message.raw(Utilities.getStringFromCollection(s, "<br>"));
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java
new file mode 100644
index 0000000..668ab0e
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java
@@ -0,0 +1,49 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import org.opends.messages.Message;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * Exception that occurs reading the server configuration.
+ *
+ */
+public class ConfigReadException extends OpenDsException
+{
+ private static final long serialVersionUID = 1266482779183126905L;
+
+ /**
+ * Constructor for the exception.
+ * @param msg the localized message to be used.
+ */
+ public ConfigReadException(Message msg)
+ {
+ super(msg);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
new file mode 100644
index 0000000..bafe53c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
@@ -0,0 +1,247 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.opends.messages.Message;
+
+/**
+ * This class is used to represent a Listener and is aimed to be used by the
+ * classes in the ListenersTableModel class.
+ */
+public class ConnectionHandlerDescriptor
+{
+ /**
+ * Enumeration used to represent the state of the listener.
+ */
+ public enum State
+ {
+ /**
+ * The listener is enabled.
+ */
+ ENABLED,
+ /**
+ * The listener is disabled.
+ */
+ DISABLED,
+ /**
+ * The state of the listener is unknown.
+ */
+ UNKNOWN
+ };
+
+ /**
+ * Enumeration used to represent the Protocol of the listener.
+ *
+ */
+ public enum Protocol
+ {
+ /**
+ * LDAP protocol.
+ */
+ LDAP(INFO_CTRL_PANEL_CONN_HANDLER_LDAP.get()),
+ /**
+ * LDAP accepting Start TLS protocol.
+ */
+ LDAP_STARTTLS(INFO_CTRL_PANEL_CONN_HANDLER_LDAP_STARTTLS.get()),
+ /**
+ * LDAP secure protocol.
+ */
+ LDAPS(INFO_CTRL_PANEL_CONN_HANDLER_LDAPS.get()),
+ /**
+ * JMX protocol.
+ */
+ JMX(INFO_CTRL_PANEL_CONN_HANDLER_JMX.get()),
+ /**
+ * JMX secure protocol.
+ */
+ JMXS(INFO_CTRL_PANEL_CONN_HANDLER_JMXS.get()),
+ /**
+ * LDIF protocol.
+ */
+ LDIF(INFO_CTRL_PANEL_CONN_HANDLER_LDIF.get()),
+ /**
+ * SNMP protocol.
+ */
+ SNMP(INFO_CTRL_PANEL_CONN_HANDLER_SNMP.get()),
+ /**
+ * Replication protocol. Even if in the configuration is not considered
+ * as a listener, we display it on the table.
+ */
+ REPLICATION(INFO_CTRL_PANEL_CONN_HANDLER_REPLICATION.get()),
+ /**
+ * Secure replication protocol.
+ */
+ REPLICATION_SECURE(INFO_CTRL_PANEL_CONN_HANDLER_REPLICATION_SECURE.get()),
+ /**
+ * Admin connector protocol.
+ */
+ ADMINISTRATION_CONNECTOR(INFO_CTRL_PANEL_CONN_HANDLER_ADMINISTRATION.get()),
+ /**
+ * Other protocol.
+ */
+ OTHER(INFO_CTRL_PANEL_CONN_HANDLER_OTHER.get());
+
+ private Message displayMessage;
+
+ private Protocol(Message displayMessage)
+ {
+ this.displayMessage = displayMessage;
+ }
+
+ /**
+ * Returns the display Message to be used for the protocol.
+ * @return the display Message to be used for the protocol.
+ */
+ public Message getDisplayMessage()
+ {
+ return displayMessage;
+ }
+ }
+
+ private State state;
+ private SortedSet<InetAddress> addresses = new TreeSet<InetAddress>();
+ private int port;
+ private Protocol protocol;
+ private String toString;
+ private String name;
+
+ private int hashCode;
+
+ /**
+ * Constructor for thid class.
+ * @param addresses the list of InetAdresses of the listener.
+ * @param port the port of the connection handler.
+ * @param protocol the protocol of the listener.
+ * @param state the state of the connection handler (enabled, disabled, etc.).
+ * @param name the name of the listener.
+ */
+ public ConnectionHandlerDescriptor(Collection<InetAddress> addresses,
+ int port, Protocol protocol, State state, String name)
+ {
+ this.addresses.addAll(addresses);
+ this.port = port;
+ this.protocol = protocol;
+ this.state = state;
+ this.name = name;
+
+ StringBuilder builder = new StringBuilder();
+ builder.append(getProtocol() + " " + getState() + " ");
+ for (InetAddress address : addresses)
+ {
+ builder.append(address.toString());
+ }
+ builder.append(" Port: "+port);
+ toString = builder.toString();
+ hashCode = toString.hashCode();
+ }
+
+ /**
+ * Returns the address port representation of the listener.
+ * @return the address port representation of the listener.
+ */
+ public SortedSet<InetAddress> getAdresses()
+ {
+ return new TreeSet<InetAddress>(addresses);
+ }
+
+ /**
+ * Returns the protocol of the listener.
+ * @return the protocol of the listener.
+ */
+ public Protocol getProtocol()
+ {
+ return protocol;
+ }
+
+ /**
+ * Returns the state of the listener.
+ * @return the state of the listener.
+ */
+ public State getState()
+ {
+ return state;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return toString;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object o)
+ {
+ boolean equals = false;
+ if (o == this)
+ {
+ equals = true;
+ }
+ else if (o instanceof ConnectionHandlerDescriptor)
+ {
+ equals = hashCode() == o.hashCode();
+ }
+ return equals;
+ }
+
+ /**
+ * Returns the port of the connection handler.
+ * @return the port of the connection handler.
+ */
+ public int getPort()
+ {
+ return port;
+ }
+
+ /**
+ * Returns the name of the connection handler.
+ * @return the name of the connection handler.
+ */
+ public String getName()
+ {
+ return name;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
new file mode 100644
index 0000000..4001be8
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
@@ -0,0 +1,345 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * The table model used by the table that displays the connection handlers.
+ *
+ */
+public class ConnectionHandlerTableModel extends SortableTableModel
+implements Comparator<ConnectionHandlerDescriptor>
+{
+ private static final long serialVersionUID = -1121308303480078376L;
+ private Set<ConnectionHandlerDescriptor> data =
+ new HashSet<ConnectionHandlerDescriptor>();
+ private ArrayList<String[]> dataArray =
+ new ArrayList<String[]>();
+ private String[] COLUMN_NAMES;
+ private int sortColumn = 0;
+ private boolean sortAscending = true;
+
+ /**
+ * Constructor for this table model.
+ */
+ public ConnectionHandlerTableModel()
+ {
+ this(true);
+ }
+
+ /**
+ * Constructor for this table model.
+ * @param wrapHeader whether to wrap the headers or not.
+ * monitoring information or not.
+ */
+ public ConnectionHandlerTableModel(boolean wrapHeader)
+ {
+ if (wrapHeader)
+ {
+ COLUMN_NAMES = new String[] {
+ getHeader(INFO_ADDRESS_PORT_COLUMN.get()),
+ getHeader(INFO_PROTOCOL_COLUMN.get()),
+ getHeader(INFO_STATE_COLUMN.get())
+ };
+ }
+ else
+ {
+ COLUMN_NAMES = new String[] {
+ INFO_ADDRESS_PORT_COLUMN.get().toString(),
+ INFO_PROTOCOL_COLUMN.get().toString(),
+ INFO_STATE_COLUMN.get().toString()
+ };
+ }
+ }
+
+ /**
+ * Sets the data for this table model.
+ * @param newData the data for this table model.
+ */
+ public void setData(Set<ConnectionHandlerDescriptor> newData)
+ {
+ if (!newData.equals(data))
+ {
+ data.clear();
+ data.addAll(newData);
+ updateDataArray();
+ fireTableDataChanged();
+ }
+ }
+
+ /**
+ * Updates the table model contents and sorts its contents depending on the
+ * sort options set by the user.
+ */
+ public void forceResort()
+ {
+ updateDataArray();
+ fireTableDataChanged();
+ }
+
+ /**
+ * Comparable implementation.
+ * @param desc1 the first listener descriptor to compare.
+ * @param desc2 the second listener descriptor to compare.
+ * @return 1 if according to the sorting options set by the user the first
+ * listener descriptor must be put before the second descriptor, 0 if they
+ * are equivalent in terms of sorting and -1 if the second descriptor must
+ * be put before the first descriptor.
+ */
+ public int compare(ConnectionHandlerDescriptor desc1,
+ ConnectionHandlerDescriptor desc2)
+ {
+ int result = 0;
+ if (sortColumn == 0)
+ {
+ if (desc1.getAdresses().equals(desc2.getAdresses()))
+ {
+ Integer port1 = new Integer(desc1.getPort());
+ Integer port2 = new Integer(desc2.getPort());
+ result = port1.compareTo(port2);
+ }
+ else
+ {
+ result = getAddressPortString(desc1).compareTo(
+ getAddressPortString(desc2));
+ }
+ if (result == 0)
+ {
+ result = getProtocolString(desc1).compareTo(
+ getProtocolString(desc2));
+ }
+
+ if (result == 0)
+ {
+ result = desc1.getState().compareTo(desc2.getState());
+ }
+ }
+ else if (sortColumn == 1)
+ {
+ result = getProtocolString(desc1).compareTo(
+ getProtocolString(desc2));
+
+ if (result == 0)
+ {
+ result = getAddressPortString(desc1).compareTo(
+ getAddressPortString(desc2));
+ }
+
+ if (result == 0)
+ {
+ result = desc1.getState().compareTo(desc2.getState());
+ }
+ }
+ else
+ {
+ result = desc1.getState().compareTo(desc2.getState());
+
+ if (result == 0)
+ {
+ result = getAddressPortString(desc1).compareTo(
+ getAddressPortString(desc2));
+ }
+
+ if (result == 0)
+ {
+ result = getProtocolString(desc1).compareTo(
+ getProtocolString(desc2));
+ }
+ }
+
+ if (!sortAscending)
+ {
+ result = -result;
+ }
+
+ return result;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getColumnCount()
+ {
+ return 3;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getRowCount()
+ {
+ return dataArray.size();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object getValueAt(int row, int col)
+ {
+ return dataArray.get(row)[col];
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getColumnName(int col) {
+ return COLUMN_NAMES[col];
+ }
+
+
+ /**
+ * Returns whether the sort is ascending or descending.
+ * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isSortAscending()
+ {
+ return sortAscending;
+ }
+
+ /**
+ * Sets whether to sort ascending of descending.
+ * @param sortAscending whether to sort ascending or descending.
+ */
+ public void setSortAscending(boolean sortAscending)
+ {
+ this.sortAscending = sortAscending;
+ }
+
+ /**
+ * Returns the column index used to sort.
+ * @return the column index used to sort.
+ */
+ public int getSortColumn()
+ {
+ return sortColumn;
+ }
+
+ /**
+ * Sets the column index used to sort.
+ * @param sortColumn column index used to sort..
+ */
+ public void setSortColumn(int sortColumn)
+ {
+ this.sortColumn = sortColumn;
+ }
+
+ private String getAddressPortString(ConnectionHandlerDescriptor desc)
+ {
+ Set<InetAddress> addresses = desc.getAdresses();
+ String returnValue;
+ if (addresses.size() == 0)
+ {
+ if (desc.getPort() > 0)
+ {
+ returnValue = "0.0.0.0:"+desc.getPort();
+ }
+ else
+ {
+ returnValue = INFO_NOT_APPLICABLE_LABEL.get().toString();
+ }
+ }
+ else
+ {
+ StringBuilder buf = new StringBuilder();
+ buf.append("<html>");
+ boolean added = false;
+ for (InetAddress address : addresses)
+ {
+ if (added)
+ {
+ buf.append("<br>");
+ }
+ buf.append(address);
+ added = true;
+ if (desc.getPort() > 0)
+ {
+ buf.append(":"+desc.getPort());
+ }
+ }
+ returnValue = buf.toString();
+ }
+ return returnValue;
+ }
+
+ private String getProtocolString(ConnectionHandlerDescriptor desc)
+ {
+ String returnValue;
+ switch (desc.getProtocol())
+ {
+ case OTHER:
+ returnValue = desc.getName();
+ break;
+ default:
+ returnValue = desc.getProtocol().getDisplayMessage().toString();
+ break;
+ }
+ return returnValue;
+ }
+
+ private void updateDataArray()
+ {
+ TreeSet<ConnectionHandlerDescriptor> sortedSet =
+ new TreeSet<ConnectionHandlerDescriptor>(this);
+ sortedSet.addAll(data);
+ dataArray.clear();
+ for (ConnectionHandlerDescriptor desc : sortedSet)
+ {
+ String[] s = new String[3];
+ s[0] = getAddressPortString(desc);
+ s[1] = getProtocolString(desc);
+
+ switch (desc.getState())
+ {
+ case ENABLED:
+ s[2] = INFO_ENABLED_LABEL.get().toString();
+ break;
+
+ case DISABLED:
+ s[2] = INFO_DISABLED_LABEL.get().toString();
+ break;
+
+ case UNKNOWN:
+ s[2] = INFO_UNKNOWN_LABEL.get().toString();
+ break;
+
+ default:
+ throw new IllegalStateException("Unknown state: "+desc.getState());
+ }
+ dataArray.add(s);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java
new file mode 100644
index 0000000..cdd8168
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java
@@ -0,0 +1,88 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+
+ /**
+ * Policy to follow to choose the protocol to be used.
+ *
+ * */
+public enum ConnectionProtocolPolicy
+{
+ /**
+ * Force to use Start TLS.
+ */
+ USE_STARTTLS,
+ /**
+ * Force to use LDAP.
+ */
+ USE_LDAP,
+ /**
+ * Force to use LDAPs.
+ */
+ USE_LDAPS,
+ /**
+ * Force to use the Administration Connector.
+ */
+ USE_ADMIN,
+ /**
+ * Use the most secure available (LDAPs, StartTLS and finally LDAP).
+ */
+ USE_MOST_SECURE_AVAILABLE,
+ /**
+ * Use the less secure available (LDAP, and then LDAPs).
+ */
+ USE_LESS_SECURE_AVAILABLE;
+
+ /**
+ * Returns the ConnectionProtocolPolicy to be used with the parameters
+ * provided by the user.
+ * @param useSSL whether the user asked to use SSL or not.
+ * @param useStartTLS whether the user asked to use Start TLS or not.
+ * @return the ConnectionProtocolPolicy to be used with the parameters
+ * provided by the user.
+ */
+ public static ConnectionProtocolPolicy getConnectionPolicy(boolean useSSL,
+ boolean useStartTLS)
+ {
+ ConnectionProtocolPolicy policy;
+ if (useStartTLS)
+ {
+ policy = ConnectionProtocolPolicy.USE_STARTTLS;
+ }
+ else if (useSSL)
+ {
+ policy = ConnectionProtocolPolicy.USE_LDAPS;
+ }
+ else
+ {
+ policy = ConnectionProtocolPolicy.USE_LESS_SECURE_AVAILABLE;
+ }
+ return policy;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
new file mode 100644
index 0000000..7c1e8f4
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
@@ -0,0 +1,979 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.InitialLdapContext;
+
+import org.opends.admin.ads.util.ApplicationTrustManager;
+import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.browser.LDAPConnectionPool;
+import org.opends.guitools.controlpanel.event.BackupCreatedEvent;
+import org.opends.guitools.controlpanel.event.BackupCreatedListener;
+import org.opends.guitools.controlpanel.event.ConfigChangeListener;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.IndexModifiedEvent;
+import org.opends.guitools.controlpanel.event.IndexModifiedListener;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.ConfigFromDirContext;
+import org.opends.guitools.controlpanel.util.ConfigFromFile;
+import org.opends.guitools.controlpanel.util.ConfigReader;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.quicksetup.util.UIKeyStore;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.tools.ConfigureWindowsService;
+
+/**
+ * This is the classes that is shared among all the different places in the
+ * Control Panel. It contains information about the server status and
+ * configuration and some objects that are shared everywhere.
+ *
+ */
+public class ControlPanelInfo
+{
+ /**
+ * The default pooling time in miliseconds.
+ */
+ public static final long DEFAULT_POOLING = 20000;
+
+ private ServerDescriptor serverDesc;
+ private Set<Task> tasks = new HashSet<Task>();
+ private InitialLdapContext ctx;
+ private InitialLdapContext userDataCtx;
+ private final LDAPConnectionPool connectionPool = new LDAPConnectionPool();
+ // Used by the browsers
+ private final IconPool iconPool = new IconPool(); // Used by the browsers
+ private Thread poolingThread;
+ private boolean stopPooling;
+ private boolean pooling;
+ private ApplicationTrustManager trustManager;
+ private ConnectionProtocolPolicy connectionPolicy =
+ ConnectionProtocolPolicy.USE_MOST_SECURE_AVAILABLE;
+ private String ldapURL;
+ private String startTLSURL;
+ private String ldapsURL;
+ private String adminConnectorURL;
+
+ private static boolean mustDeregisterConfig;
+
+ private Set<AbstractIndexDescriptor> modifiedIndexes =
+ new HashSet<AbstractIndexDescriptor>();
+
+ private LinkedHashSet<ConfigChangeListener> configListeners =
+ new LinkedHashSet<ConfigChangeListener>();
+
+
+ private LinkedHashSet<BackupCreatedListener> backupListeners =
+ new LinkedHashSet<BackupCreatedListener>();
+
+ private LinkedHashSet<IndexModifiedListener> indexListeners =
+ new LinkedHashSet<IndexModifiedListener>();
+
+ private static final Logger LOG =
+ Logger.getLogger(ControlPanelInfo.class.getName());
+
+ private static ControlPanelInfo instance;
+
+ private ControlPanelInfo()
+ {
+ }
+
+ /**
+ * Returns a singleton for this instance.
+ * @return the control panel info.
+ */
+ public static ControlPanelInfo getInstance()
+ {
+ if (instance == null)
+ {
+ instance = new ControlPanelInfo();
+ try
+ {
+ instance.setTrustManager(
+ new ApplicationTrustManager(UIKeyStore.getInstance()));
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING, "Error retrieving UI key store: "+t, t);
+ instance.setTrustManager(new ApplicationTrustManager(null));
+ }
+ }
+ return instance;
+ }
+
+ /**
+ * Returns the last ServerDescriptor that has been retrieved.
+ * @return the last ServerDescriptor that has been retrieved.
+ */
+ public ServerDescriptor getServerDescriptor()
+ {
+ return serverDesc;
+ }
+
+ /**
+ * Returns the list of tasks.
+ * @return the list of tasks.
+ */
+ public Set<Task> getTasks()
+ {
+ return Collections.unmodifiableSet(tasks);
+ }
+
+ /**
+ * Registers a task. The Control Panel creates a task everytime an operation
+ * is made and they are stored here.
+ * @param task the task to be registered.
+ */
+ public void registerTask(Task task)
+ {
+ tasks.add(task);
+ }
+
+ /**
+ * Tells whether an index must be reindexed or not.
+ * @param index the index.
+ * @return <CODE>true</CODE> if the index must be reindexed and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean mustReindex(AbstractIndexDescriptor index)
+ {
+ boolean mustReindex = false;
+ for (AbstractIndexDescriptor i : modifiedIndexes)
+ {
+ if (i.getName().equals(index.getName()) &&
+ i.getBackend().getBackendID().equals(
+ index.getBackend().getBackendID()))
+ {
+ mustReindex = true;
+ break;
+ }
+ }
+ return mustReindex;
+ }
+
+ /**
+ * Registers an index as modified. This is used by the panels to be able
+ * to inform the user that a rebuild of the index is required.
+ * @param index the index.
+ */
+ public void registerModifiedIndex(AbstractIndexDescriptor index)
+ {
+ modifiedIndexes.add(index);
+ indexModified(index);
+ }
+
+ /**
+ * Unregisters a modified index.
+ * @param index the index.
+ * @return <CODE>true</CODE> if the index is found in the list of modified
+ * indexes and <CODE>false</CODE> otherwise.
+ */
+ public boolean unregisterModifiedIndex(AbstractIndexDescriptor index)
+ {
+ // We might have stored indexes whose configuration has changed, just remove
+ // them if they have the same name, are of the same type and are defined in
+ // the same backend.
+ Set<AbstractIndexDescriptor> toRemove =
+ new HashSet<AbstractIndexDescriptor>();
+ for (AbstractIndexDescriptor i : modifiedIndexes)
+ {
+ if (i.getName().equalsIgnoreCase(index.getName()) &&
+ i.getBackend().getBackendID().equalsIgnoreCase(
+ index.getBackend().getBackendID()) &&
+ i.getClass().equals((index.getClass())))
+ {
+ toRemove.add(i);
+ }
+ }
+ if (!toRemove.isEmpty())
+ {
+ boolean returnValue = modifiedIndexes.removeAll(toRemove);
+ indexModified(toRemove.iterator().next());
+ return returnValue;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Unregisters all the modified indexes on a given backend.
+ * @param backendName the name of the backend.
+ */
+ public void unregisterModifiedIndexesInBackend(String backendName)
+ {
+ HashSet<AbstractIndexDescriptor> toDelete =
+ new HashSet<AbstractIndexDescriptor>();
+ for (AbstractIndexDescriptor index : modifiedIndexes)
+ {
+ // Compare only the Backend ID, since the backend object attached to
+ // the registered index might have changed (for instance the number of
+ // entries). Relying on the backend ID to identify the backend is
+ // safe.
+ if (index.getBackend().getBackendID().equalsIgnoreCase(backendName))
+ {
+ toDelete.add(index);
+ }
+ }
+ modifiedIndexes.removeAll(toDelete);
+ for (BackendDescriptor backend : getServerDescriptor().getBackends())
+ {
+ if (backend.getBackendID().equals(backendName))
+ {
+ IndexModifiedEvent ev = new IndexModifiedEvent(backend);
+ for (IndexModifiedListener listener : indexListeners)
+ {
+ listener.backendIndexesModified(ev);
+ }
+ break;
+ }
+ }
+ }
+
+ /**
+ * Returns a collection with all the modified indexes.
+ * @return a collection with all the modified indexes.
+ */
+ public Collection<AbstractIndexDescriptor> getModifiedIndexes()
+ {
+ return Collections.unmodifiableCollection(modifiedIndexes);
+ }
+
+ /**
+ * Sets the dir context to be used by the ControlPanelInfo to retrieve
+ * monitoring and configuration information.
+ * @param ctx the connection.
+ */
+ public void setDirContext(InitialLdapContext ctx)
+ {
+ this.ctx = ctx;
+ }
+
+ /**
+ * Returns the dir context to be used by the ControlPanelInfo to retrieve
+ * monitoring and configuration information.
+ * @return the dir context to be used by the ControlPanelInfo to retrieve
+ * monitoring and configuration information.
+ */
+ public InitialLdapContext getDirContext()
+ {
+ return ctx;
+ }
+
+ /**
+ * Sets the dir context to be used by the ControlPanelInfo to retrieve
+ * user data.
+ * @param ctx the connection.
+ * @throws NamingException if there is a problem updating the connection pool.
+ */
+ public void setUserDataDirContext(InitialLdapContext ctx)
+ throws NamingException
+ {
+ if (userDataCtx != null)
+ {
+ if (connectionPool.isConnectionRegistered(userDataCtx))
+ {
+ try
+ {
+ connectionPool.unregisterConnection(userDataCtx);
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ this.userDataCtx = ctx;
+ if (ctx != null)
+ {
+ InitialLdapContext cloneLdc =
+ ConnectionUtils.cloneInitialLdapContext(userDataCtx,
+ ConnectionUtils.getDefaultLDAPTimeout(),
+ getTrustManager(), null);
+ connectionPool.registerConnection(cloneLdc);
+ }
+ }
+
+ /**
+ * Returns the dir context to be used by the ControlPanelInfo to retrieve
+ * user data.
+ * @return the dir context to be used by the ControlPanelInfo to retrieve
+ * user data.
+ */
+ public InitialLdapContext getUserDataDirContext()
+ {
+ return userDataCtx;
+ }
+
+ /**
+ * Informs that a backup has been created. The method will notify to all
+ * the backup listeners that a backup has been created.
+ * @param newBackup the new created backup.
+ */
+ public void backupCreated(BackupDescriptor newBackup)
+ {
+ BackupCreatedEvent ev = new BackupCreatedEvent(newBackup);
+ for (BackupCreatedListener listener : backupListeners)
+ {
+ listener.backupCreated(ev);
+ }
+ }
+
+ /**
+ * Informs that an index has been modified. The method will notify to all
+ * the index listeners that an index has been modified.
+ * @param modifiedIndex the modified index.
+ */
+ public void indexModified(AbstractIndexDescriptor modifiedIndex)
+ {
+ IndexModifiedEvent ev = new IndexModifiedEvent(modifiedIndex);
+ for (IndexModifiedListener listener : indexListeners)
+ {
+ listener.indexModified(ev);
+ }
+ }
+
+ /**
+ * Regenerates the last found ServerDescriptor object.
+ *
+ */
+ public synchronized void regenerateDescriptor()
+ {
+ ServerDescriptor desc = new ServerDescriptor();
+ InitialLdapContext ctx = getDirContext();
+ desc.setInstallPath(Utilities.getServerRootDirectory());
+ boolean windowsServiceEnabled = false;
+ if (Utilities.isWindows())
+ {
+ int result = ConfigureWindowsService.serviceState(null, null);
+ windowsServiceEnabled =
+ result == ConfigureWindowsService.SERVICE_STATE_ENABLED;
+ }
+ desc.setWindowsServiceEnabled(windowsServiceEnabled);
+ desc.setOpenDSVersion(
+ org.opends.server.util.DynamicConstants.FULL_VERSION_STRING);
+ ConfigReader reader;
+
+ ServerDescriptor.ServerStatus status = null;
+ for (Task task : getTasks())
+ {
+ if ((task.getType() == Task.Type.START_SERVER) &&
+ task.getState() == Task.State.RUNNING)
+ {
+ status = ServerDescriptor.ServerStatus.STARTING;
+ }
+ else if ((task.getType() == Task.Type.STOP_SERVER) &&
+ task.getState() == Task.State.RUNNING)
+ {
+ status = ServerDescriptor.ServerStatus.STOPPING;
+ }
+ }
+ if (status != null)
+ {
+ desc.setStatus(status);
+ if (status == ServerDescriptor.ServerStatus.STOPPING)
+ {
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ this.ctx = null;
+ }
+ if (userDataCtx != null)
+ {
+ if (connectionPool.isConnectionRegistered(userDataCtx))
+ {
+ try
+ {
+ connectionPool.unregisterConnection(userDataCtx);
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ try
+ {
+ userDataCtx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ userDataCtx = null;
+ }
+ }
+ reader = new ConfigFromFile();
+ ((ConfigFromFile)reader).readConfiguration();
+ desc.setAuthenticated(false);
+ }
+ else if (Utilities.isServerRunning(
+ Utilities.getInstanceRootDirectory(
+ desc.getInstallPath().getAbsolutePath())))
+ {
+ desc.setStatus(ServerDescriptor.ServerStatus.STARTED);
+ if (ctx == null)
+ {
+ reader = new ConfigFromFile();
+ ((ConfigFromFile)reader).readConfiguration();
+ }
+ else
+ {
+ reader = new ConfigFromDirContext();
+ ((ConfigFromDirContext)reader).readConfiguration(ctx);
+ if (reader.getExceptions().size() > 0)
+ {
+ // Check the connection
+ boolean connectionWorks = false;
+ int nMaxErrors = 5;
+ for (int i=0; i< nMaxErrors && !connectionWorks; i++)
+ {
+ try
+ {
+ Utilities.pingDirContext(ctx);
+ connectionWorks = true;
+ }
+ catch (NamingException ne)
+ {
+ }
+ }
+ if (!connectionWorks)
+ {
+ // Try with offline info
+ reader = new ConfigFromFile();
+ ((ConfigFromFile)reader).readConfiguration();
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ this.ctx = null;
+ if (connectionPool.isConnectionRegistered(userDataCtx))
+ {
+ try
+ {
+ connectionPool.unregisterConnection(userDataCtx);
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ try
+ {
+ userDataCtx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ userDataCtx = null;
+ }
+ }
+ }
+ desc.setAuthenticated(reader instanceof ConfigFromDirContext);
+ desc.setJavaVersion(reader.getJavaVersion());
+ desc.setOpenConnections(reader.getOpenConnections());
+ }
+ else
+ {
+ desc.setStatus(ServerDescriptor.ServerStatus.STOPPED);
+ desc.setAuthenticated(false);
+ reader = new ConfigFromFile();
+ ((ConfigFromFile)reader).readConfiguration();
+ }
+ desc.setExceptions(reader.getExceptions());
+ desc.setAdministrativeUsers(reader.getAdministrativeUsers());
+ desc.setBackends(reader.getBackends());
+ desc.setConnectionHandlers(reader.getConnectionHandlers());
+ desc.setAdminConnector(reader.getAdminConnector());
+ desc.setSchema(reader.getSchema());
+ desc.setSchemaEnabled(reader.isSchemaEnabled());
+
+ if ((serverDesc == null) || !serverDesc.equals(desc))
+ {
+ serverDesc = desc;
+ // Update the schema: so that when we call the server code the latest
+ // schema read is used.
+ if (serverDesc.getSchema() != null)
+ {
+ if (!ServerDescriptor.areSchemasEqual(serverDesc.getSchema(),
+ DirectoryServer.getSchema()))
+ {
+ DirectoryServer.setSchema(desc.getSchema());
+ }
+ }
+ ldapURL = getURL(serverDesc, ConnectionHandlerDescriptor.Protocol.LDAP);
+ ldapsURL = getURL(serverDesc, ConnectionHandlerDescriptor.Protocol.LDAPS);
+ adminConnectorURL = getAdminConnectorURL(serverDesc);
+ startTLSURL = getURL(serverDesc,
+ ConnectionHandlerDescriptor.Protocol.LDAP_STARTTLS);
+ ConfigurationChangeEvent ev = new ConfigurationChangeEvent(this, desc);
+ for (ConfigChangeListener listener : configListeners)
+ {
+ listener.configurationChanged(ev);
+ }
+ }
+ }
+
+ /**
+ * Adds a configuration change listener.
+ * @param listener the listener.
+ */
+ public void addConfigChangeListener(ConfigChangeListener listener)
+ {
+ configListeners.add(listener);
+ }
+
+ /**
+ * Removes a configuration change listener.
+ * @param listener the listener.
+ * @return <CODE>true</CODE> if the listener is found and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean removeConfigChangeListener(ConfigChangeListener listener)
+ {
+ return configListeners.remove(listener);
+ }
+
+ /**
+ * Adds a backup creation listener.
+ * @param listener the listener.
+ */
+ public void addBackupCreatedListener(BackupCreatedListener listener)
+ {
+ backupListeners.add(listener);
+ }
+
+ /**
+ * Removes a backup creation listener.
+ * @param listener the listener.
+ * @return <CODE>true</CODE> if the listener is found and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean removeBackupCreatedListener(BackupCreatedListener listener)
+ {
+ return backupListeners.remove(listener);
+ }
+
+ /**
+ * Adds an index modification listener.
+ * @param listener the listener.
+ */
+ public void addIndexModifiedListener(IndexModifiedListener listener)
+ {
+ indexListeners.add(listener);
+ }
+
+ /**
+ * Removes an index modification listener.
+ * @param listener the listener.
+ * @return <CODE>true</CODE> if the listener is found and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean removeIndexModifiedListener(IndexModifiedListener listener)
+ {
+ return indexListeners.remove(listener);
+ }
+
+ /**
+ * Starts pooling the server configuration. The period of the pooling is
+ * specified as a parameter. This method is asynchronous and it will start
+ * the pooling in another thread.
+ * @param period the pooling in miliseconds of the pooling.
+ */
+ public synchronized void startPooling(final long period)
+ {
+ if (poolingThread != null)
+ {
+ return;
+ }
+ pooling = true;
+ stopPooling = false;
+
+ poolingThread = new Thread(new Runnable()
+ {
+ public void run()
+ {
+ try
+ {
+ while (!stopPooling)
+ {
+ regenerateDescriptor();
+ Thread.sleep(period);
+ }
+ }
+ catch (Throwable t)
+ {
+ }
+ pooling = false;
+ }
+ });
+ poolingThread.start();
+ }
+
+ /**
+ * Stops pooling the server. This method is synchronous, it does not return
+ * until the pooling is actually stopped.
+ *
+ */
+ public synchronized void stopPooling()
+ {
+ stopPooling = true;
+ while ((poolingThread != null) && pooling)
+ {
+ try
+ {
+ poolingThread.interrupt();
+ Thread.sleep(100);
+ }
+ catch (Throwable t)
+ {
+ // do nothing;
+ }
+ }
+ poolingThread = null;
+ pooling = false;
+ }
+
+ /**
+ * Returns the trust manager to be used by this ControlPanelInfo (and in
+ * general by the control panel).
+ * @return the trust manager to be used by this ControlPanelInfo.
+ */
+ public ApplicationTrustManager getTrustManager()
+ {
+ return trustManager;
+ }
+
+ /**
+ * Sets the trust manager to be used by this ControlPanelInfo (and in
+ * general by the control panel).
+ * @param trustManager the trust manager to be used by this ControlPanelInfo.
+ */
+ public void setTrustManager(ApplicationTrustManager trustManager)
+ {
+ this.trustManager = trustManager;
+ connectionPool.setTrustManager(trustManager);
+ }
+
+ /**
+ * Returns the connection policy to be used by this ControlPanelInfo (and in
+ * general by the control panel).
+ * @return the connection policy to be used by this ControlPanelInfo.
+ */
+ public ConnectionProtocolPolicy getConnectionPolicy()
+ {
+ return connectionPolicy;
+ }
+
+ /**
+ * Sets the connection policy to be used by this ControlPanelInfo (and in
+ * general by the control panel).
+ * @param connectionPolicy the connection policy to be used by this
+ * ControlPanelInfo.
+ */
+ public void setConnectionPolicy(ConnectionProtocolPolicy connectionPolicy)
+ {
+ this.connectionPolicy = connectionPolicy;
+ }
+
+ /**
+ * Gets the LDAPS URL based in what is read in the configuration. It
+ * returns <CODE>null</CODE> if no LDAPS URL was found.
+ * @return the LDAPS URL to be used to connect to the server.
+ */
+ public String getLDAPSURL()
+ {
+ return ldapsURL;
+ }
+
+ /**
+ * Gets the Administration Connector URL based in what is read in the
+ * configuration. It returns <CODE>null</CODE> if no Administration
+ * Connector URL was found.
+ * @return the Administration Connector URL to be used to connect
+ * to the server.
+ */
+ public String getAdminConnectorURL()
+ {
+ return adminConnectorURL;
+ }
+
+ /**
+ * Gets the LDAP URL based in what is read in the configuration. It
+ * returns <CODE>null</CODE> if no LDAP URL was found.
+ * @return the LDAP URL to be used to connect to the server.
+ */
+ public String getLDAPURL()
+ {
+ return ldapURL;
+ }
+
+ /**
+ * Gets the Start TLS URL based in what is read in the configuration. It
+ * returns <CODE>null</CODE> if no Start TLS URL is found.
+ * @return the Start TLS URL to be used to connect to the server.
+ */
+ public String getStartTLSURL()
+ {
+ return startTLSURL;
+ }
+
+ /**
+ * Returns the LDAP URL to be used to connect to a given ServerDescriptor
+ * using a certain protocol. It returns <CODE>null</CODE> if URL for the
+ * protocol is not found.
+ * @param server the server descriptor.
+ * @param protocol the protocol to be used.
+ * @return the LDAP URL to be used to connect to a given ServerDescriptor
+ * using a certain protocol.
+ */
+ private static String getURL(ServerDescriptor server,
+ ConnectionHandlerDescriptor.Protocol protocol)
+ {
+ String url = null;
+
+ String sProtocol = null;
+ switch (protocol)
+ {
+ case LDAP:
+ sProtocol = "ldap";
+ break;
+ case LDAPS:
+ sProtocol = "ldaps";
+ break;
+ case LDAP_STARTTLS:
+ sProtocol = "ldap";
+ break;
+ case JMX:
+ sProtocol = "jmx";
+ break;
+ case JMXS:
+ sProtocol = "jmxs";
+ break;
+ }
+
+ for (ConnectionHandlerDescriptor desc : server.getConnectionHandlers())
+ {
+ if ((desc.getState() == ConnectionHandlerDescriptor.State.ENABLED) &&
+ (desc.getProtocol() == protocol))
+ {
+ int port = desc.getPort();
+ SortedSet<InetAddress> addresses = desc.getAdresses();
+ if (addresses.size() == 0)
+ {
+ if (port > 0)
+ {
+ url = sProtocol +"://"+
+ ConnectionUtils.getHostNameForLdapUrl(
+ server.getHostname())+":"+port;
+ }
+ }
+ else
+ {
+ if (port > 0)
+ {
+ InetAddress address = addresses.first();
+ url = sProtocol +"://"+
+ ConnectionUtils.getHostNameForLdapUrl(address.toString())+":"+
+ port;
+ }
+ }
+ }
+ }
+ return url;
+ }
+
+ /**
+ * Returns the Administration Connector URL.
+ * It returns <CODE>null</CODE> if URL for the
+ * protocol is not found.
+ * @param server the server descriptor.
+ * @return the Administration Connector URL.
+ */
+ private static String getAdminConnectorURL(ServerDescriptor server) {
+ String url = null;
+
+ ConnectionHandlerDescriptor desc = server.getAdminConnector();
+ int port = desc.getPort();
+ SortedSet<InetAddress> addresses = desc.getAdresses();
+ if (addresses.size() == 0) {
+ if (port > 0) {
+ url = "ldaps://" +
+ ConnectionUtils.getHostNameForLdapUrl(
+ server.getHostname()) + ":" + port;
+ }
+ } else {
+ if (port > 0) {
+ InetAddress address = addresses.first();
+ url = "ldaps://" +
+ ConnectionUtils.getHostNameForLdapUrl(address.toString()) + ":" +
+ port;
+ }
+ }
+ return url;
+ }
+
+ /**
+ * Tells whether we must connect to the server using Start TLS.
+ * @return <CODE>true</CODE> if we must connect to the server using Start TLS
+ * and <CODE>false</CODE> otherwise.
+ */
+ public boolean connectUsingStartTLS()
+ {
+ boolean connectUsingStartTLS = false;
+ if (getStartTLSURL() != null)
+ {
+ connectUsingStartTLS = getStartTLSURL().equals(getURLToConnect());
+ }
+ return connectUsingStartTLS;
+ }
+
+ /**
+ * Tells whether we must connect to the server using LDAPS.
+ * @return <CODE>true</CODE> if we must connect to the server using LDAPS
+ * and <CODE>false</CODE> otherwise.
+ */
+ public boolean connectUsingLDAPS()
+ {
+ boolean connectUsingLDAPS = false;
+ if (getLDAPSURL() != null)
+ {
+ connectUsingLDAPS = getLDAPSURL().equals(getURLToConnect());
+ }
+ return connectUsingLDAPS;
+ }
+
+ /**
+ * Returns the URL that must be used to connect to the server based on the
+ * available enabled connection handlers in the server and the connection
+ * policy.
+ * @return the URL that must be used to connect to the server.
+ */
+ public String getURLToConnect()
+ {
+ String url;
+ switch (getConnectionPolicy())
+ {
+ case USE_STARTTLS:
+ url = getStartTLSURL();
+ break;
+ case USE_LDAP:
+ url = getLDAPURL();
+ break;
+ case USE_LDAPS:
+ url = getLDAPSURL();
+ break;
+ case USE_ADMIN:
+ url = getAdminConnectorURL();
+ break;
+ case USE_MOST_SECURE_AVAILABLE:
+ url = getLDAPSURL();
+ if (url == null)
+ {
+ url = getStartTLSURL();
+ }
+ if (url == null)
+ {
+ url = getLDAPURL();
+ }
+ break;
+ case USE_LESS_SECURE_AVAILABLE:
+ url = getLDAPURL();
+ if (url == null)
+ {
+ url = getStartTLSURL();
+ }
+ if (url == null)
+ {
+ url = getLDAPSURL();
+ }
+ break;
+ default:
+ throw new IllegalStateException("Unknown policy: "+getConnectionPolicy());
+ }
+ return url;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the configuration must be deregistered and
+ * <CODE>false</CODE> otherwise.
+ * This is required when we use the ConfigFileHandler to update the
+ * configuration, in these cases cn=config must the deregistered from the
+ * ConfigFileHandler and after that register again.
+ * @return <CODE>true</CODE> if the configuration must be deregistered and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean mustDeregisterConfig()
+ {
+ return mustDeregisterConfig;
+ }
+
+ /**
+ * Sets whether the configuration must be deregistered or not.
+ * @param mustDeregisterConfig whether the configuration must be deregistered
+ * or not.
+ */
+ public void setMustDeregisterConfig(boolean mustDeregisterConfig)
+ {
+ ControlPanelInfo.mustDeregisterConfig = mustDeregisterConfig;
+ }
+
+ /**
+ * Returns the connection pool to be used by the LDAP entry browsers.
+ * @return the connection pool to be used by the LDAP entry browsers.
+ */
+ public LDAPConnectionPool getConnectionPool()
+ {
+ return connectionPool;
+ }
+
+ /**
+ * Returns the icon pool to be used by the LDAP entry browsers.
+ * @return the icon pool to be used by the LDAP entry browsers.
+ */
+ public IconPool getIconPool()
+ {
+ return iconPool;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
new file mode 100644
index 0000000..5d3fa2e
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
@@ -0,0 +1,196 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.CompositeName;
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.SearchResult;
+
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * This is a commodity class used to wrap the SearchResult class of JNDI.
+ * Basically it retrieves all the attributes and values on the SearchResult and
+ * calculates its DN. Using it we avoid having to handle the NamingException
+ * exceptions that most of the methods in SearchResult throw.
+ *
+ */
+public class CustomSearchResult implements Comparable {
+ private Name name;
+ private String dn;
+ private Map<String, Set<Object>> attributes;
+ private SortedSet<String> attrNames;
+
+ /**
+ * Constructor of an empty search result. This constructor is used by the
+ * LDAP entry editor which 'build' their own CustomSearchResult. The entry
+ * editors use some methods that require CustomSearchResult.
+ * @param dn the dn of the entry.
+ */
+ public CustomSearchResult(String dn)
+ {
+ this.dn = dn;
+ attributes = new HashMap<String, Set<Object>>();
+ attrNames = new TreeSet<String>();
+ }
+
+ /**
+ * Constructor of a search result using a SearchResult as basis.
+ * @param sr the SearchResult.
+ * @param baseDN the base DN of the search that returned the SearchResult.
+ * @throws NamingException if there is an error retrieving the attribute
+ * values.
+ */
+ public CustomSearchResult(SearchResult sr, String baseDN)
+ throws NamingException
+ {
+ String sName = sr.getName();
+ if ((baseDN != null) && (baseDN.length() > 0))
+ {
+ if ((sName != null) && (sName.length() > 0))
+ {
+ name = new CompositeName(sName);
+ name.add(baseDN);
+
+ }
+ else {
+ name = Utilities.getJNDIName(baseDN);
+ }
+ }
+ else {
+ name = new CompositeName(sName);
+ }
+ StringBuilder buf = new StringBuilder();
+ for (int i=0; i<name.size(); i++)
+ {
+ String n = name.get(i);
+ if ((buf.length() != 0) && (n != null) && (n.length() > 0))
+ {
+ buf.append(",");
+ }
+ if ((n != null) && (n.length() > 0))
+ {
+ buf.append(n);
+ }
+ }
+ dn = buf.toString();
+
+ attributes = new HashMap<String, Set<Object>>();
+ attrNames = new TreeSet<String>();
+ Attributes attrs = sr.getAttributes();
+ if (attrs != null)
+ {
+ NamingEnumeration en = attrs.getAll();
+ while (en.hasMore()) {
+ Attribute attr = (Attribute)en.next();
+ String name = attr.getID();
+ attrNames.add(name);
+ Set<Object> values = new HashSet<Object>();
+ for (int i=0; i<attr.size(); i++)
+ {
+ Object v = attr.get(i);
+ if (!"".equals(v.toString()))
+ {
+ values.add(v);
+ }
+ }
+ attributes.put(name.toLowerCase(), values);
+ }
+ }
+ }
+
+ /**
+ * Returns the DN of the entry.
+ * @return the DN of the entry.
+ */
+ public String getDN() {
+ return dn;
+ }
+
+ /**
+ * Returns the values for a given attribute. It returns an empty Set if
+ * the attribute is not defined.
+ * @param name the name of the attribute.
+ * @return the values for a given attribute. It returns an empty Set if
+ * the attribute is not defined.
+ */
+ public Set<Object> getAttributeValues(String name) {
+ Set<Object> values = attributes.get(name.toLowerCase());
+ if (values == null)
+ {
+ values = Collections.emptySet();
+ }
+ return values;
+ }
+
+ /**
+ * Returns all the attribute names of the entry.
+ * @return the attribute names of the entry.
+ */
+ public SortedSet<String> getAttributeNames() {
+ return attrNames;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compareTo(Object o) {
+ return this.getDN().compareTo(((CustomSearchResult)o).getDN());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString() {
+ return "dn: "+dn+"\nattributes: "+attributes;
+ }
+
+ /**
+ * Sets the values for a given attribute name.
+ * @param attrName the name of the attribute.
+ * @param values the values for the attribute.
+ */
+ public void set(String attrName, Set<Object> values)
+ {
+ attrNames.add(attrName);
+ attrName = attrName.toLowerCase();
+ attributes.put(attrName, values);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
new file mode 100644
index 0000000..e303a8f
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
@@ -0,0 +1,190 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
+import org.opends.server.types.AttributeType;
+
+/**
+ * The class used to describe the index configuration (the normal index: the
+ * one used to improve search performance on a given attribute).
+ *
+ */
+public class IndexDescriptor extends AbstractIndexDescriptor
+{
+
+ private SortedSet<IndexType> types = new TreeSet<IndexType>();
+ private boolean isDatabaseIndex;
+ private int entryLimit;
+ private AttributeType attr;
+ private int hashCode;
+
+ /**
+ * Constructor of the index.
+ * @param name name of the index.
+ * @param attr the attribute type associated with the index attribute.
+ * @param backend the backend where the index is defined.
+ * @param types the type of indexes (equality, substring, etc.).
+ * @param entryLimit the entry limit for the index.
+ */
+ public IndexDescriptor(String name, AttributeType attr,
+ BackendDescriptor backend,
+ SortedSet<IndexType> types, int entryLimit)
+ {
+ super(name, backend);
+ this.attr = attr;
+ this.types.addAll(types);
+ isDatabaseIndex = isDatabaseIndex(name);
+ this.entryLimit = entryLimit;
+ recalculateHashCode();
+ }
+
+ /**
+ * Returns the attribute type associated with the index attribute.
+ * @return the attribute type associated with the index attribute.
+ */
+ public AttributeType getAttributeType()
+ {
+ return attr;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compareTo(Object o)
+ {
+ int returnValue = -1;
+ if (o instanceof AbstractIndexDescriptor)
+ {
+ AbstractIndexDescriptor index = (AbstractIndexDescriptor)o;
+ returnValue = getName().compareTo(index.getName());
+ }
+ return returnValue;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ /**
+ * Returns the type of indexes (equality, substring, etc.).
+ * @return the type of indexes (equality, substring, etc.).
+ */
+ public SortedSet<IndexType> getTypes()
+ {
+ return new TreeSet<IndexType>(types);
+ }
+
+ /**
+ * Tells whether this is a database index or not. Database indexes are not
+ * modifiable and for internal use only.
+ * @return <CODE>true</CODE> if this is a database index and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isDatabaseIndex()
+ {
+ return isDatabaseIndex;
+ }
+
+ /**
+ * Tells whether the provide index name corresponds to a database index or
+ * not. Database indexes are not modifiable and for internal use only.
+ * @return <CODE>true</CODE> if the provide index name corresponds to a
+ * database index and <CODE>false</CODE> otherwise.
+ */
+ private boolean isDatabaseIndex(String name)
+ {
+ return name.equalsIgnoreCase("dn2id") ||
+ name.equalsIgnoreCase("id2children") ||
+ name.equalsIgnoreCase("id2subtree");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object o)
+ {
+ boolean equals = o == this;
+ if (!equals)
+ {
+ equals = o instanceof IndexDescriptor;
+ if (equals)
+ {
+ IndexDescriptor index = (IndexDescriptor)o;
+ equals = index.getName().equalsIgnoreCase(getName()) &&
+ index.isDatabaseIndex() == isDatabaseIndex() &&
+ index.getTypes().equals(getTypes()) &&
+ index.getEntryLimit() == getEntryLimit();
+
+ if (equals)
+ {
+ if ((getBackend() != null) && (index.getBackend() != null))
+ {
+ // Only compare the backend IDs. In this context is enough
+ equals = getBackend().getBackendID().equals(
+ index.getBackend().getBackendID());
+ }
+ }
+ }
+ }
+ return equals;
+ }
+
+ /**
+ * Returns the entry limit of the index.
+ * @return the entry limit of the index.
+ */
+ public int getEntryLimit()
+ {
+ return entryLimit;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void recalculateHashCode()
+ {
+ StringBuilder sb = new StringBuilder();
+ for (IndexType t : types)
+ {
+ sb.append(t+",");
+ }
+ if (getBackend() != null)
+ {
+ sb.append(getBackend().getBackendID());
+ }
+ hashCode = (getName()+sb+entryLimit).hashCode();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java
new file mode 100644
index 0000000..ba1e4fa
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java
@@ -0,0 +1,185 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import org.opends.messages.Message;
+import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
+
+/**
+ * The table model for the indexes. This is the table model used by the table
+ * that appears on the right side of the Manage Index dialog when the user
+ * clicks on the node "Index" and it gives a global view of the indexes
+ * defined on a given backend.
+ *
+ */
+public class IndexTableModel extends AbstractIndexTableModel
+{
+
+ private static final long serialVersionUID = 6979651281772979301L;
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String[] getColumnNames()
+ {
+ return new String[] {
+ getHeader(INFO_CTRL_PANEL_INDEXES_HEADER_ATTRIBUTE.get(), 30),
+ getHeader(INFO_CTRL_PANEL_INDEXES_HEADER_ENTRY_LIMIT.get(), 30),
+ getHeader(INFO_CTRL_PANEL_INDEXES_HEADER_INDEX_TYPES.get(), 30),
+ getHeader(INFO_CTRL_PANEL_INDEXES_HEADER_REQUIRES_REBUILD.get(), 30)
+ };
+ }
+
+ /**
+ * Comparable implementation.
+ * @param index1 the first index descriptor to compare.
+ * @param index2 the second index descriptor to compare.
+ * @return 1 if according to the sorting options set by the user the first
+ * index descriptor must be put before the second descriptor, 0 if they
+ * are equivalent in terms of sorting and -1 if the second descriptor must
+ * be put before the first descriptor.
+ */
+ public int compare(AbstractIndexDescriptor index1,
+ AbstractIndexDescriptor index2)
+ {
+ int result;
+ IndexDescriptor i1 = (IndexDescriptor)index1;
+ IndexDescriptor i2 = (IndexDescriptor)index2;
+
+ int[] possibleResults = {compareNames(i1, i2), compareEntryLimits(i1, i2),
+ compareTypes(i1, i2), compareRebuildRequired(i1, i2)};
+ result = possibleResults[sortColumn];
+ if (result == 0)
+ {
+ for (int i : possibleResults)
+ {
+ if (i != 0)
+ {
+ result = i;
+ break;
+ }
+ }
+ }
+ if (!sortAscending)
+ {
+ result = -result;
+ }
+ return result;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String[] getLine(AbstractIndexDescriptor index)
+ {
+ IndexDescriptor i = (IndexDescriptor)index;
+ return new String[] {
+ i.getName(), getEntryLimitValue(i), getIndexTypeString(i),
+ getRebuildRequiredString(i).toString()
+ };
+ }
+
+ /**
+ * Returns the String representing the entry limit value of the index.
+ * @return the String representing the entry limit value of the index.
+ */
+ private String getEntryLimitValue(IndexDescriptor i)
+ {
+ if (i.getEntryLimit() >= 0)
+ {
+ return String.valueOf(i.getEntryLimit());
+ }
+ else
+ {
+ return INFO_NOT_APPLICABLE_LABEL.get().toString();
+ }
+ }
+
+ // Comparison methods.
+
+ private int compareNames(IndexDescriptor i1, IndexDescriptor i2)
+ {
+ return i1.getName().compareTo(i2.getName());
+ }
+
+ private int compareEntryLimits(IndexDescriptor i1, IndexDescriptor i2)
+ {
+ return getEntryLimitValue(i1).compareTo(getEntryLimitValue(i2));
+ }
+
+ private int compareTypes(IndexDescriptor i1, IndexDescriptor i2)
+ {
+ return getIndexTypeString(i1).compareTo(getIndexTypeString(i2));
+ }
+
+ /**
+ * Returns the String representation of the index type for the index.
+ * @param index the index.
+ * @return the String representation of the index type for the index.
+ */
+ private String getIndexTypeString(IndexDescriptor index)
+ {
+ StringBuilder sb = new StringBuilder();
+ for (IndexType type : index.getTypes())
+ {
+ Message v;
+ switch (type)
+ {
+ case SUBSTRING:
+ v = INFO_CTRL_PANEL_INDEX_SUBSTRING.get();
+ break;
+ case ORDERING:
+ v = INFO_CTRL_PANEL_INDEX_ORDERING.get();
+ break;
+ case PRESENCE:
+ v = INFO_CTRL_PANEL_INDEX_PRESENCE.get();
+ break;
+ case EQUALITY:
+ v = INFO_CTRL_PANEL_INDEX_EQUALITY.get();
+ break;
+ case APPROXIMATE:
+ v = INFO_CTRL_PANEL_INDEX_APPROXIMATE.get();
+ break;
+ default:
+ throw new IllegalStateException("Unknown index type: "+type);
+ }
+ if (sb.length() > 0)
+ {
+ sb.append(", ");
+ }
+ sb.append(v);
+ }
+ if (sb.length() == 0)
+ {
+ sb.append(INFO_NOT_APPLICABLE_LABEL.get().toString());
+ }
+ return sb.toString();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
new file mode 100644
index 0000000..46b8b8a
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
@@ -0,0 +1,130 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+/**
+ * This class represent all the objectclass values for a given entry. It is
+ * used by the entry editors (SimplifiedEntryView and TableEntryView) to edit
+ * and display the objectclass.
+ *
+ */
+public class ObjectClassValue
+{
+ private String structural;
+ private SortedSet<String> auxiliary = new TreeSet<String>();
+ private int hashCode;
+
+ /**
+ * Constructor of the object class value.
+ * @param structural the name of the structural objectclass.
+ * @param auxiliary the auxiliary objectclasses.
+ */
+ public ObjectClassValue(String structural, Set<String> auxiliary)
+ {
+ this.structural = structural;
+ this.auxiliary.addAll(auxiliary);
+ hashCode = structural.hashCode();
+ for (String oc : auxiliary)
+ {
+ hashCode += oc.hashCode();
+ }
+ }
+
+ /**
+ * Returns the names of the auxiliary objectclasses.
+ * @return the names of the auxiliary objectclasses.
+ */
+ public SortedSet<String> getAuxiliary()
+ {
+ return auxiliary;
+ }
+
+ /**
+ * Returns the name of the structural objectclass.
+ * @return the name of the structural objectclass.
+ */
+ public String getStructural()
+ {
+ return structural;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object o)
+ {
+ boolean equals;
+ if (o != this)
+ {
+ if (o != null)
+ {
+ if (o instanceof ObjectClassValue)
+ {
+ ObjectClassValue oc = (ObjectClassValue)o;
+ if (structural != null)
+ {
+ equals = structural.equals(oc.getStructural());
+ }
+ else
+ {
+ equals = oc.getStructural() == null;
+ }
+ if (equals)
+ {
+ equals = auxiliary.equals(oc.getAuxiliary());
+ }
+ }
+ else
+ {
+ equals = false;
+ }
+ }
+ else
+ {
+ equals = false;
+ }
+ }
+ else
+ {
+ equals = true;
+ }
+ return equals;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
new file mode 100644
index 0000000..3d70f1e
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -0,0 +1,729 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.DN;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.Schema;
+
+/**
+ * This is just a class used to provide a data model describing what the
+ * StatusPanelDialog will show to the user.
+ */
+public class ServerDescriptor
+{
+ private ServerStatus status;
+ private int openConnections;
+ private Set<BackendDescriptor> backends = new HashSet<BackendDescriptor>();
+ private Set<ConnectionHandlerDescriptor> listeners =
+ new HashSet<ConnectionHandlerDescriptor>();
+ private ConnectionHandlerDescriptor adminConnector;
+ private Set<DN> administrativeUsers = new HashSet<DN>();
+ private File installPath;
+ private String openDSVersion;
+ private String javaVersion;
+ private ArrayList<OpenDsException> exceptions =
+ new ArrayList<OpenDsException>();
+ private boolean isWindowsServiceEnabled;
+ private boolean isSchemaEnabled;
+ private Schema schema;
+
+ private boolean isAuthenticated;
+
+ private static String hostName = "locahost";
+ static
+ {
+ try
+ {
+ hostName = java.net.InetAddress.getLocalHost().getHostName();
+ }
+ catch (Throwable t)
+ {
+ }
+ };
+
+ /**
+ * Enumeration indicating the status of the server.
+ *
+ */
+ public enum ServerStatus
+ {
+ /**
+ * Server Started.
+ */
+ STARTED,
+ /**
+ * Server Stopped.
+ */
+ STOPPED,
+ /**
+ * Server Starting.
+ */
+ STARTING,
+ /**
+ * Server Stopping.
+ */
+ STOPPING,
+ /**
+ * Status Unknown.
+ */
+ UNKNOWN
+ }
+
+ /**
+ * Default constructor.
+ */
+ public ServerDescriptor()
+ {
+ }
+
+ /**
+ * Return the administrative users.
+ * @return the administrative users.
+ */
+ public Set<DN> getAdministrativeUsers()
+ {
+ return Collections.unmodifiableSet(administrativeUsers);
+ }
+
+ /**
+ * Set the administrative users.
+ * @param administrativeUsers the administrative users to set
+ */
+ public void setAdministrativeUsers(Set<DN> administrativeUsers)
+ {
+ this.administrativeUsers.clear();
+ this.administrativeUsers.addAll(administrativeUsers);
+ }
+
+ /**
+ * Returns whether the schema is enabled or not.
+ * @return <CODE>true</CODE> if the schema is enabled and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isSchemaEnabled()
+ {
+ return isSchemaEnabled;
+ }
+
+ /**
+ * Sets whether the schema is enabled or not.
+ * @param isSchemaEnabled <CODE>true</CODE> if the schema is enabled and
+ * <CODE>false</CODE> otherwise.
+ */
+ public void setSchemaEnabled(boolean isSchemaEnabled)
+ {
+ this.isSchemaEnabled = isSchemaEnabled;
+ }
+
+ /**
+ * Return the install path where the server is installed.
+ * @return the install path where the server is installed.
+ */
+ public File getInstallPath()
+ {
+ return installPath;
+ }
+
+ /**
+ * Sets the install path where the server is installed.
+ * @param installPath the install path where the server is installed.
+ */
+ public void setInstallPath(File installPath)
+ {
+ this.installPath = installPath;
+ }
+
+ /**
+ * Return the java version used to run the server.
+ * @return the java version used to run the server.
+ */
+ public String getJavaVersion()
+ {
+ return javaVersion;
+ }
+
+ /**
+ * Set the java version used to run the server.
+ * @param javaVersion the java version used to run the server.
+ */
+ public void setJavaVersion(String javaVersion)
+ {
+ this.javaVersion = javaVersion;
+ }
+
+ /**
+ * Returns the number of open connection in the server.
+ * @return the number of open connection in the server.
+ */
+ public int getOpenConnections()
+ {
+ return openConnections;
+ }
+
+ /**
+ * Set the number of open connections.
+ * @param openConnections the number of open connections.
+ */
+ public void setOpenConnections(int openConnections)
+ {
+ this.openConnections = openConnections;
+ }
+
+ /**
+ * Returns the version of the server.
+ * @return the version of the server.
+ */
+ public String getOpenDSVersion()
+ {
+ return openDSVersion;
+ }
+
+ /**
+ * Sets the version of the server.
+ * @param openDSVersion the version of the server.
+ */
+ public void setOpenDSVersion(String openDSVersion)
+ {
+ this.openDSVersion = openDSVersion;
+ }
+
+ /**
+ * Returns the status of the server.
+ * @return the status of the server.
+ */
+ public ServerStatus getStatus()
+ {
+ return status;
+ }
+
+ /**
+ * Sets the status of the server.
+ * @param status the status of the server.
+ */
+ public void setStatus(ServerStatus status)
+ {
+ this.status = status;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object o)
+ {
+ boolean equals = false;
+ if (this != o)
+ {
+ if (o instanceof ServerDescriptor)
+ {
+ ServerDescriptor desc = (ServerDescriptor)o;
+ equals = desc.getStatus() == getStatus();
+
+ if (equals)
+ {
+ equals = desc.isAuthenticated() == isAuthenticated();
+ }
+
+ if (equals)
+ {
+ equals = desc.getOpenConnections() == getOpenConnections();
+ }
+
+ if (equals)
+ {
+ equals = desc.getInstallPath().equals(getInstallPath());
+ }
+
+ if (equals)
+ {
+ if (desc.getJavaVersion() == null)
+ {
+ equals = getJavaVersion() == null;
+ }
+ else
+ {
+ equals = desc.getJavaVersion().equals(getJavaVersion());
+ }
+ }
+
+ if (equals)
+ {
+ equals = desc.getOpenDSVersion().equals(getOpenDSVersion());
+ }
+
+ if (equals)
+ {
+ equals = desc.getAdministrativeUsers().equals(
+ getAdministrativeUsers());
+ }
+
+ if (equals)
+ {
+ equals = desc.getConnectionHandlers().equals(getConnectionHandlers());
+ }
+
+ if (equals)
+ {
+ equals = desc.getBackends().equals(getBackends());
+ }
+
+ if (equals)
+ {
+ equals = desc.getExceptions().equals(getExceptions());
+ }
+
+ if (equals)
+ {
+ equals = desc.isSchemaEnabled() == isSchemaEnabled();
+ }
+
+ if (equals)
+ {
+ if (desc.getSchema() == null)
+ {
+ equals = getSchema() != null;
+ }
+ else if (getSchema() == null)
+ {
+ equals = false;
+ }
+ else
+ {
+ equals = areSchemasEqual(schema, desc.getSchema());
+ }
+ }
+ }
+ }
+ else
+ {
+ equals = true;
+ }
+ return equals;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return status.hashCode() + openConnections +
+ (String.valueOf(
+ installPath+openDSVersion+javaVersion+isAuthenticated)).
+ hashCode();
+ }
+
+ /**
+ * Return whether we were authenticated when retrieving the information of
+ * this ServerStatusDescriptor.
+ * @return <CODE>true</CODE> if we were authenticated when retrieving the
+ * information of this ServerStatusDescriptor and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isAuthenticated()
+ {
+ return isAuthenticated;
+ }
+
+ /**
+ * Sets whether we were authenticated when retrieving the information of
+ * this ServerStatusDescriptor.
+ * @param isAuthenticated whether we were authenticated when retrieving the
+ * information of this ServerStatusDescriptor.
+ */
+ public void setAuthenticated(boolean isAuthenticated)
+ {
+ this.isAuthenticated = isAuthenticated;
+ }
+
+ /**
+ * Returns the backend descriptors of the server.
+ * @return the backend descriptors of the server.
+ */
+ public Set<BackendDescriptor> getBackends()
+ {
+ return Collections.unmodifiableSet(backends);
+ }
+
+ /**
+ * Sets the backend descriptors of the server.
+ * @param backends the database descriptors to set.
+ */
+ public void setBackends(Set<BackendDescriptor> backends)
+ {
+ this.backends.clear();
+ this.backends.addAll(backends);
+ }
+
+ /**
+ * Returns the listener descriptors of the server.
+ * @return the listener descriptors of the server.
+ */
+ public Set<ConnectionHandlerDescriptor> getConnectionHandlers()
+ {
+ return Collections.unmodifiableSet(listeners);
+ }
+
+ /**
+ * Sets the listener descriptors of the server.
+ * @param listeners the listener descriptors to set.
+ */
+ public void setConnectionHandlers(Set<ConnectionHandlerDescriptor> listeners)
+ {
+ this.listeners.clear();
+ this.listeners.addAll(listeners);
+ }
+
+ /**
+ * Sets the schema of the server.
+ * @param schema the schema of the server.
+ */
+ public void setSchema(Schema schema)
+ {
+ this.schema = schema;
+ }
+
+ /**
+ * Returns the schema of the server.
+ * @return the schema of the server.
+ */
+ public Schema getSchema()
+ {
+ return schema;
+ }
+
+ /**
+ * Returns the host name of the server.
+ * @return the host name of the server.
+ */
+ public String getHostname()
+ {
+ return hostName;
+ }
+
+ /**
+ * Returns the exceptions that occurred while reading the configuration.
+ * @return the exceptions that occurred while reading the configuration.
+ */
+ public List<OpenDsException> getExceptions()
+ {
+ return Collections.unmodifiableList(exceptions);
+ }
+
+ /**
+ * Sets the exceptions that occurred while reading the configuration.
+ * @param exceptions exceptions that occurred while reading the
+ * configuration.
+ */
+ public void setExceptions(Collection<OpenDsException> exceptions)
+ {
+ this.exceptions.clear();
+ this.exceptions.addAll(exceptions);
+ }
+
+ /**
+ * Tells whether the windows service is enabled or not.
+ * @return <CODE>true</CODE> if the windows service is enabled and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isWindowsServiceEnabled()
+ {
+ return isWindowsServiceEnabled;
+ }
+
+ /**
+ * Sets whether the windows service is enabled or not.
+ * @param isWindowsServiceEnabled <CODE>true</CODE> if the windows service is
+ * enabled and <CODE>false</CODE> otherwise.
+ */
+ public void setWindowsServiceEnabled(boolean isWindowsServiceEnabled)
+ {
+ this.isWindowsServiceEnabled = isWindowsServiceEnabled;
+ }
+
+ /**
+ * Method used to compare schemas.
+ * Returns <CODE>true</CODE> if the two schemas are equal and
+ * <CODE>false</CODE> otherwise.
+ * @param schema1 the first schema.
+ * @param schema2 the second schema.
+ * @return <CODE>true</CODE> if the two schemas are equal and
+ * <CODE>false</CODE> otherwise.
+ */
+ public static boolean areSchemasEqual(Schema schema1, Schema schema2)
+ {
+ boolean areEqual = schema1 == schema2;
+
+ if (!areEqual && (schema1 != null) && (schema2 != null))
+ {
+ areEqual = true;
+
+ // Just compare exhaustively objectclasses and attributes.
+ Map<String, AttributeType> attrs1 = schema1.getAttributeTypes();
+ Map<String, AttributeType> attrs2 = schema2.getAttributeTypes();
+ areEqual = attrs1.size() == attrs2.size();
+ for (String name : attrs1.keySet())
+ {
+ if (!areEqual)
+ {
+ break;
+ }
+
+ AttributeType attr1 = attrs1.get(name);
+ AttributeType attr2 = attrs2.get(name);
+ if (attr2 != null)
+ {
+ areEqual = areAttributesEqual(attr1, attr2);
+ }
+ else
+ {
+ areEqual = false;
+ }
+ }
+ if (areEqual)
+ {
+ Map<String, ObjectClass> ocs1 = schema1.getObjectClasses();
+ Map<String, ObjectClass> ocs2 = schema2.getObjectClasses();
+ areEqual = ocs1.size() == ocs2.size();
+ for (String name : ocs1.keySet())
+ {
+ if (!areEqual)
+ {
+ break;
+ }
+
+ ObjectClass oc1 = ocs1.get(name);
+ ObjectClass oc2 = ocs2.get(name);
+ if (oc2 != null)
+ {
+ areEqual = areObjectClassesEqual(oc1, oc2);
+ }
+ else
+ {
+ areEqual = false;
+ }
+ }
+ }
+ if (areEqual)
+ {
+ areEqual = schema1.getMatchingRules().equals(
+ schema2.getMatchingRules());
+ }
+ if (areEqual)
+ {
+ areEqual = schema1.getSyntaxes().equals(schema2.getSyntaxes());
+ }
+ }
+ return areEqual;
+ }
+
+ /**
+ * Method used to compare attributes defined in the schema.
+ * Returns <CODE>true</CODE> if the two schema attributes are equal and
+ * <CODE>false</CODE> otherwise.
+ * @param schema1 the first schema attribute.
+ * @param schema2 the second schema attribute.
+ * @return <CODE>true</CODE> if the two schema attributes are equal and
+ * <CODE>false</CODE> otherwise.
+ */
+ private static final boolean areAttributesEqual(AttributeType attr1,
+ AttributeType attr2)
+ {
+ boolean areEqual = attr1.getOID().equals(attr2.getOID()) &&
+ attr1.isCollective() == attr2.isCollective() &&
+ attr1.isNoUserModification() == attr2.isNoUserModification() &&
+ attr1.isObjectClassType() == attr2.isObjectClassType() &&
+ attr1.isObsolete() == attr2.isObsolete() &&
+ attr1.isOperational() == attr2.isOperational() &&
+ attr1.isSingleValue() == attr2.isSingleValue();
+
+ if (areEqual)
+ {
+ Object[] compareWithEqual = {attr1.getApproximateMatchingRule(),
+ attr2.getApproximateMatchingRule(),
+ attr1.getDefinitionWithFileName(), attr2.getDefinitionWithFileName(),
+ attr1.getDescription(), attr2.getDescription(),
+ attr1.getEqualityMatchingRule(), attr2.getEqualityMatchingRule(),
+ attr1.getOrderingMatchingRule(), attr2.getOrderingMatchingRule(),
+ attr1.getSubstringMatchingRule(), attr2.getSubstringMatchingRule(),
+ attr1.getSuperiorType(), attr2.getSuperiorType(),
+ attr1.getSyntax(), attr2.getSyntax(),
+ attr1.getSyntaxOID(), attr2.getSyntaxOID()
+ };
+
+ for (int i=0; i<compareWithEqual.length && areEqual; i++)
+ {
+ areEqual = areEqual(compareWithEqual[i], compareWithEqual[i+1]);
+ i ++;
+ }
+
+
+ if (areEqual)
+ {
+ Iterable[] iterables = {attr1.getExtraPropertyNames(),
+ attr2.getExtraPropertyNames(),
+ attr1.getNormalizedNames(), attr2.getNormalizedNames(),
+ attr1.getUserDefinedNames(), attr2.getUserDefinedNames()};
+ for (int i=0; i<iterables.length && areEqual; i++)
+ {
+ Set<Object> set1 = new HashSet<Object>();
+ Set<Object> set2 = new HashSet<Object>();
+ for (Object o : iterables[i])
+ {
+ set1.add(o);
+ }
+ for (Object o : iterables[i+1])
+ {
+ set2.add(o);
+ }
+ areEqual = set1.equals(set2);
+ i ++;
+ }
+ }
+ }
+
+ return areEqual;
+ }
+
+ /**
+ * Method used to compare objectclasses defined in the schema.
+ * Returns <CODE>true</CODE> if the two schema objectclasses are equal and
+ * <CODE>false</CODE> otherwise.
+ * @param schema1 the first schema objectclass.
+ * @param schema2 the second schema objectclass.
+ * @return <CODE>true</CODE> if the two schema objectclasses are equal and
+ * <CODE>false</CODE> otherwise.
+ */
+ private static final boolean areObjectClassesEqual(ObjectClass oc1,
+ ObjectClass oc2)
+ {
+ boolean areEqual = oc1.getOID().equals(oc2.getOID()) &&
+ oc1.isExtensibleObject() == oc2.isExtensibleObject();
+ if (areEqual)
+ {
+ Object[] compareWithEqual = {
+ oc1.getDefinitionWithFileName(), oc2.getDefinitionWithFileName(),
+ oc1.getDescription(), oc2.getDescription(),
+ oc1.getObjectClassType(), oc2.getObjectClassType(),
+ oc1.getOptionalAttributes(), oc2.getOptionalAttributes(),
+ oc1.getRequiredAttributes(), oc2.getRequiredAttributes(),
+ oc1.getSuperiorClass(), oc2.getSuperiorClass()
+ };
+
+ for (int i=0; i<compareWithEqual.length && areEqual; i++)
+ {
+ areEqual = areEqual(compareWithEqual[i], compareWithEqual[i+1]);
+ i ++;
+ }
+ }
+
+ if (areEqual)
+ {
+ Iterable[] iterables = {
+ oc1.getExtraPropertyNames(), oc2.getExtraPropertyNames(),
+ oc1.getNormalizedNames(), oc2.getNormalizedNames(),
+ oc1.getUserDefinedNames(), oc2.getUserDefinedNames()};
+ for (int i=0; i<iterables.length && areEqual; i++)
+ {
+ Set<Object> set1 = new HashSet<Object>();
+ Set<Object> set2 = new HashSet<Object>();
+ for (Object o : iterables[i])
+ {
+ set1.add(o);
+ }
+ for (Object o : iterables[i+1])
+ {
+ set2.add(o);
+ }
+ areEqual = set1.equals(set2);
+ i ++;
+ }
+ }
+
+ return areEqual;
+
+ }
+
+ /**
+ * Commodity method used to compare two objects that might be
+ * <CODE>null</CODE>.
+ * @param o1 the first object.
+ * @param o2 the second object.
+ * @return if both objects are <CODE>null</CODE> returns true. If not returns
+ * <CODE>true</CODE> if both objects are equal according to the Object.equal
+ * method and <CODE>false</CODE> otherwise.
+ */
+ private static boolean areEqual(Object o1, Object o2)
+ {
+ boolean areEqual = false;
+ if (o1 != null)
+ {
+ if (o2 != null)
+ {
+ areEqual = o1.equals(o2);
+ }
+ else
+ {
+ areEqual = false;
+ }
+ }
+ else
+ {
+ areEqual = o2 == null;
+ }
+ return areEqual;
+ }
+
+ /**
+ * Returns the admin connector.
+ * @return the admin connector.
+ */
+ public ConnectionHandlerDescriptor getAdminConnector()
+ {
+ return adminConnector;
+ }
+
+ /**
+ * Sets the admin connector.
+ * @param adminConnector the admin connector.
+ */
+ public void setAdminConnector(ConnectionHandlerDescriptor adminConnector)
+ {
+ this.adminConnector = adminConnector;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableListModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
new file mode 100644
index 0000000..6647d9e
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
@@ -0,0 +1,145 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.AbstractListModel;
+
+/**
+ * Note: this implementation does not call automatically fireContentsChanged,
+ * its up to the caller of the different methods of this implementation to
+ * call it explicitly. This is done because in general there is a series
+ * of calls to the add/remove methods and a single call to notify that
+ * things have changed is enough.
+ *
+ * @param <T>
+ */
+public class SortableListModel<T> extends AbstractListModel
+{
+ private static final long serialVersionUID = 3241258779190228463L;
+ private SortedSet<T> data = new TreeSet<T>();
+
+ /**
+ * Returns the size of the list model.
+ * @return the size of the list model.
+ */
+ public int getSize()
+ {
+ return data.size();
+ }
+
+ /**
+ * Sets the comparator to be used to sort the list.
+ * @param comp the comparator.
+ */
+ public void setComparator(Comparator<T> comp)
+ {
+ SortedSet<T> copy = data;
+ data = new TreeSet<T>(comp);
+ data.addAll(copy);
+ }
+
+ /**
+ * Returns the element at the specified index.
+ * @param i the index of the element.
+ * @return the element at the specified index.
+ */
+ public T getElementAt(int i)
+ {
+ int index = 0;
+ for (T element : data)
+ {
+ if (index == i)
+ {
+ return element;
+ }
+ index++;
+ }
+ throw new ArrayIndexOutOfBoundsException(
+ "The index "+i+" is bigger than the maximum size: "+getSize());
+ }
+
+ /**
+ * Adds a value to the list model.
+ * @param value the value to be added.
+ */
+ public void add(T value)
+ {
+ data.add(value);
+ }
+
+ /**
+ * Removes a value from the list model.
+ * @param value the value to be removed.
+ * @return <CODE>true</CODE> if the element was on the list and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean remove(T value)
+ {
+ return data.remove(value);
+ }
+
+ /**
+ * Clears the list model.
+ *
+ */
+ public void clear()
+ {
+ data.clear();
+ }
+
+ /**
+ * Adds all the elements in the collection to the list model.
+ * @param newData the collection containing the elements to be added.
+ */
+ public void addAll(Collection<T> newData)
+ {
+ data.addAll(newData);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void fireContentsChanged(Object source, int index0, int index1)
+ {
+ super.fireContentsChanged(source, index0, index1);
+ }
+
+ /**
+ * Returns the data in this list model ordered.
+ * @return the data in this list model ordered.
+ */
+ public SortedSet<T> getData()
+ {
+ return new TreeSet<T>(data);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java
new file mode 100644
index 0000000..bf9bdc2
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java
@@ -0,0 +1,99 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import javax.swing.table.AbstractTableModel;
+
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.util.ServerConstants;
+import org.opends.server.util.StaticUtils;
+
+/**
+ * A generic interface that must implement table models that are sortable.
+ */
+public abstract class SortableTableModel extends AbstractTableModel
+{
+ /**
+ * Returns whether the sort is ascending or descending.
+ * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
+ * otherwise.
+ */
+ public abstract boolean isSortAscending();
+
+ /**
+ * Sets whether to sort ascending of descending.
+ * @param sortAscending whether to sort ascending or descending.
+ */
+ public abstract void setSortAscending(boolean sortAscending);
+
+ /**
+ * Returns the column index used to sort.
+ * @return the column index used to sort.
+ */
+ public abstract int getSortColumn();
+
+ /**
+ * Sets the column index used to sort.
+ * @param sortColumn column index used to sort..
+ */
+ public abstract void setSortColumn(int sortColumn);
+
+ /**
+ * Updates the table model contents and sorts its contents depending on the
+ * sort options set by the user.
+ */
+ public abstract void forceResort();
+
+
+ /**
+ * Returns the header wrapped with the default line width.
+ * @param msg the header message value (with no HTML formatting).
+ * @return the header wrapped with the default line width.
+ */
+ protected String getHeader(Message msg)
+ {
+ return getHeader(msg, 15);
+ }
+
+ /**
+ * Returns the header wrapped with a certain line width.
+ * @param msg the header message value (with no HTML formatting).
+ * @param wrap the maximum line width before wrapping.
+ * @return the header wrapped with the specified line width.
+ */
+ protected String getHeader(Message msg, int wrap)
+ {
+ String text = msg.toString();
+ String wrappedText = StaticUtils.wrapText(text, wrap);
+ wrappedText = wrappedText.replaceAll(ServerConstants.EOL, "<br>");
+ return "<html>"+Utilities.applyFont(wrappedText,
+ ColorAndFontConstants.headerFont);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
new file mode 100644
index 0000000..1a71623
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
@@ -0,0 +1,190 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn.Scope;
+import org.opends.server.types.DN;
+
+/**
+ * The class used to describe the VLV index configuration.
+ *
+ */
+public class VLVIndexDescriptor extends AbstractIndexDescriptor
+{
+ private DN baseDN;
+ private Scope scope;
+ private String filter;
+ private List<VLVSortOrder> sortOrder = new ArrayList<VLVSortOrder>();
+ private int maxBlockSize;
+ private int hashCode;
+
+ /**
+ * Constructor for the VLVIndexDescriptor.
+ * @param name the name of the index.
+ * @param backend the backend where the index is defined.
+ * @param baseDN the baseDN of the search indexed by the VLV index.
+ * @param scope the scope of the search indexed by the VLV index.
+ * @param filter the filter or the search indexed by the VLV index.
+ * @param sortOrder the sort order list of the VLV index.
+ * @param maxBlockSize the maximum block size of the VLV index.
+ */
+ public VLVIndexDescriptor(String name, BackendDescriptor backend, DN baseDN,
+ Scope scope, String filter, List<VLVSortOrder> sortOrder,
+ int maxBlockSize)
+ {
+ super(name, backend);
+ this.baseDN = baseDN;
+ this.scope = scope;
+ this.filter = filter;
+ this.sortOrder.addAll(sortOrder);
+ this.maxBlockSize = maxBlockSize;
+
+ recalculateHashCode();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compareTo(Object o)
+ {
+ int returnValue = -1;
+ if (o instanceof AbstractIndexDescriptor)
+ {
+ AbstractIndexDescriptor index = (AbstractIndexDescriptor)o;
+ returnValue = getName().compareTo(index.getName());
+ }
+ return returnValue;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ /**
+ * Returns the baseDN of the search indexed by the VLV index.
+ * @return the baseDN of the search indexed by the VLV index.
+ */
+ public DN getBaseDN()
+ {
+ return baseDN;
+ }
+
+ /**
+ * Returns the filter of the search indexed by the VLV index.
+ * @return the filter of the search indexed by the VLV index.
+ */
+ public String getFilter()
+ {
+ return filter;
+ }
+
+ /**
+ * Returns the scope of the search indexed by the VLV index.
+ * @return the scope of the search indexed by the VLV index.
+ */
+ public Scope getScope()
+ {
+ return scope;
+ }
+
+ /**
+ * Returns the sort order list of the VLV index.
+ * @return the sort order list of the VLV index.
+ */
+ public List<VLVSortOrder> getSortOrder()
+ {
+ return Collections.unmodifiableList(sortOrder);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object o)
+ {
+ boolean equals = o == this;
+ if (!equals)
+ {
+ equals = o instanceof VLVIndexDescriptor;
+ if (equals)
+ {
+ VLVIndexDescriptor index = (VLVIndexDescriptor)o;
+ equals = index.getName().equalsIgnoreCase(getName()) &&
+ index.getBaseDN().equals(getBaseDN()) &&
+ index.getFilter().equals(getFilter()) &&
+ index.getScope() == getScope() &&
+ index.getSortOrder().equals(getSortOrder());
+ if (equals)
+ {
+ if ((getBackend() != null) && (index.getBackend() != null))
+ {
+ // Only compare the backend IDs. In this context is better to
+ // do this since the backend object contains some state (like
+ // number entries) that can change.
+ equals = getBackend().getBackendID().equals(
+ index.getBackend().getBackendID());
+ }
+ }
+ }
+ }
+ return equals;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void recalculateHashCode()
+ {
+ StringBuilder sb = new StringBuilder();
+ for (VLVSortOrder s : sortOrder)
+ {
+ sb.append(s.getAttributeName()+s.isAscending()+",");
+ }
+ if (getBackend() != null)
+ {
+ sb.append(getBackend().getBackendID());
+ }
+ hashCode = (getName()+baseDN+scope+filter+sb+maxBlockSize).hashCode();
+ }
+
+ /**
+ * Returns the maximum block size of the VLV index.
+ * @return the maximum block size of the VLV index.
+ */
+ public int getMaxBlockSize()
+ {
+ return maxBlockSize;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
new file mode 100644
index 0000000..26d7cae
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
@@ -0,0 +1,224 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * The table model for the VLV indexes. This is the table model used by the
+ * table that appears on the right side of the Manage Index dialog when the user
+ * clicks on the node "VLV Indexes" and it gives a global view of the VLV
+ * indexes defined on a given backend.
+ *
+ */
+public class VLVIndexTableModel extends AbstractIndexTableModel
+{
+ private static final long serialVersionUID = 897379916278218775L;
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String[] getColumnNames()
+ {
+ return new String[] {
+ getHeader(INFO_CTRL_PANEL_VLV_INDEXES_HEADER_NAME.get()),
+ getHeader(INFO_CTRL_PANEL_VLV_INDEXES_HEADER_BASE_DN.get(), 30),
+ getHeader(INFO_CTRL_PANEL_VLV_INDEXES_HEADER_SCOPE.get()),
+ getHeader(INFO_CTRL_PANEL_VLV_INDEXES_HEADER_FILTER.get()),
+ getHeader(INFO_CTRL_PANEL_VLV_INDEXES_HEADER_SORT_ORDER.get(), 30),
+ getHeader(INFO_CTRL_PANEL_VLV_INDEXES_HEADER_REQUIRES_REBUILD.get(), 30)
+ };
+ }
+
+ /**
+ * Comparable implementation.
+ * @param index1 the first VLV index descriptor to compare.
+ * @param index2 the second VLV index descriptor to compare.
+ * @return 1 if according to the sorting options set by the user the first
+ * index descriptor must be put before the second descriptor, 0 if they
+ * are equivalent in terms of sorting and -1 if the second descriptor must
+ * be put before the first descriptor.
+ */
+ public int compare(AbstractIndexDescriptor index1,
+ AbstractIndexDescriptor index2)
+ {
+ int result;
+ VLVIndexDescriptor i1 = (VLVIndexDescriptor)index1;
+ VLVIndexDescriptor i2 = (VLVIndexDescriptor)index2;
+
+ int[] possibleResults = {compareNames(i1, i2), compareBaseDNs(i1, i2),
+ compareScopes(i1, i2), compareFilters(i1, i2),
+ compareSortOrders(i1, i2), compareRebuildRequired(i1, i2)};
+ result = possibleResults[sortColumn];
+ if (result == 0)
+ {
+ for (int i : possibleResults)
+ {
+ if (i != 0)
+ {
+ result = i;
+ break;
+ }
+ }
+ }
+ if (!sortAscending)
+ {
+ result = -result;
+ }
+ return result;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String[] getLine(AbstractIndexDescriptor index)
+ {
+ VLVIndexDescriptor i = (VLVIndexDescriptor)index;
+ return new String[] {
+ i.getName(), getDNValue(i), getScopeDisplayValue(i), i.getFilter(),
+ getSortOrderDisplayValue(i), getRebuildRequiredString(i).toString()
+ };
+ }
+
+ /**
+ * Returns the VLV index DN value in String format.
+ * @param i the VLV index.
+ * @return the VLV index DN value in String format.
+ */
+ private String getDNValue(VLVIndexDescriptor i)
+ {
+ return Utilities.unescapeUtf8(i.getBaseDN().toString());
+ }
+
+ /**
+ * Returns the VLV index scope value in String format. This is the value used
+ * to make String comparisons.
+ * @param i the VLV index.
+ * @return the VLV index scope value in String format.
+ */
+ private String getScopeStringValue(VLVIndexDescriptor i)
+ {
+ String s;
+ switch (i.getScope())
+ {
+ case BASE_OBJECT:
+ s = "Base Object";
+ break;
+ case SINGLE_LEVEL:
+ s = "Single Level";
+ break;
+ case WHOLE_SUBTREE:
+ s = "Whole Subtree";
+ break;
+ case SUBORDINATE_SUBTREE:
+ s = "Subordinate Subtree";
+ break;
+ default:
+ throw new IllegalStateException("Unknow scope: "+i.getScope());
+ }
+ return s;
+ }
+
+ /**
+ * Returns the VLV index scope display value in String format. This is the
+ * value to be stored in the table model.
+ * @param i the VLV index.
+ * @return the VLV index DN value in String format.
+ */
+ private String getScopeDisplayValue(VLVIndexDescriptor i)
+ {
+ return "<html>"+getScopeStringValue(i);
+ }
+
+ /**
+ * Returns the VLV index sort order value in String format. This is the value
+ * used to make String comparisons.
+ * @param i the VLV index.
+ * @return the VLV index DN value in String format.
+ */
+ private String getSortOrderStringValue(VLVIndexDescriptor i)
+ {
+ StringBuilder sb = new StringBuilder();
+ for (VLVSortOrder sortOrder : i.getSortOrder())
+ {
+ if (sb.length() > 0)
+ {
+ sb.append(", ");
+ }
+ sb.append(sortOrder.getAttributeName());
+ if (sortOrder.isAscending())
+ {
+ sb.append(" (ascending)");
+ }
+ else
+ {
+ sb.append(" (descending)");
+ }
+ }
+ if (sb.length() == 0)
+ {
+ sb.append(INFO_NOT_APPLICABLE_LABEL.get().toString());
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Returns the VLV index sort order value in String format. This is the value
+ * stored in the table model.
+ * @param i the VLV index.
+ * @return the VLV index sort order value in String format.
+ */
+ private String getSortOrderDisplayValue(VLVIndexDescriptor i)
+ {
+ return "<html>"+getSortOrderStringValue(i).replaceAll(", ",",<br>");
+ }
+
+ //Comparison methods.
+
+ private int compareBaseDNs(VLVIndexDescriptor i1, VLVIndexDescriptor i2)
+ {
+ return getDNValue(i1).compareTo(getDNValue(i2));
+ }
+
+ private int compareScopes(VLVIndexDescriptor i1, VLVIndexDescriptor i2)
+ {
+ return getScopeStringValue(i1).compareTo(getScopeStringValue(i2));
+ }
+
+ private int compareFilters(VLVIndexDescriptor i1, VLVIndexDescriptor i2)
+ {
+ return i1.getFilter().compareTo(i2.getFilter());
+ }
+
+ private int compareSortOrders(VLVIndexDescriptor i1, VLVIndexDescriptor i2)
+ {
+ return getSortOrderStringValue(i1).compareTo(getSortOrderStringValue(i2));
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java
new file mode 100644
index 0000000..8383738
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java
@@ -0,0 +1,96 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.datamodel;
+
+/**
+ * Class that describes the VLV sort order.
+ */
+public class VLVSortOrder
+{
+ private String attributeName;
+ private boolean isAscending;
+ private int hashCode;
+
+ /**
+ * Constructor of the VLVSortOrder.
+ * @param attributeName the attribute name to be used to sort.
+ * @param isAscending whether the sorting is ascending or descending.
+ */
+ public VLVSortOrder(String attributeName, boolean isAscending)
+ {
+ this.attributeName = attributeName;
+ this.isAscending = isAscending;
+ hashCode = ("vlvsortorder"+attributeName+isAscending).hashCode();
+ }
+
+ /**
+ * Returns the name of the attribute.
+ * @return the name of the attribute.
+ */
+ public String getAttributeName()
+ {
+ return attributeName;
+ }
+
+ /**
+ * Returns whether the sorting is ascending or descending.
+ * @return <CODE>true</CODE> if the sorting is ascending and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isAscending()
+ {
+ return isAscending;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object o)
+ {
+ boolean equals = o == this;
+ if (!equals)
+ {
+ equals = o instanceof VLVSortOrder;
+ if (equals)
+ {
+ VLVSortOrder sortOrder = (VLVSortOrder)o;
+ equals = sortOrder.getAttributeName().equalsIgnoreCase(attributeName) &&
+ sortOrder.isAscending() == isAscending;
+ }
+ }
+ return equals;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/package-info.java
new file mode 100644
index 0000000..8200008
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Defines the data structures that are used in the control panel. This
+ * includes table models, some exceptions, the classes used to represent the
+ * configuration (like ServerDescriptor), etc.
+ *
+ **/
+package org.opends.guitools.controlpanel.datamodel;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java
new file mode 100644
index 0000000..66600db
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java
@@ -0,0 +1,57 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import org.opends.guitools.controlpanel.datamodel.BackupDescriptor;
+
+/**
+ * The event used to notify that a backup has been created.
+ *
+ */
+public class BackupCreatedEvent
+{
+ private BackupDescriptor newBackup;
+
+ /**
+ * The constructor of the event.
+ * @param newBackup the created backup.
+ */
+ public BackupCreatedEvent(BackupDescriptor newBackup)
+ {
+ this.newBackup = newBackup;
+ }
+
+ /**
+ * Returns the backup descriptor.
+ * @return the backup descriptor.
+ */
+ public BackupDescriptor getBackupDescriptor()
+ {
+ return newBackup;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedListener.java
new file mode 100644
index 0000000..b694bd4
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BackupCreatedListener.java
@@ -0,0 +1,41 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * The listeners that receive notifications when a backup is created.
+ *
+ */
+public interface BackupCreatedListener
+{
+ /**
+ * Method called when a backup is created.
+ * @param ev the event notifying that the backup was created.
+ */
+ public void backupCreated(BackupCreatedEvent ev);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowseActionListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowseActionListener.java
new file mode 100644
index 0000000..bd1a8e0
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowseActionListener.java
@@ -0,0 +1,265 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import static org.opends.messages.QuickSetupMessages.*;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
+import javax.swing.JFileChooser;
+import javax.swing.text.JTextComponent;
+
+import org.opends.quicksetup.util.ExtensionFileFilter;
+
+/**
+ * This is a class that automates the update of a text field with what the user
+ * selects in a file chooser. The class is not in charge of creating the
+ * components or of updating the layout, it simply adds the required listeners
+ * in the buttons and text fields so that a file chooser will be displayed
+ * when the user clicks on the button and if the user chooses a file or a
+ * directory the text field will be updated accordingly.
+ *
+ */
+public class BrowseActionListener implements ActionListener
+{
+ private JFileChooser fc;
+
+ private JTextComponent field;
+
+ private Component parent;
+
+ private BrowseType type;
+
+ /**
+ * Enumeration used to specify which kind of file browser dialog must be
+ * displayed.
+ *
+ */
+ public enum BrowseType
+ {
+ /**
+ * The Browser is used to retrieve a directory.
+ */
+ LOCATION_DIRECTORY,
+ /**
+ * The Browser is used to retrieve an LDIF file.
+ */
+ OPEN_LDIF_FILE,
+ /**
+ * The Browser is used to retrieve a .zip file.
+ */
+ OPEN_ZIP_FILE,
+ /**
+ * The Browser is used to retrieve a generic file.
+ */
+ OPEN_GENERIC_FILE,
+ /**
+ * The Browser is used to create a generic file.
+ */
+ CREATE_GENERIC_FILE,
+ /**
+ * The Browser is used to create an LDIF file.
+ */
+ CREATE_LDIF_FILE,
+ /**
+ * The Browser is used to create a generic directory.
+ */
+ CREATE_DIRECTORY
+ }
+
+ /**
+ * Constructor for the BrowseActionListener.
+ *
+ * @param field
+ * the text component that will be updated when the user selects
+ * something in the file browser dialog.
+ * @param type
+ * the type of file browse dialog that will be displayed.
+ * @param parent
+ * component that will be used as reference to display the file
+ * browse dialog.
+ */
+ public BrowseActionListener(JTextComponent field, BrowseType type,
+ Component parent)
+ {
+ this.field = field;
+ this.type = type;
+ this.parent = parent;
+
+ fc = new JFileChooser();
+ switch (type)
+ {
+ case LOCATION_DIRECTORY:
+ fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+ fc.setDialogType(JFileChooser.OPEN_DIALOG);
+ fc.setDialogTitle("Choose Directory");
+ break;
+
+ case CREATE_DIRECTORY:
+ fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+ fc.setDialogType(JFileChooser.SAVE_DIALOG);
+ fc.setDialogTitle("Choose Directory");
+ break;
+
+ case OPEN_LDIF_FILE:
+ fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+ fc.setDialogType(JFileChooser.OPEN_DIALOG);
+ fc.setDialogTitle(INFO_OPEN_LDIF_FILE_DIALOG_TITLE.get().toString());
+ ExtensionFileFilter ldifFiles =
+ new ExtensionFileFilter("ldif",
+ INFO_LDIF_FILES_DESCRIPTION.get().toString());
+
+ fc.addChoosableFileFilter(ldifFiles);
+ fc.setFileFilter(ldifFiles);
+ break;
+
+ case CREATE_LDIF_FILE:
+ fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+ fc.setDialogType(JFileChooser.SAVE_DIALOG);
+ fc.setDialogTitle(INFO_OPEN_LDIF_FILE_DIALOG_TITLE.get().toString());
+ ldifFiles = new ExtensionFileFilter("ldif",
+ INFO_LDIF_FILES_DESCRIPTION.get().toString());
+
+ fc.addChoosableFileFilter(ldifFiles);
+ fc.setFileFilter(ldifFiles);
+ break;
+
+ case OPEN_ZIP_FILE:
+ fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+ fc.setDialogType(JFileChooser.OPEN_DIALOG);
+ fc.setDialogTitle(INFO_OPEN_ZIP_FILE_DIALOG_TITLE.get().toString());
+ ExtensionFileFilter zipFiles =
+ new ExtensionFileFilter("zip",
+ INFO_ZIP_FILES_DESCRIPTION.get().toString());
+
+ fc.addChoosableFileFilter(zipFiles);
+ fc.setFileFilter(zipFiles);
+ break;
+
+ case OPEN_GENERIC_FILE:
+ fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+ fc.setDialogType(JFileChooser.OPEN_DIALOG);
+ fc.setDialogTitle(INFO_OPEN_GENERIC_FILE_DIALOG_TITLE.get().toString());
+
+ break;
+
+ case CREATE_GENERIC_FILE:
+ fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+ fc.setDialogType(JFileChooser.SAVE_DIALOG);
+ fc.setDialogTitle(INFO_OPEN_GENERIC_FILE_DIALOG_TITLE.get().toString());
+ break;
+
+ default:
+ throw new IllegalArgumentException("Unknown BrowseType: " + type);
+ }
+ }
+
+ /**
+ * ActionListener implementation. It will display a file browser dialog and
+ * then will update the text component if the user selects something on the
+ * dialog.
+ *
+ * @param e the ActionEvent we receive.
+ *
+ */
+ public void actionPerformed(ActionEvent e)
+ {
+ int returnVal;
+
+ /* If we can get the current field parent directory set to it */
+ String path = field.getText();
+ if (path != null)
+ {
+ if (path.trim().length() > 0)
+ {
+ File f = new File(path);
+ while ((f != null) && !f.isDirectory())
+ {
+ f = f.getParentFile();
+ }
+ if (f != null)
+ {
+ fc.setCurrentDirectory(f);
+ }
+ }
+ }
+
+ switch (type)
+ {
+ case LOCATION_DIRECTORY:
+ returnVal = fc.showOpenDialog(parent);
+ break;
+
+ case OPEN_LDIF_FILE:
+ returnVal = fc.showOpenDialog(parent);
+ break;
+
+ case OPEN_ZIP_FILE:
+ returnVal = fc.showOpenDialog(parent);
+ break;
+
+ case OPEN_GENERIC_FILE:
+ returnVal = fc.showOpenDialog(parent);
+ break;
+ case CREATE_GENERIC_FILE:
+ returnVal = fc.showSaveDialog(parent);
+ break;
+
+ case CREATE_LDIF_FILE:
+ returnVal = fc.showSaveDialog(parent);
+ break;
+
+ case CREATE_DIRECTORY:
+ returnVal = fc.showSaveDialog(parent);
+ break;
+
+ default:
+ throw new IllegalStateException("Unknown type: " + type);
+ }
+
+ if (returnVal == JFileChooser.APPROVE_OPTION)
+ {
+ File file = fc.getSelectedFile();
+ field.setText(file.getAbsolutePath());
+ field.requestFocusInWindow();
+ field.selectAll();
+ fieldUpdated();
+ }
+ }
+
+ /**
+ * The method that is called after the text field is updated.
+ *
+ */
+ protected void fieldUpdated()
+ {
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowserEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowserEvent.java
new file mode 100644
index 0000000..88c1c87
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowserEvent.java
@@ -0,0 +1,91 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import java.util.EventObject;
+
+/**
+ * This class defines an event for the browser. It basically it is used to
+ * communicate between the BrowserController and the NodeRefresher classes.
+ * @author jvergara
+ *
+ */
+public class BrowserEvent extends EventObject
+{
+ private static final long serialVersionUID = 6476274376887062526L;
+
+ /**
+ * The different types of events that we can have.
+ *
+ */
+ public enum Type
+ {
+ /**
+ * Update of the entry started.
+ */
+ UPDATE_START,
+ /**
+ * Update of the entry ended.
+ */
+ UPDATE_END,
+ /**
+ * Insert of children started.
+ */
+ INSERT_CHILDREN_START,
+ /**
+ * Insert of children ended.
+ */
+ INSERT_CHILDREN_END,
+ /**
+ * The specified size limit (max number of children to be returned) in the
+ * BrowserController was reached.
+ */
+ SIZE_LIMIT_REACHED
+
+ };
+
+ private Type type;
+
+ /**
+ * Constructor of the event.
+ * @param source the Object that generated this event.
+ * @param id the type of the event.
+ */
+ public BrowserEvent(Object source, Type id) {
+ super(source);
+ this.type = id;
+ }
+
+ /**
+ * Returns the type of event.
+ * @return the type of event.
+ */
+ public Type getType() {
+ return type;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowserEventListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowserEventListener.java
new file mode 100644
index 0000000..0b79da89
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/BrowserEventListener.java
@@ -0,0 +1,43 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * Interface that must be implemented by the objects that want to receive
+ * browse events.
+ *
+ */
+public interface BrowserEventListener extends java.util.EventListener {
+
+ /**
+ * The method that is called to notify that a new browser event has been
+ * generated.
+ * @param e the browser event.
+ */
+ public void processBrowserEvent(BrowserEvent e);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigChangeListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigChangeListener.java
new file mode 100644
index 0000000..48bd162
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigChangeListener.java
@@ -0,0 +1,42 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * Interface that must be implemented by the objects that want to receive
+ * configuration change notifications.
+ *
+ */
+public interface ConfigChangeListener
+{
+ /**
+ * Method that is called when a change in the configuration occurred.
+ * @param ev the configuration change event.
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationChangeEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationChangeEvent.java
new file mode 100644
index 0000000..19894e6
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationChangeEvent.java
@@ -0,0 +1,72 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+
+/**
+ * The event that describes a change in the configuration. It will be created
+ * in ControlCenterInfo when the configuration is read and there has been a
+ * modification between the newly read configuration and the configuration we
+ * read previously.
+ *
+ */
+public class ConfigurationChangeEvent
+{
+ private Object source;
+ private ServerDescriptor newDescriptor;
+
+ /**
+ * Constructor for the event.
+ * @param source the source of this event.
+ * @param newDescriptor the object describing the new configuration.
+ */
+ public ConfigurationChangeEvent(Object source, ServerDescriptor newDescriptor)
+ {
+ this.source = source;
+ this.newDescriptor = newDescriptor;
+ }
+
+ /**
+ * Returns the object describing the new configuration.
+ * @return the object describing the new configuration.
+ */
+ public ServerDescriptor getNewDescriptor()
+ {
+ return newDescriptor;
+ }
+
+ /**
+ * Returns the source of the event.
+ * @return the source of the event.
+ */
+ public Object getSource()
+ {
+ return source;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedEvent.java
new file mode 100644
index 0000000..7c2f52b
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedEvent.java
@@ -0,0 +1,70 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * The event used to notify that a new configuration element was created. It
+ * is used by index and schema editors to notify changes of the index
+ * configuration and in the schema.
+ *
+ */
+public class ConfigurationElementCreatedEvent
+{
+ private Object source;
+ private Object configurationObject;
+
+ /**
+ * Constructor of the event.
+ * @param source the source of the event.
+ * @param configurationObject the newly created configuration object.
+ */
+ public ConfigurationElementCreatedEvent(Object source,
+ Object configurationObject)
+ {
+ this.source = source;
+ this.configurationObject = configurationObject;
+ }
+
+ /**
+ * Returns the newly created configuration object.
+ * @return the newly created configuration object.
+ */
+ public Object getConfigurationObject()
+ {
+ return configurationObject;
+ }
+
+ /**
+ * Returns the source of the event.
+ * @return the source of the event.
+ */
+ public Object getSource()
+ {
+ return source;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java
new file mode 100644
index 0000000..8173cbe
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java
@@ -0,0 +1,43 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * Interface that must be implemented by the objects that want to receive
+ * notifications when new configuration elements are created (like new indexes
+ * or schema elements).
+ *
+ */
+public interface ConfigurationElementCreatedListener
+{
+ /**
+ * Method that is called when a new configuration element was created.
+ * @param ev the configuration change event.
+ */
+ public void elementCreated(ConfigurationElementCreatedEvent ev);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadErrorEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadErrorEvent.java
new file mode 100644
index 0000000..e8f6175
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadErrorEvent.java
@@ -0,0 +1,82 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+//Note: in terms of synchronization, this implementation assumes that the
+//interrupt method is only called in the event thread (this class is used
+//when the user selects a node in the LDAP entry browser).
+/**
+ * The event that is create when there is an error reading an entry. It is
+ * used in the LDAP entry browser to notify of this kind of errors.
+ */
+public class EntryReadErrorEvent
+{
+ private Object source;
+ private Throwable t;
+ private String dn;
+
+ /**
+ * Constructor for the event.
+ * @param source the source of this event.
+ * @param dn the DN of the entry we were searching.
+ * @param t the throwable that we got as error.
+ */
+ public EntryReadErrorEvent(Object source, String dn, Throwable t)
+ {
+ this.source = source;
+ this.t = t;
+ this.dn = dn;
+ }
+
+ /**
+ * Returns the source of the event.
+ * @return the source of the event.
+ */
+ public Object getSource()
+ {
+ return source;
+ }
+
+ /**
+ * Returns the throwable that we got as error.
+ * @return the throwable that we got as error.
+ */
+ public Throwable getError()
+ {
+ return t;
+ }
+
+ /**
+ * Returns the DN of the entry we were searching.
+ * @return the DN of the entry we were searching.
+ */
+ public String getDN()
+ {
+ return dn;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadEvent.java
new file mode 100644
index 0000000..f7cf2c0
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadEvent.java
@@ -0,0 +1,70 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
+
+/**
+ * The class used to notify that a new entry has been successfully read. Used
+ * in the LDAP entry browser.
+ *
+ */
+public class EntryReadEvent
+{
+ private Object source;
+ private CustomSearchResult sr;
+
+ /**
+ * The event constructor.
+ * @param source the source of the event.
+ * @param sr the search result containing the entry that was read.
+ */
+ public EntryReadEvent(Object source, CustomSearchResult sr)
+ {
+ this.source = source;
+ this.sr = sr;
+ }
+
+ /**
+ * Returns the source of the event.
+ * @return the source of the event.
+ */
+ public Object getSource()
+ {
+ return source;
+ }
+
+ /**
+ * Returns the search result containing the entry that was read.
+ * @return the search result containing the entry that was read.
+ */
+ public CustomSearchResult getSearchResult()
+ {
+ return sr;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadListener.java
new file mode 100644
index 0000000..c428771
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/EntryReadListener.java
@@ -0,0 +1,48 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * Interface that must be implemented by the objects that want to receive
+ * notifications when an entry was successfully read or when there was an
+ * error reading an entry. This is used by the LDAP entry browser.
+ *
+ */
+public interface EntryReadListener
+{
+ /**
+ * Notifies that an entry was successfully read.
+ * @param ev the event containing the search result.
+ */
+ public void entryRead(EntryReadEvent ev);
+ /**
+ * Notifies that an error reading an entry.
+ * @param ev the event describing the error.
+ */
+ public void entryReadError(EntryReadErrorEvent ev);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedEvent.java
new file mode 100644
index 0000000..a959113
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedEvent.java
@@ -0,0 +1,72 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+
+/**
+ * The event that describes a modification of the index.
+ *
+ */
+public class IndexModifiedEvent
+{
+ private Set<AbstractIndexDescriptor> modifiedIndexes =
+ new HashSet<AbstractIndexDescriptor>();
+
+ /**
+ * The constructor of the event.
+ * @param modifiedIndex the modified indexes.
+ */
+ public IndexModifiedEvent(AbstractIndexDescriptor modifiedIndex)
+ {
+ this.modifiedIndexes.add(modifiedIndex);
+ }
+
+ /**
+ * The event will contain all the indexes in a given backend.
+ * @param backend the backend whose indexes have been modified.
+ */
+ public IndexModifiedEvent(BackendDescriptor backend)
+ {
+ this.modifiedIndexes.addAll(backend.getIndexes());
+ this.modifiedIndexes.addAll(backend.getVLVIndexes());
+ }
+
+ /**
+ * Returns list of indexes that have been modified.
+ * @return list of indexes that have been modified.
+ */
+ public Set<AbstractIndexDescriptor> getIndexDescriptor()
+ {
+ return modifiedIndexes;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedListener.java
new file mode 100644
index 0000000..c5f7083
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexModifiedListener.java
@@ -0,0 +1,48 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * Interface that must be implemented by the objects that want to receive
+ * notifications when an index has been modified.
+ *
+ */
+public interface IndexModifiedListener
+{
+ /**
+ * Notification that an index has been modified.
+ * @param ev the index event.
+ */
+ public void indexModified(IndexModifiedEvent ev);
+
+ /**
+ * Notification that the indexes in a backend have been modified.
+ * @param ev the index event.
+ */
+ public void backendIndexesModified(IndexModifiedEvent ev);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionEvent.java
new file mode 100644
index 0000000..79bdea9
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionEvent.java
@@ -0,0 +1,71 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+
+/**
+ * The event that describes that an index has been selected. This is used
+ * in the dialog 'Manage Index' to notify that a new index is selected on the
+ * tree.
+ *
+ */
+public class IndexSelectionEvent
+{
+ private Object source;
+ private AbstractIndexDescriptor index;
+
+ /**
+ * Constructor of the event.
+ * @param source the source of the event.
+ * @param index the index that has been selected.
+ */
+ public IndexSelectionEvent(Object source, AbstractIndexDescriptor index)
+ {
+ this.source = source;
+ this.index = index;
+ }
+
+ /**
+ * Returns the index that has been selected.
+ * @return the index that has been selected.
+ */
+ public AbstractIndexDescriptor getIndex()
+ {
+ return index;
+ }
+
+ /**
+ * Returns the source of the event.
+ * @return the source of the event.
+ */
+ public Object getSource()
+ {
+ return source;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionListener.java
new file mode 100644
index 0000000..74e64ac
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/IndexSelectionListener.java
@@ -0,0 +1,43 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * Interface that must be implemented by the objects that want to receive
+ * notifications when an index has been selected. This is used in the dialog
+ * 'Manage Index' to notify that a new index is selected on the tree.
+ *
+ */
+public interface IndexSelectionListener
+{
+ /**
+ * Notification that an index has been selected.
+ * @param ev the index selection event.
+ */
+ public void indexSelected(IndexSelectionEvent ev);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedEvent.java
new file mode 100644
index 0000000..4e084c7
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedEvent.java
@@ -0,0 +1,72 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import org.opends.server.types.Entry;
+
+/**
+ * Method that describes that an entry has changed. This is used by the LDAP
+ * entry editors.
+ *
+ */
+public class LDAPEntryChangedEvent
+{
+ private Object source;
+ private Entry entry;
+
+ /**
+ * Constructor of the event.
+ * @param source the source of the event.
+ * @param entry the entry that has been modified (the object contains the new
+ * values of the entry).
+ */
+ public LDAPEntryChangedEvent(Object source, Entry entry)
+ {
+ this.source = source;
+ this.entry = entry;
+ }
+
+ /**
+ * Returns the entry that has been modified (the object contains the new
+ * values of the entry).
+ * @return the entry that has been modified.
+ */
+ public Entry getEntry()
+ {
+ return entry;
+ }
+
+ /**
+ * Returns the source of the event.
+ * @return the source of the event.
+ */
+ public Object getSource()
+ {
+ return source;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java
new file mode 100644
index 0000000..0e49bd4
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java
@@ -0,0 +1,44 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+
+/**
+ * Interface that must be implemented by the objects that want to receive
+ * notifications when a LDAP Entry has been modified. This is used by the LDAP
+ * entry editors.
+ *
+ */
+public interface LDAPEntryChangedListener
+{
+ /**
+ * Notification that an LDAP entry has been modified.
+ * @param ev the event.
+ */
+ public void entryChanged(LDAPEntryChangedEvent ev);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/MoveEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/MoveEvent.java
new file mode 100644
index 0000000..c4a22b7
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/MoveEvent.java
@@ -0,0 +1,68 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
+
+/**
+ * The event that is throw when an entry is moved in the LDAP
+ * entry browser. For the time being it is not used but it can be used in the
+ * future when the move of the entries is implemented.
+ *
+ */
+public class MoveEvent
+{
+ private BrowserNodeInfo newParent;
+ private BrowserNodeInfo[] nodes;
+
+ /**
+ * The constructor of the move event.
+ * @param newParent the new parent of the nodes that are being moved.
+ * @param nodes the nodes that are being moved.
+ */
+ public MoveEvent(BrowserNodeInfo newParent, BrowserNodeInfo[] nodes) {
+ this.newParent = newParent;
+ this.nodes = nodes;
+ }
+
+ /**
+ * Return the new parent of the nodes that are being moved.
+ * @return the new parent of the nodes that are being moved.
+ */
+ public BrowserNodeInfo getNewParent() {
+ return newParent;
+ }
+
+ /**
+ * Return the nodes that are being moved.
+ * @return the nodes that are being moved.
+ */
+ public BrowserNodeInfo[] getNodes() {
+ return nodes;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/MoveListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/MoveListener.java
new file mode 100644
index 0000000..39a2328
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/MoveListener.java
@@ -0,0 +1,45 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * Interface that must be implemented by the objects that want to receive
+ * notifications when an entry is being moved (for instance using drag and
+ * drop).
+ * For the time being it is not used but it can be used in the future when the
+ * move of the entries is implemented.
+ *
+ */
+public interface MoveListener
+{
+ /**
+ * Notification that the entry is being moved.
+ * @param ev the event.
+ */
+ public void processMoveEvent(MoveEvent ev);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/PrintStreamListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/PrintStreamListener.java
new file mode 100644
index 0000000..b92c1aa
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/PrintStreamListener.java
@@ -0,0 +1,45 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * This is a listener used by the progress dialogs and the tasks to be notified
+ * when something is written to a PrintStream. This is used for instance to
+ * be able to redirect the output logs of operations launched in a separate
+ * process (like start-ds, import-ldif, etc.). It is used mainly in the
+ * progress dialog and in the task.
+ *
+ */
+public interface PrintStreamListener
+{
+ /**
+ * Notification that a new line has been written in a PrintStream.
+ * @param line the new line.
+ */
+ public void newLine(String line);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java
new file mode 100644
index 0000000..f6089ee
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java
@@ -0,0 +1,44 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * Interface that must be implemented by the objects that want to receive
+ * notifications when the authentication to be used to handle referrals in the
+ * LDAP entries browser.
+ * For the time being it is not used but it can be used in the future when some
+ * UI to specify authentication for referrals is implemented.
+ *
+ */
+public interface ReferralAuthenticationListener {
+ /**
+ * Notification that some authentication changed.
+ *
+ */
+ public void notifyAuthDataChanged();
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionEvent.java
new file mode 100644
index 0000000..7d5efa1
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionEvent.java
@@ -0,0 +1,69 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * The event that describes that an element of the schema has been selected.
+ * This is used in the dialog 'Manage Schema' to notify that a new schema
+ * element is selected on the tree.
+ *
+ */
+public class SchemaElementSelectionEvent
+{
+ private Object source;
+ private Object schemaElement;
+
+ /**
+ * Constructor of the event.
+ * @param source the source of the event.
+ * @param schemaElement the schema element that has been selected.
+ */
+ public SchemaElementSelectionEvent(Object source, Object schemaElement)
+ {
+ this.source = source;
+ this.schemaElement = schemaElement;
+ }
+
+ /**
+ * Returns the schema element that has been selected.
+ * @return the schema element that has been selected.
+ */
+ public Object getSchemaElement()
+ {
+ return schemaElement;
+ }
+
+ /**
+ * Returns the source of the event.
+ * @return the source of the event.
+ */
+ public Object getSource()
+ {
+ return source;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java
new file mode 100644
index 0000000..48579f2
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java
@@ -0,0 +1,44 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+/**
+ * Interface that must be implemented by the objects that want to receive
+ * notifications when a schema element has been selected. This is used in the
+ * dialog 'Manage Schema' to notify that a new schema element is selected on the
+ * tree.
+ *
+ */
+public interface SchemaElementSelectionListener
+{
+ /**
+ * Notification that a schema element has been selected.
+ * @param ev the schema element selection event.
+ */
+ public void schemaElementSelected(SchemaElementSelectionEvent ev);
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
new file mode 100644
index 0000000..bb570ac
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
@@ -0,0 +1,117 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JScrollPane;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+
+/**
+ * This is a listener that is basically used to update dynamically the border
+ * of a scroll bar. This is used when we do not want to display the borders of
+ * the scrollpane if no scrollbars are visible. So the code basically adds
+ * a component listener to the scroll pane and depending on whether the scroll
+ * bars are displayed or not some border to the scroll pane is added (or not).
+ *
+ */
+public class ScrollPaneBorderListener extends ComponentAdapter
+{
+ private JScrollPane scroll;
+ private Border emptyBorder = new EmptyBorder(0, 0, 0, 0);
+ private Border etchedBorder = BorderFactory.createMatteBorder(0, 0, 1, 0,
+ ColorAndFontConstants.defaultBorderColor);
+
+
+ /**
+ * The constructor of the listener.
+ * @param scroll the scroll pane to update.
+ * @param addTopBorder whether we want to add a top border or only a bottom
+ * border when the border must be displayed.
+ */
+ public ScrollPaneBorderListener(JScrollPane scroll, boolean addTopBorder)
+ {
+ this.scroll = scroll;
+ scroll.getHorizontalScrollBar().addComponentListener(this);
+ scroll.getVerticalScrollBar().addComponentListener(this);
+ if (addTopBorder)
+ {
+ etchedBorder = BorderFactory.createMatteBorder(1, 0, 1, 0,
+ ColorAndFontConstants.defaultBorderColor);
+ }
+ }
+
+ /**
+ * The constructor of the listener.
+ * @param scroll the scroll pane to update.
+ */
+ public ScrollPaneBorderListener(JScrollPane scroll)
+ {
+ this(scroll, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void componentShown(ComponentEvent ev)
+ {
+ updateBorder();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void componentHidden(ComponentEvent ev)
+ {
+ updateBorder();
+ }
+
+ /**
+ * Updates the border depending on whether the scroll bars are visible or not.
+ *
+ */
+ public void updateBorder()
+ {
+ boolean displayBorder = scroll.getVerticalScrollBar().isVisible() ||
+ scroll.getHorizontalScrollBar().isVisible();
+
+ if (displayBorder)
+ {
+ scroll.setBorder(etchedBorder);
+ }
+ else
+ {
+ scroll.setBorder(emptyBorder);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
new file mode 100644
index 0000000..f9b0fe1
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
@@ -0,0 +1,76 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.event;
+
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+
+import javax.swing.text.JTextComponent;
+
+/**
+ * A class used to be able to select the contents of the text field when
+ * it gets the focus.
+ *
+ */
+public class TextComponentFocusListener implements FocusListener
+{
+ private JTextComponent tf;
+
+ /**
+ * The constructor for this listener.
+ * @param tf the text field associated with this listener.
+ */
+ public TextComponentFocusListener(JTextComponent tf)
+ {
+ this.tf = tf;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void focusGained(FocusEvent e)
+ {
+ if ((tf.getText() == null) || "".equals(tf.getText()))
+ {
+ tf.setText(" ");
+ tf.selectAll();
+ tf.setText("");
+ }
+ else
+ {
+ tf.selectAll();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void focusLost(FocusEvent e)
+ {
+ }
+}
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/package-info.java
new file mode 100644
index 0000000..77d9443
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/event/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Defines some of the events and listeners used in the Control Panel.
+ *
+ */
+package org.opends.guitools.controlpanel.event;
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/clear-filter-down.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/clear-filter-down.png
new file mode 100644
index 0000000..be29ee4
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/clear-filter-down.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/clear-filter.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/clear-filter.png
new file mode 100644
index 0000000..1650755
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/clear-filter.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/downarrow.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/downarrow.png
new file mode 100644
index 0000000..e6578fd
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/downarrow.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-attr-folder.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-attr-folder.png
new file mode 100644
index 0000000..0e74dbf
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-attr-folder.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-attr.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-attr.png
new file mode 100644
index 0000000..88c1fd57
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-attr.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-class-folder.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-class-folder.png
new file mode 100644
index 0000000..49b2e3b
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-class-folder.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-class.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-class.png
new file mode 100644
index 0000000..6fc48c7
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-class.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-directory.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-directory.png
new file mode 100644
index 0000000..2247390
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-directory.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-folder.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-folder.png
new file mode 100644
index 0000000..854a340
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-folder.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-generic.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-generic.png
new file mode 100644
index 0000000..7754559
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-generic.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-group.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-group.png
new file mode 100644
index 0000000..54c5c26
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-group.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-folder.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-folder.png
new file mode 100644
index 0000000..e75b9e3
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-folder.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-ro.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-ro.png
new file mode 100644
index 0000000..cc9f51a
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx-ro.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx.png
new file mode 100644
index 0000000..41acece
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-idx.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-ou.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-ou.png
new file mode 100644
index 0000000..3553bba
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-ou.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-ppol.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-ppol.png
new file mode 100644
index 0000000..f87194e
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-ppol.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-referral.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-referral.png
new file mode 100644
index 0000000..0adacb9
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-referral.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-rule-folder.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-rule-folder.png
new file mode 100644
index 0000000..3476dc2
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-rule-folder.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-rule.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-rule.png
new file mode 100644
index 0000000..3dd4ddd
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-rule.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-suffix.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-suffix.png
new file mode 100644
index 0000000..206e8e8
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-suffix.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax-folder.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax-folder.png
new file mode 100644
index 0000000..37bdb02
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax-folder.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax.png
new file mode 100644
index 0000000..5f16903
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-syntax.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-user.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-user.png
new file mode 100644
index 0000000..eb3dd56
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-user.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx-folder.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx-folder.png
new file mode 100644
index 0000000..12b5e95
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx-folder.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx.png
new file mode 100644
index 0000000..75f39ec
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/ds-vlv-idx.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/field-locked.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/field-locked.png
new file mode 100644
index 0000000..201a14d
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/field-locked.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/package-info.java
new file mode 100644
index 0000000..c29e9ec
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Contains the different images (in gif and png format) that are used by the
+ * control panel.
+ */
+package org.opends.guitools.controlpanel.images;
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/required.gif b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/required.gif
new file mode 100644
index 0000000..a4a6777
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/required.gif
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/rightarrow.png b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/rightarrow.png
new file mode 100644
index 0000000..273dec6
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/images/rightarrow.png
Binary files differ
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/package-info.java
new file mode 100644
index 0000000..45107f2
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/package-info.java
@@ -0,0 +1,35 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Defines the main classes that are you used by the control-panel to launch the
+ * command line. This includes the command line launcher and the ControlPanel
+ * class which creates the main dialog of the control panel.
+ * */
+package org.opends.guitools.controlpanel;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/AddToGroupTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/AddToGroupTask.java
new file mode 100644
index 0000000..fd3fa91
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/AddToGroupTask.java
@@ -0,0 +1,310 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.swing.SwingUtilities;
+
+import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.AdminToolMessages;
+import org.opends.messages.Message;
+import org.opends.server.types.DN;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * The class that is in charge of adding a set of entries to a set of static
+ * groups.
+ */
+public class AddToGroupTask extends Task
+{
+ private Set<String> backendSet;
+ private LinkedHashSet<DN> dns = new LinkedHashSet<DN>();
+ private LinkedHashSet<DN> groupDns = new LinkedHashSet<DN>();
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param dns the DNs of the entries we want to add to the groups.
+ * @param groupDns the groups that we want to modify.
+ */
+ public AddToGroupTask(ControlPanelInfo info, ProgressDialog dlg,
+ Set<DN> dns, Set<DN> groupDns)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ this.dns.addAll(dns);
+ this.groupDns.addAll(groupDns);
+ for (DN groupDn : groupDns)
+ {
+ for (BackendDescriptor backend :
+ info.getServerDescriptor().getBackends())
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ if (groupDn.isDescendantOf(baseDN.getDn()))
+ {
+ backendSet.add(backend.getBackendID());
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.MODIFY_ENTRY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return
+ AdminToolMessages.INFO_CTRL_PANEL_ADD_TO_GROUP_TASK_DESCRIPTION.get();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (!isServerRunning())
+ {
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean regenerateDescriptor()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ for (final DN groupDn : groupDns)
+ {
+ final Collection<ModificationItem> modifications =
+ getModifications(groupDn, dns);
+ if (modifications.size() > 0)
+ {
+ ModificationItem[] mods =
+ new ModificationItem[modifications.size()];
+ modifications.toArray(mods);
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ printEquivalentCommandToModify(groupDn, modifications);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_ADDING_TO_GROUP.get(groupDn.toString()),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ getInfo().getDirContext().modifyAttributes(
+ Utilities.getJNDIName(groupDn.toString()), mods);
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ }
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * Returns the modifications that must be made to the provided group.
+ * @param groupDn the DN of the static group that must be updated.
+ * @param dns the list of entry DNs that must be added to the group.
+ * @return the list of modifications (in form of ModificationItem) that
+ * must be made to the provided group.
+ * @throws NamingException if an error occurs.
+ */
+ private Collection<ModificationItem> getModifications(DN groupDn,
+ Set<DN> dns) throws NamingException
+ {
+ ArrayList<ModificationItem> modifications =
+ new ArrayList<ModificationItem>();
+ // Search for the group entry
+
+ SearchControls ctls = new SearchControls();
+ ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
+ ctls.setReturningAttributes(
+ new String[] {
+ ServerConstants.ATTR_UNIQUE_MEMBER
+ });
+ String filter = BrowserController.ALL_OBJECTS_FILTER;
+ NamingEnumeration<SearchResult> result =
+ getInfo().getDirContext().search(
+ Utilities.getJNDIName(groupDn.toString()),
+ filter, ctls);
+
+ while (result.hasMore())
+ {
+ SearchResult sr = result.next();
+ Set<String> values =
+ ConnectionUtils.getValues(sr, ServerConstants.ATTR_UNIQUE_MEMBER);
+ Set<String> dnsToAdd = new LinkedHashSet<String>();
+ if (values != null)
+ {
+ for (DN newDn : dns)
+ {
+ boolean found = false;
+ for (String dn : values)
+ {
+ if (Utilities.areDnsEqual(dn, newDn.toString()))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ dnsToAdd.add(newDn.toString());
+ }
+ }
+ }
+ else
+ {
+ for (DN newDn : dns)
+ {
+ dnsToAdd.add(newDn.toString());
+ }
+ }
+ if (dnsToAdd.size() > 0)
+ {
+ Attribute attribute =
+ new BasicAttribute(ServerConstants.ATTR_UNIQUE_MEMBER);
+ for (String dn : dnsToAdd)
+ {
+ attribute.add(dn);
+ }
+ modifications.add(new ModificationItem(
+ DirContext.ADD_ATTRIBUTE,
+ attribute));
+ }
+ }
+ return modifications;
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
new file mode 100644
index 0000000..f30cdc8
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
@@ -0,0 +1,826 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.ConfigMessages.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.util.ConfigReader;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.admin.client.ManagementContext;
+import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
+import org.opends.server.admin.client.ldap.LDAPManagementContext;
+import org.opends.server.admin.server.ServerManagementContext;
+import org.opends.server.admin.std.client.*;
+import org.opends.server.admin.std.server.ReplicationDomainCfg;
+import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
+import org.opends.server.admin.std.server.RootCfg;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.config.ConfigEntry;
+import org.opends.server.config.DNConfigAttribute;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.DN;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * The task used to delete a set of base DNs or backends.
+ *
+ */
+public class DeleteBaseDNAndBackendTask extends Task
+{
+ private Set<String> backendSet;
+ private Map<String, Set<BaseDNDescriptor>> baseDNsToDelete =
+ new HashMap<String, Set<BaseDNDescriptor>>();
+ private ArrayList<BackendDescriptor> backendsToDelete =
+ new ArrayList<BackendDescriptor>();
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param backendsToDelete the backends to delete.
+ * @param baseDNsToDelete the base DNs to delete.
+ */
+ public DeleteBaseDNAndBackendTask(ControlPanelInfo info, ProgressDialog dlg,
+ Collection<BackendDescriptor> backendsToDelete,
+ Collection<BaseDNDescriptor> baseDNsToDelete)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ for (BackendDescriptor backend : backendsToDelete)
+ {
+ backendSet.add(backend.getBackendID());
+ }
+ for (BaseDNDescriptor baseDN : baseDNsToDelete)
+ {
+ backendSet.add(baseDN.getBackend().getBackendID());
+ }
+ for (BaseDNDescriptor baseDN : baseDNsToDelete)
+ {
+ String backendID = baseDN.getBackend().getBackendID();
+ Set<BaseDNDescriptor> set = this.baseDNsToDelete.get(backendID);
+ if (set == null)
+ {
+ set = new HashSet<BaseDNDescriptor>();
+ this.baseDNsToDelete.put(backendID, set);
+ }
+ set.add(baseDN);
+ }
+ ArrayList<String> indirectBackendsToDelete = new ArrayList<String>();
+ for (Set<BaseDNDescriptor> set : this.baseDNsToDelete.values())
+ {
+ BackendDescriptor backend = set.iterator().next().getBackend();
+ if (set.size() == backend.getBaseDns().size())
+ {
+ // All of the suffixes must be deleted.
+ indirectBackendsToDelete.add(backend.getBackendID());
+ this.backendsToDelete.add(backend);
+ }
+ }
+ for (String backendID : indirectBackendsToDelete)
+ {
+ this.baseDNsToDelete.remove(backendID);
+ }
+ this.backendsToDelete.addAll(backendsToDelete);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ if (baseDNsToDelete.size() > 0)
+ {
+ return Type.DELETE_BASEDN;
+ }
+ else
+ {
+ return Type.DELETE_BACKEND;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ StringBuilder sb = new StringBuilder();
+
+ if (baseDNsToDelete.size() > 0)
+ {
+ ArrayList<String> dns = new ArrayList<String>();
+ for (Set<BaseDNDescriptor> set : baseDNsToDelete.values())
+ {
+ for (BaseDNDescriptor baseDN : set)
+ {
+ dns.add(baseDN.getDn().toString());
+ }
+ }
+ if (dns.size() == 1)
+ {
+ String dn = dns.iterator().next();
+ sb.append(INFO_CTRL_PANEL_DELETE_BASE_DN_DESCRIPTION.get(dn));
+ }
+ else
+ {
+ ArrayList<String> quotedDns = new ArrayList<String>();
+ for (String dn : dns)
+ {
+ quotedDns.add("'"+dn+"'");
+ }
+ sb.append(INFO_CTRL_PANEL_DELETE_BASE_DNS_DESCRIPTION.get(
+ Utilities.getStringFromCollection(quotedDns, ", ")));
+ }
+ }
+
+ if (backendsToDelete.size() > 0)
+ {
+ if (sb.length() > 0)
+ {
+ sb.append(" ");
+ }
+ if (backendsToDelete.size() == 1)
+ {
+ sb.append(INFO_CTRL_PANEL_DELETE_BACKEND_DESCRIPTION.get(
+ backendsToDelete.iterator().next().getBackendID()));
+ }
+ else
+ {
+ ArrayList<String> ids = new ArrayList<String>();
+ for (BackendDescriptor backend : backendsToDelete)
+ {
+ ids.add(backend.getBackendID());
+ }
+ sb.append(INFO_CTRL_PANEL_DELETE_BACKENDS_DESCRIPTION.get(
+ Utilities.getStringFromCollection(ids, ", ")));
+ }
+ }
+ return Message.raw(sb.toString());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(
+ getIncompatibilityMessage(this, taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * Update the configuration in the server.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void updateConfiguration() throws OpenDsException
+ {
+ boolean configHandlerUpdated = false;
+ final int totalNumber = baseDNsToDelete.size() + backendsToDelete.size();
+ int numberDeleted = 0;
+ try
+ {
+ if (!isServerRunning())
+ {
+ configHandlerUpdated = true;
+ getInfo().stopPooling();
+ if (getInfo().mustDeregisterConfig())
+ {
+ DirectoryServer.deregisterBaseDN(DN.decode("cn=config"));
+ }
+ DirectoryServer.getInstance().initializeConfiguration(
+ org.opends.server.extensions.ConfigFileHandler.class.getName(),
+ ConfigReader.configFile);
+ getInfo().setMustDeregisterConfig(true);
+ }
+ boolean isFirst = true;
+ for (final Set<BaseDNDescriptor> baseDNs : baseDNsToDelete.values())
+ {
+ if (!isFirst)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml("<br><br>");
+ }
+ });
+ }
+ isFirst = false;
+
+ for (BaseDNDescriptor baseDN : baseDNs)
+ {
+ disableReplicationIfRequired(baseDN);
+ }
+
+ if (isServerRunning())
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLinePath(baseDNs));
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(
+ getDSConfigCommandLineArguments(baseDNs));
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_BASE_DN.get()+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ if (baseDNs.size() == 1)
+ {
+ String dn = baseDNs.iterator().next().getDn().toString();
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_DELETING_BASE_DN.get(dn),
+ ColorAndFontConstants.progressFont));
+ }
+ else
+ {
+ ArrayList<String> dns = new ArrayList<String>();
+ for (BaseDNDescriptor baseDN : baseDNs)
+ {
+ dns.add("'"+baseDN.getDn().toString()+"'");
+ }
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_DELETING_BASE_DNS.get(
+ Utilities.getStringFromCollection(dns, ", ")),
+ ColorAndFontConstants.progressFont));
+ }
+ }
+ });
+ if (isServerRunning())
+ {
+ deleteBaseDNs(getInfo().getDirContext(), baseDNs);
+ }
+ else
+ {
+ deleteBaseDNs(baseDNs);
+ }
+ numberDeleted ++;
+ final int fNumberDeleted = numberDeleted;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().getProgressBar().setIndeterminate(false);
+ getProgressDialog().getProgressBar().setValue(
+ (fNumberDeleted * 100) / totalNumber);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ for (final BackendDescriptor backend : backendsToDelete)
+ {
+ if (!isFirst)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml("<br><br>");
+ }
+ });
+ }
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ disableReplicationIfRequired(baseDN);
+ }
+ isFirst = false;
+ if (isServerRunning())
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLinePath(backend));
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(
+ getDSConfigCommandLineArguments(backend));
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_BACKEND.get()+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_DELETING_BACKEND.get(
+ backend.getBackendID()),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ if (isServerRunning())
+ {
+ deleteBackend(getInfo().getDirContext(), backend);
+ }
+ else
+ {
+ deleteBackend(backend);
+ }
+ numberDeleted ++;
+ final int fNumberDeleted = numberDeleted;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().getProgressBar().setIndeterminate(false);
+ getProgressDialog().getProgressBar().setValue(
+ (fNumberDeleted * 100) / totalNumber);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ }
+ finally
+ {
+ if (configHandlerUpdated)
+ {
+ DirectoryServer.getInstance().initializeConfiguration(
+ ConfigReader.configClassName, ConfigReader.configFile);
+ getInfo().startPooling(ControlPanelInfo.DEFAULT_POOLING);
+ }
+ }
+ }
+
+ /**
+ * Returns the DN in the configuration for a given backend.
+ * @param backend the backend.
+ * @return the backend configuration entry DN.
+ */
+ private String getDN(BackendDescriptor backend)
+ {
+ return Utilities.getRDNString("ds-cfg-backend-id",
+ backend.getBackendID())+",cn=Backends,cn=config";
+ }
+
+ /**
+ * Deletes a set of base DNs. The code assumes that the server is not running
+ * and that the configuration file can be edited.
+ * @param baseDNs the list of base DNs.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void deleteBaseDNs(Set<BaseDNDescriptor> baseDNs)
+ throws OpenDsException
+ {
+ BackendDescriptor backend = baseDNs.iterator().next().getBackend();
+
+ SortedSet<DN> oldBaseDNs = new TreeSet<DN>();
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ oldBaseDNs.add(baseDN.getDn());
+ }
+ LinkedList<DN> newBaseDNs = new LinkedList<DN>();
+ newBaseDNs.addAll(oldBaseDNs);
+ ArrayList<DN> dnsToRemove = new ArrayList<DN>();
+ for (BaseDNDescriptor baseDN : baseDNs)
+ {
+ dnsToRemove.add(baseDN.getDn());
+ }
+ newBaseDNs.removeAll(dnsToRemove);
+
+ String backendName = backend.getBackendID();
+ String dn = Utilities.getRDNString("ds-cfg-backend-id", backendName)+
+ ",cn=Backends,cn=config";
+ ConfigEntry configEntry =
+ DirectoryServer.getConfigHandler().getConfigEntry(DN.decode(dn));
+
+ DNConfigAttribute baseDNAttr =
+ new DNConfigAttribute(
+ ConfigConstants.ATTR_BACKEND_BASE_DN,
+ INFO_CONFIG_BACKEND_ATTR_DESCRIPTION_BASE_DNS.get(),
+ true, true, false, newBaseDNs);
+ configEntry.putConfigAttribute(baseDNAttr);
+ DirectoryServer.getConfigHandler().writeUpdatedConfig();
+ }
+
+ /**
+ * Deletes a set of base DNs. The code assumes that the server is running
+ * and that the provided connection is active.
+ * @param baseDNs the list of base DNs.
+ * @param ctx the connection to the server.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void deleteBaseDNs(InitialLdapContext ctx,
+ Set<BaseDNDescriptor> baseDNs) throws OpenDsException
+ {
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ LocalDBBackendCfgClient backend =
+ (LocalDBBackendCfgClient)root.getBackend(
+ baseDNs.iterator().next().getBackend().getBackendID());
+ SortedSet<DN> oldBaseDNs = backend.getBaseDN();
+ SortedSet<DN> newBaseDNs = new TreeSet<DN>();
+ newBaseDNs.addAll(oldBaseDNs);
+ ArrayList<DN> dnsToRemove = new ArrayList<DN>();
+ for (BaseDNDescriptor baseDN : baseDNs)
+ {
+ dnsToRemove.add(baseDN.getDn());
+ }
+ newBaseDNs.removeAll(dnsToRemove);
+ backend.setBaseDN(newBaseDNs);
+ backend.commit();
+ }
+
+ /**
+ * Deletes a backend. The code assumes that the server is not running
+ * and that the configuration file can be edited.
+ * @param backend the backend to be deleted.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void deleteBackend(BackendDescriptor backend) throws OpenDsException
+ {
+ String dn = getDN(backend);
+ Utilities.deleteConfigSubtree(
+ DirectoryServer.getConfigHandler(), DN.decode(dn));
+ }
+
+ /**
+ * Deletes a backend. The code assumes that the server is running
+ * and that the provided connection is active.
+ * @param backend the backend to be deleted.
+ * @param ctx the connection to the server.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void deleteBackend(InitialLdapContext ctx,
+ BackendDescriptor backend) throws OpenDsException
+ {
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ root.removeBackend(backend.getBackendID());
+ root.commit();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * Returns the path of the command line to be used to delete the specified
+ * backend.
+ * @param backend the backend to be deleted.
+ * @return the path of the command line to be used to delete the specified
+ * backend.
+ */
+ private String getConfigCommandLinePath(BackendDescriptor backend)
+ {
+ if (isServerRunning())
+ {
+ return getCommandLinePath("dsconfig");
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Returns the path of the command line to be used to delete the specified
+ * base DNs.
+ * @param baseDNs the base DNs to be deleted.
+ * @return the path of the command line to be used to delete the specified
+ * base DNs.
+ */
+ private String getConfigCommandLinePath(Set<BaseDNDescriptor> baseDNs)
+ {
+ if (isServerRunning())
+ {
+ return getCommandLinePath("dsconfig");
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ updateConfiguration();
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * Return the dsconfig arguments required to delete a set of base DNs.
+ * @param baseDNs the base DNs to be deleted.
+ * @return the dsconfig arguments required to delete a set of base DNs.
+ */
+ private ArrayList<String> getDSConfigCommandLineArguments(
+ Set<BaseDNDescriptor> baseDNs)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ if (isServerRunning())
+ {
+ args.add("set-backend-prop");
+ args.add("--backend-name");
+ args.add(baseDNs.iterator().next().getBackend().getBackendID());
+ args.add("--remove");
+ for (BaseDNDescriptor baseDN : baseDNs)
+ {
+ args.add("base-dn:"+baseDN.getDn().toString());
+ }
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+ }
+ return args;
+ }
+
+ /**
+ * Return the dsconfig arguments required to delete a backend.
+ * @param backend the backend to be deleted.
+ * @return the dsconfig arguments required to delete a backend.
+ */
+ private ArrayList<String> getDSConfigCommandLineArguments(
+ BackendDescriptor backend)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("delete-backend");
+ args.add("--backend-name");
+ args.add(backend.getBackendID());
+
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+ return args;
+ }
+
+ /**
+ * Disables replication if required: if the deleted base DN is replicated,
+ * update the replication configuration to remove any reference to it.
+ * @param baseDN the base DN that is going to be removed.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void disableReplicationIfRequired(final BaseDNDescriptor baseDN)
+ throws OpenDsException
+ {
+ if (baseDN.getType() == BaseDNDescriptor.Type.REPLICATED)
+ {
+ final String[] domainName = {null};
+
+ try
+ {
+ if (isServerRunning())
+ {
+ InitialLdapContext ctx = getInfo().getDirContext();
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ ReplicationSynchronizationProviderCfgClient sync = null;
+ try
+ {
+ sync = (ReplicationSynchronizationProviderCfgClient)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+ }
+ catch (OpenDsException oe)
+ {
+ // Ignore this one
+ }
+ if (sync != null)
+ {
+ String[] domains = sync.listReplicationDomains();
+ if (domains != null)
+ {
+ for (int i=0; i<domains.length; i++)
+ {
+ ReplicationDomainCfgClient domain =
+ sync.getReplicationDomain(domains[i]);
+ DN dn = domain.getBaseDN();
+ if (dn.equals(baseDN.getDn()))
+ {
+ domainName[0] = domains[i];
+ sync.removeReplicationDomain(domains[i]);
+ sync.commit();
+ break;
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ RootCfg root =
+ ServerManagementContext.getInstance().getRootConfiguration();
+ ReplicationSynchronizationProviderCfg sync = null;
+ try
+ {
+ sync = (ReplicationSynchronizationProviderCfg)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+ }
+ catch (OpenDsException oe)
+ {
+ // Ignore this one
+ }
+ if (sync != null)
+ {
+ String[] domains = sync.listReplicationDomains();
+ if (domains != null)
+ {
+ for (int i=0; i<domains.length; i++)
+ {
+ ReplicationDomainCfg domain =
+ sync.getReplicationDomain(domains[i]);
+ DN dn = domain.getBaseDN();
+ if (dn.equals(baseDN.getDn()))
+ {
+ domainName[0] = domains[i];
+ DN entryDN = domain.dn();
+ Utilities.deleteConfigSubtree(
+ DirectoryServer.getConfigHandler(), entryDN);
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ finally
+ {
+ // This is not super clean, but this way we calculate the domain name
+ // only once.
+ if (isServerRunning() && (domainName[0] != null))
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLinePath(baseDN.getBackend()));
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(
+ getCommandLineArgumentsToDisableReplication(domainName[0]));
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_DOMAIN.get(
+ baseDN.getDn().toString())+"<br><b>"+
+ sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_DELETING_DOMAIN.get(
+ baseDN.getDn().toString()),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ }
+
+ /**
+ * Return the dsconfig arguments required to delete a replication domain.
+ * @param domainName the name of the domain to be deleted.
+ * @return the dsconfig arguments required to delete a replication domain.
+ */
+ private ArrayList<String> getCommandLineArgumentsToDisableReplication(
+ String domainName)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("delete-replication-domain");
+ args.add("--provider-name");
+ args.add("Multimaster Synchronization");
+ args.add("--domain-name");
+ args.add(domainName);
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+ return args;
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
new file mode 100644
index 0000000..b16f599
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -0,0 +1,489 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * The task that is launched when an entry must be deleted.
+ */
+public class DeleteEntryTask extends Task
+{
+ private Set<String> backendSet;
+ private DN lastDn;
+ private int nDeleted = 0;
+ private int nToDelete = -1;
+ private BrowserController controller;
+ private TreePath[] paths;
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param paths the tree paths of the entries that must be deleted.
+ * @param controller the Browser Controller.
+ */
+ public DeleteEntryTask(ControlPanelInfo info, ProgressDialog dlg,
+ TreePath[] paths, BrowserController controller)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ this.controller = controller;
+ this.paths = paths;
+ SortedSet<DN> entries = new TreeSet<DN>();
+ boolean canPrecalculateNumberOfEntries = true;
+ nToDelete = paths.length;
+ for (TreePath path : paths)
+ {
+ BasicNode node = (BasicNode)path.getLastPathComponent();
+ /*
+ if (node.getNumSubOrdinates() != -1)
+ {
+ nToDelete += node.getNumSubOrdinates();
+ }
+ else if (node.isLeaf())
+ {
+ canPrecalculateNumberOfEntries = false;
+ }
+ */
+ try
+ {
+ DN dn = DN.decode(node.getDN());
+ entries.add(dn);
+ }
+ catch (DirectoryException de)
+ {
+ throw new IllegalStateException("Unexpected error parsing dn: "+
+ node.getDN(), de);
+ }
+ }
+ for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ for (DN dn : entries)
+ {
+ if (dn.isDescendantOf(baseDN.getDn()))
+ {
+ backendSet.add(backend.getBackendID());
+ break;
+ }
+ }
+ }
+ }
+ if (!canPrecalculateNumberOfEntries)
+ {
+ nToDelete = -1;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.DELETE_ENTRY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_DELETE_ENTRY_TASK_DESCRIPTION.get();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (!isServerRunning())
+ {
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean regenerateDescriptor()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ ArrayList<DN> alreadyDeleted = new ArrayList<DN>();
+ final ArrayList<BrowserNodeInfo> toNotify =
+ new ArrayList<BrowserNodeInfo>();
+ int deletedSinceLastNotify = 0;
+ try
+ {
+ for (TreePath path : paths)
+ {
+ BasicNode node = (BasicNode)path.getLastPathComponent();
+ try
+ {
+ DN dn = DN.decode(node.getDN());
+ boolean isDnDeleted = false;
+ for (DN deletedDn : alreadyDeleted)
+ {
+ if (dn.isDescendantOf(deletedDn))
+ {
+ isDnDeleted = true;
+ break;
+ }
+ }
+ if (!isDnDeleted)
+ {
+ InitialLdapContext ctx =
+ controller.findConnectionForDisplayedEntry(node);
+ deleteSubtree(ctx, dn);
+ alreadyDeleted.add(dn);
+ toNotify.add(controller.getNodeInfoFromPath(path));
+ deletedSinceLastNotify = nDeleted - deletedSinceLastNotify;
+ if (deletedSinceLastNotify >= 10)
+ {
+ SwingUtilities.invokeAndWait(new Runnable()
+ {
+ public void run()
+ {
+ notifyEntriesDeleted(toNotify);
+ toNotify.clear();
+ }
+ });
+ }
+ }
+ }
+ catch (DirectoryException de)
+ {
+ throw new IllegalStateException("Unexpected error parsing dn: "+
+ node.getDN(), de);
+ }
+ }
+ if (toNotify.size() > 0)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ notifyEntriesDeleted(toNotify);
+ toNotify.clear();
+ }
+ });
+ }
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ if (nDeleted > 1)
+ {
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ "<br>"+INFO_CTRL_PANEL_ENTRIES_DELETED.get(nDeleted),
+ ColorAndFontConstants.progressFont));
+ }
+ }
+
+ /**
+ * Notifies that some entries have been deleted. This will basically update
+ * the browser controller so that the tree reflects the changes that have
+ * been made.
+ * @param deleteNodes the nodes that have been deleted.
+ */
+ private void notifyEntriesDeleted(Collection<BrowserNodeInfo> deleteNodes)
+ {
+ TreePath pathToSelect = null;
+ for (BrowserNodeInfo nodeInfo : deleteNodes)
+ {
+ TreePath parentPath = controller.notifyEntryDeleted(nodeInfo);
+ if (pathToSelect != null)
+ {
+ if (parentPath.getPathCount() < pathToSelect.getPathCount())
+ {
+ pathToSelect = parentPath;
+ }
+ }
+ else
+ {
+ pathToSelect = parentPath;
+ }
+ }
+ if (pathToSelect != null)
+ {
+ TreePath selectedPath = controller.getTree().getSelectionPath();
+ if (selectedPath == null)
+ {
+ controller.getTree().setSelectionPath(pathToSelect);
+ }
+ else if (!selectedPath.equals(pathToSelect) &&
+ (pathToSelect.getPathCount() < selectedPath.getPathCount()))
+ {
+ controller.getTree().setSelectionPath(pathToSelect);
+ }
+ }
+ }
+
+ /**
+ * Deletes a subtree.
+ * @param ctx the connection to the server.
+ * @param dnToRemove the DN of the subtree to delete.
+ * @throws NamingException if an error occurs deleting the subtree.
+ */
+ private void deleteSubtree(InitialLdapContext ctx, DN dnToRemove)
+ throws NamingException
+ {
+ lastDn = dnToRemove;
+ try
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ printEquivalentCommandToDelete(lastDn);
+ getProgressDialog().setSummary(
+ Message.raw(
+ Utilities.applyFont(
+ INFO_CTRL_PANEL_DELETING_ENTRY_SUMMARY.get(
+ lastDn.toString()).toString(),
+ ColorAndFontConstants.defaultFont)));
+ }
+ });
+ Utilities.deleteSubtree(ctx, dnToRemove);
+ nDeleted ++;
+ if ((nToDelete > 0) && (nToDelete > nDeleted))
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().getProgressBar().setIndeterminate(false);
+ getProgressDialog().getProgressBar().setValue(
+ (100 * nDeleted) / nToDelete);
+ }
+ });
+ }
+ } catch (NameNotFoundException nnfe) {
+ // The entry is not there: it has been removed
+ }
+ }
+
+/*
+ private void deleteSubtree(DirContext ctx, DN dnToRemove)
+ throws NamingException, DirectoryException
+ {
+ lastDn = dnToRemove;
+
+ try {
+ SearchControls ctls = new SearchControls();
+ ctls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
+ String filter =
+ "(|(objectClass=*)(objectclass=ldapsubentry))";
+ ctls.setReturningAttributes(new String[] {"dn"});
+ NamingEnumeration<SearchResult> entryDNs =
+ ctx.search(Utilities.getJNDIName(dnToRemove.toString()), filter, ctls);
+
+ DN entryDNFound = dnToRemove;
+ while (entryDNs.hasMore())
+ {
+ SearchResult sr = entryDNs.next();
+ if (!sr.getName().equals(""))
+ {
+ CustomSearchResult res =
+ new CustomSearchResult(sr, dnToRemove.toString());
+ entryDNFound = DN.decode(res.getDN());
+ deleteSubtree(ctx,entryDNFound);
+ }
+ }
+
+ } catch (NameNotFoundException nnfe) {
+ // The entry is not there: it has been removed
+ }
+
+ try
+ {
+ if (((nDeleted % 10) == 0) || (nDeleted == 0))
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().setSummary(
+ Utilities.applyFont("Deleting entry '"+lastDn+"'...",
+ ColorAndFontConstants.defaultFont));
+ if (nDeleted == 0)
+ {
+ // Just give an example
+ printEquivalentCommandToDelete(lastDn);
+ }
+ }
+ });
+ }
+ ctx.destroySubcontext(Utilities.getJNDIName(dnToRemove.toString()));
+ nDeleted ++;
+ if (((nDeleted % 10) == 0) && (nToDelete > 0) && (nToDelete > nDeleted))
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().getProgressBar().setIndeterminate(false);
+ getProgressDialog().getProgressBar().setValue(
+ (100 * nDeleted) / nToDelete);
+ }
+ });
+ }
+ } catch (NameNotFoundException nnfe) {
+ // The entry is not there: it has been removed
+ }
+ }
+
+ private void printEquivalentCommandToDelete(DN dn)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add(getCommandLineName("ldapdelete"));
+ args.addAll(getObfuscatedCommandLineArguments(
+ getConnectionCommandLineArguments()));
+ args.add(dn.toString());
+ StringBuilder sb = new StringBuilder();
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ "Equivalent command line to delete entry '"+dn+"':<br><b>"+
+ sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+*/
+ /**
+ * Prints in the progress dialog the equivalent command-line to delete a
+ * subtree.
+ * @param dn the DN of the subtree to be deleted.
+ */
+ private void printEquivalentCommandToDelete(DN dn)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add(getCommandLinePath("ldapdelete"));
+ args.addAll(getObfuscatedCommandLineArguments(
+ getConnectionCommandLineArguments()));
+ args.add("-J");
+ args.add(Utilities.SUBTREE_CTRL_OID);
+ args.add(dn.toString());
+ StringBuilder sb = new StringBuilder();
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_ENTRY.get(dn.toString())+
+ "<br><b>"+
+ sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
new file mode 100644
index 0000000..7d073a7
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
@@ -0,0 +1,416 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.util.ConfigReader;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.admin.client.ManagementContext;
+import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
+import org.opends.server.admin.client.ldap.LDAPManagementContext;
+import org.opends.server.admin.std.client.LocalDBBackendCfgClient;
+import org.opends.server.admin.std.client.RootCfgClient;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.DN;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * The task that is launched when an index must be deleted.
+ */
+public class DeleteIndexTask extends Task
+{
+ private Set<String> backendSet;
+ private ArrayList<AbstractIndexDescriptor> indexesToDelete =
+ new ArrayList<AbstractIndexDescriptor>();
+ private ArrayList<AbstractIndexDescriptor> deletedIndexes =
+ new ArrayList<AbstractIndexDescriptor>();
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param indexesToDelete the indexes that must be deleted.
+ */
+ public DeleteIndexTask(ControlPanelInfo info, ProgressDialog dlg,
+ ArrayList<AbstractIndexDescriptor> indexesToDelete)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ for (AbstractIndexDescriptor index : indexesToDelete)
+ {
+ backendSet.add(index.getBackend().getBackendID());
+ }
+ this.indexesToDelete.addAll(indexesToDelete);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.DELETE_INDEX;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ if (backendSet.size() == 1)
+ {
+ return INFO_CTRL_PANEL_DELETE_INDEX_TASK_DESCRIPTION.get(
+ Utilities.getStringFromCollection(backendSet, ", "));
+ }
+ else
+ {
+ return INFO_CTRL_PANEL_DELETE_INDEX_IN_BACKENDS_TASK_DESCRIPTION.get(
+ Utilities.getStringFromCollection(backendSet, ", "));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * Update the configuration in the server.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void updateConfiguration() throws OpenDsException
+ {
+ boolean configHandlerUpdated = false;
+ final int totalNumber = indexesToDelete.size();
+ int numberDeleted = 0;
+ try
+ {
+ if (!isServerRunning())
+ {
+ configHandlerUpdated = true;
+ getInfo().stopPooling();
+ if (getInfo().mustDeregisterConfig())
+ {
+ DirectoryServer.deregisterBaseDN(DN.decode("cn=config"));
+ }
+ DirectoryServer.getInstance().initializeConfiguration(
+ org.opends.server.extensions.ConfigFileHandler.class.getName(),
+ ConfigReader.configFile);
+ getInfo().setMustDeregisterConfig(true);
+ }
+ boolean isFirst = true;
+ for (final AbstractIndexDescriptor index : indexesToDelete)
+ {
+ if (!isFirst)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml("<br><br>");
+ }
+ });
+ }
+ isFirst = false;
+ if (isServerRunning())
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLineName(index));
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(
+ getDSConfigCommandLineArguments(index));
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_INDEX.get()+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ if (isVLVIndex(index))
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_DELETING_VLV_INDEX.get(
+ index.getName()),
+ ColorAndFontConstants.progressFont));
+ }
+ else
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_DELETING_INDEX.get(
+ index.getName()),
+ ColorAndFontConstants.progressFont));
+ }
+ }
+ });
+ if (isServerRunning())
+ {
+ deleteIndex(getInfo().getDirContext(), index);
+ }
+ else
+ {
+ deleteIndex(index);
+ }
+ numberDeleted ++;
+ final int fNumberDeleted = numberDeleted;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().getProgressBar().setIndeterminate(false);
+ getProgressDialog().getProgressBar().setValue(
+ (fNumberDeleted * 100) / totalNumber);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ deletedIndexes.add(index);
+ }
+ }
+ finally
+ {
+ if (configHandlerUpdated)
+ {
+ DirectoryServer.getInstance().initializeConfiguration(
+ ConfigReader.configClassName, ConfigReader.configFile);
+ getInfo().startPooling(ControlPanelInfo.DEFAULT_POOLING);
+ }
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the index is a VLV index and
+ * <CODE>false</CODE> otherwise.
+ * @param index the index.
+ * @return <CODE>true</CODE> if the index is a VLV index and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean isVLVIndex(AbstractIndexDescriptor index)
+ {
+ return index instanceof VLVIndexDescriptor;
+ }
+
+ /**
+ * Deletes an index. The code assumes that the server is not running
+ * and that the configuration file can be edited.
+ * @param index the index to be deleted.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void deleteIndex(AbstractIndexDescriptor index) throws OpenDsException
+ {
+ if (isVLVIndex(index))
+ {
+ String dn = Utilities.getRDNString("ds-cfg-name", index.getName())+
+ ",cn=VLV Index,"+Utilities.getRDNString("ds-cfg-backend-id",
+ index.getBackend().getBackendID())+",cn=Backends,cn=config";
+ DirectoryServer.getConfigHandler().deleteEntry(DN.decode(dn), null);
+ }
+ else
+ {
+ String dn = Utilities.getRDNString("ds-cfg-attribute", index.getName())+
+ ",cn=Index,"+Utilities.getRDNString("ds-cfg-backend-id",
+ index.getBackend().getBackendID())+",cn=Backends,cn=config";
+ DirectoryServer.getConfigHandler().deleteEntry(DN.decode(dn), null);
+ }
+ }
+
+ /**
+ * Deletes an index. The code assumes that the server is running
+ * and that the provided connection is active.
+ * @param index the index to be deleted.
+ * @param ctx the connection to the server.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void deleteIndex(InitialLdapContext ctx,
+ AbstractIndexDescriptor index) throws OpenDsException
+ {
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ LocalDBBackendCfgClient backend =
+ (LocalDBBackendCfgClient)root.getBackend(
+ index.getBackend().getBackendID());
+ if (isVLVIndex(index))
+ {
+ backend.removeLocalDBVLVIndex(index.getName());
+ }
+ else
+ {
+ backend.removeLocalDBIndex(index.getName());
+ }
+ backend.commit();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * Returns the path of the command line to be used to delete the specified
+ * index.
+ * @param index the index to be deleted.
+ * @return the path of the command line to be used to delete the specified
+ * index.
+ */
+ private String getConfigCommandLineName(AbstractIndexDescriptor index)
+ {
+ if (isServerRunning())
+ {
+ return getCommandLinePath("dsconfig");
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ updateConfiguration();
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ finally
+ {
+ for (AbstractIndexDescriptor index : deletedIndexes)
+ {
+ getInfo().unregisterModifiedIndex(index);
+ }
+ }
+ }
+
+ /**
+ * Return the dsconfig arguments required to delete an index.
+ * @param index the index to be deleted.
+ * @return the dsconfig arguments required to delete an index.
+ */
+ private ArrayList<String> getDSConfigCommandLineArguments(
+ AbstractIndexDescriptor index)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ if (isVLVIndex(index))
+ {
+ args.add("delete-local-db-vlv-index");
+ }
+ else
+ {
+ args.add("delete-local-db-index");
+ }
+ args.add("--backend-name");
+ args.add(index.getBackend().getBackendID());
+
+ args.add("--index-name");
+ args.add(index.getName());
+
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+ return args;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
new file mode 100644
index 0000000..9cbeabe
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
@@ -0,0 +1,458 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.naming.NamingException;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.CommonSchemaElements;
+import org.opends.server.types.Entry;
+import org.opends.server.types.ExistingFileBehavior;
+import org.opends.server.types.LDIFExportConfig;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.Modification;
+import org.opends.server.types.ModificationType;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.SchemaFileElement;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.LDIFWriter;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * The task that is launched when a schema element must be deleted.
+ */
+public class DeleteSchemaElementsTask extends Task
+{
+ ArrayList<ObjectClass> ocsToDelete = new ArrayList<ObjectClass>();
+ ArrayList<AttributeType> attrsToDelete = new ArrayList<AttributeType>();
+ private Set<String> backendSet;
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param ocsToDelete the object classes that must be deleted.
+ * @param attrsToDelete the attributes that must be deleted.
+ */
+ public DeleteSchemaElementsTask(ControlPanelInfo info, ProgressDialog dlg,
+ List<ObjectClass> ocsToDelete, List<AttributeType> attrsToDelete)
+ {
+ super(info, dlg);
+ this.ocsToDelete.addAll(ocsToDelete);
+ this.attrsToDelete.addAll(attrsToDelete);
+ backendSet = new HashSet<String>();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ if (attrsToDelete.isEmpty())
+ {
+ return Type.DELETE_OBJECTCLASS;
+ }
+ else if (ocsToDelete.isEmpty())
+ {
+ return Type.DELETE_ATTRIBUTE;
+ }
+ else
+ {
+ return Type.DELETE_OBJECTCLASS;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ updateSchema();
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_DELETE_SCHEMA_ELEMENT_TASK_DESCRIPTION.get();
+ }
+
+ /**
+ * Updates the schema.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void updateSchema() throws OpenDsException
+ {
+ final boolean[] isFirst = {true};
+ final int totalNumber = ocsToDelete.size() + attrsToDelete.size();
+ int numberDeleted = 0;
+ for (final ObjectClass objectClass : ocsToDelete)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ if (!isFirst[0])
+ {
+ getProgressDialog().appendProgressHtml("<br><br>");
+ }
+ isFirst[0] = false;
+ printEquivalentCommandToDelete(objectClass);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_DELETING_OBJECTCLASS.get(
+ objectClass.getNameOrOID()),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ if (isServerRunning())
+ {
+ try
+ {
+ BasicAttribute attr = new BasicAttribute(
+ getSchemaFileAttributeName(objectClass));
+ attr.add(getSchemaFileAttributeValue(objectClass));
+ ModificationItem mod =
+ new ModificationItem(DirContext.REMOVE_ATTRIBUTE, attr);
+ getInfo().getDirContext().modifyAttributes(
+ ConfigConstants.DN_DEFAULT_SCHEMA_ROOT,
+ new ModificationItem[] { mod });
+ }
+ catch (NamingException ne)
+ {
+ throw new OnlineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne.toString()), ne);
+ }
+ }
+ else
+ {
+ updateSchemaFile(objectClass);
+ }
+ numberDeleted ++;
+ final int fNumberDeleted = numberDeleted;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().getProgressBar().setIndeterminate(false);
+ getProgressDialog().getProgressBar().setValue(
+ (fNumberDeleted * 100) / totalNumber);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+
+ for (final AttributeType attribute : attrsToDelete)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ if (!isFirst[0])
+ {
+ getProgressDialog().appendProgressHtml("<br><br>");
+ }
+ isFirst[0] = false;
+ printEquivalentCommandToDelete(attribute);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_DELETING_ATTRIBUTE.get(
+ attribute.getNameOrOID()),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ if (isServerRunning())
+ {
+ try
+ {
+ BasicAttribute attr = new BasicAttribute(
+ getSchemaFileAttributeName(attribute));
+ attr.add(getSchemaFileAttributeValue(attribute));
+ ModificationItem mod = new ModificationItem(
+ DirContext.REMOVE_ATTRIBUTE,
+ attr);
+ getInfo().getDirContext().modifyAttributes(
+ ConfigConstants.DN_DEFAULT_SCHEMA_ROOT,
+ new ModificationItem[] { mod });
+ }
+ catch (NamingException ne)
+ {
+ throw new OnlineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne.toString()), ne);
+ }
+ }
+ else
+ {
+ updateSchemaFile(attribute);
+ }
+
+ numberDeleted ++;
+ final int fNumberDeleted = numberDeleted;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().getProgressBar().setIndeterminate(false);
+ getProgressDialog().getProgressBar().setValue(
+ (fNumberDeleted * 100) / totalNumber);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+
+ }
+
+ /**
+ * Updates the schema file by deleting the provided schema element.
+ * @param schemaElement the schema element to be deleted.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void updateSchemaFile(CommonSchemaElements schemaElement)
+ throws OpenDsException
+ {
+ String schemaFile = getSchemaFile((SchemaFileElement)schemaElement);
+ LDIFExportConfig exportConfig =
+ new LDIFExportConfig(schemaFile,
+ ExistingFileBehavior.OVERWRITE);
+ LDIFReader reader = null;
+ Entry schemaEntry = null;
+ try
+ {
+ reader = new LDIFReader(new LDIFImportConfig(schemaFile));
+ schemaEntry = reader.readEntry();
+
+ Modification mod = new Modification(ModificationType.DELETE,
+ Attributes.create(
+ getSchemaFileAttributeName(schemaElement).toLowerCase(),
+ getSchemaFileAttributeValue(schemaElement)));
+ schemaEntry.applyModification(mod);
+ LDIFWriter writer = new LDIFWriter(exportConfig);
+ writer.writeEntry(schemaEntry);
+ exportConfig.getWriter().newLine();
+ }
+ catch (Throwable t)
+ {
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ try
+ {
+ reader.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ if (exportConfig != null)
+ {
+ try
+ {
+ exportConfig.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns the schema file for a given schema element.
+ * @param element the schema element.
+ * @return the schema file for a given schema element.
+ */
+ private String getSchemaFile(SchemaFileElement element)
+ {
+ String schemaFile = element.getSchemaFile();
+ if (schemaFile == null)
+ {
+ schemaFile = ConfigConstants.FILE_USER_SCHEMA_ELEMENTS;
+ }
+ File f = new File(schemaFile);
+ if (!f.isAbsolute())
+ {
+ f = new File(
+ DirectoryServer.getEnvironmentConfig().getSchemaDirectory(),
+ schemaFile);
+ }
+ schemaFile = f.getAbsolutePath();
+ return schemaFile;
+ }
+
+ /**
+ * Returns the attribute name in the schema entry that corresponds to the
+ * profived schema element.
+ * @param element the schema element.
+ * @return the attribute name in the schema entry that corresponds to the
+ * profived schema element.
+ */
+ private String getSchemaFileAttributeName(CommonSchemaElements element)
+ {
+ if (element instanceof AttributeType)
+ {
+ return "attributeTypes";
+ }
+ else
+ {
+ return "objectClasses";
+ }
+ }
+
+ /**
+ * Returns the value in the schema file for the provided element.
+ * @param element the schema element.
+ * @return the value in the schema file for the provided element.
+ */
+ private String getSchemaFileAttributeValue(CommonSchemaElements element)
+ {
+ if (element instanceof AttributeType)
+ {
+ return ((AttributeType)element).getDefinition();
+ }
+ else
+ {
+ return ((ObjectClass)element).getDefinition();
+ }
+ }
+
+ /**
+ * Prints the equivalent command-line to delete the schema element in the
+ * progress dialog.
+ * @param element the schema element to be deleted.
+ */
+ private void printEquivalentCommandToDelete(CommonSchemaElements element)
+ {
+ String schemaFile = getSchemaFile((SchemaFileElement)element);
+ String attrName = getSchemaFileAttributeName(element);
+ String attrValue = getSchemaFileAttributeValue(element);
+ if (!isServerRunning())
+ {
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_SCHEMA_ELEMENT_OFFLINE.get(
+ schemaFile)+"<br><b>"+
+ attrName+": "+attrValue+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ else
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add(getCommandLinePath("ldapmodify"));
+ args.add("-a");
+ args.addAll(getObfuscatedCommandLineArguments(
+ getConnectionCommandLineArguments()));
+ StringBuilder sb = new StringBuilder();
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ sb.append("<br>");
+ sb.append("dn: cn=schema<br>");
+ sb.append("changetype: modify<br>");
+ sb.append("delete: "+attrName+"<br>");
+ sb.append(attrName+": "+attrValue);
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_SCHEMA_ELEMENT_ONLINE.get()+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/IndexTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/IndexTask.java
new file mode 100644
index 0000000..48a009b
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/IndexTask.java
@@ -0,0 +1,133 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.server.types.DN;
+
+/**
+ * Abstract task used to factorize some code shared by different tasks involving
+ * indexes.
+ *
+ */
+public abstract class IndexTask extends Task
+{
+ /**
+ * The set of backends that are affected by this task.
+ */
+ protected Set<String> backendSet;
+ /**
+ * The set of base DNs that are affected by this task.
+ */
+ protected Set<String> baseDNs;
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param baseDN the base DN where the indexes are defined.
+ */
+ protected IndexTask(ControlPanelInfo info, ProgressDialog dlg,
+ String baseDN)
+ {
+ super(info, dlg);
+ baseDNs = new HashSet<String>();
+ baseDNs.add(baseDN);
+ initializeBackendSet();
+ }
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param baseDNs the list of base DNs where the indexes are defined.
+ */
+ protected IndexTask(ControlPanelInfo info, ProgressDialog dlg,
+ Collection<String> baseDNs)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ this.baseDNs = new TreeSet<String>();
+ this.baseDNs.addAll(baseDNs);
+ initializeBackendSet();
+ }
+
+ /**
+ * Initialize the list of backends that are affected by this task.
+ *
+ */
+ private void initializeBackendSet()
+ {
+ backendSet = new TreeSet<String>();
+ DN theDN = null;
+ for (String baseDN : baseDNs)
+ {
+ try
+ {
+ theDN = DN.decode(baseDN);
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalArgumentException("Could not decode dn "+
+ baseDN, t);
+ }
+ for (BackendDescriptor backend :
+ getInfo().getServerDescriptor().getBackends())
+ {
+ for (BaseDNDescriptor b : backend.getBaseDns())
+ {
+ if (b.getDn().equals(theDN))
+ {
+ backendSet.add(backend.getBackendID());
+ break;
+ }
+ }
+ if (backendSet.size() > 0)
+ {
+ break;
+ }
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
new file mode 100644
index 0000000..b66fdf3
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -0,0 +1,703 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.CannotRenameException;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.ui.ViewEntryPanel;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.AdminToolMessages;
+import org.opends.messages.Message;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.ByteStringFactory;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.RDN;
+import org.opends.server.types.Schema;
+
+/**
+ * The task that is called when we must modify an entry.
+ *
+ */
+public class ModifyEntryTask extends Task
+{
+ private Set<String> backendSet;
+ private boolean mustRename;
+ private boolean hasModifications;
+ private CustomSearchResult oldEntry;
+ private DN oldDn;
+ private ArrayList<ModificationItem> modifications;
+ private Entry newEntry;
+ private BrowserController controller;
+ private TreePath treePath;
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param newEntry the entry containing the new values.
+ * @param oldEntry the old entry as we retrieved using JNDI.
+ * @param controller the BrowserController.
+ * @param path the TreePath corresponding to the node in the tree that we
+ * want to modify.
+ */
+ public ModifyEntryTask(ControlPanelInfo info, ProgressDialog dlg,
+ Entry newEntry, CustomSearchResult oldEntry,
+ BrowserController controller, TreePath path)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ this.oldEntry = oldEntry;
+ this.newEntry = newEntry;
+ this.controller = controller;
+ this.treePath = path;
+ DN newDn = newEntry.getDN();
+ try
+ {
+ oldDn = DN.decode(oldEntry.getDN());
+ for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ if (newDn.isDescendantOf(baseDN.getDn()) ||
+ oldDn.isDescendantOf(baseDN.getDn()))
+ {
+ backendSet.add(backend.getBackendID());
+ }
+ }
+ }
+ mustRename = !newDn.equals(oldDn);
+ }
+ catch (OpenDsException ode)
+ {
+ throw new IllegalStateException("Could not parse DN: "+oldEntry.getDN(),
+ ode);
+ }
+ modifications = getModifications(newEntry, oldEntry, getInfo());
+ hasModifications = modifications.size() > 0 ||
+ !oldDn.equals(newEntry.getDN());
+ }
+
+ /**
+ * Tells whether there actually modifications on the entry.
+ * @return <CODE>true</CODE> if there are modifications and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean hasModifications()
+ {
+ return hasModifications;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.MODIFY_ENTRY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_MODIFY_ENTRY_TASK_DESCRIPTION.get(oldEntry.getDN());
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (!isServerRunning())
+ {
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean regenerateDescriptor()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ BasicNode node = (BasicNode)treePath.getLastPathComponent();
+ InitialLdapContext ctx = controller.findConnectionForDisplayedEntry(node);
+ if (!mustRename)
+ {
+ if (modifications.size() > 0) {
+ ModificationItem[] mods =
+ new ModificationItem[modifications.size()];
+ modifications.toArray(mods);
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ printEquivalentCommandToModify(newEntry.getDN(), modifications);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_MODIFYING_ENTRY.get(oldEntry.getDN()),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ ctx.modifyAttributes(Utilities.getJNDIName(oldEntry.getDN()), mods);
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(
+ ColorAndFontConstants.progressFont));
+ controller.notifyEntryChanged(
+ controller.getNodeInfoFromPath(treePath));
+ controller.getTree().removeSelectionPath(treePath);
+ controller.getTree().setSelectionPath(treePath);
+ }
+ });
+ }
+ }
+ else
+ {
+ modifyAndRename(ctx, oldDn, oldEntry, newEntry, modifications);
+ }
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * Modifies and renames the entry.
+ * @param ctx the connection to the server.
+ * @param oldDN the oldDN of the entry.
+ * @param originalEntry the original entry.
+ * @param newEntry the new entry.
+ * @param originalMods the original modifications (these are required since
+ * we might want to update them).
+ * @throws CannotRenameException if we cannot perform the modification.
+ * @throws NamingException if an error performing the modification occurs.
+ */
+ private void modifyAndRename(DirContext ctx, final DN oldDN,
+ CustomSearchResult originalEntry, final Entry newEntry,
+ final ArrayList<ModificationItem> originalMods)
+ throws CannotRenameException, NamingException
+ {
+ RDN oldRDN = oldDN.getRDN();
+ RDN newRDN = newEntry.getDN().getRDN();
+
+ boolean rdnTypeChanged =
+ newRDN.getNumValues() != oldRDN.getNumValues();
+
+ for (int i=0; (i<newRDN.getNumValues()) && !rdnTypeChanged; i++) {
+ boolean found = false;
+ for (int j=0;
+ (j<oldRDN.getNumValues()) && !found; j++) {
+ found = newRDN.getAttributeName(i).equalsIgnoreCase(
+ oldRDN.getAttributeName(j));
+ }
+ rdnTypeChanged = !found;
+ }
+
+ if (rdnTypeChanged) {
+ /* Check if user changed the objectclass...*/
+ boolean changedOc = false;
+ for (ModificationItem mod : originalMods)
+ {
+ Attribute attr = mod.getAttribute();
+ changedOc = attr.getID().equalsIgnoreCase(
+ ConfigConstants.ATTR_OBJECTCLASS);
+ if (changedOc)
+ {
+ break;
+ }
+ }
+
+ if (changedOc)
+ {
+ /* See if the original entry contains the new
+ naming attribute(s) if it does we will be able
+ to perform the renaming and then the
+ modifications without problem */
+ boolean entryContainsRdnTypes = true;
+ for (int i=0; (i<newRDN.getNumValues()) && entryContainsRdnTypes; i++)
+ {
+ Set<Object> values = originalEntry.getAttributeValues(
+ newRDN.getAttributeName(i));
+ entryContainsRdnTypes = !values.isEmpty();
+ }
+
+ if (!entryContainsRdnTypes)
+ {
+ throw new CannotRenameException(
+ AdminToolMessages.ERR_CANNOT_MODIFY_OBJECTCLASS_AND_RENAME.get());
+ }
+ }
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ printEquivalentRenameCommand(oldDN, newEntry.getDN());
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_RENAMING_ENTRY.get(oldDN.toString(),
+ newEntry.getDN().toString()),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ ctx.rename(Utilities.getJNDIName(oldDn.toString()),
+ Utilities.getJNDIName(newEntry.getDN().toString()));
+
+ final TreePath[] newPath = {null};
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ getProgressDialog().appendProgressHtml("<br>");
+ TreePath parentPath = controller.notifyEntryDeleted(
+ controller.getNodeInfoFromPath(treePath));
+ newPath[0] = controller.notifyEntryAdded(
+ controller.getNodeInfoFromPath(parentPath),
+ newEntry.getDN().toString());
+ }
+ });
+
+
+ ModificationItem[] mods = new ModificationItem[originalMods.size()];
+ originalMods.toArray(mods);
+ if (mods.length > 0)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ DN dn = newEntry.getDN();
+ printEquivalentCommandToModify(dn, originalMods);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_MODIFYING_ENTRY.get(dn.toString()),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ ctx.modifyAttributes(Utilities.getJNDIName(newEntry.getDN().toString()),
+ mods);
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ if (newPath[0] != null)
+ {
+ controller.getTree().setSelectionPath(newPath[0]);
+ }
+ }
+ });
+ }
+ }
+
+ /**
+ * Gets the modifications to apply between two entries.
+ * @param newEntry the new entry.
+ * @param oldEntry the old entry.
+ * @param info the ControlPanelInfo, used to retrieve the schema for instance.
+ * @return the modifications to apply between two entries.
+ */
+ public static ArrayList<ModificationItem> getModifications(Entry newEntry,
+ CustomSearchResult oldEntry, ControlPanelInfo info) {
+ ArrayList<ModificationItem> modifications =
+ new ArrayList<ModificationItem>();
+ Schema schema = info.getServerDescriptor().getSchema();
+
+ List<org.opends.server.types.Attribute> newAttrs = newEntry.getAttributes();
+ newAttrs.add(newEntry.getObjectClassAttribute());
+ for (org.opends.server.types.Attribute attr : newAttrs)
+ {
+ String attrName = attr.getNameWithOptions();
+ if (!ViewEntryPanel.isEditable(attrName, schema))
+ {
+ continue;
+ }
+ AttributeType attrType = schema.getAttributeType(
+ attr.getName().toLowerCase());
+ Set<AttributeValue> newValues = new LinkedHashSet<AttributeValue>();
+ Iterator<AttributeValue> it = attr.iterator();
+ while (it.hasNext())
+ {
+ newValues.add(it.next());
+ }
+ Set<Object> oldValues = oldEntry.getAttributeValues(attrName);
+
+ boolean isAttributeInNewRdn = false;
+ AttributeValue rdnValue = null;
+ RDN rdn = newEntry.getDN().getRDN();
+ for (int i=0; i<rdn.getNumValues() && !isAttributeInNewRdn; i++)
+ {
+ isAttributeInNewRdn =
+ rdn.getAttributeName(i).equalsIgnoreCase(attrName);
+ rdnValue = rdn.getAttributeValue(i);
+ }
+
+ /* Check the attributes of the old DN. If we are renaming them they
+ * will be deleted. Check that they are on the new entry but not in
+ * the new RDN. If it is the case we must add them after the renaming.
+ */
+ AttributeValue oldRdnValueToAdd = null;
+ /* Check the value in the RDN that will be deleted. If the value was
+ * on the previous RDN but not in the new entry it will be deleted. So
+ * we must avoid to include it as a delete modification in the
+ * modifications.
+ */
+ AttributeValue oldRdnValueDeleted = null;
+ RDN oldRDN = null;
+ try
+ {
+ oldRDN = DN.decode(oldEntry.getDN()).getRDN();
+ }
+ catch (DirectoryException de)
+ {
+ throw new IllegalStateException("Unexpected error parsing DN: "+
+ oldEntry.getDN(), de);
+ }
+ for (int i=0; i<oldRDN.getNumValues(); i++)
+ {
+ if (oldRDN.getAttributeName(i).equalsIgnoreCase(attrName))
+ {
+ AttributeValue value = oldRDN.getAttributeValue(i);
+ boolean containsValue = false;
+ it = attr.iterator();
+ while (it.hasNext())
+ {
+ if (value.equals(it.next()))
+ {
+ containsValue = true;
+ break;
+ }
+ }
+ if (containsValue)
+ {
+ if ((rdnValue == null) || !rdnValue.equals(value))
+ {
+ oldRdnValueToAdd = value;
+ }
+ }
+ else
+ {
+ oldRdnValueDeleted = value;
+ }
+ break;
+ }
+ }
+ if (oldValues == null)
+ {
+ Set<AttributeValue> vs = new HashSet<AttributeValue>();
+ vs.addAll(newValues);
+ if (rdnValue != null)
+ {
+ vs.remove(rdnValue);
+ }
+ if (vs.size() > 0)
+ {
+ modifications.add(new ModificationItem(
+ DirContext.ADD_ATTRIBUTE,
+ createAttribute(attrName, newValues)));
+ }
+ } else {
+ Set<AttributeValue> toDelete = getValuesToDelete(oldValues, newValues,
+ attrType);
+ if (oldRdnValueDeleted != null)
+ {
+ toDelete.remove(oldRdnValueDeleted);
+ }
+ Set<AttributeValue> toAdd = getValuesToAdd(oldValues, newValues,
+ attrType);
+ if (oldRdnValueToAdd != null)
+ {
+ toAdd.add(oldRdnValueToAdd);
+ }
+ if ((toDelete.size() + toAdd.size() >= newValues.size()) &&
+ !isAttributeInNewRdn)
+ {
+ modifications.add(new ModificationItem(
+ DirContext.REPLACE_ATTRIBUTE,
+ createAttribute(attrName, newValues)));
+ }
+ else
+ {
+ if (toDelete.size() > 0)
+ {
+ modifications.add(new ModificationItem(
+ DirContext.REMOVE_ATTRIBUTE,
+ createAttribute(attrName, toDelete)));
+ }
+ if (toAdd.size() > 0)
+ {
+ Set<AttributeValue> vs = new HashSet<AttributeValue>();
+ vs.addAll(toAdd);
+ if (rdnValue != null)
+ {
+ vs.remove(rdnValue);
+ }
+ if (vs.size() > 0)
+ {
+ modifications.add(new ModificationItem(
+ DirContext.ADD_ATTRIBUTE,
+ createAttribute(attrName, vs)));
+ }
+ }
+ }
+ }
+ }
+
+ /* Check if there are attributes to delete */
+ for (String attrName : oldEntry.getAttributeNames())
+ {
+ if (!ViewEntryPanel.isEditable(attrName, schema))
+ {
+ continue;
+ }
+ Set<Object> oldValues = oldEntry.getAttributeValues(attrName);
+ String attrNoOptions =
+ Utilities.getAttributeNameWithoutOptions(attrName).toLowerCase();
+
+ List<org.opends.server.types.Attribute> attrs =
+ newEntry.getAttribute(attrNoOptions);
+ boolean found = false;
+ if (attrs != null)
+ {
+ for (org.opends.server.types.Attribute attr : attrs)
+ {
+ if (attr.getNameWithOptions().equalsIgnoreCase(attrName))
+ {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found && (oldValues.size() > 0))
+ {
+ modifications.add(new ModificationItem(
+ DirContext.REMOVE_ATTRIBUTE,
+ new BasicAttribute(attrName)));
+ }
+ }
+ return modifications;
+ }
+
+ /**
+ * Creates a JNDI attribute using an attribute name and a set of values.
+ * @param attrName the attribute name.
+ * @param values the values.
+ * @return a JNDI attribute using an attribute name and a set of values.
+ */
+ private static Attribute createAttribute(String attrName,
+ Set<AttributeValue> values) {
+ Attribute attribute = new BasicAttribute(attrName);
+ for (AttributeValue value : values)
+ {
+ attribute.add(value.getValue().value());
+ }
+ return attribute;
+ }
+
+ /**
+ * Creates an AttributeValue for an attribute and a value (the one we got
+ * using JNDI).
+ * @param attrType the attribute type.
+ * @param value the value found using JNDI.
+ * @return an AttributeValue object.
+ */
+ private static AttributeValue createAttributeValue(AttributeType attrType,
+ Object value)
+ {
+ ByteString v;
+ if (value instanceof String)
+ {
+ v = ByteStringFactory.create((String)value);
+ }
+ else if (value instanceof byte[])
+ {
+ v = ByteStringFactory.create((byte[])value);
+ }
+ else
+ {
+ v = ByteStringFactory.create(String.valueOf(value));
+ }
+ return new AttributeValue(attrType, v);
+ }
+
+ /**
+ * Returns the set of AttributeValue that must be deleted.
+ * @param oldValues the old values of the entry.
+ * @param newValues the new values of the entry.
+ * @param attrType the attribute type.
+ * @return the set of AttributeValue that must be deleted.
+ */
+ private static Set<AttributeValue> getValuesToDelete(Set<Object> oldValues,
+ Set<AttributeValue> newValues, AttributeType attrType)
+ {
+ Set<AttributeValue> valuesToDelete = new HashSet<AttributeValue>();
+ for (Object o : oldValues)
+ {
+ AttributeValue oldValue = createAttributeValue(attrType, o);
+ if (!newValues.contains(oldValue))
+ {
+ valuesToDelete.add(oldValue);
+ }
+ }
+ return valuesToDelete;
+ }
+
+ /**
+ * Returns the set of AttributeValue that must be added.
+ * @param oldValues the old values of the entry.
+ * @param newValues the new values of the entry.
+ * @param attrType the attribute type.
+ * @return the set of AttributeValue that must be added.
+ */
+ private static Set<AttributeValue> getValuesToAdd(Set<Object> oldValues,
+ Set<AttributeValue> newValues, AttributeType attrType)
+ {
+ Set<AttributeValue> valuesToAdd = new HashSet<AttributeValue>();
+ for (AttributeValue newValue : newValues)
+ {
+ boolean found = false;
+ for (Object o : oldValues)
+ {
+ found = newValue.equals(createAttributeValue(attrType, o));
+ if (found)
+ {
+ break;
+ }
+ }
+ if (!found)
+ {
+ valuesToAdd.add(newValue);
+ }
+ }
+ return valuesToAdd;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java
new file mode 100644
index 0000000..60b3bc8
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -0,0 +1,311 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * The task launched when we must create an entry.
+ *
+ */
+public class NewEntryTask extends Task
+{
+ private Entry newEntry;
+ private String ldif;
+ private Set<String> backendSet;
+ private BasicNode parentNode;
+ private BrowserController controller;
+ private DN dn;
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param newEntry the entry containing the new values.
+ * @param ldif the LDIF representation of the new entry.
+ * @param controller the BrowserController.
+ * @param parentNode the parent node in the tree of the entry that we want
+ * to create.
+ */
+ public NewEntryTask(ControlPanelInfo info, ProgressDialog dlg,
+ Entry newEntry, String ldif,
+ BasicNode parentNode, BrowserController controller)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ this.newEntry = newEntry;
+ this.ldif = ldif;
+ this.parentNode = parentNode;
+ this.controller = controller;
+ dn = newEntry.getDN();
+ for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ if (dn.isDescendantOf(baseDN.getDn()))
+ {
+ backendSet.add(backend.getBackendID());
+ }
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.NEW_ENTRY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_NEW_ENTRY_TASK_DESCRIPTION.get(dn.toString());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (!isServerRunning())
+ {
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean regenerateDescriptor()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ InitialLdapContext ctx;
+
+ if (parentNode != null)
+ {
+ ctx = controller.findConnectionForDisplayedEntry(parentNode);
+ }
+ else
+ {
+ ctx = getInfo().getDirContext();
+ }
+ BasicAttributes attrs = new BasicAttributes();
+ BasicAttribute objectclass =
+ new BasicAttribute(ConfigConstants.ATTR_OBJECTCLASS);
+ for (String oc : newEntry.getObjectClasses().values())
+ {
+ objectclass.add(oc);
+ }
+ attrs.put(objectclass);
+ for (org.opends.server.types.Attribute attr : newEntry.getAttributes())
+ {
+ String attrName = attr.getNameWithOptions();
+ Set<AttributeValue> values = new LinkedHashSet<AttributeValue>();
+ Iterator<AttributeValue> it = attr.iterator();
+ while (it.hasNext())
+ {
+ values.add(it.next());
+ }
+ BasicAttribute a = new BasicAttribute(attrName);
+ for (AttributeValue value : values)
+ {
+ a.add(value.getValueBytes());
+ }
+ attrs.put(a);
+ }
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ printEquivalentCommand();
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_CREATING_ENTRY.get(dn.toString()),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ ctx.createSubcontext(Utilities.getJNDIName(newEntry.getDN().toString()),
+ attrs);
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ if (parentNode != null)
+ {
+ TreePath parentPath =
+ new TreePath(controller.getTreeModel().getPathToRoot(parentNode));
+ if (parentPath != null)
+ {
+ BrowserNodeInfo nodeInfo =
+ controller.getNodeInfoFromPath(parentPath);
+ if (nodeInfo != null)
+ {
+ TreePath newPath = controller.notifyEntryAdded(
+ controller.getNodeInfoFromPath(parentPath),
+ newEntry.getDN().toString());
+ if (newPath != null)
+ {
+ controller.getTree().setSelectionPath(newPath);
+ controller.getTree().scrollPathToVisible(newPath);
+ }
+ }
+ }
+ }
+ }
+ });
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * Prints the equivalent command-line in the progress dialog.
+ *
+ */
+ private void printEquivalentCommand()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add(getCommandLinePath("ldapmodify"));
+ args.addAll(getObfuscatedCommandLineArguments(
+ getConnectionCommandLineArguments()));
+ args.add("--defaultAdd");
+ StringBuilder sb = new StringBuilder();
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ sb.append("<br>");
+ String[] lines = ldif.split("\n");
+ for (String line : lines)
+ {
+ sb.append(obfuscateLDIFLine(line));
+ sb.append("<br>");
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_ENTRY.get()+"<br><b>"+
+ sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/OfflineUpdateException.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/OfflineUpdateException.java
new file mode 100644
index 0000000..8c05802
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/OfflineUpdateException.java
@@ -0,0 +1,60 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import org.opends.messages.Message;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * Exception throw when there is an error updating the configuration offline
+ * (in general updating the configuration files).
+ *
+ */
+public class OfflineUpdateException extends OpenDsException
+{
+ private static final long serialVersionUID = -3657161656553956678L;
+
+ /**
+ * Creates an exception with a message.
+ * @param msg the message.
+ */
+ public OfflineUpdateException(Message msg)
+ {
+ super(msg);
+ }
+
+ /**
+ * Creates an exception with a message and a root cause.
+ * @param msg the message.
+ * @param rootCause the root cause.
+ */
+ public OfflineUpdateException(Message msg, Throwable rootCause)
+ {
+ super(msg, rootCause);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/OnlineUpdateException.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/OnlineUpdateException.java
new file mode 100644
index 0000000..b5e1380
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/OnlineUpdateException.java
@@ -0,0 +1,61 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import org.opends.messages.Message;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * Exception throw when there is an error updating the configuration online
+ * (in general is used as a wrapper when we get a NamingException).
+ *
+ */
+public class OnlineUpdateException extends OpenDsException
+{
+
+ private static final long serialVersionUID = 2594845362087209988L;
+
+ /**
+ * Creates an exception with a message.
+ * @param msg the message.
+ */
+ public OnlineUpdateException(Message msg)
+ {
+ super(msg);
+ }
+
+ /**
+ * Creates an exception with a message and a root cause.
+ * @param msg the message.
+ * @param rootCause the root cause.
+ */
+ public OnlineUpdateException(Message msg, Throwable rootCause)
+ {
+ super(msg, rootCause);
+ }
+}
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
new file mode 100644
index 0000000..49338fb
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
@@ -0,0 +1,349 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.admin.client.ManagementContext;
+import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
+import org.opends.server.admin.client.ldap.LDAPManagementContext;
+import org.opends.server.admin.std.client.LocalDBBackendCfgClient;
+import org.opends.server.admin.std.client.RootCfgClient;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * The class that is used when a set of indexes must be rebuilt.
+ *
+ */
+public class RebuildIndexTask extends IndexTask
+{
+ private SortedSet<AbstractIndexDescriptor> indexes =
+ new TreeSet<AbstractIndexDescriptor>();
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param baseDNs the baseDNs corresponding to the indexes.
+ * @param indexes the indexes.
+ */
+ public RebuildIndexTask(ControlPanelInfo info, ProgressDialog dlg,
+ Collection<String> baseDNs, SortedSet<AbstractIndexDescriptor> indexes)
+ {
+ super(info, dlg, baseDNs);
+ this.indexes.addAll(indexes);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.REBUILD_INDEXES;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ if (baseDNs.size() == 1)
+ {
+ return INFO_CTRL_PANEL_REBUILD_INDEX_TASK_DESCRIPTION.get(
+ baseDNs.iterator().next());
+ }
+ else
+ {
+ // Assume is in a backend
+ return INFO_CTRL_PANEL_REBUILD_INDEX_TASK_DESCRIPTION.get(
+ backendSet.iterator().next());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+ try
+ {
+ boolean mustDisable = false;
+ boolean mustEnable = false;
+ String backendName = backendSet.iterator().next();
+ if (isServerRunning())
+ {
+ for (BackendDescriptor backend :
+ getInfo().getServerDescriptor().getBackends())
+ {
+ if (backendName.equals(backend.getBackendID()))
+ {
+ mustDisable = backend.isEnabled();
+ break;
+ }
+ }
+ }
+
+ if (mustDisable)
+ {
+ setBackendEnable(backendName, false);
+ mustEnable = true;
+ }
+
+ for (final String baseDN : baseDNs)
+ {
+ ArrayList<String> arguments = getCommandLineArguments(baseDN);
+
+ String[] args = new String[arguments.size()];
+
+ arguments.toArray(args);
+
+ final StringBuilder sb = new StringBuilder();
+ sb.append(getCommandLinePath("rebuild-index"));
+ Collection<String> displayArgs = getObfuscatedCommandLineArguments(
+ getCommandLineArguments(baseDN));
+ displayArgs.removeAll(getConfigCommandLineArguments());
+ for (String arg : displayArgs)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ sb.toString();
+ final ProgressDialog progressDialog = getProgressDialog();
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ progressDialog.appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_REBUILD_INDEX.get(baseDN)+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ returnCode = executeCommandLine(getCommandLinePath("rebuild-index"),
+ args);
+
+ if (returnCode != 0)
+ {
+ break;
+ }
+ }
+ if (mustEnable)
+ {
+ setBackendEnable(backendName, true);
+ }
+
+ if (returnCode != 0)
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ for (AbstractIndexDescriptor index : indexes)
+ {
+ getInfo().unregisterModifiedIndex(index);
+ }
+
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * Returns the command line arguments required to rebuild the indexes
+ * in the specified base DN.
+ * @param baseDN the base DN.
+ * @return the command line arguments required to rebuild the indexes
+ * in the specified base DN.
+ */
+ protected ArrayList<String> getCommandLineArguments(String baseDN)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+
+ args.add("--baseDN");
+ args.add(baseDN);
+
+ for (AbstractIndexDescriptor index : indexes)
+ {
+ args.add("--index");
+ if (index instanceof VLVIndexDescriptor)
+ {
+ args.add(
+ Utilities.getVLVNameInCommandLine((VLVIndexDescriptor)index));
+ }
+ else
+ {
+ args.add(index.getName());
+ }
+ }
+
+ return args;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * Enables a backend.
+ * @param backendName the backend name.
+ * @param enable whether to enable or disable the backend.
+ * @throws OpenDsException if an error occurs.
+ */
+ private void setBackendEnable(final String backendName,
+ final boolean enable) throws OpenDsException
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("set-backend-prop");
+ args.add("--backend-name");
+ args.add(backendName);
+ args.add("--set");
+ args.add("enabled:"+enable);
+
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+
+ final StringBuilder sb = new StringBuilder();
+ sb.append(getCommandLinePath("dsconfig"));
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+
+ final ProgressDialog progressDialog = getProgressDialog();
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ if (enable)
+ {
+ progressDialog.appendProgressHtml("<br><br>"+Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ENABLE_BACKEND.get(
+ backendName)+"<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ progressDialog.appendProgressHtml(Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_ENABLING_BACKEND.get(backendName),
+ ColorAndFontConstants.progressFont));
+ }
+ else
+ {
+ progressDialog.appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DISABLE_BACKEND.get(
+ backendName)+"<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ progressDialog.appendProgressHtml(Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_DISABLING_BACKEND.get(backendName),
+ ColorAndFontConstants.progressFont));
+ }
+ }
+ });
+
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(getInfo().getDirContext()));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ LocalDBBackendCfgClient backend =
+ (LocalDBBackendCfgClient)root.getBackend(backendName);
+
+ if (backend.isEnabled() != enable)
+ {
+ backend.setEnabled(enable);
+ backend.commit();
+ }
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ progressDialog.appendProgressHtml(Utilities.getProgressDone(
+ ColorAndFontConstants.progressFont)+
+ "<br><br>");
+ }
+ });
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
new file mode 100644
index 0000000..106f6b4
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
@@ -0,0 +1,249 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.DN;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * The task called when we want to reset the password of the user.
+ *
+ */
+public class ResetUserPasswordTask extends Task
+{
+ private Set<String> backendSet;
+ private BasicNode node;
+ private char[] newPassword;
+ private BrowserController controller;
+ DN dn;
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ * @param node the node corresponding to the entry whose password is going
+ * to be reset.
+ * @param controller the BrowserController.
+ * @param pwd the new password.
+ */
+ public ResetUserPasswordTask(ControlPanelInfo info, ProgressDialog dlg,
+ BasicNode node, BrowserController controller, char[] pwd)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ this.node = node;
+ this.newPassword = pwd;
+ this.controller = controller;
+ try
+ {
+ dn = DN.decode(node.getDN());
+ for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ if (dn.isDescendantOf(baseDN.getDn()))
+ {
+ backendSet.add(backend.getBackendID());
+ }
+ }
+ }
+ }
+ catch (OpenDsException ode)
+ {
+ throw new IllegalStateException("Could not parse DN: "+node.getDN(), ode);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.MODIFY_ENTRY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_RESET_USER_PASSWORD_TASK_DESCRIPTION.get(
+ node.getDN());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean regenerateDescriptor()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (!isServerRunning())
+ {
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ InitialLdapContext ctx =
+ controller.findConnectionForDisplayedEntry(node);
+ BasicAttribute attr =
+ new BasicAttribute(ServerConstants.ATTR_USER_PASSWORD);
+ attr.add(new String(newPassword));
+ ModificationItem mod =
+ new ModificationItem(DirContext.REPLACE_ATTRIBUTE, attr);
+ ModificationItem[] mods = {mod};
+ final ArrayList<ModificationItem> modifications =
+ new ArrayList<ModificationItem>();
+ modifications.add(mod);
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ printEquivalentCommandToModify(dn, modifications);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_RESETTING_USER_PASSWORD.get(node.getDN()),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ ctx.modifyAttributes(Utilities.getJNDIName(node.getDN()), mods);
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ TreePath treePath =
+ new TreePath(controller.getTreeModel().getPathToRoot(node));
+ if (treePath != null)
+ {
+ BrowserNodeInfo nodeInfo = controller.getNodeInfoFromPath(treePath);
+ if (nodeInfo != null)
+ {
+ controller.notifyEntryChanged(nodeInfo);
+ }
+ controller.getTree().removeSelectionPath(treePath);
+ controller.getTree().setSelectionPath(treePath);
+ }
+ }
+ });
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/RestartServerTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/RestartServerTask.java
new file mode 100644
index 0000000..068749d
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/RestartServerTask.java
@@ -0,0 +1,194 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The task called when we want to restart the server.
+ *
+ */
+public class RestartServerTask extends StartStopTask
+{
+ private boolean starting;
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ */
+ public RestartServerTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ if (starting)
+ {
+ return Type.START_SERVER;
+ }
+ else
+ {
+ return Type.STOP_SERVER;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_RESTART_SERVER_TASK_DESCRIPTION.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * Returns the full path of the start command-line.
+ * @return the full path of the start command-line.
+ */
+ private String getStartCommandLineName()
+ {
+ return getCommandLinePath("start-ds");
+ }
+
+ /**
+ * Returns the full path of the stop command-line.
+ * @return the full path of the stop command-line.
+ */
+ private String getStopCommandLineName()
+ {
+ return getCommandLinePath("stop-ds");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ starting = false;
+ lastException = null;
+ final ProgressDialog dlg = getProgressDialog();
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ String cmdLine = getStopCommandLineName();
+ dlg.setSummary(Message.raw(
+ Utilities.applyFont(
+ INFO_CTRL_PANEL_STOPPING_SERVER_SUMMARY.get().toString(),
+ ColorAndFontConstants.defaultFont)));
+ dlg.appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_STOP_SERVER.get()+"<br><b>"+
+ cmdLine+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ // To display new status
+ getInfo().regenerateDescriptor();
+ getInfo().stopPooling();
+ try
+ {
+ ArrayList<String> arguments = getCommandLineArguments();
+
+ String[] args = new String[arguments.size()];
+
+ arguments.toArray(args);
+ returnCode = executeCommandLine(getStopCommandLineName(), args);
+
+ if (returnCode != 0)
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().getProgressBar().setIndeterminate(false);
+ dlg.getProgressBar().setValue(30);
+ dlg.appendProgressHtml(Utilities.applyFont(
+ "<b>"+INFO_CTRL_PANEL_SERVER_STOPPED.get()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ String cmdLine = getStartCommandLineName();
+
+ dlg.setSummary(Message.raw(
+ Utilities.applyFont(
+ INFO_CTRL_PANEL_STARTING_SERVER_SUMMARY.get().toString(),
+ ColorAndFontConstants.defaultFont)));
+ dlg.appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_START_SERVER.get()+"<br><b>"+
+ cmdLine+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ starting = true;
+ // To display new status
+ getInfo().regenerateDescriptor();
+ returnCode = executeCommandLine(getStartCommandLineName(), args);
+ if (returnCode != 0)
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ getInfo().startPooling(ControlPanelInfo.DEFAULT_POOLING);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
new file mode 100644
index 0000000..f7be01a
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
@@ -0,0 +1,291 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.CommonSchemaElements;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * An abstract class used to refactor some code between the different tasks
+ * that update the schema.
+ *
+ */
+public abstract class SchemaTask extends Task
+{
+ private Set<String> backendSet;
+ /**
+ * The file where the schema elements updated by this task is located.
+ */
+ protected String schemaFile;
+
+ /**
+ * Whether the schema file is defined or not.
+ */
+ protected boolean isSchemaFileDefined;
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ */
+ protected SchemaTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ CommonSchemaElements element = getSchemaElement();
+ schemaFile = element.getSchemaFile();
+ if (schemaFile == null)
+ {
+ schemaFile = ConfigConstants.FILE_USER_SCHEMA_ELEMENTS;
+ }
+ File f = new File(schemaFile);
+ if (!f.isAbsolute())
+ {
+ f = new File(
+ DirectoryServer.getEnvironmentConfig().getSchemaDirectory(),
+ schemaFile);
+ }
+ schemaFile = f.getAbsolutePath();
+ isSchemaFileDefined = isSchemaFileDefined();
+ }
+
+ /**
+ * Returns the schema element that this task is handling.
+ * @return the schema element that this task is handling.
+ */
+ protected abstract CommonSchemaElements getSchemaElement();
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ return canLaunch;
+ }
+
+ /**
+ * Returns whether the file defined in the schema element exists or not.
+ * @return <CODE>true</CODE> if the schema file is defined and
+ * <CODE>false</CODE> otherwise.
+ */
+ protected boolean isSchemaFileDefined()
+ {
+ boolean schemaDefined = false;
+ LDIFReader reader = null;
+ try
+ {
+ reader = new LDIFReader(new LDIFImportConfig(schemaFile));
+ while (reader.readEntry() != null)
+ {
+ schemaDefined = true;
+ break;
+ }
+ }
+ catch (Throwable t)
+ {
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ try
+ {
+ reader.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ return schemaDefined;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ updateSchema();
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * Update the schema.
+ * @throws OpenDsException if an error occurs.
+ */
+ protected abstract void updateSchema() throws OpenDsException;
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * Returns the list of LDIF lines that are enough to create the entry
+ * containing only the schema element associated with this task.
+ * @return the list of LDIF lines that are enough to create the entry
+ * containing only the schema element associated with this task.
+ */
+ protected ArrayList<String> getSchemaEntryLines()
+ {
+ ArrayList<String> lines = new ArrayList<String>();
+ lines.add("dn: cn=schema");
+ lines.add("objectClass: top");
+ lines.add("objectClass: ldapSubentry");
+ lines.add("objectClass: subschema");
+ lines.add(getSchemaFileAttributeName()+": "+
+ getSchemaFileAttributeValue());
+ return lines;
+ }
+
+ /**
+ * Returns the attribute in the schema file that contains the definition
+ * of the schema element.
+ * @return the attribute in the schema file that contains the definition
+ * of the schema element.
+ */
+ protected abstract String getSchemaFileAttributeName();
+
+ /**
+ * Returns the value in the schema file that corresponds to the definition
+ * of the schema element.
+ * @return the value in the schema file that corresponds to the definition
+ * of the schema element.
+ */
+ protected abstract String getSchemaFileAttributeValue();
+
+
+ /**
+ * Prints the equivalent command-line to add the schema element.
+ *
+ */
+ protected void printEquivalentCommandToAdd()
+ {
+ if (!isServerRunning())
+ {
+ if (isSchemaFileDefined)
+ {
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ADD_SCHEMA_ELEMENT_OFFLINE.get(
+ schemaFile)+"<br><b>"+
+ getSchemaFileAttributeName()+": "+getSchemaFileAttributeValue()+
+ "</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ else
+ {
+ StringBuilder sb = new StringBuilder();
+ for (String line : getSchemaEntryLines())
+ {
+ if (sb.length() > 0)
+ {
+ sb.append("<br>");
+ }
+ sb.append(line);
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ADD_SCHEMA_ENTRY_OFFLINE.get(
+ schemaFile)+"<br><b>"+sb+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ }
+ else
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add(getCommandLinePath("ldapmodify"));
+ args.add("-a");
+ args.addAll(getObfuscatedCommandLineArguments(
+ getConnectionCommandLineArguments()));
+ StringBuilder sb = new StringBuilder();
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ sb.append("<br>");
+ sb.append("dn: cn=schema<br>");
+ sb.append("changetype: modify<br>");
+ sb.append("add: "+getSchemaFileAttributeName()+"<br>");
+ sb.append(getSchemaFileAttributeName()+": "+
+ getSchemaFileAttributeValue());
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ADD_SCHEMA_ELEMENT_ONLINE.get()+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StartServerTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StartServerTask.java
new file mode 100644
index 0000000..1e0ca32
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StartServerTask.java
@@ -0,0 +1,76 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.messages.Message;
+
+/**
+ * The task called when we want to start the server.
+ *
+ */
+public class StartServerTask extends StartStopTask
+{
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ */
+ public StartServerTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.START_SERVER;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_START_SERVER_TASK_DESCRIPTION.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return getCommandLinePath("start-ds");
+ }
+};
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StartStopTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StartStopTask.java
new file mode 100644
index 0000000..5b91660
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StartStopTask.java
@@ -0,0 +1,136 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.messages.Message;
+
+/**
+ * An abstract class used to refactor some code between the start, stop and
+ * restart tasks.
+ *
+ */
+public abstract class StartStopTask extends Task
+{
+ Set<String> backendSet;
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param progressDialog the progress dialog where the task progress will be
+ * displayed.
+ */
+ protected StartStopTask(ControlPanelInfo info, ProgressDialog progressDialog)
+ {
+ super(info, progressDialog);
+ backendSet = new HashSet<String>();
+ for (BackendDescriptor backend :
+ info.getServerDescriptor().getBackends())
+ {
+ backendSet.add(backend.getBackendID());
+ }
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+ // To display new status
+ try
+ {
+ getInfo().regenerateDescriptor();
+ getInfo().stopPooling();
+
+ ArrayList<String> arguments = getCommandLineArguments();
+
+ String[] args = new String[arguments.size()];
+
+ arguments.toArray(args);
+ returnCode = executeCommandLine(getCommandLinePath(), args);
+
+ if (returnCode != 0)
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ getInfo().startPooling(ControlPanelInfo.DEFAULT_POOLING);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ return args;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StopServerTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StopServerTask.java
new file mode 100644
index 0000000..33d421c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/StopServerTask.java
@@ -0,0 +1,101 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The task called when we want to start the server.
+ *
+ */
+public class StopServerTask extends StartStopTask
+{
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param dlg the progress dialog where the task progress will be displayed.
+ */
+ public StopServerTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.STOP_SERVER;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_STOP_SERVER_TASK_DESCRIPTION.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ super.runTask();
+ if (state == State.FINISHED_SUCCESSFULLY)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ "<b>Server Stopped</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return getCommandLinePath("stop-ds");
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
new file mode 100644
index 0000000..e21e096
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
@@ -0,0 +1,916 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.task;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.List;
+import java.util.Set;
+
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.ldap.InitialLdapContext;
+
+import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.PrintStreamListener;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.ProgressDialog;
+import org.opends.guitools.controlpanel.util.ApplicationPrintStream;
+import org.opends.guitools.controlpanel.util.ConfigReader;
+import org.opends.guitools.controlpanel.util.ProcessReader;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.ByteStringFactory;
+import org.opends.server.types.DN;
+import org.opends.server.types.Schema;
+import org.opends.server.util.Base64;
+import org.opends.server.util.SetupUtils;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * The class used to define a number of common methods and mechanisms for the
+ * tasks that are run in the Control Panel.
+ *
+ */
+public abstract class Task
+{
+ /**
+ * The different task types.
+ *
+ */
+ public enum Type
+ {
+ /**
+ * New Base DN creation.
+ */
+ NEW_BASEDN,
+ /**
+ * New index creation.
+ */
+ NEW_INDEX,
+ /**
+ * Modification of indexes.
+ */
+ MODIFY_INDEX,
+ /**
+ * Deletion of indexes.
+ */
+ DELETE_INDEX,
+ /**
+ * Creation of VLV indexes.
+ */
+ NEW_VLV_INDEX,
+ /**
+ * Modification of VLV indexes.
+ */
+ MODIFY_VLV_INDEX,
+ /**
+ * Deletion of VLV indexes.
+ */
+ DELETE_VLV_INDEX,
+ /**
+ * Import of an LDIF file.
+ */
+ IMPORT_LDIF,
+ /**
+ * Export of an LDIF file.
+ */
+ EXPORT_LDIF,
+ /**
+ * Backup.
+ */
+ BACKUP,
+ /**
+ * Restore.
+ */
+ RESTORE,
+ /**
+ * Verification of indexes.
+ */
+ VERIFY_INDEXES,
+ /**
+ * Rebuild of indexes.
+ */
+ REBUILD_INDEXES,
+ /**
+ * Enabling of Windows Service.
+ */
+ ENABLE_WINDOWS_SERVICE,
+ /**
+ * Disabling of Windows Service.
+ */
+ DISABLE_WINDOWS_SERVICE,
+ /**
+ * Starting the server.
+ */
+ START_SERVER,
+ /**
+ * Stopping the server.
+ */
+ STOP_SERVER,
+ /**
+ * Updating the java settings for the different command-lines.
+ */
+ JAVA_SETTINGS_UPDATE,
+ /**
+ * Creating a new attribute in the schema.
+ */
+ NEW_ATTRIBUTE,
+ /**
+ * Creating a new objectclass in the schema.
+ */
+ NEW_OBJECTCLASS,
+ /**
+ * Deleting an attribute in the schema.
+ */
+ DELETE_ATTRIBUTE,
+ /**
+ * Deleting an objectclass in the schema.
+ */
+ DELETE_OBJECTCLASS,
+ /**
+ * Modifying an entry.
+ */
+ MODIFY_ENTRY,
+ /**
+ * Creating an entry.
+ */
+ NEW_ENTRY,
+ /**
+ * Deleting an entry.
+ */
+ DELETE_ENTRY,
+ /**
+ * Deleting a base DN.
+ */
+ DELETE_BASEDN,
+ /**
+ * Deleting a backend.
+ */
+ DELETE_BACKEND,
+ /**
+ * Other task.
+ */
+ OTHER
+ };
+
+ /**
+ * The state on which the task can be.
+ */
+ public enum State
+ {
+ /**
+ * The task is not started.
+ */
+ NOT_STARTED,
+ /**
+ * The task is running.
+ */
+ RUNNING,
+ /**
+ * The task finished successfully.
+ */
+ FINISHED_SUCCESSFULLY,
+ /**
+ * The task finished with error.
+ */
+ FINISHED_WITH_ERROR
+ };
+
+ /**
+ * Returns the names of the backends that are affected by the task.
+ * @return the names of the backends that are affected by the task.
+ */
+ public abstract Set<String> getBackends();
+
+ /**
+ * The current state of the task.
+ */
+ protected State state = State.NOT_STARTED;
+ /**
+ * The return code of the task.
+ */
+ protected Integer returnCode;
+ /**
+ * The last exception encountered during the task execution.
+ */
+ protected Throwable lastException;
+ /**
+ * The progress logs of the task. Note that the user of StringBuffer is not
+ * a bug, because of the way the contents of logs is updated, using
+ * StringBuffer instead of StringBuilder is required.
+ */
+ protected StringBuffer logs = new StringBuffer();
+ /**
+ * The error logs of the task.
+ */
+ protected StringBuilder errorLogs = new StringBuilder();
+ /**
+ * The standard output logs of the task.
+ */
+ protected StringBuilder outputLogs = new StringBuilder();
+ /**
+ * The print stream for the error logs.
+ */
+ protected ApplicationPrintStream errorPrintStream =
+ new ApplicationPrintStream();
+ /**
+ * The print stream for the standard output logs.
+ */
+ protected ApplicationPrintStream outPrintStream =
+ new ApplicationPrintStream();
+
+ /**
+ * The process (if any) that the task launched. For instance if this is a
+ * start server task, the process generated executing the start-ds
+ * command-line.
+ */
+ protected Process process;
+ private ControlPanelInfo info;
+
+ private ProgressDialog progressDialog;
+
+ private static int MAX_BINARY_LENGTH_TO_DISPLAY = 1024;
+
+ /**
+ * Constructor of the task.
+ * @param info the control panel information.
+ * @param progressDialog the progress dialog where the task progress will be
+ * displayed.
+ */
+ protected Task(ControlPanelInfo info, ProgressDialog progressDialog)
+ {
+ this.info = info;
+ this.progressDialog = progressDialog;
+ outPrintStream.addListener(new PrintStreamListener()
+ {
+ /**
+ * Add a new line to the logs.
+ * @param msg the new line.
+ */
+ public void newLine(String msg)
+ {
+ outputLogs.append(msg+"\n");
+ logs.append(msg+"\n");
+ }
+ });
+ errorPrintStream.addListener(new PrintStreamListener()
+ {
+ /**
+ * Add a new line to the error logs.
+ * @param msg the new line.
+ */
+ public void newLine(String msg)
+ {
+ errorLogs.append(msg+"\n");
+ logs.append(msg+"\n");
+ }
+ });
+ }
+
+ /**
+ * Returns the ControlPanelInfo object.
+ * @return the ControlPanelInfo object.
+ */
+ public ControlPanelInfo getInfo()
+ {
+ return info;
+ }
+
+ /**
+ * Returns the logs of the task.
+ * @return the logs of the task.
+ */
+ public String getLogs()
+ {
+ return logs.toString();
+ }
+
+ /**
+ * Returns the error logs of the task.
+ * @return the error logs of the task.
+ */
+ public String getErrorLogs()
+ {
+ return errorLogs.toString();
+ }
+
+ /**
+ * Returns the output logs of the task.
+ * @return the output logs of the task.
+ */
+ public String getOutputLogs()
+ {
+ return outputLogs.toString();
+ }
+
+ /**
+ * Returns the state of the task.
+ * @return the state of the task.
+ */
+ public State getState()
+ {
+ return state;
+ }
+
+ /**
+ * Returns last exception encountered during the task execution.
+ * Returns <CODE>null</CODE> if no exception was found.
+ * @return last exception encountered during the task execution.
+ */
+ public Throwable getLastException()
+ {
+ return lastException;
+ }
+
+ /**
+ * Returns the return code (this makes sense when the task launches a
+ * command-line, it will return the error code returned by the command-line).
+ * @return the return code.
+ */
+ public Integer getReturnCode()
+ {
+ return returnCode;
+ }
+
+ /**
+ * Returns the process that the task launched.
+ * Returns <CODE>null</CODE> if not process was launched.
+ * @return the process that the task launched.
+ */
+ public Process getProcess()
+ {
+ return process;
+ }
+
+ /**
+ * Returns the progress dialog.
+ * @return the progress dialog.
+ */
+ protected ProgressDialog getProgressDialog()
+ {
+ return progressDialog;
+ }
+
+ /**
+ * Tells whether a new server descriptor should be regenerated when the task
+ * is over. If the task has an influence in the configuration or state of
+ * the server (for instance the creation of a base DN) this method should
+ * return <CODE>true</CODE> so that the configuration will be re-read and
+ * all the ConfigChangeListeners will receive a notification with the new
+ * configuration.
+ * @return <CODE>true</CODE> if a new server descriptor must be regenerated
+ * when the task is over and <CODE>false</CODE> otherwise.
+ */
+ public boolean regenerateDescriptor()
+ {
+ return true;
+ }
+
+ /**
+ * Method that is called when everything is finished after updating the
+ * progress dialog. It is called from the event thread.
+ */
+ public void postOperation()
+ {
+ }
+
+ /**
+ * The description of the task. It is used in both the incompatibility
+ * messages and in the warning message displayed when the user wants to
+ * quit and there are tasks running.
+ * @return the description of the task.
+ */
+ public abstract Message getTaskDescription();
+
+ /**
+ * Returns a String representation of a value. In general this is called
+ * to display the command-line equivalent when we do a modification in an
+ * entry. But since some attributes must be obfuscated (like the user
+ * password) we pass through this method.
+ * @param attrName the attribute name.
+ * @param o the attribute value.
+ * @return the obfuscated String representing the attribute value to be
+ * displayed in the logs of the user.
+ */
+ protected String obfuscateAttributeStringValue(String attrName, Object o)
+ {
+ if (Utilities.mustObfuscate(attrName,
+ getInfo().getServerDescriptor().getSchema()))
+ {
+ return Utilities.OBFUSCATED_VALUE;
+ }
+ else
+ {
+ if (o instanceof byte[])
+ {
+ byte[] bytes = (byte[])o;
+ if (displayBase64(attrName))
+ {
+ if (bytes.length > MAX_BINARY_LENGTH_TO_DISPLAY)
+ {
+ return INFO_CTRL_PANEL_VALUE_IN_BASE64.get().toString();
+ }
+ else
+ {
+ return Base64.encode(bytes);
+ }
+ }
+ else
+ {
+ if (bytes.length > MAX_BINARY_LENGTH_TO_DISPLAY)
+ {
+ return INFO_CTRL_PANEL_BINARY_VALUE.get().toString();
+ }
+ else
+ {
+ // Get the String value
+ ByteString v = ByteStringFactory.create(bytes);
+ return v.stringValue();
+ }
+ }
+ }
+ else
+ {
+ return String.valueOf(o);
+ }
+ }
+ }
+
+ /**
+ * Obfuscates (if required) the attribute value in an LDIF line.
+ * @param line the line of the LDIF file that must be treated.
+ * @return the line obfuscated.
+ */
+ protected String obfuscateLDIFLine(String line)
+ {
+ String returnValue;
+ int index = line.indexOf(":");
+ if (index != -1)
+ {
+ String attrName = line.substring(0, index).trim();
+
+ if (Utilities.mustObfuscate(attrName,
+ getInfo().getServerDescriptor().getSchema()))
+ {
+ returnValue = attrName + ": " +Utilities.OBFUSCATED_VALUE;
+ }
+ else
+ {
+ returnValue = line;
+ }
+ }
+ else
+ {
+ returnValue = line;
+ }
+ return returnValue;
+ }
+
+ /**
+ * Executes a command-line synchrounously.
+ * @param commandLineName the command line full path.
+ * @param args the arguments for the command-line.
+ * @return the error code returned by the command-line.
+ */
+ protected int executeCommandLine(String commandLineName, String[] args)
+ {
+ returnCode = -1;
+ String[] cmd = new String[args.length + 1];
+ cmd[0] = commandLineName;
+ for (int i=0; i<args.length; i++)
+ {
+ cmd[i+1] = args[i];
+ }
+
+ ProcessBuilder pb = new ProcessBuilder(cmd);
+ // Use the java args in the script.
+ Map<String, String> env = pb.environment();
+ //env.put(SetupUtils.OPENDS_JAVA_ARGS, "");
+ env.remove(SetupUtils.OPENDS_JAVA_ARGS);
+ env.remove("CLASSPATH");
+ ProcessReader outReader = null;
+ ProcessReader errReader = null;
+ try {
+ process = pb.start();
+
+ outReader = new ProcessReader(process, outPrintStream, false);
+ errReader = new ProcessReader(process, errorPrintStream, true);
+
+ outReader.startReading();
+ errReader.startReading();
+
+ returnCode = process.waitFor();
+ } catch (Throwable t)
+ {
+ lastException = t;
+ }
+ finally
+ {
+ if (outReader != null)
+ {
+ outReader.interrupt();
+ }
+ if (errReader != null)
+ {
+ errReader.interrupt();
+ }
+ }
+ return returnCode;
+ }
+
+ /**
+ * Informs of whether the task to be launched can be launched or not. Every
+ * task must implement this method so that we avoid launching in paralel two
+ * tasks that are not compatible. Note that in general if the current task
+ * is not running this method will return <CODE>true</CODE>.
+ *
+ * @param taskToBeLaunched the Task that we are trying to launch.
+ * @param incompatibilityReasons the list of incompatibility reasons that
+ * must be updated.
+ * @return <CODE>true</CODE> if the task that we are trying to launch can be
+ * launched in paralel with this task and <CODE>false</CODE> otherwise.
+ */
+ public abstract boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons);
+
+ /**
+ * Execute the task. This method is synchronous.
+ *
+ */
+ public abstract void runTask();
+
+ /**
+ * Returns the type of the task.
+ * @return the type of the task.
+ */
+ public abstract Type getType();
+
+
+ /**
+ * Returns the binary/script directory.
+ * @return the binary/script directory.
+ */
+ protected String getBinaryDir()
+ {
+ if (Utilities.isWindows())
+ {
+ return getInfo().getServerDescriptor().getInstallPath() +
+ File.separator + "bat" + File.separator;
+ }
+ else
+ {
+ return getInfo().getServerDescriptor().getInstallPath() +
+ File.separator + "bin" + File.separator;
+ }
+ }
+
+ /**
+ * Returns the full path of the command-line associated with this task or
+ * <CODE>null</CODE> if there is not a command-line (or a single command-line)
+ * associated with the task.
+ * @return the full path of the command-line associated with this task.
+ */
+ protected abstract String getCommandLinePath();
+
+ /**
+ * Returns the full path of the command-line for a given script name.
+ * @param scriptBasicName the script basic name (with no extension).
+ * @return the full path of the command-line for a given script name.
+ */
+ protected String getCommandLinePath(String scriptBasicName)
+ {
+ String cmdLineName;
+ if (Utilities.isWindows())
+ {
+ cmdLineName = getBinaryDir()+scriptBasicName+".bat";
+ }
+ else
+ {
+ cmdLineName = getBinaryDir()+scriptBasicName;
+ }
+ return cmdLineName;
+ }
+
+ /**
+ * Returns the list of command-line arguments.
+ * @return the list of command-line arguments.
+ */
+ protected abstract List<String> getCommandLineArguments();
+
+
+
+ /**
+ * Returns the list of obfuscated command-line arguments. This is called
+ * basically to display the equivalent command-line to the user.
+ * @param clearArgs the arguments in clear.
+ * @return the list of obfuscated command-line arguments.
+ */
+ protected List<String> getObfuscatedCommandLineArguments(
+ List<String> clearArgs)
+ {
+ ArrayList<String> args = new ArrayList<String>(clearArgs);
+ for (int i=1; i<args.size(); i++)
+ {
+ if (args.get(i-1).equalsIgnoreCase("--bindPassword"))
+ {
+ args.set(i, Utilities.OBFUSCATED_VALUE);
+ }
+ }
+ return args;
+ }
+
+ /**
+ * Returns the command-line arguments that correspond to the configuration.
+ * This method is called to remove them when we display the equivalent
+ * command-line. In some cases we run the methods of the command-line
+ * directly (on this JVM) instead of launching the script in another process.
+ * When we call this methods we must add these arguments, but they are not
+ * to be included as arguments of the command-line (when is launched as a
+ * script).
+ * @return the command-line arguments that correspond to the configuration.
+ */
+ protected ArrayList<String> getConfigCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("--configClass");
+ args.add(org.opends.server.extensions.ConfigFileHandler.class.getName());
+ args.add("--configFile");
+ args.add(ConfigReader.configFile);
+ return args;
+ }
+
+ /**
+ * Returns the list of arguments related to the connection (host, port, bind
+ * DN, etc.).
+ * @return the list of arguments related to the connection.
+ */
+ protected List<String> getConnectionCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ InitialLdapContext ctx = getInfo().getDirContext();
+ if (isServerRunning() && (ctx != null))
+ {
+ String hostName = ConnectionUtils.getHostName(ctx);
+ int port = ConnectionUtils.getPort(ctx);
+ boolean isSSL = ConnectionUtils.isSSL(ctx);
+ boolean isStartTLS = ConnectionUtils.isStartTLS(ctx);
+ String bindDN = ConnectionUtils.getBindDN(ctx);
+ String bindPwd = ConnectionUtils.getBindPassword(ctx);
+ args.add("--hostname");
+ args.add(hostName);
+ args.add("--port");
+ args.add(String.valueOf(port));
+ args.add("--bindDN");
+ args.add(bindDN);
+ args.add("--bindPassword");
+ args.add(bindPwd);
+ if (isSSL || isStartTLS)
+ {
+ args.add("--trustAll");
+ }
+ }
+ return args;
+ }
+
+ /**
+ * Returns the command-line to be displayed (when we display the equivalent
+ * command-line).
+ * @return the command-line to be displayed.
+ */
+ public String getCommandLineToDisplay()
+ {
+ String cmdLineName = getCommandLinePath();
+ if (cmdLineName != null)
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(cmdLineName);
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(getCommandLineArguments());
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ return sb.toString();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Commodity method to know if the server is running or not.
+ * @return <CODE>true</CODE> if the server is running and <CODE>false</CODE>
+ * otherwise.
+ */
+ protected boolean isServerRunning()
+ {
+ return getInfo().getServerDescriptor().getStatus() ==
+ ServerDescriptor.ServerStatus.STARTED;
+ }
+
+ /**
+ *
+ * Returns the print stream for the error logs.
+ * @return the print stream for the error logs.
+ */
+ public ApplicationPrintStream getErrorPrintStream()
+ {
+ return errorPrintStream;
+ }
+
+ /**
+ *
+ * Returns the print stream for the output logs.
+ * @return the print stream for the output logs.
+ */
+ public ApplicationPrintStream getOutPrintStream()
+ {
+ return outPrintStream;
+ }
+
+ /**
+ * Prints the equivalent modify command line in the progress dialog.
+ * @param dn the dn of the modified entry.
+ * @param mods the modifications.
+ */
+ protected void printEquivalentCommandToModify(DN dn,
+ Collection<ModificationItem> mods)
+ {
+ printEquivalentCommandToModify(dn.toString(), mods);
+ }
+
+ /**
+ * Prints the equivalent modify command line in the progress dialog.
+ * @param dn the dn of the modified entry.
+ * @param mods the modifications.
+ */
+ protected void printEquivalentCommandToModify(String dn,
+ Collection<ModificationItem> mods)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add(getCommandLinePath("ldapmodify"));
+ args.addAll(getObfuscatedCommandLineArguments(
+ getConnectionCommandLineArguments()));
+ StringBuilder sb = new StringBuilder();
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ sb.append("<br>");
+ sb.append("dn: "+dn);
+ boolean firstChangeType = true;
+ for (ModificationItem mod : mods)
+ {
+ if (firstChangeType)
+ {
+ sb.append("<br>");
+ }
+ else
+ {
+ sb.append("-<br>");
+ }
+ firstChangeType = false;
+ sb.append("changetype: modify<br>");
+ Attribute attr = mod.getAttribute();
+ String attrName = attr.getID();
+ if (mod.getModificationOp() == DirContext.ADD_ATTRIBUTE)
+ {
+ sb.append("add: "+attrName+"<br>");
+ }
+ else if (mod.getModificationOp() == DirContext.REPLACE_ATTRIBUTE)
+ {
+ sb.append("replace: "+attrName+"<br>");
+ }
+ else
+ {
+ sb.append("delete: "+attrName+"<br>");
+ }
+ for (int i=0; i<attr.size(); i++)
+ {
+ try
+ {
+ Object o = attr.get(i);
+ // We are systematically adding the values in binary mode.
+ // Use the attribute names to figure out the value to be displayed.
+ if (displayBase64(attr.getID()))
+ {
+ sb.append(attrName+":: ");
+ }
+ else
+ {
+ sb.append(attrName+": ");
+ }
+ sb.append(obfuscateAttributeStringValue(attrName, o));
+ sb.append("<br>");
+ }
+ catch (NamingException ne)
+ {
+ // Bug
+ throw new IllegalStateException(
+ "Unexpected error parsing modifications: "+ne, ne);
+ }
+ }
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_MODIFY.get().toString()+"<br><b>"+
+ sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+
+ /**
+ * Tells whether the provided attribute's values must be displayed using
+ * base 64 when displaying the equivalent command-line or not.
+ * @param attrName the attribute name.
+ * @return <CODE>true</CODE> if the attribute must be displayed using base 64
+ * and <CODE>false</CODE> otherwise.
+ */
+ protected boolean displayBase64(String attrName)
+ {
+ Schema schema = null;
+ if (getInfo() != null)
+ {
+ schema = getInfo().getServerDescriptor().getSchema();
+ }
+ return Utilities.hasBinarySyntax(attrName, schema);
+ }
+
+ /**
+ * Prints the equivalent rename command line in the progress dialog.
+ * @param oldDN the old DN of the entry.
+ * @param newDN the new DN of the entry.
+ */
+ protected void printEquivalentRenameCommand(DN oldDN, DN newDN)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add(getCommandLinePath("ldapmodify"));
+ args.addAll(getObfuscatedCommandLineArguments(
+ getConnectionCommandLineArguments()));
+ StringBuilder sb = new StringBuilder();
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ sb.append("<br>");
+ sb.append("dn: "+oldDN);
+ sb.append("<br>");
+ sb.append("changetype: moddn<br>");
+ sb.append("newrdn: "+newDN.getRDN()+"<br>");
+ sb.append("deleteoldrdn: 1");
+
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_RENAME.get().toString()+"<br><b>"+
+ sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+
+ /**
+ * Returns the incompatible message between two tasks.
+ * @param taskRunning the task that is running.
+ * @param taskToBeLaunched the task that we are trying to launch.
+ * @return the incompatible message between two tasks.
+ */
+ protected Message getIncompatibilityMessage(Task taskRunning,
+ Task taskToBeLaunched)
+ {
+ return INFO_CTRL_PANEL_INCOMPATIBLE_TASKS.get(
+ taskRunning.getTaskDescription().toString(),
+ taskToBeLaunched.getTaskDescription().toString());
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/package-info.java
new file mode 100644
index 0000000..2a81e96
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Defines the main classes that are you used to perform the administrative
+ * operations: start the server, modify an entry, delete a base DN, etc.
+ * Note that some of the task classes are defined as internal classes of the
+ * panels that launch them (see org.opends.guitools.controlpanel.ui).
+ * */
+package org.opends.guitools.controlpanel.task;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
new file mode 100644
index 0000000..172b4c7
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
@@ -0,0 +1,262 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexTableModel;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.IndexSelectionEvent;
+import org.opends.guitools.controlpanel.event.IndexSelectionListener;
+import org.opends.guitools.controlpanel.ui.renderer.SelectableTableCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * The abstract class used to refactor some code. The classes that extend this
+ * class are the two panels that appear on the right side of the
+ * 'Manage Indexes...' dialog when the user clicks on 'Indexes' or
+ * 'VLV Indexes'.
+ *
+ */
+public abstract class AbstractBackendIndexesPanel extends StatusGenericPanel
+{
+ private String backendName;
+ /**
+ * The table model.
+ */
+ protected AbstractIndexTableModel tableModel;
+ /**
+ * The table contained by this panel.
+ */
+ protected JTable table;
+ /**
+ * The scroll pane that contains the table.
+ */
+ protected JScrollPane tableScroll;
+ private Set<IndexSelectionListener> indexListeners =
+ new HashSet<IndexSelectionListener>();
+ private int lastRowMouseOver = -1;
+
+ /**
+ * Default constructor.
+ *
+ */
+ protected AbstractBackendIndexesPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return table;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ update(backendName);
+ }
+
+ /**
+ * The contents of the panel are updated with the indexes of the provided
+ * backend.
+ * @param backendName the backend name.
+ */
+ public void update(String backendName)
+ {
+ this.backendName = backendName;
+
+ BackendDescriptor backend = null;
+ for (BackendDescriptor b : getInfo().getServerDescriptor().getBackends())
+ {
+ if (b.getBackendID().equals(backendName))
+ {
+ backend = b;
+ break;
+ }
+ }
+
+ if (backend != null)
+ {
+ final BackendDescriptor b = backend;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ updateTableModel(b);
+ Utilities.updateTableSizes(table);
+ Utilities.updateScrollMode(tableScroll, table);
+ }
+ });
+ }
+ else
+ {
+ updateErrorPane(errorPane,
+ ERR_CTRL_PANEL_BACKEND_NOT_FOUND_SUMMARY.get(),
+ ColorAndFontConstants.errorTitleFont,
+ ERR_CTRL_PANEL_BACKEND_NOT_FOUND_DETAILS.get(backendName),
+ ColorAndFontConstants.defaultFont);
+ }
+ }
+
+ /**
+ * The method that is called to update the table model with the contents of
+ * the specified backend.
+ * @param backend the backend.
+ */
+ protected abstract void updateTableModel(BackendDescriptor backend);
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ // No OK button
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ /**
+ * Adds an index selection listener.
+ * @param listener the index selection listener.
+ */
+ public void addIndexSelectionListener(IndexSelectionListener listener)
+ {
+ indexListeners.add(listener);
+ }
+
+ /**
+ * Removes an index selection listener.
+ * @param listener the index selection listener.
+ */
+ public void removeIndexSelectionListener(IndexSelectionListener listener)
+ {
+ indexListeners.remove(listener);
+ }
+
+ /**
+ * Returns the index table model used by this panel.
+ * @return the index table model used by this panel.
+ */
+ protected abstract AbstractIndexTableModel getIndexTableModel();
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ *
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 1;
+ addErrorPane(gbc);
+ gbc.gridy ++;
+ tableModel = getIndexTableModel();
+ SelectableTableCellRenderer renderer = new SelectableTableCellRenderer();
+ table = Utilities.createSortableTable(tableModel, renderer);
+ renderer.setTable(table);
+ table.getSelectionModel().setSelectionMode(
+ ListSelectionModel.SINGLE_SELECTION);
+ table.setDragEnabled(false);
+ table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+ table.addMouseListener(new MouseAdapter()
+ {
+ public void mouseReleased(MouseEvent ev)
+ {
+ int selectedRow = table.getSelectedRow();
+ if ((selectedRow != -1) && (lastRowMouseOver == selectedRow))
+ {
+ AbstractIndexDescriptor index = tableModel.getIndexAt(selectedRow);
+ final IndexSelectionEvent ise = new IndexSelectionEvent(table, index);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ // Call it this way to let the painting events to happen.
+ public void run()
+ {
+ for (IndexSelectionListener listener : indexListeners)
+ {
+ listener.indexSelected(ise);
+ }
+ }
+ });
+ }
+ }
+ });
+ table.addMouseMotionListener(new MouseMotionAdapter()
+ {
+ public void mouseMoved(MouseEvent ev)
+ {
+ lastRowMouseOver = table.rowAtPoint(ev.getPoint());
+
+ }
+
+ public void mouseDragged(MouseEvent ev)
+ {
+ lastRowMouseOver = -1;
+ }
+ });
+
+ tableScroll = Utilities.createBorderLessScrollBar(table);
+ tableScroll.getViewport().setOpaque(false);
+ tableScroll.setOpaque(false);
+ tableScroll.getViewport().setBackground(ColorAndFontConstants.background);
+ tableScroll.setBackground(ColorAndFontConstants.background);
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ add(tableScroll, gbc);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
new file mode 100644
index 0000000..6e8bbdc
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
@@ -0,0 +1,1567 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTree;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.TreeModelEvent;
+import javax.swing.event.TreeModelListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
+
+import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.CategorizedComboBoxElement;
+import org.opends.guitools.controlpanel.datamodel.ConfigReadException;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.BrowserEvent;
+import org.opends.guitools.controlpanel.event.BrowserEventListener;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.components.FilterTextField;
+import org.opends.guitools.controlpanel.ui.components.TreePanel;
+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.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.server.protocols.ldap.LDAPFilter;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.LDAPException;
+import org.opends.server.types.SearchFilter;
+
+/**
+ * The abstract class used to refactor some code. The classes that extend this
+ * class are the 'Browse Entries' panel and the panel of the dialog we display
+ * when the user can choose a set of entries (for instance when the user adds
+ * a member to a group in the 'New Group' dialog).
+ *
+ */
+public abstract class AbstractBrowseEntriesPanel extends StatusGenericPanel
+{
+ private JComboBox baseDNs;
+ /**
+ * The combo box containing the different filter types.
+ */
+ protected JComboBox filterAttribute;
+
+ /**
+ * The text field of the filter.
+ */
+ protected FilterTextField filter;
+
+ private JButton applyButton;
+
+ private JButton okButton;
+ private JButton cancelButton;
+ private JButton closeButton;
+
+ private JLabel lBaseDN;
+ private JLabel lFilter;
+ private JLabel lLimit;
+
+ private JLabel lNumberOfEntries;
+
+ private JLabel lNoMatchFound;
+
+ /**
+ * The tree pane contained in this panel.
+ */
+ protected TreePanel treePane;
+
+ /**
+ * The browser controller used to update the LDAP entry tree.
+ */
+ protected BrowserController controller;
+
+ private NumberOfEntriesUpdater numberEntriesUpdater;
+
+ private BaseDNPanel otherBaseDNPanel;
+ private GenericDialog otherBaseDNDlg;
+
+ private boolean firstTimeDisplayed = true;
+
+ private Object lastSelectedBaseDN = null;
+ private boolean ignoreBaseDNEvents = false;
+
+ /**
+ * LDAP filter message.
+ */
+ protected static final Message LDAP_FILTER =
+ INFO_CTRL_PANEL_LDAP_FILTER.get();
+
+ /**
+ * User filter message.
+ */
+ protected static final Message USER_FILTER =
+ INFO_CTRL_PANEL_USERS_FILTER.get();
+
+ /**
+ * Group filter message.
+ */
+ protected static final Message GROUP_FILTER =
+ INFO_CTRL_PANEL_GROUPS_FILTER.get();
+
+ private final Message OTHER_BASE_DN =
+ INFO_CTRL_PANEL_OTHER_BASE_DN.get();
+
+ private ArrayList<DN> otherBaseDns = new ArrayList<DN>();
+
+ private static final String ALL_BASE_DNS = "All Base DNs";
+
+ private static final int MAX_NUMBER_ENTRIES = 5000;
+
+ private static final int MAX_NUMBER_OTHER_BASE_DNS = 10;
+
+ private final String[] CONTAINER_CLASSES = {
+ "organization",
+ "organizationalUnit"
+ };
+
+ /**
+ * Default constructor.
+ *
+ */
+ public AbstractBrowseEntriesPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresBorder()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean callConfigurationChangedInBackground()
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ if (controller == null)
+ {
+ createBrowserController(info);
+ }
+ super.setInfo(info);
+ treePane.setInfo(info);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public final GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ /**
+ * Since these panel has a special layout, we cannot use the layout of the
+ * GenericDialog and we return ButtonType.NO_BUTTON in the method
+ * getButtonType. We use this method to be able to add some progress
+ * information to the left of the buttons.
+ * @return the button type of the panel.
+ */
+ protected abstract GenericDialog.ButtonType getBrowseButtonType();
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ super.toBeDisplayed(visible);
+ ((GenericDialog)Utilities.getParentDialog(this)).getRootPane().
+ setDefaultButton(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void setEnabledOK(boolean enable)
+ {
+ okButton.setEnabled(enable);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void setEnabledCancel(boolean enable)
+ {
+ cancelButton.setEnabled(enable);
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ *
+ */
+ private void createLayout()
+ {
+ setBackground(ColorAndFontConstants.greyBackground);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 7;
+ addErrorPane(gbc);
+ Message title = INFO_CTRL_PANEL_SERVER_NOT_RUNNING_SUMMARY.get();
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(INFO_CTRL_PANEL_SERVER_NOT_RUNNING_DETAILS.get());
+ mb.append("<br><br>");
+ mb.append(getStartServerHTML());
+ Message details = mb.toMessage();
+ updateErrorPane(errorPane, title, ColorAndFontConstants.errorTitleFont,
+ details,
+ ColorAndFontConstants.defaultFont);
+ errorPane.setVisible(true);
+ errorPane.setFocusable(true);
+
+ gbc.insets = new Insets(10, 10, 0, 10);
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0;
+ gbc.fill = GridBagConstraints.NONE;
+ lBaseDN = Utilities.createPrimaryLabel(INFO_CTRL_PANEL_BASE_DN_LABEL.get());
+ gbc.gridx = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets.right = 0;
+ add(lBaseDN, gbc);
+ gbc.insets.left = 5;
+ baseDNs = Utilities.createComboBox();
+
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ model.addElement("dc=dn to be displayed");
+ baseDNs.setModel(model);
+ baseDNs.setRenderer(new CustomComboBoxCellRenderer(baseDNs));
+ baseDNs.addItemListener(new ItemListener()
+ {
+ public void itemStateChanged(ItemEvent ev)
+ {
+ if (ignoreBaseDNEvents || (ev.getStateChange() != ItemEvent.SELECTED))
+ {
+ return;
+ }
+ Object o = baseDNs.getSelectedItem();
+ if (isCategory(o))
+ {
+ if (lastSelectedBaseDN == null)
+ {
+ // Look for the first element that is not a category
+ for (int i=0; i<baseDNs.getModel().getSize(); i++)
+ {
+ Object item = baseDNs.getModel().getElementAt(i);
+ if (item instanceof CategorizedComboBoxElement)
+ {
+ if (!isCategory(item))
+ {
+ lastSelectedBaseDN = item;
+ break;
+ }
+ }
+ }
+ if (lastSelectedBaseDN != null)
+ {
+ baseDNs.setSelectedItem(lastSelectedBaseDN);
+ }
+ }
+ else
+ {
+ ignoreBaseDNEvents = true;
+ baseDNs.setSelectedItem(lastSelectedBaseDN);
+ ignoreBaseDNEvents = false;
+ }
+ }
+ else if (COMBO_SEPARATOR.equals(o))
+ {
+ ignoreBaseDNEvents = true;
+ baseDNs.setSelectedItem(lastSelectedBaseDN);
+ ignoreBaseDNEvents = false;
+ }
+ else if (!OTHER_BASE_DN.equals(o))
+ {
+ lastSelectedBaseDN = o;
+ if (lastSelectedBaseDN != null)
+ {
+ applyButtonClicked();
+ }
+ }
+ else
+ {
+ if (otherBaseDNDlg == null)
+ {
+ otherBaseDNPanel = new BaseDNPanel();
+ otherBaseDNDlg = new GenericDialog(
+ Utilities.getFrame(AbstractBrowseEntriesPanel.this),
+ otherBaseDNPanel);
+ otherBaseDNDlg.setModal(true);
+ Utilities.centerGoldenMean(otherBaseDNDlg,
+ Utilities.getParentDialog(AbstractBrowseEntriesPanel.this));
+ }
+ otherBaseDNDlg.setVisible(true);
+ String newBaseDn = otherBaseDNPanel.getBaseDn();
+ DefaultComboBoxModel model = (DefaultComboBoxModel)baseDNs.getModel();
+ if (newBaseDn != null)
+ {
+ Object newElement = null;
+
+ try
+ {
+ DN dn = DN.decode(newBaseDn);
+ newElement = new CategorizedComboBoxElement(
+ Utilities.unescapeUtf8(dn.toString()),
+ CategorizedComboBoxElement.Type.REGULAR);
+ if (!otherBaseDns.contains(dn))
+ {
+ otherBaseDns.add(0, dn);
+
+ if (otherBaseDns.size() > MAX_NUMBER_OTHER_BASE_DNS)
+ {
+ ignoreBaseDNEvents = true;
+ for (int i=otherBaseDns.size() - 1;
+ i >= MAX_NUMBER_OTHER_BASE_DNS; i--)
+ {
+ DN dnToRemove = otherBaseDns.get(i);
+ otherBaseDns.remove(i);
+ Object elementToRemove = new CategorizedComboBoxElement(
+ Utilities.unescapeUtf8(dnToRemove.toString()),
+ CategorizedComboBoxElement.Type.REGULAR);
+ model.removeElement(elementToRemove);
+ }
+ ignoreBaseDNEvents = false;
+ }
+ }
+ if (model.getIndexOf(newElement) == -1)
+ {
+ int index = model.getIndexOf(COMBO_SEPARATOR);
+ model.insertElementAt(newElement, index + 1);
+ if (otherBaseDns.size() == 1)
+ {
+ model.insertElementAt(COMBO_SEPARATOR, index + 2);
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Unexpected error decoding dn "+
+ newBaseDn, t);
+ }
+ if (newElement != null)
+ {
+ model.setSelectedItem(newElement);
+ }
+ }
+ else
+ {
+ if (lastSelectedBaseDN != null)
+ {
+ ignoreBaseDNEvents = true;
+ model.setSelectedItem(lastSelectedBaseDN);
+ ignoreBaseDNEvents = false;
+ }
+ }
+ }
+ }
+ });
+ gbc.gridx ++;
+ add(baseDNs, gbc);
+
+ gbc.gridx ++;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ gbc.insets.left = 10;
+ add(new JSeparator(SwingConstants.VERTICAL), gbc);
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ lFilter = Utilities.createPrimaryLabel(INFO_CTRL_PANEL_FILTER_LABEL.get());
+ gbc.gridx ++;
+ add(lFilter, gbc);
+
+ filterAttribute = Utilities.createComboBox();
+ filterAttribute.setModel(
+ new DefaultComboBoxModel(new Object[]{
+ USER_FILTER,
+ GROUP_FILTER,
+ COMBO_SEPARATOR,
+ "attributetobedisplayed",
+ COMBO_SEPARATOR,
+ LDAP_FILTER}));
+ filterAttribute.setRenderer(new CustomListCellRenderer(filterAttribute));
+ filterAttribute.addItemListener(new IgnoreItemListener(filterAttribute));
+ gbc.gridx ++;
+ gbc.insets.left = 5;
+ add(filterAttribute, gbc);
+
+ filter = new FilterTextField();
+ filter.setToolTipText(
+ INFO_CTRL_PANEL_SUBSTRING_SEARCH_INLINE_HELP.get().toString());
+ filter.addKeyListener(new KeyAdapter()
+ {
+ public void keyReleased(KeyEvent e)
+ {
+ if ((e.getKeyCode() == KeyEvent.VK_ENTER) && applyButton.isEnabled())
+ {
+ filter.displayRefreshIcon(true);
+ applyButtonClicked();
+ }
+ }
+ });
+ filter.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ filter.displayRefreshIcon(true);
+ applyButtonClicked();
+ }
+ });
+
+ gbc.weightx = 1.0;
+ gbc.gridx ++;
+ add(filter, gbc);
+
+ gbc.insets.top = 10;
+ applyButton =
+ Utilities.createButton(INFO_CTRL_PANEL_APPLY_BUTTON_LABEL.get());
+ gbc.insets.right = 10;
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ add(applyButton, gbc);
+ applyButton.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ applyButtonClicked();
+ }
+ });
+ gbc.insets = new Insets(10, 0, 0, 0);
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridwidth = 7;
+ add(createMainPanel(), gbc);
+
+// The button panel
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ gbc.insets = new Insets(0, 0, 0, 0);
+ add(createButtonsPanel(), gbc);
+ }
+
+ /**
+ * Returns the panel that contains the buttons of type OK, CANCEL, etc.
+ * @return the panel that contains the buttons of type OK, CANCEL, etc.
+ */
+ private JPanel createButtonsPanel()
+ {
+ JPanel buttonsPanel = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.gridwidth = 1;
+ gbc.gridy = 0;
+ lLimit = Utilities.createDefaultLabel();
+ Utilities.setWarningLabel(lLimit,
+ INFO_CTRL_PANEL_MAXIMUM_CHILDREN_DISPLAYED.get(MAX_NUMBER_ENTRIES));
+ gbc.weighty = 0.0;
+ gbc.gridy ++;
+ lLimit.setVisible(false);
+ lNumberOfEntries = Utilities.createDefaultLabel();
+ gbc.insets = new Insets(10, 10, 10, 10);
+ buttonsPanel.add(lNumberOfEntries, gbc);
+ buttonsPanel.add(lLimit, gbc);
+ gbc.weightx = 1.0;
+ gbc.gridx ++;
+ buttonsPanel.add(Box.createHorizontalGlue(), gbc);
+ buttonsPanel.setOpaque(true);
+ buttonsPanel.setBackground(ColorAndFontConstants.greyBackground);
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ if (getBrowseButtonType() == GenericDialog.ButtonType.CLOSE)
+ {
+ closeButton =
+ Utilities.createButton(INFO_CTRL_PANEL_CLOSE_BUTTON_LABEL.get());
+ closeButton.setOpaque(false);
+ buttonsPanel.add(closeButton, gbc);
+ closeButton.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ closeClicked();
+ }
+ });
+ }
+ else if (getBrowseButtonType() == GenericDialog.ButtonType.OK)
+ {
+ okButton = Utilities.createButton(INFO_CTRL_PANEL_OK_BUTTON_LABEL.get());
+ okButton.setOpaque(false);
+ buttonsPanel.add(okButton, gbc);
+ okButton.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ okClicked();
+ }
+ });
+ }
+ if (getBrowseButtonType() == GenericDialog.ButtonType.OK_CANCEL)
+ {
+ okButton = Utilities.createButton(INFO_CTRL_PANEL_OK_BUTTON_LABEL.get());
+ okButton.setOpaque(false);
+ gbc.insets.right = 0;
+ buttonsPanel.add(okButton, gbc);
+ okButton.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ okClicked();
+ }
+ });
+ cancelButton =
+ Utilities.createButton(INFO_CTRL_PANEL_CANCEL_BUTTON_LABEL.get());
+ cancelButton.setOpaque(false);
+ gbc.insets.right = 10;
+ gbc.insets.left = 5;
+ gbc.gridx ++;
+ buttonsPanel.add(cancelButton, gbc);
+ cancelButton.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ cancelClicked();
+ }
+ });
+ }
+
+
+ buttonsPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0,
+ ColorAndFontConstants.defaultBorderColor));
+
+ return buttonsPanel;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return baseDNs;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(lBaseDN);
+ setSecondaryValid(lFilter);
+ super.cancelClicked();
+ }
+
+ /**
+ * The method that is called when the user clicks on Apply. Basically it
+ * will update the BrowserController with the new base DN and filter specified
+ * by the user. The method assumes that is being called from the event
+ * thread.
+ *
+ */
+ protected void applyButtonClicked()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ setPrimaryValid(lFilter);
+ String s = getBaseDN();
+ boolean displayAll = false;
+ if (s != null)
+ {
+ displayAll = s.equals(ALL_BASE_DNS);
+ if (!displayAll)
+ {
+ try
+ {
+ DN.decode(s);
+ }
+ catch (Throwable t)
+ {
+ errors.add(INFO_CTRL_PANEL_INVALID_DN_DETAILS.get(s, t.toString()));
+ }
+ }
+ }
+ else
+ {
+ errors.add(INFO_CTRL_PANEL_NO_BASE_DN_SELECTED.get());
+ }
+ String filterValue = getFilter();
+ try
+ {
+ LDAPFilter.decode(filterValue);
+ }
+ catch (LDAPException le)
+ {
+ errors.add(INFO_CTRL_PANEL_INVALID_FILTER_DETAILS.get(
+ le.getMessageObject().toString()));
+ setPrimaryInvalid(lFilter);
+ }
+ if (errors.size() == 0)
+ {
+ lLimit.setVisible(false);
+ lNumberOfEntries.setVisible(true);
+ controller.removeAllUnderRoot();
+ controller.setFilter(filterValue);
+ controller.setAutomaticExpand(!filterValue.equals(
+ BrowserController.ALL_OBJECTS_FILTER));
+ if (controller.getConfigurationConnection() != null)
+ {
+ treePane.getTree().setRootVisible(displayAll);
+ treePane.getTree().setShowsRootHandles(!displayAll);
+ boolean isBaseDN = false;
+ for (BackendDescriptor backend :
+ getInfo().getServerDescriptor().getBackends())
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ String dn = Utilities.unescapeUtf8(baseDN.getDn().toString());
+ if (displayAll)
+ {
+ controller.addSuffix(dn, null);
+ }
+ else if (s.equals(dn))
+ {
+ controller.addSuffix(dn, null);
+ isBaseDN = true;
+ }
+ }
+ }
+ if (!isBaseDN && !displayAll)
+ {
+ BasicNode rootNode =
+ (BasicNode)controller.getTree().getModel().getRoot();
+ if (controller.findChildNode(rootNode, s) == -1)
+ {
+ controller.addNodeUnderRoot(s);
+ }
+ }
+ }
+ else
+ {
+ controller.getTree().setRootVisible(false);
+ controller.removeAllUnderRoot();
+ }
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Returns the LDAP filter built based in the parameters provided by the user.
+ * @return the LDAP filter built based in the parameters provided by the user.
+ */
+ private String getFilter()
+ {
+ String returnValue;
+ String s = filter.getText();
+ if (s.length() == 0)
+ {
+ returnValue = BrowserController.ALL_OBJECTS_FILTER;
+ }
+ else
+ {
+ Object attr = filterAttribute.getSelectedItem();
+ if (LDAP_FILTER.equals(attr))
+ {
+ s = s.trim();
+ if (s.length() == 0)
+ {
+ returnValue = BrowserController.ALL_OBJECTS_FILTER;
+ }
+ else
+ {
+ returnValue = s;
+ }
+ }
+ else if (USER_FILTER.equals(attr))
+ {
+ if (s.equals("*"))
+ {
+ returnValue = "(objectClass=person)";
+ }
+ else
+ {
+ returnValue = "(&(objectClass=person)(|"+
+ "(cn="+s+")(sn="+s+")(uid="+s+")))";
+ }
+ }
+ else if (GROUP_FILTER.equals(attr))
+ {
+ if (s.equals("*"))
+ {
+ returnValue =
+ "(|(objectClass=groupOfUniqueNames)(objectClass=groupOfURLs))";
+ }
+ else
+ {
+ returnValue =
+ "(&(|(objectClass=groupOfUniqueNames)(objectClass=groupOfURLs))"+
+ "(cn="+s+"))";
+ }
+ }
+ else if (attr != null)
+ {
+ try
+ {
+ LDAPFilter ldapFilter =
+ new LDAPFilter(SearchFilter.createFilterFromString(
+ "("+attr+"="+s+")"));
+ returnValue = ldapFilter.toString();
+ }
+ catch (DirectoryException de)
+ {
+ // Try this alternative:
+ AttributeType attrType =
+ getInfo().getServerDescriptor().getSchema().getAttributeType(
+ attr.toString().toLowerCase());
+ LDAPFilter ldapFilter =
+ new LDAPFilter(SearchFilter.createEqualityFilter(
+ attrType, new AttributeValue(attrType, s)));
+ returnValue = ldapFilter.toString();
+ }
+ }
+ else
+ {
+ returnValue = BrowserController.ALL_OBJECTS_FILTER;
+ }
+ }
+ return returnValue;
+ }
+
+ /**
+ * Returns the component that will be displayed between the filtering options
+ * and the buttons panel. This component must contain the tree panel.
+ * @return the component that will be displayed between the filtering options
+ * and the buttons panel.
+ */
+ protected abstract Component createMainPanel();
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ final ServerDescriptor desc = ev.getNewDescriptor();
+
+ updateCombos(desc);
+
+ updateBrowserControllerAndErrorPane(desc);
+ }
+
+ /**
+ * Creates and returns the tree panel.
+ * @return the tree panel.
+ */
+ protected JComponent createTreePane()
+ {
+ treePane = new TreePanel();
+
+ lNoMatchFound = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NO_MATCHES_FOUND_LABEL.get());
+ lNoMatchFound.setVisible(false);
+
+ // Calculate default size
+ JTree tree = treePane.getTree();
+ DefaultMutableTreeNode root = new DefaultMutableTreeNode(
+ "myserver.mydomain.com:389");
+ DefaultTreeModel model = new DefaultTreeModel(root);
+ tree.setModel(model);
+ tree.setShowsRootHandles(false);
+ tree.expandPath(new TreePath(root));
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setBackground(ColorAndFontConstants.background);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 1;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ Utilities.setBorder(treePane, new EmptyBorder(10, 0, 10, 0));
+ p.add(treePane, gbc);
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ Utilities.setBorder(lNoMatchFound, new EmptyBorder(15, 15, 15, 15));
+ p.add(lNoMatchFound, gbc);
+
+ if ((getInfo() != null) && (controller == null))
+ {
+ createBrowserController(getInfo());
+ }
+ numberEntriesUpdater = new NumberOfEntriesUpdater();
+ numberEntriesUpdater.start();
+
+ return p;
+ }
+
+
+ /**
+ * Creates the browser controller object.
+ * @param info the ControlPanelInfo to be used to create the browser
+ * controller.
+ */
+ protected void createBrowserController(ControlPanelInfo info)
+ {
+ controller = new BrowserController(treePane.getTree(),
+ info.getConnectionPool(),
+ info.getIconPool());
+ controller.setContainerClasses(CONTAINER_CLASSES);
+ controller.setShowContainerOnly(false);
+ controller.setMaxChildren(MAX_NUMBER_ENTRIES);
+ controller.addBrowserEventListener(new BrowserEventListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void processBrowserEvent(BrowserEvent ev)
+ {
+ if (ev.getType() == BrowserEvent.Type.SIZE_LIMIT_REACHED)
+ {
+ lLimit.setVisible(true);
+ lNumberOfEntries.setVisible(false);
+ }
+ }
+ });
+ controller.getTreeModel().addTreeModelListener(new TreeModelListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void treeNodesChanged(TreeModelEvent e)
+ {
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void treeNodesInserted(TreeModelEvent e)
+ {
+ checkRootNode();
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void treeNodesRemoved(TreeModelEvent e)
+ {
+ checkRootNode();
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void treeStructureChanged(TreeModelEvent e)
+ {
+ checkRootNode();
+ }
+ });
+ }
+
+ final static String[] systemIndexes = {"aci", "dn2id", "ds-sync-hist",
+ "entryUUID", "id2children", "id2subtree"};
+ private static boolean displayIndex(String name)
+ {
+ boolean displayIndex = true;
+ for (String systemIndex : systemIndexes)
+ {
+ if (systemIndex.equalsIgnoreCase(name))
+ {
+ displayIndex = false;
+ break;
+ }
+ }
+ return displayIndex;
+ }
+
+ /**
+ * Updates the contents of the combo boxes with the provided ServerDescriptor.
+ * @param desc the server descriptor to be used to update the combo boxes.
+ */
+ private void updateCombos(ServerDescriptor desc)
+ {
+ final SortedSet<String> newElements = new TreeSet<String>();
+ for (BackendDescriptor backend : desc.getBackends())
+ {
+ for (IndexDescriptor index : backend.getIndexes())
+ {
+ String indexName = index.getName();
+ if (displayIndex(indexName))
+ {
+ newElements.add(indexName);
+ }
+ }
+ }
+ final DefaultComboBoxModel model =
+ (DefaultComboBoxModel)filterAttribute.getModel();
+ boolean changed = newElements.size() != model.getSize() - 2;
+ if (!changed)
+ {
+ int i = 0;
+ for (String newElement : newElements)
+ {
+ changed = !newElement.equals(model.getElementAt(i));
+ if (changed)
+ {
+ break;
+ }
+ i++;
+ }
+ }
+ if (changed)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ Object selected = filterAttribute.getSelectedItem();
+ model.removeAllElements();
+ model.addElement(USER_FILTER);
+ model.addElement(GROUP_FILTER);
+ model.addElement(COMBO_SEPARATOR);
+ for (String newElement : newElements)
+ {
+ model.addElement(newElement);
+ }
+ // If there are not backends, we get no indexes to set.
+ if (newElements.size() > 0)
+ {
+ model.addElement(COMBO_SEPARATOR);
+ }
+ model.addElement(LDAP_FILTER);
+ if (selected != null)
+ {
+ if (model.getIndexOf(selected) != -1)
+ {
+ model.setSelectedItem(selected);
+ }
+ else
+ {
+ model.setSelectedItem(model.getElementAt(0));
+ }
+ }
+ }
+ });
+ }
+
+ LinkedHashSet<Object> baseDNNewElements = new LinkedHashSet<Object>();
+ SortedSet<String> backendIDs = new TreeSet<String>();
+ HashMap<String, SortedSet<String>> hmBaseDNs =
+ new HashMap<String, SortedSet<String>>();
+
+ boolean allAdded = false;
+ HashMap<String, BaseDNDescriptor> hmBaseDNWithEntries =
+ new HashMap<String, BaseDNDescriptor>();
+
+ BaseDNDescriptor baseDNWithEntries = null;
+ for (BackendDescriptor backend : desc.getBackends())
+ {
+ if (displayBackend(backend))
+ {
+ String backendID = backend.getBackendID();
+ backendIDs.add(backendID);
+ SortedSet<String> baseDNs = new TreeSet<String>();
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ try
+ {
+ baseDNs.add(Utilities.unescapeUtf8(baseDN.getDn().toString()));
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ if (baseDN.getEntries() > 0)
+ {
+ hmBaseDNWithEntries.put(
+ Utilities.unescapeUtf8(baseDN.getDn().toString()), baseDN);
+ }
+ }
+ hmBaseDNs.put(backendID, baseDNs);
+ if (backendID.equalsIgnoreCase("userRoot"))
+ {
+ for (String baseDN : baseDNs)
+ {
+ baseDNWithEntries = hmBaseDNWithEntries.get(baseDN);
+ if (baseDNWithEntries != null)
+ {
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if (!allAdded)
+ {
+ baseDNNewElements.add(new CategorizedComboBoxElement(ALL_BASE_DNS,
+ CategorizedComboBoxElement.Type.REGULAR));
+ allAdded = true;
+ }
+ for (String backendID : backendIDs)
+ {
+ baseDNNewElements.add(new CategorizedComboBoxElement(backendID,
+ CategorizedComboBoxElement.Type.CATEGORY));
+ SortedSet<String> baseDNs = hmBaseDNs.get(backendID);
+ for (String baseDN : baseDNs)
+ {
+ baseDNNewElements.add(new CategorizedComboBoxElement(baseDN,
+ CategorizedComboBoxElement.Type.REGULAR));
+ if (baseDNWithEntries == null)
+ {
+ baseDNWithEntries = hmBaseDNWithEntries.get(baseDN);
+ }
+ }
+ }
+ for (DN dn : otherBaseDns)
+ {
+ if (allAdded)
+ {
+ baseDNNewElements.add(COMBO_SEPARATOR);
+ }
+ baseDNNewElements.add(new CategorizedComboBoxElement(
+ Utilities.unescapeUtf8(dn.toString()),
+ CategorizedComboBoxElement.Type.REGULAR));
+ }
+ if (allAdded)
+ {
+ baseDNNewElements.add(COMBO_SEPARATOR);
+ baseDNNewElements.add(OTHER_BASE_DN);
+ }
+ if (firstTimeDisplayed && (baseDNWithEntries != null))
+ {
+ ignoreBaseDNEvents = true;
+ }
+ updateComboBoxModel(baseDNNewElements,
+ (DefaultComboBoxModel)baseDNs.getModel());
+ // Select the element in the combo box.
+ if (firstTimeDisplayed && (baseDNWithEntries != null))
+ {
+ final Object toSelect = new CategorizedComboBoxElement(
+ Utilities.unescapeUtf8(baseDNWithEntries.getDn().toString()),
+ CategorizedComboBoxElement.Type.REGULAR);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ // After this updateBrowseController is called.
+ ignoreBaseDNEvents = true;
+ baseDNs.setSelectedItem(toSelect);
+ ignoreBaseDNEvents = false;
+ }
+ });
+ }
+ if (getInfo().getServerDescriptor().isAuthenticated())
+ {
+ firstTimeDisplayed = false;
+ }
+ }
+
+ /**
+ * Updates the contents of the error pane and the browser controller with the
+ * provided ServerDescriptor. It checks that the server is running and that
+ * we are authenticated, that the connection to the server has not changed,
+ * etc.
+ * @param desc the server descriptor to be used to update the error pane and
+ * browser controller.
+ */
+ private void updateBrowserControllerAndErrorPane(ServerDescriptor desc)
+ {
+ boolean displayNodes = false;
+ boolean displayErrorPane = false;
+ Message errorTitle = Message.EMPTY;
+ Message errorDetails = Message.EMPTY;
+ ServerDescriptor.ServerStatus status = desc.getStatus();
+ if (status == ServerDescriptor.ServerStatus.STARTED)
+ {
+ if (!desc.isAuthenticated())
+ {
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_TO_BROWSE_SUMMARY.get());
+ mb.append("<br><br>"+getAuthenticateHTML());
+ errorDetails = mb.toMessage();
+ errorTitle = INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_SUMMARY.get();
+
+ displayErrorPane = true;
+ }
+ else
+ {
+ try
+ {
+ InitialLdapContext ctx = getInfo().getDirContext();
+ InitialLdapContext ctx1 = controller.getConfigurationConnection();
+ boolean setConnection = ctx != ctx1;
+ if (setConnection)
+ {
+ if (getInfo().getUserDataDirContext() == null)
+ {
+ InitialLdapContext ctxUserData =
+ Utilities.getUserDataDirContext(getInfo(),
+ ConnectionUtils.getBindDN(ctx),
+ ConnectionUtils.getBindPassword(ctx));
+ getInfo().setUserDataDirContext(ctxUserData);
+ }
+ final NamingException[] fNe = {null};
+ Runnable runnable = new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ try
+ {
+ controller.setConnections(getInfo().getDirContext(),
+ getInfo().getUserDataDirContext());
+ applyButtonClicked();
+ }
+ catch (NamingException ne)
+ {
+ fNe[0] = ne;
+ }
+ }
+ };
+ if (!SwingUtilities.isEventDispatchThread())
+ {
+ try
+ {
+ SwingUtilities.invokeAndWait(runnable);
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ else
+ {
+ runnable.run();
+ }
+
+ if (fNe[0] != null)
+ {
+ throw fNe[0];
+ }
+ }
+ displayNodes = true;
+ }
+ catch (NamingException ne)
+ {
+ errorTitle = INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_DETAILS.get();
+ errorDetails = INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_SUMMARY.get(
+ ne.toString());
+ displayErrorPane = true;
+ }
+ catch (ConfigReadException cre)
+ {
+ errorTitle = INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_DETAILS.get();
+ errorDetails = INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_SUMMARY.get(
+ cre.getMessageObject().toString());
+ displayErrorPane = true;
+ }
+ }
+ }
+ else
+ {
+ errorTitle = INFO_CTRL_PANEL_SERVER_NOT_RUNNING_SUMMARY.get();
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(
+ INFO_CTRL_PANEL_AUTHENTICATION_SERVER_MUST_RUN_TO_BROWSE_SUMMARY.get());
+ mb.append("<br><br>");
+ mb.append(getStartServerHTML());
+ errorDetails = mb.toMessage();
+ displayErrorPane = true;
+ }
+
+ final boolean fDisplayNodes = displayNodes;
+ final boolean fDisplayErrorPane = displayErrorPane;
+ final Message fErrorTitle = errorTitle;
+ final Message fErrorDetails = errorDetails;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ applyButton.setEnabled(!fDisplayErrorPane);
+ errorPane.setVisible(fDisplayErrorPane);
+ if (fDisplayErrorPane)
+ {
+ updateErrorPane(errorPane, fErrorTitle,
+ ColorAndFontConstants.errorTitleFont, fErrorDetails,
+ ColorAndFontConstants.defaultFont);
+ }
+ else if (fDisplayNodes)
+ {
+ // Update the browser controller with the potential new suffixes.
+ String s = getBaseDN();
+ DN theDN = null;
+ boolean displayAll = false;
+ if (s != null)
+ {
+ displayAll = s.equals(ALL_BASE_DNS);
+ if (!displayAll)
+ {
+ try
+ {
+ theDN = DN.decode(s);
+ }
+ catch (Throwable t)
+ {
+ s = null;
+ }
+ }
+ }
+ treePane.getTree().setRootVisible(displayAll);
+ treePane.getTree().setShowsRootHandles(!displayAll);
+ if (s != null)
+ {
+ boolean isBaseDN = false;
+ for (BackendDescriptor backend :
+ getInfo().getServerDescriptor().getBackends())
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ String dn = Utilities.unescapeUtf8(baseDN.getDn().toString());
+ if ((theDN != null) && baseDN.getDn().equals(theDN))
+ {
+ isBaseDN = true;
+ }
+ if (baseDN.getEntries() > 0)
+ {
+ if (!controller.hasSuffix(dn))
+ {
+ if (displayAll)
+ {
+ controller.addSuffix(dn, null);
+ }
+ else if (s.equals(dn))
+ {
+ controller.addSuffix(dn, null);
+ }
+ }
+ }
+ }
+ if (!isBaseDN && !displayAll)
+ {
+ BasicNode rootNode =
+ (BasicNode)controller.getTree().getModel().getRoot();
+ if (controller.findChildNode(rootNode, s) == -1)
+ {
+ controller.addNodeUnderRoot(s);
+ }
+ }
+ }
+ }
+ }
+
+
+ if (!fDisplayNodes)
+ {
+ controller.removeAllUnderRoot();
+ treePane.getTree().setRootVisible(false);
+ }
+ }
+ });
+ }
+
+ /**
+ * Returns the base DN specified by the user.
+ * @return the base DN specified by the user.
+ */
+ private String getBaseDN()
+ {
+ String dn;
+ Object o = baseDNs.getSelectedItem();
+ if (o instanceof String)
+ {
+ dn = (String)o;
+ }
+ else if (o instanceof CategorizedComboBoxElement)
+ {
+ dn = ((CategorizedComboBoxElement)o).getValue().toString();
+ }
+ else
+ {
+ dn = null;
+ }
+ if (dn != null)
+ {
+ if (dn.trim().length() == 0)
+ {
+ dn = ALL_BASE_DNS;
+ }
+ else if (OTHER_BASE_DN.equals(dn))
+ {
+ dn = null;
+ }
+ }
+ else
+ {
+ dn = null;
+ }
+ return dn;
+ }
+
+ /**
+ * This class is used simply to avoid an inset on the left for the
+ * 'All Base DNs' item.
+ * Since this item is a CategorizedComboBoxElement of type
+ * CategorizedComboBoxElement.Type.REGULAR, it has by default an inset on
+ * the left. The class simply handles this particular case to not to have
+ * that inset for the 'All Base DNs' item.
+ */
+ class CustomComboBoxCellRenderer extends CustomListCellRenderer
+ {
+ /**
+ * The constructor.
+ * @param combo the combo box to be rendered.
+ */
+ CustomComboBoxCellRenderer(JComboBox combo)
+ {
+ super(combo);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus)
+ {
+ Component comp = super.getListCellRendererComponent(list, value, index,
+ isSelected, cellHasFocus);
+ if (value instanceof CategorizedComboBoxElement)
+ {
+ CategorizedComboBoxElement element = (CategorizedComboBoxElement)value;
+ String name = getStringValue(element);
+ if (ALL_BASE_DNS.equals(name))
+ {
+ ((JLabel)comp).setText(ALL_BASE_DNS);
+ }
+ }
+ comp.setFont(defaultFont);
+ return comp;
+ }
+ }
+
+ /**
+ * Checks that the root node has some children. It it has no children the
+ * message 'No Match Found' is displayed instead of the tree panel.
+ *
+ */
+ private void checkRootNode()
+ {
+ DefaultMutableTreeNode root =
+ (DefaultMutableTreeNode)controller.getTreeModel().getRoot();
+ boolean visible = root.getChildCount() > 0;
+ if (visible != treePane.isVisible())
+ {
+ treePane.setVisible(visible);
+ lNoMatchFound.setVisible(!visible);
+ lNumberOfEntries.setVisible(visible);
+ }
+ numberEntriesUpdater.recalculate();
+ }
+
+ /**
+ * This is a class that simply checks the number of entries that the browser
+ * contains and updates a counter with the new number of entries.
+ * It is basically a thread that sleeps and checks whether some
+ * calculation must be made: when we know that something is updated in the
+ * browser the method recalculate() is called. We could use a more
+ * sofisticated code (like use a wait() call that would get notified when
+ * recalculate() is called) but this is not required and it might have an
+ * impact on the reactivity of the UI if recalculate gets called too often.
+ * We can afford to wait 400 miliseconds before updating the number of
+ * entries and with this approach there is hardly no impact on the reactivity
+ * of the UI.
+ *
+ */
+ protected class NumberOfEntriesUpdater extends Thread implements Runnable
+ {
+ private boolean recalculate;
+
+ /**
+ * Constructor.
+ *
+ */
+ public NumberOfEntriesUpdater()
+ {
+ }
+
+ /**
+ * Notifies that the number of entries in the browser has changed.
+ *
+ */
+ public void recalculate()
+ {
+ recalculate = true;
+ }
+
+ /**
+ * Executes the updater.
+ */
+ public void run()
+ {
+ while (true)
+ {
+ try
+ {
+ Thread.sleep(400);
+ }
+ catch (Throwable t)
+ {
+ }
+ if (recalculate)
+ {
+ recalculate = false;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ int nEntries = 0;
+ // This recursive algorithm is fast enough to use it on the
+ // event thread. Running it here we avoid issues with concurrent
+ // access to the node children
+ if (controller.getTree().isRootVisible())
+ {
+ nEntries ++;
+ }
+ DefaultMutableTreeNode root =
+ (DefaultMutableTreeNode)controller.getTreeModel().getRoot();
+
+ nEntries += getChildren(root);
+ lNumberOfEntries.setText("Number of entries: "+nEntries);
+ }
+ });
+ }
+ if (controller != null)
+ {
+ final boolean mustDisplayRefreshIcon = controller.getQueueSize() > 0;
+ if (mustDisplayRefreshIcon != filter.isRefreshIconDisplayed())
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ filter.displayRefreshIcon(mustDisplayRefreshIcon);
+ }
+ });
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns the number of children for a given node.
+ * @param node the node.
+ * @return the number of children for the node.
+ */
+ private int getChildren(DefaultMutableTreeNode node)
+ {
+ int nEntries = 0;
+
+ if (!node.isLeaf())
+ {
+ Enumeration en = node.children();
+ while (en.hasMoreElements())
+ {
+ nEntries ++;
+ nEntries += getChildren((DefaultMutableTreeNode)en.nextElement());
+ }
+ }
+ return nEntries;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java
new file mode 100644
index 0000000..2d884a1
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java
@@ -0,0 +1,412 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Container;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.opends.guitools.controlpanel.ui.components.TitlePanel;
+import org.opends.guitools.controlpanel.ui.renderer.CustomListCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn;
+import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
+import org.opends.server.types.AttributeType;
+
+/**
+ * Abstract class used to refactor some code between the classes that are used
+ * to edit/create an index.
+ *
+ */
+public abstract class AbstractIndexPanel extends StatusGenericPanel
+{
+ /**
+ * Title panel.
+ */
+ protected TitlePanel titlePanel = new TitlePanel(Message.EMPTY,
+ Message.EMPTY);
+ /**
+ * Attributes combo box.
+ */
+ protected JComboBox attributes = Utilities.createComboBox();
+ /**
+ * Name of the index label.
+ */
+ protected JLabel name = Utilities.createDefaultLabel();
+ /**
+ * Label for attribute.
+ */
+ protected JLabel lAttribute =
+ Utilities.createPrimaryLabel(INFO_CTRL_PANEL_ATTRIBUTE_LABEL.get());
+ /**
+ * Label for entry limit.
+ */
+ protected JLabel lEntryLimit =
+ Utilities.createPrimaryLabel(INFO_CTRL_PANEL_ENTRY_LIMIT_LABEL.get());
+ /**
+ * Entry limit text field.
+ */
+ protected JTextField entryLimit = Utilities.createShortTextField();
+ /**
+ * Label for type.
+ */
+ protected JLabel lType =
+ Utilities.createPrimaryLabel(INFO_CTRL_PANEL_INDEX_TYPE_LABEL.get());
+ /**
+ * Approximate index type check box.
+ */
+ protected JCheckBox approximate =
+ Utilities.createCheckBox(INFO_CTRL_PANEL_APPROXIMATE_LABEL.get());
+ /**
+ * Equality index type check box.
+ */
+ protected JCheckBox equality =
+ Utilities.createCheckBox(INFO_CTRL_PANEL_EQUALITY_LABEL.get());
+ /**
+ * Ordering index type check box.
+ */
+ protected JCheckBox ordering =
+ Utilities.createCheckBox(INFO_CTRL_PANEL_ORDERING_LABEL.get());
+ /**
+ * Presence index type check box.
+ */
+ protected JCheckBox presence =
+ Utilities.createCheckBox(INFO_CTRL_PANEL_PRESENCE_LABEL.get());
+ /**
+ * Substring index type check box.
+ */
+ protected JCheckBox substring =
+ Utilities.createCheckBox(INFO_CTRL_PANEL_SUBSTRING_LABEL.get());
+ /**
+ * Delete index button.
+ */
+ protected JButton deleteIndex =
+ Utilities.createButton(INFO_CTRL_PANEL_DELETE_INDEX_LABEL.get());
+ /**
+ * Save changes button.
+ */
+ protected JButton saveChanges =
+ Utilities.createButton(INFO_CTRL_PANEL_SAVE_CHANGES_LABEL.get());
+ /**
+ * Label containing some warning information (such as the fact that the index
+ * cannot be edited).
+ */
+ protected JLabel warning = Utilities.createDefaultLabel();
+ /**
+ * Panel containing all the index types.
+ */
+ protected JPanel typesPanel = new JPanel(new GridBagLayout());
+
+ /**
+ * Message to be displayed to indicate that an index is not configurable.
+ */
+ protected Message NON_CONFIGURABLE_INDEX =
+ INFO_CTRL_PANEL_NON_CONFIGURABLE_INDEX_LABEL.get();
+
+ /**
+ * Message to be displayed to indicate that an index has been modified.
+ */
+ protected Message INDEX_MODIFIED = INFO_CTRL_PANEL_INDEX_MODIFIED_LABEL.get();
+
+ /**
+ * Array of checkboxes.
+ */
+ protected JCheckBox[] types = {approximate, equality, ordering, presence,
+ substring};
+
+ /**
+ * Array of index types that matches the array of checkboxes (types).
+ */
+ protected IndexType[] configTypes = {IndexType.APPROXIMATE,
+ IndexType.EQUALITY, IndexType.ORDERING, IndexType.PRESENCE,
+ IndexType.SUBSTRING
+ };
+
+ /**
+ * Custom attributes message.
+ */
+ protected Message CUSTOM_ATTRIBUTES =
+ INFO_CTRL_PANEL_CUSTOM_ATTRIBUTES_LABEL.get();
+ /**
+ * Standard attributes message.
+ */
+ protected Message STANDARD_ATTRIBUTES =
+ INFO_CTRL_PANEL_STANDARD_ATTRIBUTES_LABEL.get();
+
+ /**
+ * Minimum value for entry limit.
+ */
+ protected final int MIN_ENTRY_LIMIT =
+ LocalDBIndexCfgDefn.getInstance().getIndexEntryLimitPropertyDefinition().
+ getLowerLimit();
+ /**
+ * Maximum value for entry limit.
+ */
+ protected final int MAX_ENTRY_LIMIT =
+ LocalDBIndexCfgDefn.getInstance().getIndexEntryLimitPropertyDefinition().
+ getUpperLimit();
+
+ /**
+ * Default value for entry limit.
+ */
+ protected final int DEFAULT_ENTRY_LIMIT = 4000;
+
+ /**
+ * Repopulates the contents of the panel with the provided attribute type. It
+ * will check the checkboxes for which the attribute has a matching rule.
+ * @param attr the attribute.
+ */
+ protected void repopulateTypesPanel(AttributeType attr)
+ {
+ typesPanel.removeAll();
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridy = 0;
+ gbc.gridx = 0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ if (attr != null)
+ {
+ if (attr.getApproximateMatchingRule() != null)
+ {
+ typesPanel.add(approximate, gbc);
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ }
+ if (attr.getEqualityMatchingRule() != null)
+ {
+ typesPanel.add(equality, gbc);
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ }
+ if (attr.getOrderingMatchingRule() != null)
+ {
+ typesPanel.add(ordering, gbc);
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ }
+ typesPanel.add(presence, gbc);
+ gbc.gridx = 1;
+ gbc.weightx = 1.0;
+ typesPanel.add(Box.createHorizontalGlue(), gbc);
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.top = 10;
+ if (attr.getSubstringMatchingRule() != null)
+ {
+ typesPanel.add(substring, gbc);
+ gbc.insets.top = 10;
+ }
+ }
+ typesPanel.validate();
+ }
+
+ /**
+ * Creates the basic layout of the panel.
+ * @param c the container of the layout.
+ * @param gbc the grid bag constraints to be used.
+ * @param nameReadOnly whether the panel is read-only or not.
+ */
+ protected void createBasicLayout(Container c, GridBagConstraints gbc,
+ boolean nameReadOnly)
+ {
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 3;
+ addErrorPane(c, gbc);
+
+ if (nameReadOnly)
+ {
+ gbc.gridy ++;
+ titlePanel.setTitle(INFO_CTRL_PANEL_INDEX_DETAILS_LABEL.get());
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.top = 10;
+ gbc.weightx = 1.0;
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ c.add(p, gbc);
+ GridBagConstraints gbc2 = new GridBagConstraints();
+ gbc2.weightx = 0.0;
+ gbc2.gridwidth = GridBagConstraints.RELATIVE;
+ p.add(titlePanel, gbc2);
+ gbc2.gridwidth = GridBagConstraints.REMAINDER;
+ gbc2.fill = GridBagConstraints.HORIZONTAL;
+ gbc2.weightx = 1.0;
+ p.add(Box.createHorizontalGlue(), gbc2);
+ }
+
+ gbc.gridwidth = 1;
+ gbc.gridy ++;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ gbc.weightx = 0.0;
+ c.add(lAttribute, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ if (!nameReadOnly)
+ {
+ attributes.addItemListener(new IgnoreItemListener(attributes));
+ attributes.setRenderer(new CustomListCellRenderer(attributes));
+ c.add(attributes, gbc);
+ }
+ else
+ {
+ c.add(name, gbc);
+ }
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ c.add(lEntryLimit, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ c.add(p, gbc);
+ GridBagConstraints gbc2 = new GridBagConstraints();
+ gbc2.weightx = 0.0;
+ gbc2.gridwidth = GridBagConstraints.RELATIVE;
+ p.add(entryLimit, gbc2);
+ gbc2.gridwidth = GridBagConstraints.REMAINDER;
+ gbc2.fill = GridBagConstraints.HORIZONTAL;
+ gbc2.weightx = 1.0;
+ p.add(Box.createHorizontalGlue(), gbc2);
+
+
+ gbc.gridx = 0;
+ gbc.insets.left = 0;
+ gbc.gridy ++;
+ gbc.weightx = 0.0;
+ gbc.weightx = 0.0;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ c.add(lType, gbc);
+
+ gbc.gridx = 1;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ JCheckBox[] types = {approximate, equality, ordering, presence, substring};
+ typesPanel.setOpaque(false);
+ c.add(typesPanel, gbc);
+ gbc.gridy ++;
+ gbc2 = new GridBagConstraints();
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ for (int i=0; i<types.length; i++)
+ {
+ types[i].setOpaque(false);
+ typesPanel.add(types[i], gbc2);
+ gbc2.anchor = GridBagConstraints.WEST;
+ gbc2.insets.top = 10;
+ }
+
+ gbc.weighty = 1.0;
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ c.add(Box.createVerticalGlue(), gbc);
+ }
+
+ /**
+ * Returns a sorted set of index types (that matches what the user selected
+ * on the check boxes).
+ * @return a sorted set of indexes (that matches what the user selected
+ * on the check boxes).
+ */
+ protected SortedSet<IndexType> getTypes()
+ {
+ SortedSet<IndexType> indexTypes = new TreeSet<IndexType>();
+ for (int i=0; i<types.length; i++)
+ {
+ if (types[i].isSelected())
+ {
+ indexTypes.add(configTypes[i]);
+ }
+ }
+ return indexTypes;
+ }
+
+ /**
+ * Returns a list of error message with the problems encountered in the data
+ * provided by the user.
+ * @return a list of error message with the problems encountered in the data
+ * provided by the user.
+ */
+ protected List<Message> getErrors()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ setPrimaryValid(lEntryLimit);
+ setPrimaryValid(lType);
+
+ String newEntryLimit = entryLimit.getText().trim();
+
+ try
+ {
+ int n = Integer.parseInt(newEntryLimit);
+ if ((n < MIN_ENTRY_LIMIT) ||
+ (n > MAX_ENTRY_LIMIT))
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_ENTRY_LIMIT_LABEL.get(
+ MIN_ENTRY_LIMIT, MAX_ENTRY_LIMIT));
+ setPrimaryInvalid(lEntryLimit);
+ }
+ }
+ catch (Throwable t)
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_ENTRY_LIMIT_LABEL.get(
+ MIN_ENTRY_LIMIT, MAX_ENTRY_LIMIT));
+ setPrimaryInvalid(lEntryLimit);
+ }
+
+ if (getTypes().isEmpty())
+ {
+ errors.add(ERR_CTRL_PANEL_NO_INDEX_TYPE_SELECTED.get());
+ setPrimaryInvalid(lType);
+ }
+
+ return errors;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
new file mode 100644
index 0000000..f808685
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
@@ -0,0 +1,284 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.NewEntryTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.util.LDIFException;
+import org.opends.server.util.LDIFReader;
+
+/**
+ * Abstract class used to refactor some code among the different panels that are
+ * used to create a new entry.
+ *
+ */
+public abstract class AbstractNewEntryPanel extends StatusGenericPanel
+{
+ /**
+ * The parent node that was selected when the user clicked on the new entry
+ * action.
+ */
+ protected BasicNode parentNode;
+
+ /**
+ * The browser controller.
+ */
+ protected BrowserController controller;
+
+ /**
+ * Sets the parent and the browser controller for this panel.
+ * @param parentNode the selected parent node (or <CODE>null</CODE> if no
+ * parent node was selected).
+ * @param controller the browser controller.
+ */
+ public void setParent(BasicNode parentNode, BrowserController controller)
+ {
+ this.parentNode = parentNode;
+ this.controller = controller;
+ }
+
+ /**
+ * Returns the title for the progress dialog.
+ * @return the title for the progress dialog.
+ */
+ protected abstract Message getProgressDialogTitle();
+ /**
+ * Returns the LDIF representation of the new entry.
+ * @return the LDIF representation of the new entry.
+ */
+ protected abstract String getLDIF();
+
+ /**
+ * Updates the list of errors by checking the syntax of the entry.
+ * @param errors the list of errors that must be updated.
+ */
+ protected abstract void checkSyntax(ArrayList<Message> errors);
+
+ /**
+ * Returns <CODE>true</CODE> if the syntax of the entry must be checked in
+ * the background and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the syntax of the entry must be checked in
+ * the background and <CODE>false</CODE> otherwise.
+ */
+ protected boolean checkSyntaxBackground()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ final ArrayList<Message> errors = new ArrayList<Message>();
+
+ if (checkSyntaxBackground())
+ {
+ BackgroundTask<Void> worker = new BackgroundTask<Void>()
+ {
+ public Void processBackgroundTask()
+ {
+ try
+ {
+ Thread.sleep(2000);
+ }
+ catch (Throwable t)
+ {
+ }
+ checkSyntax(errors);
+ return null;
+ }
+ public void backgroundTaskCompleted(Void returnValue, Throwable t)
+ {
+ if (t != null)
+ {
+ errors.add(ERR_CTRL_PANEL_UNEXPECTED_DETAILS.get(t.toString()));
+ }
+ displayMainPanel();
+ setEnabledCancel(true);
+ setEnabledOK(true);
+ handleErrorsAndLaunchTask(errors);
+ }
+ };
+ displayMessage(INFO_CTRL_PANEL_CHECKING_SUMMARY.get());
+ setEnabledCancel(false);
+ setEnabledOK(false);
+ worker.startBackgroundTask();
+ }
+ else
+ {
+ checkSyntax(errors);
+ handleErrorsAndLaunchTask(errors);
+ }
+ }
+
+ /**
+ * Checks that there are not errors in the list and launches a new entry
+ * task.
+ * @param errors the list of errors.
+ */
+ private void handleErrorsAndLaunchTask(ArrayList<Message> errors)
+ {
+ Entry entry = null;
+ if (errors.size() == 0)
+ {
+ try
+ {
+ entry = getEntry();
+ }
+ catch (Throwable t)
+ {
+ // Unexpected error: getEntry() should work after calling checkSyntax
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ String dn = entry.getDN().toString();
+ // Checking for the existence of an entry is fast enough so we can do
+ // it on the event thread.
+ if (entryExists(dn))
+ {
+ errors.add(ERR_CTRL_PANEL_ENTRY_ALREADY_EXISTS.get(dn));
+ }
+ }
+ if (errors.size() == 0)
+ {
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this), getProgressDialogTitle(), getInfo());
+ try
+ {
+ NewEntryTask newTask =
+ new NewEntryTask(getInfo(), dlg, entry, getLDIF(),
+ parentNode, controller);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.size() == 0)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_CREATING_NEW_ENTRY_SUMMARY.get(),
+ INFO_CTRL_PANEL_CREATING_NEW_ENTRY_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_CREATING_NEW_ENTRY_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_CREATING_NEW_ENTRY_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_CREATING_NEW_ENTRY_ERROR_DETAILS.get(),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ catch (Throwable t)
+ {
+ // Unexpected error: getEntry() should work after calling checkSyntax
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ updateErrorPaneIfServerRunningAndAuthRequired(ev.getNewDescriptor(),
+ INFO_CTRL_PANEL_NEW_ENTRY_REQUIRES_SERVER_RUNNING.get(),
+ INFO_CTRL_PANEL_NEW_ENTRY_REQUIRES_AUTHENTICATION.get());
+ }
+
+ /**
+ * Returns the entry object representing what the user provided as data.
+ * @return the entry object representing what the user provided as data.
+ * @throws LDIFException if there is an error with the LDIF syntax.
+ * @throws IOException if there is an error creating the internal stream.
+ */
+ protected Entry getEntry() throws LDIFException, IOException
+ {
+ Entry entry;
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ String ldif = getLDIF();
+
+ if (ldif.trim().length() == 0)
+ {
+ throw new LDIFException(ERR_LDIF_REPRESENTATION_REQUIRED.get());
+ }
+
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ entry = reader.readEntry(checkSchema());
+ if (entry == null)
+ {
+ throw new LDIFException(ERR_LDIF_REPRESENTATION_REQUIRED.get());
+ }
+ else
+ {
+ if (entry.getObjectClasses().size() == 0)
+ {
+ throw new LDIFException(ERR_OBJECTCLASS_FOR_ENTRY_REQUIRED.get());
+ }
+ }
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ return entry;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the schema must be checked and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the schema must be checked and
+ * <CODE>false</CODE> otherwise.
+ */
+ protected boolean checkSchema()
+ {
+ return getInfo().getServerDescriptor().isSchemaEnabled();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
new file mode 100644
index 0000000..322f6bc
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
@@ -0,0 +1,1297 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.TreeSet;
+
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+import javax.swing.ListModel;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.CategorizedComboBoxElement;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.components.TitlePanel;
+import org.opends.guitools.controlpanel.ui.renderer.CustomListCellRenderer;
+import org.opends.guitools.controlpanel.ui.renderer.IndexComboBoxCellRenderer;
+import org.opends.guitools.controlpanel.ui.renderer.VLVSortOrderRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.admin.DefinedDefaultBehaviorProvider;
+import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn;
+import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
+import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn.Scope;
+import org.opends.server.protocols.ldap.LDAPFilter;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.DN;
+import org.opends.server.types.FilterType;
+import org.opends.server.types.LDAPException;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.RawFilter;
+import org.opends.server.types.Schema;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * Abstract class used to refactor some code between the classes that are used
+ * to edit/create a VLV index.
+ *
+ */
+public abstract class AbstractVLVIndexPanel extends StatusGenericPanel
+{
+ /**
+ * Title panel.
+ */
+ protected TitlePanel titlePanel = new TitlePanel(Message.EMPTY,
+ Message.EMPTY);
+ /**
+ * Name label.
+ */
+ protected JLabel lName = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_VLV_INDEX_NAME_LABEL.get());
+ /**
+ * Base DN label.
+ */
+ protected JLabel lBaseDN = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_VLV_INDEX_BASE_DN_LABEL.get());
+ /**
+ * Search scope label.
+ */
+ protected JLabel lSearchScope = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_VLV_INDEX_SEARCH_SCOPE_LABEL.get());
+ /**
+ * Search filter label.
+ */
+ protected JLabel lFilter = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_VLV_INDEX_FILTER_LABEL.get());
+ /**
+ * Sort order label.
+ */
+ protected JLabel lSortOrder = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_VLV_INDEX_SORT_ORDER_LABEL.get());
+ /**
+ * Backends label.
+ */
+ protected JLabel lBackend = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_BACKEND_LABEL.get());
+ /**
+ * Max block size label.
+ */
+ protected JLabel lMaxBlockSize = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_VLV_INDEX_MAX_BLOCK_SIZE_LABEL.get());
+
+ /**
+ * Name text field.
+ */
+ protected JTextField name = Utilities.createMediumTextField();
+ /**
+ * Read-only name label.
+ */
+ protected JLabel readOnlyName = Utilities.createDefaultLabel();
+ /**
+ * Read-only backend name label.
+ */
+ protected JLabel backendName = Utilities.createDefaultLabel();
+ /**
+ * Base DNs combo box.
+ */
+ protected JComboBox baseDNs = Utilities.createComboBox();
+ /**
+ * Subtree text field.
+ */
+ protected JTextField baseDN = Utilities.createLongTextField();
+ /**
+ * Base Object scope radio button.
+ */
+ protected JRadioButton baseObject = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_VLV_INDEX_BASE_OBJECT_LABEL.get());
+ /**
+ * Single Level scope radio button.
+ */
+ protected JRadioButton singleLevel = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_VLV_INDEX_SINGLE_LEVEL_LABEL.get());
+ /**
+ * Subordinate subtree scope radio button.
+ */
+ protected JRadioButton subordinateSubtree = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_VLV_INDEX_SUBORDINATE_SUBTREE_LABEL.get());
+ /**
+ * Whole subtree scope radio button.
+ */
+ protected JRadioButton wholeSubtree = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_VLV_INDEX_WHOLE_SUBTREE_LABEL.get());
+
+ /**
+ * Filter text field.
+ */
+ protected JTextField filter = Utilities.createLongTextField();
+ /**
+ * Max block size text field.
+ */
+ protected JTextField maxBlockSize = Utilities.createShortTextField();
+ /**
+ * Attributes combo box.
+ */
+ protected JComboBox attributes = Utilities.createComboBox();
+ /**
+ * The list containing the sort order elements.
+ */
+ protected JList sortOrder = new JList();
+ /**
+ * The add button.
+ */
+ protected JButton add = Utilities.createButton(
+ INFO_CTRL_PANEL_VLV_INDEX_ADD_BUTTON_LABEL.get());
+ /**
+ * The move up button.
+ */
+ protected JButton moveUp = Utilities.createButton(
+ INFO_CTRL_PANEL_VLV_INDEX_MOVE_UP_BUTTON_LABEL.get());
+ /**
+ * The move down button.
+ */
+ protected JButton moveDown = Utilities.createButton(
+ INFO_CTRL_PANEL_VLV_INDEX_MOVE_DOWN_BUTTON_LABEL.get());
+ /**
+ * The remove button.
+ */
+ protected JButton remove = Utilities.createButton (
+ INFO_CTRL_PANEL_VLV_INDEX_REMOVE_BUTTON_LABEL.get());
+ /**
+ * Ascending order combo box.
+ */
+ protected JComboBox ascendingOrder = Utilities.createComboBox();
+
+ /**
+ * Combo box containing the sort order.
+ */
+ protected DefaultListModel sortOrderModel;
+
+ /**
+ * The list of labels.
+ */
+ protected JLabel[] labels = {lName, lBaseDN, lSearchScope, lFilter,
+ lSortOrder, lBackend, lMaxBlockSize};
+
+ /**
+ * The relative component that must be used to center the parent dialog of
+ * this panel.
+ */
+ protected Component relativeComponent;
+
+ /**
+ * Other base DN message.
+ */
+ protected final Message OTHER_BASE_DN =
+ INFO_CTRL_PANEL_VLV_OTHER_BASE_DN_LABEL.get();
+ /**
+ * Ascending message.
+ */
+ protected final Message ASCENDING =
+ INFO_CTRL_PANEL_VLV_ASCENDING_LABEL.get();
+ /**
+ * Descending message.
+ */
+ protected final Message DESCENDING =
+ INFO_CTRL_PANEL_VLV_DESCENDING_LABEL.get();
+
+ /**
+ * Custom attributes message.
+ */
+ protected Message CUSTOM_ATTRIBUTES =
+ INFO_CTRL_PANEL_CUSTOM_ATTRIBUTES_LABEL.get();
+
+ /**
+ * Standard attributes message.
+ */
+ protected Message STANDARD_ATTRIBUTES =
+ INFO_CTRL_PANEL_STANDARD_ATTRIBUTES_LABEL.get();
+
+ /**
+ * The list of standard attribute names.
+ */
+ protected TreeSet<String> standardAttrNames = new TreeSet<String>();
+ /**
+ * The list of configuration attribute names.
+ */
+ protected TreeSet<String> configurationAttrNames = new TreeSet<String>();
+ /**
+ * The list of custom attribute names.
+ */
+ protected TreeSet<String> customAttrNames = new TreeSet<String>();
+
+ private int defaultVLVEntryLimitValue;
+ {
+ DefinedDefaultBehaviorProvider<Integer> provider =
+ (DefinedDefaultBehaviorProvider<Integer>)
+ LocalDBVLVIndexCfgDefn.getInstance().getMaxBlockSizePropertyDefinition().
+ getDefaultBehaviorProvider();
+ defaultVLVEntryLimitValue =
+ Integer.parseInt(provider.getDefaultValues().iterator().next());
+ }
+
+ /**
+ * Minimum value for max block size.
+ */
+ protected final int MIN_MAX_BLOCK_SIZE =
+ LocalDBVLVIndexCfgDefn.getInstance().getMaxBlockSizePropertyDefinition().
+ getLowerLimit();
+ /**
+ * Maximum value for max block size.
+ */
+ protected final int MAX_MAX_BLOCK_SIZE = 2147483647;
+ /**
+ * Default value for max block size.
+ */
+ protected final int DEFAULT_MAX_BLOCK_SIZE = defaultVLVEntryLimitValue;
+
+
+ /**
+ * Constructor.
+ * @param backendID the backend ID where the index is defined (or will be
+ * defined).
+ * @param relativeComponent the relative component where the dialog containing
+ * this panel must be centered.
+ */
+ protected AbstractVLVIndexPanel(String backendID, Component relativeComponent)
+ {
+ super();
+ if (backendID != null)
+ {
+ backendName.setText(backendID);
+ }
+ this.relativeComponent = relativeComponent;
+ }
+
+ /**
+ * Returns the LDIF representing the new index.
+ * @param indexName the name of the index.
+ * @return the LDIF representing the new index.
+ */
+ protected String getIndexLDIF(String indexName)
+ {
+ String dn = Utilities.getRDNString("ds-cfg-backend-id",
+ backendName.getText())+",cn=Backends,cn=config";
+ ArrayList<String> lines = new ArrayList<String>();
+ lines.add("dn: "+Utilities.getRDNString("ds-cfg-name", indexName)+
+ ",cn=VLV Index,"+dn);
+ lines.add("objectClass: ds-cfg-local-db-vlv-index");
+ lines.add("objectClass: top");
+ lines.add("ds-cfg-name: "+indexName);
+ lines.add("ds-cfg-filter: "+filter.getText().trim());
+ lines.add("ds-cfg-sort-order: "+getSortOrderStringValue(getSortOrder()));
+ lines.add("ds-cfg-base-dn: "+getBaseDN());
+ lines.add("ds-cfg-scope: "+getScope().toString());
+ lines.add("ds-cfg-max-block-size: "+maxBlockSize.getText().trim());
+ StringBuilder sb = new StringBuilder();
+ for (String line : lines)
+ {
+ sb.append(line+ServerConstants.EOL);
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Returns the scope of the VLV index as it appears on the panel.
+ * @return the scope of the VLV index as it appears on the panel.
+ */
+ protected Scope getScope()
+ {
+ Scope scope;
+ if (baseObject.isSelected())
+ {
+ scope = Scope.BASE_OBJECT;
+ }
+ else if (singleLevel.isSelected())
+ {
+ scope = Scope.SINGLE_LEVEL;
+ }
+ else if (subordinateSubtree.isSelected())
+ {
+ scope = Scope.SUBORDINATE_SUBTREE;
+ }
+ else
+ {
+ scope = Scope.WHOLE_SUBTREE;
+ }
+ return scope;
+ }
+
+ /**
+ * Returns the list of VLV sort order elements as they are displayed in the
+ * panel.
+ * @return the list of VLV sort order elements as they are displayed in the
+ * panel.
+ */
+ protected List<VLVSortOrder> getSortOrder()
+ {
+ ArrayList<VLVSortOrder> sortOrder = new ArrayList<VLVSortOrder>();
+ for (int i=0; i<sortOrderModel.getSize(); i++)
+ {
+ sortOrder.add((VLVSortOrder)sortOrderModel.get(i));
+ }
+ return sortOrder;
+ }
+
+ /**
+ * Returns the string representation for the provided list of VLV sort order.
+ * @param sortOrder the list of VLV sort order elements.
+ * @return the string representation for the provided list of VLV sort order.
+ */
+ protected String getSortOrderStringValue(List<VLVSortOrder> sortOrder)
+ {
+ StringBuilder sb = new StringBuilder();
+ for (VLVSortOrder s : sortOrder)
+ {
+ if (sb.length() > 0)
+ {
+ sb.append(" ");
+ }
+ if (s.isAscending())
+ {
+ sb.append("+");
+ }
+ else
+ {
+ sb.append("-");
+ }
+ sb.append(s.getAttributeName());
+ }
+ return sb.toString();
+ }
+
+
+ /**
+ * Updates the layout with the new changed configuration event.
+ * @param ev the configuration change event.
+ * @return <CODE>true</CODE> if an error has been displayed and
+ * <CODE>false</CODE> otherwise.
+ */
+ protected boolean updateLayout(ConfigurationChangeEvent ev)
+ {
+ final ServerDescriptor desc = ev.getNewDescriptor();
+
+ Schema schema = desc.getSchema();
+ BackendDescriptor backend = getBackend();
+ final boolean[] repack = {false};
+ final boolean[] error = {false};
+ if (backend != null)
+ {
+ updateBaseDNCombo(backend);
+ }
+
+ if (schema != null)
+ {
+ repack[0] = attributes.getItemCount() == 0;
+ LinkedHashSet<CategorizedComboBoxElement> newElements =
+ new LinkedHashSet<CategorizedComboBoxElement>();
+
+ synchronized(standardAttrNames)
+ {
+ standardAttrNames.clear();
+ configurationAttrNames.clear();
+ customAttrNames.clear();
+
+ for (AttributeType attr : schema.getAttributeTypes().values())
+ {
+ String name = attr.getPrimaryName();
+ boolean defined = false;
+ ListModel model = sortOrder.getModel();
+ for (int i=0; i < model.getSize(); i++)
+ {
+ VLVSortOrder s = (VLVSortOrder)model.getElementAt(i);
+ if (name.equalsIgnoreCase(s.getAttributeName()))
+ {
+ defined = true;
+ break;
+ }
+ }
+ if (!defined)
+ {
+ if (Utilities.isStandard(attr))
+ {
+ standardAttrNames.add(name);
+ }
+ else if (Utilities.isConfiguration(attr))
+ {
+ configurationAttrNames.add(name);
+ }
+ else
+ {
+ customAttrNames.add(name);
+ }
+ }
+ }
+ }
+ if (customAttrNames.size() > 0)
+ {
+ newElements.add(new CategorizedComboBoxElement(
+ CUSTOM_ATTRIBUTES,
+ CategorizedComboBoxElement.Type.CATEGORY));
+ for (String attrName : customAttrNames)
+ {
+ newElements.add(new CategorizedComboBoxElement(
+ attrName,
+ CategorizedComboBoxElement.Type.REGULAR));
+ }
+ }
+ if (standardAttrNames.size() > 0)
+ {
+ newElements.add(new CategorizedComboBoxElement(
+ STANDARD_ATTRIBUTES,
+ CategorizedComboBoxElement.Type.CATEGORY));
+ for (String attrName : standardAttrNames)
+ {
+ newElements.add(new CategorizedComboBoxElement(
+ attrName,
+ CategorizedComboBoxElement.Type.REGULAR));
+ }
+ }
+ // Ignore configuration attr names
+ /*
+ if (configurationAttrNames.size() > 0)
+ {
+ newElements.add(new CategorizedComboBoxDescriptor(
+ "Configuration Attributes",
+ CategorizedComboBoxDescriptor.Type.CATEGORY));
+ for (String attrName : configurationAttrNames)
+ {
+ newElements.add(new CategorizedComboBoxDescriptor(
+ attrName,
+ CategorizedComboBoxDescriptor.Type.REGULAR));
+ }
+ }
+ */
+ DefaultComboBoxModel model =
+ (DefaultComboBoxModel)attributes.getModel();
+ updateComboBoxModel(newElements, model);
+ }
+ else
+ {
+ updateErrorPane(errorPane,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_SUMMARY.get(),
+ ColorAndFontConstants.errorTitleFont,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_DETAILS.get(),
+ ColorAndFontConstants.defaultFont);
+ repack[0] = true;
+ error[0] = true;
+ }
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ if ((getButtonType() == GenericDialog.ButtonType.OK) ||
+ (getButtonType() == GenericDialog.ButtonType.OK))
+ {
+ setEnabledOK(!error[0]);
+ }
+ errorPane.setVisible(error[0]);
+ add.setEnabled(attributes.getModel().getSize() > 0);
+ remove.setEnabled(sortOrder.getSelectedIndex() != -1);
+ if (repack[0])
+ {
+ packParentDialog();
+ if (relativeComponent != null)
+ {
+ Utilities.centerGoldenMean(
+ Utilities.getParentDialog(AbstractVLVIndexPanel.this),
+ relativeComponent);
+ }
+ }
+ }
+ });
+ return !error[0];
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the user accepts to continue creating the VLV
+ * index even if no indexes are created for the provided filter for the VLV
+ * index. Returns <CODE>false</CODE> if the user does not accept to create
+ * the index. Note that the confirmation dialog will only be displayed when
+ * the indexes are not defined, if the dialog is not displayed the method
+ * returns <CODE>true</CODE>.
+ * @return <CODE>true</CODE> if the user accepts to continue creating the VLV
+ * index even if no indexes are created for the provided filter for the VLV
+ * index. Returns <CODE>false</CODE> if the user does not accept to create
+ * the index.
+ */
+ protected boolean checkIndexRequired()
+ {
+ boolean confirm = true;
+ String f = filter.getText().trim();
+ try
+ {
+ LDAPFilter ldapFilter = LDAPFilter.decode(f);
+ ArrayList<Message> msgs = new ArrayList<Message>();
+ updateIndexRequiredMessages(ldapFilter, msgs);
+ if (!msgs.isEmpty())
+ {
+ StringBuilder sb = new StringBuilder();
+ for (Message msg : msgs)
+ {
+ sb.append("<br>-"+msg);
+ }
+ confirm = displayConfirmationDialog(
+ INFO_CTRL_PANEL_VLV_INDEXES_NOT_DEFINED_CONFIRMATION_TITLE.get(),
+ INFO_CTRL_PANEL_VLV_INDEXES_NOT_DEFINED_CONFIRMATION_MSG.get(
+ getBackend().getBackendID(), sb.toString()));
+ }
+ }
+ catch (Throwable t)
+ {
+ // Bug
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ return confirm;
+ }
+
+ /**
+ * Updates the provided list of error messages by analyzing the provided
+ * filter. The idea is basically to analyze the filter and check if what
+ * appears on the filter is indexed or not. If it is not indexed it updates
+ * the error message list with a message explaining that.
+ * @param filter the filter to analyze.
+ * @param msgs the list of messages to be updated.
+ */
+ private void updateIndexRequiredMessages(RawFilter filter,
+ Collection<Message> msgs)
+ {
+ switch (filter.getFilterType())
+ {
+ case AND:
+ case OR:
+ if (filter.getFilterComponents() != null)
+ {
+ for (RawFilter f : filter.getFilterComponents())
+ {
+ updateIndexRequiredMessages(f, msgs);
+ }
+ }
+ break;
+ case NOT:
+ updateIndexRequiredMessages(filter.getNOTComponent(), msgs);
+ break;
+ default:
+ FilterType[] filterTypes = {FilterType.EQUALITY, FilterType.SUBSTRING,
+ FilterType.GREATER_OR_EQUAL, FilterType.LESS_OR_EQUAL,
+ FilterType.PRESENT, FilterType.APPROXIMATE_MATCH,
+ FilterType.EXTENSIBLE_MATCH
+ };
+ IndexType[] indexTypes = {IndexType.EQUALITY, IndexType.SUBSTRING,
+ IndexType.ORDERING, IndexType.ORDERING, IndexType.PRESENCE,
+ IndexType.APPROXIMATE, null
+ };
+ Message[] indexTypeNames = {INFO_CTRL_PANEL_VLV_INDEX_EQUALITY_TYPE.get(),
+ INFO_CTRL_PANEL_VLV_INDEX_SUBSTRING_TYPE.get(),
+ INFO_CTRL_PANEL_VLV_INDEX_ORDERING_TYPE.get(),
+ INFO_CTRL_PANEL_VLV_INDEX_ORDERING_TYPE.get(),
+ INFO_CTRL_PANEL_VLV_INDEX_PRESENCE_TYPE.get(),
+ INFO_CTRL_PANEL_VLV_INDEX_APPROXIMATE_TYPE.get(),
+ null
+ };
+ for (int i=0; i<filterTypes.length; i++)
+ {
+ if (filterTypes[i] == filter.getFilterType())
+ {
+ IndexDescriptor index = getIndex(filter.getAttributeType());
+ if (index != null)
+ {
+ IndexType type = indexTypes[i];
+ if (type != null)
+ {
+ if (!index.getTypes().contains(type))
+ {
+ msgs.add(INFO_CTRL_PANEL_MUST_UPDATE_INDEX_DEFINITION_TYPE.get(
+ filter.getAttributeType(), indexTypeNames[i]));
+ }
+ }
+ }
+ else
+ {
+ Message type = indexTypeNames[i];
+ if (type != null)
+ {
+ msgs.add(INFO_CTRL_PANEL_MUST_DEFINE_INDEX_TYPE.get(
+ filter.getAttributeType(), type));
+ }
+ else
+ {
+ msgs.add(INFO_CTRL_PANEL_MUST_DEFINE_INDEX.get(
+ filter.getAttributeType()));
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns the index descriptor for a given index name (<CODE>null</CODE> if
+ * no index descriptor is found for that name).
+ * @param indexName the name of the index.
+ * @return the index descriptor for a given index name.
+ */
+ private IndexDescriptor getIndex(String indexName)
+ {
+ IndexDescriptor index = null;
+ BackendDescriptor backend = getBackend();
+ if (backend != null)
+ {
+ for (IndexDescriptor i : backend.getIndexes())
+ {
+ if (i.getName().equalsIgnoreCase(indexName))
+ {
+ index = i;
+ break;
+ }
+ }
+ }
+ return index;
+ }
+
+ /**
+ * Updates the base DN combo box with the provided backend.
+ * @param backend the backend to be used with the provided backend.
+ */
+ protected void updateBaseDNCombo(BackendDescriptor backend)
+ {
+ ArrayList<Object> newElements =
+ new ArrayList<Object>();
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ String dn = null;
+ try
+ {
+ dn = Utilities.unescapeUtf8(baseDN.getDn().toString());
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ newElements.add(dn);
+ }
+ newElements.add(COMBO_SEPARATOR);
+ newElements.add(OTHER_BASE_DN);
+ updateComboBoxModel(newElements, (DefaultComboBoxModel)baseDNs.getModel());
+ }
+
+ /**
+ * Updates a list of errors with the errors found in the panel.
+ * @param checkName whether the name of the VLV index must be checked or not.
+ * @return a list containing the error messages found.
+ */
+ protected List<Message> checkErrors(boolean checkName)
+ {
+ for (JLabel l : labels)
+ {
+ setPrimaryValid(l);
+ }
+
+ BackendDescriptor backend = getBackend();
+
+ ArrayList<Message> errors = new ArrayList<Message>();
+ if (checkName)
+ {
+ String n = name.getText();
+ if (n.trim().length() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_NO_VLV_INDEX_NAME_PROVIDED.get());
+ setPrimaryInvalid(lName);
+ }
+ else if (backend != null)
+ {
+ // Check that there is no other VLV index with same name
+ for (VLVIndexDescriptor index : backend.getVLVIndexes())
+ {
+ if (index.getName().equalsIgnoreCase(n))
+ {
+ errors.add(ERR_CTRL_PANEL_VLV_INDEX_ALREADY_DEFINED.get(n,
+ backendName.getText()));
+ setPrimaryInvalid(lName);
+ break;
+ }
+ }
+ }
+ }
+
+ String baseDN = getBaseDN();
+ if ((baseDN == null) || (baseDN.length() == 0))
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BASE_DN_FOR_VLV_PROVIDED.get());
+ setPrimaryInvalid(lBaseDN);
+ }
+ else
+ {
+ try
+ {
+ DN.decode(baseDN);
+ }
+ catch (OpenDsException oe)
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_BASE_DN_FOR_VLV_PROVIDED.get(
+ oe.getMessageObject().toString()));
+ setPrimaryInvalid(lBaseDN);
+ }
+ }
+
+ String f = filter.getText().trim();
+ if (f.equals(""))
+ {
+ errors.add(ERR_CTRL_PANEL_NO_FILTER_FOR_VLV_PROVIDED.get());
+ setPrimaryInvalid(lFilter);
+ }
+ else
+ {
+ try
+ {
+ LDAPFilter.decode(f);
+ }
+ catch (LDAPException le)
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_FILTER_FOR_VLV_PROVIDED.get(
+ le.getMessageObject().toString()));
+ setPrimaryInvalid(lFilter);
+ }
+ }
+
+ if (sortOrder.getModel().getSize() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_NO_ATTRIBUTE_FOR_VLV_PROVIDED.get());
+ setPrimaryInvalid(lSortOrder);
+ }
+ String v = maxBlockSize.getText();
+ try
+ {
+ int n = Integer.parseInt(v);
+ if ((n < MIN_MAX_BLOCK_SIZE) || (n > MAX_MAX_BLOCK_SIZE))
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_MAX_BLOCK_SIZE_FOR_VLV_PROVIDED.get(
+ MIN_MAX_BLOCK_SIZE, MAX_MAX_BLOCK_SIZE));
+ setPrimaryInvalid(lMaxBlockSize);
+ }
+ }
+ catch (Throwable t)
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_MAX_BLOCK_SIZE_FOR_VLV_PROVIDED.get(
+ MIN_MAX_BLOCK_SIZE, MAX_MAX_BLOCK_SIZE));
+ setPrimaryInvalid(lMaxBlockSize);
+ }
+ return errors;
+ }
+
+ /**
+ * Returns the backend for the index.
+ * @return the backend for the index.
+ */
+ protected BackendDescriptor getBackend()
+ {
+// Check that the index does not exist
+ BackendDescriptor backend = null;
+ for (BackendDescriptor b : getInfo().getServerDescriptor().getBackends())
+ {
+ if (b.getBackendID().equalsIgnoreCase(backendName.getText()))
+ {
+ backend = b;
+ break;
+ }
+ }
+ return backend;
+ }
+
+ /**
+ * Returns the base DN for the VLV index.
+ * @return the base DN for the VLV index.
+ */
+ protected String getBaseDN()
+ {
+ Object selectedItem = baseDNs.getSelectedItem();
+ if (OTHER_BASE_DN.equals(selectedItem))
+ {
+ selectedItem = baseDN.getText().trim();
+ }
+ if (selectedItem != null)
+ {
+ return selectedItem.toString();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+
+ /**
+ * Returns the selected attribute.
+ * @return the selected attribute.
+ */
+ protected String getSelectedAttribute()
+ {
+ String attrName;
+ CategorizedComboBoxElement o =
+ (CategorizedComboBoxElement)attributes.getSelectedItem();
+ if (o != null)
+ {
+ attrName = o.getValue().toString();
+ }
+ else
+ {
+ attrName = null;
+ }
+ return attrName;
+ }
+
+
+ /**
+ * Creates the basic layout of the panel.
+ * @param c the container of the layout.
+ * @param gbc the grid bag constraints to be used.
+ * @param nameReadOnly whether the panel is read-only or not.
+ */
+ protected void createBasicLayout(Container c, GridBagConstraints gbc,
+ boolean nameReadOnly)
+ {
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 3;
+ addErrorPane(c, gbc);
+
+ if (nameReadOnly)
+ {
+ gbc.gridy ++;
+ titlePanel.setTitle(INFO_CTRL_PANEL_VLV_INDEX_DETAILS_LABEL.get());
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.top = 10;
+ c.add(titlePanel, gbc);
+ }
+
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ c.add(lName, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+
+ if (nameReadOnly)
+ {
+ c.add(readOnlyName, gbc);
+ }
+ else
+ {
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ c.add(p, gbc);
+ GridBagConstraints gbc2 = new GridBagConstraints();
+ gbc2.weightx = 0.3;
+ gbc2.fill = GridBagConstraints.HORIZONTAL;
+ gbc2.gridwidth = GridBagConstraints.RELATIVE;
+ p.add(name, gbc2);
+ gbc2.gridwidth = GridBagConstraints.REMAINDER;
+ gbc2.weightx = 0.7;
+ p.add(Box.createHorizontalGlue(), gbc2);
+ }
+ gbc.gridy ++;
+
+ gbc.insets.left = 0;
+ gbc.insets.top = 10;
+ gbc.gridx = 0;
+ c.add(lBackend, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ c.add(backendName, gbc);
+ gbc.gridy ++;
+
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ gbc.gridwidth = 1;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ c.add(lBaseDN, gbc);
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ c.add(p, gbc);
+ gbc.gridy ++;
+
+ DefaultComboBoxModel model = new DefaultComboBoxModel(
+ new Object[]{COMBO_SEPARATOR, OTHER_BASE_DN});
+ baseDNs.setModel(model);
+ baseDNs.setRenderer(new CustomListCellRenderer(baseDNs));
+ ItemListener listener = new IgnoreItemListener(baseDNs);
+ baseDNs.addItemListener(listener);
+ baseDNs.addItemListener(new ItemListener()
+ {
+ public void itemStateChanged(ItemEvent ev)
+ {
+ baseDN.setEnabled(OTHER_BASE_DN.equals(baseDNs.getSelectedItem()));
+ }
+ });
+ listener.itemStateChanged(null);
+ GridBagConstraints gbc2 = new GridBagConstraints();
+ gbc2.fill = GridBagConstraints.HORIZONTAL;
+ p.add(baseDNs, gbc2);
+ gbc2.gridwidth = GridBagConstraints.REMAINDER;
+ gbc2.weightx = 1.0;
+ gbc2.insets.left = 5;
+ p.add(baseDN, gbc2);
+ gbc2.insets.top = 3;
+ JLabel inlineHelp = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_SUBTREE_INLINE_HELP_LABEL.get());
+ p.add(inlineHelp, gbc2);
+
+
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ gbc.gridwidth = 1;
+ c.add(lSearchScope, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ JRadioButton [] radios = {baseObject, singleLevel, subordinateSubtree,
+ wholeSubtree
+ };
+ singleLevel.setSelected(true);
+ ButtonGroup group = new ButtonGroup();
+ for (JRadioButton radio : radios)
+ {
+ c.add(radio, gbc);
+ group.add(radio);
+ gbc.insets.top = 5;
+ gbc.gridy ++;
+ }
+
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ gbc.gridwidth = 1;
+ c.add(lFilter, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ c.add(filter, gbc);
+ gbc.gridy ++;
+ gbc.insets.top = 3;
+ inlineHelp = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_FILTER_INLINE_HELP_LABEL.get());
+ c.add(inlineHelp, gbc);
+ gbc.gridy ++;
+
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ gbc.gridwidth = 1;
+ c.add(lMaxBlockSize, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ c.add(maxBlockSize, gbc);
+ maxBlockSize.setText(String.valueOf(DEFAULT_MAX_BLOCK_SIZE));
+ gbc.gridy ++;
+
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ gbc.gridwidth = 1;
+ c.add(lSortOrder, gbc);
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ attributes.addItemListener(new IgnoreItemListener(attributes));
+ attributes.setRenderer(new IndexComboBoxCellRenderer(attributes));
+ c.add(attributes, gbc);
+ gbc.gridx ++;
+
+ ascendingOrder.setModel(new DefaultComboBoxModel(
+ new Object[] {ASCENDING, DESCENDING}));
+ c.add(ascendingOrder, gbc);
+ gbc.gridy ++;
+
+ final ListSelectionListener listListener = new ListSelectionListener()
+ {
+ public void valueChanged(ListSelectionEvent ev)
+ {
+ int[] indexes = sortOrder.getSelectedIndices();
+ if ((indexes != null) && (indexes.length > 0))
+ {
+ moveUp.setEnabled(indexes[0] != 0);
+ moveDown.setEnabled(indexes[indexes.length - 1] !=
+ sortOrder.getModel().getSize() - 1);
+ remove.setEnabled(true);
+ }
+ else
+ {
+ moveUp.setEnabled(false);
+ moveUp.setEnabled(false);
+ remove.setEnabled(false);
+ }
+ }
+ };
+
+ JButton[] buttons = {add, remove, moveUp, moveDown};
+ for (JButton button : buttons)
+ {
+ button.setOpaque(false);
+ button.setEnabled(false);
+ }
+
+ add.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ String attr = getSelectedAttribute();
+ if (attr != null)
+ {
+ boolean isAscending = ASCENDING == ascendingOrder.getSelectedItem();
+ sortOrderModel.addElement(new VLVSortOrder(attr, isAscending));
+ DefaultComboBoxModel model =
+ (DefaultComboBoxModel)attributes.getModel();
+ int i = attributes.getSelectedIndex();
+ if (i > 0)
+ {
+ // To avoid issues, try to figure out first the new selection
+ int newIndex = -1;
+ for (int j= i -1; j>0 && (newIndex == -1); j--)
+ {
+ CategorizedComboBoxElement o = (CategorizedComboBoxElement)
+ model.getElementAt(j);
+ if (o.getType() == CategorizedComboBoxElement.Type.REGULAR)
+ {
+ newIndex = j;
+ }
+ }
+ if (newIndex == -1)
+ {
+ for (int j= i + 1; j<model.getSize() && (newIndex == -1); j++)
+ {
+ CategorizedComboBoxElement o = (CategorizedComboBoxElement)
+ model.getElementAt(j);
+ if (o.getType() == CategorizedComboBoxElement.Type.REGULAR)
+ {
+ newIndex = j;
+ }
+ }
+ }
+ if (newIndex != -1)
+ {
+ attributes.setSelectedIndex(newIndex);
+ }
+ model.removeElementAt(i);
+ }
+ }
+ listListener.valueChanged(null);
+ }
+ });
+ moveUp.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ int[] indexes = sortOrder.getSelectedIndices();
+ for (int i=0; i<indexes.length; i++)
+ {
+ Object o1 = sortOrderModel.elementAt(indexes[i] - 1);
+ Object o2 = sortOrderModel.elementAt(indexes[i]);
+ sortOrderModel.set(indexes[i] - 1, o2);
+ sortOrderModel.set(indexes[i], o1);
+
+ indexes[i] = indexes[i] - 1;
+ }
+ sortOrder.setSelectedIndices(indexes);
+ listListener.valueChanged(null);
+ }
+ });
+ moveDown.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ int[] indexes = sortOrder.getSelectedIndices();
+ for (int i=0; i<indexes.length; i++)
+ {
+ Object o1 = sortOrderModel.elementAt(indexes[i] + 1);
+ Object o2 = sortOrderModel.elementAt(indexes[i]);
+ sortOrderModel.set(indexes[i] + 1, o2);
+ sortOrderModel.set(indexes[i], o1);
+
+ indexes[i] = indexes[i] + 1;
+ }
+ sortOrder.setSelectedIndices(indexes);
+ listListener.valueChanged(null);
+ }
+ });
+ remove.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ int[] indexes = sortOrder.getSelectedIndices();
+
+ synchronized (standardAttrNames)
+ {
+ DefaultComboBoxModel model =
+ (DefaultComboBoxModel)attributes.getModel();
+ for (int i=0; i<indexes.length; i++)
+ {
+ VLVSortOrder sortOrder = (VLVSortOrder)sortOrderModel.getElementAt(
+ indexes[i]);
+ String attrName = sortOrder.getAttributeName();
+ boolean isCustom = customAttrNames.contains(attrName);
+ boolean dealingWithCustom = true;
+ for (int j = 0; j < model.getSize(); j++)
+ {
+ CategorizedComboBoxElement o = (CategorizedComboBoxElement)
+ model.getElementAt(j);
+ if (o.getType() == CategorizedComboBoxElement.Type.REGULAR)
+ {
+ if (dealingWithCustom == isCustom)
+ {
+ if (attrName.compareTo(o.getValue().toString()) < 0)
+ {
+ model.insertElementAt(new CategorizedComboBoxElement(
+ attrName,
+ CategorizedComboBoxElement.Type.REGULAR), j);
+ break;
+ }
+ }
+ }
+ else if (!o.getValue().equals(CUSTOM_ATTRIBUTES))
+ {
+ dealingWithCustom = false;
+ if (isCustom)
+ {
+ model.insertElementAt(new CategorizedComboBoxElement(
+ attrName,
+ CategorizedComboBoxElement.Type.REGULAR), j);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ for (int i=indexes.length - 1; i >=0; i--)
+ {
+ sortOrderModel.remove(indexes[i]);
+ }
+ listListener.valueChanged(null);
+ }
+ });
+
+ gbc.insets.top = 5;
+ gbc.gridx = 1;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.EAST;
+ c.add(add, gbc);
+ gbc.gridy ++;
+
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ gbc.gridheight = 3;
+ gbc.gridx = 1;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.anchor = GridBagConstraints.NORTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ sortOrderModel = new DefaultListModel();
+ sortOrder.setModel(sortOrderModel);
+ sortOrder.setCellRenderer(new VLVSortOrderRenderer(sortOrder));
+ sortOrder.setVisibleRowCount(6);
+ sortOrder.setPrototypeCellValue("AjA");
+ c.add(Utilities.createScrollPane(sortOrder), gbc);
+ sortOrder.addListSelectionListener(listListener);
+
+ gbc.gridx = 2;
+ gbc.weighty = 0.0;
+ gbc.weightx = 0.0;
+ gbc.gridheight = 1;
+ gbc.insets.left = 5;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.WEST;
+ c.add(moveUp, gbc);
+ gbc.gridy ++;
+ gbc.insets.top = 5;
+ c.add(moveDown, gbc);
+ gbc.insets.top = 0;
+ gbc.gridy ++;
+ gbc.weighty = 1.0;
+
+ Dimension d = new Dimension(
+ Math.max(moveUp.getPreferredSize().width,
+ moveDown.getPreferredSize().width),
+ Math.max(moveUp.getPreferredSize().height,
+ moveDown.getPreferredSize().height));
+ moveUp.setPreferredSize(d);
+ moveDown.setPreferredSize(d);
+
+ c.add(Box.createVerticalGlue(), gbc);
+
+ gbc.gridx = 1;
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ gbc.anchor = GridBagConstraints.NORTHEAST;
+ gbc.fill = GridBagConstraints.NONE;
+ c.add(remove, gbc);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
new file mode 100644
index 0000000..2c68f65
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
@@ -0,0 +1,486 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.DropTargetListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.AddToGroupTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
+import org.opends.guitools.controlpanel.ui.nodes.DndBrowserNodes;
+import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.DN;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * The dialog that is displayed when we want to add entries to a set of groups.
+ * @author jvergara
+ *
+ */
+public class AddToGroupPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 1837745944604435848L;
+ private JTextArea groups;
+ private JTextArea entries;
+ private JScrollPane scrollEntries;
+ private JLabel lEntries = Utilities.createDefaultLabel();
+ private JLabel lGroups = Utilities.createDefaultLabel();
+ private LinkedHashSet<DN> dns = new LinkedHashSet<DN>();
+
+ private GenericDialog browseGroupDlg;
+ private LDAPEntrySelectionPanel browseGroupPanel;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public AddToGroupPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * Sets the entries we want to add to groups.
+ * @param dns the DN of the entries we want to add to groups.
+ */
+ public void setEntriesToAdd(Set<DN> dns)
+ {
+ ArrayList<String> sDns = new ArrayList<String>();
+ for (DN dn : dns)
+ {
+ sDns.add(dn.toString());
+ }
+ if (dns.size() > 5)
+ {
+ entries.setText(Utilities.getStringFromCollection(sDns, "\n"));
+ scrollEntries.setVisible(true);
+ lEntries.setVisible(false);
+ }
+ else
+ {
+ lEntries.setText("<html>"+Utilities.applyFont(
+ "<li>"+Utilities.getStringFromCollection(sDns, "<li>"),
+ ColorAndFontConstants.defaultFont));
+ scrollEntries.setVisible(false);
+ lEntries.setVisible(true);
+ }
+ this.dns.clear();
+ this.dns.addAll(dns);
+ packParentDialog();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return groups;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ final ArrayList<Message> errors = new ArrayList<Message>();
+ BackgroundTask<Void> worker = new BackgroundTask<Void>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public Void processBackgroundTask()
+ {
+ try
+ {
+ Thread.sleep(2000);
+ }
+ catch (Throwable t)
+ {
+ }
+ updateErrors(errors);
+ return null;
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(Void returnValue, Throwable t)
+ {
+ if (t != null)
+ {
+ errors.add(ERR_CTRL_PANEL_UNEXPECTED_DETAILS.get(t.toString()));
+ }
+ displayMainPanel();
+ setEnabledCancel(true);
+ setEnabledOK(true);
+ handleErrorsAndLaunchTask(errors);
+ }
+ };
+ displayMessage(INFO_CTRL_PANEL_CHECKING_SUMMARY.get());
+ setEnabledCancel(false);
+ setEnabledOK(false);
+ worker.startBackgroundTask();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_ADD_TO_GROUP_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.gridwidth = 2;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ JLabel l = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_ADD_TO_GROUP_ENTRIES_LABEL.get());
+ add(l, gbc);
+ gbc.insets.top = 5;
+ entries = Utilities.createNonEditableTextArea(Message.EMPTY, 6, 40);
+ scrollEntries = Utilities.createScrollPane(entries);
+ gbc.weighty = 0.1;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridy ++;
+ add(scrollEntries, gbc);
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets.top = 0;
+ add(lEntries, gbc);
+
+ gbc.insets.top = 10;
+ gbc.gridy ++ ;
+ lGroups.setText(INFO_CTRL_PANEL_ADD_TO_GROUP_GROUPS_LABEL.get().toString());
+ add(lGroups, gbc);
+ gbc.insets.top = 5;
+ gbc.gridwidth = 1;
+ groups = Utilities.createTextArea(Message.EMPTY, 8, 40);
+ JScrollPane scrollGroups = Utilities.createScrollPane(groups);
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridy ++;
+ add(scrollGroups, gbc);
+ gbc.gridx ++;
+ gbc.insets.left = 5;
+ gbc.weightx = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ JButton browse = Utilities.createButton(
+ INFO_CTRL_PANEL_ADD_GROUPS_BUTTON_LABEL.get());
+ gbc.anchor = GridBagConstraints.NORTH;
+ add(browse, gbc);
+ browse.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ browseGroupsClicked();
+ }
+ });
+
+ DropTargetListener dropTargetlistener = new DropTargetListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void dragEnter(DropTargetDragEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dragExit(DropTargetEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dragOver(DropTargetDragEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dropActionChanged(DropTargetDragEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void drop(DropTargetDropEvent e)
+ {
+ try {
+ Transferable tr = e.getTransferable();
+
+ //flavor not supported, reject drop
+ if (!tr.isDataFlavorSupported(DndBrowserNodes.INFO_FLAVOR))
+ {
+ e.rejectDrop();
+ }
+
+ //cast into appropriate data type
+ DndBrowserNodes nodes =
+ (DndBrowserNodes) tr.getTransferData(DndBrowserNodes.INFO_FLAVOR);
+
+ StringBuilder sb = new StringBuilder();
+ sb.append(groups.getText());
+ for (BrowserNodeInfo node : nodes.getNodes())
+ {
+ if (sb.length() > 0)
+ {
+ sb.append("\n");
+ }
+ sb.append(node.getNode().getDN());
+ }
+ groups.setText(sb.toString());
+ groups.setCaretPosition(sb.length());
+
+ e.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
+ e.getDropTargetContext().dropComplete(true);
+ }
+ catch (IOException io)
+ {
+ e.rejectDrop();
+ }
+ catch (UnsupportedFlavorException ufe)
+ {
+ e.rejectDrop();
+ }
+ }
+ };
+ new DropTarget(groups, dropTargetlistener);
+ }
+
+ private void browseGroupsClicked()
+ {
+ if (browseGroupDlg == null)
+ {
+ browseGroupPanel = new LDAPEntrySelectionPanel();
+ browseGroupPanel.setTitle(INFO_CTRL_PANEL_CHOOSE_GROUP_TITLE.get());
+ browseGroupPanel.setFilter(
+ LDAPEntrySelectionPanel.Filter.STATIC_GROUPS);
+ browseGroupPanel.setMultipleSelection(true);
+ browseGroupPanel.setInfo(getInfo());
+ browseGroupDlg = new GenericDialog(Utilities.getFrame(this),
+ browseGroupPanel);
+ Utilities.centerGoldenMean(browseGroupDlg,
+ Utilities.getParentDialog(this));
+ browseGroupDlg.setModal(true);
+ }
+ browseGroupDlg.setVisible(true);
+ String[] dns = browseGroupPanel.getDNs();
+ if (dns.length > 0)
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(groups.getText());
+ for (String dn : dns)
+ {
+ if (sb.length() > 0)
+ {
+ sb.append("\n");
+ }
+ sb.append(dn);
+ }
+ groups.setText(sb.toString());
+ groups.setCaretPosition(sb.length());
+ }
+ }
+
+ private void updateErrors(List<Message> errors)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ setPrimaryValid(lGroups);
+ }
+ });
+
+ String[] grs = groups.getText().split("\n");
+ boolean oneGroupDefined = false;
+ for (String groupDn : grs)
+ {
+ groupDn = groupDn.trim();
+ if (groupDn.length() > 0)
+ {
+ try
+ {
+ DN.decode(groupDn);
+ if (!entryExists(groupDn))
+ {
+ errors.add(
+ ERR_CTRL_PANEL_GROUP_COULD_NOT_BE_FOUND.get(groupDn));
+ }
+ else if (!hasObjectClass(groupDn, "groupOfUniqueNames"))
+ {
+ errors.add(ERR_CTRL_PANEL_NOT_A_STATIC_GROUP.get(groupDn));
+ }
+ else
+ {
+ oneGroupDefined = true;
+ }
+ }
+ catch (OpenDsException ode)
+ {
+ errors.add(INFO_CTRL_PANEL_INVALID_DN_DETAILS.get(groupDn,
+ ode.getMessageObject().toString()));
+ }
+ }
+ }
+ if (!oneGroupDefined && errors.isEmpty())
+ {
+ errors.add(ERR_CTRL_PANEL_GROUP_NOT_PROVIDED.get());
+ }
+
+ if (!errors.isEmpty())
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ setPrimaryInvalid(lGroups);
+ }
+ });
+ }
+ }
+
+ private void handleErrorsAndLaunchTask(ArrayList<Message> errors)
+ {
+ if (errors.size() == 0)
+ {
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_ADD_TO_GROUP_TITLE.get(), getInfo());
+ LinkedHashSet<DN> groupDns = new LinkedHashSet<DN>();
+ String[] grs = groups.getText().split("\n");
+ try
+ {
+ for (String groupDn : grs)
+ {
+ groupDn = groupDn.trim();
+ if (groupDn.length() > 0)
+ {
+ groupDns.add(DN.decode(groupDn));
+ }
+ }
+ }
+ catch (OpenDsException ode)
+ {
+ throw new IllegalStateException(
+ "Unexpected error decoding dn. Details: "+ode.getMessageObject(),
+ ode);
+ }
+ try
+ {
+ AddToGroupTask newTask =
+ new AddToGroupTask(getInfo(), dlg, dns, groupDns);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.size() == 0)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_ADDING_TO_GROUP_SUMMARY.get(),
+ INFO_CTRL_PANEL_ADDING_TO_GROUP_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_ADDING_TO_GROUP_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_ADDING_TO_GROUP_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_ADDING_TO_GROUP_ERROR_DETAILS.get(),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ catch (Throwable t)
+ {
+ // Unexpected error: getEntry() should work after calling checkSyntax
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
new file mode 100644
index 0000000..6ca22c1
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
@@ -0,0 +1,222 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.TreeSet;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JLabel;
+import javax.swing.JList;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.components.TitlePanel;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.api.AttributeSyntax;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.Schema;
+
+/**
+ * Panel containing information about an attribute syntax.
+ *
+ */
+public class AttributeSyntaxPanel extends SchemaElementPanel
+{
+ private static final long serialVersionUID = -2426247742251904863L;
+ private TitlePanel titlePanel = new TitlePanel(Message.EMPTY,
+ Message.EMPTY);
+ private JLabel name = Utilities.createDefaultLabel();
+ private JLabel oid = Utilities.createDefaultLabel();
+ private JLabel description = Utilities.createDefaultLabel();
+ private JList usedByAttributes = new JList(new DefaultListModel());
+
+ /**
+ * Default constructor.
+ *
+ */
+ public AttributeSyntaxPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return usedByAttributes;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ titlePanel.setTitle(INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_DETAILS.get());
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridwidth = 2;
+ gbc.gridy = 0;
+ gbc.insets.top = 5;
+ gbc.insets.bottom = 7;
+ add(titlePanel, gbc);
+
+ gbc.insets.bottom = 0;
+ gbc.insets.top = 8;
+
+ Message[] labels = {INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_NAME.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_OID.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_DESCRIPTION.get()};
+ JLabel[] values = {name, oid, description};
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.anchor = GridBagConstraints.WEST;
+ for (int i=0; i < labels.length; i++)
+ {
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ JLabel l = Utilities.createPrimaryLabel(labels[i]);
+ add(l, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ add(values[i], gbc);
+ gbc.gridy ++;
+ }
+
+ usedByAttributes.setVisibleRowCount(15);
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ JLabel l = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_USED_BY_ATTRIBUTES.get());
+ gbc.weightx = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(l, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.weighty = 1.0;
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets.top = 10;
+ add(Utilities.createScrollPane(usedByAttributes), gbc);
+
+ MouseAdapter doubleClickListener = new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent ev)
+ {
+ if (ev.getClickCount() > 1)
+ {
+ String o = (String)usedByAttributes.getSelectedValue();
+ if (o != null)
+ {
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ AttributeType attr = schema.getAttributeType(o.toLowerCase());
+ if (attr != null)
+ {
+ notifySchemaSelectionListeners(attr);
+ }
+ }
+ }
+ }
+ }
+ };
+ usedByAttributes.addMouseListener(doubleClickListener);
+ setBorder(PANEL_BORDER);
+ }
+
+ /**
+ * Updates the contents of the panel.
+ * @param syntax the attribute syntax that the panel must display.
+ * @param schema the schema.
+ */
+ public void update(AttributeSyntax syntax, Schema schema)
+ {
+ String n = syntax.getSyntaxName();
+ if (n == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ titlePanel.setDetails(Message.raw(n));
+ name.setText(n);
+ oid.setText(syntax.getOID());
+
+ n = syntax.getDescription();
+ if (n == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ description.setText(n);
+
+ TreeSet<String> attributes = new TreeSet<String>();
+ for (AttributeType attr : schema.getAttributeTypes().values())
+ {
+ if (syntax == attr.getSyntax())
+ {
+ attributes.add(attr.getNameOrOID());
+ }
+ }
+ DefaultListModel model = (DefaultListModel)usedByAttributes.getModel();
+ model.clear();
+ for (String attr : attributes)
+ {
+ model.addElement(attr);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
new file mode 100644
index 0000000..d28a6fa
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
@@ -0,0 +1,80 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import java.util.HashSet;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexTableModel;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.IndexTableModel;
+import org.opends.messages.AdminToolMessages;
+import org.opends.messages.Message;
+
+/**
+ * Panel displaying a table containing the indexes of a backend.
+ *
+ */
+public class BackendIndexesPanel extends AbstractBackendIndexesPanel
+{
+ private static final long serialVersionUID = 7214847636854721907L;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public BackendIndexesPanel()
+ {
+ super();
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return AdminToolMessages.INFO_CTRL_PANEL_BACKEND_INDEXES_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected AbstractIndexTableModel getIndexTableModel()
+ {
+ return new IndexTableModel();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void updateTableModel(BackendDescriptor backend)
+ {
+ tableModel.setData(
+ new HashSet<AbstractIndexDescriptor>(backend.getIndexes()),
+ getInfo());
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
new file mode 100644
index 0000000..a655577
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
@@ -0,0 +1,81 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import java.util.HashSet;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexTableModel;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexTableModel;
+import org.opends.messages.AdminToolMessages;
+import org.opends.messages.Message;
+
+/**
+ * Panel displaying a table containing the VLV indexes of a backend.
+ *
+ */
+public class BackendVLVIndexesPanel extends AbstractBackendIndexesPanel
+{
+ private static final long serialVersionUID = -5864660402543106492L;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public BackendVLVIndexesPanel()
+ {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return AdminToolMessages.INFO_CTRL_PANEL_BACKEND_VLV_INDEXES_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected AbstractIndexTableModel getIndexTableModel()
+ {
+ return new VLVIndexTableModel();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void updateTableModel(BackendDescriptor backend)
+ {
+ tableModel.setData(
+ new HashSet<AbstractIndexDescriptor>(backend.getVLVIndexes()),
+ getInfo());
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java
new file mode 100644
index 0000000..aa0588d
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java
@@ -0,0 +1,541 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.CoreMessages.*;
+import static org.opends.messages.ToolMessages.*;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumn;
+
+import org.opends.guitools.controlpanel.datamodel.BackupDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackupTableModel;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.BrowseActionListener;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.renderer.BackupTableCellRenderer;
+import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.BackupDirectory;
+import org.opends.server.types.BackupInfo;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.StaticUtils;
+
+/**
+ * Abstract class used to refactor code in panels that contain a backup list on
+ * it.
+ *
+ */
+public abstract class BackupListPanel extends StatusGenericPanel
+{
+ /**
+ * The text field containing the parent directory.
+ */
+ protected JTextField parentDirectory;
+
+ /**
+ * The refreshing list message, displayed when the list of backups is
+ * refreshed.
+ */
+ protected final Message REFRESHING_LIST =
+ INFO_CTRL_PANEL_REFRESHING_LIST_SUMMARY.get();
+
+ /**
+ * The message informing that no backups where found.
+ */
+ protected final Message NO_BACKUPS_FOUND =
+ INFO_CTRL_PANEL_NO_BACKUPS_FOUND.get();
+
+ /**
+ * Label for the path field.
+ */
+ protected JLabel lPath;
+ /**
+ * Label for the list.
+ */
+ protected JLabel lAvailableBackups;
+ /**
+ * Refreshing list label (displayed instead of the list when this one is
+ * being refreshed).
+ */
+ protected JLabel lRefreshingList;
+ /**
+ * Refresh list button.
+ */
+ protected JButton refreshList;
+ /**
+ * Verify backup button.
+ */
+ protected JButton verifyBackup;
+ /**
+ * Browse button.
+ */
+ protected JButton browse;
+ /**
+ * The scroll that contains the list of backups (actually is a table).
+ */
+ protected JScrollPane tableScroll;
+ /**
+ * The list of backups.
+ */
+ protected JTable backupList;
+
+ /**
+ * Whether the backup parent directory has been initialized with a value or
+ * not.
+ */
+ protected boolean backupDirectoryInitialized;
+
+ private static final Logger LOG =
+ Logger.getLogger(RestorePanel.class.getName());
+
+ /**
+ * Default constructor.
+ *
+ */
+ protected BackupListPanel()
+ {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return parentDirectory;
+ }
+
+ /**
+ * Returns the selected backup in the list.
+ * @return the selected backup in the list.
+ */
+ protected BackupDescriptor getSelectedBackup()
+ {
+ BackupDescriptor backup = null;
+ int row = backupList.getSelectedRow();
+ if (row != -1)
+ {
+ BackupTableModel model = (BackupTableModel)backupList.getModel();
+ backup = model.get(row);
+ }
+ return backup;
+ }
+
+ /**
+ * Notification that the verify button was clicked. Whatever is required
+ * to be done must be done in this method.
+ *
+ */
+ protected abstract void verifyBackupClicked();
+
+ /**
+ * Creates the components and lays them in the panel.
+ * @param gbc the grid bag constraints to be used.
+ */
+ protected void createLayout(GridBagConstraints gbc)
+ {
+ gbc.gridy ++;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 0.0;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.gridwidth = 1;
+ gbc.insets.left = 0;
+ lPath = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_BACKUP_PATH_LABEL.get());
+ add(lPath, gbc);
+
+ gbc.gridx = 1;
+ gbc.insets.left = 10;
+ parentDirectory = Utilities.createLongTextField();
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(parentDirectory, gbc);
+ browse = Utilities.createButton(INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ browse.setOpaque(false);
+ browse.addActionListener(
+ new BrowseActionListener(parentDirectory,
+ BrowseActionListener.BrowseType.LOCATION_DIRECTORY, this));
+ gbc.gridx = 2;
+ gbc.weightx = 0.0;
+ add(browse, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+ lAvailableBackups = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_AVAILABLE_BACKUPS_LABEL.get());
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.fill = GridBagConstraints.NONE;
+ add(lAvailableBackups, gbc);
+
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets.left = 10;
+ lRefreshingList = Utilities.createDefaultLabel(REFRESHING_LIST);
+ lRefreshingList.setHorizontalAlignment(SwingConstants.CENTER);
+ gbc.anchor = GridBagConstraints.CENTER;
+ add(lRefreshingList, gbc);
+
+ backupList = new JTable();
+ // Done to provide a good size to the table.
+ BackupTableModel model = new BackupTableModel();
+ for (BackupDescriptor backup : createDummyBackupList())
+ {
+ model.add(backup);
+ }
+ backupList.setModel(model);
+ backupList.getSelectionModel().setSelectionMode(
+ ListSelectionModel.SINGLE_SELECTION);
+ backupList.setShowGrid(false);
+ backupList.setIntercellSpacing(new Dimension(0, 0));
+ TableCellRenderer renderer = new BackupTableCellRenderer();
+ for (int i=0; i<model.getColumnCount(); i++)
+ {
+ TableColumn col = backupList.getColumn(model.getColumnName(i));
+ col.setCellRenderer(renderer);
+ }
+ backupList.getTableHeader().setVisible(false);
+ backupList.getTableHeader().setPreferredSize(new Dimension(0, 0));
+ backupList.getTableHeader().setMinimumSize(new Dimension(0, 0));
+ Utilities.updateTableSizes(backupList);
+ tableScroll = Utilities.createScrollPane(backupList);
+ tableScroll.setPreferredSize(backupList.getPreferredSize());
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ add(tableScroll, gbc);
+ lRefreshingList.setPreferredSize(tableScroll.getPreferredSize());
+
+ gbc.gridy ++;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.insets.top = 5;
+ JPanel buttonPanel = new JPanel(new GridBagLayout());
+ buttonPanel.setOpaque(false);
+ add(buttonPanel, gbc);
+ GridBagConstraints gbc2 = new GridBagConstraints();
+ gbc2.gridx = 0;
+ gbc2.gridy = 0;
+ gbc2.gridwidth = 1;
+ gbc2.anchor = GridBagConstraints.EAST;
+ gbc2.fill = GridBagConstraints.HORIZONTAL;
+ gbc2.weightx = 1.0;
+ buttonPanel.add(Box.createHorizontalGlue(), gbc2);
+ refreshList = Utilities.createButton(
+ INFO_CTRL_PANEL_REFRESH_LIST_BUTTON_LABEL.get());
+ refreshList.setOpaque(false);
+ refreshList.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ refreshList();
+ }
+ });
+ gbc2.weightx = 0.0;
+ gbc2.gridx ++;
+ buttonPanel.add(refreshList, gbc2);
+ gbc2.gridx ++;
+ gbc2.insets.left = 5;
+ verifyBackup = Utilities.createButton(
+ INFO_CTRL_PANEL_VERIFY_BACKUP_BUTTON_LABEL.get());
+ verifyBackup.setOpaque(false);
+ verifyBackup.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ verifyBackupClicked();
+ }
+ });
+ ListSelectionListener listener = new ListSelectionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void valueChanged(ListSelectionEvent ev)
+ {
+ BackupDescriptor backup = getSelectedBackup();
+ verifyBackup.setEnabled(backup != null);
+ }
+ };
+ backupList.getSelectionModel().addListSelectionListener(listener);
+ listener.valueChanged(null);
+ buttonPanel.add(verifyBackup, gbc2);
+ }
+
+ /**
+ * Refresh the list of backups by looking in the backups defined under the
+ * provided parent backup directory.
+ *
+ */
+ protected void refreshList()
+ {
+ final boolean refreshEnabled = refreshList.isEnabled();
+
+ refreshList.setEnabled(false);
+ verifyBackup.setEnabled(false);
+ tableScroll.setVisible(false);
+ lRefreshingList.setText(REFRESHING_LIST.toString());
+ lRefreshingList.setVisible(true);
+ final int lastSelectedRow = backupList.getSelectedRow();
+
+ BackgroundTask<Set<BackupInfo>> worker =
+ new BackgroundTask<Set<BackupInfo>>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public Set<BackupInfo> processBackgroundTask() throws Throwable
+ {
+ // Open the backup directory and make sure it is valid.
+ LinkedHashSet<BackupInfo> backups = new LinkedHashSet<BackupInfo>();
+ Throwable firstThrowable = null;
+ try
+ {
+ BackupDirectory backupDir =
+ BackupDirectory.readBackupDirectoryDescriptor(
+ parentDirectory.getText());
+ backups.addAll(backupDir.getBackups().values());
+ }
+ catch (Throwable t)
+ {
+ firstThrowable = t;
+ // Check the subdirectories
+ File f = new File(parentDirectory.getText());
+
+ if (f.isDirectory())
+ {
+ File[] children = f.listFiles();
+ for (int i=0; i<children.length; i++)
+ {
+ if (children[i].isDirectory())
+ {
+ try
+ {
+ BackupDirectory backupDir =
+ BackupDirectory.readBackupDirectoryDescriptor(
+ children[i].getAbsolutePath());
+
+ backups.addAll(backupDir.getBackups().values());
+ }
+ catch (Throwable t2)
+ {
+ if (!children[i].getName().equals("tasks"))
+ {
+ LOG.log(Level.WARNING, "Error searching backup: "+t2, t2);
+ }
+ }
+ }
+ }
+ }
+ if (backups.size() == 0)
+ {
+ throw firstThrowable;
+ }
+ }
+ return backups;
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(Set<BackupInfo> returnValue,
+ Throwable t)
+ {
+ BackupTableModel model = (BackupTableModel)backupList.getModel();
+ model.clear();
+ if (t == null)
+ {
+ if (returnValue.size() > 0)
+ {
+ for (BackupInfo backup : returnValue)
+ {
+ model.add(new BackupDescriptor(backup));
+ }
+ model.fireTableDataChanged();
+ Utilities.updateTableSizes(backupList);
+ tableScroll.setVisible(true);
+ lRefreshingList.setVisible(false);
+ }
+ else
+ {
+ lRefreshingList.setText(NO_BACKUPS_FOUND.toString());
+ }
+ errorPane.setVisible(false);
+ // This is done to perform checks against whether we require to
+ // display an error message or not.
+ configurationChanged(new ConfigurationChangeEvent(null,
+ getInfo().getServerDescriptor()));
+ }
+ else
+ {
+ boolean displayError = true;
+ if (t instanceof OpenDsException)
+ {
+ OpenDsException e = (OpenDsException)t;
+ if (e.getMessageObject().getDescriptor().equals(
+ ERR_BACKUPDIRECTORY_NO_DESCRIPTOR_FILE))
+ {
+ displayError = false;
+ }
+ }
+ if (displayError)
+ {
+ Message details = ERR_RESTOREDB_CANNOT_READ_BACKUP_DIRECTORY.get(
+ parentDirectory.getText(), StaticUtils.getExceptionMessage(t));
+
+ updateErrorPane(errorPane,
+ ERR_ERROR_SEARCHING_BACKUPS_SUMMARY.get(),
+ ColorAndFontConstants.errorTitleFont,
+ details,
+ errorPane.getFont());
+ packParentDialog();
+ }
+ errorPane.setVisible(displayError);
+
+ if (!displayError)
+ {
+ // This is done to perform checks against whether we require to
+ // display an error message or not.
+ configurationChanged(new ConfigurationChangeEvent(null,
+ getInfo().getServerDescriptor()));
+ }
+
+ lRefreshingList.setText(NO_BACKUPS_FOUND.toString());
+ }
+ refreshList.setEnabled(refreshEnabled);
+ verifyBackup.setEnabled(getSelectedBackup() != null);
+ if ((lastSelectedRow != -1) &&
+ (lastSelectedRow < backupList.getRowCount()))
+ {
+ backupList.setRowSelectionInterval(lastSelectedRow, lastSelectedRow);
+ }
+ else if (backupList.getRowCount() > 0)
+ {
+ backupList.setRowSelectionInterval(0, 0);
+ }
+ }
+ };
+ worker.startBackgroundTask();
+ }
+
+ /**
+ * Creates a list with backup descriptor. This is done simply to have a good
+ * initial size for the table.
+ * @return a list with bogus backup descriptors.
+ */
+ private ArrayList<BackupDescriptor> createDummyBackupList()
+ {
+ ArrayList<BackupDescriptor> list = new ArrayList<BackupDescriptor>();
+ list.add(new BackupDescriptor(
+ new File("/local/OpenDS-0.9.0/bak/200704201567Z"),
+ new GregorianCalendar(2007, 5, 20, 8, 10).getTime(),
+ BackupDescriptor.Type.FULL, "id"));
+ list.add(new BackupDescriptor(
+ new File("/local/OpenDS-0.9.0/bak/200704201567Z"),
+ new GregorianCalendar(2007, 5, 22, 8, 10).getTime(),
+ BackupDescriptor.Type.INCREMENTAL, "id"));
+ list.add(new BackupDescriptor(
+ new File("/local/OpenDS-0.9.0/bak/200704221567Z"),
+ new GregorianCalendar(2007, 5, 25, 8, 10).getTime(),
+ BackupDescriptor.Type.INCREMENTAL, "id"));
+ return list;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ ServerDescriptor desc = ev.getNewDescriptor();
+
+ if (!backupDirectoryInitialized &&
+ (parentDirectory.getText().length() == 0))
+ {
+ final String path = new File(desc.getInstallPath(),
+ org.opends.quicksetup.Installation.BACKUPS_PATH_RELATIVE).
+ getAbsolutePath();
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ parentDirectory.setText(path);
+ refreshList();
+ backupDirectoryInitialized = true;
+ }
+ });
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ if (visible && backupDirectoryInitialized)
+ {
+ refreshList();
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java
new file mode 100644
index 0000000..fe871a8
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java
@@ -0,0 +1,748 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.swing.ButtonGroup;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackupDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.tools.BackUpDB;
+import org.opends.server.types.BackupDirectory;
+import org.opends.server.types.BackupInfo;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * The panel that appears when the user clicks on 'Backup...'.
+ *
+ */
+public class BackupPanel extends BackupListPanel
+{
+ private static final long serialVersionUID = -1626301350756394814L;
+ private JComboBox backends;
+ private JCheckBox allBackends;
+ private JTextField backupID;
+ private JRadioButton fullBackup;
+ private JRadioButton incrementalBackup;
+ private JCheckBox compressData;
+ private JCheckBox encryptData;
+ private JCheckBox generateMessageDigest;
+ private JCheckBox signMessageDigest;
+
+ private JLabel lBackend;
+ private JLabel lNoBackendsFound;
+ private JLabel lBackupID;
+ private JLabel lBackupType;
+ private JLabel lBackupOptions;
+
+ private ChangeListener changeListener;
+
+ private static final Logger LOG =
+ Logger.getLogger(BackupPanel.class.getName());
+
+ /**
+ * Default constructor.
+ *
+ */
+ public BackupPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_BACKUP_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return backupID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void verifyBackupClicked()
+ {
+ // Nothing to do: the button is not visible.
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ *
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 3;
+ addErrorPane(gbc);
+
+ gbc.weightx = 0.0;
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.NONE;
+ lBackend = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_BACKEND_LABEL.get());
+ add(lBackend, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ JPanel auxPanel = new JPanel(new GridBagLayout());
+ add(auxPanel, gbc);
+ auxPanel.setOpaque(false);
+ GridBagConstraints gbc2 = new GridBagConstraints();
+ backends = Utilities.createComboBox();
+ backends.setModel(new DefaultComboBoxModel(new String[]{}));
+ auxPanel.add(backends, gbc2);
+ lNoBackendsFound = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NO_BACKENDS_FOUND_LABEL.get());
+ add(lNoBackendsFound, gbc);
+ lNoBackendsFound.setVisible(false);
+ gbc2.insets.left = 10;
+ allBackends = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_BACKUP_ALL_BACKENDS_LABEL.get());
+ auxPanel.add(allBackends, gbc2);
+
+ gbc.insets.top = 10;
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.gridwidth = 1;
+ lBackupType = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_BACKUP_TYPE_LABEL.get());
+ add(lBackupType, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ fullBackup = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_FULL_BACKUP_LABEL.get());
+ add(fullBackup, gbc);
+
+ gbc.gridy ++;
+ gbc.insets.top = 5;
+ incrementalBackup = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_INCREMENTAL_BACKUP_LABEL.get());
+ add(incrementalBackup, gbc);
+
+ ButtonGroup group = new ButtonGroup();
+ group.add(fullBackup);
+ group.add(incrementalBackup);
+ fullBackup.setSelected(true);
+
+ gbc.insets.top = 10;
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.gridwidth = 1;
+ lBackupID = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_BACKUP_ID_LABEL.get());
+ add(lBackupID, gbc);
+ backupID = Utilities.createMediumTextField();
+ gbc.weightx = 0.0;
+ gbc.gridx ++;
+ gbc.insets.left = 10;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.gridwidth = 2;
+ add(backupID, gbc);
+
+ gbc.insets.top = 10;
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ super.createLayout(gbc);
+ verifyBackup.setVisible(false);
+ lAvailableBackups.setText(
+ INFO_CTRL_PANEL_AVAILABLE_PARENT_BACKUPS_LABEL.get().toString());
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ gbc.anchor = GridBagConstraints.WEST;
+ lBackupOptions = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_BACKUP_OPTIONS_LABEL.get());
+ add(lBackupOptions, gbc);
+
+ compressData = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_COMPRESS_DATA_LABEL.get());
+ compressData.setSelected(false);
+
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ add(compressData, gbc);
+
+ encryptData = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_ENCRYPT_DATA_LABEL.get());
+
+ gbc.gridy ++;
+ gbc.insets.top = 5;
+ add(encryptData, gbc);
+ encryptData.setSelected(false);
+ generateMessageDigest = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_GENERATE_MESSAGE_DIGEST_LABEL.get());
+
+ gbc.gridy ++;
+ add(generateMessageDigest, gbc);
+
+ signMessageDigest = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_SIGN_MESSAGE_DIGEST_HASH_LABEL.get());
+ gbc.insets.left = 30;
+ gbc.gridy ++;
+ add(signMessageDigest, gbc);
+ generateMessageDigest.setSelected(false);
+
+ changeListener = new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent ev)
+ {
+ backends.setEnabled(!allBackends.isSelected());
+ signMessageDigest.setEnabled(generateMessageDigest.isSelected());
+ boolean enable = incrementalBackup.isSelected();
+ refreshList.setEnabled(enable);
+ tableScroll.setEnabled(enable);
+ backupList.setEnabled(enable);
+ }
+ };
+ incrementalBackup.addChangeListener(changeListener);
+ generateMessageDigest.addChangeListener(changeListener);
+ allBackends.addChangeListener(changeListener);
+ changeListener.stateChanged(null);
+
+ addBottomGlue(gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ ServerDescriptor desc = ev.getNewDescriptor();
+ updateSimpleBackendComboBoxModel(backends, lNoBackendsFound, desc);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ if (!backupDirectoryInitialized)
+ {
+ SimpleDateFormat dateFormat = new SimpleDateFormat(
+ ServerConstants.DATE_FORMAT_COMPACT_LOCAL_TIME);
+ final String id = dateFormat.format(new Date());
+ backupID.setText(id);
+ }
+ allBackends.setVisible(backends.getModel().getSize() > 0);
+ }
+ });
+ super.configurationChanged(ev);
+ updateErrorPaneAndOKButtonIfAuthRequired(getInfo().getServerDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_BACKUP.get());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ setPrimaryValid(lBackend);
+ setPrimaryValid(lPath);
+ setPrimaryValid(lAvailableBackups);
+
+ final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+
+ if (!allBackends.isSelected())
+ {
+ String backendName = (String)backends.getSelectedItem();
+ if (backendName == null)
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BACKENDS_SELECTED.get());
+ setPrimaryInvalid(lBackend);
+ }
+ }
+ else
+ {
+ if (backends.getModel().getSize() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BACKENDS_AVAILABLE.get());
+ setPrimaryInvalid(lBackend);
+ }
+ }
+
+ String parentPath = parentDirectory.getText();
+ if ((parentPath == null) || (parentPath.trim().equals("")))
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BACKUP_PATH_PROVIDED.get());
+ setPrimaryInvalid(lPath);
+ }
+ else
+ {
+ File f = new File(parentPath);
+ if (f.isFile())
+ {
+ errors.add(ERR_CTRL_PANEL_BACKUP_PATH_IS_A_FILE.get(parentPath));
+ setPrimaryInvalid(lPath);
+ }
+ else if (!f.exists())
+ {
+ errors.add(ERR_CTRL_PANEL_BACKUP_PATH_DOES_NOT_EXIST.get(parentPath));
+ setPrimaryInvalid(lPath);
+ }
+ }
+ String dir = backupID.getText();
+ if ((dir == null) || (dir.trim().equals("")))
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BACKUP_ID_PROVIDED.get());
+ setPrimaryInvalid(lBackupID);
+ }
+
+ if (errors.isEmpty())
+ {
+ File f = new File(parentPath, dir);
+ if (f.isFile())
+ {
+ errors.add(ERR_CTRL_PANEL_BACKUP_PATH_EXISTS.get(
+ f.getAbsolutePath()));
+ setPrimaryInvalid(lPath);
+ }
+ }
+
+ if (incrementalBackup.isSelected())
+ {
+ boolean selected = backupList.isVisible() &&
+ (getSelectedBackup() != null);
+ if (!selected)
+ {
+ errors.add(ERR_CTRL_PANEL_NO_PARENT_BACKUP_SELECTED.get());
+ setPrimaryInvalid(lAvailableBackups);
+ }
+ }
+
+ // Check that there is not a backup with the provided ID
+ final JComponent[] components =
+ {
+ backends, allBackends, fullBackup, incrementalBackup, parentDirectory,
+ browse, backupList, refreshList, compressData, encryptData,
+ generateMessageDigest, signMessageDigest
+ };
+ setEnabledOK(false);
+ setEnabledCancel(false);
+ for (int i=0; i<components.length; i++)
+ {
+ components[i].setEnabled(false);
+ }
+ final String id = backupID.getText();
+ final String path = parentDirectory.getText();
+ BackgroundTask<Void> worker = new BackgroundTask<Void>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public Void processBackgroundTask() throws Throwable
+ {
+ // Open the backup directory and make sure it is valid.
+ LinkedHashSet<BackupInfo> backups = new LinkedHashSet<BackupInfo>();
+ try
+ {
+ BackupDirectory backupDir =
+ BackupDirectory.readBackupDirectoryDescriptor(path);
+ backups.addAll(backupDir.getBackups().values());
+ }
+ catch (Throwable t)
+ {
+ // Check the subdirectories
+ File f = new File(path);
+
+ if (f.isDirectory())
+ {
+ File[] children = f.listFiles();
+ for (int i=0; i<children.length; i++)
+ {
+ if (children[i].isDirectory())
+ {
+ try
+ {
+ BackupDirectory backupDir =
+ BackupDirectory.readBackupDirectoryDescriptor(
+ children[i].getAbsolutePath());
+
+ backups.addAll(backupDir.getBackups().values());
+ }
+ catch (Throwable t2)
+ {
+ if (!children[i].getName().equals("tasks"))
+ {
+ LOG.log(Level.WARNING, "Error searching backup: "+t2, t2);
+ }
+ }
+ }
+ }
+ }
+ }
+ for (BackupInfo backup : backups)
+ {
+ if (backup.getBackupID().equalsIgnoreCase(id))
+ {
+ errors.add(ERR_CTRL_PANEL_BACKUP_ID_ALREADY_EXIST.get(id, path));
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ setPrimaryInvalid(lBackupID);
+ }
+ });
+ break;
+ }
+ }
+ return null;
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(Void returnValue,
+ Throwable t)
+ {
+ for (int i=0; i<components.length; i++)
+ {
+ components[i].setEnabled(true);
+ }
+ setEnabledOK(true);
+ setEnabledCancel(true);
+ changeListener.stateChanged(null);
+ if (errors.isEmpty())
+ {
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(BackupPanel.this), getTitle(),
+ getInfo());
+ BackupTask newTask = new BackupTask(getInfo(), progressDialog);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ Message initMsg;
+ if (allBackends.isSelected())
+ {
+ initMsg = INFO_CTRL_PANEL_RUN_BACKUP_ALL_BACKENDS.get();
+ }
+ else
+ {
+ initMsg = INFO_CTRL_PANEL_RUN_BACKUP_SUMMARY.get(
+ backends.getSelectedItem().toString());
+ }
+ launchOperation(newTask,
+ initMsg,
+ INFO_CTRL_PANEL_RUN_BACKUP_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_RUN_BACKUP_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_RUN_BACKUP_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_RUN_BACKUP_ERROR_DETAILS,
+ progressDialog);
+ progressDialog.setVisible(true);
+ Utilities.getParentDialog(BackupPanel.this).setVisible(false);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+ };
+ if (errors.isEmpty())
+ {
+ worker.startBackgroundTask();
+ }
+ else
+ {
+ worker.backgroundTaskCompleted(null, null);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(lBackend);
+ setPrimaryValid(lPath);
+ setPrimaryValid(lAvailableBackups);
+
+ super.cancelClicked();
+ }
+
+ /**
+ * Class that launches the backup.
+ *
+ */
+ protected class BackupTask extends Task
+ {
+ private Set<String> backendSet;
+ private String dir;
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public BackupTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ if (!allBackends.isSelected())
+ {
+ backendSet.add((String)backends.getSelectedItem());
+ }
+ else
+ {
+ for (BackendDescriptor backend :
+ info.getServerDescriptor().getBackends())
+ {
+ if (!backend.isConfigBackend())
+ {
+ backendSet.add(backend.getBackendID());
+ }
+ }
+ }
+ dir = parentDirectory.getText();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.BACKUP;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_BACKUP_TASK_DESCRIPTION.get(
+ Utilities.getStringFromCollection(backendSet, ", "), dir);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+ try
+ {
+ ArrayList<String> arguments = getCommandLineArguments();
+
+ String[] args = new String[arguments.size()];
+
+ arguments.toArray(args);
+ if (isServerRunning())
+ {
+ returnCode = BackUpDB.mainBackUpDB(args, false, outPrintStream,
+ errorPrintStream);
+ }
+ else
+ {
+ returnCode = executeCommandLine(getCommandLinePath(), args);
+ }
+ if (returnCode != 0)
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ getInfo().backupCreated(
+ new BackupDescriptor(
+ new File(parentDirectory.getText()),
+ new Date(),
+ fullBackup.isSelected() ? BackupDescriptor.Type.FULL :
+ BackupDescriptor.Type.INCREMENTAL,
+ backupID.getText()));
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+
+ args.add("--backupDirectory");
+ args.add(dir);
+
+ args.add("--backupID");
+ args.add(backupID.getText());
+
+ if (allBackends.isSelected())
+ {
+ args.add("--backUpAll");
+ }
+ else
+ {
+ args.add("--backendID");
+ args.add((String)backends.getSelectedItem());
+ }
+
+ if (incrementalBackup.isSelected())
+ {
+ args.add("--incremental");
+ BackupDescriptor backup = getSelectedBackup();
+ args.add("--incrementalBaseID");
+ args.add(backup.getID());
+ }
+
+
+ if (compressData.isSelected())
+ {
+ args.add("--compress");
+ }
+
+ if (encryptData.isSelected())
+ {
+ args.add("--encrypt");
+ }
+
+ if (generateMessageDigest.isSelected())
+ {
+ args.add("--hash");
+ if (signMessageDigest.isSelected())
+ {
+ args.add("--signHash");
+ }
+ }
+
+ args.addAll(getConnectionCommandLineArguments());
+
+ if (isServerRunning())
+ {
+ args.addAll(getConfigCommandLineArguments());
+ }
+
+ return args;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return getCommandLinePath("backup");
+ }
+ };
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BaseDNPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
new file mode 100644
index 0000000..a6da215
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
@@ -0,0 +1,187 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.util.LinkedHashSet;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.DN;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * A simple dialog where the user can provide a base DN.
+ *
+ */
+public class BaseDNPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 2742173517231794830L;
+ private JTextField dn;
+ private JLabel dnLabel;
+ private String baseDn;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public BaseDNPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_OTHER_BASE_DN_TITLE.get();
+ }
+
+ /**
+ * Returns the base DN chosen by the user.
+ * @return the base DN chosen by the user.
+ */
+ public String getBaseDn()
+ {
+ return baseDn;
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+
+ gbc.weightx = 0.0;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.NONE;
+ dnLabel = Utilities.createPrimaryLabel(INFO_CTRL_PANEL_BASE_DN_LABEL.get());
+ add(dnLabel, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ dn = Utilities.createLongTextField();
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(dn, gbc);
+
+ addBottomGlue(gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return dn;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ setPrimaryValid(dnLabel);
+ LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+
+ if ("".equals(dn.getText().trim()))
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BASE_DN_PROVIDED.get());
+ }
+ else
+ {
+ try
+ {
+ DN.decode(dn.getText());
+ }
+ catch (OpenDsException ode)
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_BASE_DN_PROVIDED.get(
+ ode.getMessageObject().toString()));
+ }
+ }
+
+ if (errors.size() > 0)
+ {
+ setPrimaryInvalid(dnLabel);
+ }
+ if (errors.isEmpty())
+ {
+ baseDn = dn.getText().trim();
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ dn.setSelectionStart(0);
+ dn.setSelectionEnd(dn.getText().length());
+ dn.requestFocusInWindow();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(dnLabel);
+ baseDn = null;
+ super.cancelClicked();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ super.toBeDisplayed(visible);
+ if (visible)
+ {
+ baseDn = null;
+ }
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
new file mode 100644
index 0000000..ec4c32a
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
@@ -0,0 +1,725 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+import javax.swing.text.JTextComponent;
+
+import org.opends.guitools.controlpanel.datamodel.BinaryValue;
+import org.opends.guitools.controlpanel.event.BrowseActionListener;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.Schema;
+
+/**
+ * Panel that is displayed in the dialog where the user can specify the value
+ * of a binary attribute.
+ *
+ */
+public class BinaryAttributeEditorPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = -877248486446244170L;
+ private JRadioButton useFile;
+ private JRadioButton useBase64;
+ private JTextField file;
+ private JButton browse;
+ private JLabel lFile;
+ private JTextField base64;
+ private JLabel imagePreview;
+ private JButton refreshButton;
+ private JLabel lImage = Utilities.createDefaultLabel();
+ private JLabel attrName;
+
+ private BinaryValue value;
+
+ private boolean valueChanged;
+
+ 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());
+
+ /**
+ * Default constructor.
+ *
+ */
+ public BinaryAttributeEditorPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * Sets the value to be displayed in the panel.
+ * @param attrName the attribute name.
+ * @param value the binary value.
+ */
+ public void setValue(final String attrName,
+ final BinaryValue value)
+ {
+ final boolean launchBackground = this.value != value;
+// Read the file or encode the base 64 content.
+ BackgroundTask<Void> worker = new BackgroundTask<Void>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public Void processBackgroundTask() throws Throwable
+ {
+ try
+ {
+ Thread.sleep(1000);
+ }
+ catch (Throwable t)
+ {
+ }
+ valueChanged = false;
+ BinaryAttributeEditorPanel.this.attrName.setText(attrName);
+ if (hasImageSyntax(attrName))
+ {
+ if (value != null)
+ {
+ BinaryAttributeEditorPanel.updateImage(lImage, value.getBytes());
+ }
+ else
+ {
+ lImage.setIcon(null);
+ lImage.setText(
+ INFO_CTRL_PANEL_NO_VALUE_SPECIFIED.get().toString());
+ }
+ setImageVisible(true);
+ useFile.setSelected(true);
+ base64.setText("");
+ }
+ else
+ {
+ lImage.setIcon(null);
+ lImage.setText("");
+ setImageVisible(false);
+
+ if (value != null)
+ {
+ BinaryAttributeEditorPanel.updateBase64(base64, value.getBytes());
+ }
+ }
+
+ if (value != null)
+ {
+ if (value.getType() == BinaryValue.Type.BASE64_STRING)
+ {
+ file.setText("");
+ }
+ else
+ {
+ file.setText(value.getFile().getAbsolutePath());
+ useFile.setSelected(true);
+ }
+ }
+ else
+ {
+ base64.setText("");
+ file.setText("");
+ useFile.setSelected(true);
+ }
+
+ BinaryAttributeEditorPanel.this.value = value;
+
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(Void returnValue,
+ Throwable t)
+ {
+ setPrimaryValid(useFile);
+ setPrimaryValid(useBase64);
+ BinaryAttributeEditorPanel.this.attrName.setText(attrName);
+ setEnabledOK(true);
+ displayMainPanel();
+ updateEnabling();
+ packParentDialog();
+ if (t != null)
+ {
+ LOG.log(Level.WARNING, "Error reading binary contents: "+t, t);
+ }
+ }
+ };
+ if (launchBackground)
+ {
+ setEnabledOK(false);
+ displayMessage(INFO_CTRL_PANEL_READING_SUMMARY.get());
+ worker.startBackgroundTask();
+ }
+ else
+ {
+ setPrimaryValid(lFile);
+ setPrimaryValid(useFile);
+ setPrimaryValid(useBase64);
+ BinaryAttributeEditorPanel.this.attrName.setText(attrName);
+ setEnabledOK(true);
+ boolean isImage = hasImageSyntax(attrName);
+ setImageVisible(isImage);
+ if (value == null)
+ {
+ if (isImage)
+ {
+ useFile.setSelected(true);
+ }
+ else
+ {
+ useBase64.setSelected(true);
+ }
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return file;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ valueChanged = false;
+ super.cancelClicked();
+ }
+
+ /**
+ * Returns the binary value displayed in the panel.
+ * @return the binary value displayed in the panel.
+ */
+ public BinaryValue getBinaryValue()
+ {
+ return value;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ refresh(true, false);
+ }
+
+ /**
+ * Refresh the contents in the panel.
+ * @param closeAndUpdateValue whether the dialog must be closed and the value
+ * updated at the end of the method or not.
+ * @param updateImage whether the displayed image must be updated or not.
+ */
+ private void refresh(final boolean closeAndUpdateValue,
+ final boolean updateImage)
+ {
+ final ArrayList<Message> errors = new ArrayList<Message>();
+
+ setPrimaryValid(useFile);
+ setPrimaryValid(useBase64);
+
+ final BinaryValue oldValue = value;
+
+ if (closeAndUpdateValue)
+ {
+ value = null;
+ }
+
+ if (useFile.isSelected())
+ {
+ String f = file.getText();
+ if (f.trim().length() == 0)
+ {
+ if (hasImageSyntax(attrName.getText()) && (oldValue != null) &&
+ !updateImage)
+ {
+ // Do nothing. We do not want to regenerate the image and we
+ // are on the case where the user simply did not change the image.
+ }
+ else
+ {
+ errors.add(ERR_CTRL_PANEL_FILE_NOT_PROVIDED.get());
+ setPrimaryInvalid(useFile);
+ setPrimaryInvalid(lFile);
+ }
+ }
+ else
+ {
+ File theFile = new File(f);
+ if (!theFile.exists())
+ {
+ errors.add(ERR_CTRL_PANEL_FILE_DOES_NOT_EXIST.get(f));
+ setPrimaryInvalid(useFile);
+ setPrimaryInvalid(lFile);
+ }
+ else if (theFile.isDirectory())
+ {
+ errors.add(ERR_CTRL_PANEL_PATH_IS_A_DIRECTORY.get(f));
+ setPrimaryInvalid(useFile);
+ setPrimaryInvalid(lFile);
+ }
+ else if (!theFile.canRead())
+ {
+ errors.add(ERR_CTRL_PANEL_CANNOT_READ_FILE.get(f));
+ setPrimaryInvalid(useFile);
+ setPrimaryInvalid(lFile);
+ }
+ }
+ }
+ else
+ {
+ String b = base64.getText();
+ if (b.length() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_VALUE_IN_BASE_64_REQUIRED.get());
+ setPrimaryInvalid(useBase64);
+ }
+ }
+ if (errors.size() == 0)
+ {
+ // Read the file or encode the base 64 content.
+ BackgroundTask<BinaryValue> worker = new BackgroundTask<BinaryValue>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public BinaryValue processBackgroundTask() throws Throwable
+ {
+ try
+ {
+ Thread.sleep(1000);
+ }
+ catch (Throwable t)
+ {
+ }
+ BinaryValue returnValue;
+ if (useBase64.isSelected())
+ {
+ returnValue = BinaryValue.createBase64(base64.getText());
+ }
+ else if (file.getText().trim().length() > 0)
+ {
+ File f = new File(file.getText());
+ FileInputStream in = null;
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ byte[] bytes = new byte[2 * 1024];
+ try
+ {
+ in = new FileInputStream(f);
+ boolean done = false;
+ while (!done)
+ {
+ int len = in.read(bytes);
+ if (len == -1)
+ {
+ done = true;
+ }
+ else
+ {
+ out.write(bytes, 0, len);
+ }
+ }
+ returnValue = BinaryValue.createFromFile(out.toByteArray(), f);
+ }
+ finally
+ {
+ if (in != null)
+ {
+ in.close();
+ }
+ out.close();
+ }
+ }
+ else
+ {
+ // We do not want to regenerate the image and we
+ // are on the case where the user simply did not change the image.
+ returnValue = oldValue;
+ }
+ if (closeAndUpdateValue)
+ {
+ valueChanged = !returnValue.equals(oldValue);
+ }
+ if (updateImage)
+ {
+ updateImage(lImage, returnValue.getBytes());
+ }
+ return returnValue;
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(BinaryValue returnValue,
+ Throwable t)
+ {
+ setEnabledOK(true);
+ displayMainPanel();
+ if (closeAndUpdateValue)
+ {
+ value = returnValue;
+ }
+ else
+ {
+ packParentDialog();
+ }
+ if (t != null)
+ {
+ if (useFile.isSelected())
+ {
+ errors.add(ERR_CTRL_PANEL_ERROR_READING_FILE.get(t.toString()));
+ }
+ else
+ {
+ errors.add(
+ ERR_CTRL_PANEL_ERROR_DECODING_BASE_64.get(t.toString()));
+ }
+ displayErrorDialog(errors);
+ }
+ else
+ {
+ if (closeAndUpdateValue)
+ {
+ Utilities.getParentDialog(BinaryAttributeEditorPanel.this).
+ setVisible(false);
+ }
+ }
+ }
+ };
+ setEnabledOK(false);
+ displayMessage(INFO_CTRL_PANEL_READING_SUMMARY.get());
+ worker.startBackgroundTask();
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_EDIT_BINARY_ATTRIBUTE_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean valueChanged()
+ {
+ return valueChanged;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return true;
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+
+ gbc.gridwidth = 1;
+ JLabel l = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_NAME_LABEL.get());
+ add(l, gbc);
+ gbc.gridx ++;
+ gbc.insets.left = 10;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.WEST;
+ attrName = Utilities.createDefaultLabel();
+ gbc.gridwidth = 2;
+ add(attrName, gbc);
+
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ useFile = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_USE_CONTENTS_OF_FILE.get());
+ lFile = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_USE_CONTENTS_OF_FILE.get());
+ useFile.setFont(ColorAndFontConstants.primaryFont);
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ add(useFile, gbc);
+ add(lFile, gbc);
+ gbc.gridx ++;
+ file = Utilities.createLongTextField();
+ gbc.weightx = 1.0;
+ gbc.insets.left = 10;
+ add(file, gbc);
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ browse = Utilities.createButton(INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ browse.addActionListener(
+ new CustomBrowseActionListener(file,
+ BrowseActionListener.BrowseType.OPEN_GENERIC_FILE, this));
+ browse.setOpaque(false);
+ add(browse, gbc);
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.insets.left = 0;
+ gbc.gridwidth = 3;
+ useBase64 = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE_64.get());
+ useBase64.setFont(ColorAndFontConstants.primaryFont);
+ add(useBase64, gbc);
+
+ gbc.gridy ++;
+ gbc.insets.left = 30;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ base64 = Utilities.createLongTextField();
+ add(base64, gbc);
+
+ imagePreview =
+ Utilities.createPrimaryLabel(INFO_CTRL_PANEL_IMAGE_PREVIEW_LABEL.get());
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ add(imagePreview, gbc);
+
+ refreshButton = Utilities.createButton(
+ INFO_CTRL_PANEL_REFRESH_BUTTON_LABEL.get());
+ gbc.gridx ++;
+ gbc.insets.left = 5;
+ gbc.fill = GridBagConstraints.NONE;
+ add(refreshButton, gbc);
+ gbc.insets.left = 0;
+ gbc.weightx = 1.0;
+ add(Box.createHorizontalGlue(), gbc);
+ refreshButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ refreshButtonClicked();
+ }
+ });
+
+ gbc.gridy ++;
+ gbc.gridwidth = 3;
+ gbc.insets.top = 5;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ add(lImage, gbc);
+
+ addBottomGlue(gbc);
+ ButtonGroup group = new ButtonGroup();
+ group.add(useFile);
+ group.add(useBase64);
+
+ ActionListener listener = new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ updateEnabling();
+ }
+ };
+ useFile.addActionListener(listener);
+ useBase64.addActionListener(listener);
+ }
+
+ /**
+ * Updates the enabling state of all the components in the panel.
+ *
+ */
+ private void updateEnabling()
+ {
+ base64.setEnabled(useBase64.isSelected());
+ file.setEnabled(useFile.isSelected());
+ browse.setEnabled(useFile.isSelected());
+ refreshButton.setEnabled(useFile.isSelected());
+ }
+
+ /**
+ * Updates the provided component with the base 64 representation of the
+ * provided binary array.
+ * @param base64 the text component to be updated.
+ * @param bytes the byte array.
+ */
+ static void updateBase64(JTextComponent base64, byte[] bytes)
+ {
+ if (bytes.length < MAX_BASE64_TO_DISPLAY)
+ {
+ BinaryValue value = BinaryValue.createBase64(bytes);
+ base64.setText(value.getBase64());
+ }
+ else
+ {
+ base64.setText(
+ INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE_64.get().toString());
+ }
+ }
+
+ /**
+ * Updates a label, by displaying the image in the provided byte array.
+ * @param lImage the label to be updated.
+ * @param bytes the array of bytes containing the image.
+ */
+ static void updateImage(JLabel lImage, byte[] bytes)
+ {
+ Icon icon = Utilities.createImageIcon(bytes,
+ BinaryAttributeEditorPanel.MAX_IMAGE_HEIGHT,
+ INFO_CTRL_PANEL_IMAGE_OF_ATTRIBUTE_LABEL.get(), false);
+ if (icon.getIconHeight() > 0)
+ {
+ lImage.setIcon(icon);
+ lImage.setText("");
+ }
+ else
+ {
+ Utilities.setWarningLabel(lImage,
+ INFO_CTRL_PANEL_PREVIEW_NOT_AVAILABLE_LABEL.get());
+ }
+ }
+
+ /**
+ * Updates the visibility of the components depending on whether the image
+ * must be made visible or not.
+ * @param visible whether the image must be visible or not.
+ */
+ private void setImageVisible(boolean visible)
+ {
+ imagePreview.setVisible(visible);
+ refreshButton.setVisible(visible);
+ lFile.setVisible(visible);
+ useFile.setVisible(!visible);
+ useBase64.setVisible(!visible);
+ base64.setVisible(!visible);
+ lImage.setVisible(visible);
+ }
+
+ /**
+ * Class used to refresh automatically the contents in the panel after the
+ * user provides a path value through the JFileChooser associated with the
+ * browse button.
+ *
+ */
+ class CustomBrowseActionListener extends BrowseActionListener
+ {
+ /**
+ * Constructor of this listener.
+ * @param field the text field.
+ * @param type the type of browsing (file, directory, etc.)
+ * @param parent the parent component to be used as reference to display
+ * the file chooser dialog.
+ */
+ public CustomBrowseActionListener(JTextComponent field, BrowseType type,
+ Component parent)
+ {
+ super(field, type, parent);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void fieldUpdated()
+ {
+ super.fieldUpdated();
+ if (refreshButton.isVisible())
+ {
+ // The file field is updated, if refreshButton is visible it means
+ // that we can have a preview.
+ refreshButtonClicked();
+ }
+ }
+ }
+
+ /**
+ * Called when the refresh button is clicked by the user.
+ *
+ */
+ private void refreshButtonClicked()
+ {
+ refresh(false, true);
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the attribute has an image syntax and
+ * <CODE>false</CODE> otherwise.
+ * @param attrName the attribute name.
+ * @return <CODE>true</CODE> if the attribute has an image syntax and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean hasImageSyntax(String attrName)
+ {
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ return Utilities.hasImageSyntax(attrName, schema);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
new file mode 100644
index 0000000..ade878b
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
@@ -0,0 +1,245 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.swing.Box;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.Schema;
+
+/**
+ * The panel used to display a binary value.
+ *
+ */
+public class BinaryValuePanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 2536360199438858665L;
+ private JLabel lBase64;
+ private JTextField base64;
+ private JLabel attrName;
+ private JLabel imagePreview;
+ private JLabel lImage = Utilities.createDefaultLabel();
+ private byte[] lastBytes;
+
+ private static final Logger LOG =
+ Logger.getLogger(BinaryValuePanel.class.getName());
+
+ /**
+ * Default constructor.
+ *
+ */
+ public BinaryValuePanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * Sets the value to be displayed in the panel.
+ * @param attr the attribute name.
+ * @param bytes the binary value.
+ */
+ public void setValue(final String attr, final byte[] bytes)
+ {
+ final boolean launchBackground = lastBytes != bytes;
+ lastBytes = bytes;
+ BackgroundTask<Void> worker = new BackgroundTask<Void>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public Void processBackgroundTask() throws Throwable
+ {
+ try
+ {
+ Thread.sleep(1000);
+ }
+ catch (Throwable t)
+ {
+ }
+ attrName.setText(attr);
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (Utilities.hasImageSyntax(attr, schema))
+ {
+ BinaryAttributeEditorPanel.updateImage(lImage, bytes);
+ lBase64.setVisible(false);
+ base64.setVisible(false);
+ imagePreview.setVisible(true);
+ }
+ else
+ {
+ lImage.setIcon(null);
+ lImage.setText("");
+ imagePreview.setVisible(false);
+ lBase64.setVisible(true);
+ base64.setVisible(true);
+ BinaryAttributeEditorPanel.updateBase64(base64, bytes);
+ }
+ return null;
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(Void returnValue,
+ Throwable t)
+ {
+ displayMainPanel();
+ packParentDialog();
+ if (t != null)
+ {
+ LOG.log(Level.WARNING, "Error reading binary contents: "+t, t);
+ }
+ }
+ };
+ if (launchBackground)
+ {
+ /**
+ * {@inheritDoc}
+ */
+ displayMessage(INFO_CTRL_PANEL_READING_SUMMARY.get());
+ worker.startBackgroundTask();
+ }
+ else
+ {
+ attrName.setText(attr);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return base64;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.CLOSE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ // No OK Button
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_VIEW_BINARY_ATTRIBUTE_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ *
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridy = 0;
+ gbc.gridx = 0;
+
+ JLabel l = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_NAME_LABEL.get());
+ add(l, gbc);
+ gbc.gridx ++;
+ gbc.insets.left = 10;
+ gbc.fill = GridBagConstraints.NONE;
+ attrName = Utilities.createDefaultLabel();
+ add(attrName, gbc);
+ gbc.gridx ++;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets.left = 0;
+ gbc.weightx = 1.0;
+ add(Box.createHorizontalGlue(), gbc);
+
+ gbc.gridwidth = 3;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ lBase64 = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_VALUE_IN_BASE_64_LABEL.get());
+ add(lBase64, gbc);
+
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ base64 = Utilities.createLongTextField();
+ add(base64, gbc);
+
+ imagePreview = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_IMAGE_PREVIEW_LABEL.get());
+ gbc.gridy ++;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ add(imagePreview, gbc);
+ gbc.gridy ++;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.insets.top = 5;
+ add(lImage, gbc);
+
+ addBottomGlue(gbc);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
new file mode 100644
index 0000000..935bf73
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
@@ -0,0 +1,1363 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DragGestureEvent;
+import java.awt.dnd.DragGestureListener;
+import java.awt.dnd.DragSource;
+import java.awt.dnd.DragSourceContext;
+import java.awt.dnd.DragSourceDragEvent;
+import java.awt.dnd.DragSourceDropEvent;
+import java.awt.dnd.DragSourceEvent;
+import java.awt.dnd.DragSourceListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.ButtonGroup;
+import javax.swing.JComponent;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.JSplitPane;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.EntryReadErrorEvent;
+import org.opends.guitools.controlpanel.task.DeleteEntryTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.components.CustomTree;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
+import org.opends.guitools.controlpanel.ui.nodes.DndBrowserNodes;
+import org.opends.guitools.controlpanel.util.LDAPEntryReader;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.DN;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.Schema;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * The pane that is displayed when the user clicks on 'Browse Entries...'.
+ * It contains its own menu bar with all the actions to edit the entries.
+ *
+ */
+public class BrowseEntriesPanel extends AbstractBrowseEntriesPanel
+{
+ private static final long serialVersionUID = 1308129251140541645L;
+
+ private BrowseMenuBar menuBar;
+
+ private JPopupMenu popup;
+ private JMenuItem popupDeleteMenuItem;
+ private JMenuItem popupCopyDNMenuItem;
+ private JMenuItem popupAddToGroupMenuItem;
+ private JMenuItem popupNewEntryFromLDIFMenuItem;
+ private JMenuItem popupNewUserMenuItem;
+ private JMenuItem popupNewGroupMenuItem;
+ private JMenuItem popupNewOUMenuItem;
+ private JMenuItem popupNewOrganizationMenuItem;
+ private JMenuItem popupNewDomainMenuItem;
+ private JMenuItem popupResetUserPasswordMenuItem;
+
+ private LDAPEntryPanel entryPane;
+
+ private GenericDialog resetUserPasswordDlg;
+ private ResetUserPasswordPanel resetUserPasswordPanel;
+
+ private GenericDialog addToGroupDlg;
+ private AddToGroupPanel addToGroupPanel;
+
+ private GenericDialog deleteBaseDNDlg;
+ private GenericDialog deleteBackendDlg;
+
+ private GenericDialog newUserDlg;
+ private NewUserPanel newUserPanel;
+
+ private GenericDialog newGroupDlg;
+ private NewGroupPanel newGroupPanel;
+
+ private GenericDialog newOUDlg;
+ private NewOrganizationalUnitPanel newOUPanel;
+
+ private GenericDialog newOrganizationDlg;
+ private NewOrganizationPanel newOrganizationPanel;
+
+ private GenericDialog newDomainDlg;
+ private NewDomainPanel newDomainPanel;
+
+ private GenericDialog newEntryFromLDIFDlg;
+ private NewEntryFromLDIFPanel newEntryFromLDIFPanel;
+
+ private boolean ignoreTreeSelectionEvents = false;
+
+ private ArrayList<LDAPEntryReader> entryReaderQueue =
+ new ArrayList<LDAPEntryReader>();
+
+ /**
+ * {@inheritDoc}
+ */
+ public JMenuBar getMenuBar()
+ {
+ if (menuBar == null)
+ {
+ menuBar = new BrowseMenuBar(getInfo());
+ menuBar.deleteMenuItem.setEnabled(false);
+ }
+ return menuBar;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_MANAGE_ENTRIES_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getBrowseButtonType()
+ {
+ return GenericDialog.ButtonType.CLOSE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void createBrowserController(ControlPanelInfo info)
+ {
+ super.createBrowserController(info);
+ entryPane.setController(controller);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Component createMainPanel()
+ {
+ JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+ pane.setOpaque(true); //content panes must be opaque
+
+ JComponent p = createTreePane();
+
+ JTree tree = treePane.getTree();
+ addDragAndDropListener(tree);
+ addTreeSelectionListener(tree);
+
+ JScrollPane treeScroll = Utilities.createScrollPane(p);
+ treeScroll.setPreferredSize(
+ new Dimension(treeScroll.getPreferredSize().width + 30,
+ 4 * treeScroll.getPreferredSize().height));
+ pane.setDividerLocation(treeScroll.getPreferredSize().width);
+
+ entryPane = new LDAPEntryPanel();
+
+
+// Create a split pane with the two scroll panes in it.
+ pane.setLeftComponent(treeScroll);
+ pane.setRightComponent(entryPane);
+ pane.setResizeWeight(0.0);
+ entryPane.setPreferredSize(
+ new Dimension((treeScroll.getPreferredSize().width * 5) / 2,
+ treeScroll.getPreferredSize().height));
+
+ entryPane.setBorder(treeScroll.getBorder());
+
+ addPopupMenu();
+
+ return pane;
+ }
+
+ /**
+ * Adds the tree selection listener.
+ * @param tree the tree to which the listeners are added.
+ */
+ private void addTreeSelectionListener(JTree tree)
+ {
+ TreeSelectionListener treeSelectionListener = new TreeSelectionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void valueChanged(TreeSelectionEvent ev)
+ {
+ if (ignoreTreeSelectionEvents)
+ {
+ return;
+ }
+ TreePath path = null;
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ if (entryPane.mustCheckUnsavedChanges())
+ {
+ ignoreTreeSelectionEvents = true;
+ treePane.getTree().setSelectionPath(entryPane.getTreePath());
+ switch (entryPane.checkUnsavedChanges())
+ {
+ case DO_NOT_SAVE:
+ break;
+ case SAVE:
+ break;
+ case CANCEL:
+ ignoreTreeSelectionEvents = false;
+ return;
+ }
+ if (paths != null)
+ {
+ treePane.getTree().setSelectionPaths(paths);
+ }
+ else
+ {
+ treePane.getTree().clearSelection();
+ }
+ ignoreTreeSelectionEvents = false;
+ }
+ if ((paths != null) && (paths.length == 1))
+ {
+ path = paths[0];
+ }
+
+// Update menu items
+ boolean enableDelete = false;
+ if ((paths != null) && (paths.length > 0))
+ {
+ enableDelete = true;
+ for (TreePath p : paths)
+ {
+ BasicNode n = (BasicNode)p.getLastPathComponent();
+ enableDelete = entryPane.canDelete(n.getDN());
+ if (!enableDelete)
+ {
+ break;
+ }
+ }
+ }
+ popupDeleteMenuItem.setEnabled(enableDelete);
+ menuBar.deleteMenuItem.setEnabled(enableDelete);
+
+ boolean enableCopyDN = (paths != null) && (paths.length > 0);
+ popupCopyDNMenuItem.setEnabled(enableCopyDN);
+ menuBar.copyDNMenuItem.setEnabled(enableCopyDN);
+
+ boolean enableAddToGroup = enableCopyDN;
+ popupAddToGroupMenuItem.setEnabled(enableAddToGroup);
+ menuBar.addToGroupMenuItem.setEnabled(enableAddToGroup);
+
+ boolean enableResetPassword = path != null;
+ if (enableResetPassword)
+ {
+ BasicNode node = (BasicNode)path.getLastPathComponent();
+ enableResetPassword = hasUserPassword(node.getObjectClassValues());
+ }
+ popupResetUserPasswordMenuItem.setEnabled(enableResetPassword);
+ menuBar.resetPasswordMenuItem.setEnabled(enableResetPassword);
+
+// Assume that if we cannot delete, we cannot create a new path
+ boolean enableNewEntry = (path != null) && enableDelete;
+ popupNewUserMenuItem.setEnabled(enableNewEntry);
+ menuBar.newUserMenuItem.setEnabled(enableNewEntry);
+
+ popupNewGroupMenuItem.setEnabled(enableNewEntry);
+ menuBar.newGroupMenuItem.setEnabled(enableNewEntry);
+
+ popupNewOUMenuItem.setEnabled(enableNewEntry);
+ menuBar.newOUMenuItem.setEnabled(enableNewEntry);
+
+ popupNewOrganizationMenuItem.setEnabled(enableNewEntry);
+ menuBar.newOrganizationMenuItem.setEnabled(enableNewEntry);
+
+ popupNewDomainMenuItem.setEnabled(enableNewEntry);
+ menuBar.newDomainMenuItem.setEnabled(enableNewEntry);
+
+ updateRightPane(paths);
+ }
+ };
+ tree.getSelectionModel().addTreeSelectionListener(treeSelectionListener);
+ }
+
+ /**
+ * Adds a drag and drop listener to a tree.
+ * @param tree the tree to which the listener is added.
+ */
+ private void addDragAndDropListener(JTree tree)
+ {
+ final DragSource dragSource = DragSource.getDefaultDragSource();
+ final DragSourceListener dragSourceListener = new DragSourceListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void dragDropEnd(DragSourceDropEvent dsde)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dragEnter(DragSourceDragEvent dsde)
+ {
+ DragSourceContext context = dsde.getDragSourceContext();
+ int dropAction = dsde.getDropAction();
+ if ((dropAction & DnDConstants.ACTION_COPY) != 0)
+ {
+ context.setCursor(DragSource.DefaultCopyDrop);
+ }
+ else if ((dropAction & DnDConstants.ACTION_MOVE) != 0)
+ {
+ context.setCursor(DragSource.DefaultMoveDrop);
+ }
+ else
+ {
+ context.setCursor(DragSource.DefaultCopyNoDrop);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dragOver(DragSourceDragEvent dsde)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dropActionChanged(DragSourceDragEvent dsde)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dragExit(DragSourceEvent dsde)
+ {
+ }
+ };
+ final DragGestureListener dragGestureListener = new DragGestureListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void dragGestureRecognized(DragGestureEvent e)
+ {
+ //Get the selected node
+ JTree tree = treePane.getTree();
+ TreePath[] paths = tree.getSelectionPaths();
+ if (paths != null)
+ {
+ BrowserNodeInfo[] nodes = new BrowserNodeInfo[paths.length];
+ DndBrowserNodes dndNodes = new DndBrowserNodes();
+ for (int i=0; i<paths.length; i++)
+ {
+ BrowserNodeInfo node = controller.getNodeInfoFromPath(paths[i]);
+ nodes[i] = node;
+ }
+ dndNodes.setParent(tree);
+ dndNodes.setNodes(nodes);
+ //Select the appropriate cursor;
+ Cursor cursor = DragSource.DefaultCopyNoDrop;
+ // begin the drag
+ dragSource.startDrag(e, cursor, dndNodes, dragSourceListener);
+ }
+ }
+ };
+ dragSource.createDefaultDragGestureRecognizer(tree, //DragSource
+ DnDConstants.ACTION_COPY_OR_MOVE, //specifies valid actions
+ dragGestureListener
+ );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ super.setInfo(info);
+ entryPane.setInfo(info);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ final ServerDescriptor desc = ev.getNewDescriptor();
+
+ updateMenus(desc);
+
+ super.configurationChanged(ev);
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided object classes allow (or require
+ * the userPassword attribute).
+ * @param ocs the object classes.
+ * @return <CODE>true</CODE> if the provided object classes allow (or require
+ * the userPassword attribute) and <CODE>false</CODE> otherwise.
+ */
+ private boolean hasUserPassword(String[] ocs)
+ {
+ boolean hasUserPassword = false;
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if ((ocs != null) && (schema != null))
+ {
+ AttributeType attr = schema.getAttributeType(
+ ServerConstants.ATTR_USER_PASSWORD);
+ for (String oc : ocs)
+ {
+ ObjectClass objectClass = schema.getObjectClass(oc);
+ if ((objectClass != null) && (attr != null))
+ {
+ if (objectClass.isRequiredOrOptional(attr))
+ {
+ hasUserPassword = true;
+ break;
+ }
+ }
+ }
+ }
+ return hasUserPassword;
+ }
+
+ /**
+ * Updates the menus with the provided server descriptor.
+ * @param desc the server descriptor.
+ */
+ private void updateMenus(ServerDescriptor desc)
+ {
+ menuBar.newEntryFromLDIFMenuItem.setEnabled(desc.isAuthenticated());
+ }
+
+ /**
+ * Updates the contents of the right pane with the selected tree paths.
+ * @param paths the selected tree paths.
+ */
+ private void updateRightPane(TreePath[] paths)
+ {
+ TreePath path = null;
+ if ((paths != null) && (paths.length == 1))
+ {
+ path = paths[0];
+ }
+ BasicNode node = null;
+ if (path != null)
+ {
+ node = (BasicNode)path.getLastPathComponent();
+ }
+ if (node != null)
+ {
+ String dn = node.getDN();
+ try
+ {
+ InitialLdapContext ctx =
+ controller.findConnectionForDisplayedEntry(node);
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ LDAPEntryReader reader = new LDAPEntryReader(dn, ctx, schema);
+ reader.addEntryReadListener(entryPane);
+ cleanupReaderQueue();
+ // Required to update the browser controller properly if the entry is
+ // deleted.
+ entryPane.setTreePath(path);
+ reader.startBackgroundTask();
+ entryReaderQueue.add(reader);
+ }
+ catch (Throwable t)
+ {
+ EntryReadErrorEvent ev = new EntryReadErrorEvent(this, dn, t);
+ entryPane.entryReadError(ev);
+ }
+ }
+ else
+ {
+ cleanupReaderQueue();
+ if ((paths != null) && (paths.length > 1))
+ {
+ entryPane.multipleEntriesSelected();
+ }
+ else
+ {
+ entryPane.noEntrySelected();
+ }
+ }
+ }
+
+ /**
+ * Cleans up the reader queue (the queue where we store the entries that we
+ * must read).
+ *
+ */
+ private void cleanupReaderQueue()
+ {
+ ArrayList<LDAPEntryReader> toRemove = new ArrayList<LDAPEntryReader>();
+ for (LDAPEntryReader r : entryReaderQueue)
+ {
+ if (r.isOver())
+ {
+ toRemove.add(r);
+ }
+ else
+ {
+ r.interrupt();
+ }
+ }
+ entryReaderQueue.removeAll(toRemove);
+ }
+
+ /**
+ * Adds a pop up menu to the tree.
+ *
+ */
+ private void addPopupMenu()
+ {
+ popup = new JPopupMenu();
+
+ popupNewUserMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_USER_MENU.get());
+ popupNewUserMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newUser();
+ }
+ });
+ popupNewUserMenuItem.setEnabled(false);
+ popup.add(popupNewUserMenuItem);
+
+ popupNewGroupMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_GROUP_MENU.get());
+ popupNewGroupMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newGroup();
+ }
+ });
+ popupNewGroupMenuItem.setEnabled(false);
+ popup.add(popupNewGroupMenuItem);
+
+ popupNewOUMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_ORGANIZATIONAL_UNIT_MENU.get());
+ popupNewOUMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newOrganizationalUnit();
+ }
+ });
+ popupNewOUMenuItem.setEnabled(false);
+ popup.add(popupNewOUMenuItem);
+
+ popupNewOrganizationMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_ORGANIZATION_MENU.get());
+ popupNewOrganizationMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newOrganization();
+ }
+ });
+ popupNewOrganizationMenuItem.setEnabled(false);
+ popup.add(popupNewOrganizationMenuItem);
+
+ popupNewDomainMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_DOMAIN_MENU.get());
+ popupNewDomainMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newDomain();
+ }
+ });
+ popupNewDomainMenuItem.setEnabled(false);
+ popup.add(popupNewDomainMenuItem);
+
+ popupNewEntryFromLDIFMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_FROM_LDIF_MENU.get());
+ popupNewEntryFromLDIFMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newEntryFromLDIF();
+ }
+ });
+ popup.add(popupNewEntryFromLDIFMenuItem);
+
+ popup.add(new JSeparator());
+ popupResetUserPasswordMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_RESET_USER_PASSWORD_MENU.get());
+ popupResetUserPasswordMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ resetUserPassword();
+ }
+ });
+
+ popup.add(popupResetUserPasswordMenuItem);
+ popupResetUserPasswordMenuItem.setEnabled(false);
+
+ popupAddToGroupMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_ADD_TO_GROUP_MENU.get());
+ popupAddToGroupMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ addToGroup();
+ }
+ });
+ popup.add(popupAddToGroupMenuItem);
+ popupAddToGroupMenuItem.setEnabled(false);
+
+ popupCopyDNMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_COPY_DN_MENU.get());
+ popupCopyDNMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ copyDN();
+ }
+ });
+ popup.add(new JSeparator());
+ popup.add(popupCopyDNMenuItem);
+ popupCopyDNMenuItem.setEnabled(false);
+ popup.add(new JSeparator());
+
+ popupDeleteMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_DELETE_ENTRY_MENU.get());
+ popupDeleteMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteClicked();
+ }
+ });
+ popup.add(popupDeleteMenuItem);
+ popupDeleteMenuItem.setEnabled(false);
+
+ popup.setOpaque(true);
+
+ ((CustomTree)treePane.getTree()).setPopupMenu(popup);
+ }
+
+ private void resetUserPassword()
+ {
+ if (resetUserPasswordDlg == null)
+ {
+ resetUserPasswordPanel = new ResetUserPasswordPanel();
+ resetUserPasswordPanel.setInfo(getInfo());
+ resetUserPasswordDlg = new GenericDialog(Utilities.getFrame(this),
+ resetUserPasswordPanel);
+ Utilities.centerGoldenMean(resetUserPasswordDlg,
+ Utilities.getParentDialog(this));
+ }
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ if ((paths != null) && (paths.length == 1))
+ {
+ TreePath path = paths[0];
+ BasicNode node = (BasicNode)path.getLastPathComponent();
+ resetUserPasswordPanel.setValue(node, controller);
+ resetUserPasswordDlg.setVisible(true);
+ }
+ }
+
+ private void deleteBaseDN()
+ {
+ if (deleteBaseDNDlg == null)
+ {
+ DeleteBaseDNPanel panel = new DeleteBaseDNPanel();
+ panel.setInfo(getInfo());
+ deleteBaseDNDlg = new GenericDialog(Utilities.getFrame(this), panel);
+ Utilities.centerGoldenMean(deleteBaseDNDlg,
+ Utilities.getParentDialog(this));
+ }
+ deleteBaseDNDlg.setVisible(true);
+ }
+
+ private void deleteBackend()
+ {
+ if (deleteBackendDlg == null)
+ {
+ DeleteBackendPanel panel = new DeleteBackendPanel();
+ panel.setInfo(getInfo());
+ deleteBackendDlg = new GenericDialog(Utilities.getFrame(this), panel);
+ Utilities.centerGoldenMean(deleteBackendDlg,
+ Utilities.getParentDialog(this));
+ }
+ deleteBackendDlg.setVisible(true);
+ }
+
+ private void newUser()
+ {
+ if (newUserDlg == null)
+ {
+ newUserPanel = new NewUserPanel();
+ newUserPanel.setInfo(getInfo());
+ newUserDlg = new GenericDialog(Utilities.getFrame(this), newUserPanel);
+ Utilities.centerGoldenMean(newUserDlg,
+ Utilities.getParentDialog(this));
+ }
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ BasicNode parentNode = null;
+ if ((paths != null) && (paths.length == 1))
+ {
+ TreePath path = paths[0];
+ parentNode = (BasicNode)path.getLastPathComponent();
+ }
+ newUserPanel.setParent(parentNode, controller);
+ newUserDlg.setVisible(true);
+ }
+
+ private void newGroup()
+ {
+ if (newGroupDlg == null)
+ {
+ newGroupPanel = new NewGroupPanel();
+ newGroupPanel.setInfo(getInfo());
+ /* First argument: Component to associate the target with
+ * Second argument: DropTargetListener
+ */
+ newGroupDlg = new GenericDialog(Utilities.getFrame(this), newGroupPanel);
+ Utilities.centerGoldenMean(newGroupDlg,
+ Utilities.getParentDialog(this));
+ }
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ BasicNode parentNode = null;
+ if ((paths != null) && (paths.length == 1))
+ {
+ TreePath path = paths[0];
+ parentNode = (BasicNode)path.getLastPathComponent();
+ }
+ newGroupPanel.setParent(parentNode, controller);
+ newGroupDlg.setVisible(true);
+ }
+
+ private void newOrganizationalUnit()
+ {
+ if (newOUDlg == null)
+ {
+ newOUPanel = new NewOrganizationalUnitPanel();
+ newOUPanel.setInfo(getInfo());
+ newOUDlg = new GenericDialog(Utilities.getFrame(this), newOUPanel);
+ Utilities.centerGoldenMean(newOUDlg,
+ Utilities.getParentDialog(this));
+ }
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ BasicNode parentNode = null;
+ if ((paths != null) && (paths.length == 1))
+ {
+ TreePath path = paths[0];
+ parentNode = (BasicNode)path.getLastPathComponent();
+ }
+ newOUPanel.setParent(parentNode, controller);
+ newOUDlg.setVisible(true);
+ }
+
+ private void newOrganization()
+ {
+ if (newOrganizationDlg == null)
+ {
+ newOrganizationPanel = new NewOrganizationPanel();
+ newOrganizationPanel.setInfo(getInfo());
+ newOrganizationDlg = new GenericDialog(Utilities.getFrame(this),
+ newOrganizationPanel);
+ Utilities.centerGoldenMean(newOrganizationDlg,
+ Utilities.getParentDialog(this));
+ }
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ BasicNode parentNode = null;
+ if ((paths != null) && (paths.length == 1))
+ {
+ TreePath path = paths[0];
+ parentNode = (BasicNode)path.getLastPathComponent();
+ }
+ newOrganizationPanel.setParent(parentNode, controller);
+ newOrganizationDlg.setVisible(true);
+ }
+
+ private void newDomain()
+ {
+ if (newDomainDlg == null)
+ {
+ newDomainPanel = new NewDomainPanel();
+ newDomainPanel.setInfo(getInfo());
+ newDomainDlg =
+ new GenericDialog(Utilities.getFrame(this), newDomainPanel);
+ Utilities.centerGoldenMean(newDomainDlg,
+ Utilities.getParentDialog(this));
+ }
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ BasicNode parentNode = null;
+ if ((paths != null) && (paths.length == 1))
+ {
+ TreePath path = paths[0];
+ parentNode = (BasicNode)path.getLastPathComponent();
+ }
+ newDomainPanel.setParent(parentNode, controller);
+ newDomainDlg.setVisible(true);
+ }
+
+ private void newEntryFromLDIF()
+ {
+ if (newEntryFromLDIFDlg == null)
+ {
+ newEntryFromLDIFPanel = new NewEntryFromLDIFPanel();
+ newEntryFromLDIFPanel.setInfo(getInfo());
+ newEntryFromLDIFDlg = new GenericDialog(Utilities.getFrame(this),
+ newEntryFromLDIFPanel);
+ Utilities.centerGoldenMean(newEntryFromLDIFDlg,
+ Utilities.getParentDialog(this));
+ }
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ BasicNode parentNode = null;
+ if ((paths != null) && (paths.length == 1))
+ {
+ TreePath path = paths[0];
+ parentNode = (BasicNode)path.getLastPathComponent();
+ }
+ newEntryFromLDIFPanel.setParent(parentNode, controller);
+ newEntryFromLDIFDlg.setVisible(true);
+ }
+
+ private void deleteClicked()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+
+ if ((paths != null) && (paths.length > 0))
+ {
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_DELETE_SELECTED_ENTRIES_TITLE.get(), getInfo());
+ DeleteEntryTask newTask = new DeleteEntryTask(getInfo(), dlg, paths,
+ controller);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.size() == 0)
+ {
+ if (displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_DELETE_ENTRIES_CONFIRMATION_DETAILS.get()))
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_ENTRIES_SUMMARY.get(),
+ INFO_CTRL_PANEL_DELETING_ENTRIES_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_ENTRIES_SUCCESSFUL.get(),
+ ERR_CTRL_PANEL_DELETING_ENTRIES_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_ENTRIES_ERROR_DETAILS.get(),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ }
+ }
+ }
+ }
+
+ private void copyDN()
+ {
+ ClipboardOwner owner = new ClipboardOwner()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void lostOwnership( Clipboard aClipboard,
+ Transferable aContents) {
+ //do nothing
+ }
+ };
+ Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ if (paths != null)
+ {
+ StringBuilder sb = new StringBuilder();
+ for (TreePath path : paths)
+ {
+ BasicNode node = (BasicNode)path.getLastPathComponent();
+ if (sb.length() > 0)
+ {
+ sb.append("\n");
+ }
+ sb.append(node.getDN());
+ }
+ StringSelection stringSelection = new StringSelection(sb.toString());
+ clipboard.setContents(stringSelection, owner);
+ }
+ }
+
+ private void addToGroup()
+ {
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ if (paths != null)
+ {
+ LinkedHashSet<DN> dns = new LinkedHashSet<DN>();
+ for (TreePath path : paths)
+ {
+ BasicNode node = (BasicNode)path.getLastPathComponent();
+ try
+ {
+ dns.add(DN.decode(node.getDN()));
+ }
+ catch (OpenDsException ode)
+ {
+ throw new IllegalStateException(
+ "Unexpected error decoding dn. Details: "+ode.getMessageObject(),
+ ode);
+ }
+ }
+ if (addToGroupDlg == null)
+ {
+ addToGroupPanel = new AddToGroupPanel();
+ addToGroupPanel.setInfo(getInfo());
+ addToGroupDlg = new GenericDialog(Utilities.getFrame(this),
+ addToGroupPanel);
+ Utilities.centerGoldenMean(addToGroupDlg,
+ Utilities.getParentDialog(this));
+ }
+ addToGroupPanel.setEntriesToAdd(dns);
+ addToGroupDlg.setVisible(true);
+ }
+ }
+
+ private void newWindow()
+ {
+ BrowseEntriesPanel panel = new BrowseEntriesPanel();
+ panel.setDisposeOnClose(true);
+ panel.setInfo(getInfo());
+ GenericDialog dlg = new GenericDialog(Utilities.getFrame(this),
+ panel);
+
+ Utilities.centerGoldenMean(dlg, Utilities.getFrame(this));
+
+ dlg.setVisible(true);
+ }
+
+ /**
+ * The specific menu bar of this panel.
+ *
+ */
+ class BrowseMenuBar extends GenericMenuBar
+ {
+ private static final long serialVersionUID = 505187832236882370L;
+ JMenuItem deleteMenuItem;
+ JMenuItem copyDNMenuItem;
+ JMenuItem addToGroupMenuItem;
+ JMenuItem resetPasswordMenuItem;
+ JMenuItem newUserMenuItem;
+ JMenuItem newGroupMenuItem;
+ JMenuItem newOUMenuItem;
+ JMenuItem newOrganizationMenuItem;
+ JMenuItem newDomainMenuItem;
+ JMenuItem newEntryFromLDIFMenuItem;
+
+ /**
+ * Constructor.
+ * @param info the control panel info.
+ */
+ public BrowseMenuBar(ControlPanelInfo info)
+ {
+ super(info);
+ add(createFileMenuBar());
+ add(createEntriesMenuBar());
+ add(createViewMenuBar());
+ add(createHelpMenuBar());
+ }
+
+ /**
+ * Creates the file menu bar.
+ * @return the file menu bar.
+ */
+ private JMenu createFileMenuBar()
+ {
+ JMenu menu = Utilities.createMenu(INFO_CTRL_PANEL_FILE_MENU.get(),
+ INFO_CTRL_PANEL_FILE_MENU_DESCRIPTION.get());
+ menu.setMnemonic(KeyEvent.VK_F);
+ JMenuItem newWindow = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_BROWSER_WINDOW_MENU.get());
+ newWindow.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newWindow();
+ }
+ });
+ menu.add(newWindow);
+ menu.add(new JSeparator());
+ JMenuItem close = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_CLOSE_MENU.get());
+ close.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ closeClicked();
+ }
+ });
+ menu.add(close);
+ return menu;
+ }
+
+ /**
+ * Creates the view menu bar.
+ * @return the view menu bar.
+ */
+ protected JMenu createViewMenuBar()
+ {
+ JMenu menu = Utilities.createMenu(
+ INFO_CTRL_PANEL_VIEW_MENU.get(),
+ INFO_CTRL_PANEL_VIEW_MENU_DESCRIPTION.get());
+ menu.setMnemonic(KeyEvent.VK_V);
+ Message[] labels = {
+ INFO_CTRL_PANEL_SIMPLIFIED_VIEW_MENU.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_VIEW_MENU.get(),
+ INFO_CTRL_PANEL_LDIF_VIEW_MENU.get()
+ };
+ final LDAPEntryPanel.View[] views = {
+ LDAPEntryPanel.View.SIMPLIFIED_VIEW,
+ LDAPEntryPanel.View.ATTRIBUTE_VIEW,
+ LDAPEntryPanel.View.LDIF_VIEW
+ };
+ final JRadioButtonMenuItem[] menus =
+ new JRadioButtonMenuItem[labels.length];
+ ButtonGroup group = new ButtonGroup();
+ for (int i=0; i<labels.length; i++)
+ {
+ menus[i] = new JRadioButtonMenuItem(labels[i].toString());
+ menu.add(menus[i]);
+ group.add(menus[i]);
+ }
+ ActionListener listener = new ActionListener()
+ {
+ private boolean ignoreEvents;
+ private JRadioButtonMenuItem lastSelected = menus[0];
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ if (ignoreEvents)
+ {
+ return;
+ }
+ for (int i=0; i<menus.length; i++)
+ {
+ if (menus[i].isSelected())
+ {
+ ignoreEvents = true;
+ lastSelected.setSelected(true);
+ if (entryPane.mustCheckUnsavedChanges())
+ {
+ switch (entryPane.checkUnsavedChanges())
+ {
+ case DO_NOT_SAVE:
+ break;
+ case SAVE:
+ break;
+ case CANCEL:
+ ignoreEvents = false;
+ return;
+ }
+ }
+ lastSelected = menus[i];
+ menus[i].setSelected(true);
+ entryPane.setView(views[i]);
+ ignoreEvents = false;
+ break;
+ }
+ }
+ }
+ };
+ for (int i=0; i<labels.length; i++)
+ {
+ menus[i].addActionListener(listener);
+ }
+ menus[0].setSelected(true);
+ return menu;
+ }
+
+ /**
+ * Creates the entries menu bar.
+ * @return the entries menu bar.
+ */
+ protected JMenu createEntriesMenuBar()
+ {
+ JMenu menu = Utilities.createMenu(
+ INFO_CTRL_PANEL_ENTRIES_MENU.get(),
+ INFO_CTRL_PANEL_ENTRIES_MENU_DESCRIPTION.get());
+ menu.setMnemonic(KeyEvent.VK_E);
+
+ newUserMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_USER_MENU.get());
+ newUserMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newUser();
+ }
+ });
+ newUserMenuItem.setEnabled(false);
+ menu.add(newUserMenuItem);
+
+ newGroupMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_GROUP_MENU.get());
+ newGroupMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newGroup();
+ }
+ });
+ newGroupMenuItem.setEnabled(false);
+ menu.add(newGroupMenuItem);
+
+ newOUMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_ORGANIZATIONAL_UNIT_MENU.get());
+ newOUMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newOrganizationalUnit();
+ }
+ });
+ newOUMenuItem.setEnabled(false);
+ menu.add(newOUMenuItem);
+
+ newOrganizationMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_ORGANIZATION_MENU.get());
+ newOrganizationMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newOrganization();
+ }
+ });
+ newOrganizationMenuItem.setEnabled(false);
+ menu.add(newOrganizationMenuItem);
+
+ newDomainMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_DOMAIN_MENU.get());
+ newDomainMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newDomain();
+ }
+ });
+ newDomainMenuItem.setEnabled(false);
+ menu.add(newDomainMenuItem);
+
+ newEntryFromLDIFMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_FROM_LDIF_MENU.get());
+ newEntryFromLDIFMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newEntryFromLDIF();
+ }
+ });
+ menu.add(newEntryFromLDIFMenuItem);
+ menu.add(new JSeparator());
+ resetPasswordMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_RESET_USER_PASSWORD_MENU.get());
+ resetPasswordMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ resetUserPassword();
+ }
+ });
+ resetPasswordMenuItem.setEnabled(false);
+ menu.add(resetPasswordMenuItem);
+
+ addToGroupMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_ADD_TO_GROUP_MENU.get());
+ addToGroupMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ addToGroup();
+ }
+ });
+ addToGroupMenuItem.setEnabled(false);
+ menu.add(addToGroupMenuItem);
+
+ menu.add(new JSeparator());
+ copyDNMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_COPY_DN_MENU.get());
+ copyDNMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ copyDN();
+ }
+ });
+ copyDNMenuItem.setEnabled(false);
+ menu.add(copyDNMenuItem);
+ menu.add(new JSeparator());
+ deleteMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_DELETE_ENTRY_MENU.get());
+ deleteMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteClicked();
+ }
+ });
+ deleteMenuItem.setEnabled(false);
+ menu.add(deleteMenuItem);
+ menu.add(new JSeparator());
+ JMenuItem deleteBaseDNMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_DELETE_BASE_DN_MENU.get());
+ deleteBaseDNMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteBaseDN();
+ }
+ });
+ menu.add(deleteBaseDNMenuItem);
+
+ JMenuItem deleteBackendMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_DELETE_BACKEND_MENU.get());
+ deleteBackendMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteBackend();
+ }
+ });
+ menu.add(deleteBackendMenuItem);
+ return menu;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
new file mode 100644
index 0000000..3c5bbad
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
@@ -0,0 +1,965 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import javax.swing.Box;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.JSplitPane;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.event.*;
+import org.opends.guitools.controlpanel.task.DeleteIndexTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.components.CustomTree;
+import org.opends.guitools.controlpanel.ui.components.TreePanel;
+import org.opends.guitools.controlpanel.ui.nodes.AbstractIndexTreeNode;
+import org.opends.guitools.controlpanel.ui.nodes.CategoryTreeNode;
+import org.opends.guitools.controlpanel.ui.nodes.IndexTreeNode;
+import org.opends.guitools.controlpanel.ui.nodes.VLVIndexTreeNode;
+import org.opends.guitools.controlpanel.ui.renderer.TreeCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The pane that is displayed when the user clicks on 'Browse Indexes'.
+ *
+ */
+public class BrowseIndexPanel extends StatusGenericPanel
+implements IndexModifiedListener
+{
+ private static final long serialVersionUID = 4560020571983291585L;
+
+ private JComboBox backends;
+ private JLabel lNoBackendsFound;
+
+ private IndexBrowserRightPanel entryPane;
+ private TreePanel treePane;
+
+ private JButton newIndex;
+ private JButton newVLVIndex;
+
+ private CategoryTreeNode standardIndexes = new CategoryTreeNode(
+ INFO_CTRL_PANEL_INDEXES_CATEGORY_NODE.get());
+ private CategoryTreeNode vlvIndexes = new CategoryTreeNode(
+ INFO_CTRL_PANEL_VLV_INDEXES_CATEGORY_NODE.get());
+
+ private AbstractIndexDescriptor lastCreatedIndex;
+
+ private TreePath lastIndexTreePath;
+
+ private CategoryTreeNode[] categoryNodes = {
+ standardIndexes, vlvIndexes
+ };
+
+ private JMenuItem deleteMenuItem;
+
+ private GenericDialog newIndexDialog;
+ private GenericDialog newVLVIndexDialog;
+
+ private boolean ignoreSelectionEvents;
+
+ private boolean firstTreeRepopulate = true;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public BrowseIndexPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresBorder()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ super.toBeDisplayed(visible);
+ ((GenericDialog)Utilities.getParentDialog(this)).
+ getRootPane().setDefaultButton(null);
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ setBackground(ColorAndFontConstants.greyBackground);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 5;
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ addErrorPane(gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.gridx = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets = new Insets(10, 10, 0, 0);
+ JLabel lBackend =
+ Utilities.createPrimaryLabel(INFO_CTRL_PANEL_BACKEND_LABEL.get());
+ add(lBackend, gbc);
+
+ backends = Utilities.createComboBox();
+ backends.setModel(new DefaultComboBoxModel(new String[]{}));
+ ItemListener comboListener = new ItemListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void itemStateChanged(ItemEvent ev)
+ {
+ if (!ignoreSelectionEvents &&
+ (ev.getStateChange() == ItemEvent.SELECTED))
+ {
+ repopulateTree(treePane.getTree());
+ }
+ }
+ };
+ backends.addItemListener(comboListener);
+ gbc.insets.left = 5;
+ gbc.gridx ++;
+ add(backends, gbc);
+ lNoBackendsFound = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NO_BACKENDS_FOUND_LABEL.get());
+ add(lNoBackendsFound, gbc);
+ lNoBackendsFound.setVisible(false);
+
+ newIndex = Utilities.createButton(
+ INFO_CTRL_PANEL_NEW_INDEX_BUTTON_LABEL.get());
+ newIndex.setOpaque(false);
+ newIndex.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newIndexClicked();
+ }
+ });
+ gbc.gridx ++;
+ gbc.insets.left = 10;
+ add(newIndex, gbc);
+
+ newVLVIndex = Utilities.createButton(
+ INFO_CTRL_PANEL_NEW_VLV_INDEX_BUTTON_LABEL.get());
+ newVLVIndex.setOpaque(false);
+ newVLVIndex.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newVLVIndexClicked();
+ }
+ });
+ gbc.gridx ++;
+ gbc.insets.right = 10;
+ add(newVLVIndex, gbc);
+ gbc.gridx ++;
+ gbc.weightx = 1.0;
+ add(Box.createHorizontalGlue(), gbc);
+
+ gbc.insets = new Insets(10, 0, 0, 0);
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridwidth = 5;
+ add(createSplitPane(), gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_MANAGE_INDEXES_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return backends;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void closeClicked()
+ {
+ super.closeClicked();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ // No ok button
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.CLOSE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ private Component createSplitPane()
+ {
+ JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+ pane.setOpaque(true); //content panes must be opaque
+
+ treePane = new TreePanel();
+ Utilities.setBorder(treePane, new EmptyBorder(10, 0, 10, 0));
+
+ entryPane = new IndexBrowserRightPanel();
+ JScrollPane treeScroll = Utilities.createScrollPane(treePane);
+
+ entryPane.addIndexSelectionListener(new IndexSelectionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void indexSelected(IndexSelectionEvent ev)
+ {
+ AbstractIndexDescriptor index = ev.getIndex();
+ TreeNode parentNode;
+ if (index instanceof IndexDescriptor)
+ {
+ parentNode = standardIndexes;
+ }
+ else
+ {
+ parentNode = vlvIndexes;
+ }
+ DefaultTreeModel model =
+ (DefaultTreeModel)treePane.getTree().getModel();
+ int n = model.getChildCount(parentNode);
+ for (int i=0; i<n; i++)
+ {
+ AbstractIndexTreeNode node =
+ (AbstractIndexTreeNode)model.getChild(parentNode, i);
+ if (node.getName().equals(index.getName()))
+ {
+ TreePath newSelectionPath = new TreePath(node.getPath());
+ treePane.getTree().setSelectionPath(newSelectionPath);
+ treePane.getTree().scrollPathToVisible(newSelectionPath);
+ break;
+ }
+ }
+ }
+ });
+
+
+// Create a split pane
+ pane.setLeftComponent(treeScroll);
+ pane.setRightComponent(entryPane);
+ pane.setResizeWeight(0.0);
+
+ treePane.getTree().addTreeSelectionListener(new TreeSelectionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void valueChanged(TreeSelectionEvent ev)
+ {
+ if (!ignoreSelectionEvents)
+ {
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+
+ if (entryPane.mustCheckUnsavedChanges())
+ {
+ ignoreSelectionEvents = true;
+ treePane.getTree().setSelectionPath(lastIndexTreePath);
+ switch (entryPane.checkUnsavedChanges())
+ {
+ case DO_NOT_SAVE:
+ break;
+ case SAVE:
+ break;
+ case CANCEL:
+ ignoreSelectionEvents = false;
+ return;
+ }
+ if (paths != null)
+ {
+ treePane.getTree().setSelectionPaths(paths);
+ }
+ else
+ {
+ treePane.getTree().clearSelection();
+ }
+ ignoreSelectionEvents = false;
+ }
+
+
+ boolean deletableElementsSelected = false;
+ boolean nonDeletableElementsSelected = false;
+ if (paths != null)
+ {
+ for (TreePath path : paths)
+ {
+ Object node = path.getLastPathComponent();
+ if (node instanceof IndexTreeNode)
+ {
+ IndexDescriptor index = ((IndexTreeNode)node).getIndex();
+ if (index.isDatabaseIndex())
+ {
+ nonDeletableElementsSelected = true;
+ }
+ else
+ {
+ deletableElementsSelected = true;
+ }
+ }
+ else if (node instanceof VLVIndexTreeNode)
+ {
+ deletableElementsSelected = true;
+ }
+ }
+ }
+ deleteMenuItem.setEnabled(deletableElementsSelected &&
+ !nonDeletableElementsSelected);
+ updateEntryPane();
+ }
+ }
+ });
+ DefaultMutableTreeNode root = new DefaultMutableTreeNode("Tree root");
+ for (DefaultMutableTreeNode node : categoryNodes)
+ {
+ root.add(node);
+ }
+ DefaultTreeModel model = new DefaultTreeModel(root);
+ JTree tree = treePane.getTree();
+ tree.setModel(model);
+ tree.setRootVisible(false);
+ tree.setVisibleRowCount(20);
+ tree.expandPath(new TreePath(root));
+ tree.setCellRenderer(new IndexTreeCellRenderer());
+ addPopupMenu();
+
+ treeScroll.setPreferredSize(
+ new Dimension(2 * treeScroll.getPreferredSize().width,
+ 8 * treeScroll.getPreferredSize().height));
+ entryPane.setBorder(treeScroll.getBorder());
+ entryPane.setPreferredSize(
+ new Dimension((treeScroll.getPreferredSize().width * 5) / 2,
+ treeScroll.getPreferredSize().height));
+ pane.setDividerLocation(treeScroll.getPreferredSize().width);
+ entryPane.displayVoid();
+ return pane;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ super.setInfo(info);
+ treePane.setInfo(info);
+ entryPane.setInfo(info);
+ info.addIndexModifiedListener(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ ignoreSelectionEvents = true;
+ ServerDescriptor desc = ev.getNewDescriptor();
+ updateSimpleBackendComboBoxModel(backends, lNoBackendsFound,
+ desc);
+ refreshContents(desc);
+ }
+
+ /**
+ * Adds a pop up menu.
+ *
+ */
+ private void addPopupMenu()
+ {
+ final JPopupMenu popup = new JPopupMenu();
+ JMenuItem menuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_INDEX_MENU.get());
+ menuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newIndexClicked();
+ }
+ });
+ popup.add(menuItem);
+ menuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_VLV_INDEX_MENU.get());
+ menuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newVLVIndexClicked();
+ }
+ });
+ popup.add(menuItem);
+ popup.add(new JSeparator());
+ deleteMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_DELETE_INDEX_MENU.get());
+ deleteMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteClicked();
+ }
+ });
+ popup.add(deleteMenuItem);
+ deleteMenuItem.setEnabled(false);
+
+ ((CustomTree)treePane.getTree()).setPopupMenu(popup);
+ }
+
+ /**
+ * Refresh the contents of the tree.
+ * @param desc the descriptor containing the index configuration.
+ */
+ private void refreshContents(final ServerDescriptor desc)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ repopulateTree(treePane.getTree());
+ ignoreSelectionEvents = false;
+ boolean userBackendsDefined = backends.getModel().getSize() > 0;
+ newIndex.setEnabled(userBackendsDefined);
+ newVLVIndex.setEnabled(userBackendsDefined);
+ if (!userBackendsDefined)
+ {
+ entryPane.displayVoid();
+ updateErrorPane(errorPane,
+ ERR_CTRL_PANEL_NO_BACKENDS_FOUND_TITLE.get(),
+ ColorAndFontConstants.errorTitleFont,
+ ERR_CTRL_PANEL_NO_BACKENDS_FOUND_DETAILS.get(),
+ ColorAndFontConstants.defaultFont);
+ errorPane.setVisible(true);
+ }
+ else
+ {
+ errorPane.setVisible(false);
+ }
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void indexModified(IndexModifiedEvent ev)
+ {
+ refreshContents(getInfo().getServerDescriptor());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void backendIndexesModified(IndexModifiedEvent ev)
+ {
+ refreshContents(getInfo().getServerDescriptor());
+ }
+
+ /**
+ * Repopulates the contents of the tree.
+ * @param tree the tree to be repopulated.
+ */
+ private void repopulateTree(JTree tree)
+ {
+ ignoreSelectionEvents = true;
+ DefaultMutableTreeNode root = getRoot(tree);
+
+ TreePath path = tree.getSelectionPath();
+ DefaultMutableTreeNode lastSelectedNode = null;
+ if (path != null)
+ {
+ lastSelectedNode = (DefaultMutableTreeNode)path.getLastPathComponent();
+ }
+ TreePath newSelectionPath = null;
+
+ BackendDescriptor backend = null;
+ String backendName = (String)backends.getSelectedItem();
+ if (backendName != null)
+ {
+ for (BackendDescriptor b : getInfo().getServerDescriptor().getBackends())
+ {
+ if (b.getBackendID().equalsIgnoreCase(backendName))
+ {
+ backend = b;
+ break;
+ }
+ }
+ }
+
+ ArrayList<ArrayList<? extends AbstractIndexTreeNode>> nodes =
+ new ArrayList<ArrayList<? extends AbstractIndexTreeNode>>();
+ ArrayList<IndexTreeNode> standardIndexNodes =
+ new ArrayList<IndexTreeNode>();
+ ArrayList<VLVIndexTreeNode> vlvIndexNodes =
+ new ArrayList<VLVIndexTreeNode>();
+ nodes.add(standardIndexNodes);
+ nodes.add(vlvIndexNodes);
+
+ if (backend != null)
+ {
+ for (IndexDescriptor index : backend.getIndexes())
+ {
+ standardIndexNodes.add(new IndexTreeNode(index.getName(), index));
+ }
+ for (VLVIndexDescriptor index : backend.getVLVIndexes())
+ {
+ vlvIndexNodes.add(new VLVIndexTreeNode(index.getName(), index));
+ }
+ }
+
+
+ DefaultTreeModel model = (DefaultTreeModel)tree.getModel();
+ int i = 0;
+ int positionUnderRoot = 0;
+ for (DefaultMutableTreeNode parent : categoryNodes)
+ {
+ if (nodes.get(i).size() == 0)
+ {
+ if (root.getIndex(parent) != -1)
+ {
+ model.removeNodeFromParent(parent);
+ parent.removeAllChildren();
+ }
+ }
+ else
+ {
+ boolean expand = true;
+ if (root.getIndex(parent) == -1)
+ {
+ model.insertNodeInto(parent, root, positionUnderRoot);
+ }
+ else
+ {
+ expand = tree.isExpanded(new TreePath(parent)) ||
+ (parent.getChildCount() == 0);
+ parent.removeAllChildren();
+ }
+ for (AbstractIndexTreeNode node : nodes.get(i))
+ {
+ parent.add(node);
+ if ((newSelectionPath == null) &&
+ ((lastSelectedNode != null) || (lastCreatedIndex != null)))
+ {
+ if (lastCreatedIndex != null)
+ {
+ if ((node instanceof IndexTreeNode) &&
+ (lastCreatedIndex instanceof IndexDescriptor))
+ {
+ if (node.getName().equals(lastCreatedIndex.getName()))
+ {
+ newSelectionPath = new TreePath(node.getPath());
+ lastCreatedIndex = null;
+ }
+ }
+ else if ((node instanceof VLVIndexTreeNode) &&
+ (lastCreatedIndex instanceof VLVIndexDescriptor))
+ {
+ if (node.getName().equals(lastCreatedIndex.getName()))
+ {
+ newSelectionPath = new TreePath(node.getPath());
+ lastCreatedIndex = null;
+ }
+ }
+ }
+ else if (node.getName().equals(lastSelectedNode.getUserObject()))
+ {
+ newSelectionPath = new TreePath(node.getPath());
+ }
+ }
+ }
+ model.nodeStructureChanged(parent);
+ if (expand)
+ {
+ tree.expandPath(new TreePath(parent.getPath()));
+ }
+ positionUnderRoot++;
+ }
+ i++;
+ }
+
+ if (newSelectionPath == null)
+ {
+ if (firstTreeRepopulate)
+ {
+ newSelectionPath = new TreePath(standardIndexes.getPath());
+ }
+ }
+ if (newSelectionPath != null)
+ {
+ tree.setSelectionPath(newSelectionPath);
+ tree.scrollPathToVisible(newSelectionPath);
+ }
+
+ updateEntryPane();
+
+ firstTreeRepopulate = false;
+ ignoreSelectionEvents = false;
+ }
+
+ /**
+ * Updates the contents of the right panel.
+ *
+ */
+ private void updateEntryPane()
+ {
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ TreePath path = null;
+ if ((paths != null) && (paths.length == 1))
+ {
+ path = paths[0];
+ }
+ lastIndexTreePath = path;
+ if (path != null)
+ {
+ Object node = path.getLastPathComponent();
+ if (node instanceof IndexTreeNode)
+ {
+ entryPane.updateStandardIndex(
+ ((IndexTreeNode)node).getIndex());
+ }
+ else if (node instanceof VLVIndexTreeNode)
+ {
+ entryPane.updateVLVIndex(((VLVIndexTreeNode)node).getIndex());
+ }
+ else if (node == standardIndexes)
+ {
+ String backendName = (String)backends.getSelectedItem();
+ entryPane.updateBackendIndexes(backendName);
+ }
+ else if (node == vlvIndexes)
+ {
+ String backendName = (String)backends.getSelectedItem();
+ entryPane.updateBackendVLVIndexes(backendName);
+ }
+ else
+ {
+ entryPane.displayVoid();
+ }
+ }
+ else
+ {
+ if ((paths != null) && (paths.length > 1))
+ {
+ entryPane.displayMultiple();
+ }
+ else
+ {
+ entryPane.displayVoid();
+ }
+ }
+ }
+
+ private DefaultMutableTreeNode getRoot(JTree tree)
+ {
+ return (DefaultMutableTreeNode)tree.getModel().getRoot();
+ }
+
+ private void newIndexClicked()
+ {
+ if (newIndexDialog == null)
+ {
+ NewIndexPanel panel =
+ new NewIndexPanel((String)backends.getSelectedItem(),
+ Utilities.getParentDialog(this));
+ panel.setInfo(getInfo());
+ newIndexDialog = new GenericDialog(null, panel);
+ Utilities.centerGoldenMean(newIndexDialog,
+ Utilities.getParentDialog(this));
+ panel.addConfigurationElementCreatedListener(
+ new ConfigurationElementCreatedListener()
+ {
+ public void elementCreated(ConfigurationElementCreatedEvent ev)
+ {
+ Object o = ev.getConfigurationObject();
+ if (o instanceof AbstractIndexDescriptor)
+ {
+ lastCreatedIndex = (AbstractIndexDescriptor)o;
+ }
+ }
+ });
+ }
+ newIndexDialog.setVisible(true);
+ }
+
+ private void newVLVIndexClicked()
+ {
+ if (newVLVIndexDialog == null)
+ {
+ NewVLVIndexPanel panel =
+ new NewVLVIndexPanel((String)backends.getSelectedItem(),
+ Utilities.getParentDialog(this));
+ panel.setInfo(getInfo());
+ newVLVIndexDialog = new GenericDialog(null, panel);
+ Utilities.centerGoldenMean(newVLVIndexDialog,
+ Utilities.getParentDialog(this));
+ panel.addConfigurationElementCreatedListener(
+ new ConfigurationElementCreatedListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void elementCreated(ConfigurationElementCreatedEvent ev)
+ {
+ Object o = ev.getConfigurationObject();
+ if (o instanceof AbstractIndexDescriptor)
+ {
+ lastCreatedIndex = (AbstractIndexDescriptor)o;
+ }
+ }
+ });
+ }
+ newVLVIndexDialog.setVisible(true);
+ }
+
+ private void deleteClicked()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ ArrayList<AbstractIndexDescriptor> indexesToDelete =
+ new ArrayList<AbstractIndexDescriptor>();
+ ArrayList<String> indexesNames = new ArrayList<String>();
+ if (paths != null)
+ {
+ for (TreePath path : paths)
+ {
+ Object node = path.getLastPathComponent();
+ if (node instanceof IndexTreeNode)
+ {
+ indexesToDelete.add(((IndexTreeNode)node).getIndex());
+ }
+ else if (node instanceof VLVIndexTreeNode)
+ {
+ indexesToDelete.add(((VLVIndexTreeNode)node).getIndex());
+ }
+ }
+ }
+ else
+ {
+ errors.add(ERR_CTRL_PANEL_NO_INDEX_SELECTED.get());
+ }
+ for (AbstractIndexDescriptor index : indexesToDelete)
+ {
+ indexesNames.add(index.getName());
+ }
+ String nameLabel = Utilities.getStringFromCollection(indexesNames, ", ");
+ String backendName = indexesToDelete.get(0).getBackend().getBackendID();
+ if (errors.isEmpty())
+ {
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_DELETE_INDEXES_TITLE.get(), getInfo());
+ DeleteIndexTask newTask = new DeleteIndexTask(getInfo(), dlg,
+ indexesToDelete);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ if (displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_CONFIRMATION_INDEXES_DELETE_DETAILS.get(nameLabel,
+ backendName)))
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_INDEXES_SUMMARY.get(),
+ INFO_CTRL_PANEL_DELETING_INDEXES_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_INDEXES_SUCCESSFUL.get(nameLabel,
+ backendName),
+ ERR_CTRL_PANEL_DELETING_INDEXES_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_INDEXES_ERROR_DETAILS.get(nameLabel),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ }
+ }
+ }
+ if (!errors.isEmpty())
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ private HashMap<Object, ImageIcon> hmCategoryImages =
+ new HashMap<Object, ImageIcon>();
+ private HashMap<Class, ImageIcon> hmImages = new HashMap<Class, ImageIcon>();
+ {
+ Object[] nodes = {standardIndexes, vlvIndexes};
+ String[] paths = {"ds-idx-folder.png", "ds-vlv-idx-folder.png"};
+ for (int i=0; i<nodes.length; i++)
+ {
+ hmCategoryImages.put(nodes[i],
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+"/"+paths[i]));
+ }
+ Class[] classes = {IndexTreeNode.class, VLVIndexTreeNode.class};
+ String[] ocPaths = {"ds-idx.png", "ds-vlv-idx.png"};
+ for (int i=0; i<classes.length; i++)
+ {
+ hmImages.put(classes[i],
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+"/"+ocPaths[i]));
+ }
+ };
+
+ /**
+ * Specific class used to render the nodes in the tree. It uses specific
+ * icons for the nodes.
+ *
+ */
+ protected class IndexTreeCellRenderer extends TreeCellRenderer
+ {
+ private ImageIcon readOnlyIndexIcon =
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+"/ds-idx-ro.png");
+
+ private static final long serialVersionUID = -6953837045703643228L;
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getTreeCellRendererComponent(JTree tree, Object value,
+ boolean isSelected, boolean isExpanded, boolean isLeaf, int row,
+ boolean hasFocus)
+ {
+ super.getTreeCellRendererComponent(tree, value, isSelected, isExpanded,
+ isLeaf, row, hasFocus);
+ setIcon(getIcon(value));
+ return this;
+ }
+
+ private ImageIcon getIcon(Object value)
+ {
+ ImageIcon icon = null;
+ if (value instanceof IndexTreeNode)
+ {
+ if (((IndexTreeNode)value).getIndex().isDatabaseIndex())
+ {
+ icon = readOnlyIndexIcon;
+ }
+ }
+ if (icon == null)
+ {
+ icon = hmImages.get(value.getClass());
+ if (icon == null)
+ {
+ icon = hmCategoryImages.get(value);
+ }
+ }
+ return icon;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
new file mode 100644
index 0000000..fc4f7a9
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
@@ -0,0 +1,1796 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.JSplitPane;
+import javax.swing.JTree;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.*;
+import org.opends.guitools.controlpanel.task.DeleteSchemaElementsTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.components.CustomTree;
+import org.opends.guitools.controlpanel.ui.components.FilterTextField;
+import org.opends.guitools.controlpanel.ui.components.TreePanel;
+import org.opends.guitools.controlpanel.ui.nodes.*;
+import org.opends.guitools.controlpanel.ui.renderer.CustomListCellRenderer;
+import org.opends.guitools.controlpanel.ui.renderer.TreeCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.api.AttributeSyntax;
+import org.opends.server.api.MatchingRule;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.CommonSchemaElements;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.Schema;
+
+/**
+ * The pane that is displayed when the user clicks on 'Browse Schema'.
+ *
+ */
+public class BrowseSchemaPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = -6462914563743569830L;
+ private JComboBox filterAttribute;
+ private FilterTextField filter;
+ private JButton applyButton;
+ private JButton newAttribute;
+ private JButton newObjectClass;
+
+ private JLabel lNumberOfElements;
+
+ private JLabel lFilter;
+
+ private SchemaBrowserRightPanel entryPane;
+ private TreePanel treePane;
+
+ private TreePath lastEntryTreePath;
+
+ private Schema lastSchema;
+
+ private GenericDialog newAttributeDialog;
+ private GenericDialog newObjectClassDialog;
+
+ private JMenuItem deleteMenuItem;
+
+ private JPopupMenu popup;
+
+ private CommonSchemaElements lastCreatedElement;
+
+ private final Message NAME = INFO_CTRL_PANEL_SCHEMA_ELEMENT_NAME.get();
+ private final Message TYPE = INFO_CTRL_PANEL_SCHEMA_ELEMENT_TYPE.get();
+ private final Message PARENT_CLASS = INFO_CTRL_PANEL_PARENT_CLASS.get();
+ private final Message CHILD_CLASS = INFO_CTRL_PANEL_CHILD_CLASS.get();
+ private final Message REQUIRED_ATTRIBUTES =
+ INFO_CTRL_PANEL_REQUIRED_ATTRIBUTES.get();
+ private final Message OPTIONAL_ATTRIBUTES =
+ INFO_CTRL_PANEL_OPTIONAL_ATTRIBUTES.get();
+
+ private CategoryTreeNode attributes =
+ new CategoryTreeNode(INFO_CTRL_PANEL_ATTRIBUTES_CATEGORY_NODE.get());
+ private CategoryTreeNode objectClasses =
+ new CategoryTreeNode(INFO_CTRL_PANEL_OBJECTCLASSES_CATEGORY_NODE.get());
+ private CategoryTreeNode standardObjectClasses =
+ new CategoryTreeNode(
+ INFO_CTRL_PANEL_STANDARD_OBJECTCLASSES_CATEGORY_NODE.get());
+ private CategoryTreeNode standardAttributes =
+ new CategoryTreeNode(
+ INFO_CTRL_PANEL_STANDARD_ATTRIBUTES_CATEGORY_NODE.get());
+ private CategoryTreeNode configurationObjectClasses =
+ new CategoryTreeNode(
+ INFO_CTRL_PANEL_CONFIGURATION_OBJECTCLASSES_CATEGORY_NODE.get());
+ private CategoryTreeNode configurationAttributes =
+ new CategoryTreeNode(
+ INFO_CTRL_PANEL_CONFIGURATION_ATTRIBUTES_CATEGORY_NODE.get());
+ private CategoryTreeNode customObjectClasses =
+ new CategoryTreeNode(
+ INFO_CTRL_PANEL_CUSTOM_OBJECTCLASSES_CATEGORY_NODE.get());
+ private CategoryTreeNode customAttributes =
+ new CategoryTreeNode(
+ INFO_CTRL_PANEL_CUSTOM_ATTRIBUTES_CATEGORY_NODE.get());
+ private CategoryTreeNode matchingRules =
+ new CategoryTreeNode(INFO_CTRL_PANEL_MATCHING_RULES_CATEGORY_NODE.get());
+ private CategoryTreeNode syntaxes =
+ new CategoryTreeNode(
+ INFO_CTRL_PANEL_ATTRIBUTE_SYNTAXES_CATEGORY_NODE.get());
+
+ private CategoryTreeNode[] underRootNodes =
+ {
+ objectClasses, attributes, matchingRules, syntaxes
+ };
+
+ private CategoryTreeNode[] categoryNodes = {
+ standardObjectClasses, standardAttributes, customObjectClasses,
+ customAttributes, configurationObjectClasses,
+ configurationAttributes, matchingRules, syntaxes
+ };
+
+ private JLabel lNoMatchFound;
+
+ private boolean ignoreSelectionEvents;
+
+ private Message NO_SCHEMA_ITEM_SELECTED =
+ INFO_CTRL_PANEL_NO_SCHEMA_ITEM_SELECTED.get();
+ private Message CATEGORY_ITEM_SELECTED =
+ INFO_CTRL_PANEL_CATEGORY_ITEM_SELECTED.get();
+ private Message MULTIPLE_ITEMS_SELECTED =
+ INFO_CTRL_PANEL_MULTIPLE_ITEMS_SELECTED.get();
+
+ /**
+ * Default constructor.
+ *
+ */
+ public BrowseSchemaPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresBorder()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean callConfigurationChangedInBackground()
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ ((GenericDialog)Utilities.getParentDialog(this)).getRootPane().
+ setDefaultButton(null);
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ setBackground(ColorAndFontConstants.greyBackground);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 7;
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ addErrorPane(gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.gridx = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets = new Insets(10, 10, 0, 0);
+
+ newObjectClass = Utilities.createButton(
+ INFO_CTRL_PANEL_NEW_OBJECTCLASS_BUTTON.get());
+ newObjectClass.setOpaque(false);
+ gbc.weightx = 0.0;
+ add(newObjectClass, gbc);
+ newObjectClass.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newObjectClassClicked();
+ }
+ });
+
+ newAttribute = Utilities.createButton(
+ INFO_CTRL_PANEL_NEW_ATTRIBUTE_BUTTON.get());
+ newAttribute.setOpaque(false);
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ gbc.insets.left = 10;
+ add(newAttribute, gbc);
+ newAttribute.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newAttributeClicked();
+ }
+ });
+
+ gbc.gridx ++;
+ JSeparator sep = new JSeparator(SwingConstants.VERTICAL);
+ gbc.fill = GridBagConstraints.VERTICAL;
+ add(sep, gbc);
+
+ lFilter = Utilities.createPrimaryLabel(INFO_CTRL_PANEL_FILTER_LABEL.get());
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.gridx ++;
+ add(lFilter, gbc);
+
+ filterAttribute = Utilities.createComboBox();
+ filterAttribute.setModel(
+ new DefaultComboBoxModel(new Message[]{
+ NAME,
+ TYPE,
+ PARENT_CLASS,
+ CHILD_CLASS,
+ REQUIRED_ATTRIBUTES,
+ OPTIONAL_ATTRIBUTES}));
+ filterAttribute.setRenderer(new CustomListCellRenderer(filterAttribute));
+ gbc.insets.left = 5;
+ gbc.gridx ++;
+ add(filterAttribute, gbc);
+
+ filter = new FilterTextField();
+ filter.addKeyListener(new KeyAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void keyReleased(KeyEvent e)
+ {
+ if ((e.getKeyCode() == KeyEvent.VK_ENTER) && applyButton.isEnabled())
+ {
+ filter.displayRefreshIcon(FilterTextField.DEFAULT_REFRESH_ICON_TIME);
+ repopulateTree(treePane.getTree());
+ }
+ }
+ });
+ filter.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ filter.displayRefreshIcon(FilterTextField.DEFAULT_REFRESH_ICON_TIME);
+ repopulateTree(treePane.getTree());
+ }
+ });
+ gbc.gridx ++;
+ gbc.weightx = 1.0;
+ add(filter, gbc);
+
+ applyButton =
+ Utilities.createButton(INFO_CTRL_PANEL_APPLY_BUTTON_LABEL.get());
+ applyButton.setOpaque(false);
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ gbc.insets.right = 10;
+ add(applyButton, gbc);
+ applyButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ filter.displayRefreshIcon(FilterTextField.DEFAULT_REFRESH_ICON_TIME);
+ repopulateTree(treePane.getTree());
+ }
+ });
+
+ gbc.insets = new Insets(10, 0, 0, 0);
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridwidth = 7;
+ add(createSplitPane(), gbc);
+
+ // The button panel
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ gbc.insets = new Insets(0, 0, 0, 0);
+ add(createButtonsPanel(), gbc);
+ }
+
+ private JPanel createButtonsPanel()
+ {
+ JPanel buttonsPanel = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.gridwidth = 1;
+ gbc.gridy = 0;
+ lNumberOfElements = Utilities.createDefaultLabel();
+ gbc.insets = new Insets(10, 10, 10, 10);
+ buttonsPanel.add(lNumberOfElements, gbc);
+ gbc.weightx = 1.0;
+ gbc.gridx ++;
+ buttonsPanel.add(Box.createHorizontalGlue(), gbc);
+ buttonsPanel.setOpaque(true);
+ buttonsPanel.setBackground(ColorAndFontConstants.greyBackground);
+ gbc.insets.left = 5;
+ gbc.insets.right = 10;
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ JButton closeButton =
+ Utilities.createButton(INFO_CTRL_PANEL_CLOSE_BUTTON_LABEL.get());
+ closeButton.setOpaque(false);
+ buttonsPanel.add(closeButton, gbc);
+ closeButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ closeClicked();
+ }
+ });
+
+ buttonsPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0,
+ ColorAndFontConstants.defaultBorderColor));
+
+ return buttonsPanel;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_MANAGE_SCHEMA_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return filter;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void closeClicked()
+ {
+ setSecondaryValid(lFilter);
+ super.closeClicked();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ // No ok button
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ private Component createSplitPane()
+ {
+ treePane = new TreePanel();
+
+ lNoMatchFound =Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NO_MATCHES_FOUND_LABEL.get());
+ lNoMatchFound.setVisible(false);
+
+ entryPane = new SchemaBrowserRightPanel();
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setBackground(ColorAndFontConstants.background);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 1;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ Utilities.setBorder(treePane, new EmptyBorder(10, 0, 10, 0));
+ p.add(treePane, gbc);
+ Utilities.setBorder(lNoMatchFound, new EmptyBorder(15, 15, 15, 15));
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ p.add(lNoMatchFound, gbc);
+ JScrollPane treeScroll = Utilities.createScrollPane(p);
+
+ entryPane.addSchemaElementSelectionListener(
+ new SchemaElementSelectionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void schemaElementSelected(SchemaElementSelectionEvent ev)
+ {
+ Object element = ev.getSchemaElement();
+ DefaultTreeModel model =
+ (DefaultTreeModel)treePane.getTree().getModel();
+ Object root = model.getRoot();
+ selectElementUnder(root, element, model);
+ }
+ });
+
+ treePane.getTree().addTreeSelectionListener(new TreeSelectionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void valueChanged(TreeSelectionEvent ev)
+ {
+ if (!ignoreSelectionEvents)
+ {
+ ignoreSelectionEvents = true;
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+
+ if (entryPane.mustCheckUnsavedChanges())
+ {
+ ignoreSelectionEvents = true;
+ treePane.getTree().setSelectionPath(lastEntryTreePath);
+ switch (entryPane.checkUnsavedChanges())
+ {
+ case DO_NOT_SAVE:
+ break;
+ case SAVE:
+ break;
+ case CANCEL:
+ ignoreSelectionEvents = false;
+ return;
+ }
+ if (paths != null)
+ {
+ treePane.getTree().setSelectionPaths(paths);
+ }
+ else
+ {
+ treePane.getTree().clearSelection();
+ }
+ }
+
+ boolean deletableElementsSelected = false;
+ boolean nonDeletableElementsSelected = false;
+ if (paths != null)
+ {
+ for (TreePath path : paths)
+ {
+ Object node = path.getLastPathComponent();
+ if (node instanceof CategoryTreeNode)
+ {
+ nonDeletableElementsSelected = true;
+ }
+ else if ((node instanceof CustomObjectClassTreeNode) ||
+ (node instanceof CustomAttributeTreeNode))
+ {
+ deletableElementsSelected = true;
+ }
+ else if (node instanceof SchemaElementTreeNode)
+ {
+ nonDeletableElementsSelected = true;
+ }
+ }
+ }
+ deleteMenuItem.setEnabled(deletableElementsSelected &&
+ !nonDeletableElementsSelected);
+ updateEntryPane();
+ ignoreSelectionEvents = false;
+ }
+ }
+ });
+ DefaultMutableTreeNode root = new DefaultMutableTreeNode("Tree root");
+ for (DefaultMutableTreeNode node : underRootNodes)
+ {
+ root.add(node);
+ }
+ DefaultTreeModel model = new DefaultTreeModel(root);
+ JTree tree = treePane.getTree();
+ tree.setModel(model);
+ tree.setRootVisible(false);
+ tree.setVisibleRowCount(20);
+ tree.expandPath(new TreePath(root));
+ tree.setCellRenderer(new SchemaTreeCellRenderer());
+ addPopupMenu();
+ treeScroll.setPreferredSize(
+ new Dimension((3 * treeScroll.getPreferredSize().width) / 2,
+ 5 * treeScroll.getPreferredSize().height));
+ entryPane.displayMessage(NO_SCHEMA_ITEM_SELECTED);
+ entryPane.setBorder(treeScroll.getBorder());
+ entryPane.setPreferredSize(
+ new Dimension(treeScroll.getPreferredSize().width,
+ treeScroll.getPreferredSize().height));
+ JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+ pane.setOpaque(true); //content panes must be opaque
+ pane.setLeftComponent(treeScroll);
+ pane.setRightComponent(entryPane);
+ pane.setResizeWeight(0.0);
+ pane.setDividerLocation(treeScroll.getPreferredSize().width);
+ return pane;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ super.setInfo(info);
+ treePane.setInfo(info);
+ entryPane.setInfo(info);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ final ServerDescriptor desc = ev.getNewDescriptor();
+ if ((lastSchema == null) ||
+ !ServerDescriptor.areSchemasEqual(lastSchema, desc.getSchema())||
+ true)
+ {
+ lastSchema = desc.getSchema();
+ if (lastSchema != null)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ repopulateTree(treePane.getTree());
+ }
+ });
+ }
+ else
+ {
+ updateErrorPane(errorPane,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_SUMMARY.get(),
+ ColorAndFontConstants.errorTitleFont,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_DETAILS.get(),
+ ColorAndFontConstants.defaultFont);
+ if (!errorPane.isVisible())
+ {
+ errorPane.setVisible(true);
+ }
+ }
+ }
+ }
+
+ /**
+ * Selects the node in the tree that corresponds to a given schema element.
+ * @param root the node we must start searching for the node to be selected.
+ * @param element the schema element.
+ * @param model the tree model.
+ * @return <CODE>true</CODE> if the node was found and selected and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean selectElementUnder(Object root, Object element,
+ DefaultTreeModel model)
+ {
+ int n = model.getChildCount(root);
+ boolean found = false;
+ for (int i=0; i<n && !found; i++)
+ {
+ Object node = model.getChild(root, i);
+ if (node instanceof SchemaElementTreeNode)
+ {
+ SchemaElementTreeNode schemaNode = (SchemaElementTreeNode)node;
+ if (schemaNode.getSchemaElement().equals(element))
+ {
+ found = true;
+ TreePath newSelectionPath = new TreePath(schemaNode.getPath());
+ treePane.getTree().setSelectionPath(newSelectionPath);
+ treePane.getTree().scrollPathToVisible(newSelectionPath);
+ }
+ }
+ if (!found)
+ {
+ found = selectElementUnder(node, element, model);
+ }
+ }
+ return found;
+ }
+
+ /**
+ * Repopulates the tree.
+ * @param tree the tree to be repopulated.
+ */
+ private void repopulateTree(JTree tree)
+ {
+ if (lastSchema == null)
+ {
+ return;
+ }
+ ignoreSelectionEvents = true;
+ DefaultMutableTreeNode root = getRoot(tree);
+
+ TreePath path = tree.getSelectionPath();
+ DefaultMutableTreeNode lastSelectedNode = null;
+ if (path != null)
+ {
+ lastSelectedNode = (DefaultMutableTreeNode)path.getLastPathComponent();
+ }
+ TreePath newSelectionPath = null;
+
+ TreeSet<String> standardOcNames = new TreeSet<String>();
+ HashMap<String, StandardObjectClassTreeNode> hmStandardOcs =
+ new HashMap<String, StandardObjectClassTreeNode>();
+ TreeSet<String> configurationOcNames = new TreeSet<String>();
+ HashMap<String, ConfigurationObjectClassTreeNode> hmConfigurationOcs =
+ new HashMap<String, ConfigurationObjectClassTreeNode>();
+ TreeSet<String> customOcNames = new TreeSet<String>();
+ HashMap<String, CustomObjectClassTreeNode> hmCustomOcs =
+ new HashMap<String, CustomObjectClassTreeNode>();
+ for (ObjectClass oc : lastSchema.getObjectClasses().values())
+ {
+ if (mustAdd(oc))
+ {
+ String name = oc.getPrimaryName();
+ if (Utilities.isStandard(oc))
+ {
+ standardOcNames.add(name);
+ hmStandardOcs.put(name, new StandardObjectClassTreeNode(name, oc));
+ }
+ else if (Utilities.isConfiguration(oc))
+ {
+ configurationOcNames.add(name);
+ hmConfigurationOcs.put(name,
+ new ConfigurationObjectClassTreeNode(name, oc));
+ }
+ else
+ {
+ customOcNames.add(name);
+ hmCustomOcs.put(name, new CustomObjectClassTreeNode(name, oc));
+ }
+ }
+ }
+
+
+ TreeSet<String> standardAttrNames = new TreeSet<String>();
+ HashMap<String, StandardAttributeTreeNode> hmStandardAttrs =
+ new HashMap<String, StandardAttributeTreeNode>();
+ TreeSet<String> configurationAttrNames = new TreeSet<String>();
+ HashMap<String, ConfigurationAttributeTreeNode> hmConfigurationAttrs =
+ new HashMap<String, ConfigurationAttributeTreeNode>();
+ TreeSet<String> customAttrNames = new TreeSet<String>();
+ HashMap<String, CustomAttributeTreeNode> hmCustomAttrs =
+ new HashMap<String, CustomAttributeTreeNode>();
+ for (AttributeType attr : lastSchema.getAttributeTypes().values())
+ {
+ if (mustAdd(attr))
+ {
+ String name = attr.getPrimaryName();
+ if (Utilities.isStandard(attr))
+ {
+ standardAttrNames.add(name);
+ hmStandardAttrs.put(name, new StandardAttributeTreeNode(name, attr));
+ }
+ else if (Utilities.isConfiguration(attr))
+ {
+ configurationAttrNames.add(name);
+ hmConfigurationAttrs.put(name,
+ new ConfigurationAttributeTreeNode(name, attr));
+ }
+ else
+ {
+ customAttrNames.add(name);
+ hmCustomAttrs.put(name, new CustomAttributeTreeNode(name, attr));
+ }
+ }
+ }
+
+ TreeSet<String> matchingRuleNames = new TreeSet<String>();
+ HashMap<String, MatchingRuleTreeNode> hmMatchingRules =
+ new HashMap<String, MatchingRuleTreeNode>();
+ for (MatchingRule matchingRule : lastSchema.getMatchingRules().values())
+ {
+ if (mustAdd(matchingRule))
+ {
+ String name = matchingRule.getNameOrOID();
+ matchingRuleNames.add(name);
+ hmMatchingRules.put(name, new MatchingRuleTreeNode(name, matchingRule));
+ }
+ }
+
+ TreeSet<String> syntaxNames = new TreeSet<String>();
+ HashMap<String, AttributeSyntaxTreeNode> hmSyntaxes =
+ new HashMap<String, AttributeSyntaxTreeNode>();
+ for (AttributeSyntax syntax : lastSchema.getSyntaxes().values())
+ {
+ if (mustAdd(syntax))
+ {
+ String name = syntax.getSyntaxName();
+ if (name == null)
+ {
+ name = syntax.getOID();
+ }
+ syntaxNames.add(name);
+ hmSyntaxes.put(name, new AttributeSyntaxTreeNode(name, syntax));
+ }
+ }
+
+
+ ArrayList<TreeSet<String>> names = new ArrayList<TreeSet<String>>();
+ names.add(standardOcNames);
+ names.add(standardAttrNames);
+ names.add(customOcNames);
+ names.add(customAttrNames);
+ names.add(configurationOcNames);
+ names.add(configurationAttrNames);
+ names.add(matchingRuleNames);
+ names.add(syntaxNames);
+
+ int size = 0;
+ for (TreeSet<String> set : names)
+ {
+ size += set.size();
+ }
+
+ ArrayList<HashMap<String, ? extends DefaultMutableTreeNode>> nodes =
+ new ArrayList<HashMap<String, ? extends DefaultMutableTreeNode>>();
+ nodes.add(hmStandardOcs);
+ nodes.add(hmStandardAttrs);
+ nodes.add(hmCustomOcs);
+ nodes.add(hmCustomAttrs);
+ nodes.add(hmConfigurationOcs);
+ nodes.add(hmConfigurationAttrs);
+ nodes.add(hmMatchingRules);
+ nodes.add(hmSyntaxes);
+
+ DefaultTreeModel model = (DefaultTreeModel)tree.getModel();
+
+ String f = filter.getText().trim();
+ boolean filterProvided = f.length() > 0;
+
+ ArrayList<TreePath> toExpand = new ArrayList<TreePath>();
+
+ int i = 0;
+ int positionUnderRoot = 0;
+ boolean rootWasEmpty = root.getChildCount() == 0;
+ boolean expand = filterProvided;
+ if (root.getIndex(objectClasses) == -1)
+ {
+ model.insertNodeInto(objectClasses, root, positionUnderRoot);
+ }
+ else if (!expand)
+ {
+ expand = tree.isExpanded(new TreePath(objectClasses.getPath()));
+ }
+ if (expand)
+ {
+ toExpand.add(new TreePath(objectClasses.getPath()));
+ }
+ positionUnderRoot ++;
+
+ expand = filterProvided;
+ if (root.getIndex(attributes) == -1)
+ {
+ model.insertNodeInto(attributes, root, positionUnderRoot);
+ }
+ else if (!expand)
+ {
+ expand = tree.isExpanded(new TreePath(attributes.getPath()));
+ }
+ if (expand)
+ {
+ toExpand.add(new TreePath(attributes.getPath()));
+ }
+ positionUnderRoot ++;
+ int positionUnderAttributes = 0;
+ int positionUnderObjectClass = 0;
+
+ for (DefaultMutableTreeNode parent : categoryNodes)
+ {
+ if (nodes.get(i).size() == 0)
+ {
+ if (parent.getParent() != null)
+ {
+ parent.removeAllChildren();
+ model.removeNodeFromParent(parent);
+ }
+ }
+ else
+ {
+ expand = false;
+ if ((parent == standardObjectClasses) || (parent == customObjectClasses)
+ || (parent == configurationObjectClasses))
+ {
+ if (objectClasses.getIndex(parent) == -1)
+ {
+ model.insertNodeInto(parent, objectClasses,
+ positionUnderObjectClass);
+ }
+ else
+ {
+ expand = tree.isExpanded(new TreePath(parent.getPath()));
+ parent.removeAllChildren();
+ }
+ positionUnderObjectClass ++;
+ }
+ else if ((parent == standardAttributes) || (parent == customAttributes)
+ || (parent == configurationAttributes))
+ {
+ if (attributes.getIndex(parent) == -1)
+ {
+ model.insertNodeInto(parent, attributes, positionUnderAttributes);
+ }
+ else
+ {
+ expand = tree.isExpanded(new TreePath(parent.getPath()));
+ parent.removeAllChildren();
+ }
+ positionUnderAttributes ++;
+ }
+ else
+ {
+ if (root.getIndex(parent) == -1)
+ {
+ model.insertNodeInto(parent, root, positionUnderRoot);
+ }
+ else
+ {
+ expand = tree.isExpanded(new TreePath(parent.getPath()));
+ parent.removeAllChildren();
+ }
+ positionUnderRoot ++;
+ }
+
+ for (String name : names.get(i))
+ {
+ DefaultMutableTreeNode node = nodes.get(i).get(name);
+ parent.add(node);
+ if ((newSelectionPath == null) &&
+ ((lastSelectedNode != null) || (lastCreatedElement != null)))
+ {
+ if (lastCreatedElement != null)
+ {
+ if ((node instanceof CustomObjectClassTreeNode) &&
+ (lastCreatedElement instanceof ObjectClass))
+ {
+ if (name.equals(lastCreatedElement.getNameOrOID()))
+ {
+ newSelectionPath = new TreePath(node.getPath());
+ lastCreatedElement = null;
+ }
+ }
+ else if ((node instanceof CustomAttributeTreeNode) &&
+ (lastCreatedElement instanceof AttributeType))
+ {
+ if (name.equals(lastCreatedElement.getNameOrOID()))
+ {
+ newSelectionPath = new TreePath(node.getPath());
+ lastCreatedElement = null;
+ }
+ }
+ }
+ else if (name.equals(lastSelectedNode.getUserObject()))
+ {
+ newSelectionPath = new TreePath(node.getPath());
+ }
+ }
+ }
+ model.nodeStructureChanged(parent);
+ if (expand || filterProvided)
+ {
+ toExpand.add(new TreePath(parent.getPath()));
+ }
+ }
+ i++;
+ }
+
+ DefaultMutableTreeNode[] ocAndAttrs = {objectClasses, attributes};
+ for (DefaultMutableTreeNode node : ocAndAttrs)
+ {
+ if (node.getParent() != null)
+ {
+ if (node.getChildCount() == 0)
+ {
+ model.removeNodeFromParent(node);
+ model.nodeStructureChanged(node);
+ }
+ }
+ }
+
+ if (newSelectionPath != null)
+ {
+ tree.setSelectionPath(newSelectionPath);
+ tree.scrollPathToVisible(newSelectionPath);
+ }
+ TreePath rootPath = new TreePath(root.getPath());
+ if (rootWasEmpty || !tree.isVisible(rootPath))
+ {
+ tree.expandPath(rootPath);
+ }
+ for (TreePath p : toExpand)
+ {
+ tree.expandPath(p);
+ }
+ updateEntryPane();
+ ignoreSelectionEvents = false;
+ int nElements = hmStandardOcs.size() + hmConfigurationOcs.size() +
+ hmCustomOcs.size() + hmStandardAttrs.size() + hmConfigurationAttrs.size() +
+ hmCustomAttrs.size() + hmMatchingRules.size() + hmSyntaxes.size();
+ lNoMatchFound.setVisible(nElements == 0);
+ treePane.setVisible(nElements > 0);
+ if (nElements > 0)
+ {
+ lNumberOfElements.setText("Number of elements: "+nElements);
+ lNumberOfElements.setVisible(true);
+ }
+ else
+ {
+ lNumberOfElements.setVisible(false);
+ }
+ if ((newSelectionPath == null) && (f.length() > 0))
+ {
+ for (i=0; i<tree.getRowCount(); i++)
+ {
+ newSelectionPath = tree.getPathForRow(i);
+ Object node = newSelectionPath.getLastPathComponent();
+ if (!(node instanceof CategoryTreeNode))
+ {
+ tree.setSelectionPath(newSelectionPath);
+ break;
+ }
+ }
+ }
+ repaint();
+ }
+
+ /**
+ * Updates the right entry panel.
+ *
+ */
+ private void updateEntryPane()
+ {
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ TreePath path = null;
+ if ((paths != null) && (paths.length == 1))
+ {
+ path = paths[0];
+ }
+ lastEntryTreePath = path;
+ if (path != null)
+ {
+ Object node = path.getLastPathComponent();
+ if (node instanceof StandardObjectClassTreeNode)
+ {
+ entryPane.updateStandardObjectClass(
+ ((StandardObjectClassTreeNode)node).getObjectClass(), lastSchema);
+ }
+ else if (node instanceof ConfigurationObjectClassTreeNode)
+ {
+ entryPane.updateConfigurationObjectClass(
+ ((ConfigurationObjectClassTreeNode)node).getObjectClass(),
+ lastSchema);
+ }
+ else if (node instanceof CustomObjectClassTreeNode)
+ {
+ entryPane.updateCustomObjectClass(
+ ((CustomObjectClassTreeNode)node).getObjectClass(), lastSchema);
+ }
+ else if (node instanceof StandardAttributeTreeNode)
+ {
+ entryPane.updateStandardAttribute(
+ ((StandardAttributeTreeNode)node).getAttribute(), lastSchema);
+ }
+ else if (node instanceof ConfigurationAttributeTreeNode)
+ {
+ entryPane.updateConfigurationAttribute(
+ ((ConfigurationAttributeTreeNode)node).getAttribute(), lastSchema);
+ }
+ else if (node instanceof CustomAttributeTreeNode)
+ {
+ entryPane.updateCustomAttribute(
+ ((CustomAttributeTreeNode)node).getAttribute(), lastSchema);
+ }
+ else if (node instanceof MatchingRuleTreeNode)
+ {
+ entryPane.updateMatchingRule(
+ ((MatchingRuleTreeNode)node).getMatchingRule(), lastSchema);
+ }
+ else if (node instanceof AttributeSyntaxTreeNode)
+ {
+ entryPane.updateAttributeSyntax(
+ ((AttributeSyntaxTreeNode)node).getAttributeSyntax(), lastSchema);
+ }
+ else
+ {
+ entryPane.displayMessage(NO_SCHEMA_ITEM_SELECTED);
+ }
+ }
+ else
+ {
+ if ((paths != null) && (paths.length > 1))
+ {
+ boolean categorySelected = false;
+ int nNonCategory = 0;
+ for (TreePath p : paths)
+ {
+ Object node = p.getLastPathComponent();
+ if (node instanceof CategoryTreeNode)
+ {
+ categorySelected = true;
+ }
+ else
+ {
+ nNonCategory ++;
+ }
+ }
+ if (nNonCategory == 0)
+ {
+ entryPane.displayMessage(NO_SCHEMA_ITEM_SELECTED);
+ }
+ else if (categorySelected)
+ {
+ entryPane.displayMessage(CATEGORY_ITEM_SELECTED);
+ }
+ else
+ {
+ entryPane.displayMessage(MULTIPLE_ITEMS_SELECTED);
+ }
+ }
+ else
+ {
+ entryPane.displayMessage(NO_SCHEMA_ITEM_SELECTED);
+ }
+ }
+ }
+
+ /**
+ * Adds a popup menu.
+ *
+ */
+ private void addPopupMenu()
+ {
+ popup = new JPopupMenu();
+ JMenuItem menuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_OBJECTCLASS_MENU.get());
+ menuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newObjectClassClicked();
+ }
+ });
+ popup.add(menuItem);
+ menuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_NEW_ATTRIBUTE_MENU.get());
+ menuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ newAttributeClicked();
+ }
+ });
+ popup.add(menuItem);
+ popup.add(new JSeparator());
+ deleteMenuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_DELETE_SCHEMA_ELEMENT_MENU.get());
+ deleteMenuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteClicked();
+ }
+ });
+ popup.add(deleteMenuItem);
+ deleteMenuItem.setEnabled(false);
+
+ popup.setOpaque(true);
+
+ ((CustomTree)treePane.getTree()).setPopupMenu(popup);
+ }
+
+ private void deleteClicked()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ ArrayList<ObjectClass> ocsToDelete = new ArrayList<ObjectClass>();
+ ArrayList<AttributeType> attrsToDelete = new ArrayList<AttributeType>();
+ if (paths != null)
+ {
+ for (TreePath path : paths)
+ {
+ Object node = path.getLastPathComponent();
+ if (node instanceof CustomObjectClassTreeNode)
+ {
+ ocsToDelete.add(((CustomObjectClassTreeNode)node).getObjectClass());
+ }
+ else if (node instanceof CustomAttributeTreeNode)
+ {
+ attrsToDelete.add(((CustomAttributeTreeNode)node).getAttribute());
+ }
+ }
+ }
+
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ ArrayList<String> ocNames = new ArrayList<String>();
+ ArrayList<String> attrNames = new ArrayList<String>();
+ if (schema != null)
+ {
+// Analyze objectClasses
+ for (ObjectClass objectClass : ocsToDelete)
+ {
+ ArrayList<ObjectClass> childClasses = new ArrayList<ObjectClass>();
+ for (ObjectClass o : schema.getObjectClasses().values())
+ {
+ if (objectClass.equals(o.getSuperiorClass()))
+ {
+ childClasses.add(o);
+ }
+ }
+ childClasses.removeAll(ocsToDelete);
+ if (!childClasses.isEmpty())
+ {
+ ArrayList<String> childNames = new ArrayList<String>();
+ for (ObjectClass oc : childClasses)
+ {
+ childNames.add(oc.getNameOrOID());
+ }
+ String ocName = objectClass.getNameOrOID();
+ errors.add(ERR_CANNOT_DELETE_PARENT_OBJECTCLASS.get(ocName,
+ Utilities.getStringFromCollection(childNames, ", "), ocName));
+ }
+ ocNames.add(objectClass.getNameOrOID());
+ }
+// Analyze attributes
+ for (AttributeType attribute : attrsToDelete)
+ {
+ String attrName = attribute.getNameOrOID();
+ ArrayList<AttributeType> childAttributes =
+ new ArrayList<AttributeType>();
+ for (AttributeType attr : schema.getAttributeTypes().values())
+ {
+ if (attribute.equals(attr.getSuperiorType()))
+ {
+ childAttributes.add(attr);
+ }
+ }
+ childAttributes.removeAll(attrsToDelete);
+ if (!childAttributes.isEmpty())
+ {
+ ArrayList<String> childNames = new ArrayList<String>();
+ for (AttributeType attr : childAttributes)
+ {
+ childNames.add(attr.getNameOrOID());
+ }
+ errors.add(ERR_CANNOT_DELETE_PARENT_ATTRIBUTE.get(attrName,
+ Utilities.getStringFromCollection(childNames, ", "), attrName));
+ }
+
+ ArrayList<String> dependentClasses = new ArrayList<String>();
+ for (ObjectClass o : schema.getObjectClasses().values())
+ {
+ if (o.getRequiredAttributeChain().contains(attribute))
+ {
+ dependentClasses.add(o.getNameOrOID());
+ }
+ }
+ dependentClasses.removeAll(ocsToDelete);
+ if (!dependentClasses.isEmpty())
+ {
+ errors.add(ERR_CANNOT_DELETE_ATTRIBUTE_WITH_DEPENDENCIES.get(
+ attrName,
+ Utilities.getStringFromCollection(dependentClasses, ", "),
+ attrName));
+ }
+ attrNames.add(attribute.getNameOrOID());
+ }
+ }
+ else
+ {
+ errors.add(ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_DETAILS.get());
+ }
+ if (errors.isEmpty())
+ {
+ // Reorder objectClasses and attributes to delete them in the proper
+ // order.
+ ArrayList<ObjectClass> orderedObjectClasses =
+ new ArrayList<ObjectClass>();
+ for (ObjectClass oc : ocsToDelete)
+ {
+ int index = -1;
+ for (int i=0; i<orderedObjectClasses.size(); i++)
+ {
+ ObjectClass parent = orderedObjectClasses.get(i).getSuperiorClass();
+ while ((parent != null) && (index == -1))
+ {
+ if (parent.equals(oc))
+ {
+ index = i+1;
+ }
+ else
+ {
+ parent = parent.getSuperiorClass();
+ }
+ }
+ }
+ if (index == -1)
+ {
+ orderedObjectClasses.add(oc);
+ }
+ else
+ {
+ orderedObjectClasses.add(index, oc);
+ }
+ }
+
+ ArrayList<AttributeType> orderedAttributes =
+ new ArrayList<AttributeType>();
+ for (AttributeType attr : attrsToDelete)
+ {
+ int index = -1;
+ for (int i=0; i<orderedAttributes.size(); i++)
+ {
+ AttributeType parent = orderedAttributes.get(i).getSuperiorType();
+ while ((parent != null) && (index == -1))
+ {
+ if (parent.equals(attr))
+ {
+ index = i+1;
+ }
+ else
+ {
+ parent = parent.getSuperiorType();
+ }
+ }
+ }
+ if (index == -1)
+ {
+ orderedAttributes.add(attr);
+ }
+ else
+ {
+ orderedAttributes.add(index, attr);
+ }
+ }
+ Message title;
+ if (orderedAttributes.isEmpty())
+ {
+ title = INFO_CTRL_PANEL_DELETE_OBJECTCLASSES_TITLE.get();
+ }
+ else if (orderedObjectClasses.isEmpty())
+ {
+ title = INFO_CTRL_PANEL_DELETE_ATTRIBUTES_TITLE.get();
+ }
+ else
+ {
+ title = INFO_CTRL_PANEL_DELETE_OBJECTCLASSES_AND_ATTRIBUTES_TITLE.get();
+ }
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this), title, getInfo());
+ DeleteSchemaElementsTask newTask =
+ new DeleteSchemaElementsTask(getInfo(), dlg, orderedObjectClasses,
+ orderedAttributes);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ ArrayList<String> allNames = new ArrayList<String>();
+ allNames.addAll(ocNames);
+ allNames.addAll(attrNames);
+ Message confirmationMessage =
+ INFO_CTRL_PANEL_CONFIRMATION_DELETE_SCHEMA_ELEMENTS_DETAILS.get(
+ Utilities.getStringFromCollection(allNames, ", "));
+ if (displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ confirmationMessage))
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_SCHEMA_ELEMENTS_SUMMARY.get(),
+ INFO_CTRL_PANEL_DELETING_SCHEMA_ELEMENTS_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_SCHEMA_ELEMENTS_SUCCESSFUL.get(
+ Utilities.getStringFromCollection(allNames, ", ")),
+ ERR_CTRL_PANEL_DELETING_SCHEMA_ELEMENTS_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_SCHEMA_ELEMENTS_ERROR_DETAILS.get(),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ }
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Checks whether a given attribute type must be added or not. Method used to
+ * do the filtering based on the name.
+ * @param attr the attribute type.
+ * @param attrName the name provided by the user.
+ * @return <CODE>true</CODE> if the attribute must be added and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean mustAddAttributeName(AttributeType attr, String attrName)
+ {
+ ArrayList<String> values = new ArrayList<String>();
+ String oid = attr.getOID();
+ values.add(oid);
+
+ String name = attr.getPrimaryName();
+ if (name != null)
+ {
+ values.add(name);
+ }
+ Iterable<String> names = attr.getNormalizedNames();
+ for (String v : names)
+ {
+ values.add(v);
+ }
+ return matchFilter(values, attrName, false);
+ }
+
+ /**
+ * Checks whether a given object class must be added or not. Method used to
+ * do the filtering based on the name.
+ * @param oc the object class.
+ * @param ocName the name provided by the user.
+ * @return <CODE>true</CODE> if the objectclass must be added and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean mustAddObjectClassName(ObjectClass oc, String ocName)
+ {
+ ArrayList<String> values = new ArrayList<String>();
+ String oid = oc.getOID();
+ values.add(oid);
+
+ String name = oc.getPrimaryName();
+ if (name != null)
+ {
+ values.add(name);
+ }
+ Iterable<String> names = oc.getNormalizedNames();
+ for (String v : names)
+ {
+ values.add(v);
+ }
+ return matchFilter(values, ocName, false);
+ }
+
+ /**
+ * Check whether the provided attribute must be added or not.
+ * @param attr the attribute.
+ * @return <CODE>true</CODE> if the attribute must be added and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean mustAdd(AttributeType attr)
+ {
+ boolean mustAdd = true;
+
+ String f = filter.getText().trim();
+ if (f.length () > 0)
+ {
+ Object filterType = filterAttribute.getSelectedItem();
+
+ if (NAME.equals(filterType))
+ {
+ mustAdd = mustAddAttributeName(attr, f);
+ }
+ else if (TYPE.equals(filterType))
+ {
+ String[] elements = f.split("[ ,]");
+ String text =
+ StandardAttributePanel.getTypeValue(attr).toString().toLowerCase();
+ for (int i=0; i<elements.length && mustAdd; i++)
+ {
+ mustAdd = text.indexOf(elements[i].toLowerCase()) != -1;
+ }
+ }
+ else
+ {
+ mustAdd = false;
+ }
+ }
+ return mustAdd;
+ }
+
+ /**
+ * Check whether the provided object class must be added or not.
+ * @param oc the objectclass.
+ * @return <CODE>true</CODE> if the objectclass must be added and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean mustAdd(ObjectClass oc)
+ {
+ boolean mustAdd = true;
+ String f = filter.getText().trim();
+ if (f.length () > 0)
+ {
+ Object filterType = filterAttribute.getSelectedItem();
+
+ if (NAME.equals(filterType))
+ {
+ mustAdd = mustAddObjectClassName(oc, f);
+ }
+ else if (TYPE.equals(filterType))
+ {
+ String[] elements = f.split("[ ,]");
+ String text =
+ StandardObjectClassPanel.getTypeValue(oc).toString().toLowerCase();
+ for (int i=0; i<elements.length && mustAdd; i++)
+ {
+ mustAdd = text.indexOf(elements[i].toLowerCase()) != -1;
+ }
+ }
+ else if (REQUIRED_ATTRIBUTES.equals(filterType) ||
+ OPTIONAL_ATTRIBUTES.equals(filterType))
+ {
+ String[] attrValues = f.split(" ");
+ Set<AttributeType> definedAttrs;
+ if (REQUIRED_ATTRIBUTES.equals(filterType))
+ {
+ definedAttrs = oc.getRequiredAttributeChain();
+ }
+ else
+ {
+ definedAttrs = oc.getOptionalAttributeChain();
+ }
+ for (String attrName : attrValues)
+ {
+ mustAdd = false;
+ for (AttributeType attr : definedAttrs)
+ {
+ mustAdd = mustAddAttributeName(attr, attrName);
+ if (mustAdd)
+ {
+ break;
+ }
+ }
+ if (!mustAdd)
+ {
+ break;
+ }
+ }
+ }
+ else if (CHILD_CLASS.equals(filterType))
+ {
+ mustAdd = false;
+ for (ObjectClass o : lastSchema.getObjectClasses().values())
+ {
+ boolean isChild = false;
+ ObjectClass parent = o.getSuperiorClass();
+ while (!isChild && (parent != null))
+ {
+ isChild = parent == oc;
+ parent = parent.getSuperiorClass();
+ }
+ if (isChild)
+ {
+ mustAdd = mustAddObjectClassName(o, f);
+ if (mustAdd)
+ {
+ break;
+ }
+ }
+ }
+ }
+ else if (PARENT_CLASS.equals(filterType))
+ {
+ mustAdd = false;
+ ObjectClass parentClass = oc.getSuperiorClass();
+ while (!mustAdd && (parentClass != null))
+ {
+ mustAdd = mustAddObjectClassName(parentClass, f);
+ parentClass = parentClass.getSuperiorClass();
+ }
+ }
+ else
+ {
+ mustAdd = false;
+ }
+ }
+ return mustAdd;
+ }
+
+ /**
+ * Check whether the provided matching rule must be added or not.
+ * @param matchingRule the matching rule.
+ * @return <CODE>true</CODE> if the matching rule must be added and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean mustAdd(MatchingRule matchingRule)
+ {
+ boolean mustAdd = true;
+ String f = filter.getText().trim();
+ if (f.length () > 0)
+ {
+ if (NAME.equals(filterAttribute.getSelectedItem()))
+ {
+ ArrayList<String> values = new ArrayList<String>();
+ String oid = matchingRule.getOID();
+ values.add(oid);
+
+ String name = matchingRule.getName();
+ if (name != null)
+ {
+ values.add(name);
+ }
+ mustAdd = matchFilter(values, f, false);
+ }
+ else if (TYPE.equals(filterAttribute.getSelectedItem()))
+ {
+ String[] elements = f.split("[ ,]");
+ String text =
+ MatchingRulePanel.getTypeValue(matchingRule).toString().toLowerCase();
+ for (int i=0; i<elements.length && mustAdd; i++)
+ {
+ mustAdd = text.indexOf(elements[i].toLowerCase()) != -1;
+ }
+ }
+ else
+ {
+ mustAdd = false;
+ }
+ }
+ return mustAdd;
+ }
+
+ /**
+ * Check whether the provided attribute syntax must be added or not.
+ * @param syntax the attribute syntax.
+ * @return <CODE>true</CODE> if the attribute syntax must be added and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean mustAdd(AttributeSyntax syntax)
+ {
+ boolean mustAdd = true;
+ String f = filter.getText().trim();
+ if (f.length () > 0)
+ {
+ if (NAME.equals(filterAttribute.getSelectedItem()))
+ {
+ ArrayList<String> values = new ArrayList<String>();
+ String oid = syntax.getOID();
+ values.add(oid);
+
+ String name = syntax.getSyntaxName();
+ if (name != null)
+ {
+ values.add(name);
+ }
+ mustAdd = matchFilter(values, f, false);
+ }
+ else
+ {
+ mustAdd = false;
+ }
+ }
+ return mustAdd;
+ }
+
+ private boolean matchFilter(Collection<String> values, String filter,
+ boolean exact)
+ {
+ boolean matchFilter = false;
+ for (String value : values)
+ {
+ if (exact)
+ {
+ matchFilter = value.equalsIgnoreCase(filter);
+ }
+ else
+ {
+ matchFilter = value.toLowerCase().indexOf(filter.toLowerCase()) != -1;
+ }
+ if (matchFilter)
+ {
+ break;
+ }
+ }
+ return matchFilter;
+ }
+
+ private DefaultMutableTreeNode getRoot(JTree tree)
+ {
+ return (DefaultMutableTreeNode)tree.getModel().getRoot();
+ }
+
+ private void newAttributeClicked()
+ {
+ if (newAttributeDialog == null)
+ {
+ NewAttributePanel panel = new NewAttributePanel(
+ Utilities.getParentDialog(this));
+ panel.setInfo(getInfo());
+ newAttributeDialog = new GenericDialog(null, panel);
+ Utilities.centerGoldenMean(newAttributeDialog,
+ Utilities.getParentDialog(this));
+ panel.addConfigurationElementCreatedListener(
+ new ConfigurationElementCreatedListener()
+ {
+ public void elementCreated(ConfigurationElementCreatedEvent ev)
+ {
+ Object o = ev.getConfigurationObject();
+ if (o instanceof CommonSchemaElements)
+ {
+ lastCreatedElement = (CommonSchemaElements)o;
+ }
+ }
+ });
+ }
+ newAttributeDialog.setVisible(true);
+ }
+
+ private void newObjectClassClicked()
+ {
+ if (newObjectClassDialog == null)
+ {
+ NewObjectClassPanel panel = new NewObjectClassPanel(
+ Utilities.getParentDialog(this));
+ panel.setInfo(getInfo());
+ newObjectClassDialog = new GenericDialog(null, panel);
+ Utilities.centerGoldenMean(newObjectClassDialog,
+ Utilities.getParentDialog(this));
+ panel.addConfigurationElementCreatedListener(
+ new ConfigurationElementCreatedListener()
+ {
+ public void elementCreated(ConfigurationElementCreatedEvent ev)
+ {
+ Object o = ev.getConfigurationObject();
+ if (o instanceof CommonSchemaElements)
+ {
+ lastCreatedElement = (CommonSchemaElements)o;
+ }
+ }
+ });
+ }
+ newObjectClassDialog.setVisible(true);
+ }
+
+ private HashMap<Object, ImageIcon> hmCategoryImages =
+ new HashMap<Object, ImageIcon>();
+ private HashMap<Class, ImageIcon> hmImages = new HashMap<Class, ImageIcon>();
+ {
+ Object[] nodes = {attributes, objectClasses, standardObjectClasses,
+ standardAttributes, configurationObjectClasses, configurationAttributes,
+ customObjectClasses, customAttributes, matchingRules, syntaxes};
+ String[] paths = {"ds-attr-folder.png", "ds-class-folder.png",
+ "ds-folder.png",
+ "ds-folder.png", "ds-folder.png", "ds-folder.png", "ds-folder.png",
+ "ds-folder.png", "ds-rule-folder.png", "ds-syntax-folder.png"};
+ for (int i=0; i<nodes.length; i++)
+ {
+ hmCategoryImages.put(nodes[i],
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+"/"+paths[i]));
+ }
+ Class[] classes = {ConfigurationAttributeTreeNode.class,
+ StandardAttributeTreeNode.class, CustomAttributeTreeNode.class,
+ ConfigurationObjectClassTreeNode.class,
+ StandardObjectClassTreeNode.class, CustomObjectClassTreeNode.class,
+ MatchingRuleTreeNode.class, AttributeSyntaxTreeNode.class};
+ String[] ocPaths = {"ds-attr.png", "ds-attr.png", "ds-attr.png",
+ "ds-class.png", "ds-class.png", "ds-class.png", "ds-rule.png",
+ "ds-syntax.png"};
+ for (int i=0; i<classes.length; i++)
+ {
+ hmImages.put(classes[i],
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+"/"+ocPaths[i]));
+ }
+ };
+ /**
+ * Specific class used to render the nodes in the tree. It uses specific
+ * icons for the nodes.
+ *
+ */
+ protected class SchemaTreeCellRenderer extends TreeCellRenderer
+ {
+ private static final long serialVersionUID = -3390568254259441766L;
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getTreeCellRendererComponent(JTree tree, Object value,
+ boolean isSelected, boolean isExpanded, boolean isLeaf, int row,
+ boolean hasFocus)
+ {
+ super.getTreeCellRendererComponent(tree, value, isSelected, isExpanded,
+ isLeaf, row, hasFocus);
+ setIcon(getIcon(value));
+ return this;
+ }
+
+ private ImageIcon getIcon(Object value)
+ {
+ ImageIcon icon = hmImages.get(value.getClass());
+ if (icon == null)
+ {
+ icon = hmCategoryImages.get(value);
+ }
+ return icon;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
new file mode 100644
index 0000000..0e8f4dd
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
@@ -0,0 +1,249 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import java.awt.Color;
+import java.awt.Font;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.UIManager;
+import javax.swing.border.Border;
+
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * Class containing some Fonts and Colors used in the Control Panel.
+ *
+ */
+public class ColorAndFontConstants
+{
+ /**
+ * Foreground color (the color of normal text).
+ */
+ public static final Color foreground =
+ UIManager.getColor("TextField.foreground");
+ /**
+ * Background color (the color of the panels).
+ */
+ public static final Color background;
+ private static Color toggleButtonColor;
+ /**
+ * The border to be used for a text area.
+ */
+ public static final Border textAreaBorder;
+ static
+ {
+ Border border = new javax.swing.border.EmptyBorder(0, 0, 0, 0);
+ Color bg = Color.white;
+ try
+ {
+ if ((foreground.getGreen() + foreground.getRed() + foreground.getBlue()) >
+ (200 * 3))
+ {
+ // This is done to avoid problem in high contrast UIs
+ bg = UIManager.getColor("TextField.background");
+ }
+ else
+ {
+ bg = Color.white;
+ }
+ toggleButtonColor = UIManager.getColor("ToggleButton.background");
+ if (toggleButtonColor == null)
+ {
+ toggleButtonColor = new Color(200, 200, 200);
+ }
+
+ JScrollPane scroll = new JScrollPane(new JTextArea());
+ border = scroll.getViewportBorder();
+ if (border == null)
+ {
+ border = scroll.getBorder();
+ }
+ }
+ catch (Throwable t)
+ {
+ }
+ textAreaBorder = border;
+ background = bg;
+ }
+ /**
+ * The text color of buttons.
+ */
+ public static final Color buttonForeground =
+ UIManager.getColor("Button.foreground");
+ /**
+ * The text color of the category items.
+ */
+ public static final Color categoryForeground = foreground;
+ /**
+ * The text color of the BasicExpander components.
+ */
+ public static final Color expanderForeground = foreground;
+ /**
+ * The grey color background that is used for instance as background for the
+ * buttons in the dialogs (in the bottom of the dialogs).
+ */
+ public static final Color greyBackground = Utilities.isWindows() ?
+ UIManager.getColor("MenuBar.background") :
+ UIManager.getColor("Panel.background");
+ /**
+ * The default border color.
+ */
+ public static final Color defaultBorderColor =
+ Utilities.deriveColorHSB(toggleButtonColor, 0, 0, -.2f);
+
+ /**
+ * The grid color for the table.
+ */
+ public static final Color gridColor =
+ Utilities.isMacOS() ? defaultBorderColor :
+ UIManager.getColor("Table.gridColor");
+ /**
+ * The color of the text in the table.
+ */
+ public static final Color tableForeground = foreground;
+ /**
+ * The background color of the table.
+ */
+ public static final Color tableBackground = background;
+ /**
+ * The text color of the tree.
+ */
+ public static final Color treeForeground = foreground;
+ /**
+ * The background color of the tree.
+ */
+ public static final Color treeBackground = background;
+ /**
+ * The color of the background when the mouse is over (this is used in some
+ * components, like the accordion components or some tables to have a visual
+ * hint that some components can be clicked).
+ */
+ public static final Color mouseOverBackground =
+ UIManager.getColor("TextField.selectionBackground");
+ /**
+ * Text color indicating that a field is valid.
+ */
+ public static final Color validFontColor = foreground;
+
+ /**
+ * The color of the text when the mouse is over (this is used in some
+ * components, like the accordion components or some tables to have a visual
+ * hint that some components can be clicked).
+ */
+ public static final Color mouseOverForeground =
+ UIManager.getColor("TextField.selectionForeground");
+ /**
+ * The color of the background when the mouse is pressed (this is used in some
+ * components, like the accordion components or some tables to have a visual
+ * hint that some components can be clicked).
+ */
+ public static final Color pressedBackground =
+ Utilities.deriveColorHSB(mouseOverBackground,
+ 0, 0, -.20f);
+ /**
+ * The color of the text when the mouse is pressed (this is used in some
+ * components, like the accordion components or some tables to have a visual
+ * hint that some components can be clicked).
+ */
+ public static final Color pressedForeground =
+ Utilities.deriveColorHSB(mouseOverForeground,
+ 0, 0, +.20f);
+
+ /**
+ * The default font of the labels.
+ */
+ public static final Font defaultFont = UIManager.getFont("Label.font");
+ /**
+ * The font of the BasicExpander component.
+ */
+ public static final Font expanderFont = defaultFont.deriveFont(Font.BOLD);
+ /**
+ * The inline help font.
+ */
+ public static final Font inlineHelpFont = defaultFont.deriveFont(
+ (float)(defaultFont.getSize() - 2));
+ /**
+ * The font of the table header.
+ */
+ public final static Font headerFont =
+ UIManager.getFont("TableHeader.font").deriveFont(Font.BOLD);
+ /**
+ * The font to be used in the title of the error panes.
+ */
+ public static final Font errorTitleFont =
+ defaultFont.deriveFont(Font.BOLD).deriveFont(13f);
+ /**
+ * The font to be used in the CategoryButton component.
+ */
+ public static final Font categoryFont =
+ UIManager.getFont("Label.font").deriveFont(Font.BOLD);
+ /**
+ * The top border of the accordion component.
+ */
+ public static final Color topAccordionBorderColor = Utilities.deriveColorHSB(
+ toggleButtonColor, 0, 0, .2f);
+ /**
+ * The font to be used in primary labels.
+ */
+ public static final Font primaryFont = defaultFont.deriveFont(Font.BOLD);
+ /**
+ * The font to be used in the tree.
+ */
+ public static final Font treeFont = UIManager.getFont("Tree.font");
+ /**
+ * The font to be used in the table.
+ */
+ public final static Font tableFont = UIManager.getFont("Table.font");
+ /**
+ * The font to be used in the title of the TitlePanel component.
+ */
+ public final static Font titleFont =
+ defaultFont.deriveFont(Font.BOLD).deriveFont(14f);
+ /**
+ * Text color indicating that a field is not valid.
+ */
+ public static final Color invalidFontColor = Color.red;
+ /**
+ * The font to be used when the field associated with a primary label is not
+ * valid.
+ */
+ public static final Font primaryInvalidFont =
+ primaryFont.deriveFont(Font.ITALIC);
+ /**
+ * The font to be used when the field associated with a normal label is not
+ * valid.
+ */
+ public static final Font invalidFont = defaultFont.deriveFont(Font.ITALIC);
+ /**
+ * The font to be used in the progress dialog's 'Details' section.
+ */
+ public static final Font progressFont = UIManager.getFont("EditorPane.font");
+
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
new file mode 100644
index 0000000..ea09aa1
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
@@ -0,0 +1,48 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+import org.opends.messages.Message;
+
+/**
+ * The panel that displays a configuration attribute definition.
+ *
+ */
+public class ConfigurationAttributePanel extends StandardAttributePanel
+{
+ private static final long serialVersionUID = -6072885354690411482L;
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_CONFIGURATION_ATTRIBUTE_TITLE.get();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
new file mode 100644
index 0000000..0245034
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
@@ -0,0 +1,48 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+import org.opends.messages.Message;
+
+/**
+ * The panel that displays a configuration objectclass definition.
+ *
+ */
+public class ConfigurationObjectClassPanel extends StandardObjectClassPanel
+{
+ private static final long serialVersionUID = 8875851764570955881L;
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_CONFIGURATION_OBJECTCLASS_TITLE.get();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
new file mode 100644
index 0000000..6ba7fc8
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
@@ -0,0 +1,130 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import java.awt.Dimension;
+
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import javax.swing.border.EmptyBorder;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigChangeListener;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * The main panel of the control panel. It contains a split pane. On the left
+ * we have some actions and on the right some global information about the
+ * server.
+ *
+ */
+public class ControlCenterMainPane extends JSplitPane
+{
+ private static final long serialVersionUID = -8939025523701408656L;
+ private StatusPanel statusPane;
+ /**
+ * Constructor.
+ * @param info the control panel info.
+ */
+ public ControlCenterMainPane(ControlPanelInfo info)
+ {
+ super(JSplitPane.HORIZONTAL_SPLIT);
+ setOpaque(true); //content panes must be opaque
+
+ //setBorder(BorderFactory.createMatteBorder(0, 0, 0, 1,
+ // AccordionElementBorder.bottomColor));
+
+ statusPane = new StatusPanel();
+ statusPane.setBorder(new EmptyBorder(10, 10, 30, 10));
+ statusPane.setInfo(info);
+ //statusPane.setBorder(BorderFactory.createCompoundBorder(
+ // BorderFactory.createMatteBorder(0, 0, 0, 0,
+ // AccordionElementBorder.bottomColor),
+ // new EmptyBorder(10, 10, 30, 10)));
+
+ MainActionsPane mainActionsPane = new MainActionsPane();
+ mainActionsPane.setInfo(info);
+ JScrollPane accordionScroll = Utilities.createScrollPane(mainActionsPane);
+ accordionScroll.getViewport().setBackground(
+ ColorAndFontConstants.greyBackground);
+ JScrollPane statusScroll = Utilities.createScrollPane(statusPane);
+
+// Create a split pane with the two scroll panes in it.
+ setLeftComponent(accordionScroll);
+
+ setRightComponent(statusScroll);
+ setResizeWeight(0.0);
+
+ setDividerLocation(accordionScroll.getPreferredSize().width + 2);
+
+ setPreferredSize(
+ new Dimension(getPreferredSize().width + 4, getPreferredSize().height));
+ info.addConfigChangeListener(new ConfigChangeListener()
+ {
+ private boolean lastStatusStopped;
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ if (ev.getNewDescriptor().getStatus() !=
+ ServerDescriptor.ServerStatus.STARTED)
+ {
+ lastStatusStopped = true;
+ }
+ else if (lastStatusStopped)
+ {
+ lastStatusStopped = false;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getLoginDialog().setVisible(true);
+ getLoginDialog().toFront();
+ }
+ });
+ }
+ }
+ });
+ }
+
+ /**
+ * Returns the login dialog used to ask authentication to the user.
+ * @return the login dialog used to ask authentication to the user.
+ */
+ public GenericDialog getLoginDialog()
+ {
+ return statusPane.getLoginDialog();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
new file mode 100644
index 0000000..2bc2dc5
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -0,0 +1,229 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.ScrollPaneBorderListener;
+import org.opends.guitools.controlpanel.task.DeleteSchemaElementsTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.Schema;
+
+/**
+ * The panel that displays a custom attribute definition.
+ *
+ */
+public class CustomAttributePanel extends StandardAttributePanel
+{
+ private static final long serialVersionUID = 2850763193735843746L;
+ private JButton delete;
+ private AttributeType attribute;
+ private String attrName;
+ private ScrollPaneBorderListener scrollListener;
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_CUSTOM_ATTRIBUTE_TITLE.get();
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ protected void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ p.setBorder(PANEL_BORDER);
+ super.createBasicLayout(p, gbc);
+ gbc = new GridBagConstraints();
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ JScrollPane scroll = Utilities.createBorderLessScrollBar(p);
+ scrollListener = new ScrollPaneBorderListener(scroll);
+ add(scroll, gbc);
+
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.insets = new Insets(10, 10, 10, 10);
+ delete = Utilities.createButton(
+ INFO_CTRL_PANEL_DELETE_ATTRIBUTE_BUTTON.get());
+ delete.setOpaque(false);
+ add(delete, gbc);
+ delete.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteAttribute();
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void update(AttributeType attr, Schema schema)
+ {
+ super.update(attr, schema);
+ attribute = attr;
+ attrName = attribute.getNameOrOID();
+
+ scrollListener.updateBorder();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(final ConfigurationChangeEvent ev)
+ {
+ updateErrorPaneIfAuthRequired(ev.getNewDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_ATTRIBUTE_DELETE.get());
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ delete.setEnabled(!authenticationRequired(ev.getNewDescriptor()));
+ }
+ });
+ }
+
+ private void deleteAttribute()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_DELETE_ATTRIBUTE_TITLE.get(), getInfo());
+ ArrayList<ObjectClass> ocsToDelete = new ArrayList<ObjectClass>();
+ ArrayList<AttributeType> attrsToDelete = new ArrayList<AttributeType>();
+ attrsToDelete.add(attribute);
+
+ DeleteSchemaElementsTask newTask = new DeleteSchemaElementsTask(getInfo(),
+ dlg, ocsToDelete, attrsToDelete);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ ArrayList<String> childAttributes = new ArrayList<String>();
+ for (AttributeType attr : schema.getAttributeTypes().values())
+ {
+ if (attribute.equals(attr.getSuperiorType()))
+ {
+ childAttributes.add(attr.getNameOrOID());
+ }
+ }
+ if (!childAttributes.isEmpty())
+ {
+ errors.add(ERR_CANNOT_DELETE_PARENT_ATTRIBUTE.get(attrName,
+ Utilities.getStringFromCollection(childAttributes, ", "),
+ attrName));
+ }
+
+ ArrayList<String> dependentClasses = new ArrayList<String>();
+ for (ObjectClass o : schema.getObjectClasses().values())
+ {
+ if (o.getRequiredAttributeChain().contains(attribute))
+ {
+ dependentClasses.add(o.getNameOrOID());
+ }
+ }
+ if (!dependentClasses.isEmpty())
+ {
+ errors.add(ERR_CANNOT_DELETE_ATTRIBUTE_WITH_DEPENDENCIES.get(
+ attrName,
+ Utilities.getStringFromCollection(dependentClasses, ", "),
+ attrName));
+ }
+ }
+ if (errors.size() == 0)
+ {
+ Message confirmationMessage =
+ INFO_CTRL_PANEL_CONFIRMATION_DELETE_ATTRIBUTE_DETAILS.get(
+ attribute.getNameOrOID());
+ if (displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ confirmationMessage))
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_ATTRIBUTE_SUMMARY.get(attrName),
+ INFO_CTRL_PANEL_DELETING_ATTRIBUTE_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_ATTRIBUTE_SUCCESSFUL.get(attrName),
+ ERR_CTRL_PANEL_DELETING_ATTRIBUTE_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_ATTRIBUTE_ERROR_DETAILS.get(attrName),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ }
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
new file mode 100644
index 0000000..d2fee03
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -0,0 +1,206 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.ScrollPaneBorderListener;
+import org.opends.guitools.controlpanel.task.DeleteSchemaElementsTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.Schema;
+
+/**
+ * The panel that displays a custom object class definition.
+ *
+ */
+public class CustomObjectClassPanel extends StandardObjectClassPanel
+{
+ private static final long serialVersionUID = 2105520588901380L;
+ private JButton delete;
+ private ObjectClass objectClass;
+ private String ocName;
+ private ScrollPaneBorderListener scrollListener;
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_CUSTOM_OBJECTCLASS_TITLE.get();
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ protected void createLayout()
+ {
+ JPanel p = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+ p.setOpaque(false);
+ p.setBorder(PANEL_BORDER);
+ super.createBasicLayout(p, gbc);
+ gbc = new GridBagConstraints();
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ JScrollPane scroll = Utilities.createBorderLessScrollBar(p);
+ scrollListener = new ScrollPaneBorderListener(scroll);
+ add(scroll, gbc);
+
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.insets = new Insets(10, 10, 10, 10);
+ delete = Utilities.createButton(
+ INFO_CTRL_PANEL_DELETE_OBJECTCLASS_BUTTON.get());
+ delete.setOpaque(false);
+ add(delete, gbc);
+ delete.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteObjectclass();
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(final ConfigurationChangeEvent ev)
+ {
+ updateErrorPaneIfAuthRequired(ev.getNewDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_OBJECTCLASS_DELETE.get());
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ delete.setEnabled(!authenticationRequired(ev.getNewDescriptor()));
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void update(ObjectClass oc, Schema schema)
+ {
+ super.update(oc, schema);
+ objectClass = oc;
+ if (objectClass != null)
+ {
+ ocName = objectClass.getNameOrOID();
+ }
+ scrollListener.updateBorder();
+ }
+
+ private void deleteObjectclass()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_DELETE_OBJECTCLASS_TITLE.get(), getInfo());
+ ArrayList<ObjectClass> ocsToDelete = new ArrayList<ObjectClass>();
+ ocsToDelete.add(objectClass);
+ ArrayList<AttributeType> attrsToDelete = new ArrayList<AttributeType>();
+
+ DeleteSchemaElementsTask newTask = new DeleteSchemaElementsTask(getInfo(),
+ dlg, ocsToDelete, attrsToDelete);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ ArrayList<String> childClasses = new ArrayList<String>();
+ for (ObjectClass o : schema.getObjectClasses().values())
+ {
+ if (objectClass.equals(o.getSuperiorClass()))
+ {
+ childClasses.add(o.getNameOrOID());
+ }
+ }
+ if (!childClasses.isEmpty())
+ {
+ errors.add(ERR_CANNOT_DELETE_PARENT_OBJECTCLASS.get(ocName,
+ Utilities.getStringFromCollection(childClasses, ", "), ocName));
+ }
+ }
+ if (errors.size() == 0)
+ {
+ Message confirmationMessage =
+ INFO_CTRL_PANEL_CONFIRMATION_DELETE_OBJECTCLASS_DETAILS.get(
+ ocName);
+ if (displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ confirmationMessage))
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_OBJECTCLASS_SUMMARY.get(ocName),
+ INFO_CTRL_PANEL_DELETING_OBJECTCLASS_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_OBJECTCLASS_SUCCESSFUL.get(ocName),
+ ERR_CTRL_PANEL_DELETING_OBJECTCLASS_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_OBJECTCLASS_ERROR_DETAILS.get(ocName),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ }
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
new file mode 100644
index 0000000..ac9fffa
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
@@ -0,0 +1,173 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.DeleteBaseDNAndBackendTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+
+/**
+ * The panel displayed when the user clicks on 'Delete Backend...' in the
+ * browse entries dialog.
+ *
+ */
+public class DeleteBackendPanel extends DeleteBaseDNPanel
+{
+ private static final long serialVersionUID = 8744925738292396658L;
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_DELETE_BACKEND_TITLE.get();
+ }
+
+ /**
+ * Returns the no backend found label.
+ * @return the no backend found label.
+ */
+ protected Message getNoElementsFoundLabel()
+ {
+ return INFO_CTRL_PANEL_NO_BACKENDS_FOUND_LABEL.get();
+ }
+
+ /**
+ * Returns the list label.
+ * @return the list label.
+ */
+ protected Message getListLabel()
+ {
+ return INFO_CTRL_PANEL_SELECT_BACKENDS_TO_DELETE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ ServerDescriptor desc = ev.getNewDescriptor();
+ final SortedSet<String> newElements = new TreeSet<String>();
+ for (BackendDescriptor backend : desc.getBackends())
+ {
+ if (!backend.isConfigBackend())
+ {
+ newElements.add(backend.getBackendID());
+ }
+ }
+ updateList(newElements);
+ updateErrorPaneAndOKButtonIfAuthRequired(getInfo().getServerDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_BACKEND_DELETE.get());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this), getTitle(), getInfo());
+ Object[] backends = list.getSelectedValues();
+ ArrayList<BackendDescriptor> backendsToDelete =
+ new ArrayList<BackendDescriptor>();
+ for (Object o : backends)
+ {
+ String id = (String)o;
+ for (BackendDescriptor backend :
+ getInfo().getServerDescriptor().getBackends())
+ {
+ if (backend.getBackendID().equalsIgnoreCase(id))
+ {
+ backendsToDelete.add(backend);
+ break;
+ }
+ }
+ }
+ DeleteBaseDNAndBackendTask newTask = new DeleteBaseDNAndBackendTask(
+ getInfo(), progressDialog, backendsToDelete,
+ new HashSet<BaseDNDescriptor>());
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ Message confirmationMessage = getConfirmationMessage(backendsToDelete);
+ if (displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ confirmationMessage))
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_BACKENDS_SUMMARY.get(),
+ INFO_CTRL_PANEL_DELETING_BACKENDS_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_BACKENDS_SUCCESSFUL.get(),
+ ERR_CTRL_PANEL_DELETING_BACKENDS_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_BACKENDS_ERROR_DETAILS.get(),
+ null,
+ progressDialog);
+ progressDialog.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ private Message getConfirmationMessage(
+ Collection<BackendDescriptor> backendsToDelete)
+ {
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(INFO_CTRL_PANEL_CONFIRMATION_DELETE_BACKENDS_DETAILS.get());
+ for (BackendDescriptor backend : backendsToDelete)
+ {
+ mb.append("<br> - "+backend.getBackendID());
+ }
+ mb.append("<br><br>");
+ mb.append(INFO_CTRL_PANEL_DO_YOU_WANT_TO_CONTINUE.get());
+ return mb.toMessage();
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
new file mode 100644
index 0000000..5e82097
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
@@ -0,0 +1,480 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.Box;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.DeleteBaseDNAndBackendTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.renderer.CustomListCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.server.types.DN;
+
+/**
+ * The panel displayed when the user clicks on 'Delete Base DN...' in the
+ * browse entries dialog.
+ *
+ */
+public class DeleteBaseDNPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 2182662824496761087L;
+
+ /**
+ * The list containing the base DNs.
+ */
+ protected JList list;
+
+ /**
+ * Label indicating that no element was found.
+ */
+ protected JLabel lNoElementsFound;
+
+ /**
+ * The main panel.
+ */
+ protected JPanel mainPanel;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public DeleteBaseDNPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_DELETE_BASE_DN_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return list;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return false;
+ }
+
+
+ /**
+ * Returns the no backend found label.
+ * @return the no backend found label.
+ */
+ protected Message getNoElementsFoundLabel()
+ {
+ return INFO_CTRL_PANEL_NO_BASE_DNS_FOUND_LABEL.get();
+ }
+
+ /**
+ * Returns the list label.
+ * @return the list label.
+ */
+ protected Message getListLabel()
+ {
+ return INFO_CTRL_PANEL_SELECT_BASE_DNS_TO_DELETE.get();
+ }
+
+ /**
+ * Updates the list of base DNs.
+ * @param newElements the base DNs to be used to update the list.
+ */
+ protected void updateList(final Collection<?> newElements)
+ {
+ final DefaultListModel model = (DefaultListModel)list.getModel();
+ boolean changed = newElements.size() != model.getSize();
+ if (!changed)
+ {
+ int i = 0;
+ for (Object newElement : newElements)
+ {
+ changed = !newElement.equals(model.getElementAt(i));
+ if (changed)
+ {
+ break;
+ }
+ i++;
+ }
+ }
+ if (changed)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ Object[] s = list.getSelectedValues();
+ Set<Object> selected = new HashSet<Object>();
+ if (s != null)
+ {
+ for (Object o : s)
+ {
+ selected.add(o);
+ }
+ }
+ final DefaultListModel model = (DefaultListModel)list.getModel();
+ model.clear();
+ SortedSet<Integer> indices = new TreeSet<Integer>();
+ int i = 0;
+ for (Object newElement : newElements)
+ {
+ model.addElement(newElement);
+ if (selected.contains(newElement))
+ {
+ indices.add(i);
+ }
+ i ++;
+ }
+ if (selected.size() > 0)
+ {
+ int[] indArray = new int[indices.size()];
+ i = 0;
+ for (Integer index : indices)
+ {
+ indArray[i] = index;
+ i++;
+ }
+ list.setSelectedIndices(indArray);
+ }
+ checkVisibility();
+ }
+ });
+ }
+ }
+
+ private void checkVisibility()
+ {
+ mainPanel.setVisible(list.getModel().getSize() > 0);
+ lNoElementsFound.setVisible(list.getModel().getSize() == 0);
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 1;
+ addErrorPane(gbc);
+
+ mainPanel = new JPanel(new GridBagLayout());
+ mainPanel.setOpaque(false);
+ gbc.gridy ++;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ add(mainPanel, gbc);
+
+ gbc.anchor = GridBagConstraints.CENTER;
+ gbc.fill = GridBagConstraints.NONE;
+ lNoElementsFound = Utilities.createPrimaryLabel(getNoElementsFoundLabel());
+ add(lNoElementsFound, gbc);
+ lNoElementsFound.setVisible(false);
+
+ gbc.gridy = 0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 0.0;
+ gbc.gridwidth = 2;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.NONE;
+ JLabel lBaseDNs =
+ Utilities.createPrimaryLabel(getListLabel());
+ mainPanel.add(lBaseDNs, gbc);
+ gbc.insets.top = 5;
+ list = new JList(new DefaultListModel());
+ list.setCellRenderer(new CustomListCellRenderer(list));
+ list.setVisibleRowCount(15);
+ gbc.gridy ++;
+ gbc.gridheight = 3;
+ gbc.gridwidth = 1;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ mainPanel.add(Utilities.createScrollPane(list), gbc);
+
+ JButton selectAllButton = Utilities.createButton(
+ INFO_CTRL_PANEL_SELECT_ALL_BUTTON.get());
+ selectAllButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ int[] indices = new int[list.getModel().getSize()];
+ for (int i=0 ; i<indices.length; i++)
+ {
+ indices[i] = i;
+ }
+ list.setSelectedIndices(indices);
+ }
+ });
+ gbc.gridx ++;
+ gbc.gridheight = 1;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets.left = 5;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ mainPanel.add(selectAllButton, gbc);
+
+ gbc.gridy ++;
+ JButton unselectAllButton = Utilities.createButton(
+ INFO_CTRL_PANEL_CLEAR_SELECTION_BUTTON.get());
+ unselectAllButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ list.clearSelection();
+ }
+ });
+ mainPanel.add(unselectAllButton, gbc);
+
+ list.addListSelectionListener(new ListSelectionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void valueChanged(ListSelectionEvent ev)
+ {
+ checkOKButtonEnable();
+ }
+ });
+
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ gbc.insets.top = 0;
+ gbc.weighty = 1.0;
+ mainPanel.add(Box.createVerticalGlue(), gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ if (visible)
+ {
+ list.clearSelection();
+ checkVisibility();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkOKButtonEnable()
+ {
+ setEnabledOK(!list.isSelectionEmpty() && mainPanel.isVisible());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ ServerDescriptor desc = ev.getNewDescriptor();
+ final SortedSet<DN> newElements = new TreeSet<DN>();
+ for (BackendDescriptor backend : desc.getBackends())
+ {
+ if (!backend.isConfigBackend())
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ newElements.add(baseDN.getDn());
+ }
+ }
+ }
+ updateList(newElements);
+ updateErrorPaneAndOKButtonIfAuthRequired(getInfo().getServerDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_BASE_DN_DELETE.get());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this), getTitle(), getInfo());
+ Object[] dns = list.getSelectedValues();
+ ArrayList<BaseDNDescriptor> baseDNsToDelete =
+ new ArrayList<BaseDNDescriptor>();
+ for (Object o : dns)
+ {
+ DN dn = (DN)o;
+ boolean found = false;
+ for (BackendDescriptor backend :
+ getInfo().getServerDescriptor().getBackends())
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ if (baseDN.getDn().equals(dn))
+ {
+ baseDNsToDelete.add(baseDN);
+ found = true;
+ break;
+ }
+ }
+ if (found)
+ {
+ break;
+ }
+ }
+ }
+ DeleteBaseDNAndBackendTask newTask = new DeleteBaseDNAndBackendTask(
+ getInfo(), progressDialog, new HashSet<BackendDescriptor>(),
+ baseDNsToDelete);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ Message confirmationMessage = getConfirmationMessage(baseDNsToDelete);
+ if (displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ confirmationMessage))
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_BASE_DNS_SUMMARY.get(),
+ INFO_CTRL_PANEL_DELETING_BASE_DNS_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_BASE_DNS_SUCCESSFUL.get(),
+ ERR_CTRL_PANEL_DELETING_BASE_DNS_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_BASE_DNS_ERROR_DETAILS.get(),
+ null,
+ progressDialog);
+ progressDialog.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ private Message getConfirmationMessage(
+ Collection<BaseDNDescriptor> baseDNsToDelete)
+ {
+ MessageBuilder mb = new MessageBuilder();
+ Map<String, Set<BaseDNDescriptor>> hmBackends =
+ new HashMap<String, Set<BaseDNDescriptor>>();
+ for (BaseDNDescriptor baseDN : baseDNsToDelete)
+ {
+ String backendID = baseDN.getBackend().getBackendID();
+ Set<BaseDNDescriptor> set = hmBackends.get(backendID);
+ if (set == null)
+ {
+ set = new HashSet<BaseDNDescriptor>();
+ hmBackends.put(backendID, set);
+ }
+ set.add(baseDN);
+ }
+ ArrayList<String> indirectBackendsToDelete = new ArrayList<String>();
+ for (Set<BaseDNDescriptor> set : hmBackends.values())
+ {
+ BackendDescriptor backend = set.iterator().next().getBackend();
+ if (set.size() == backend.getBaseDns().size())
+ {
+ // All of the suffixes must be deleted.
+ indirectBackendsToDelete.add(backend.getBackendID());
+ }
+ }
+ mb.append(INFO_CTRL_PANEL_CONFIRMATION_DELETE_BASE_DNS_DETAILS.get());
+ for (BaseDNDescriptor baseDN : baseDNsToDelete)
+ {
+ mb.append("<br> - "+baseDN.getDn());
+ }
+ if (indirectBackendsToDelete.size() > 0)
+ {
+ mb.append("<br><br>");
+ mb.append(
+ INFO_CTRL_PANEL_CONFIRMATION_DELETE_BASE_DNS_INDIRECT_DETAILS.get());
+ for (String backendID : indirectBackendsToDelete)
+ {
+ mb.append("<br> - "+backendID);
+ }
+ }
+ mb.append("<br><br>");
+ mb.append(INFO_CTRL_PANEL_DO_YOU_WANT_TO_CONTINUE.get());
+ return mb.toMessage();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ErrorPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ErrorPanel.java
new file mode 100644
index 0000000..9dd0dea
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ErrorPanel.java
@@ -0,0 +1,121 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.util.Collection;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+
+/**
+ * Class used to display an collection of error messages.
+ *
+ */
+public class ErrorPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = -4494826284037288552L;
+ private Message title;
+ /**
+ * Constructor.
+ * @param title the title to be displayed in the dialog.
+ * @param errors the collection of errors to be displayed.
+ */
+ public ErrorPanel(Message title, Collection<Message> errors)
+ {
+ super();
+ this.title = title;
+ createLayout(errors);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return title;
+ }
+
+ private void createLayout(Collection<Message> errors)
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ addErrorPane(gbc);
+
+ errorPane.setVisible(true);
+
+ MessageBuilder mb = new MessageBuilder();
+ for (Message error : errors)
+ {
+ if (mb.length() > 0)
+ {
+ mb.append("<br>");
+ }
+ mb.append(error);
+ }
+
+ updateErrorPane(errorPane, title, ColorAndFontConstants.errorTitleFont,
+ mb.toMessage(), ColorAndFontConstants.defaultFont);
+
+ gbc.weighty = 0.0;
+ addBottomGlue(gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.OK;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java
new file mode 100644
index 0000000..921d525
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java
@@ -0,0 +1,112 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.messages.Message;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * The panel that is displayed when there is an error searching an entry.
+ *
+ */
+public class ErrorSearchingEntryPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = -8460172599072631973L;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public ErrorSearchingEntryPanel()
+ {
+ super();
+ GridBagConstraints gbc = new GridBagConstraints();
+ addErrorPane(gbc);
+ errorPane.setVisible(true);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return errorPane;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_ERROR_SEARCHING_ENTRY_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+
+ }
+
+ /**
+ * Sets the error to be displayed in the panel.
+ * @param dn the DN of the entry that caused a problem.
+ * @param t the Throwable that occurred when searching the entry.
+ */
+ public void setError(String dn, Throwable t)
+ {
+ Message title = INFO_CTRL_PANEL_ERROR_SEARCHING_ENTRY_TITLE.get();
+ Message details;
+ if (t instanceof OpenDsException)
+ {
+ details = ERR_CTRL_PANEL_ERROR_SEARCHING_ENTRY.get(dn,
+ ((OpenDsException)t).getMessageObject().toString());
+ }
+ else
+ {
+ details = ERR_CTRL_PANEL_ERROR_SEARCHING_ENTRY.get(dn,
+ t.toString());
+ }
+ updateErrorPane(errorPane, title, ColorAndFontConstants.errorTitleFont,
+ details, ColorAndFontConstants.defaultFont);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
new file mode 100644
index 0000000..382b2ca
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
@@ -0,0 +1,583 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import static org.opends.messages.QuickSetupMessages.INFO_NO_LDIF_PATH;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.event.BrowseActionListener;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.tools.ExportLDIF;
+
+/**
+ * The panel where the user can export the contents of the server to an LDIF
+ * file.
+ *
+ */
+public class ExportLDIFPanel extends InclusionExclusionPanel
+{
+ private static final long serialVersionUID = 2256902594454214644L;
+ private JComboBox backends;
+ private JTextField file;
+ private JCheckBox overwrite;
+ private JCheckBox compressData;
+ private JCheckBox encryptData;
+ private JCheckBox generateSignedHash;
+ private JCheckBox wrapText;
+ private JTextField wrapColumn;
+
+ private JLabel lBackend;
+ private JLabel lNoBackendsFound;
+ private JLabel lFile;
+ private JLabel lExportOptions;
+ private JCheckBox excludeOperationalAttrs;
+
+ private DocumentListener documentListener;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public ExportLDIFPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_EXPORT_LDIF_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return file;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ if (visible)
+ {
+ documentListener.changedUpdate(null);
+ }
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 4;
+ addErrorPane(gbc);
+
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 0.0;
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.NONE;
+ lBackend = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_BACKEND_LABEL.get());
+ add(lBackend, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ backends = Utilities.createComboBox();
+ backends.setModel(new DefaultComboBoxModel(new String[]{}));
+ gbc.gridwidth = 3;
+ add(backends, gbc);
+ lNoBackendsFound = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NO_BACKENDS_FOUND_LABEL.get());
+ add(lNoBackendsFound, gbc);
+ lNoBackendsFound.setVisible(false);
+ gbc.insets.top = 10;
+
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.gridwidth = 1;
+ lFile = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_EXPORT_TO_FILE_LABEL.get());
+ add(lFile, gbc);
+
+ gbc.gridx = 1;
+ gbc.insets.left = 10;
+ gbc.gridwidth = 2;
+ file = Utilities.createTextField();
+ documentListener = new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ String text = file.getText().trim();
+ setEnabledOK((text != null) && (text.length() > 0) &&
+ !errorPane.isVisible());
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ changedUpdate(ev);
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ changedUpdate(ev);
+ }
+ };
+ file.getDocument().addDocumentListener(documentListener);
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(file, gbc);
+ JButton bBrowse = Utilities.createButton(
+ INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ bBrowse.addActionListener(
+ new BrowseActionListener(file,
+ BrowseActionListener.BrowseType.CREATE_LDIF_FILE, this));
+ gbc.gridx = 3;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ bBrowse.setOpaque(false);
+ add(bBrowse, gbc);
+ gbc.gridx = 1;
+ gbc.gridy ++;
+ gbc.insets.left = 30;
+ gbc.insets.top = 5;
+ gbc.gridwidth = 3;
+ overwrite =
+ Utilities.createCheckBox(INFO_CTRL_PANEL_EXPORT_OVERWRITE_LABEL.get());
+ overwrite.setOpaque(false);
+ add(overwrite, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ lExportOptions =
+ Utilities.createPrimaryLabel(INFO_CTRL_PANEL_EXPORT_OPTIONS.get());
+ add(lExportOptions, gbc);
+
+ compressData = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_COMPRESS_DATA_LABEL.get());
+ compressData.setSelected(false);
+
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 3;
+ add(compressData, gbc);
+
+ encryptData = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_ENCRYPT_DATA_LABEL.get());
+
+ /*
+ gbc.gridy ++;
+ gbc.insets.top = 5;
+ add(encryptData, gbc);
+*/
+ generateSignedHash = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_EXPORT_GENERATE_SIGNED_HASH.get());
+
+ encryptData.addChangeListener(new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent ev)
+ {
+ generateSignedHash.setEnabled(encryptData.isSelected());
+ }
+ });
+ encryptData.setSelected(false);
+ generateSignedHash.setEnabled(false);
+
+ /*
+ gbc.gridy ++;
+ gbc.insets.left = 30;
+ add(generateSignedHash, gbc);
+*/
+ wrapText = Utilities.createCheckBox(INFO_CTRL_PANEL_EXPORT_WRAP_TEXT.get());
+ wrapText.setOpaque(false);
+ gbc.insets.left = 10;
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ add(wrapText, gbc);
+
+ gbc.insets.left = 5;
+ gbc.gridx = 2;
+ wrapColumn = Utilities.createTextField("80", 4);
+ gbc.fill = GridBagConstraints.NONE;
+ add(wrapColumn, gbc);
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+
+ wrapText.addChangeListener(new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent ev)
+ {
+ wrapColumn.setEnabled(wrapText.isSelected());
+ }
+ });
+ wrapColumn.setEnabled(false);
+ wrapText.setSelected(false);
+
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.gridwidth = 4;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ excludeOperationalAttrs = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_EXCLUDE_OPERATIONAL_ATTRIBUTES.get());
+ excludeOperationalAttrs.setOpaque(false);
+ add(createDataExclusionOptions(new JLabel[]{null},
+ new Component[]{excludeOperationalAttrs}), gbc);
+ gbc.gridy ++;
+ gbc.insets.top = 15;
+ add(createDataInclusionOptions(new JLabel[]{}, new Component[]{}), gbc);
+ addBottomGlue(gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ updateSimpleBackendComboBoxModel(backends, lNoBackendsFound,
+ ev.getNewDescriptor());
+
+ updateErrorPaneAndOKButtonIfAuthRequired(getInfo().getServerDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_EXPORT.get());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkOKButtonEnable()
+ {
+ documentListener.changedUpdate(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ setPrimaryValid(lBackend);
+ setPrimaryValid(lFile);
+ setPrimaryValid(lExportOptions);
+ final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+
+ String backendName = (String)backends.getSelectedItem();
+ if (backendName == null)
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BACKEND_SELECTED.get());
+ setPrimaryInvalid(lBackend);
+ }
+
+ String ldifPath = file.getText();
+ if ((ldifPath == null) || (ldifPath.trim().equals("")))
+ {
+ errors.add(INFO_NO_LDIF_PATH.get());
+ setPrimaryInvalid(lFile);
+ }
+ else
+ {
+ File f = new File(ldifPath);
+ if (f.isDirectory())
+ {
+ errors.add(ERR_CTRL_PANEL_EXPORT_DIRECTORY_PROVIDED.get(ldifPath));
+ }
+ }
+
+ if (wrapText.isSelected())
+ {
+ String cols = wrapColumn.getText();
+ int minValue = 1;
+ int maxValue = 1000;
+ Message errMsg = ERR_CTRL_PANEL_INVALID_WRAP_COLUMN.get(minValue,
+ maxValue);
+ checkIntValue(errors, cols, minValue, maxValue, errMsg);
+ }
+
+ updateIncludeExclude(errors, backendName);
+
+ if (errors.isEmpty())
+ {
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this), getTitle(), getInfo());
+ ExportTask newTask = new ExportTask(getInfo(), progressDialog);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ boolean confirmed = true;
+ if (errors.isEmpty())
+ {
+ File f = new File(ldifPath);
+ if (overwrite.isSelected() && f.exists())
+ {
+ confirmed = displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_CONFIRMATION_EXPORT_LDIF_DETAILS.get(ldifPath));
+ }
+ }
+ if ((errors.isEmpty()) && confirmed)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_EXPORTING_LDIF_SUMMARY.get(
+ backends.getSelectedItem().toString()),
+ INFO_CTRL_PANEL_EXPORTING_LDIF_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_EXPORTING_LDIF_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_EXPORTING_LDIF_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_EXPORTING_LDIF_ERROR_DETAILS,
+ progressDialog);
+ progressDialog.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(lBackend);
+ setPrimaryValid(lFile);
+ setPrimaryValid(lExportOptions);
+ super.cancelClicked();
+ }
+
+ /**
+ * The class that performs the export.
+ *
+ */
+ protected class ExportTask extends InclusionExclusionTask
+ {
+ private Set<String> backendSet;
+ private String fileName;
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public ExportTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ backendSet.add((String)backends.getSelectedItem());
+ fileName = file.getText();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.EXPORT_LDIF;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_EXPORT_TASK_DESCRIPTION.get(
+ backendSet.iterator().next(), fileName);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+ try
+ {
+ ArrayList<String> arguments = getCommandLineArguments();
+
+ String[] args = new String[arguments.size()];
+
+ arguments.toArray(args);
+ if (isServerRunning())
+ {
+ returnCode = ExportLDIF.mainExportLDIF(args, false, outPrintStream,
+ errorPrintStream);
+ }
+ else
+ {
+ returnCode = executeCommandLine(getCommandLinePath(), args);
+ }
+ if (returnCode != 0)
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("--ldifFile");
+ args.add(fileName);
+ args.add("--backendID");
+ args.add(backendSet.iterator().next());
+
+ if (!overwrite.isSelected())
+ {
+ args.add("--appendToLDIF");
+ }
+
+ if (compressData.isSelected())
+ {
+ args.add("--compress");
+ }
+ if (wrapText.isSelected())
+ {
+ args.add("--wrapColumn");
+ args.add(wrapColumn.getText().trim());
+ }
+ if (excludeOperationalAttrs.isSelected())
+ {
+ args.add("--excludeOperational");
+ }
+
+ args.addAll(super.getCommandLineArguments());
+
+ if (isServerRunning())
+ {
+ args.addAll(getConfigCommandLineArguments());
+ }
+
+ return args;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return getCommandLinePath("export-ldif");
+ }
+ };
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java
new file mode 100644
index 0000000..900496c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java
@@ -0,0 +1,415 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.AbstractButton;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JMenuBar;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JViewport;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+import javax.swing.border.EmptyBorder;
+import javax.swing.text.JTextComponent;
+
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * The generic dialog of the Control Panel. It contains a StatusGenericPanel.
+ *
+ */
+public class GenericDialog extends JDialog
+{
+ private static final long serialVersionUID = -2643144936460484112L;
+ private final static Color buttonPanelBackground =
+ ColorAndFontConstants.greyBackground;
+ private JButton okButton;
+ /**
+ * The close button.
+ */
+ protected JButton closeButton;
+ private JButton cancelButton;
+ //private JPanel contentPanel;
+ /**
+ * The panel contained in the dialog.
+ */
+ protected StatusGenericPanel panel;
+ //private ProgressPanel progressPanel;
+ //private boolean displayInputInNextVisible;
+ private Component lastComponentWithFocus;
+
+ /**
+ * The different combinations of buttons that the dialog can have.
+ *
+ */
+ public enum ButtonType
+ {
+ /**
+ * The dialog contains OK and CANCEL buttons.
+ */
+ OK_CANCEL,
+ /**
+ * The dialog contains a OK button.
+ */
+ OK,
+ /**
+ * The dialog contains a CLOSE button.
+ */
+ CLOSE,
+ /**
+ * The dialog has no buttons.
+ */
+ NO_BUTTON
+ };
+
+ /**
+ * Constructor of the dialog.
+ * @param parentFrame the parent frame of the dialog.
+ * @param panel the panel contained in this dialog.
+ */
+ public GenericDialog(JFrame parentFrame, StatusGenericPanel panel)
+ {
+ super();
+ this.panel = panel;
+ if (panel.requiresBorder())
+ {
+ setDefaultBorder(panel);
+ }
+ JMenuBar menu = panel.getMenuBar();
+ if (menu != null)
+ {
+ setJMenuBar(menu);
+ }
+ JScrollPane scroll = Utilities.createScrollPane(panel);
+ /*
+ CardLayout cardLayout = new CardLayout();
+ contentPanel = new JPanel(cardLayout);
+ contentPanel.setOpaque(false);
+ setContentPane(contentPanel);
+ */
+ JPanel inputPanel = new JPanel(new GridBagLayout());
+ setContentPane(inputPanel);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.BOTH;
+ if (panel.requiresScroll())
+ {
+ inputPanel.add(scroll, gbc);
+ }
+ else
+ {
+ inputPanel.add(panel, gbc);
+ }
+ if (panel.getButtonType() != ButtonType.NO_BUTTON)
+ {
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ inputPanel.add(createButtonsPanel(panel), gbc);
+ }
+
+ KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
+ ActionListener actionListener = new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ setVisible(false);
+ }
+ };
+ getRootPane().registerKeyboardAction(actionListener, stroke,
+ JComponent.WHEN_IN_FOCUSED_WINDOW);
+
+ FocusListener focusListener = new FocusAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void focusGained(FocusEvent ev)
+ {
+ lastComponentWithFocus = ev.getComponent();
+ }
+ };
+ addFocusListener(focusListener, panel);
+
+ addWindowListener(new WindowAdapter() {
+ /**
+ * {@inheritDoc}
+ */
+ public void windowClosing(WindowEvent e) {
+ GenericDialog.this.panel.closeClicked();
+ }
+ });
+
+ pack();
+ if (!SwingUtilities.isEventDispatchThread())
+ {
+ Thread.dumpStack();
+ }
+ }
+
+ /**
+ * Method used to add a focus listeners to all the components in the panel.
+ * This is done to recover the focus on an item when the dialog is closed
+ * and then opened again.
+ * @param focusListener the focus listener.
+ * @param container the container where the components are layed out.
+ */
+ private void addFocusListener(FocusListener focusListener,
+ Container container)
+ {
+ for (int i=0; i < container.getComponentCount(); i++)
+ {
+ Component comp = container.getComponent(i);
+ if ((comp instanceof AbstractButton) ||
+ (comp instanceof JTextComponent) ||
+ (comp instanceof JList) ||
+ (comp instanceof JComboBox) ||
+ (comp instanceof JTable))
+ {
+ comp.addFocusListener(focusListener);
+ }
+ else if ((comp instanceof JPanel) || (comp instanceof JScrollPane)
+ || (comp instanceof JViewport))
+ {
+ addFocusListener(focusListener, (Container)comp);
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setVisible(boolean visible)
+ {
+ if (lastComponentWithFocus == null)
+ {
+ lastComponentWithFocus = panel.getPreferredFocusComponent();
+ }
+ if (visible && (lastComponentWithFocus != null))
+ {
+ lastComponentWithFocus.requestFocusInWindow();
+ }
+ updateDefaultButton(panel);
+ panel.toBeDisplayed(visible);
+ updateTitle();
+ super.setVisible(visible);
+ }
+
+ /**
+ * Sets the enable state of the OK button.
+ * @param enable whether the OK button must be enabled or not.
+ */
+ public void setEnabledOK(boolean enable)
+ {
+ okButton.setEnabled(enable);
+ }
+
+ /**
+ * Sets the enable state of the Cancel button.
+ * @param enable whether the Cancel button must be enabled or not.
+ */
+ public void setEnabledCancel(boolean enable)
+ {
+ cancelButton.setEnabled(enable);
+ }
+
+ /**
+ * Sets the enable state of the Close button.
+ * @param enable whether the Close button must be enabled or not.
+ */
+ public void setEnabledClose(boolean enable)
+ {
+ closeButton.setEnabled(enable);
+ }
+
+ /**
+ * Updates the title of the dialog using the title of the panel.
+ *
+ */
+ void updateTitle()
+ {
+ if (panel.getTitle() != null)
+ {
+ setTitle(INFO_CTRL_PANEL_GENERIC_TITLE.get(
+ panel.getTitle().toString()).toString());
+ }
+ }
+
+ private void setDefaultBorder(JComponent comp)
+ {
+ Utilities.setBorder(comp, new EmptyBorder(20, 20, 20, 20));
+ }
+
+
+ private JPanel createButtonsPanel(final StatusGenericPanel panel)
+ {
+ JPanel buttonsPanel = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+ ButtonType buttonType = panel.getButtonType();
+ gbc.gridx = 0;
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ buttonsPanel.add(Box.createHorizontalGlue(), gbc);
+ buttonsPanel.setOpaque(true);
+ buttonsPanel.setBackground(buttonPanelBackground);
+ gbc.insets = new Insets(10, 0, 10, 0);
+ gbc.insets.left = 5;
+
+ if (buttonType == ButtonType.OK_CANCEL)
+ {
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ okButton = Utilities.createButton(
+ INFO_CTRL_PANEL_OK_BUTTON_LABEL.get());
+ okButton.setOpaque(false);
+ buttonsPanel.add(okButton, gbc);
+ okButton.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ panel.okClicked();
+ }
+ });
+ okButton.setEnabled(panel.isEnableOK());
+
+ gbc.gridx ++;
+ cancelButton = Utilities.createButton(
+ INFO_CTRL_PANEL_CANCEL_BUTTON_LABEL.get());
+ cancelButton.setOpaque(false);
+ cancelButton.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ panel.cancelClicked();
+ }
+ });
+ cancelButton.setEnabled(panel.isEnableCancel());
+ gbc.insets.right = 10;
+ buttonsPanel.add(cancelButton, gbc);
+ }
+
+ if (buttonType == ButtonType.OK)
+ {
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ okButton = Utilities.createButton(
+ INFO_CTRL_PANEL_OK_BUTTON_LABEL.get());
+ okButton.setOpaque(false);
+ gbc.insets.right = 10;
+ buttonsPanel.add(okButton, gbc);
+ okButton.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ panel.okClicked();
+ }
+ });
+ okButton.setEnabled(panel.isEnableOK());
+ }
+
+ if (buttonType == ButtonType.CLOSE)
+ {
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ closeButton = Utilities.createButton(
+ INFO_CTRL_PANEL_CLOSE_BUTTON_LABEL.get());
+ closeButton.setOpaque(false);
+ gbc.insets.right = 10;
+ buttonsPanel.add(closeButton, gbc);
+ closeButton.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ panel.closeClicked();
+ }
+ });
+ closeButton.setEnabled(panel.isEnableClose());
+ }
+
+
+
+ buttonsPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0,
+ ColorAndFontConstants.defaultBorderColor));
+ return buttonsPanel;
+ }
+
+ /**
+ * Updates the default button of the dialog, depending on the type of
+ * generic panel that it contains.
+ * @param panel the generic panel contained in this dialog.
+ */
+ private void updateDefaultButton(StatusGenericPanel panel)
+ {
+ ButtonType buttonType = panel.getButtonType();
+
+ if (buttonType == ButtonType.OK_CANCEL)
+ {
+ getRootPane().setDefaultButton(okButton);
+ }
+ else if (buttonType == ButtonType.OK)
+ {
+ getRootPane().setDefaultButton(okButton);
+ }
+ else if (buttonType == ButtonType.CLOSE)
+ {
+ getRootPane().setDefaultButton(closeButton);
+ }
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
new file mode 100644
index 0000000..d4b2bff
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
@@ -0,0 +1,146 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.quicksetup.ui.WebBrowserErrorDialog;
+import org.opends.quicksetup.util.WebBrowserException;
+import org.opends.quicksetup.util.WebBrowserLauncher;
+
+/**
+ * An abstract class that the different menu bars in the Control Panel extend.
+ *
+ */
+
+abstract class GenericMenuBar extends JMenuBar
+{
+ private ControlPanelInfo info;
+
+ /**
+ * Constructor of the menu bar.
+ * @param info the control panel information.
+ */
+ protected GenericMenuBar(ControlPanelInfo info)
+ {
+ this.info = info;
+ }
+
+ /**
+ * Returns the control panel information.
+ * @return the control panel information.
+ */
+ public ControlPanelInfo getInfo()
+ {
+ return info;
+ }
+
+ /**
+ * Creates the Help menu bar.
+ * @return the Help menu bar.
+ */
+ protected JMenu createHelpMenuBar()
+ {
+ JMenu menu = Utilities.createMenu(INFO_CTRL_PANEL_HELP_MENU.get(),
+ INFO_CTRL_PANEL_HELP_MENU_DESCRIPTION.get());
+ menu.setMnemonic(KeyEvent.VK_H);
+ JMenuItem menuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_ADMINISTRATION_GUIDE_MENU.get());
+ menuItem.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ displayURL("https://www.opends.org/wiki/page/AdministrationGuide");
+ }
+ });
+ menu.add(menuItem);
+ menuItem = Utilities.createMenuItem(
+ INFO_CTRL_PANEL_DOCUMENTATION_WIKI_MENU.get());
+ menuItem.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ displayURL("https://www.opends.org/wiki/page/Main");
+ }
+ });
+ menu.add(menuItem);
+ return menu;
+ }
+
+ private void displayURL(final String url)
+ {
+ BackgroundTask<Void> worker = new BackgroundTask<Void>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public Void processBackgroundTask() throws WebBrowserException
+ {
+ try
+ {
+ WebBrowserLauncher.openURL(url);
+ } catch (Throwable t)
+ {
+ throw new WebBrowserException(url,
+ ERR_CTRL_PANEL_UNEXPECTED_DETAILS.get(t.toString()), t);
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(Void returnValue,
+ Throwable throwable)
+ {
+ WebBrowserException ex = (WebBrowserException) throwable;
+ if (ex != null)
+ {
+ WebBrowserErrorDialog dlg = new WebBrowserErrorDialog(
+ Utilities.getFrame(GenericMenuBar.this), ex);
+ Utilities.centerGoldenMean(dlg,
+ Utilities.getParentDialog(GenericMenuBar.this));
+ dlg.setModal(true);
+ dlg.packAndShow();
+ }
+ }
+ };
+ worker.startBackgroundTask();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
new file mode 100644
index 0000000..30688df
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
@@ -0,0 +1,759 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.QuickSetupMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.swing.ButtonGroup;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.event.BrowseActionListener;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.quicksetup.util.Utils;
+import org.opends.server.tools.ImportLDIF;
+
+/**
+ * The panel where the user can import the contents of an LDIF file to the
+ * server.
+ *
+ */
+public class ImportLDIFPanel extends InclusionExclusionPanel
+{
+ private static final long serialVersionUID = 1143246529610229229L;
+ private JComboBox backends;
+ private JTextField file;
+ private JCheckBox dataCompressed;
+ private JRadioButton overwrite;
+ private JRadioButton append;
+ private JCheckBox replaceEntries;
+ private JCheckBox rejectNotSchemaCompliant;
+ private JCheckBox writeRejects;
+ private JCheckBox writeSkips;
+ private JTextField rejectsFile;
+ private JTextField skipsFile;
+ private JCheckBox overwriteRejectsFile;
+ private JCheckBox overwriteSkipsFile;
+
+ private JLabel lBackend;
+ private JLabel lNoBackendsFound;
+ private JLabel lFile;
+ private JLabel lImportType;
+ private JLabel lSchemaValidation;
+ private JLabel lRejectsFile;
+ private JLabel lSkipsFile;
+
+ private DocumentListener documentListener;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public ImportLDIFPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_IMPORT_LDIF_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return file;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ if (visible)
+ {
+ documentListener.changedUpdate(null);
+ }
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 3;
+ addErrorPane(gbc);
+
+ gbc.gridy ++;
+ gbc.weightx = 0.0;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.NONE;
+ lBackend = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_BACKEND_LABEL.get());
+ add(lBackend, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ backends = Utilities.createComboBox();
+ backends.setModel(new DefaultComboBoxModel(new String[]{}));
+ gbc.gridwidth = 2;
+ add(backends, gbc);
+ lNoBackendsFound = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NO_BACKENDS_FOUND_LABEL.get());
+ add(lNoBackendsFound, gbc);
+ lNoBackendsFound.setVisible(false);
+ gbc.insets.top = 10;
+
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.gridwidth = 1;
+ lFile = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_FILE_TO_IMPORT_LABEL.get());
+ add(lFile, gbc);
+
+ gbc.gridx = 1;
+ gbc.insets.left = 10;
+ file = Utilities.createTextField();
+ documentListener = new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ String text = file.getText().trim();
+ setEnabledOK((text != null) && (text.length() > 0) &&
+ !errorPane.isVisible());
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ changedUpdate(ev);
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ changedUpdate(ev);
+ }
+ };
+ file.getDocument().addDocumentListener(documentListener);
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(file, gbc);
+ JButton bBrowse = Utilities.createButton(
+ INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ bBrowse.addActionListener(
+ new BrowseActionListener(file,
+ BrowseActionListener.BrowseType.OPEN_LDIF_FILE, this));
+ gbc.gridx = 2;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ bBrowse.setOpaque(false);
+ add(bBrowse, gbc);
+ gbc.gridx = 1;
+ gbc.gridy ++;
+ gbc.insets.left = 30;
+ gbc.insets.top = 5;
+ gbc.gridwidth = 2;
+ dataCompressed = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_DATA_IN_FILE_COMPRESSED.get());
+ dataCompressed.setOpaque(false);
+ add(dataCompressed, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ lImportType = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_IMPORT_TYPE_LABEL.get());
+ add(lImportType, gbc);
+
+ overwrite = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_IMPORT_OVERWRITE_LABEL.get());
+ overwrite.setSelected(true);
+
+ append =
+ Utilities.createRadioButton(INFO_CTRL_PANEL_IMPORT_APPEND_LABEL.get());
+
+ ButtonGroup group = new ButtonGroup();
+ group.add(overwrite);
+ group.add(append);
+
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ add(overwrite, gbc);
+ gbc.gridy ++;
+ gbc.insets.top = 5;
+ add(append, gbc);
+ append.addChangeListener(new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent ev)
+ {
+ replaceEntries.setEnabled(append.isSelected());
+ }
+ });
+
+ replaceEntries =
+ Utilities.createCheckBox(INFO_CTRL_PANEL_IMPORT_REPLACE_ENTRIES.get());
+ replaceEntries.setOpaque(false);
+ replaceEntries.setEnabled(false);
+ gbc.insets.left = 30;
+ gbc.gridy ++;
+ add(replaceEntries, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ lSchemaValidation = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_SCHEMA_VALIDATION_LABEL.get());
+ add(lSchemaValidation, gbc);
+
+ gbc.gridx = 1;
+ rejectNotSchemaCompliant = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_REJECT_NOT_SCHEMA_COMPLIANT_LABEL.get());
+ rejectNotSchemaCompliant.setSelected(true);
+ gbc.insets.left = 10;
+ add(rejectNotSchemaCompliant, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ lRejectsFile = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_REJECTS_FILE_LABEL.get());
+ add(lRejectsFile, gbc);
+
+ gbc.gridx = 1;
+ writeRejects = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_WRITE_REJECTS_FILE_LABEL.get());
+ writeRejects.setSelected(false);
+ gbc.insets.left = 10;
+ add(writeRejects, gbc);
+
+ gbc.gridx = 1;
+ gbc.gridy++;
+ gbc.insets.left = 30;
+ gbc.insets.top = 5;
+ rejectsFile = Utilities.createTextField();
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(rejectsFile, gbc);
+ final JButton rejectsBrowse =
+ Utilities.createButton(INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ rejectsBrowse.addActionListener(
+ new BrowseActionListener(rejectsFile,
+ BrowseActionListener.BrowseType.CREATE_GENERIC_FILE, this));
+ gbc.gridx = 2;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ gbc.insets.left = 10;
+ rejectsBrowse.setOpaque(false);
+ add(rejectsBrowse, gbc);
+ gbc.gridx = 1;
+ gbc.gridy ++;
+ gbc.insets.left = 30;
+ gbc.gridwidth = 2;
+ overwriteRejectsFile = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_OVERWRITE_REJECTS_FILE_LABEL.get());
+ overwriteRejectsFile.setOpaque(false);
+ add(overwriteRejectsFile, gbc);
+
+ ChangeListener changeListener = new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent ev)
+ {
+ rejectsFile.setEnabled(writeRejects.isSelected());
+ rejectsBrowse.setEnabled(writeRejects.isSelected());
+ overwriteRejectsFile.setEnabled(writeRejects.isSelected());
+ }
+ };
+ writeRejects.addChangeListener(changeListener);
+ writeRejects.setSelected(false);
+ changeListener.stateChanged(null);
+
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ lSkipsFile = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_SKIPS_FILE_LABEL.get());
+ add(lSkipsFile, gbc);
+
+ gbc.gridx = 1;
+ writeSkips =
+ Utilities.createCheckBox(INFO_CTRL_PANEL_WRITE_SKIPS_FILE_LABEL.get());
+ writeSkips.setSelected(false);
+ gbc.insets.left = 10;
+ add(writeSkips, gbc);
+
+ gbc.gridx = 1;
+ gbc.gridy++;
+ gbc.insets.left = 30;
+ gbc.insets.top = 5;
+ skipsFile = Utilities.createTextField();
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(skipsFile, gbc);
+ final JButton skipsBrowse =
+ Utilities.createButton(INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ skipsBrowse.addActionListener(
+ new BrowseActionListener(skipsFile,
+ BrowseActionListener.BrowseType.CREATE_GENERIC_FILE, this));
+ gbc.gridx = 2;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ gbc.insets.left = 10;
+ skipsBrowse.setOpaque(false);
+ add(skipsBrowse, gbc);
+
+ gbc.gridx = 1;
+ gbc.gridy ++;
+ gbc.insets.left = 30;
+ gbc.gridwidth = 2;
+ overwriteSkipsFile = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_OVERWRITE_SKIPS_FILE_LABEL.get());
+ overwriteSkipsFile.setOpaque(false);
+ add(overwriteSkipsFile, gbc);
+
+ changeListener = new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent ev)
+ {
+ skipsFile.setEnabled(writeSkips.isSelected());
+ skipsBrowse.setEnabled(writeSkips.isSelected());
+ overwriteSkipsFile.setEnabled(writeSkips.isSelected());
+ }
+ };
+ writeSkips.addChangeListener(changeListener);
+ writeSkips.setSelected(false);
+ changeListener.stateChanged(null);
+
+ changeListener = new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent ev)
+ {
+ if (ev.getSource() == overwriteSkipsFile)
+ {
+ overwriteRejectsFile.setSelected(overwriteSkipsFile.isSelected());
+ }
+ if (ev.getSource() == overwriteRejectsFile)
+ {
+ overwriteSkipsFile.setSelected(overwriteRejectsFile.isSelected());
+ }
+ }
+ };
+ overwriteRejectsFile.addChangeListener(changeListener);
+ overwriteSkipsFile.addChangeListener(changeListener);
+
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.gridwidth = 3;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(createDataExclusionOptions(new JLabel[]{}, new Component[]{}), gbc);
+ gbc.gridy ++;
+ gbc.insets.top = 15;
+ add(createDataInclusionOptions(new JLabel[]{}, new Component[]{}), gbc);
+
+ addBottomGlue(gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ updateSimpleBackendComboBoxModel(backends, lNoBackendsFound,
+ ev.getNewDescriptor());
+ updateErrorPaneAndOKButtonIfAuthRequired(getInfo().getServerDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_IMPORT.get());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkOKButtonEnable()
+ {
+ documentListener.changedUpdate(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ setPrimaryValid(lBackend);
+ setPrimaryValid(lFile);
+ setPrimaryValid(lRejectsFile);
+ setPrimaryValid(lSkipsFile);
+ final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+
+ String backendName = (String)backends.getSelectedItem();
+ if (backendName == null)
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BACKEND_SELECTED.get());
+ setPrimaryInvalid(lBackend);
+ }
+
+ String ldifPath = file.getText();
+ if ((ldifPath == null) || (ldifPath.trim().equals("")))
+ {
+ errors.add(INFO_NO_LDIF_PATH.get());
+ setPrimaryInvalid(lFile);
+ } else if (!Utils.fileExists(ldifPath))
+ {
+ errors.add(INFO_LDIF_FILE_DOES_NOT_EXIST.get());
+ setPrimaryInvalid(lFile);
+ }
+
+ if (writeRejects.isSelected())
+ {
+ String rejectPath = rejectsFile.getText();
+ if ((rejectPath == null) || (rejectPath.trim().equals("")))
+ {
+ errors.add(ERR_CTRL_PANEL_REJECTS_FILE_REQUIRED.get());
+ setPrimaryInvalid(lRejectsFile);
+ }
+ else if (writeSkips.isSelected())
+ {
+ if (new File(rejectPath).equals(new File(skipsFile.getText())))
+ {
+ errors.add(ERR_CTRL_PANEL_REJECTS_AND_SKIPS_MUST_BE_DIFFERENT.get());
+ setPrimaryInvalid(lRejectsFile);
+ setPrimaryInvalid(lSkipsFile);
+ }
+ }
+ }
+
+ if (writeSkips.isSelected())
+ {
+ String skipPath = skipsFile.getText();
+ if ((skipPath == null) || (skipPath.trim().equals("")))
+ {
+ errors.add(ERR_CTRL_PANEL_SKIPS_FILE_REQUIRED.get());
+ setPrimaryInvalid(lSkipsFile);
+ }
+ }
+
+ updateIncludeExclude(errors, backendName);
+
+ if (errors.isEmpty())
+ {
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this), getTitle(), getInfo());
+ ImportTask newTask = new ImportTask(getInfo(), progressDialog);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ boolean confirmed = true;
+ if (errors.isEmpty())
+ {
+ if (overwrite.isSelected())
+ {
+ confirmed = displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_CONFIRMATION_IMPORT_LDIF_DETAILS.get(
+ backends.getSelectedItem().toString()));
+ }
+ }
+ if ((errors.isEmpty()) && confirmed)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_IMPORTING_LDIF_SUMMARY.get(
+ backends.getSelectedItem().toString()),
+ INFO_CTRL_PANEL_IMPORTING_LDIF_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_IMPORTING_LDIF_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_IMPORTING_LDIF_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_IMPORTING_LDIF_ERROR_DETAILS,
+ progressDialog);
+ progressDialog.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(lBackend);
+ setPrimaryValid(lFile);
+ setPrimaryValid(lImportType);
+ setPrimaryValid(lSchemaValidation);
+ setPrimaryValid(lRejectsFile);
+ setPrimaryValid(lSkipsFile);
+ super.cancelClicked();
+ }
+
+ /**
+ * The class that performs the import.
+ *
+ */
+ protected class ImportTask extends InclusionExclusionTask
+ {
+ private Set<String> backendSet;
+ private String fileName;
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public ImportTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ backendSet.add((String)backends.getSelectedItem());
+ fileName = file.getText();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.IMPORT_LDIF;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_IMPORT_TASK_DESCRIPTION.get(fileName,
+ backendSet.iterator().next());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("--ldifFile");
+ args.add(fileName);
+ args.add("--backendID");
+ args.add((String)backends.getSelectedItem());
+ if (dataCompressed.isSelected())
+ {
+ args.add("--isCompressed");
+ }
+ if (overwrite.isSelected())
+ {
+ args.add("--clearBackend");
+ }
+ if (append.isSelected())
+ {
+ args.add("--append");
+ if (replaceEntries.isSelected())
+ {
+ args.add("--replaceExisting");
+ }
+ }
+ if (!rejectNotSchemaCompliant.isSelected())
+ {
+ args.add("--skipSchemaValidation");
+ }
+
+ if (writeRejects.isSelected())
+ {
+ args.add("--rejectFile");
+ args.add(rejectsFile.getText());
+ }
+
+ if (writeSkips.isSelected())
+ {
+ args.add("--skipFile");
+ args.add(skipsFile.getText());
+ }
+
+ if ((writeRejects.isSelected() || writeSkips.isSelected()) &&
+ overwriteRejectsFile.isSelected())
+ {
+ args.add("--overwrite");
+ }
+
+ args.addAll(super.getCommandLineArguments());
+
+ if (isServerRunning())
+ {
+ args.addAll(getConfigCommandLineArguments());
+ }
+
+ return args;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return getCommandLinePath("import-ldif");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+ try
+ {
+ ArrayList<String> arguments = getCommandLineArguments();
+
+ String[] args = new String[arguments.size()];
+
+ arguments.toArray(args);
+ if (isServerRunning())
+ {
+ returnCode = ImportLDIF.mainImportLDIF(args, false, outPrintStream,
+ errorPrintStream);
+ }
+ else
+ {
+ returnCode = executeCommandLine(getCommandLinePath(), args);
+ }
+ if (returnCode != 0)
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ for (String backend : getBackends())
+ {
+ getInfo().unregisterModifiedIndexesInBackend(backend);
+ }
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+ };
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
new file mode 100644
index 0000000..2ae9a2f
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
@@ -0,0 +1,632 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.text.JTextComponent;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.components.BasicExpander;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.quicksetup.util.Utils;
+import org.opends.server.protocols.ldap.LDAPFilter;
+import org.opends.server.types.DN;
+import org.opends.server.types.LDAPException;
+
+/**
+ * Abstract class used to refactor some code used by the import LDIF and export
+ * LDIF panels.
+ *
+ */
+public abstract class InclusionExclusionPanel extends StatusGenericPanel
+{
+ /**
+ * The DNs to exclude.
+ */
+ protected JTextArea dnsToExclude;
+ /**
+ * The attributes to exclude.
+ */
+ protected JTextField attributesToExclude;
+ /**
+ * The exclusion filter.
+ */
+ protected JTextField exclusionFilter;
+ /**
+ * The DNs to include.
+ */
+ protected JTextArea dnsToInclude;
+ /**
+ * The attributes to include.
+ */
+ protected JTextField attributesToInclude;
+ /**
+ * The inclusion filter.
+ */
+ protected JTextField inclusionFilter;
+
+ /**
+ * The DNs to include.
+ */
+ protected JLabel lDnsToInclude;
+ /**
+ * The attributes to include.
+ */
+ protected JLabel lAttributesToInclude;
+ /**
+ * The inclusion filter label.
+ */
+ protected JLabel lInclusionFilter;
+ /**
+ * The DNs to exclude label.
+ */
+ protected JLabel lDnsToExclude;
+ /**
+ * The attributes to exclude label.
+ */
+ protected JLabel lAttributesToExclude;
+ /**
+ * The exclusion filter label.
+ */
+ protected JLabel lExclusionFilter;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(lDnsToInclude);
+ setPrimaryValid(lAttributesToInclude);
+ setPrimaryValid(lInclusionFilter);
+ setPrimaryValid(lDnsToExclude);
+ setPrimaryValid(lAttributesToExclude);
+ setPrimaryValid(lExclusionFilter);
+ super.cancelClicked();
+ }
+
+ /**
+ * A commodity method that layouts a set of components.
+ * @param extraComponentLabels the labels.
+ * @param extraComponents the components.
+ * @return the panel containing the labels and the components.
+ */
+ protected Component createDataInclusionOptions(
+ final JLabel[] extraComponentLabels,
+ final Component[] extraComponents)
+ {
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.weightx = 1.0;
+ gbc.gridwidth = 2;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ int labelInsetLeft = 15;
+ final BasicExpander expander =
+ new BasicExpander(INFO_CTRL_PANEL_DATA_INCLUSION_OPTIONS.get());
+ panel.add(expander, gbc);
+
+ gbc.gridy ++;
+ lDnsToInclude =
+ Utilities.createPrimaryLabel(INFO_CTRL_PANEL_DNS_TO_INCLUDE.get());
+ gbc.insets.left = labelInsetLeft;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ panel.add(lDnsToInclude, gbc);
+
+ gbc.gridx = 1;
+ gbc.weightx = 1.0;
+ gbc.insets.left = 10;
+ dnsToInclude = Utilities.createTextArea(Message.EMPTY, 5, 25);
+ final JScrollPane scrollDns = Utilities.createScrollPane(dnsToInclude);
+ panel.add(scrollDns, gbc);
+
+ gbc.insets.top = 2;
+ gbc.gridy ++;
+ final JLabel lDnsExplanation = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_SEPARATE_DNS_LINE_BREAK.get());
+ panel.add(lDnsExplanation, gbc);
+
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.weightx = 0.0;
+ lAttributesToInclude = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTES_TO_INCLUDE.get());
+ gbc.insets.left = labelInsetLeft;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ panel.add(lAttributesToInclude, gbc);
+
+ gbc.gridx = 1;
+ gbc.weightx = 1.0;
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ attributesToInclude = Utilities.createMediumTextField();
+ panel.add(attributesToInclude, gbc);
+
+ gbc.insets.top = 2;
+ gbc.gridy ++;
+ final JLabel lAttributesExplanation = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_SEPARATE_ATTRIBUTES_COMMA.get());
+ panel.add(lAttributesExplanation, gbc);
+
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ lInclusionFilter = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_INCLUSION_FILTER.get());
+ gbc.insets.left = labelInsetLeft;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ panel.add(lInclusionFilter, gbc);
+
+ gbc.gridx = 1;
+ gbc.weightx = 1.0;
+ gbc.insets.left = 10;
+ inclusionFilter = Utilities.createMediumTextField();
+ panel.add(inclusionFilter, gbc);
+
+ addExtraComponents(panel, extraComponentLabels, extraComponents, gbc,
+ labelInsetLeft);
+
+ ChangeListener changeListener = new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent e)
+ {
+ lDnsToInclude.setVisible(expander.isSelected());
+ scrollDns.setVisible(expander.isSelected());
+ lDnsExplanation.setVisible(expander.isSelected());
+ lAttributesToInclude.setVisible(expander.isSelected());
+ attributesToInclude.setVisible(expander.isSelected());
+ lAttributesExplanation.setVisible(expander.isSelected());
+ lInclusionFilter.setVisible(expander.isSelected());
+ inclusionFilter.setVisible(expander.isSelected());
+ expanderStateChanged(expander, extraComponentLabels, extraComponents);
+ packParentDialog();
+ }
+ };
+ expander.addChangeListener(changeListener);
+ expander.setSelected(false);
+ changeListener.stateChanged(null);
+
+ return panel;
+ }
+
+ /**
+ * A commodity method that layouts a set of components.
+ * @param extraComponentLabels the labels.
+ * @param extraComponents the components.
+ * @return the panel containing the labels and the components.
+ */
+ protected Component createDataExclusionOptions(
+ final JLabel[] extraComponentLabels,
+ final Component[] extraComponents)
+ {
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.weightx = 1.0;
+ gbc.gridwidth = 2;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ int labelInsetLeft = 15;
+ final BasicExpander expander =
+ new BasicExpander(INFO_CTRL_PANEL_DATA_EXCLUSION_OPTIONS.get());
+ panel.add(expander, gbc);
+
+ gbc.gridy ++;
+ lDnsToExclude =
+ Utilities.createPrimaryLabel(INFO_CTRL_PANEL_DNS_TO_EXCLUDE.get());
+ gbc.insets.left = labelInsetLeft;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ panel.add(lDnsToExclude, gbc);
+
+ gbc.gridx = 1;
+ gbc.weightx = 1.0;
+ gbc.insets.left = 10;
+ dnsToExclude = Utilities.createTextArea(Message.EMPTY, 5, 0);
+ final JScrollPane scrollDns = Utilities.createScrollPane(dnsToExclude);
+ panel.add(scrollDns, gbc);
+
+ gbc.insets.top = 2;
+ gbc.gridy ++;
+ final JLabel lDnsExplanation = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_SEPARATE_DNS_LINE_BREAK.get());
+ panel.add(lDnsExplanation, gbc);
+
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.weightx = 0.0;
+ lAttributesToExclude = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTES_TO_INCLUDE.get());
+ gbc.insets.left = labelInsetLeft;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ panel.add(lAttributesToExclude, gbc);
+
+ gbc.gridx = 1;
+ gbc.weightx = 1.0;
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ attributesToExclude = Utilities.createTextField();
+ panel.add(attributesToExclude, gbc);
+
+ gbc.insets.top = 2;
+ gbc.gridy ++;
+ final JLabel lAttributesExplanation = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_SEPARATE_ATTRIBUTES_COMMA.get());
+ panel.add(lAttributesExplanation, gbc);
+
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ lExclusionFilter = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_EXCLUSION_FILTER.get());
+ gbc.insets.left = labelInsetLeft;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ panel.add(lExclusionFilter, gbc);
+
+ gbc.gridx = 1;
+ gbc.weightx = 1.0;
+ gbc.insets.left = 10;
+ exclusionFilter = Utilities.createTextField();
+ panel.add(exclusionFilter, gbc);
+
+ addExtraComponents(panel, extraComponentLabels, extraComponents, gbc,
+ labelInsetLeft);
+
+ ChangeListener changeListener = new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent e)
+ {
+ lDnsToExclude.setVisible(expander.isSelected());
+ scrollDns.setVisible(expander.isSelected());
+ lDnsExplanation.setVisible(expander.isSelected());
+ lAttributesToExclude.setVisible(expander.isSelected());
+ attributesToExclude.setVisible(expander.isSelected());
+ lAttributesExplanation.setVisible(expander.isSelected());
+ lExclusionFilter.setVisible(expander.isSelected());
+ exclusionFilter.setVisible(expander.isSelected());
+ expanderStateChanged(expander, extraComponentLabels, extraComponents);
+ }
+ };
+ expander.addChangeListener(changeListener);
+ expander.setSelected(false);
+ changeListener.stateChanged(null);
+
+ return panel;
+ }
+
+ private void addExtraComponents(JPanel panel, JLabel[] extraComponentLabels,
+ Component[] extraComponents, GridBagConstraints gbc, int labelInsetLeft)
+ {
+ for (int i=0; i<extraComponentLabels.length; i++)
+ {
+ if (extraComponentLabels[i] == null)
+ {
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.insets.left = labelInsetLeft;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 2;
+ gbc.weightx = 1.0;
+ panel.add(extraComponents[i], gbc);
+ }
+ else
+ {
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.insets.left = labelInsetLeft;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ panel.add(extraComponentLabels[i], gbc);
+
+ gbc.gridx = 1;
+ gbc.weightx = 1.0;
+ gbc.insets.left = 10;
+ panel.add(extraComponents[i], gbc);
+ }
+ }
+ }
+
+ private void expanderStateChanged(BasicExpander expander,
+ JLabel[] extraComponentLabels,
+ Component[] extraComponents)
+ {
+ for (JLabel comp : extraComponentLabels)
+ {
+ if (comp != null)
+ {
+ comp.setVisible(expander.isSelected());
+ }
+ }
+ for (Component comp : extraComponents)
+ {
+ comp.setVisible(expander.isSelected());
+ }
+ }
+
+
+ /**
+ * Updates a list of errors in the include and exclude subpanels.
+ * @param errors the list of errors to be updated.
+ * @param backendName the name of the backend where the operation associated
+ * with the panel applies (used to generate the error messages).
+ */
+ protected void updateIncludeExclude(Collection<Message> errors,
+ String backendName)
+ {
+ updateErrors(lDnsToInclude, dnsToInclude, lAttributesToInclude,
+ attributesToInclude, lInclusionFilter, inclusionFilter, errors,
+ backendName);
+ updateErrors(lDnsToExclude, dnsToExclude, lAttributesToExclude,
+ attributesToExclude, lExclusionFilter, exclusionFilter, errors,
+ backendName);
+ }
+
+
+ private void updateErrors(JLabel lDns, JTextComponent dns, JLabel lAttributes,
+ JTextComponent attributes, JLabel lFilter, JTextComponent filter,
+ Collection<Message> errors, String backendName)
+ {
+ setPrimaryValid(lDns);
+ setPrimaryValid(lAttributes);
+ setPrimaryValid(lFilter);
+
+ String s = dns.getText();
+
+ boolean validDn = true;
+
+ if (s.trim().length() > 0)
+ {
+ String[] dnArray = s.split("\n");
+ for (int i=0; i<dnArray.length; i++)
+ {
+ if (!Utils.isDn(dnArray[i]))
+ {
+ errors.add(ERR_CTRL_PANEL_DN_NOT_VALID_WITH_VALUE.get(dnArray[i]));
+ validDn = false;
+ }
+ else
+ {
+ BackendDescriptor backend = null;
+
+ if (backendName != null)
+ {
+ ServerDescriptor server = getInfo().getServerDescriptor();
+ for (BackendDescriptor b : server.getBackends())
+ {
+ if (b.getBackendID().equalsIgnoreCase(backendName))
+ {
+ backend = b;
+ break;
+ }
+ }
+ }
+
+ if (backend != null)
+ {
+ boolean found = false;
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ try
+ {
+ DN dn = DN.decode(dnArray[i]);
+ if (baseDN.getDn().isDescendantOf(dn))
+ {
+ found = true;
+ break;
+ }
+ }
+ catch (Throwable t)
+ {
+ // Bug
+ t.printStackTrace();
+ }
+ }
+ if (!found)
+ {
+ errors.add(ERR_CTRL_PANEL_NOT_A_DESCENDANT_OF_BASE_DN.get(
+ dnArray[i], backendName));
+ }
+ }
+ }
+ }
+ }
+
+ if (!validDn)
+ {
+ setPrimaryInvalid(lDns);
+ }
+
+ s = attributes.getText();
+
+ boolean validAttributes = true;
+
+ if (s.trim().length() > 0)
+ {
+ String[] attributeArray = s.split(",");
+ for (int i=0; i<attributeArray.length; i++)
+ {
+ if (!Utilities.isValidAttributeName(attributeArray[i]))
+ {
+ errors.add(ERR_CTRL_PANEL_NOT_VALID_ATTRIBUTE_NAME.get(
+ attributeArray[i]));
+ validAttributes = false;
+ }
+ }
+ }
+
+ if (!validAttributes)
+ {
+ setPrimaryInvalid(lAttributes);
+ }
+
+ s = filter.getText();
+ if ((s != null) && (s.trim().length() > 0))
+ {
+ try
+ {
+ LDAPFilter.decode(s);
+ }
+ catch (LDAPException le)
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_FILTER_DETAILS_WITH_VALUE.get(s,
+ le.getMessageObject().toString()));
+ setPrimaryInvalid(lFilter);
+ }
+ }
+ }
+
+ /**
+ * Abstract class that provides some methods that can be used to generate the
+ * equivalent command-line arguments for some of the things that are contained
+ * in the inclusion/exclusion panels.
+ *
+ */
+ protected abstract class InclusionExclusionTask extends Task
+ {
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ protected InclusionExclusionTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ }
+
+ /**
+ * Returns the command line arguments corresponding to the elements
+ * displayed in the inclusion/exclusion panels.
+ * @return the command line arguments corresponding to the elements
+ * displayed in the inclusion/exclusion panels.
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ String s = dnsToInclude.getText();
+ if (s.trim().length() > 0)
+ {
+ String[] dnArray = s.split("\n");
+ for (int i=0; i<dnArray.length; i++)
+ {
+ args.add("--includeBranch");
+ args.add(dnArray[i]);
+ }
+ }
+ s = attributesToInclude.getText();
+ if (s.trim().length() > 0)
+ {
+ String[] attrArray = s.split(",");
+ for (int i=0; i<attrArray.length; i++)
+ {
+ args.add("--includeAttribute");
+ args.add(attrArray[i]);
+ }
+ }
+ s = inclusionFilter.getText();
+ if (s.trim().length() > 0)
+ {
+ args.add("--includeFilter");
+ args.add(s);
+ }
+
+ s = dnsToExclude.getText();
+ if (s.trim().length() > 0)
+ {
+ String[] dnArray = s.split("\n");
+ for (int i=0; i<dnArray.length; i++)
+ {
+ args.add("--excludeBranch");
+ args.add(dnArray[i]);
+ }
+ }
+ s = attributesToExclude.getText();
+ if (s.trim().length() > 0)
+ {
+ String[] attrArray = s.split(",");
+ for (int i=0; i<attrArray.length; i++)
+ {
+ args.add("--excludeAttribute");
+ args.add(attrArray[i]);
+ }
+ }
+ s = exclusionFilter.getText();
+ if (s.trim().length() > 0)
+ {
+ args.add("--excludeFilter");
+ args.add(s);
+ }
+ args.addAll(getConnectionCommandLineArguments());
+ return args;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
new file mode 100644
index 0000000..3abea96
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
@@ -0,0 +1,292 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+
+import javax.swing.JPanel;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.IndexSelectionListener;
+import org.opends.messages.Message;
+
+/**
+ * The panel on the right of the 'Manage Indexes' panel.
+ *
+ */
+public class IndexBrowserRightPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = -6904674789074101772L;
+ private JPanel mainPanel;
+ private IndexPanel standardIndexPanel = new IndexPanel();
+ private VLVIndexPanel vlvIndexPanel = new VLVIndexPanel();
+ private BackendIndexesPanel backendIndexesPanel = new BackendIndexesPanel();
+ private BackendVLVIndexesPanel backendVLVIndexesPanel =
+ new BackendVLVIndexesPanel();
+
+ private final static String NOTHING_SELECTED = "Nothing Selected";
+ private final static String MULTIPLE_SELECTED = "Multiple Selected";
+
+ /**
+ * Default constructor.
+ *
+ */
+ public IndexBrowserRightPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * Displays a panel informing that no item is selected.
+ *
+ */
+ public void displayVoid()
+ {
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel, NOTHING_SELECTED);
+ }
+
+ /**
+ * Displays a panel informing that multiple items are selected.
+ *
+ */
+ public void displayMultiple()
+ {
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel, MULTIPLE_SELECTED);
+ }
+
+ /**
+ * Adds an index selection listener.
+ * @param listener the index selection listener.
+ */
+ public void addIndexSelectionListener(IndexSelectionListener listener)
+ {
+ backendIndexesPanel.addIndexSelectionListener(listener);
+ backendVLVIndexesPanel.addIndexSelectionListener(listener);
+ }
+
+ /**
+ * Removes an index selection listener.
+ * @param listener the index selection listener.
+ */
+ public void removeIndexSelectionListener(IndexSelectionListener listener)
+ {
+ backendIndexesPanel.removeIndexSelectionListener(listener);
+ backendVLVIndexesPanel.removeIndexSelectionListener(listener);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ super.setInfo(info);
+ standardIndexPanel.setInfo(info);
+ vlvIndexPanel.setInfo(info);
+ backendIndexesPanel.setInfo(info);
+ backendVLVIndexesPanel.setInfo(info);
+ }
+
+ /**
+ * Updates the contents of the panel with an standard index.
+ * @param index the index to be used to update the contents of the panel.
+ */
+ public void updateStandardIndex(IndexDescriptor index)
+ {
+ standardIndexPanel.update(index);
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ standardIndexPanel.getTitle().toString());
+ }
+
+ /**
+ * Updates the contents of the panel with a VLV index.
+ * @param index the index to be used to update the contents of the panel.
+ */
+ public void updateVLVIndex(VLVIndexDescriptor index)
+ {
+ vlvIndexPanel.update(index);
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ vlvIndexPanel.getTitle().toString());
+ }
+
+ /**
+ * Updates the contents of the panel with the indexes on the provided backend.
+ * A table with all the indexes of the backend will be displayed.
+ * @param backendName the name of the backend.
+ */
+ public void updateBackendIndexes(String backendName)
+ {
+ backendIndexesPanel.update(backendName);
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ backendIndexesPanel.getTitle().toString());
+ }
+
+ /**
+ * Updates the contents of the panel with the VLV indexes on the provided
+ * backend.
+ * A table with all the VLV indexes of the backend will be displayed.
+ * @param backendName the name of the backend.
+ */
+ public void updateBackendVLVIndexes(String backendName)
+ {
+ backendVLVIndexesPanel.update(backendName);
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ backendVLVIndexesPanel.getTitle().toString());
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ CardLayout cardLayout = new CardLayout();
+ mainPanel = new JPanel(cardLayout);
+ mainPanel.setOpaque(false);
+ NoItemSelectedPanel noEntryPanel = new NoItemSelectedPanel();
+ mainPanel.add(noEntryPanel, NOTHING_SELECTED);
+ NoItemSelectedPanel multipleEntryPanel = new NoItemSelectedPanel();
+ multipleEntryPanel.setMessage(
+ INFO_CTRL_PANEL_MULTIPLE_ITEMS_SELECTED_LABEL.get());
+ mainPanel.add(multipleEntryPanel, MULTIPLE_SELECTED);
+ StatusGenericPanel[] panels =
+ {
+ standardIndexPanel,
+ backendIndexesPanel,
+ backendVLVIndexesPanel,
+ vlvIndexPanel
+ };
+ for (StatusGenericPanel panel : panels)
+ {
+ mainPanel.add(panel, panel.getTitle().toString());
+ }
+ cardLayout.show(mainPanel, NOTHING_SELECTED);
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ add(mainPanel, gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ // No ok button
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_INDEX_BROWSER_RIGHT_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ // TODO
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * Method used to know if there are unsaved changes or not. It is used by
+ * the index selection listener when the user changes the selection.
+ * @return <CODE>true</CODE> if there are unsaved changes (and so the
+ * selection of the index should be canceled) and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean mustCheckUnsavedChanges()
+ {
+ boolean mustCheckUnsavedChanges;
+ if (vlvIndexPanel.isVisible())
+ {
+ mustCheckUnsavedChanges = vlvIndexPanel.mustCheckUnsavedChanges();
+ }
+ else if (standardIndexPanel.isVisible())
+ {
+ mustCheckUnsavedChanges = standardIndexPanel.mustCheckUnsavedChanges();
+ }
+ else
+ {
+ mustCheckUnsavedChanges = false;
+ }
+ return mustCheckUnsavedChanges;
+ }
+
+ /**
+ * Tells whether the user chose to save the changes in the panel, to not save
+ * them or simply cancelled the selection in the tree.
+ * @return the value telling whether the user chose to save the changes in the
+ * panel, to not save them or simply cancelled the selection in the tree.
+ */
+ public UnsavedChangesDialog.Result checkUnsavedChanges()
+ {
+ UnsavedChangesDialog.Result result;
+ if (vlvIndexPanel.isVisible())
+ {
+ result = vlvIndexPanel.checkUnsavedChanges();
+ }
+ else if (standardIndexPanel.isVisible())
+ {
+ result = standardIndexPanel.checkUnsavedChanges();
+ }
+ else
+ {
+ result = UnsavedChangesDialog.Result.DO_NOT_SAVE;
+ }
+ return result;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java
new file mode 100644
index 0000000..e7fa86f
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java
@@ -0,0 +1,886 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.Box;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.ScrollPaneBorderListener;
+import org.opends.guitools.controlpanel.task.DeleteIndexTask;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.ConfigReader;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.admin.client.ManagementContext;
+import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
+import org.opends.server.admin.client.ldap.LDAPManagementContext;
+import org.opends.server.admin.std.client.LocalDBBackendCfgClient;
+import org.opends.server.admin.std.client.LocalDBIndexCfgClient;
+import org.opends.server.admin.std.client.RootCfgClient;
+import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.ServerConstants;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * The panel that displays an existing index (it appears on the right of the
+ * 'Manage Indexes' dialog).
+ *
+ */
+public class IndexPanel extends AbstractIndexPanel
+{
+ private static final long serialVersionUID = 1439500626486823366L;
+ private IndexDescriptor index;
+ private ScrollPaneBorderListener scrollListener;
+
+ private boolean ignoreCheckSave;
+
+ private ModifyIndexTask newModifyTask;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public IndexPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ *
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ super.createBasicLayout(p, gbc, true);
+ p.setBorder(new EmptyBorder(10, 10, 10, 10));
+ gbc = new GridBagConstraints();
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ JScrollPane scroll = Utilities.createBorderLessScrollBar(p);
+ scrollListener = new ScrollPaneBorderListener(scroll);
+ add(scroll, gbc);
+
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.weightx = 1.0;
+ gbc.insets.left = 0;
+ gbc.gridwidth = 2;
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+
+ gbc.insets = new Insets(10, 10, 0, 10);
+ add(warning, gbc);
+ Utilities.setWarningLabel(warning, INDEX_MODIFIED);
+
+ gbc.gridy ++;
+ JPanel buttonPanel = new JPanel(new GridBagLayout());
+ buttonPanel.setOpaque(false);
+ gbc.insets = new Insets(10, 10, 10, 10);
+ add(buttonPanel, gbc);
+
+ gbc.insets = new Insets(0, 0, 0, 0);
+ gbc.gridy = 0;
+ gbc.gridx = 0;
+ gbc.weightx = 0.0;
+ gbc.gridwidth = 1;
+ deleteIndex.setOpaque(false);
+ gbc.insets.left = 0;
+ buttonPanel.add(deleteIndex, gbc);
+ deleteIndex.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteIndex();
+ }
+ });
+ gbc.gridx = 2;
+ gbc.weightx = 1.0;
+ buttonPanel.add(Box.createHorizontalGlue(), gbc);
+ gbc.weightx = 0.0;
+ gbc.insets.left = 10;
+ saveChanges.setOpaque(false);
+ gbc.gridx = 3;
+ buttonPanel.add(saveChanges, gbc);
+ saveChanges.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ saveIndex(false);
+ }
+ });
+
+ entryLimit.getDocument().addDocumentListener(new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ checkSaveButton();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ checkSaveButton();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ checkSaveButton();
+ }
+ });
+
+ ActionListener listener = new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ checkSaveButton();
+ }
+ };
+ for (JCheckBox cb : types)
+ {
+ cb.addActionListener(listener);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_INDEX_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return entryLimit;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(final ConfigurationChangeEvent ev)
+ {
+ updateErrorPaneIfAuthRequired(ev.getNewDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_INDEX_EDITING.get());
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ checkSaveButton();
+ deleteIndex.setEnabled(!authenticationRequired(ev.getNewDescriptor()));
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+
+ /**
+ * Method used to know if there are unsaved changes or not. It is used by
+ * the index selection listener when the user changes the selection.
+ * @return <CODE>true</CODE> if there are unsaved changes (and so the
+ * selection of the index should be canceled) and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean mustCheckUnsavedChanges()
+ {
+ return (index != null) &&
+ saveChanges.isVisible() && saveChanges.isEnabled();
+ }
+
+ /**
+ * Tells whether the user chose to save the changes in the panel, to not save
+ * them or simply cancelled the selection in the tree.
+ * @return the value telling whether the user chose to save the changes in the
+ * panel, to not save them or simply cancelled the selection change in the
+ * tree.
+ */
+ public UnsavedChangesDialog.Result checkUnsavedChanges()
+ {
+ UnsavedChangesDialog.Result result;
+ UnsavedChangesDialog unsavedChangesDlg = new UnsavedChangesDialog(
+ Utilities.getParentDialog(this), getInfo());
+ unsavedChangesDlg.setMessage(INFO_CTRL_PANEL_UNSAVED_CHANGES_SUMMARY.get(),
+ INFO_CTRL_PANEL_UNSAVED_INDEX_CHANGES_DETAILS.get(index.getName()));
+ Utilities.centerGoldenMean(unsavedChangesDlg,
+ Utilities.getParentDialog(this));
+ unsavedChangesDlg.setVisible(true);
+ result = unsavedChangesDlg.getResult();
+ if (result == UnsavedChangesDialog.Result.SAVE)
+ {
+ saveIndex(false);
+ if ((newModifyTask == null) || // The user data is not valid
+ (newModifyTask.getState() != Task.State.FINISHED_SUCCESSFULLY))
+ {
+ result = UnsavedChangesDialog.Result.CANCEL;
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * Checks the enabling state of the save button.
+ *
+ */
+ private void checkSaveButton()
+ {
+ if (!ignoreCheckSave && (index != null))
+ {
+ saveChanges.setEnabled(
+ !authenticationRequired(getInfo().getServerDescriptor()) &&
+ isModified());
+ }
+ }
+
+ private void deleteIndex()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_DELETE_INDEX_TITLE.get(), getInfo());
+ ArrayList<AbstractIndexDescriptor> indexesToDelete =
+ new ArrayList<AbstractIndexDescriptor>();
+ indexesToDelete.add(index);
+ DeleteIndexTask newTask = new DeleteIndexTask(getInfo(), dlg,
+ indexesToDelete);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ String indexName = index.getName();
+ String backendName = index.getBackend().getBackendID();
+ if (displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_CONFIRMATION_INDEX_DELETE_DETAILS.get(indexName,
+ backendName)))
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_INDEX_SUMMARY.get(),
+ INFO_CTRL_PANEL_DELETING_INDEX_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_INDEX_SUCCESSFUL.get(indexName,
+ backendName),
+ ERR_CTRL_PANEL_DELETING_INDEX_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_INDEX_ERROR_DETAILS.get(indexName),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ }
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Saves the index modifications.
+ * @param modal whether the progress dialog for the task must be modal or
+ * not.
+ */
+ private void saveIndex(boolean modal)
+ {
+ newModifyTask = null;
+ if (!isModified())
+ {
+ return;
+ }
+
+ List<Message> errors = getErrors();
+
+ if (errors.isEmpty())
+ {
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_MODIFYING_INDEX_TITLE.get(), getInfo());
+ dlg.setModal(modal);
+ newModifyTask = new ModifyIndexTask(getInfo(), dlg);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newModifyTask, errors);
+ }
+ if (errors.size() == 0)
+ {
+ String attributeName = index.getName();
+ String backendName = index.getBackend().getBackendID();
+ launchOperation(newModifyTask,
+ INFO_CTRL_PANEL_MODIFYING_INDEX_SUMMARY.get(attributeName),
+ INFO_CTRL_PANEL_MODIFYING_INDEX_COMPLETE.get(),
+ INFO_CTRL_PANEL_MODIFYING_INDEX_SUCCESSFUL.get(attributeName,
+ backendName),
+ ERR_CTRL_PANEL_MODIFYING_INDEX_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_MODIFYING_INDEX_ERROR_DETAILS.get(attributeName),
+ null,
+ dlg);
+ saveChanges.setEnabled(false);
+ dlg.setVisible(true);
+ }
+ }
+
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Updates the contents of the panel with the provided index.
+ * @param index the index descriptor to be used to update the panel.
+ */
+ public void update(IndexDescriptor index)
+ {
+ ignoreCheckSave = true;
+ setPrimaryValid(lEntryLimit);
+ setPrimaryValid(lType);
+ name.setText(index.getName());
+ titlePanel.setDetails(Message.raw(index.getName()));
+ entryLimit.setText(String.valueOf(index.getEntryLimit()));
+ approximate.setSelected(false);
+ equality.setSelected(false);
+ ordering.setSelected(false);
+ substring.setSelected(false);
+ presence.setSelected(false);
+ for (IndexType type : index.getTypes())
+ {
+ switch(type)
+ {
+ case APPROXIMATE:
+ approximate.setSelected(true);
+ break;
+ case PRESENCE:
+ presence.setSelected(true);
+ break;
+ case EQUALITY:
+ equality.setSelected(true);
+ break;
+ case ORDERING:
+ ordering.setSelected(true);
+ break;
+ case SUBSTRING:
+ substring.setSelected(true);
+ break;
+ }
+ }
+
+ JComponent[] comps = {entryLimit, lType, typesPanel, lEntryLimit};
+
+ for (int i=0; i<comps.length; i++)
+ {
+ comps[i].setVisible(!index.isDatabaseIndex());
+ }
+
+ AttributeType attr = index.getAttributeType();
+ repopulateTypesPanel(attr);
+
+ if (index.isDatabaseIndex())
+ {
+ entryLimit.setText("");
+ }
+ saveChanges.setVisible(!index.isDatabaseIndex());
+ deleteIndex.setVisible(!index.isDatabaseIndex());
+ if (index.isDatabaseIndex())
+ {
+ Utilities.setWarningLabel(warning, NON_CONFIGURABLE_INDEX);
+ warning.setVisible(true);
+ }
+ else if (getInfo() != null)
+ {
+ if (getInfo().mustReindex(index))
+ {
+ Utilities.setWarningLabel(warning, INDEX_MODIFIED);
+ warning.setVisible(true);
+ warning.setVerticalTextPosition(SwingConstants.TOP);
+ }
+ else
+ {
+ warning.setVisible(false);
+ }
+ }
+ this.index = index;
+
+ ignoreCheckSave = false;
+ checkSaveButton();
+
+ scrollListener.updateBorder();
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the index has been modified and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the index has been modified and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean isModified()
+ {
+ return !getTypes().equals(index.getTypes()) ||
+ !String.valueOf(index.getEntryLimit()).equals(entryLimit.getText());
+ }
+
+ /**
+ * The task in charge of modifying the index.
+ *
+ */
+ protected class ModifyIndexTask extends Task
+ {
+ private Set<String> backendSet;
+ private String attributeName;
+ private String backendName;
+ private int entryLimitValue;
+ private IndexDescriptor indexToModify;
+ private SortedSet<IndexType> indexTypes = new TreeSet<IndexType>();
+ private IndexDescriptor modifiedIndex;
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public ModifyIndexTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ backendName = index.getBackend().getBackendID();
+ backendSet = new HashSet<String>();
+ backendSet.add(backendName);
+ attributeName = index.getName();
+ entryLimitValue = Integer.parseInt(entryLimit.getText());
+ indexTypes = getTypes();
+
+ indexToModify = index;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.MODIFY_INDEX;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_MODIFY_INDEX_TASK_DESCRIPTION.get(attributeName,
+ backendName);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * Updates the configuration of the modified index.
+ * @throws OpenDsException if there is an error updating the configuration.
+ */
+ private void updateConfiguration() throws OpenDsException
+ {
+ boolean configHandlerUpdated = false;
+ try
+ {
+ if (!isServerRunning())
+ {
+ configHandlerUpdated = true;
+ getInfo().stopPooling();
+ if (getInfo().mustDeregisterConfig())
+ {
+ DirectoryServer.deregisterBaseDN(DN.decode("cn=config"));
+ }
+ DirectoryServer.getInstance().initializeConfiguration(
+ org.opends.server.extensions.ConfigFileHandler.class.getName(),
+ ConfigReader.configFile);
+ getInfo().setMustDeregisterConfig(true);
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLineName());
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(
+ getDSConfigCommandLineArguments());
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_MODIFY_INDEX.get()+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_MODIFYING_INDEX_PROGRESS.get(attributeName),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ if (isServerRunning())
+ {
+ // Create additional indexes and display the equivalent command.
+ // Everything is done in the method createAdditionalIndexes
+ modifyIndex(getInfo().getDirContext());
+ }
+ else
+ {
+ modifyIndex();
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ finally
+ {
+ if (configHandlerUpdated)
+ {
+ DirectoryServer.getInstance().initializeConfiguration(
+ ConfigReader.configClassName, ConfigReader.configFile);
+ getInfo().startPooling(ControlPanelInfo.DEFAULT_POOLING);
+ }
+ }
+ }
+
+ /**
+ * Returns the LDIF representation of the modified index.
+ * @return the LDIF representation of the modified index.
+ */
+ private String getIndexLDIF()
+ {
+ String dn = Utilities.getRDNString("ds-cfg-backend-id", backendName)+
+ ",cn=Backends,cn=config";
+ ArrayList<String> lines = new ArrayList<String>();
+ lines.add("dn: "+
+ Utilities.getRDNString("ds-cfg-attribute", attributeName)+
+ ",cn=Index,"+dn);
+ lines.add("objectClass: ds-cfg-local-db-index");
+ lines.add("objectClass: top");
+ lines.add("ds-cfg-attribute: "+attributeName);
+ lines.add("ds-cfg-index-entry-limit: "+entryLimitValue);
+ for (IndexType type : indexTypes)
+ {
+ lines.add("ds-cfg-index-type: "+type.toString());
+ }
+ StringBuilder sb = new StringBuilder();
+ for (String line : lines)
+ {
+ sb.append(line+ServerConstants.EOL);
+ }
+ return sb.toString();
+ }
+
+ private void modifyIndex() throws OpenDsException
+ {
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ String ldif = getIndexLDIF();
+
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ Entry newConfigEntry = reader.readEntry();
+ Entry oldEntry = DirectoryServer.getConfigEntry(
+ newConfigEntry.getDN()).getEntry();
+ DirectoryServer.getConfigHandler().replaceEntry(oldEntry,
+ newConfigEntry,
+ null);
+ DirectoryServer.getConfigHandler().writeUpdatedConfig();
+ }
+ catch (IOException ioe)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
+ ioe);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ }
+
+ /**
+ * Modifies index using the provided connection.
+ * @param ctx the connection to be used to update the index configuration.
+ * @throws OpenDsException if there is an error updating the server.
+ */
+ private void modifyIndex(InitialLdapContext ctx) throws OpenDsException
+ {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLineName());
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(getDSConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ LocalDBBackendCfgClient backend =
+ (LocalDBBackendCfgClient)root.getBackend(backendName);
+ LocalDBIndexCfgClient index = backend.getLocalDBIndex(attributeName);
+ if (!indexTypes.equals(indexToModify.getTypes()))
+ {
+ index.setIndexType(indexTypes);
+ }
+ if (entryLimitValue != index.getIndexEntryLimit())
+ {
+ index.setIndexEntryLimit(entryLimitValue);
+ }
+ index.commit();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * Returns the full command-line path of the dsconfig command-line if we
+ * can provide an equivalent command-line (the server is running).
+ * @return the full command-line path of the dsconfig command-line if we
+ * can provide an equivalent command-line (the server is running).
+ */
+ private String getConfigCommandLineName()
+ {
+ if (isServerRunning() && isModified())
+ {
+ return getCommandLinePath("dsconfig");
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ updateConfiguration();
+ modifiedIndex = new IndexDescriptor(attributeName,
+ indexToModify.getAttributeType(),
+ indexToModify.getBackend(),
+ indexTypes,
+ entryLimitValue);
+ getInfo().registerModifiedIndex(modifiedIndex);
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void postOperation()
+ {
+ if ((lastException == null) && (state == State.FINISHED_SUCCESSFULLY))
+ {
+ rebuildIndexIfNecessary(modifiedIndex, getProgressDialog());
+ }
+ }
+
+ private ArrayList<String> getDSConfigCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("set-local-db-index-prop");
+ args.add("--backend-name");
+ args.add(backendName);
+
+ args.add("--index-name");
+ args.add(attributeName);
+
+ if (!indexTypes.equals(indexToModify.getTypes()))
+ {
+ for (IndexType newType : indexTypes)
+ {
+ args.add("--set");
+ args.add("index-type:"+newType.toString());
+ }
+ }
+ if (entryLimitValue != indexToModify.getEntryLimit())
+ {
+ args.add("--set");
+ args.add("index-entry-limit:"+entryLimitValue);
+ }
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+ return args;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
new file mode 100644
index 0000000..dc1f376
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -0,0 +1,1315 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.SortableTableModel;
+import org.opends.guitools.controlpanel.event.BrowseActionListener;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.components.LabelWithHelpIcon;
+import org.opends.guitools.controlpanel.ui.renderer.AttributeCellEditor;
+import org.opends.guitools.controlpanel.ui.renderer.LDAPEntryTableCellRenderer;
+import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.quicksetup.Installation;
+import org.opends.quicksetup.util.Utils;
+import org.opends.server.tools.JavaPropertiesTool;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.SetupUtils;
+
+/**
+ * The panel where the user can specify the java arguments and java home to be
+ * used in the command-lines.
+ *
+ */
+public class JavaPropertiesPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = -7886215660289880597L;
+ private JTextField javaHome;
+ private JRadioButton useOpenDSJavaHome;
+ private JRadioButton useSpecifiedJavaHome;
+ private JButton browse;
+ private JLabel lJavaHome;
+
+ private JRadioButton useOpenDSJavaArgs;
+ private JRadioButton useSpecifiedJavaArgs;
+ private JLabel lJavaArgs;
+ private JTable argumentsTable;
+ private JavaArgumentsTableModel argumentsTableModel;
+ private JScrollPane argumentsScroll;
+
+ private AttributeCellEditor editor;
+
+ private JLabel lInitContents;
+
+ private Set<JavaArgumentsDescriptor> readJavaArguments =
+ new HashSet<JavaArgumentsDescriptor>();
+ private String readJavaHome;
+ private boolean readUseOpenDSJavaHome;
+ private boolean readUseOpenDSJavaArgs;
+
+ private boolean firstDisplay = true;
+
+ private Message READING_JAVA_SETTINGS =
+ INFO_CTRL_PANEL_READING_JAVA_SETTINGS_SUMMARY.get();
+
+ JComponent[] comps;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public JavaPropertiesPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_JAVA_PROPERTIES_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return javaHome;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ super.setInfo(info);
+ if (editor != null)
+ {
+ editor.setInfo(info);
+ }
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+
+ lJavaHome = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_JAVA_HOME_LABEL.get());
+ useOpenDSJavaHome = Utilities.createRadioButton(Message.EMPTY);
+ useOpenDSJavaHome.setOpaque(false);
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.weightx = 0.0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridwidth = 1;
+ add(lJavaHome, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx ++;
+ add(useOpenDSJavaHome, gbc);
+ gbc.gridwidth = 3;
+ gbc.gridx ++;
+ LabelWithHelpIcon useOpenDSJavaHomeLabel =
+ new LabelWithHelpIcon(INFO_CTRL_PANEL_USE_OPENDS_JAVA_HOME.get(),
+ INFO_CTRL_PANEL_USE_OPENDS_JAVA_HOME_HELP.get());
+ gbc.insets.left = 0;
+ add(useOpenDSJavaHomeLabel, gbc);
+
+
+ gbc.gridx = 1;
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 0.0;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ useSpecifiedJavaHome = Utilities.createRadioButton(Message.EMPTY);
+ useSpecifiedJavaHome.setOpaque(false);
+ LabelWithHelpIcon useSpecifiedJavaHomeLabel = new LabelWithHelpIcon(
+ INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_HOME.get(),
+ INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_HOME_HELP.get());
+ gbc.insets.left = 10;
+ add(useSpecifiedJavaHome, gbc);
+ gbc.gridx ++;
+ gbc.insets.left = 0;
+ add(useSpecifiedJavaHomeLabel, gbc);
+ gbc.gridx ++;
+ javaHome = Utilities.createTextField();
+ gbc.weightx = 1.0;
+ gbc.insets.left = 5;
+ add(javaHome, gbc);
+ gbc.weightx = 0.0;
+ browse = Utilities.createButton(INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ browse.addActionListener(
+ new BrowseActionListener(javaHome,
+ BrowseActionListener.BrowseType.LOCATION_DIRECTORY, this));
+ browse.setOpaque(false);
+ gbc.gridx ++;
+ add(browse, gbc);
+
+ ButtonGroup group = new ButtonGroup();
+ group.add(useSpecifiedJavaHome);
+ group.add(useOpenDSJavaHome);
+
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ gbc.gridwidth = 5;
+ gbc.gridy ++;
+ add(new JSeparator(), gbc);
+
+ gbc.gridy ++;
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ add(p, gbc);
+
+ gbc.insets.top = 10;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+
+ lJavaArgs = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_JAVA_ARGUMENTS_LABEL.get());
+ useSpecifiedJavaArgs = Utilities.createRadioButton(Message.EMPTY);
+ useSpecifiedJavaArgs.setOpaque(false);
+ useOpenDSJavaArgs = Utilities.createRadioButton(Message.EMPTY);
+ useOpenDSJavaArgs.setOpaque(false);
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 0.0;
+ gbc.insets.top = 10;
+ p.add(lJavaArgs, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx ++;
+ gbc.gridwidth = 1;
+ p.add(useOpenDSJavaArgs, gbc);
+ gbc.gridx ++;
+ LabelWithHelpIcon useOpenDSJavaArgsLabel = new LabelWithHelpIcon(
+ INFO_CTRL_PANEL_USE_OPENDS_JAVA_ARGS.get(),
+ INFO_CTRL_PANEL_USE_OPENDS_JAVA_ARGS_HELP.get());
+ gbc.insets.left = 0;
+ p.add(useOpenDSJavaArgsLabel, gbc);
+
+
+ gbc.gridx = 1;
+ gbc.gridy ++;
+ gbc.insets.top = 10;
+ gbc.insets.left = 10;
+ p.add(useSpecifiedJavaArgs, gbc);
+ gbc.gridx ++;
+ LabelWithHelpIcon useSpecifiedJavaArgsLabel = new LabelWithHelpIcon(
+ INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_ARGS.get(),
+ INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_ARGS_HELP.get());
+ gbc.insets.left = 0;
+ p.add(useSpecifiedJavaArgsLabel, gbc);
+
+ group = new ButtonGroup();
+ group.add(useSpecifiedJavaArgs);
+ group.add(useOpenDSJavaArgs);
+
+ argumentsTableModel = new JavaArgumentsTableModel();
+ LDAPEntryTableCellRenderer renderer = new LDAPEntryTableCellRenderer();
+ argumentsTable = Utilities.createSortableTable(argumentsTableModel,
+ renderer);
+ editor = new AttributeCellEditor();
+ if (getInfo() != null)
+ {
+ editor.setInfo(getInfo());
+ }
+ argumentsTable.getColumnModel().getColumn(1).setCellEditor(editor);
+ renderer.setTable(argumentsTable);
+
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.gridx = 1;
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridwidth = 2;
+ argumentsScroll = Utilities.createScrollPane(argumentsTable);
+ p.add(argumentsScroll, gbc);
+ lInitContents = Utilities.createDefaultLabel(READING_JAVA_SETTINGS);
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.CENTER;
+ p.add(lInitContents, gbc);
+ lInitContents.setVisible(false);
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 1.0;
+ gbc.anchor = GridBagConstraints.WEST;
+
+ JLabel inlineHelp = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_ONLINE_COMMAND_HELP.get());
+ gbc.insets.top = 3;
+ gbc.gridy ++;
+ p.add(inlineHelp, gbc);
+
+ inlineHelp = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_OFFLINE_COMMAND_HELP.get());
+ gbc.gridy ++;
+ p.add(inlineHelp, gbc);
+
+ // Just to create space.
+ Set<JavaArgumentsDescriptor> fakeArguments =
+ new HashSet<JavaArgumentsDescriptor>();
+ fakeArguments.add(
+ new JavaArgumentsDescriptor("start-ds", "-server -XM256j"));
+ fakeArguments.add(
+ new JavaArgumentsDescriptor("stop-ds", "-client"));
+ fakeArguments.add(
+ new JavaArgumentsDescriptor("import-ds.online", "-server"));
+ fakeArguments.add(
+ new JavaArgumentsDescriptor("import-ds.offline", "-server"));
+ fakeArguments.add(
+ new JavaArgumentsDescriptor("export-ds.online", "-server"));
+
+ argumentsTableModel.setData(fakeArguments);
+ Utilities.updateTableSizes(argumentsTable, 7);
+
+ comps = new JComponent[] {
+ javaHome, useOpenDSJavaHome, useSpecifiedJavaHome, browse,
+ useOpenDSJavaArgs, useSpecifiedJavaArgs
+ };
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ if (visible && (firstDisplay || !updatedByUser()))
+ {
+ firstDisplay = false;
+ initContents();
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the user updated the contents and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the user updated the contents and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean updatedByUser()
+ {
+ boolean updatedByUser = !javaHome.getText().equals(readJavaHome) ||
+ useOpenDSJavaHome.isSelected() != readUseOpenDSJavaHome ||
+ useOpenDSJavaArgs.isSelected() != readUseOpenDSJavaArgs ||
+ !readJavaArguments.equals(getJavaArguments());
+
+ return updatedByUser;
+ }
+
+ /**
+ * Returns the java arguments specified in the table.
+ * @return the java arguments specified in the table.
+ */
+ private Set<JavaArgumentsDescriptor> getJavaArguments()
+ {
+ HashSet<JavaArgumentsDescriptor> args =
+ new HashSet<JavaArgumentsDescriptor>();
+ for (int i=0; i<argumentsTableModel.getRowCount(); i++)
+ {
+ args.add(argumentsTableModel.getJavaArguments(i));
+ }
+ return args;
+ }
+
+ /**
+ * Inits the contents of the table in the background.
+ *
+ */
+ private void initContents()
+ {
+ disableComponents();
+
+ BackgroundTask<Void> worker = new BackgroundTask<Void>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public Void processBackgroundTask() throws Throwable
+ {
+ String propertiesFile = getPropertiesFile();
+ FileInputStream fs = null;
+ Properties properties = new Properties();
+ try
+ {
+ fs = new FileInputStream(propertiesFile);
+ properties.load(fs);
+ }
+ catch (Throwable t)
+ {
+ }
+ finally
+ {
+ if (fs != null)
+ {
+ try
+ {
+ fs.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ String[] scripts =
+ {
+ "start-ds", "import-ldif.offline", "backup.online", "base64",
+ "create-rc-script", "dsconfig", "dsreplication", "dsframework",
+ "export-ldif.online", "import-ldif.online", "ldapcompare",
+ "ldapdelete", "ldapmodify", "ldappasswordmodify", "ldapsearch",
+ "list-backends", "manage-account", "manage-tasks", "restore.online",
+ "stop-ds", "status", "status-panel", "uninstall", "setup",
+ "backup.offline", "encode-password", "export-ldif.offline",
+ "ldif-diff", "ldifmodify", "ldifsearch", "make-ldif",
+ "rebuild-index", "restore.offline", "upgrade",
+ "verify-index", "dbtest"
+ };
+ String v = properties.getProperty("overwrite-env-java-home");
+ readUseOpenDSJavaHome =
+ (v == null) || ("false".equalsIgnoreCase(v.trim()));
+ v = properties.getProperty("overwrite-env-java-args");
+ readUseOpenDSJavaArgs =
+ (v == null) || ("false".equalsIgnoreCase(v.trim()));
+
+ readJavaHome = properties.getProperty("default.java-home");
+ if (readJavaHome == null)
+ {
+ for (String script : scripts)
+ {
+ readJavaHome = properties.getProperty(script+".java-home");
+ if (readJavaHome != null)
+ {
+ break;
+ }
+ }
+ }
+
+ readJavaArguments.clear();
+ for (String script : scripts)
+ {
+ v = properties.getProperty(script+".java-args");
+ if (v != null)
+ {
+ readJavaArguments.add(new JavaArgumentsDescriptor(script, v));
+ }
+ else
+ {
+ readJavaArguments.add(new JavaArgumentsDescriptor(script, ""));
+ }
+ }
+
+ return null;
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(Void returnValue,
+ Throwable t)
+ {
+ if (t == null)
+ {
+ javaHome.setText(readJavaHome);
+ useOpenDSJavaHome.setSelected(readUseOpenDSJavaHome);
+ useSpecifiedJavaHome.setSelected(!readUseOpenDSJavaHome);
+ useOpenDSJavaArgs.setSelected(readUseOpenDSJavaArgs);
+ useSpecifiedJavaArgs.setSelected(!readUseOpenDSJavaArgs);
+ argumentsTableModel.setData(readJavaArguments);
+ Utilities.updateTableSizes(argumentsTable, 7);
+ }
+ else
+ {
+ String arg;
+ if (t instanceof OpenDsException)
+ {
+ arg = ((OpenDsException)t).getMessageObject().toString();
+ }
+ else
+ {
+ arg = t.toString();
+ }
+ Message title =
+ ERR_CTRL_PANEL_ERR_READING_JAVA_SETTINGS_SUMMARY.get();
+ Message details =
+ ERR_CTRL_PANEL_READING_JAVA_SETTINGS_DETAILS.get(arg);
+ updateErrorPane(errorPane, title,
+ ColorAndFontConstants.errorTitleFont, details,
+ errorPane.getFont());
+ packParentDialog();
+ errorPane.setVisible(true);
+ }
+ enableComponents();
+ }
+ };
+ worker.startBackgroundTask();
+ }
+
+ /**
+ * Disables all the components. This is used when we are reading the
+ * java settings in the background.
+ *
+ */
+ private void disableComponents()
+ {
+ setEnabledOK(false);
+ lInitContents.setVisible(true);
+ argumentsScroll.setVisible(false);
+ for (JComponent comp : comps)
+ {
+ comp.setEnabled(false);
+ }
+ }
+
+ /**
+ * Enables all the components. This is used when we are reading the
+ * java settings in the background.
+ *
+ */
+ private void enableComponents()
+ {
+ for (JComponent comp : comps)
+ {
+ comp.setEnabled(true);
+ }
+ lInitContents.setVisible(false);
+ argumentsScroll.setVisible(true);
+ setEnabledOK(true);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ String f = javaHome.getText().trim();
+ if (f.length() > 0)
+ {
+ File file = new File(f);
+ if (!file.exists())
+ {
+ errors.add(ERR_CTRL_PANEL_JAVA_PATH_DOES_NOT_EXIST.get(f));
+ }
+ else if (!file.isDirectory())
+ {
+ errors.add(ERR_CTRL_PANEL_JAVA_PATH_NOT_A_DIRECTORY.get(f));
+ }
+ else
+ {
+ File javaFile = getJavaFile(file);
+ if (!javaFile.exists())
+ {
+ errors.add(ERR_CTRL_PANEL_JAVA_BINARY_NOT_FOUND.get(
+ javaFile.toString()));
+ }
+ }
+ }
+ if (errors.size() == 0)
+ {
+ final Set<String> providedArguments = new HashSet<String>();
+ for (JavaArgumentsDescriptor cmd : getJavaArguments())
+ {
+ String args = cmd.getJavaArguments().trim();
+ if (args.length() > 0)
+ {
+ providedArguments.add(args);
+ }
+ }
+ if (!providedArguments.isEmpty())
+ {
+ disableComponents();
+ lInitContents.setText(
+ INFO_CTRL_PANEL_CHECKING_JAVA_ARGUMENTS_SUMMARY.get().toString());
+ BackgroundTask<Set<String>> worker =
+ new BackgroundTask<Set<String>>()
+ {
+ private String jvm;
+ public Set<String> processBackgroundTask() throws Throwable
+ {
+ Set<String> notWorkingArgs = new HashSet<String>();
+ jvm = javaHome.getText();
+ if (jvm.trim().length() == 0)
+ {
+ jvm = System.getProperty("java.home");
+ if ((jvm == null) || (jvm.length() == 0))
+ {
+ jvm = System.getenv(SetupUtils.OPENDS_JAVA_HOME);
+ }
+ }
+
+ String installPath = getInfo().getServerDescriptor().
+ getInstallPath().getAbsolutePath();
+ for (String arg : providedArguments)
+ {
+ if (!Utils.supportsOption(arg, jvm, installPath))
+ {
+ notWorkingArgs.add(arg);
+ }
+ }
+
+ return notWorkingArgs;
+ }
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(Set<String> returnValue,
+ Throwable t)
+ {
+ if (t == null)
+ {
+ boolean confirm = true;
+ if (!returnValue.isEmpty())
+ {
+ File javaFile = getJavaFile(new File(jvm));
+ Message confirmationMessage =
+ INFO_CTRL_PANEL_CONFIRM_NOT_WORKING_ARGUMENTS_DETAILS.get(
+ javaFile.toString(),
+ Utilities.getStringFromCollection(returnValue, "<br>-"));
+ confirm = displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ confirmationMessage);
+ }
+ if (confirm)
+ {
+ launchTask();
+ }
+ }
+ else
+ {
+ String arg;
+ if (t instanceof OpenDsException)
+ {
+ arg = ((OpenDsException)t).getMessageObject().toString();
+ }
+ else
+ {
+ arg = t.toString();
+ }
+ Message title =
+ ERR_CTRL_PANEL_ERROR_CHECKING_JAVA_SETTINGS_SUMMARY.get();
+ Message details =
+ ERR_CTRL_PANEL_ERROR_CHECKING_JAVA_SETTINGS_DETAILS.get(arg);
+ updateErrorPane(errorPane, title,
+ ColorAndFontConstants.errorTitleFont, details,
+ errorPane.getFont());
+ packParentDialog();
+ errorPane.setVisible(true);
+ }
+ enableComponents();
+ lInitContents.setText(READING_JAVA_SETTINGS.toString());
+ }
+ };
+ worker.startBackgroundTask();
+ return;
+ }
+ }
+ if (errors.size() == 0)
+ {
+ launchTask();
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Returns the java binary (the executable) for a given java home.
+ * @param javaHome the java home.
+ * @return the java binary (the executable) for the provided java home.
+ */
+ private File getJavaFile(File javaHome)
+ {
+ File javaFile = new File(javaHome, "bin");
+ if (Utilities.isWindows())
+ {
+ javaFile = new File(javaFile, "java.exe");
+ }
+ else
+ {
+ javaFile = new File(javaFile, "java");
+ }
+ return javaFile;
+ }
+
+ private void launchTask()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_JAVA_PROPERTIES_TITLE.get(),
+ getInfo());
+ JavaPropertiesTask newTask = new JavaPropertiesTask(getInfo(), dlg);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.size() == 0)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_UPDATING_JAVA_SETTINGS_SUMMARY.get(),
+ INFO_CTRL_PANEL_UPDATING_JAVA_SETTINGS_COMPLETE.get(),
+ INFO_CTRL_PANEL_UPDATING_JAVA_SETTINGS_SUCCESSFUL.get(),
+ ERR_CTRL_PANEL_UPDATING_JAVA_SETTINGS_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_UPDATING_JAVA_SETTINGS_ERROR_DETAILS.get(),
+ ERR_CTRL_PANEL_UPDATING_JAVA_SETTINGS_ERROR_CODE,
+ dlg);
+ dlg.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ readJavaHome = javaHome.getText();
+ readUseOpenDSJavaHome = useOpenDSJavaHome.isSelected();
+ readUseOpenDSJavaArgs = useOpenDSJavaArgs.isSelected();
+ readJavaArguments = getJavaArguments();
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Returns the file containing the java properties.
+ * @return the file containing the java properties.
+ */
+ private String getPropertiesFile()
+ {
+ String configDir = Utils.getPath(
+ getInfo().getServerDescriptor().getInstallPath().getAbsolutePath(),
+ Installation.CONFIG_PATH_RELATIVE);
+ String propertiesFile = Utils.getPath(
+ configDir, Installation.DEFAULT_JAVA_PROPERTIES_FILE);
+ return propertiesFile;
+ }
+
+ /**
+ * Class containing the command-name and the associated java
+ * arguments.
+ *
+ */
+ private class JavaArgumentsDescriptor
+ {
+ private String commandName;
+ private String javaArguments;
+ private int hashCode;
+ private String toString;
+ /**
+ * Constructor of the arguments descriptor.
+ * @param commandName the command-line name.
+ * @param javaArguments the java arguments.
+ */
+ public JavaArgumentsDescriptor(String commandName, String javaArguments)
+ {
+ this.commandName = commandName;
+ this.javaArguments = javaArguments;
+ hashCode = commandName.hashCode() + javaArguments.hashCode();
+ toString = commandName+ ": " +javaArguments;
+ }
+
+ /**
+ * Returns the command-line name.
+ * @return the command-line name.
+ */
+ public String getCommandName()
+ {
+ return commandName;
+ }
+ /**
+ * Returns the java arguments associated with the command-line.
+ * @return the java arguments associated with the command-line.
+ */
+ public String getJavaArguments()
+ {
+ return javaArguments;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return toString;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object o)
+ {
+ boolean equals = o == this;
+ if (!equals)
+ {
+ if (o instanceof JavaArgumentsDescriptor)
+ {
+ equals =
+ commandName.equals(((JavaArgumentsDescriptor)o).getCommandName()) &&
+ javaArguments.equals(((JavaArgumentsDescriptor)o).getJavaArguments());
+ }
+ }
+ return equals;
+ }
+ }
+
+ /**
+ * The table model used to display the java arguments.
+ *
+ */
+ protected class JavaArgumentsTableModel extends SortableTableModel
+ implements Comparator<JavaArgumentsDescriptor>
+ {
+ private static final long serialVersionUID = 8288418995255677560L;
+ private Set<JavaArgumentsDescriptor> data =
+ new HashSet<JavaArgumentsDescriptor>();
+ private ArrayList<String[]> dataArray =
+ new ArrayList<String[]>();
+ private ArrayList<JavaArgumentsDescriptor> argsArray =
+ new ArrayList<JavaArgumentsDescriptor>();
+ private final String[] COLUMN_NAMES = new String[] {
+ getHeader(INFO_CTRL_PANEL_COMMAND_LINE_NAME_COLUMN.get(), 40),
+ getHeader(INFO_CTRL_PANEL_JAVA_ARGUMENTS_COLUMN.get(), 40)};
+ private int sortColumn = 0;
+ private boolean sortAscending = true;
+
+ /**
+ * Sets the data for this table model.
+ * @param newData the data for this table model.
+ */
+ public void setData(Set<JavaArgumentsDescriptor> newData)
+ {
+ if (!newData.equals(data))
+ {
+ data.clear();
+ data.addAll(newData);
+ updateDataArray();
+ fireTableDataChanged();
+ }
+ }
+
+ /**
+ * Compares two java argument descriptors.
+ * @param desc1 the first java argument descriptor.
+ * @param desc2 the second java argument descriptor.
+ * @return 1 if in terms of comparison the first element goes higher than
+ * the second one. Returns 0 if both elements are equal in terms of
+ * comparison. Returns -1 if the second element goes higher than the first
+ * one.
+ */
+ public int compare(JavaArgumentsDescriptor desc1,
+ JavaArgumentsDescriptor desc2)
+ {
+ int result;
+ int[] possibleResults = {
+ desc1.getCommandName().compareTo(desc2.getCommandName()),
+ desc1.getJavaArguments().compareTo(desc2.getJavaArguments())};
+ result = possibleResults[sortColumn];
+ if (result == 0)
+ {
+ for (int i : possibleResults)
+ {
+ if (i != 0)
+ {
+ result = i;
+ break;
+ }
+ }
+ }
+ if (!sortAscending)
+ {
+ result = -result;
+ }
+ return result;
+ }
+
+ /**
+ * Updates the table model contents and sorts its contents depending on the
+ * sort options set by the user.
+ */
+ public void forceResort()
+ {
+ updateDataArray();
+ fireTableDataChanged();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getColumnCount()
+ {
+ return COLUMN_NAMES.length;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getRowCount()
+ {
+ return dataArray.size();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object getValueAt(int row, int col)
+ {
+ return dataArray.get(row)[col];
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getColumnName(int col) {
+ return COLUMN_NAMES[col];
+ }
+
+ /**
+ * Returns the java argument descriptor in the provided row.
+ * @param row the row number.
+ * @return the java argument descriptor in the provided row.
+ */
+ public JavaArgumentsDescriptor getJavaArguments(int row)
+ {
+ return argsArray.get(row);
+ }
+
+
+ /**
+ * Returns whether the sort is ascending or descending.
+ * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isSortAscending()
+ {
+ return sortAscending;
+ }
+
+ /**
+ * Sets whether to sort ascending of descending.
+ * @param sortAscending whether to sort ascending or descending.
+ */
+ public void setSortAscending(boolean sortAscending)
+ {
+ this.sortAscending = sortAscending;
+ }
+
+ /**
+ * Returns the column index used to sort.
+ * @return the column index used to sort.
+ */
+ public int getSortColumn()
+ {
+ return sortColumn;
+ }
+
+ /**
+ * Sets the column index used to sort.
+ * @param sortColumn column index used to sort..
+ */
+ public void setSortColumn(int sortColumn)
+ {
+ this.sortColumn = sortColumn;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isCellEditable(int row, int col) {
+ if (col == 0)
+ {
+ return false;
+ } else
+ {
+ return true;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValueAt(Object value, int row, int col)
+ {
+ dataArray.get(row)[col] = (String)value;
+ JavaArgumentsDescriptor currentArg = argsArray.get(row);
+ JavaArgumentsDescriptor newArg =
+ new JavaArgumentsDescriptor(currentArg.getCommandName(), (String)value);
+ argsArray.set(row, newArg);
+ data.remove(currentArg);
+ data.add(newArg);
+ fireTableCellUpdated(row, col);
+ }
+
+ private void updateDataArray()
+ {
+ TreeSet<JavaArgumentsDescriptor> sortedSet =
+ new TreeSet<JavaArgumentsDescriptor>(this);
+ sortedSet.addAll(data);
+ dataArray.clear();
+ argsArray.clear();
+ for (JavaArgumentsDescriptor arg : sortedSet)
+ {
+ String[] s = getLine(arg);
+ dataArray.add(s);
+ argsArray.add(arg);
+ }
+ }
+
+ /**
+ * Returns an array of String with the String representation of the cells
+ * in the table.
+ * @param desc the java argument descriptor for which we want to get the
+ * cells.
+ * @return an array of String with the String representation of the cells
+ * in the table.
+ */
+ protected String[] getLine(JavaArgumentsDescriptor desc)
+ {
+ String cmd = desc.getCommandName();
+ if (cmd.equalsIgnoreCase("start-ds"))
+ {
+ cmd = INFO_CTRL_PANEL_SERVER_RUNTIME_CELL.get(
+ desc.getCommandName()).toString();
+ }
+ else if (cmd.endsWith(".online"))
+ {
+ int index = cmd.lastIndexOf(".online");
+ cmd = INFO_CTRL_PANEL_ONLINE_COMMAND_LINE_CELL.get(
+ cmd.substring(0, index)).toString();
+ }
+ else if (desc.getCommandName().endsWith(".offline"))
+ {
+ int index = cmd.lastIndexOf(".offline");
+ cmd = INFO_CTRL_PANEL_OFFLINE_COMMAND_LINE_CELL.get(
+ cmd.substring(0, index)).toString();
+ }
+ return new String[] {cmd, desc.getJavaArguments()};
+ }
+ }
+
+ /**
+ * The task in charge of updating the java properties.
+ *
+ */
+ protected class JavaPropertiesTask extends Task
+ {
+ private Set<String> backendSet;
+ private String defaultJavaHome;
+ private boolean overwriteOpenDSJavaHome;
+ private boolean overwriteOpenDSJavaArgs;
+ Set<JavaArgumentsDescriptor> arguments =
+ new HashSet<JavaArgumentsDescriptor>();
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public JavaPropertiesTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ defaultJavaHome = javaHome.getText().trim();
+ overwriteOpenDSJavaHome = useSpecifiedJavaHome.isSelected();
+ overwriteOpenDSJavaArgs = useSpecifiedJavaArgs.isSelected();
+ arguments = getJavaArguments();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.JAVA_SETTINGS_UPDATE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_UPDATE_JAVA_SETTINGS_TASK_DESCRIPTION.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (!isServerRunning())
+ {
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ returnCode = updateJavaSettings();
+ if (returnCode == 0)
+ {
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ else
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ private int updateJavaSettings() throws IOException
+ {
+ final String propertiesFile = getPropertiesFile();
+ ArrayList<String> commentLines = new ArrayList<String>();
+ BufferedReader reader = null;
+ try
+ {
+ reader = new BufferedReader(new FileReader(propertiesFile));
+ String line;
+ while ((line = reader.readLine()) != null)
+ {
+ String trimmedLine = line.trim();
+ if (trimmedLine.startsWith("#") || (trimmedLine.length() == 0))
+ {
+ commentLines.add(line);
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+ catch (IOException ioe)
+ {
+ // Not critical.
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ try
+ {
+ reader.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+
+ BufferedWriter writer = null;
+ try
+ {
+ writer = new BufferedWriter(new FileWriter(propertiesFile, false));
+ for (String comment : commentLines)
+ {
+ writer.write(comment);
+ writer.newLine();
+ }
+ writer.newLine();
+ writer.write("overwrite-env-java-home="+overwriteOpenDSJavaHome);
+ writer.newLine();
+ writer.write("overwrite-env-java-args="+overwriteOpenDSJavaArgs);
+ writer.newLine();
+ writer.newLine();
+ if ((defaultJavaHome != null) && (defaultJavaHome.length() > 0))
+ {
+ writer.write("default.java-home="+defaultJavaHome);
+ writer.newLine();
+ writer.newLine();
+ }
+ for (JavaArgumentsDescriptor desc : arguments)
+ {
+ String args = desc.getJavaArguments();
+ if (args.trim().length() > 0)
+ {
+ writer.newLine();
+ writer.write(desc.getCommandName()+".java-args="+args);
+ }
+ }
+ }
+ finally
+ {
+ if (writer != null)
+ {
+ try
+ {
+ writer.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_ACTION_TO_UPDATE_JAVA_PROPERTIES.get(
+ propertiesFile, getCommandLinePath("dsjavaproperties")).
+ toString(),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ // Launch the script
+ String[] args =
+ {
+ "--quiet"
+ };
+
+ return JavaPropertiesTool.mainCLI(args);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
new file mode 100644
index 0000000..5131930
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
@@ -0,0 +1,744 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Set;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.EntryReadErrorEvent;
+import org.opends.guitools.controlpanel.event.EntryReadEvent;
+import org.opends.guitools.controlpanel.event.EntryReadListener;
+import org.opends.guitools.controlpanel.event.LDAPEntryChangedEvent;
+import org.opends.guitools.controlpanel.event.LDAPEntryChangedListener;
+import org.opends.guitools.controlpanel.task.DeleteEntryTask;
+import org.opends.guitools.controlpanel.task.ModifyEntryTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.quicksetup.Constants;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * This is the panel that contains all the different views to display an entry.
+ *
+ */
+public class LDAPEntryPanel extends StatusGenericPanel
+implements EntryReadListener
+{
+ private static final long serialVersionUID = -6608246173472437830L;
+ private JButton saveChanges;
+ private JButton delete;
+ private JPanel mainPanel;
+ private CardLayout cardLayout;
+
+ private ErrorSearchingEntryPanel errorSearchingPanel;
+ private LDIFViewEntryPanel ldifEntryPanel;
+ private TableViewEntryPanel tableEntryPanel;
+ private SimplifiedViewEntryPanel simplifiedEntryPanel;
+
+ private ViewEntryPanel displayedEntryPanel;
+
+ private CustomSearchResult searchResult;
+ private BrowserController controller;
+ private TreePath treePath;
+
+ private ModifyEntryTask newTask;
+
+ private final String NOTHING_SELECTED = "Nothing Selected";
+ private final String MULTIPLE_SELECTED = "Multiple Selected";
+ private final String LDIF_VIEW = "LDIF View";
+ private final String ATTRIBUTE_VIEW = "Attribute View";
+ private final String SIMPLIFIED_VIEW = "Simplified View";
+ private final String ERROR_SEARCHING = "Error Searching";
+
+ private View view = View.SIMPLIFIED_VIEW;
+
+ /**
+ * The different views that we have to display an LDAP entry.
+ *
+ */
+ public enum View
+ {
+ /**
+ * Simplified view.
+ */
+ SIMPLIFIED_VIEW,
+ /**
+ * Attribute view (contained in a table).
+ */
+ ATTRIBUTE_VIEW,
+ /**
+ * LDIF view (text based).
+ */
+ LDIF_VIEW
+ };
+
+ /**
+ * Default constructor.
+ *
+ */
+ public LDAPEntryPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ *
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ cardLayout = new CardLayout();
+ mainPanel = new JPanel(cardLayout);
+ mainPanel.setOpaque(false);
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 2;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ add(mainPanel, gbc);
+ gbc.gridwidth = 1;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets = new Insets(5, 5, 5, 5);
+ gbc.weighty = 0.0;
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.NONE;
+ delete = Utilities.createButton(INFO_CTRL_PANEL_DELETE_ENTRY_BUTTON.get());
+ delete.setOpaque(false);
+ add(delete, gbc);
+ delete.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteEntry();
+ }
+ });
+
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.gridx ++;
+ saveChanges =
+ Utilities.createButton(INFO_CTRL_PANEL_SAVE_CHANGES_LABEL.get());
+ saveChanges.setOpaque(false);
+ add(saveChanges, gbc);
+ saveChanges.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ saveChanges(true);
+ }
+ });
+
+ Border border = new EmptyBorder(10, 10, 10, 10);
+
+ NoItemSelectedPanel noEntryPanel = new NoItemSelectedPanel();
+ noEntryPanel.setMessage(INFO_CTRL_PANEL_NO_ENTRY_SELECTED_LABEL.get());
+ Utilities.setBorder(noEntryPanel, border);
+ mainPanel.add(noEntryPanel, NOTHING_SELECTED);
+
+ NoItemSelectedPanel multipleEntryPanel = new NoItemSelectedPanel();
+ multipleEntryPanel.setMessage(
+ INFO_CTRL_PANEL_MULTIPLE_ENTRIES_SELECTED_LABEL.get());
+ Utilities.setBorder(multipleEntryPanel, border);
+ mainPanel.add(multipleEntryPanel, MULTIPLE_SELECTED);
+
+ errorSearchingPanel = new ErrorSearchingEntryPanel();
+ if (errorSearchingPanel.requiresBorder())
+ {
+ Utilities.setBorder(multipleEntryPanel, border);
+ }
+ mainPanel.add(errorSearchingPanel, ERROR_SEARCHING);
+
+ LDAPEntryChangedListener listener = new LDAPEntryChangedListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void entryChanged(LDAPEntryChangedEvent ev)
+ {
+ boolean enable = saveChanges.isVisible() &&
+ !authenticationRequired(getInfo().getServerDescriptor());
+ if (enable)
+ {
+ if (ev.getEntry() == null)
+ {
+ // Something changed that is wrong: assume the entry has been
+ // modified, when the user tries to save we will inform of the
+ // problem
+ enable = true;
+ }
+ else
+ {
+ boolean modified =
+ !Utilities.areDnsEqual(ev.getEntry().getDN().toString(),
+ searchResult.getDN()) ||
+ !ModifyEntryTask.getModifications(ev.getEntry(), searchResult,
+ getInfo()).isEmpty();
+ enable = modified;
+ }
+ }
+ saveChanges.setEnabled(enable);
+ }
+ };
+
+ ldifEntryPanel = new LDIFViewEntryPanel();
+ ldifEntryPanel.addLDAPEntryChangedListener(listener);
+ if (ldifEntryPanel.requiresBorder())
+ {
+ Utilities.setBorder(ldifEntryPanel, border);
+ }
+ mainPanel.add(ldifEntryPanel, LDIF_VIEW);
+
+ tableEntryPanel = new TableViewEntryPanel();
+ tableEntryPanel.addLDAPEntryChangedListener(listener);
+ if (tableEntryPanel.requiresBorder())
+ {
+ Utilities.setBorder(tableEntryPanel, border);
+ }
+ mainPanel.add(tableEntryPanel, ATTRIBUTE_VIEW);
+
+ simplifiedEntryPanel = new SimplifiedViewEntryPanel();
+ simplifiedEntryPanel.addLDAPEntryChangedListener(listener);
+ if (simplifiedEntryPanel.requiresBorder())
+ {
+ Utilities.setBorder(simplifiedEntryPanel, border);
+ }
+ mainPanel.add(simplifiedEntryPanel, SIMPLIFIED_VIEW);
+
+ cardLayout.show(mainPanel, NOTHING_SELECTED);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ // No ok button
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void entryRead(EntryReadEvent ev)
+ {
+ searchResult = ev.getSearchResult();
+
+ updateEntryView(searchResult, treePath);
+ }
+
+ /**
+ * Updates the panel with the provided search result.
+ * @param searchResult the search result corresponding to the selected node.
+ * @param treePath the tree path of the selected node.
+ */
+ private void updateEntryView(CustomSearchResult searchResult,
+ TreePath treePath)
+ {
+ boolean isReadOnly = isReadOnly(searchResult.getDN());
+ boolean canDelete = canDelete(searchResult.getDN());
+
+ delete.setVisible(canDelete);
+ saveChanges.setVisible(!isReadOnly);
+ String cardKey;
+ switch (view)
+ {
+ case LDIF_VIEW:
+ displayedEntryPanel = ldifEntryPanel;
+ cardKey = LDIF_VIEW;
+ break;
+ case ATTRIBUTE_VIEW:
+ displayedEntryPanel = tableEntryPanel;
+ cardKey = ATTRIBUTE_VIEW;
+ break;
+ default:
+ displayedEntryPanel = simplifiedEntryPanel;
+ cardKey = SIMPLIFIED_VIEW;
+ }
+ displayedEntryPanel.update(searchResult, isReadOnly, treePath);
+ saveChanges.setEnabled(false);
+ cardLayout.show(mainPanel, cardKey);
+ }
+
+ /**
+ * Sets the view to be displayed by this panel.
+ * @param view the view.
+ */
+ public void setView(View view)
+ {
+ if (view != this.view)
+ {
+ this.view = view;
+ if (searchResult != null)
+ {
+ updateEntryView(searchResult, treePath);
+ }
+ }
+ }
+
+ /**
+ * Displays a message informing that an error occurred reading the entry.
+ * @param ev the entry read error event.
+ */
+ public void entryReadError(EntryReadErrorEvent ev)
+ {
+ searchResult = null;
+
+ errorSearchingPanel.setError(ev.getDN(), ev.getError());
+
+ delete.setVisible(false);
+ saveChanges.setVisible(false);
+
+ cardLayout.show(mainPanel, ERROR_SEARCHING);
+
+ displayedEntryPanel = null;
+ }
+
+ /**
+ * Displays a panel informing that nothing is selected.
+ *
+ */
+ public void noEntrySelected()
+ {
+ searchResult = null;
+
+ delete.setVisible(false);
+ saveChanges.setVisible(false);
+
+ cardLayout.show(mainPanel, NOTHING_SELECTED);
+
+ displayedEntryPanel = null;
+ }
+
+ /**
+ * Displays a panel informing that multiple entries are selected.
+ *
+ */
+ public void multipleEntriesSelected()
+ {
+ searchResult = null;
+
+ delete.setVisible(false);
+ saveChanges.setVisible(false);
+
+ cardLayout.show(mainPanel, MULTIPLE_SELECTED);
+
+ displayedEntryPanel = null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_EDIT_LDAP_ENTRY_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return saveChanges;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ final ServerDescriptor desc = ev.getNewDescriptor();
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ boolean isReadOnly = true;
+ boolean canDelete = false;
+ if ((searchResult != null) && desc.isAuthenticated())
+ {
+ isReadOnly = isReadOnly(searchResult.getDN());
+ canDelete = canDelete(searchResult.getDN());
+ }
+
+ delete.setVisible(canDelete);
+ saveChanges.setVisible(!isReadOnly);
+ }
+ });
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ super.setInfo(info);
+ simplifiedEntryPanel.setInfo(info);
+ ldifEntryPanel.setInfo(info);
+ tableEntryPanel.setInfo(info);
+ errorSearchingPanel.setInfo(info);
+ }
+
+ private DN[] parentReadOnly;
+ private DN[] nonDeletable;
+ {
+ try
+ {
+ parentReadOnly = new DN[] {
+ DN.decode(ConfigConstants.DN_TASK_ROOT),
+ DN.decode(ConfigConstants.DN_MONITOR_ROOT),
+ DN.decode(ConfigConstants.DN_BACKUP_ROOT),
+ DN.decode(Constants.REPLICATION_CHANGES_DN)
+ };
+ nonDeletable = new DN[] {
+ DN.decode(ConfigConstants.DN_CONFIG_ROOT),
+ DN.decode(ConfigConstants.DN_DEFAULT_SCHEMA_ROOT),
+ DN.decode(ConfigConstants.DN_TRUST_STORE_ROOT)
+ };
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Error decoding DNs: "+t, t);
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided DN corresponds to a read-only
+ * entry and <CODE>false</CODE> otherwise.
+ * @param sDn the DN of the entry.
+ * @return <CODE>true</CODE> if the provided DN corresponds to a read-only
+ * entry and <CODE>false</CODE> otherwise.
+ */
+ public boolean isReadOnly(String sDn)
+ {
+ boolean isReadOnly = false;
+ try
+ {
+ DN dn = DN.decode(sDn);
+ for (DN parentDN : parentReadOnly)
+ {
+ if (dn.isDescendantOf(parentDN))
+ {
+ isReadOnly = true;
+ break;
+ }
+ }
+ if (!isReadOnly)
+ {
+ isReadOnly = dn.equals(DN.NULL_DN);
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Error decoding DNs: "+t, t);
+ }
+ return isReadOnly;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided DN corresponds to an entry that
+ * can be deleted and <CODE>false</CODE> otherwise.
+ * @param sDn the DN of the entry.
+ * @return <CODE>true</CODE> if the provided DN corresponds to an entry that
+ * can be deleted and <CODE>false</CODE> otherwise.
+ */
+ public boolean canDelete(String sDn)
+ {
+ boolean canDelete = true;
+ try
+ {
+ DN dn = DN.decode(sDn);
+ for (DN parentDN : parentReadOnly)
+ {
+ if (dn.isDescendantOf(parentDN))
+ {
+ canDelete = false;
+ break;
+ }
+ }
+ if (canDelete)
+ {
+ for (DN cannotDelete : nonDeletable)
+ {
+ if (cannotDelete.equals(dn))
+ {
+ canDelete = false;
+ break;
+ }
+ }
+ }
+ if (canDelete)
+ {
+ canDelete = !dn.equals(DN.NULL_DN);
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Error decoding DNs: "+t, t);
+ }
+ return canDelete;
+ }
+
+ /**
+ * Saves the changes done to the entry.
+ * @param modal whether the progress dialog for the task must be modal or
+ * not.
+ */
+ private void saveChanges(boolean modal)
+ {
+ newTask = null;
+ final ArrayList<Message> errors = new ArrayList<Message>();
+ // Check that the entry is correct.
+ try
+ {
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_MODIFYING_ENTRY_CHANGES_TITLE.get(), getInfo());
+ dlg.setModal(modal);
+ Entry entry = displayedEntryPanel.getEntry();
+ newTask = new ModifyEntryTask(getInfo(), dlg, entry,
+ searchResult, controller, treePath);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if ((errors.size() == 0) && newTask.hasModifications())
+ {
+ String dn = entry.getDN().toString();
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_MODIFYING_ENTRY_SUMMARY.get(dn),
+ INFO_CTRL_PANEL_MODIFYING_ENTRY_COMPLETE.get(),
+ INFO_CTRL_PANEL_MODIFYING_ENTRY_SUCCESSFUL.get(dn),
+ ERR_CTRL_PANEL_MODIFYING_ENTRY_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_MODIFYING_ENTRY_ERROR_DETAILS.get(dn),
+ null,
+ dlg);
+ saveChanges.setEnabled(false);
+ dlg.setVisible(true);
+ }
+ }
+ catch (OpenDsException ode)
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_ENTRY.get(
+ ode.getMessageObject().toString()));
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ private void deleteEntry()
+ {
+ final ArrayList<Message> errors = new ArrayList<Message>();
+ // Check that the entry is correct.
+ // Rely in numsubordinates...
+ boolean isLeaf = true;
+
+ Set<Object> o = searchResult.getAttributeValues("numsubordinates");
+ if (!o.isEmpty())
+ {
+ int numsubordinates = Integer.parseInt((String)o.iterator().next());
+ isLeaf = numsubordinates <= 0;
+ }
+
+ if (treePath != null)
+ {
+ Message title = isLeaf ? INFO_CTRL_PANEL_DELETING_ENTRY_TITLE.get() :
+ INFO_CTRL_PANEL_DELETING_SUBTREE_TITLE.get();
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ title, getInfo());
+ DeleteEntryTask newTask = new DeleteEntryTask(getInfo(), dlg,
+ new TreePath[]{treePath}, controller);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.size() == 0)
+ {
+ Message confirmationMessage =
+ isLeaf ? INFO_CTRL_PANEL_DELETE_ENTRY_CONFIRMATION_DETAILS.get(
+ searchResult.getDN()) :
+ INFO_CTRL_PANEL_DELETE_SUBTREE_CONFIRMATION_DETAILS.get(
+ searchResult.getDN());
+ if (displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ confirmationMessage))
+ {
+ String dn = searchResult.getDN();
+ if (isLeaf)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_ENTRY_SUMMARY.get(dn),
+ INFO_CTRL_PANEL_DELETING_ENTRY_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_ENTRY_SUCCESSFUL.get(dn),
+ ERR_CTRL_PANEL_DELETING_ENTRY_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_ENTRY_ERROR_DETAILS.get(dn),
+ null,
+ dlg);
+ }
+ else
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_SUBTREE_SUMMARY.get(dn),
+ INFO_CTRL_PANEL_DELETING_SUBTREE_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_SUBTREE_SUCCESSFUL.get(dn),
+ ERR_CTRL_PANEL_DELETING_SUBTREE_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_SUBTREE_ERROR_DETAILS.get(dn),
+ null,
+ dlg);
+ }
+ dlg.setVisible(true);
+ }
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Returns the browser controller in charge of the tree.
+ * @return the browser controller in charge of the tree.
+ */
+ public BrowserController getController()
+ {
+ return controller;
+ }
+
+ /**
+ * Sets the browser controller in charge of the tree.
+ * @param controller the browser controller in charge of the tree.
+ */
+ public void setController(BrowserController controller)
+ {
+ this.controller = controller;
+ }
+
+ /**
+ * Returns the tree path associated with the node that is being displayed.
+ * @return the tree path associated with the node that is being displayed.
+ */
+ public TreePath getTreePath()
+ {
+ return treePath;
+ }
+
+ /**
+ * Sets the tree path associated with the node that is being displayed.
+ * @param treePath the tree path associated with the node that is being
+ * displayed.
+ */
+ public void setTreePath(TreePath treePath)
+ {
+ this.treePath = treePath;
+ }
+
+ /**
+ * Method used to know if there are unsaved changes or not. It is used by
+ * the entry selection listener when the user changes the selection.
+ * @return <CODE>true</CODE> if there are unsaved changes (and so the
+ * selection of the entry should be cancelled) and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean mustCheckUnsavedChanges()
+ {
+ return (displayedEntryPanel != null) &&
+ saveChanges.isVisible() && saveChanges.isEnabled();
+ }
+
+ /**
+ * Tells whether the user chose to save the changes in the panel, to not save
+ * them or simply cancelled the selection change in the tree.
+ * @return the value telling whether the user chose to save the changes in the
+ * panel, to not save them or simply cancelled the selection in the tree.
+ */
+ public UnsavedChangesDialog.Result checkUnsavedChanges()
+ {
+ UnsavedChangesDialog.Result result;
+ UnsavedChangesDialog unsavedChangesDlg = new UnsavedChangesDialog(
+ Utilities.getParentDialog(this), getInfo());
+ unsavedChangesDlg.setMessage(INFO_CTRL_PANEL_UNSAVED_CHANGES_SUMMARY.get(),
+ INFO_CTRL_PANEL_UNSAVED_ENTRY_CHANGES_DETAILS.get(searchResult.getDN()));
+ Utilities.centerGoldenMean(unsavedChangesDlg,
+ Utilities.getParentDialog(this));
+ unsavedChangesDlg.setVisible(true);
+ result = unsavedChangesDlg.getResult();
+ if (result == UnsavedChangesDialog.Result.SAVE)
+ {
+ saveChanges(false);
+ if ((newTask == null) || // The user data is not valid
+ newTask.getState() != Task.State.FINISHED_SUCCESSFULLY)
+ {
+ result = UnsavedChangesDialog.Result.CANCEL;
+ }
+ }
+
+ return result;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
new file mode 100644
index 0000000..27e48b4
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
@@ -0,0 +1,280 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
+
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * A basic panel that contains a browser. It is used in general in panels that
+ * require to provide some DNs of existing entries: we allow the user to launch
+ * a browser to select entries.
+ *
+ */
+public class LDAPEntrySelectionPanel extends AbstractBrowseEntriesPanel
+{
+ private Message title;
+ private Filter f;
+
+ private String[] dns;
+
+ /**
+ * The values of the filters that will be used when opening the dialog where
+ * this panel is contained. For instance if the filter is set to Filter.USERS
+ * the panel will display only users when the dialog appears.
+ *
+ */
+ public enum Filter
+ {
+ /**
+ * Display users.
+ */
+ USERS,
+ /**
+ * Display groups.
+ */
+ GROUPS,
+ /**
+ * Display Dynamic Groups.
+ */
+ DYNAMIC_GROUPS,
+ /**
+ * Display Static Groups.
+ */
+ STATIC_GROUPS,
+ /**
+ * Default filter (all entries).
+ */
+ DEFAULT
+ }
+
+ private static final long serialVersionUID = -8140540064410029902L;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public LDAPEntrySelectionPanel()
+ {
+ super();
+ }
+
+ /**
+ * Updates the tree selection model to allow multiple selection or not.
+ * @param multiple whether the tree should allow multiple selection or not.
+ */
+ public void setMultipleSelection(boolean multiple)
+ {
+ treePane.getTree().getSelectionModel().setSelectionMode(multiple ?
+ TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION :
+ TreeSelectionModel.SINGLE_TREE_SELECTION);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ super.toBeDisplayed(visible);
+ if (visible)
+ {
+ dns = new String[]{};
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return title;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ dns = retrieveDNs();
+ super.closeClicked();
+ }
+
+ /**
+ * Returns the selected DN's in an array of Strings. The array is never
+ * <CODE>null</CODE> but might be empty.
+ * @return the selected DN's.
+ */
+ public String[] getDNs()
+ {
+ return dns;
+ }
+
+ private String[] retrieveDNs()
+ {
+ String[] dns;
+ TreePath[] paths = treePane.getTree().getSelectionPaths();
+ if (paths != null)
+ {
+ dns = new String[paths.length];
+ for (int i=0; i<paths.length; i++)
+ {
+ dns[i] = ((BasicNode)paths[i].getLastPathComponent()).getDN();
+ }
+ }
+ else
+ {
+ dns = new String[]{};
+ }
+ return dns;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getBrowseButtonType()
+ {
+ return GenericDialog.ButtonType.OK_CANCEL;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Component createMainPanel()
+ {
+ JComponent p = createTreePane();
+
+ final JTree tree = treePane.getTree();
+ tree.getSelectionModel().addTreeSelectionListener(
+ new TreeSelectionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void valueChanged(TreeSelectionEvent ev)
+ {
+ TreePath[] paths = tree.getSelectionPaths();
+ setEnabledOK((paths != null) && (paths.length > 0));
+ }
+ });
+ MouseListener mouseListener = new MouseAdapter() {
+ /**
+ * {@inheritDoc}
+ */
+ public void mousePressed(MouseEvent e) {
+ int selRow = tree.getRowForLocation(e.getX(), e.getY());
+ if ((selRow != -1) && (e.getClickCount() == 2))
+ {
+ okClicked();
+ }
+ }
+ };
+ tree.addMouseListener(mouseListener);
+
+ JScrollPane treeScroll = Utilities.createScrollPane(p);
+ treeScroll.setPreferredSize(
+ new Dimension(treeScroll.getPreferredSize().width + 30,
+ 4 * treeScroll.getPreferredSize().height));
+
+ return treeScroll;
+ }
+
+ /**
+ * Returns the last filter set with the setFilter method.
+ * @return the last filter set with the setFilter method.
+ */
+ public Filter getFilter()
+ {
+ return f;
+ }
+
+ /**
+ * Sets the filter to be used when the panel is displayed.
+ * @param filter the filter.
+ */
+ public void setFilter(Filter filter)
+ {
+ f = filter;
+ switch (f)
+ {
+ case USERS:
+ filterAttribute.setSelectedItem(USER_FILTER);
+ super.filter.setText("*");
+ break;
+ case GROUPS:
+ filterAttribute.setSelectedItem(GROUP_FILTER);
+ super.filter.setText("*");
+ break;
+ case DYNAMIC_GROUPS:
+ filterAttribute.setSelectedItem(LDAP_FILTER);
+ super.filter.setText("objectClass=groupOfURLs");
+ break;
+ case STATIC_GROUPS:
+ filterAttribute.setSelectedItem(LDAP_FILTER);
+ super.filter.setText("objectClass=groupOfUniqueNames");
+ break;
+ case DEFAULT:
+ Object o = filterAttribute.getItemAt(0);
+ filterAttribute.setSelectedItem(o);
+ super.filter.setText("");
+ break;
+ }
+ if (controller != null)
+ {
+ applyButtonClicked();
+ }
+ }
+
+ /**
+ * Sets the title that will be displayed in the dialog containing this panel.
+ * @param title the title.
+ */
+ public void setTitle(Message title)
+ {
+ this.title = title;
+ if (Utilities.getParentDialog(this) instanceof GenericDialog)
+ {
+ ((GenericDialog)Utilities.getParentDialog(this)).updateTitle();
+ }
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
new file mode 100644
index 0000000..dba1ebd
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
@@ -0,0 +1,372 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.Point;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Set;
+
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.Base64;
+import org.opends.server.util.LDIFReader;
+
+/**
+ * The panel displaying an LDIF view of an entry.
+ *
+ */
+public class LDIFViewEntryPanel extends ViewEntryPanel
+{
+ private static final long serialVersionUID = 2775960608128921072L;
+ private JScrollPane editableScroll;
+ private JScrollPane readOnlyScroll;
+ private JTextArea editableAttributes;
+ private JTextArea readOnlyAttributes;
+ private CustomSearchResult searchResult;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public LDIFViewEntryPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return editableAttributes;
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ *
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 1.0;
+
+ addTitlePanel(this, gbc);
+
+ gbc.gridy ++;
+ gbc.insets.top = 10;
+
+ editableAttributes = Utilities.createTextArea(Message.EMPTY, 20, 30);
+ editableAttributes.getDocument().addDocumentListener(new DocumentListener()
+ {
+ public void insertUpdate(DocumentEvent ev)
+ {
+ notifyListeners();
+ }
+
+ public void changedUpdate(DocumentEvent ev)
+ {
+ notifyListeners();
+ }
+
+ public void removeUpdate(DocumentEvent ev)
+ {
+ notifyListeners();
+ }
+ });
+ gbc.weighty = 0.6;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridy ++;
+ editableScroll = Utilities.createScrollPane(editableAttributes);
+ add(editableScroll, gbc);
+
+
+ gbc.weighty = 0.0;
+ gbc.insets.top = 10;
+ JLabel lReadOnly = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NON_EDITABLE_ATTRIBUTES.get());
+ gbc.gridy ++;
+ add(lReadOnly, gbc);
+ gbc.insets.top = 5;
+ readOnlyAttributes = Utilities.createNonEditableTextArea(Message.EMPTY, 10,
+ 30);
+ gbc.weightx = 1.0;
+ gbc.weighty = 0.4;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridy ++;
+ readOnlyScroll = Utilities.createScrollPane(readOnlyAttributes);
+ add(readOnlyScroll, gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void update(CustomSearchResult sr, boolean isReadOnly, TreePath path)
+ {
+ boolean sameEntry = false;
+ if ((searchResult != null) && (sr != null))
+ {
+ sameEntry = searchResult.getDN().equals(sr.getDN());
+ }
+
+ searchResult = sr;
+
+ updateTitle(sr, path);
+
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("dn: "+sr.getDN());
+
+ if (isReadOnly)
+ {
+ editableScroll.setVisible(false);
+ for (String attrName : sr.getAttributeNames())
+ {
+ Set<Object> values = sr.getAttributeValues(attrName);
+ for (Object o : values)
+ {
+ sb.append("\n"+ getLDIFLine(attrName, o));
+ }
+ }
+ final Point p1 = sameEntry ?
+ readOnlyScroll.getViewport().getViewPosition() : new Point(0, 0);
+ readOnlyAttributes.setText(sb.toString());
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ if ((p1 != null) && (readOnlyScroll.getViewport().contains(p1)))
+ {
+ readOnlyScroll.getViewport().setViewPosition(p1);
+ }
+ }
+ });
+ }
+ else
+ {
+ editableScroll.setVisible(true);
+
+ for (String attrName : sr.getAttributeNames())
+ {
+ if (!schemaReadOnlyAttributesLowerCase.contains(attrName.toLowerCase()))
+ {
+ Set<Object> values = sr.getAttributeValues(attrName);
+ for (Object o : values)
+ {
+ sb.append("\n"+ getLDIFLine(attrName, o));
+ }
+ }
+ }
+ final Point p1 = sameEntry ?
+ editableScroll.getViewport().getViewPosition() : new Point(0, 0);
+ ignoreEntryChangeEvents = true;
+ editableAttributes.setText(sb.toString());
+ ignoreEntryChangeEvents = false;
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ if ((p1 != null) && (editableScroll.getViewport().contains(p1)))
+ {
+ editableScroll.getViewport().setViewPosition(p1);
+ }
+ }
+ });
+ // Read-only attributes
+ boolean oneLineAdded = false;
+ sb = new StringBuilder();
+ for (String attrName : schemaReadOnlyAttributes)
+ {
+ Set<Object> values = sr.getAttributeValues(attrName);
+ for (Object o : values)
+ {
+ if (oneLineAdded)
+ {
+ sb.append("\n");
+ }
+ oneLineAdded = true;
+ sb.append(getLDIFLine(attrName, o));
+ }
+ }
+ final Point p2 = sameEntry ?
+ readOnlyScroll.getViewport().getViewPosition() : new Point(0, 0);
+ readOnlyAttributes.setText(sb.toString());
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ if ((p2 != null) && (readOnlyScroll.getViewport().contains(p2)))
+ {
+ readOnlyScroll.getViewport().setViewPosition(p2);
+ }
+ }
+ });
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getDisplayedDN()
+ {
+ String dn = null;
+ // Do it fast, this is called to update the dn displayed in the title.
+ String ldif = getLDIF();
+ int index = ldif.toLowerCase().indexOf("dn: ");
+ if (index != -1)
+ {
+ int index2 = ldif.indexOf("\n", index);
+ if (index2 != -1)
+ {
+ dn = ldif.substring(index + 3, index2).trim();
+ }
+ }
+ return dn;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Set<Object> getValues(String attrName)
+ {
+ throw new IllegalStateException("This method should not be called.");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Entry getEntry() throws OpenDsException
+ {
+ Entry entry = null;
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ String ldif = getLDIF();
+
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ entry = reader.readEntry(checkSchema());
+ addValuesInRDN(entry);
+ }
+ catch (IOException ioe)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe.toString()), ioe);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ return entry;
+ }
+
+ /**
+ * Returns the LDIF representation of the entry, only returns the editable
+ * attributes.
+ * @return the LDIF representation of the entry.
+ */
+ private String getLDIF()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(editableAttributes.getText());
+
+ return sb.toString();
+ }
+
+ /**
+ * Returns the equivalent LDIF line for a given attribute and value.
+ * @param attrName the attribute name.
+ * @param o the value.
+ * @return the equivalent LDIF line for the provided attribute and value.
+ */
+ private String getLDIFLine(String attrName, Object o)
+ {
+ String attrValue;
+ if (o instanceof String)
+ {
+ attrValue = (String)o;
+ }
+ else if (o instanceof byte[])
+ {
+ attrValue = Base64.encode((byte[])o);
+ // To indicate that is base64 encoded
+ attrName = attrName+":";
+ }
+ else
+ {
+ attrValue = String.valueOf(o);
+ }
+
+ return attrName+": "+ attrValue;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
new file mode 100644
index 0000000..36d7873
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
@@ -0,0 +1,490 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.QuickSetupMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.net.URI;
+import java.security.cert.X509Certificate;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.JLabel;
+import javax.swing.JPasswordField;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+
+import org.opends.admin.ads.util.ApplicationTrustManager;
+import org.opends.guitools.controlpanel.datamodel.ConfigReadException;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.quicksetup.UserDataCertificateException;
+import org.opends.quicksetup.ui.CertificateDialog;
+import org.opends.quicksetup.util.UIKeyStore;
+import org.opends.quicksetup.util.Utils;
+import org.opends.server.types.DN;
+
+/**
+ * The panel that appears when the user is asked to provide authentication.
+ *
+ */
+public class LoginPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 5051556513294844797L;
+ private JPasswordField pwd;
+ private JTextField dn;
+ private JLabel pwdLabel;
+ private JLabel dnLabel;
+ private String usedUrl;
+
+ private static final Logger LOG =
+ Logger.getLogger(LoginPanel.class.getName());
+
+ /**
+ * Default constructor.
+ *
+ */
+ public LoginPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_LOGIN_PANEL_TITLE.get();
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+
+ gbc.weightx = 0.0;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.NONE;
+ dnLabel = Utilities.createPrimaryLabel(INFO_CTRL_PANEL_BIND_DN_LABEL.get());
+ add(dnLabel, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ dn = Utilities.createTextField("cn=Directory Manager", 20);
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(dn, gbc);
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.weightx = 0.0;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.NONE;
+ pwdLabel = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_BIND_PASSWORD_LABEL.get());
+ add(pwdLabel, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ pwd = Utilities.createPasswordField();
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(pwd, gbc);
+
+ addBottomGlue(gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return pwd;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ super.toBeDisplayed(visible);
+ if (visible)
+ {
+ pwd.setText("");
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ setPrimaryValid(dnLabel);
+ setPrimaryValid(pwdLabel);
+ final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+
+ boolean dnInvalid = false;
+ boolean pwdInvalid = false;
+
+ if ("".equals(dn.getText().trim()))
+ {
+ dnInvalid = true;
+ errors.add(INFO_EMPTY_DIRECTORY_MANAGER_DN.get());
+ }
+ else if (!Utils.isDn(dn.getText()))
+ {
+ dnInvalid = true;
+ errors.add(INFO_NOT_A_DIRECTORY_MANAGER_DN.get());
+ }
+
+ if ("".equals(pwd.getPassword().length == 0))
+ {
+ pwdInvalid = true;
+ errors.add(INFO_EMPTY_PWD.get());
+ }
+ if (dnInvalid)
+ {
+ setPrimaryInvalid(dnLabel);
+ }
+
+ if (pwdInvalid)
+ {
+ setPrimaryInvalid(pwdLabel);
+ }
+
+ if (errors.isEmpty())
+ {
+ setEnabledOK(false);
+ setEnabledCancel(false);
+ displayMessage(INFO_CTRL_PANEL_VERIFYING_AUTHENTICATION_SUMMARY.get());
+
+ BackgroundTask<InitialLdapContext> worker =
+ new BackgroundTask<InitialLdapContext>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public InitialLdapContext processBackgroundTask() throws Throwable
+ {
+ InitialLdapContext ctx = null;
+ try
+ {
+ usedUrl = getInfo().getAdminConnectorURL();
+ ctx = Utilities.getAdminDirContext(getInfo(), dn.getText(),
+ String.valueOf(pwd.getPassword()));
+
+ if (getInfo().getDirContext() != null)
+ {
+ try
+ {
+ getInfo().getDirContext().close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ if (getInfo().getUserDataDirContext() != null)
+ {
+ try
+ {
+ getInfo().getUserDataDirContext().close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ try
+ {
+ Thread.sleep(500);
+ }
+ catch (Throwable t)
+ {
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ displayMessage(
+ INFO_CTRL_PANEL_READING_CONFIGURATION_SUMMARY.get());
+ }
+ });
+ getInfo().setDirContext(ctx);
+ getInfo().setUserDataDirContext(null);
+ getInfo().regenerateDescriptor();
+ return ctx;
+ } catch (Throwable t)
+ {
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t1)
+ {
+ }
+ }
+ throw t;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(InitialLdapContext ctx,
+ Throwable throwable)
+ {
+ boolean handleCertificateException = false;
+ if (throwable != null)
+ {
+ LOG.log(Level.INFO, "Error connecting: " + throwable, throwable);
+
+ if (Utils.isCertificateException(throwable))
+ {
+ ApplicationTrustManager.Cause cause =
+ getInfo().getTrustManager().getLastRefusedCause();
+
+ LOG.log(Level.INFO, "Certificate exception cause: "+cause);
+ UserDataCertificateException.Type excType = null;
+ if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
+ {
+ excType = UserDataCertificateException.Type.NOT_TRUSTED;
+ }
+ else if (cause ==
+ ApplicationTrustManager.Cause.HOST_NAME_MISMATCH)
+ {
+ excType = UserDataCertificateException.Type.HOST_NAME_MISMATCH;
+ }
+ else
+ {
+ Message msg = Utils.getThrowableMsg(
+ INFO_ERROR_CONNECTING_TO_LOCAL.get(), throwable);
+ errors.add(msg);
+ }
+
+ if (excType != null)
+ {
+ String h;
+ int p;
+ try
+ {
+ URI uri = new URI(usedUrl);
+ h = uri.getHost();
+ p = uri.getPort();
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING,
+ "Error parsing ldap url of ldap url.", t);
+ h = INFO_NOT_AVAILABLE_LABEL.get().toString();
+ p = -1;
+ }
+ UserDataCertificateException udce =
+ new UserDataCertificateException(null,
+ INFO_CERTIFICATE_EXCEPTION.get(h, String.valueOf(p)),
+ throwable, h, p,
+ getInfo().getTrustManager().getLastRefusedChain(),
+ getInfo().getTrustManager().getLastRefusedAuthType(),
+ excType);
+
+ handleCertificateException(udce);
+ handleCertificateException = true;
+ }
+ }
+ else if (throwable instanceof NamingException)
+ {
+ boolean found = false;
+ String providedDn = dn.getText();
+ Iterator<DN> it = getInfo().getServerDescriptor().
+ getAdministrativeUsers().iterator();
+ while (it.hasNext() && !found)
+ {
+ found = Utils.areDnsEqual(providedDn, it.next().toString());
+ }
+ if (!found)
+ {
+ errors.add(INFO_NOT_A_DIRECTORY_MANAGER_IN_CONFIG.get());
+ }
+ else
+ {
+ errors.add(ERR_CANNOT_CONNECT_TO_LOGIN_WITHOUT_CAUSE.get());
+ }
+
+ setPrimaryInvalid(dnLabel);
+ setPrimaryInvalid(pwdLabel);
+ }
+ else if (throwable instanceof ConfigReadException)
+ {
+ errors.add(((ConfigReadException)throwable).getMessageObject());
+ }
+ else
+ {
+ // This is a bug
+ throwable.printStackTrace();
+ errors.add(Utils.getThrowableMsg(INFO_BUG_MSG.get(), throwable));
+ }
+ }
+ displayMainPanel();
+ setEnabledCancel(true);
+ setEnabledOK(true);
+ if (!errors.isEmpty())
+ {
+ displayErrorDialog(errors);
+ pwd.setSelectionStart(0);
+ pwd.setSelectionEnd(pwd.getPassword().length);
+ pwd.requestFocusInWindow();
+ }
+ else if (!handleCertificateException)
+ {
+ Utilities.getParentDialog(LoginPanel.this).setVisible(false);
+ }
+ }
+ };
+ worker.startBackgroundTask();
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ if (dnInvalid)
+ {
+ dn.setSelectionStart(0);
+ dn.setSelectionEnd(dn.getText().length());
+ dn.requestFocusInWindow();
+ }
+ if (pwdInvalid)
+ {
+ pwd.setSelectionStart(0);
+ pwd.setSelectionEnd(pwd.getPassword().length);
+ pwd.requestFocusInWindow();
+ }
+
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(dnLabel);
+ setPrimaryValid(pwdLabel);
+ pwd.setText(null);
+ super.cancelClicked();
+ }
+
+ /**
+ * Displays a dialog asking the user to accept a certificate if the user
+ * accepts it, we update the trust manager and simulate a click on "OK" to
+ * re-check the authentication.
+ * This method assumes that we are being called from the event thread.
+ */
+ private void handleCertificateException(UserDataCertificateException ce)
+ {
+ CertificateDialog dlg = new CertificateDialog(null, ce);
+ dlg.pack();
+ Utilities.centerGoldenMean(dlg, Utilities.getParentDialog(this));
+ dlg.setVisible(true);
+ if (dlg.getUserAnswer() !=
+ CertificateDialog.ReturnType.NOT_ACCEPTED)
+ {
+ X509Certificate[] chain = ce.getChain();
+ String authType = ce.getAuthType();
+ String host = ce.getHost();
+
+ if ((chain != null) && (authType != null) && (host != null))
+ {
+ LOG.log(Level.INFO, "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()
+ {
+ public void run()
+ {
+ okClicked();
+ }
+ });
+ }
+ else
+ {
+ if (chain == null)
+ {
+ LOG.log(Level.WARNING,
+ "The chain is null for the UserDataCertificateException");
+ }
+ if (authType == null)
+ {
+ LOG.log(Level.WARNING,
+ "The auth type is null for the UserDataCertificateException");
+ }
+ if (host == null)
+ {
+ LOG.log(Level.WARNING,
+ "The host is null for the UserDataCertificateException");
+ }
+ }
+ }
+ if (dlg.getUserAnswer() ==
+ CertificateDialog.ReturnType.ACCEPTED_PERMANENTLY)
+ {
+ X509Certificate[] chain = ce.getChain();
+ if (chain != null)
+ {
+ try
+ {
+ UIKeyStore.acceptCertificate(chain);
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING, "Error accepting certificate: "+t, t);
+ }
+ }
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MainActionsPane.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MainActionsPane.java
new file mode 100644
index 0000000..f1f5e6a
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MainActionsPane.java
@@ -0,0 +1,396 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+
+import org.opends.guitools.controlpanel.datamodel.Action;
+import org.opends.guitools.controlpanel.datamodel.Category;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.components.ActionButton;
+import org.opends.guitools.controlpanel.ui.components.CategoryPanel;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The panel on the left side of the main Control Center dialog. It contains
+ * all the actions on the pane divided in categories.
+ *
+ */
+public class MainActionsPane extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 7616418700758530191L;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public MainActionsPane()
+ {
+ super();
+
+ setBackground(ColorAndFontConstants.greyBackground);
+ GridBagConstraints gbc1 = new GridBagConstraints();
+ gbc1.gridx = 0;
+ gbc1.gridy = 0;
+ gbc1.fill = GridBagConstraints.HORIZONTAL;
+ gbc1.weightx = 1;
+ ArrayList<Category> categories = createCategories();
+ ButtonGroup group = new ButtonGroup();
+ int maxWidth = 0;
+ final Map<Action, GenericDialog> dialogs =
+ new HashMap<Action, GenericDialog>();
+ ArrayList<ActionButton> actions = new ArrayList<ActionButton>();
+ for(Category category: categories)
+ {
+ JPanel categoryPanel = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc2 = new GridBagConstraints();
+ gbc2.gridx = 0;
+ gbc2.gridy = 0;
+ gbc2.weightx = 1;
+ gbc2.fill = GridBagConstraints.HORIZONTAL;
+ for (Action action : category.getActions())
+ {
+ final ActionButton b = new ActionButton(action);
+ actions.add(b);
+ b.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ // Constructs the panels using reflection.
+ Action action = b.getActionObject();
+ GenericDialog dlg = dialogs.get(action);
+ if (dlg == null)
+ {
+ Class<? extends StatusGenericPanel> panelClass =
+ action.getAssociatedPanelClass();
+ try
+ {
+ Constructor<? extends StatusGenericPanel> constructor =
+ panelClass.getDeclaredConstructor();
+ StatusGenericPanel panel = constructor.newInstance();
+ if (getInfo() != null)
+ {
+ panel.setInfo(getInfo());
+ }
+ dlg = new GenericDialog(
+ Utilities.getFrame(MainActionsPane.this),
+ panel);
+
+ dialogs.put(action, dlg);
+ Utilities.centerGoldenMean(dlg,
+ Utilities.getFrame(MainActionsPane.this));
+ }
+ catch (Throwable t)
+ {
+ // Bug
+ t.printStackTrace();
+ }
+ }
+ if (!dlg.isVisible())
+ {
+ dlg.setVisible(true);
+ }
+ else
+ {
+ dlg.toFront();
+ }
+ }
+ });
+ categoryPanel.add(b, gbc2);
+ gbc2.gridy++;
+ group.add(b);
+ maxWidth = Math.max(maxWidth, b.getPreferredSize().width);
+ }
+ CategoryPanel p = new CategoryPanel(categoryPanel, category);
+ maxWidth = Math.max(maxWidth, p.getPreferredSize().width);
+ p.setExpanded(false);
+ add(p, gbc1);
+ gbc1.gridy++;
+
+ if (category.getName().equals(
+ INFO_CTRL_PANEL_CATEGORY_DIRECTORY_DATA.get()))
+ {
+ p.setExpanded(true);
+ }
+ }
+ add(Box.createHorizontalStrut(maxWidth), gbc1);
+ gbc1.gridy ++;
+ gbc1.weighty = 1.0;
+ add(Box.createVerticalGlue(), gbc1);
+ createActionButtonListeners(actions);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return null;
+ }
+
+ private ArrayList<Category> createCategories()
+ {
+ ArrayList<Category> categories = new ArrayList<Category>();
+ Message[][] labels;
+ if (Utilities.isWindows())
+ {
+ labels = new Message[][] {
+ {
+ INFO_CTRL_PANEL_CATEGORY_DIRECTORY_DATA.get(),
+ INFO_CTRL_PANEL_ACTION_MANAGE_ENTRIES.get(),
+ INFO_CTRL_PANEL_ACTION_NEW_BASEDN.get(),
+ INFO_CTRL_PANEL_ACTION_IMPORT_LDIF.get(),
+ INFO_CTRL_PANEL_ACTION_EXPORT_LDIF.get(),
+ INFO_CTRL_PANEL_ACTION_BACKUP.get(),
+ INFO_CTRL_PANEL_ACTION_RESTORE.get()
+ },
+ {
+ INFO_CTRL_PANEL_CATEGORY_SCHEMA.get(),
+ INFO_CTRL_PANEL_ACTION_MANAGE_SCHEMA.get()
+ },
+ {
+ INFO_CTRL_PANEL_CATEGORY_INDEXES.get(),
+ INFO_CTRL_PANEL_ACTION_MANAGE_INDEXES.get(),
+ INFO_CTRL_PANEL_ACTION_VERIFY_INDEXES.get(),
+ INFO_CTRL_PANEL_ACTION_REBUILD_INDEXES.get()
+ },
+ {
+ INFO_CTRL_PANEL_CATEGORY_RUNTIME_OPTIONS.get(),
+ INFO_CTRL_PANEL_ACTION_JAVA_SETTINGS.get(),
+ INFO_CTRL_PANEL_ACTION_WINDOWS_SERVICE.get()
+ }
+ };
+ }
+ else
+ {
+ labels = new Message[][] {
+ {
+ INFO_CTRL_PANEL_CATEGORY_DIRECTORY_DATA.get(),
+ INFO_CTRL_PANEL_ACTION_MANAGE_ENTRIES.get(),
+ INFO_CTRL_PANEL_ACTION_NEW_BASEDN.get(),
+ INFO_CTRL_PANEL_ACTION_IMPORT_LDIF.get(),
+ INFO_CTRL_PANEL_ACTION_EXPORT_LDIF.get(),
+ INFO_CTRL_PANEL_ACTION_BACKUP.get(),
+ INFO_CTRL_PANEL_ACTION_RESTORE.get()
+ },
+ {
+ INFO_CTRL_PANEL_CATEGORY_SCHEMA.get(),
+ INFO_CTRL_PANEL_ACTION_MANAGE_SCHEMA.get()
+ },
+ {
+ INFO_CTRL_PANEL_CATEGORY_INDEXES.get(),
+ INFO_CTRL_PANEL_ACTION_MANAGE_INDEXES.get(),
+ INFO_CTRL_PANEL_ACTION_VERIFY_INDEXES.get(),
+ INFO_CTRL_PANEL_ACTION_REBUILD_INDEXES.get()
+ },
+ {
+ INFO_CTRL_PANEL_CATEGORY_RUNTIME_OPTIONS.get(),
+ INFO_CTRL_PANEL_ACTION_JAVA_SETTINGS.get()
+ }
+ };
+ }
+ ArrayList<Class<? extends StatusGenericPanel>> classes =
+ new ArrayList<Class<? extends StatusGenericPanel>>();
+ classes.add(BrowseEntriesPanel.class);
+ classes.add(NewBaseDNPanel.class);
+ classes.add(ImportLDIFPanel.class);
+ classes.add(ExportLDIFPanel.class);
+ classes.add(BackupPanel.class);
+ classes.add(RestorePanel.class);
+ classes.add(BrowseSchemaPanel.class);
+ classes.add(BrowseIndexPanel.class);
+ classes.add(VerifyIndexPanel.class);
+ classes.add(RebuildIndexPanel.class);
+ classes.add(JavaPropertiesPanel.class);
+ if (Utilities.isWindows())
+ {
+ classes.add(WindowsServicePanel.class);
+ }
+ int classIndex = 0;
+ for (int i=0; i<labels.length; i++)
+ {
+ Category category = new Category();
+ category.setName(labels[i][0]);
+ for (int j=1; j<labels[i].length; j++)
+ {
+ Action action = new Action();
+ action.setName(labels[i][j]);
+ action.setAssociatedPanel(classes.get(classIndex));
+ classIndex ++;
+
+ category.getActions().add(action);
+
+ }
+ categories.add(category);
+ }
+ return categories;
+ }
+
+ /**
+ * This is required because in some desktops we might encounter a case
+ * where several actions are highlighted.
+ * @param actions the actions
+ */
+ private void createActionButtonListeners(
+ final Collection<ActionButton> actions)
+ {
+ ActionListener actionListener = new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ for (ActionButton button : actions)
+ {
+ if (ev.getSource() == button)
+ {
+ button.actionPerformed(ev);
+ break;
+ }
+ }
+ }
+ };
+
+ MouseAdapter mouseListener = new MouseAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void mousePressed(MouseEvent ev)
+ {
+ for (ActionButton button : actions)
+ {
+ if (ev.getSource() == button)
+ {
+ button.mousePressed(ev);
+ break;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseReleased(MouseEvent ev)
+ {
+ for (ActionButton button : actions)
+ {
+ if (ev.getSource() == button)
+ {
+ button.mouseReleased(ev);
+ break;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseExited(MouseEvent ev)
+ {
+ for (ActionButton button : actions)
+ {
+ if (ev.getSource() == button)
+ {
+ button.mouseExited(ev);
+ break;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseEntered(MouseEvent ev)
+ {
+ for (ActionButton button : actions)
+ {
+ if (ev.getSource() == button)
+ {
+ button.mouseEntered(ev);
+ }
+ else
+ {
+ button.mouseExited(ev);
+ }
+ }
+ }
+ };
+
+ for (ActionButton button : actions)
+ {
+ button.addActionListener(actionListener);
+ button.addMouseListener(mouseListener);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MainMenuBar.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MainMenuBar.java
new file mode 100644
index 0000000..74387a1
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MainMenuBar.java
@@ -0,0 +1,171 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The menu bar that appears on the main panel.
+ *
+ */
+public class MainMenuBar extends GenericMenuBar
+{
+ private static final long serialVersionUID = 6441273044772077947L;
+
+ /**
+ * Constructor.
+ * @param info the control panel information.
+ */
+ public MainMenuBar(ControlPanelInfo info)
+ {
+ super(info);
+
+ JMenu menu;
+ JMenuItem menuItem;
+
+ if (!Utilities.isMacOS())
+ {
+ menu = Utilities.createMenu(INFO_CTRL_PANEL_FILE_MENU.get(),
+ INFO_CTRL_PANEL_FILE_MENU_DESCRIPTION.get());
+ menu.setMnemonic(KeyEvent.VK_F);
+ menuItem = Utilities.createMenuItem(INFO_CTRL_PANEL_EXIT_MENU.get());
+ menuItem.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ quitClicked();
+ }
+ });
+ menu.add(menuItem);
+
+ add(menu);
+ }
+ add(createHelpMenuBar());
+
+ if (Utilities.isMacOS())
+ {
+ setMacOSQuitHandler();
+ }
+ }
+
+ /**
+ * The method called when the user clicks on quick. It will check that there
+ * are not ongoing tasks. If there are tasks, it will ask the user for
+ * confirmation to quit.
+ *
+ */
+ public void quitClicked()
+ {
+ Set<String> runningTasks = new HashSet<String>();
+ for (Task task : getInfo().getTasks())
+ {
+ if (task.getState() == Task.State.RUNNING)
+ {
+ runningTasks.add(task.getTaskDescription().toString());
+ }
+ }
+ boolean confirmed = true;
+ if (runningTasks.size() > 0)
+ {
+ String allTasks = Utilities.getStringFromCollection(runningTasks, "<br>");
+ Message title = INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get();
+ Message msg =
+ INFO_CTRL_PANEL_RUNNING_TASKS_CONFIRMATION_DETAILS.get(allTasks);
+ confirmed = Utilities.displayConfirmationDialog(
+ Utilities.getParentDialog(this), title, msg);
+ }
+ if (confirmed)
+ {
+ System.exit(0);
+ }
+ }
+
+ /**
+ * Specific method to be able to handle the Quit events sent from the COCOA
+ * menu of Mac OS.
+ *
+ */
+ private void setMacOSQuitHandler()
+ {
+ try
+ {
+ Class<? extends Object> applicationClass =
+ Class.forName("com.apple.eawt.Application");
+ Class applicationListenerClass =
+ Class.forName("com.apple.eawt.ApplicationListener");
+ final Object macApplication = applicationClass.getConstructor(
+ (Class[])null).newInstance((Object[])null);
+ InvocationHandler adapter = new InvocationHandler()
+ {
+ public Object invoke (Object proxy, Method method, Object[] args)
+ throws Throwable
+ {
+ Object event = args[0];
+ if (method.getName().equals("handleQuit"))
+ {
+ quitClicked();
+
+ // quitClicked will exit if we must exit
+ Method setHandledMethod = event.getClass().getDeclaredMethod(
+ "setHandled", new Class[] { boolean.class });
+ setHandledMethod.invoke(event, new Object[] { Boolean.FALSE });
+ }
+ return null;
+ }
+ };
+ Method addListenerMethod =
+ applicationClass.getDeclaredMethod("addApplicationListener",
+ new Class[] { applicationListenerClass });
+ Object proxy = Proxy.newProxyInstance(MainMenuBar.class.getClassLoader(),
+ new Class[] { applicationListenerClass }, adapter);
+ addListenerMethod.invoke(macApplication, new Object[] { proxy });
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
new file mode 100644
index 0000000..90cc519
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
@@ -0,0 +1,283 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.TreeSet;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JLabel;
+import javax.swing.JList;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.components.TitlePanel;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.api.ApproximateMatchingRule;
+import org.opends.server.api.AttributeSyntax;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.api.MatchingRule;
+import org.opends.server.api.OrderingMatchingRule;
+import org.opends.server.api.SubstringMatchingRule;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.Schema;
+
+/**
+ * Class displaying the contents of a matching rule.
+ *
+ */
+public class MatchingRulePanel extends SchemaElementPanel
+{
+ private static final long serialVersionUID = 2440493955626646008L;
+ private TitlePanel titlePanel = new TitlePanel(Message.EMPTY,
+ Message.EMPTY);
+ private JLabel name = Utilities.createDefaultLabel();
+ private JLabel oid = Utilities.createDefaultLabel();
+ private JLabel description = Utilities.createDefaultLabel();
+ private JLabel syntax = Utilities.createDefaultLabel();
+ private JLabel type = Utilities.createDefaultLabel();
+ private JList usedByAttributes = new JList(new DefaultListModel());
+
+ /**
+ * Default constructor.
+ */
+ public MatchingRulePanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_MATCHING_RULE_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return usedByAttributes;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridy ++;
+ titlePanel.setTitle(INFO_CTRL_PANEL_MATCHING_RULE_DETAILS.get());
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridwidth = 2;
+ gbc.gridy = 0;
+ gbc.insets.top = 5;
+ gbc.insets.bottom = 7;
+ add(titlePanel, gbc);
+
+ gbc.insets.bottom = 0;
+ gbc.insets.top = 8;
+ Message[] labels = {
+ INFO_CTRL_PANEL_MATCHING_RULE_NAME.get(),
+ INFO_CTRL_PANEL_MATCHING_RULE_OID.get(),
+ INFO_CTRL_PANEL_MATCHING_RULE_DESCRIPTION.get(),
+ INFO_CTRL_PANEL_MATCHING_RULE_TYPE.get(),
+ INFO_CTRL_PANEL_MATCHING_RULE_SYNTAX.get()
+ };
+ JLabel[] values = {name, oid, description, type, syntax};
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.anchor = GridBagConstraints.WEST;
+ for (int i=0; i < labels.length; i++)
+ {
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ JLabel l = Utilities.createPrimaryLabel(labels[i]);
+ add(l, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ add(values[i], gbc);
+ gbc.gridy ++;
+ }
+
+ usedByAttributes.setVisibleRowCount(15);
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ JLabel l = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_MATCHING_RULE_USED_BY.get());
+ gbc.weightx = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(l, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.weighty = 1.0;
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets.top = 10;
+ add(Utilities.createScrollPane(usedByAttributes), gbc);
+
+ MouseAdapter doubleClickListener = new MouseAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseClicked(MouseEvent ev)
+ {
+ if (ev.getClickCount() > 1)
+ {
+ String o = (String)usedByAttributes.getSelectedValue();
+ if (o != null)
+ {
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ AttributeType attr = schema.getAttributeType(o.toLowerCase());
+ if (attr != null)
+ {
+ notifySchemaSelectionListeners(attr);
+ }
+ }
+ }
+ }
+ }
+ };
+ usedByAttributes.addMouseListener(doubleClickListener);
+ setBorder(PANEL_BORDER);
+ }
+
+ /**
+ * Updates the contents of the panel with the provided matching rule.
+ * @param matchingRule the matching rule.
+ * @param schema the schema.
+ */
+ public void update(MatchingRule matchingRule, Schema schema)
+ {
+ String n = matchingRule.getName();
+ if (n == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ titlePanel.setDetails(Message.raw(n));
+ name.setText(n);
+ oid.setText(matchingRule.getOID());
+ AttributeSyntax s = null;
+ String syntaxOID = matchingRule.getSyntaxOID();
+ for (AttributeSyntax candidate : schema.getSyntaxes().values())
+ {
+ if (candidate.getOID().equals(syntaxOID))
+ {
+ s = candidate;
+ break;
+ }
+ }
+ if (s != null)
+ {
+ syntax.setText(Utilities.getSyntaxText(s));
+ }
+ else
+ {
+ syntax.setText(syntaxOID);
+ }
+
+ n = matchingRule.getDescription();
+ if (n == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ description.setText(n);
+
+ type.setText(getTypeValue(matchingRule).toString());
+
+ TreeSet<String> attributes = new TreeSet<String>();
+ for (AttributeType attr : schema.getAttributeTypes().values())
+ {
+ attributes.add(attr.getNameOrOID());
+ }
+ DefaultListModel model = (DefaultListModel)usedByAttributes.getModel();
+ model.clear();
+ for (String attr : attributes)
+ {
+ model.addElement(attr);
+ }
+ }
+
+ /**
+ * Returns the message for the type of the provided matching rule.
+ * @param matchingRule the matching rule.
+ * @return the message for the type of the provided matching rule.
+ */
+ static Message getTypeValue(MatchingRule matchingRule)
+ {
+ Message text;
+ if (matchingRule instanceof EqualityMatchingRule)
+ {
+ text = INFO_CTRL_PANEL_INDEX_EQUALITY.get();
+ }
+ else if (matchingRule instanceof OrderingMatchingRule)
+ {
+ text = INFO_CTRL_PANEL_INDEX_ORDERING.get();
+ }
+ else if (matchingRule instanceof SubstringMatchingRule)
+ {
+ text = INFO_CTRL_PANEL_INDEX_SUBSTRING.get();
+ }
+ else if (matchingRule instanceof ApproximateMatchingRule)
+ {
+ text = INFO_CTRL_PANEL_INDEX_APPROXIMATE.get();
+ }
+ else
+ {
+ text = NOT_APPLICABLE;
+ }
+ return text;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
new file mode 100644
index 0000000..b5012de
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -0,0 +1,1071 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.NamingException;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.guitools.controlpanel.task.OnlineUpdateException;
+import org.opends.guitools.controlpanel.task.SchemaTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.components.BasicExpander;
+import
+org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.server.api.ApproximateMatchingRule;
+import org.opends.server.api.AttributeSyntax;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.api.MatchingRule;
+import org.opends.server.api.OrderingMatchingRule;
+import org.opends.server.api.SubstringMatchingRule;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeUsage;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.CommonSchemaElements;
+import org.opends.server.types.Entry;
+import org.opends.server.types.ExistingFileBehavior;
+import org.opends.server.types.LDIFExportConfig;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.Modification;
+import org.opends.server.types.ModificationType;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.Schema;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.LDIFWriter;
+import org.opends.server.util.ServerConstants;
+import org.opends.server.util.StaticUtils;
+
+/**
+ * The panel displayed when the user wants to define a new attribute in the
+ * schema.
+ *
+ */
+public class NewAttributePanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 2340170241535771321L;
+ private JLabel lName = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_NAME_LABEL.get());
+ private JLabel lParent = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_PARENT_LABEL.get());
+ private JLabel lOID = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_OID_LABEL.get());
+ private JLabel lAliases = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_ALIASES_LABEL.get());
+ private JLabel lOrigin = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_ORIGIN_LABEL.get());
+ private JLabel lFile = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_FILE_LABEL.get());
+ private JLabel lDescription = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_DESCRIPTION_LABEL.get());
+ private JLabel lUsage = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_USAGE_LABEL.get());
+ private JLabel lSyntax = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_LABEL.get());
+ private JLabel lApproximate = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_APPROXIMATE_MATCHING_RULE_LABEL.get());
+ private JLabel lEquality = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_EQUALITY_MATCHING_RULE_LABEL.get());
+ private JLabel lOrdering = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_ORDERING_MATCHING_RULE_LABEL.get());
+ private JLabel lSubstring = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ATTRIBUTE_SUBSTRING_MATCHING_RULE_LABEL.get());
+ private JLabel lType = Utilities.createPrimaryLabel();
+
+ private JLabel[] labels = {lName, lParent, lOID, lAliases, lOrigin, lFile,
+ lDescription, lUsage, lSyntax, lApproximate,
+ lEquality, lOrdering, lSubstring, lType
+ };
+
+ private JTextField name = Utilities.createMediumTextField();
+ private JComboBox parent = Utilities.createComboBox();
+ private JTextField oid = Utilities.createMediumTextField();
+ private JTextField aliases = Utilities.createLongTextField();
+ private JTextField description = Utilities.createLongTextField();
+ private JTextField origin = Utilities.createLongTextField();
+ private JTextField file = Utilities.createLongTextField();
+ private JComboBox usage = Utilities.createComboBox();
+ private JComboBox syntax = Utilities.createComboBox();
+ private JComboBox approximate = Utilities.createComboBox();
+ private JComboBox equality = Utilities.createComboBox();
+ private JComboBox ordering = Utilities.createComboBox();
+ private JComboBox substring = Utilities.createComboBox();
+ private JCheckBox nonModifiable = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_ATTRIBUTE_NON_MODIFIABLE_LABEL.get());
+ private JCheckBox singleValued = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_ATTRIBUTE_SINGLE_VALUED_LABEL.get());
+ private JCheckBox collective = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_ATTRIBUTE_COLLECTIVE_LABEL.get());
+ private JCheckBox obsolete = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_ATTRIBUTE_OBSOLETE_LABEL.get());
+
+ private Schema schema;
+
+ private Component relativeComponent;
+
+ private Message NO_PARENT = INFO_CTRL_PANEL_NO_PARENT_FOR_ATTRIBUTE.get();
+ private Message NO_MATCHING_RULE =
+ INFO_CTRL_PANEL_NO_MATCHING_RULE_FOR_ATTRIBUTE.get();
+
+ /**
+ * Constructor of the new attribute panel.
+ * @param relativeComponent the component relative to which the dialog
+ * containing this panel must be centered.
+ */
+ public NewAttributePanel(Component relativeComponent)
+ {
+ super();
+ this.relativeComponent = relativeComponent;
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_ATTRIBUTE_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ ArrayList<AttributeSyntax> newSyntaxes = new ArrayList<AttributeSyntax>();
+
+ final ServerDescriptor desc = ev.getNewDescriptor();
+ Schema s = desc.getSchema();
+
+ final boolean firstSchema = schema == null;
+ final boolean[] repack = {firstSchema};
+ final boolean[] error = {false};
+
+ if (s != null)
+ {
+ schema = s;
+
+ HashMap<String, AttributeSyntax> syntaxNameMap = new HashMap<String,
+ AttributeSyntax>();
+ for (String key : schema.getSyntaxes().keySet())
+ {
+ AttributeSyntax syntax = schema.getSyntax(key);
+ String name = syntax.getSyntaxName();
+ if (name == null)
+ {
+ name = syntax.getOID();
+ }
+ syntaxNameMap.put(name, syntax);
+ }
+
+ SortedSet<String> orderedKeys =
+ new TreeSet<String>(syntaxNameMap.keySet());
+ for (String key : orderedKeys)
+ {
+ newSyntaxes.add(syntaxNameMap.get(key));
+ }
+ updateComboBoxModel(newSyntaxes,
+ ((DefaultComboBoxModel)syntax.getModel()));
+
+ HashMap<String, AttributeType> attributeNameMap = new HashMap<String,
+ AttributeType>();
+ for (String key : schema.getAttributeTypes().keySet())
+ {
+ AttributeType attr = schema.getAttributeType(key);
+ attributeNameMap.put(attr.getNameOrOID(), attr);
+ }
+ orderedKeys.clear();
+ orderedKeys.addAll(attributeNameMap.keySet());
+ ArrayList<Object> newParents = new ArrayList<Object>();
+ for (String key : orderedKeys)
+ {
+ newParents.add(attributeNameMap.get(key));
+ }
+ newParents.add(0, NO_PARENT);
+ updateComboBoxModel(newParents,
+ ((DefaultComboBoxModel)parent.getModel()));
+
+ ArrayList<MatchingRule> approximateElements =
+ new ArrayList<MatchingRule>();
+ ArrayList<MatchingRule> equalityElements = new ArrayList<MatchingRule>();
+ ArrayList<MatchingRule> orderingElements = new ArrayList<MatchingRule>();
+ ArrayList<MatchingRule> substringElements = new ArrayList<MatchingRule>();
+
+ HashMap<String, MatchingRule> matchingRuleNameMap = new HashMap<String,
+ MatchingRule>();
+ for (String key : schema.getMatchingRules().keySet())
+ {
+ MatchingRule rule = schema.getMatchingRule(key);
+ matchingRuleNameMap.put(rule.getNameOrOID(), rule);
+ }
+
+ orderedKeys.clear();
+ orderedKeys.addAll(matchingRuleNameMap.keySet());
+ for (String key : orderedKeys)
+ {
+ MatchingRule matchingRule = matchingRuleNameMap.get(key);
+ if (matchingRule instanceof ApproximateMatchingRule)
+ {
+ approximateElements.add(matchingRule);
+ }
+ else if (matchingRule instanceof EqualityMatchingRule)
+ {
+ equalityElements.add(matchingRule);
+ }
+ else if (matchingRule instanceof OrderingMatchingRule)
+ {
+ orderingElements.add(matchingRule);
+ }
+ else if (matchingRule instanceof SubstringMatchingRule)
+ {
+ substringElements.add(matchingRule);
+ }
+ }
+ JComboBox[] combos = {approximate, equality, ordering, substring};
+ ArrayList<ArrayList<MatchingRule>> ruleNames =
+ new ArrayList<ArrayList<MatchingRule>>();
+ ruleNames.add(approximateElements);
+ ruleNames.add(equalityElements);
+ ruleNames.add(orderingElements);
+ ruleNames.add(substringElements);
+ for (int i=0; i<combos.length; i++)
+ {
+ DefaultComboBoxModel model = (DefaultComboBoxModel)combos[i].getModel();
+ ArrayList<Object> el = new ArrayList<Object>();
+ el.addAll(ruleNames.get(i));
+ if (model.getSize() == 0)
+ {
+ el.add(0, NO_MATCHING_RULE);
+ }
+ else
+ {
+ el.add(0, model.getElementAt(0));
+ }
+ updateComboBoxModel(el, model);
+ }
+ }
+ else
+ {
+ updateErrorPane(errorPane,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_SUMMARY.get(),
+ ColorAndFontConstants.errorTitleFont,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_DETAILS.get(),
+ ColorAndFontConstants.defaultFont);
+ repack[0] = true;
+ error[0] = true;
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ setEnabledOK(!error[0]);
+ errorPane.setVisible(error[0]);
+ if (firstSchema)
+ {
+ for (int i=0; i<syntax.getModel().getSize(); i++)
+ {
+ AttributeSyntax syn =
+ (AttributeSyntax)syntax.getModel().getElementAt(i);
+ if ("DirectoryString".equals(syn.getSyntaxName()))
+ {
+ syntax.setSelectedIndex(i);
+ break;
+ }
+ }
+ }
+ else
+ {
+ updateDefaultMatchingRuleNames();
+ }
+
+ if (repack[0])
+ {
+ packParentDialog();
+ if (relativeComponent != null)
+ {
+ Utilities.centerGoldenMean(
+ Utilities.getParentDialog(NewAttributePanel.this),
+ relativeComponent);
+ }
+ }
+ }
+ });
+ if (!error[0])
+ {
+ updateErrorPaneAndOKButtonIfAuthRequired(desc,
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_TO_CREATE_ATTRIBUTE_SUMMARY.get());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ for (JLabel label : labels)
+ {
+ setPrimaryValid(label);
+ }
+ String n = getAttributeName();
+ MessageBuilder err = new MessageBuilder();
+ if (n.length() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_ATTRIBUTE_NAME_REQUIRED.get());
+ }
+ else if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_ATTRIBUTE_NAME.get(err.toString()));
+ err = new MessageBuilder();
+ }
+ else
+ {
+ Message elementType = getSchemaElementType(n, schema);
+ if (elementType != null)
+ {
+ errors.add(ERR_CTRL_PANEL_ATTRIBUTE_NAME_ALREADY_IN_USE.get(n,
+ elementType.toString()));
+ }
+ }
+
+ n = oid.getText().trim();
+ if (n.length() > 0)
+ {
+ if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
+ {
+ errors.add(ERR_CTRL_PANEL_OID_NOT_VALID.get(err.toString()));
+ err = new MessageBuilder();
+ }
+ else
+ {
+ Message elementType = getSchemaElementType(n, schema);
+ if (elementType != null)
+ {
+ errors.add(ERR_CTRL_PANEL_OID_ALREADY_IN_USE.get(n,
+ elementType.toString()));
+ }
+ }
+ }
+
+ if (aliases.getText().trim().length() > 0)
+ {
+ String[] al = aliases.getText().split(",");
+ if (al.length > 0)
+ {
+ for (String alias : al)
+ {
+ if (alias.trim().length() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_EMPTY_ALIAS.get());
+ }
+ else
+ {
+ Message elementType = getSchemaElementType(alias, schema);
+ if (elementType != null)
+ {
+ errors.add(ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE.get(n,
+ elementType.toString()));
+ }
+ }
+ }
+ }
+ }
+
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_NEW_ATTRIBUTE_PANEL_TITLE.get(), getInfo());
+ NewAttributeTask newTask = null;
+ if (errors.size() == 0)
+ {
+ newTask = new NewAttributeTask(getInfo(), dlg);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ }
+ if (errors.size() == 0)
+ {
+ String attrName = getAttributeName();
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_CREATING_ATTRIBUTE_SUMMARY.get(attrName),
+ INFO_CTRL_PANEL_CREATING_ATTRIBUTE_COMPLETE.get(),
+ INFO_CTRL_PANEL_CREATING_ATTRIBUTE_SUCCESSFUL.get(attrName),
+ ERR_CTRL_PANEL_CREATING_ATTRIBUTE_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_CREATING_ATTRIBUTE_ERROR_DETAILS.get(attrName),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Returns the message representing the schema element type.
+ * @param name the name of the schema element.
+ * @param schema the schema.
+ * @return the message representing the schema element type.
+ */
+ static Message getSchemaElementType(String name, Schema schema)
+ {
+ if (schema.getAttributeType(name.toLowerCase()) != null)
+ {
+ return INFO_CTRL_PANEL_TYPE_ATTRIBUTE.get();
+ }
+ else if (schema.getObjectClass(name.toLowerCase()) != null)
+ {
+ return INFO_CTRL_PANEL_TYPE_OBJECT_CLASS.get();
+ }
+ else if (schema.getSyntax(name.toLowerCase()) != null)
+ {
+ return INFO_CTRL_PANEL_TYPE_ATTRIBUTE_SYNTAX.get();
+ }
+ else if (schema.getMatchingRule(name.toLowerCase()) != null)
+ {
+ return INFO_CTRL_PANEL_TYPE_MATCHING_RULE.get();
+ }
+
+ for (AttributeSyntax attr : schema.getSyntaxes().values())
+ {
+ String n = attr.getSyntaxName();
+ if (n != null)
+ {
+ if (n.equalsIgnoreCase(name))
+ {
+ return INFO_CTRL_PANEL_TYPE_ATTRIBUTE_SYNTAX.get();
+ }
+ }
+ }
+
+ for (MatchingRule rule : schema.getMatchingRules().values())
+ {
+ String n = rule.getName();
+ if (n != null)
+ {
+ if (n.equalsIgnoreCase(name))
+ {
+ return INFO_CTRL_PANEL_TYPE_MATCHING_RULE.get();
+ }
+ }
+ }
+
+ return null;
+ }
+
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ Utilities.setRequiredIcon(lName);
+
+ gbc.gridwidth = 2;
+ gbc.gridy = 0;
+ addErrorPane(gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.weighty = 0.0;
+ gbc.gridx = 1;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.fill = GridBagConstraints.NONE;
+ JLabel requiredLabel = createRequiredLabel();
+ gbc.insets.bottom = 10;
+ add(requiredLabel, gbc);
+
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.bottom = 0;
+
+ JComboBox[] comboBoxes = {parent, syntax, approximate,
+ equality, ordering, substring};
+ Message[] defaultValues = {NO_PARENT, Message.EMPTY, NO_MATCHING_RULE,
+ NO_MATCHING_RULE, NO_MATCHING_RULE, NO_MATCHING_RULE
+ };
+ SchemaElementComboBoxCellRenderer renderer = new
+ SchemaElementComboBoxCellRenderer(syntax);
+ for (int i=0; i<comboBoxes.length; i++)
+ {
+ DefaultComboBoxModel model = new DefaultComboBoxModel(
+ new Object[]{defaultValues[i]});
+ comboBoxes[i].setModel(model);
+ comboBoxes[i].setRenderer(renderer);
+ }
+
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ for (AttributeUsage us : AttributeUsage.values())
+ {
+ model.addElement(us);
+ }
+ usage.setModel(model);
+ usage.setSelectedItem(AttributeUsage.USER_APPLICATIONS);
+ usage.setRenderer(renderer);
+
+ Component[] basicComps = {name, oid, description,
+ syntax};
+ JLabel[] basicLabels = {lName, lOID, lDescription, lSyntax};
+ JLabel[] basicInlineHelp = new JLabel[] {null, null, null,
+ Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_SYNTAX_INLINE_HELP.get())};
+ add(basicLabels, basicComps, basicInlineHelp, this, gbc);
+
+ BasicExpander[] expanders = new BasicExpander[] {
+ new BasicExpander(INFO_CTRL_PANEL_EXTRA_OPTIONS_EXPANDER.get()),
+ new BasicExpander(
+ INFO_CTRL_PANEL_ATTRIBUTE_TYPE_OPTIONS_EXPANDER.get()),
+ new BasicExpander(INFO_CTRL_PANEL_MATCHING_RULE_OPTIONS_EXPANDER.get())
+ };
+
+ Component[][] comps = {{parent, aliases, origin, file},
+ {usage, singleValued, nonModifiable, collective, obsolete},
+ {approximate, equality, ordering, substring}};
+ JLabel[][] labels = {{lParent, lAliases, lOrigin, lFile},
+ {lUsage, lType, null, null, null},
+ {lApproximate, lEquality, lOrdering, lSubstring}};
+ JLabel[][] inlineHelps = {{null,
+ Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_SEPARATED_WITH_COMMAS_HELP.get()), null,
+ Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_SCHEMA_FILE_ATTRIBUTE_HELP.get(File.separator))},
+ {null, null, null, null, null, null},
+ {Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_MATCHING_RULE_APPROXIMATE_HELP.get()),
+ Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_MATCHING_RULE_EQUALITY_HELP.get()),
+ Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_MATCHING_RULE_ORDERING_HELP.get()),
+ Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_MATCHING_RULE_SUBSTRING_HELP.get())
+ }
+ };
+ for (int i=0; i<expanders.length; i++)
+ {
+ gbc.gridwidth = 2;
+ gbc.gridx = 0;
+ gbc.insets.left = 0;
+ add(expanders[i], gbc);
+ final JPanel p = new JPanel(new GridBagLayout());
+ gbc.insets.left = 15;
+ gbc.gridy ++;
+ add(p, gbc);
+ gbc.gridy ++;
+ p.setOpaque(false);
+
+ GridBagConstraints gbc1 = new GridBagConstraints();
+ gbc1.fill = GridBagConstraints.HORIZONTAL;
+ gbc1.gridy = 0;
+
+ add(labels[i], comps[i], inlineHelps[i], p, gbc1);
+ final BasicExpander expander = expanders[i];
+ ChangeListener changeListener = new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent e)
+ {
+ p.setVisible(expander.isSelected());
+ packParentDialog();
+ }
+ };
+ expander.addChangeListener(changeListener);
+ expander.setSelected(false);
+ changeListener.stateChanged(null);
+ }
+ addBottomGlue(gbc);
+
+ ItemListener itemListener = new ItemListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void itemStateChanged(ItemEvent ev)
+ {
+ if (ev.getStateChange() == ItemEvent.SELECTED)
+ {
+ updateDefaultMatchingRuleNames();
+ approximate.setSelectedIndex(0);
+ substring.setSelectedIndex(0);
+ equality.setSelectedIndex(0);
+ ordering.setSelectedIndex(0);
+ }
+ }
+ };
+ syntax.addItemListener(itemListener);
+
+ file.setText(ConfigConstants.FILE_USER_SCHEMA_ELEMENTS);
+ }
+
+
+ private void updateDefaultMatchingRuleNames()
+ {
+ AttributeSyntax syn = (AttributeSyntax)syntax.getSelectedItem();
+ if (syn != null)
+ {
+ MatchingRule[] rules = {syn.getApproximateMatchingRule(),
+ syn.getSubstringMatchingRule(),
+ syn.getEqualityMatchingRule(),
+ syn.getOrderingMatchingRule()};
+ JComboBox[] combos = {approximate, substring, equality, ordering};
+ for (int i=0; i<rules.length; i++)
+ {
+ DefaultComboBoxModel model = (DefaultComboBoxModel)combos[i].getModel();
+ int index = combos[i].getSelectedIndex();
+ if (rules[i] != null)
+ {
+ if (model.getSize() > 0)
+ {
+ model.removeElementAt(0);
+ }
+ model.insertElementAt(INFO_CTRL_PANEL_DEFAULT_DEFINED_IN_SYNTAX.get(
+ rules[i].getNameOrOID()), 0);
+ }
+ else
+ {
+ if (model.getSize() > 0)
+ {
+ model.removeElementAt(0);
+ }
+ model.insertElementAt(NO_MATCHING_RULE, 0);
+ }
+ combos[i].setSelectedIndex(index);
+ }
+ }
+ }
+
+ private String getAttributeName()
+ {
+ return name.getText().trim();
+ }
+
+ private String getOID()
+ {
+ String o = oid.getText().trim();
+ if (o.length() == 0)
+ {
+ o = getAttributeName()+"-oid";
+ }
+ return o;
+ }
+
+ private ArrayList<String> getAliases()
+ {
+ ArrayList<String> al = new ArrayList<String>();
+ String s = aliases.getText().trim();
+ if (s.length() > 0)
+ {
+ String[] a = s.split(",");
+ for (String alias : a)
+ {
+ al.add(alias.trim());
+ }
+ }
+ return al;
+ }
+
+ private ArrayList<String> getAllNames()
+ {
+ ArrayList<String> al = new ArrayList<String>();
+ al.add(getAttributeName());
+ al.addAll(getAliases());
+ return al;
+ }
+
+ private AttributeType getSuperior()
+ {
+ Object o = parent.getSelectedItem();
+ if (NO_PARENT.equals(o))
+ {
+ return null;
+ }
+ else
+ {
+ return (AttributeType)o;
+ }
+ }
+
+ private ApproximateMatchingRule getApproximateMatchingRule()
+ {
+ if (approximate.getSelectedIndex() == 0)
+ {
+ return null;
+ }
+ else
+ {
+ return (ApproximateMatchingRule)approximate.getSelectedItem();
+ }
+ }
+
+ private EqualityMatchingRule getEqualityMatchingRule()
+ {
+ if (equality.getSelectedIndex() == 0)
+ {
+ return null;
+ }
+ else
+ {
+ return (EqualityMatchingRule)equality.getSelectedItem();
+ }
+ }
+
+ private SubstringMatchingRule getSubstringMatchingRule()
+ {
+ if (substring.getSelectedIndex() == 0)
+ {
+ return null;
+ }
+ else
+ {
+ return (SubstringMatchingRule)substring.getSelectedItem();
+ }
+ }
+
+ private OrderingMatchingRule getOrderingMatchingRule()
+ {
+ if (ordering.getSelectedIndex() == 0)
+ {
+ return null;
+ }
+ else
+ {
+ return (OrderingMatchingRule)ordering.getSelectedItem();
+ }
+ }
+
+ private Map<String, List<String>> getExtraProperties()
+ {
+ Map<String, List<String>> map = new HashMap<String, List<String>>();
+ String f = file.getText().trim();
+ if (f.length() > 0)
+ {
+ ArrayList<String> list = new ArrayList<String>();
+ list.add(f);
+ map.put(ServerConstants.SCHEMA_PROPERTY_FILENAME, list);
+ }
+ String or = origin.getText().trim();
+ if (or.length() > 0)
+ {
+ ArrayList<String> list = new ArrayList<String>();
+ list.add(or);
+ map.put(ServerConstants.SCHEMA_PROPERTY_ORIGIN, list);
+ }
+ return map;
+ }
+
+ private AttributeType getAttribute()
+ {
+ AttributeType attr = new AttributeType("", getAttributeName(),
+ getAllNames(),
+ getOID(), description.getText().trim(),
+ getSuperior(),
+ (AttributeSyntax)syntax.getSelectedItem(),
+ getApproximateMatchingRule(),
+ getEqualityMatchingRule(),
+ getOrderingMatchingRule(),
+ getSubstringMatchingRule(),
+ (AttributeUsage)usage.getSelectedItem(),
+ collective.isSelected(), nonModifiable.isSelected(),
+ obsolete.isSelected(), singleValued.isSelected(),
+ getExtraProperties());
+
+ return attr;
+ }
+
+ /**
+ * The task in charge of creating the attribute.
+ *
+ */
+ protected class NewAttributeTask extends SchemaTask
+ {
+ private AttributeType attribute;
+ private String attributeName;
+ private String attributeDefinition;
+ private String attributeWithoutFileDefinition;
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public NewAttributeTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ attributeName = getAttributeName();
+ attributeDefinition = attribute.toString();
+ AttributeType attr = getAttribute();
+ attr.setExtraProperty(ServerConstants.SCHEMA_PROPERTY_FILENAME,
+ (String)null);
+ attributeWithoutFileDefinition = attr.toString();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.NEW_ATTRIBUTE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected CommonSchemaElements getSchemaElement()
+ {
+ if (attribute == null)
+ {
+ attribute = getAttribute();
+ }
+ return attribute;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_NEW_ATTRIBUTE_TASK_DESCRIPTION.get(attributeName);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getSchemaFileAttributeName()
+ {
+ return "attributeTypes";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getSchemaFileAttributeValue()
+ {
+ if (isServerRunning())
+ {
+ return attributeDefinition;
+ }
+ else
+ {
+ return attributeWithoutFileDefinition;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void updateSchema() throws OpenDsException
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ printEquivalentCommandToAdd();
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_CREATING_ATTRIBUTE_PROGRESS.get(
+ attributeName),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ if (isServerRunning())
+ {
+ try
+ {
+ BasicAttribute attr =
+ new BasicAttribute(getSchemaFileAttributeName());
+ attr.add(getSchemaFileAttributeValue());
+ ModificationItem mod = new ModificationItem(DirContext.ADD_ATTRIBUTE,
+ attr);
+ getInfo().getDirContext().modifyAttributes(
+ ConfigConstants.DN_DEFAULT_SCHEMA_ROOT,
+ new ModificationItem[] { mod });
+ }
+ catch (NamingException ne)
+ {
+ throw new OnlineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne.toString()), ne);
+ }
+ }
+ else
+ {
+ updateSchemaFile();
+ }
+ notifyConfigurationElementCreated(attribute);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+
+ /**
+ * Updates the contents of the schema file.
+ * @throws OpenDsException if an error occurs updating the schema file.
+ */
+ private void updateSchemaFile() throws OpenDsException
+ {
+ if (isSchemaFileDefined)
+ {
+ LDIFExportConfig exportConfig =
+ new LDIFExportConfig(schemaFile,
+ ExistingFileBehavior.OVERWRITE);
+ LDIFReader reader = null;
+ Entry schemaEntry = null;
+ try
+ {
+ reader = new LDIFReader(new LDIFImportConfig(schemaFile));
+ schemaEntry = reader.readEntry();
+
+ Modification mod = new Modification(ModificationType.ADD,
+ Attributes.create(getSchemaFileAttributeName().toLowerCase(),
+ getSchemaFileAttributeValue()));
+ schemaEntry.applyModification(mod);
+ LDIFWriter writer = new LDIFWriter(exportConfig);
+ writer.writeEntry(schemaEntry);
+ exportConfig.getWriter().newLine();
+ }
+ catch (Throwable t)
+ {
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ try
+ {
+ reader.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ if (exportConfig != null)
+ {
+ try
+ {
+ exportConfig.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ }
+ else
+ {
+ LDIFExportConfig exportConfig =
+ new LDIFExportConfig(schemaFile,
+ ExistingFileBehavior.FAIL);
+ try
+ {
+ ArrayList<String> lines = getSchemaEntryLines();
+ for (String line : lines)
+ {
+ LDIFWriter.writeLDIFLine(new StringBuilder(line),
+ exportConfig.getWriter(), exportConfig.getWrapColumn() > 1,
+ exportConfig.getWrapColumn());
+ }
+ exportConfig.getWriter().newLine();
+ }
+ catch (Throwable t)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(t.toString()), t);
+ }
+ finally
+ {
+ if (exportConfig != null)
+ {
+ try
+ {
+ exportConfig.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
new file mode 100644
index 0000000..aff231c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -0,0 +1,1531 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.messages.QuickSetupMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.AbstractButton;
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.BrowseActionListener;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.guitools.controlpanel.task.OnlineUpdateException;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.renderer.CustomListCellRenderer;
+import org.opends.guitools.controlpanel.util.ConfigReader;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.quicksetup.installer.InstallerHelper;
+import org.opends.quicksetup.util.Utils;
+import org.opends.server.admin.client.ManagementContext;
+import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
+import org.opends.server.admin.client.ldap.LDAPManagementContext;
+import org.opends.server.admin.std.client.LocalDBBackendCfgClient;
+import org.opends.server.admin.std.client.RootCfgClient;
+import org.opends.server.admin.std.meta.BackendCfgDefn;
+import org.opends.server.admin.std.meta.LocalDBBackendCfgDefn;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.config.ConfigEntry;
+import org.opends.server.config.DNConfigAttribute;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.tools.ImportLDIF;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.SetupUtils;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * The clss that appears when the user clicks on 'New Base DN'.
+ *
+ */
+public class NewBaseDNPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = -2680821576362341119L;
+ private JComboBox backends;
+ private JTextField newBackend;
+ private JTextField baseDN;
+ private JRadioButton onlyCreateBaseEntry;
+ private JRadioButton leaveDatabaseEmpty;
+ private JRadioButton importDataFromLDIF;
+ private JRadioButton importAutomaticallyGenerated;
+ private JTextField path;
+ private JTextField numberOfEntries;
+ private JButton browseImportPath;
+
+ private JLabel lBackend;
+ private JLabel lDirectoryBaseDN;
+ private JLabel lPath;
+ private JLabel lNumberOfEntries;
+ private JLabel lDirectoryData;
+
+ private DocumentListener documentListener;
+
+ private final Message NEW_BACKEND = INFO_CTRL_PANEL_NEW_BACKEND_LABEL.get();
+
+ /**
+ * The default constructor.
+ *
+ */
+ public NewBaseDNPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_BASE_DN_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return baseDN;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ if (visible)
+ {
+ documentListener.changedUpdate(null);
+ }
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 3;
+ addErrorPane(gbc);
+
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 0.0;
+ gbc.gridwidth = 1;
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.NONE;
+ lBackend = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_BACKEND_LABEL.get());
+ add(lBackend, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ backends = Utilities.createComboBox();
+ backends.setModel(new DefaultComboBoxModel(new Object[]{"bogus",
+ NEW_BACKEND}));
+ backends.setRenderer(new CustomListCellRenderer(backends));
+ backends.addItemListener(new IgnoreItemListener(backends));
+ gbc.gridwidth = 1;
+ add(backends, gbc);
+ newBackend = Utilities.createTextField();
+ newBackend.setColumns(25);
+ gbc.gridx = 2;
+ add(newBackend, gbc);
+ ItemListener comboListener = new ItemListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void itemStateChanged(ItemEvent ev)
+ {
+ Object o = backends.getSelectedItem();
+ newBackend.setEnabled(NEW_BACKEND.equals(o));
+ }
+ };
+ backends.addItemListener(comboListener);
+ comboListener.itemStateChanged(null);
+
+ gbc.insets.top = 10;
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.gridwidth = 1;
+ lDirectoryBaseDN =
+ Utilities.createPrimaryLabel(INFO_CTRL_PANEL_BASE_DN_LABEL.get());
+ add(lDirectoryBaseDN, gbc);
+
+ gbc.gridx = 1;
+ gbc.insets.left = 10;
+ gbc.gridwidth = 2;
+ baseDN = Utilities.createTextField();
+ documentListener = new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ String text = baseDN.getText().trim();
+ setEnabledOK((text != null) && (text.length() > 0) &&
+ !errorPane.isVisible());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ changedUpdate(ev);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ changedUpdate(ev);
+ }
+ };
+ baseDN.getDocument().addDocumentListener(documentListener);
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(baseDN, gbc);
+ gbc.gridy ++;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.insets.top = 3;
+ JLabel inlineHelp =
+ Utilities.createInlineHelpLabel(INFO_CTRL_PANEL_BASE_DN_EXAMPLE.get());
+ add(inlineHelp, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ lDirectoryData = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_DIRECTORY_DATA_LABEL.get());
+ add(lDirectoryData, gbc);
+
+ onlyCreateBaseEntry = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_ONLY_CREATE_BASE_ENTRY_LABEL.get());
+ onlyCreateBaseEntry.setSelected(false);
+
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ add(onlyCreateBaseEntry, gbc);
+
+ leaveDatabaseEmpty = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_LEAVE_DATABASE_EMPTY_LABEL.get());
+ leaveDatabaseEmpty.setSelected(false);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 2;
+ gbc.insets.top = 5;
+ add(leaveDatabaseEmpty, gbc);
+
+ importDataFromLDIF = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_IMPORT_FROM_LDIF_LABEL.get());
+ importDataFromLDIF.setSelected(false);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 2;
+ add(importDataFromLDIF, gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 2;
+ gbc.insets.left = 30;
+ add(createPathPanel(), gbc);
+
+ importAutomaticallyGenerated = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_IMPORT_AUTOMATICALLY_GENERATED_LABEL.get());
+ importAutomaticallyGenerated.setOpaque(false);
+ importAutomaticallyGenerated.setSelected(false);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 2;
+ gbc.insets.left = 10;
+ add(importAutomaticallyGenerated, gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 2;
+ gbc.insets.left = 30;
+ add(createNumberOfUsersPanel(), gbc);
+
+ ButtonGroup group = new ButtonGroup();
+ group.add(onlyCreateBaseEntry);
+ group.add(leaveDatabaseEmpty);
+ group.add(importDataFromLDIF);
+ group.add(importAutomaticallyGenerated);
+
+ ChangeListener listener = new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent ev)
+ {
+ browseImportPath.setEnabled(importDataFromLDIF.isSelected());
+ lPath.setEnabled(importDataFromLDIF.isSelected());
+ numberOfEntries.setEnabled(importAutomaticallyGenerated.isSelected());
+ lNumberOfEntries.setEnabled(importAutomaticallyGenerated.isSelected());
+ }
+ };
+ Enumeration<AbstractButton> buttons = group.getElements();
+ while (buttons.hasMoreElements())
+ {
+ buttons.nextElement().addChangeListener(listener);
+ }
+ onlyCreateBaseEntry.setSelected(true);
+ listener.stateChanged(null);
+
+ addBottomGlue(gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ ServerDescriptor desc = ev.getNewDescriptor();
+ final SortedSet<String> sortedBackends = new TreeSet<String>();
+ for (BackendDescriptor backend : desc.getBackends())
+ {
+ if (!backend.isConfigBackend())
+ {
+ sortedBackends.add(backend.getBackendID());
+ }
+ }
+ ArrayList<Object> newElements = new ArrayList<Object>();
+ newElements.addAll(sortedBackends);
+ if (sortedBackends.size() > 0)
+ {
+ newElements.add(COMBO_SEPARATOR);
+ }
+ newElements.add(NEW_BACKEND);
+ super.updateComboBoxModel(newElements,
+ ((DefaultComboBoxModel)backends.getModel()));
+ updateErrorPaneAndOKButtonIfAuthRequired(getInfo().getServerDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_CREATE_BASE_DN.get());
+ }
+
+ private JPanel createPathPanel()
+ {
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridwidth = 1;
+ lPath = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_IMPORT_LDIF_PATH_LABEL.get());
+ panel.add(lPath, gbc);
+
+ gbc.gridx = 1;
+ gbc.insets.left = 10;
+ path = Utilities.createTextField();
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ panel.add(path, gbc);
+ browseImportPath =
+ Utilities.createButton(INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ browseImportPath.addActionListener(
+ new BrowseActionListener(path,
+ BrowseActionListener.BrowseType.OPEN_LDIF_FILE, this));
+ gbc.gridx = 2;
+ gbc.weightx = 0.0;
+ panel.add(browseImportPath, gbc);
+
+ return panel;
+ }
+
+ private JPanel createNumberOfUsersPanel()
+ {
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.weightx = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ lNumberOfEntries = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NUMBER_OF_USER_ENTRIES_LABEL.get());
+ panel.add(lNumberOfEntries, gbc);
+
+ gbc.gridx = 1;
+ gbc.insets.left = 10;
+ numberOfEntries = Utilities.createTextField("2000", 6);
+ panel.add(numberOfEntries, gbc);
+
+ gbc.gridx = 2;
+ gbc.insets.left = 0;
+ gbc.weightx = 1.0;
+ panel.add(Box.createHorizontalGlue(), gbc);
+
+ return panel;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(lBackend);
+ setPrimaryValid(lDirectoryBaseDN);
+ setPrimaryValid(lDirectoryData);
+ setSecondaryValid(lPath);
+ setSecondaryValid(lNumberOfEntries);
+ super.cancelClicked();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkOKButtonEnable()
+ {
+ documentListener.changedUpdate(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ setPrimaryValid(lBackend);
+ setPrimaryValid(lDirectoryBaseDN);
+ setPrimaryValid(lDirectoryData);
+ setSecondaryValid(lPath);
+ setSecondaryValid(lNumberOfEntries);
+ final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+
+ ServerDescriptor desc = getInfo().getServerDescriptor();
+
+ Set<BackendDescriptor> backendObjects = desc.getBackends();
+
+ Object o = backends.getSelectedItem();
+ if (o == null)
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BACKENDS_SELECTED.get());
+ setPrimaryInvalid(lBackend);
+ }
+ else if (o.equals(NEW_BACKEND))
+ {
+ String backendName = newBackend.getText().trim();
+ if (backendName.length() == 0)
+ {
+ errors.add(ERR_NEW_BACKEND_NAME_REQUIRED.get());
+ setPrimaryInvalid(lBackend);
+ }
+ else
+ {
+ // Check that the backend is not already defined.
+ for (BackendDescriptor backend : backendObjects)
+ {
+ if (backendName.equalsIgnoreCase(backend.getBackendID()))
+ {
+ errors.add(ERR_BACKEND_ALREADY_EXISTS.get(backendName));
+ setPrimaryInvalid(lBackend);
+ break;
+ }
+ }
+ }
+ }
+
+ String dn = baseDN.getText();
+ if (dn.trim().length() == 0)
+ {
+ errors.add(ERR_NEW_BASE_DN_VALUE_REQUIRED.get());
+ setPrimaryInvalid(lDirectoryBaseDN);
+ }
+ else
+ {
+ try
+ {
+ DN theDN = DN.decode(dn);
+ // Check that the DN is not defined.
+ boolean baseDNAlreadyDefined = false;
+ for (BackendDescriptor backend : backendObjects)
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ if (baseDN.getDn().equals(theDN))
+ {
+ errors.add(ERR_BASE_DN_ALREADY_EXISTS.get(dn));
+ setPrimaryInvalid(lDirectoryBaseDN);
+ baseDNAlreadyDefined = true;
+ break;
+ }
+ else if (baseDN.getDn().isAncestorOf(theDN))
+ {
+ errors.add(ERR_BASE_DN_ANCESTOR_EXISTS.get(
+ baseDN.getDn().toString()));
+ setPrimaryInvalid(lDirectoryBaseDN);
+ baseDNAlreadyDefined = true;
+ break;
+ }
+ else if (theDN.isAncestorOf(baseDN.getDn()))
+ {
+ errors.add(ERR_BASE_DN_DN_IS_ANCESTOR_OF.get(
+ baseDN.getDn().toString()));
+ setPrimaryInvalid(lDirectoryBaseDN);
+ baseDNAlreadyDefined = true;
+ break;
+ }
+ }
+ if (baseDNAlreadyDefined)
+ {
+ break;
+ }
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ errors.add(INFO_CTRL_PANEL_INVALID_DN_DETAILS.get(dn,
+ oe.getMessageObject().toString()));
+ setPrimaryInvalid(lDirectoryBaseDN);
+ }
+ }
+ // TODO: what happens with sub-suffixes?
+
+ if (importDataFromLDIF.isSelected())
+ {
+ String ldifPath = path.getText();
+ if ((ldifPath == null) || (ldifPath.trim().equals("")))
+ {
+ errors.add(INFO_NO_LDIF_PATH.get());
+ setSecondaryInvalid(lPath);
+ } else if (!Utils.fileExists(ldifPath))
+ {
+ errors.add(INFO_LDIF_FILE_DOES_NOT_EXIST.get());
+ setSecondaryInvalid(lPath);
+ }
+ }
+
+ if (importAutomaticallyGenerated.isSelected())
+ {
+ String nEntries = numberOfEntries.getText();
+ int minValue = 1;
+ int maxValue = 20000;
+ Message errMsg = ERR_NUMBER_OF_ENTRIES_INVALID.get(minValue, maxValue);
+ checkIntValue(errors, nEntries, minValue, maxValue, errMsg);
+ }
+
+ if (errors.isEmpty())
+ {
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this), getTitle(), getInfo());
+ NewBaseDNTask newTask = new NewBaseDNTask(getInfo(), progressDialog);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_CREATING_BASE_DN_SUMMARY.get(dn),
+ INFO_CTRL_PANEL_CREATING_BASE_DN_COMPLETE.get(),
+ INFO_CTRL_PANEL_CREATING_BASE_DN_SUCCESSFUL.get(dn),
+ ERR_CTRL_PANEL_CREATING_BASE_DN_ERROR_SUMMARY.get(dn),
+ null,
+ ERR_CTRL_PANEL_CREATING_BASE_DN_ERROR_DETAILS,
+ progressDialog);
+ progressDialog.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ private String getBackendName()
+ {
+ Object backendName = backends.getSelectedItem();
+ if (NEW_BACKEND.equals(backendName))
+ {
+ return newBackend.getText().trim();
+ }
+ else if (backendName != null)
+ {
+ return backendName.toString();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ private boolean isNewBackend()
+ {
+ return NEW_BACKEND.equals(backends.getSelectedItem());
+ }
+
+ /**
+ * The task in charge of creating the base DN (and if required, the backend).
+ *
+ */
+ protected class NewBaseDNTask extends Task
+ {
+ Set<String> backendSet;
+ private String newBaseDN;
+ private int progressAfterConfigurationUpdate = -1;
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public NewBaseDNTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ backendSet.add(getBackendName());
+ newBaseDN = baseDN.getText();
+
+ if (onlyCreateBaseEntry.isSelected())
+ {
+ progressAfterConfigurationUpdate = 40;
+ }
+ else if (leaveDatabaseEmpty.isSelected())
+ {
+ progressAfterConfigurationUpdate = 90;
+ }
+ else if (importAutomaticallyGenerated.isSelected())
+ {
+ int nEntries = Integer.parseInt(numberOfEntries.getText().trim());
+ if (nEntries < 500)
+ {
+ progressAfterConfigurationUpdate = 30;
+ }
+ else if (nEntries < 3000)
+ {
+ progressAfterConfigurationUpdate = 15;
+ }
+ else
+ {
+ progressAfterConfigurationUpdate = 5;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.NEW_BASEDN;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_NEW_BASE_DN_TASK_DESCRIPTION.get(newBaseDN,
+ backendSet.iterator().next());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * Returns the equivalent command-line to generate the data.
+ * @return the equivalent command-line to generate the data.
+ */
+ private String getDataCommandLineToDisplay()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getDataCommandLineName());
+ Collection<String> args = getObfuscatedCommandLineArguments(
+ getDataCommandLineArguments(path.getText(), false));
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Returns the path of the command-line to be used to generate the data.
+ * @return the path of the command-line to be used to generate the data.
+ */
+ private String getDataCommandLineName()
+ {
+ String cmdLineName;
+ if (!leaveDatabaseEmpty.isSelected())
+ {
+ cmdLineName = getCommandLinePath("import-ldif");
+ }
+ else
+ {
+ cmdLineName = null;
+ }
+ return cmdLineName;
+ }
+
+ /**
+ * Returns the arguments of the command-line that can be used to generate
+ * the data.
+ * @param ldifFile the LDIF file.
+ * @param useTemplate whether to use a template or not.
+ * @return the arguments of the command-line that can be used to generate
+ * the data.
+ */
+ private ArrayList<String> getDataCommandLineArguments(String ldifFile,
+ boolean useTemplate)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ if (!leaveDatabaseEmpty.isSelected())
+ {
+ if (!useTemplate)
+ {
+ args.add("--ldifFile");
+ args.add(ldifFile);
+ }
+ else
+ {
+ args.add("--templateFile");
+ args.add(ldifFile);
+ args.add("--randomSeed");
+ args.add("0");
+ }
+ args.add("--backendID");
+ args.add(getBackendName());
+ args.add("--append");
+
+ args.addAll(getConnectionCommandLineArguments());
+
+ if (isServerRunning())
+ {
+ args.addAll(getConfigCommandLineArguments());
+ }
+ }
+ return args;
+ }
+
+ private void updateConfiguration() throws OpenDsException
+ {
+ boolean configHandlerUpdated = false;
+ try
+ {
+ if (!isServerRunning())
+ {
+ configHandlerUpdated = true;
+ getInfo().stopPooling();
+ if (getInfo().mustDeregisterConfig())
+ {
+ DirectoryServer.deregisterBaseDN(DN.decode("cn=config"));
+ }
+ DirectoryServer.getInstance().initializeConfiguration(
+ org.opends.server.extensions.ConfigFileHandler.class.getName(),
+ ConfigReader.configFile);
+ getInfo().setMustDeregisterConfig(true);
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLineFullPath());
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(
+ getDSConfigCommandLineArguments());
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_BASE_DN.get()+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ if (isNewBackend())
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ Message msg = INFO_CTRL_PANEL_CREATING_BACKEND_PROGRESS.get(
+ getBackendName(), newBaseDN);
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(msg,
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ if (isServerRunning())
+ {
+ createBackend(getInfo().getDirContext(), getBackendName(),
+ newBaseDN);
+ }
+ else
+ {
+ createBackend(getBackendName(), newBaseDN);
+ createAdditionalIndexes(getBackendName());
+ }
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ Message msg = INFO_CTRL_PANEL_CREATING_BASE_DN_PROGRESS.get(
+ newBaseDN, getBackendName());
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(msg,
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ if (isServerRunning())
+ {
+ addBaseDN(getInfo().getDirContext(), getBackendName(), newBaseDN);
+ }
+ else
+ {
+ addBaseDN(getBackendName(), newBaseDN);
+ }
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont)+
+ "<br><br>");
+ }
+ });
+
+ if (isNewBackend() && isServerRunning())
+ {
+ // Create additional indexes and display the equivalent command.
+ // Everything is done in the method createAdditionalIndexes
+ createAdditionalIndexes(getInfo().getDirContext(), getBackendName());
+ }
+
+ if (progressAfterConfigurationUpdate > 0)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().getProgressBar().setIndeterminate(false);
+ getProgressDialog().getProgressBar().setValue(
+ progressAfterConfigurationUpdate);
+ }
+ });
+ }
+ }
+ finally
+ {
+ if (configHandlerUpdated)
+ {
+ DirectoryServer.getInstance().initializeConfiguration(
+ ConfigReader.configClassName, ConfigReader.configFile);
+ getInfo().startPooling(ControlPanelInfo.DEFAULT_POOLING);
+ }
+ }
+ }
+
+ /**
+ * Creates the data in the new base DN.
+ * @throws OpenDsException if there is an error importing contents.
+ * @throws IOException if there is an err
+ */
+ private void updateData() throws OpenDsException, IOException
+ {
+ final boolean leaveEmpty = leaveDatabaseEmpty.isSelected();
+ final boolean createBaseEntry = onlyCreateBaseEntry.isSelected();
+ final boolean importLDIF = importDataFromLDIF.isSelected();
+ final boolean generateData = !leaveEmpty && !createBaseEntry &&
+ !importLDIF;
+ final String nEntries = numberOfEntries.getText();
+ final String ldif = path.getText();
+ if (leaveEmpty)
+ {
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ else
+ {
+ final ProgressDialog progressDialog = getProgressDialog();
+ String ldifFile;
+ if (importLDIF)
+ {
+ ldifFile = ldif;
+ final String cmdLine = getDataCommandLineToDisplay();
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ progressDialog.appendProgressHtml(Utilities.applyFont(
+ "Equivalent command line:<br><b>"+cmdLine+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ else if (createBaseEntry)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ progressDialog.appendProgressHtml(Utilities.getProgressWithPoints(
+ INFO_PROGRESS_CREATING_BASE_ENTRY.get(newBaseDN),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ InstallerHelper helper = new InstallerHelper();
+ File f = helper.createBaseEntryTempFile(newBaseDN);
+ ldifFile = f.getAbsolutePath();
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ progressDialog.appendProgressHtml(Utilities.applyFont(
+ INFO_PROGRESS_IMPORT_AUTOMATICALLY_GENERATED.get(nEntries).
+ toString(), ColorAndFontConstants.progressFont)+"<br>");
+ }
+ });
+ File f = SetupUtils.createTemplateFile(newBaseDN,
+ Integer.parseInt(nEntries));
+ ldifFile = f.getAbsolutePath();
+ }
+ ArrayList<String> arguments = getDataCommandLineArguments(ldifFile,
+ generateData);
+
+ String[] args = new String[arguments.size()];
+
+ arguments.toArray(args);
+ if (createBaseEntry)
+ {
+ outPrintStream.setNotifyListeners(false);
+ errorPrintStream.setNotifyListeners(false);
+ }
+ try
+ {
+ if (isServerRunning())
+ {
+ returnCode = ImportLDIF.mainImportLDIF(args, false, outPrintStream,
+ errorPrintStream);
+ }
+ else
+ {
+ returnCode = executeCommandLine(getDataCommandLineName(), args);
+ }
+ }
+ finally
+ {
+ if (createBaseEntry)
+ {
+ outPrintStream.setNotifyListeners(true);
+ errorPrintStream.setNotifyListeners(true);
+ }
+ }
+
+ if (returnCode != 0)
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ if (createBaseEntry)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ progressDialog.appendProgressHtml(
+ Utilities.getProgressDone(
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ }
+
+ private void createBackend(InitialLdapContext ctx, String backendName,
+ String baseDN) throws OpenDsException
+ {
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ LocalDBBackendCfgDefn provider = LocalDBBackendCfgDefn.getInstance();
+ LocalDBBackendCfgClient backend = root.createBackend(provider,
+ backendName, null);
+ backend.setEnabled(true);
+ Set<DN> baseDNs = new HashSet<DN>();
+ baseDNs.add(DN.decode(baseDN));
+ backend.setBaseDN(baseDNs);
+ backend.setBackendId(backendName);
+ backend.setWritabilityMode(BackendCfgDefn.WritabilityMode.ENABLED);
+ backend.commit();
+ }
+
+ private String getBackendLdif(String backendName)
+ {
+ String dn = Utilities.getRDNString("ds-cfg-backend-id", backendName)+
+ ",cn=Backends,cn=config";
+ String ldif = Utilities.makeLdif(
+ "dn: "+dn,
+ "objectClass: top",
+ "objectClass: ds-cfg-backend",
+ "objectClass: ds-cfg-local-db-backend",
+ "ds-cfg-base-dn: "+newBaseDN,
+ "ds-cfg-enabled: true",
+ "ds-cfg-writability-mode: enabled",
+ "ds-cfg-java-class: " +
+ org.opends.server.backends.jeb.BackendImpl.class.getName(),
+ "ds-cfg-backend-id: " + backendName,
+ "ds-cfg-db-directory: db",
+ "",
+ "dn: cn=Index,"+dn,
+ "objectClass: top",
+ "objectClass: ds-cfg-branch",
+ "cn: Index",
+ "",
+ "dn: ds-cfg-attribute=aci,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: aci",
+ "ds-cfg-index-type: presence",
+ "",
+ "dn: ds-cfg-attribute=ds-sync-hist,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: ds-sync-hist",
+ "ds-cfg-index-type: ordering",
+ "",
+ "dn: ds-cfg-attribute=entryUUID,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: entryUUID",
+ "ds-cfg-index-type: equality",
+ "",
+ "dn: ds-cfg-attribute=objectClass,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: objectClass",
+ "ds-cfg-index-type: equality"
+ );
+ return ldif;
+ }
+
+ private String getAdditionalIndexLdif(String backendName)
+ {
+ String dn = "ds-cfg-backend-id="+backendName+",cn=Backends,cn=config";
+ String ldif = Utilities.makeLdif(
+ "dn: ds-cfg-attribute=cn,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: cn",
+ "ds-cfg-index-type: equality",
+ "ds-cfg-index-type: substring",
+ "",
+ "dn: ds-cfg-attribute=givenName,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: givenName",
+ "ds-cfg-index-type: equality",
+ "ds-cfg-index-type: substring",
+ "",
+ "dn: ds-cfg-attribute=mail,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: mail",
+ "ds-cfg-index-type: equality",
+ "ds-cfg-index-type: substring",
+ "",
+ "dn: ds-cfg-attribute=member,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: member",
+ "ds-cfg-index-type: equality",
+ "",
+ "dn: ds-cfg-attribute=sn,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: sn",
+ "ds-cfg-index-type: equality",
+ "ds-cfg-index-type: substring",
+ "",
+ "dn: ds-cfg-attribute=telephoneNumber,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: telephoneNumber",
+ "ds-cfg-index-type: equality",
+ "ds-cfg-index-type: substring",
+ "",
+ "dn: ds-cfg-attribute=uid,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: uid",
+ "ds-cfg-index-type: equality",
+ "",
+ "dn: ds-cfg-attribute=uniqueMember,cn=Index,"+dn,
+ "objectClass: ds-cfg-local-db-index",
+ "objectClass: top",
+ "ds-cfg-attribute: uniqueMember",
+ "ds-cfg-index-type: equality"
+ );
+ return ldif;
+ }
+
+ private void createBackend(String backendName, String baseDN)
+ throws OpenDsException
+ {
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ String ldif = getBackendLdif(backendName);
+
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ Entry backendConfigEntry;
+ while ((backendConfigEntry = reader.readEntry()) != null)
+ {
+ DirectoryServer.getConfigHandler().addEntry(backendConfigEntry, null);
+ }
+ DirectoryServer.getConfigHandler().writeUpdatedConfig();
+ }
+ catch (IOException ioe)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
+ ioe);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ }
+
+ private void createAdditionalIndexes(String backendName)
+ throws OpenDsException
+ {
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ String ldif = getAdditionalIndexLdif(backendName);
+
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ Entry indexEntry;
+ while ((indexEntry = reader.readEntry()) != null)
+ {
+ DirectoryServer.getConfigHandler().addEntry(indexEntry, null);
+ }
+ DirectoryServer.getConfigHandler().writeUpdatedConfig();
+ }
+ catch (IOException ioe)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
+ ioe);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ }
+
+ private void createAdditionalIndexes(InitialLdapContext ctx,
+ String backendName) throws OpenDsException
+ {
+ ArrayList<ArrayList<String>> argsArray =
+ new ArrayList<ArrayList<String>>();
+ ArrayList<String> dns = new ArrayList<String>();
+ ArrayList<Attributes> attributes = new ArrayList<Attributes>();
+
+ // Instead of adding indexes using management framework, use this approach
+ // so that we have to define the additional indexes only in the method
+ // getBackendLdif.
+ String ldif = getAdditionalIndexLdif(backendName);
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ Entry indexEntry;
+ while ((indexEntry = reader.readEntry()) != null)
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("create-local-db-index");
+ args.add("--backend-name");
+ args.add(backendName);
+ args.add("--type");
+ args.add("generic");
+
+ argsArray.add(args);
+ Attributes attrs = new BasicAttributes();
+
+ BasicAttribute oc = new BasicAttribute("objectClass");
+ Iterator<AttributeValue> it =
+ indexEntry.getObjectClassAttribute().iterator();
+
+ while (it.hasNext())
+ {
+ oc.add(it.next().getStringValue());
+ }
+ attrs.put(oc);
+
+ List<org.opends.server.types.Attribute> odsAttrs =
+ indexEntry.getAttributes();
+ for (org.opends.server.types.Attribute odsAttr : odsAttrs)
+ {
+ String attrName = odsAttr.getName();
+ BasicAttribute attr = new BasicAttribute(attrName);
+ it = odsAttr.iterator();
+ while (it.hasNext())
+ {
+ attr.add(it.next().getStringValue());
+ }
+ attrs.put(attr);
+
+ if (attrName.equalsIgnoreCase("ds-cfg-attribute"))
+ {
+ args.add("--index-name");
+ AttributeValue value =
+ odsAttr.iterator().next();
+ args.add(value.getStringValue());
+ }
+ else if (attrName.equalsIgnoreCase("ds-cfg-index-type"))
+ {
+ it = odsAttr.iterator();
+ while (it.hasNext())
+ {
+ args.add("--set");
+ args.add("index-type:"+it.next().getStringValue());
+ }
+ }
+ }
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+
+ dns.add(indexEntry.getDN().toString());
+ attributes.add(attrs);
+ }
+
+ StringBuilder sb = new StringBuilder();
+ for (List<String> args : argsArray)
+ {
+ sb.append(getCommandLinePath("dsconfig"));
+ args = getObfuscatedCommandLineArguments(args);
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ sb.append("<br><br>");
+ }
+ final String cmdLines = sb.toString();
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_ADDITIONAL_INDEXES.get()+
+ "<br><br><b>"+cmdLines+"</b>",
+ ColorAndFontConstants.progressFont));
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_CREATING_ADDITIONAL_INDEXES_PROGRESS.get(),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ for (int i=0; i<dns.size(); i++)
+ {
+ ctx.createSubcontext(dns.get(i), attributes.get(i));
+ }
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ catch (Throwable t)
+ {
+ throw new OnlineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(t.toString()), t);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ }
+
+ private void addBaseDN(String backendName, String baseDN)
+ throws OpenDsException
+ {
+ LinkedList<DN> baseDNs = new LinkedList<DN>();
+ for (BackendDescriptor backend :
+ getInfo().getServerDescriptor().getBackends())
+ {
+ if (backend.getBackendID().equalsIgnoreCase(backendName))
+ {
+ for (BaseDNDescriptor b : backend.getBaseDns())
+ {
+ baseDNs.add(b.getDn());
+ }
+ break;
+ }
+ }
+ baseDNs.add(DN.decode(baseDN));
+
+ String dn = Utilities.getRDNString("ds-cfg-backend-id", backendName)+
+ ",cn=Backends,cn=config";
+ ConfigEntry configEntry =
+ DirectoryServer.getConfigHandler().getConfigEntry(DN.decode(dn));
+
+ DNConfigAttribute baseDNAttr =
+ new DNConfigAttribute(
+ ConfigConstants.ATTR_BACKEND_BASE_DN,
+ INFO_CONFIG_BACKEND_ATTR_DESCRIPTION_BASE_DNS.get(),
+ true, true, false, baseDNs);
+ configEntry.putConfigAttribute(baseDNAttr);
+ DirectoryServer.getConfigHandler().writeUpdatedConfig();
+ }
+
+ private void addBaseDN(InitialLdapContext ctx, String backendName,
+ String baseDN) throws OpenDsException
+ {
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ LocalDBBackendCfgClient backend =
+ (LocalDBBackendCfgClient)root.getBackend(backendName);
+
+ Set<DN> baseDNs = backend.getBaseDN();
+ DN dn = DN.decode(baseDN);
+ baseDNs.add(dn);
+ backend.setBaseDN(baseDNs);
+ backend.commit();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ /**
+ * Returns the configuration command-line full path.
+ * @return the configuration command-line full path.
+ */
+ private String getConfigCommandLineFullPath()
+ {
+ if (isServerRunning())
+ {
+ return getCommandLinePath("dsconfig");
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Returns the configuration command-line arguments.
+ * @return the configuration command-line arguments.
+ */
+ private ArrayList<String> getDSConfigCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ if (isServerRunning())
+ {
+ if (isNewBackend())
+ {
+ args.add("create-backend");
+ args.add("--backend-name");
+ args.add(getBackendName());
+ args.add("--set");
+ args.add("base-dn:"+newBaseDN);
+ args.add("--set");
+ args.add("enabled:true");
+ args.add("--type");
+ args.add("local-db");
+ }
+ else
+ {
+ args.add("set-backend-prop");
+ args.add("--backend-name");
+ args.add(getBackendName());
+ args.add("--add");
+ args.add("base-dn:"+newBaseDN);
+ }
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+ }
+ return args;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ updateConfiguration();
+ updateData();
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+ };
+}
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewDomainPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
new file mode 100644
index 0000000..62471db
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
@@ -0,0 +1,125 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.util.ArrayList;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The panel to create a domain.
+ *
+ */
+public class NewDomainPanel extends NewOrganizationPanel
+{
+ private static final long serialVersionUID = -595396547491445219L;
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_NEW_DOMAIN_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Message getProgressDialogTitle()
+ {
+ return INFO_CTRL_NEW_DOMAIN_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkSyntax(ArrayList<Message> errors)
+ {
+ for (JLabel label : labels)
+ {
+ setPrimaryValid(label);
+ }
+
+ JTextField[] requiredFields = {name};
+ Message[] msgs = {ERR_CTRL_PANEL_NAME_OF_DOMAIN_REQUIRED.get()};
+ for (int i=0; i<requiredFields.length; i++)
+ {
+ String v = requiredFields[i].getText().trim();
+ if (v.length() == 0)
+ {
+ errors.add(msgs[i]);
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void updateDNValue()
+ {
+ String value = name.getText().trim();
+ if (value.length() > 0)
+ {
+ String rdn = Utilities.getRDNString("dc", value);
+ dn.setText(rdn+","+parentNode.getDN());
+ }
+ else
+ {
+ dn.setText(","+parentNode.getDN());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getLDIF()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append("dn: "+dn.getText()+"\n");
+ String[] attrNames = {"dc", "description"};
+ JTextField[] textFields = {name, description};
+ sb.append("objectclass: top\n");
+ sb.append("objectclass: domain\n");
+ for (int i=0; i<attrNames.length; i++)
+ {
+ String value = textFields[i].getText().trim();
+ if (value.length() > 0)
+ {
+ sb.append(attrNames[i]+": "+value+"\n");
+ }
+ }
+ return sb.toString();
+ }
+}
+
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
new file mode 100644
index 0000000..932512e
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
@@ -0,0 +1,205 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.util.LDIFException;
+
+/**
+ * The panel used to create a new entry using an LDIF representation.
+ *
+ */
+public class NewEntryFromLDIFPanel extends AbstractNewEntryPanel
+{
+ private static final long serialVersionUID = -3923907357481784964L;
+ private JTextArea ldif;
+ private JButton checkSyntax;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public NewEntryFromLDIFPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return ldif;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setParent(BasicNode parentNode, BrowserController controller)
+ {
+ super.setParent(parentNode, controller);
+ StringBuilder sb = new StringBuilder();
+ final String emptyDn = "dn: ";
+ sb.append(emptyDn);
+ if (parentNode != null)
+ {
+ sb.append(","+parentNode.getDN());
+ }
+ sb.append("\nobjectClass: top");
+ ldif.setText(sb.toString());
+ ldif.setCaretPosition(emptyDn.length());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Message getProgressDialogTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_ENTRY_FROM_LDIF_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_ENTRY_FROM_LDIF_TITLE.get();
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+
+ gbc.gridy = 0;
+ addErrorPane(gbc);
+
+ gbc.gridy ++;
+
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+
+ gbc.gridx = 0;
+ gbc.insets.left = 0;
+ gbc.weightx = 1.0;
+ JLabel label = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_LDIF_SYNTAX_LABEL.get());
+ add(label, gbc);
+ ldif = Utilities.createTextArea(Message.EMPTY, 20, 50);
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ JScrollPane scroll = Utilities.createScrollPane(ldif);
+ gbc.gridy ++;
+ gbc.insets.top = 5;
+ gbc.fill = GridBagConstraints.BOTH;
+ add(scroll, gbc);
+
+ gbc.weighty = 0.0;
+ gbc.weightx = 0.0;
+ checkSyntax = Utilities.createButton(
+ INFO_CTRL_PANEL_CHECK_SYNTAX_BUTTON.get());
+ checkSyntax.setOpaque(false);
+ checkSyntax.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ checkSyntax(errors);
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+ });
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.WEST;
+ add(checkSyntax, gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkSyntax(ArrayList<Message> errors)
+ {
+ try
+ {
+ getEntry();
+ }
+ catch (IOException ioe)
+ {
+ errors.add(ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe.toString()));
+ }
+ catch (LDIFException le)
+ {
+ errors.add(le.getMessageObject());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getLDIF()
+ {
+ return ldif.getText();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
new file mode 100644
index 0000000..a2d3695
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
@@ -0,0 +1,806 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.DropTargetListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
+import org.opends.guitools.controlpanel.ui.nodes.DndBrowserNodes;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.DN;
+import org.opends.server.types.LDAPURL;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * The panel to create a group.
+ *
+ */
+public class NewGroupPanel extends AbstractNewEntryPanel
+{
+ private static final long serialVersionUID = -8173120152617813282L;
+ private JLabel lName = Utilities.createPrimaryLabel();
+ private JLabel lDescription = Utilities.createPrimaryLabel();
+ private JLabel lMembers = Utilities.createPrimaryLabel();
+ private JLabel lDn = Utilities.createPrimaryLabel();
+
+ private JLabel lMemberDNs;
+ private JLabel lLDAPURL;
+ private JLabel lReferenceGroup;
+
+
+ private JLabel[] labels = {lName, lDescription, lMembers, lDn};
+
+ private JTextField name = Utilities.createLongTextField();
+ private JTextField description = Utilities.createLongTextField();
+ private JRadioButton dynamicGroup;
+ private JRadioButton staticGroup;
+ private JRadioButton virtualGroup;
+
+ private JTextArea staticMembers;
+ private JButton addMembers;
+ private JTextField filter = Utilities.createLongTextField();
+ private JTextField referenceGroup = Utilities.createLongTextField();
+ private JButton browseReferenceGroup;
+
+ private GenericDialog membersDlg;
+ private LDAPEntrySelectionPanel membersPanel;
+
+ private GenericDialog referenceGroupDlg;
+ private LDAPEntrySelectionPanel referenceGroupPanel;
+
+ private JLabel dn = Utilities.createDefaultLabel();
+
+
+ /**
+ * An array containing the fields of this panel.
+ */
+ protected final JTextField[] fields = {name, description, filter,
+ referenceGroup};
+
+ /**
+ * Default constructor.
+ *
+ */
+ public NewGroupPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setParent(BasicNode parentNode, BrowserController controller)
+ {
+ super.setParent(parentNode, controller);
+ dn.setText(","+parentNode.getDN());
+ for (JTextField tf : fields)
+ {
+ tf.setText("");
+ }
+ staticMembers.setText("");
+ filter.setText("ldap:///"+parentNode.getDN()+"??sub?(<your filter>)");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_GROUP_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Message getProgressDialogTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_GROUP_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected boolean checkSyntaxBackground()
+ {
+ return staticGroup.isSelected();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkSyntax(ArrayList<Message> errors)
+ {
+ Runnable runnable = new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ for (JLabel label : labels)
+ {
+ setPrimaryValid(label);
+ }
+ setSecondaryValid(lMemberDNs);
+ setSecondaryValid(lLDAPURL);
+ setSecondaryValid(lReferenceGroup);
+ }
+ };
+ if (checkSyntaxBackground())
+ {
+ SwingUtilities.invokeLater(runnable);
+ }
+ else
+ {
+ runnable.run();
+ }
+
+ JTextField[] requiredFields = {name};
+ Message[] msgs = {ERR_CTRL_PANEL_NAME_OF_GROUP_REQUIRED.get()};
+ for (int i=0; i<requiredFields.length; i++)
+ {
+ String v = requiredFields[i].getText().trim();
+ if (v.length() == 0)
+ {
+ errors.add(msgs[i]);
+ }
+ }
+
+ if (staticGroup.isSelected())
+ {
+ String[] members = staticMembers.getText().split("\n");
+ boolean oneMemberDefined = false;
+ boolean errorFound = false;
+ for (String member : members)
+ {
+ member = member.trim();
+ if (member.length() > 0)
+ {
+ try
+ {
+ DN.decode(member);
+ if (!entryExists(member))
+ {
+ errorFound = true;
+ errors.add(ERR_CTRL_PANEL_MEMBER_NOT_FOUND.get(member));
+ }
+ else
+ {
+ oneMemberDefined = true;
+ }
+ }
+ catch (OpenDsException ode)
+ {
+ errorFound = true;
+ errors.add(ERR_CTRL_PANEL_MEMBER_VALUE_NOT_VALID.get(member,
+ ode.getMessageObject().toString()));
+ }
+ }
+ }
+ if (!oneMemberDefined && !errorFound)
+ {
+ errorFound = true;
+ errors.add(ERR_CTRL_PANEL_MEMBER_REQUIRED.get());
+ }
+ if (errorFound)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ setSecondaryInvalid(lMemberDNs);
+ setPrimaryInvalid(lMembers);
+ }
+ });
+ }
+ }
+ else if (dynamicGroup.isSelected())
+ {
+ boolean errorFound = false;
+ String f = filter.getText().trim();
+ if (f.length() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_GROUP_FILTER_REQUIRED.get());
+ errorFound = true;
+ }
+ else
+ {
+ try
+ {
+ LDAPURL.decode(f, true);
+ }
+ catch (OpenDsException ode)
+ {
+ errors.add(ERR_CTRL_PANEL_GROUP_FILTER_NOT_VALID.get(
+ ode.getMessageObject().toString()));
+ }
+ }
+ if (errorFound)
+ {
+ setSecondaryInvalid(lLDAPURL);
+ setPrimaryInvalid(lMembers);
+ }
+ }
+ else
+ {
+ boolean errorFound = false;
+ String ref = referenceGroup.getText().trim();
+ try
+ {
+ DN.decode(ref);
+ if (!entryExists(ref))
+ {
+ errorFound = true;
+ errors.add(ERR_CTRL_PANEL_REFERENCE_GROUP_NOT_FOUND.get());
+ }
+ else if (!hasObjectClass(ref, "groupOfURLs"))
+ {
+ errorFound = true;
+ errors.add(ERR_CTRL_PANEL_REFERENCE_GROUP_NOT_DYNAMIC.get());
+ }
+ }
+ catch (OpenDsException ode)
+ {
+ errorFound = true;
+ errors.add(ERR_CTRL_PANEL_REFERENCE_GROUP_NOT_VALID.get(
+ ode.getMessageObject().toString()));
+ }
+ if (errorFound)
+ {
+ setSecondaryInvalid(lReferenceGroup);
+ setPrimaryInvalid(lMembers);
+ }
+ }
+ }
+
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ Message[] ls = {
+ INFO_CTRL_PANEL_NEW_GROUP_NAME_LABEL.get(),
+ INFO_CTRL_PANEL_NEW_GROUP_DESCRIPTION_LABEL.get(),
+ INFO_CTRL_PANEL_NEW_GROUP_MEMBERS_LABEL.get(),
+ INFO_CTRL_PANEL_NEW_GROUP_ENTRY_DN_LABEL.get()
+ };
+ int i = 0;
+ for (Message l : ls)
+ {
+ labels[i].setText(l.toString());
+ i++;
+ }
+ Utilities.setRequiredIcon(lName);
+ Utilities.setRequiredIcon(lMembers);
+
+ gbc.gridwidth = 2;
+ gbc.gridy = 0;
+ addErrorPane(gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.weighty = 0.0;
+ gbc.gridx = 1;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.fill = GridBagConstraints.NONE;
+ JLabel requiredLabel = createRequiredLabel();
+ gbc.insets.bottom = 10;
+ add(requiredLabel, gbc);
+
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.bottom = 0;
+
+ staticGroup = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_STATIC_GROUP_LABEL.get());
+ dynamicGroup = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_DYNAMIC_GROUP_LABEL.get());
+ virtualGroup = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_VIRTUAL_STATIC_GROUP_LABEL.get());
+ ButtonGroup group = new ButtonGroup();
+ group.add(staticGroup);
+ group.add(dynamicGroup);
+ group.add(virtualGroup);
+ staticGroup.setSelected(true);
+ ActionListener actionListener = new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ checkEnabling();
+ }
+ };
+ staticGroup.addActionListener(actionListener);
+ dynamicGroup.addActionListener(actionListener);
+ virtualGroup.addActionListener(actionListener);
+
+ JLabel[] labels = {lName, lDescription, lMembers};
+ Component[] comps = {name, description, staticGroup};
+ Component[] inlineHelp = {null, null, null};
+
+ for (i=0 ; i< labels.length; i++)
+ {
+ gbc.insets.left = 0;
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ gbc.gridwidth = 1;
+ add(labels[i], gbc);
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ gbc.gridx = 1;
+ add(comps[i], gbc);
+ if (inlineHelp[i] != null)
+ {
+ gbc.insets.top = 3;
+ gbc.gridy ++;
+ add(inlineHelp[i], gbc);
+ }
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ }
+ gbc.insets.top = 5;
+ lMemberDNs = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_GROUP_MEMBER_DNS_LABEL.get());
+ gbc.insets.left = 30;
+ add(lMemberDNs, gbc);
+ staticMembers = Utilities.createTextArea(Message.EMPTY, 8, 40);
+ JScrollPane scroll = Utilities.createScrollPane(staticMembers);
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridy ++;
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ lLDAPURL = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_GROUP_FILTER_LABEL.get());
+ add(p, gbc);
+ GridBagConstraints gbc2 = new GridBagConstraints();
+ gbc2.gridx = 0;
+ gbc2.weightx = 1.0;
+ gbc2.weighty = 1.0;
+ gbc2.fill = GridBagConstraints.BOTH;
+ p.add(scroll, gbc2);
+ gbc2.insets.left = 5;
+ gbc2.weightx = 0.0;
+ gbc2.fill = GridBagConstraints.HORIZONTAL;
+ gbc2.gridx ++;
+ addMembers = Utilities.createButton(
+ INFO_CTRL_PANEL_ADD_MEMBERS_BUTTON.get());
+ gbc2.anchor = GridBagConstraints.NORTH;
+ p.add(addMembers, gbc2);
+
+ addMembers.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ addMembersClicked();
+ }
+ });
+
+ gbc.insets.left = 10;
+ gbc.insets.top = 10;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weighty = 0.0;
+ gbc.gridy ++;
+ add(dynamicGroup, gbc);
+ gbc.insets.top = 5;
+ gbc.weightx = 0.0;
+ gbc.gridy ++;
+ p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ gbc.insets.left = 30;
+ add(p, gbc);
+
+ gbc2 = new GridBagConstraints();
+ gbc2.gridx = 0;
+ gbc2.fill = GridBagConstraints.HORIZONTAL;
+ p.add(lLDAPURL, gbc2);
+ gbc2.insets.left = 5;
+ gbc2.weightx = 1.0;
+ gbc2.gridx ++;
+ p.add(filter, gbc2);
+
+ lReferenceGroup = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_DYNAMIC_GROUP_REFERENCE_LABEL.get());
+ gbc.insets.left = 30;
+ p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ gbc.gridy ++;
+ add(p, gbc);
+
+ gbc.gridy ++;
+ gbc.gridx = 1;
+ gbc.insets.left = 10;
+ gbc.insets.top = 10;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weighty = 0.0;
+ add(virtualGroup, gbc);
+ gbc.insets.top = 5;
+ gbc.weightx = 0.0;
+
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ gbc.insets.left = 0;
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ gbc.gridwidth = 1;
+ add(lDn, gbc);
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ gbc.gridx = 1;
+ add(dn, gbc);
+
+ gbc2 = new GridBagConstraints();
+ gbc2.gridx = 0;
+ gbc2.fill = GridBagConstraints.HORIZONTAL;
+ p.add(lReferenceGroup, gbc2);
+ gbc2.insets.left = 5;
+ gbc2.weightx = 1.0;
+ gbc2.gridx ++;
+ p.add(referenceGroup, gbc2);
+ gbc2.weightx = 0.0;
+ gbc2.gridx ++;
+ browseReferenceGroup =
+ Utilities.createButton(INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ browseReferenceGroup.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ browseReferenceGroupClicked();
+ }
+ });
+ p.add(browseReferenceGroup, gbc2);
+
+
+ DocumentListener listener = new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ updateDNValue();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ insertUpdate(ev);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ insertUpdate(ev);
+ }
+ };
+ JTextField[] toAddListener = {name};
+ for (JTextField tf : toAddListener)
+ {
+ tf.getDocument().addDocumentListener(listener);
+ }
+
+ DropTargetListener dropTargetlistener = new DropTargetListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void dragEnter(DropTargetDragEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dragExit(DropTargetEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dragOver(DropTargetDragEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dropActionChanged(DropTargetDragEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void drop(DropTargetDropEvent e)
+ {
+ try {
+ Transferable tr = e.getTransferable();
+
+ //flavor not supported, reject drop
+ if (!tr.isDataFlavorSupported(DndBrowserNodes.INFO_FLAVOR))
+ {
+ e.rejectDrop();
+ }
+
+ //cast into appropriate data type
+ DndBrowserNodes nodes =
+ (DndBrowserNodes) tr.getTransferData(DndBrowserNodes.INFO_FLAVOR);
+
+ Component comp = e.getDropTargetContext().getComponent();
+ if (comp == staticMembers)
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(staticMembers.getText());
+ for (BrowserNodeInfo node : nodes.getNodes())
+ {
+ if (sb.length() > 0)
+ {
+ sb.append("\n");
+ }
+ sb.append(node.getNode().getDN());
+ }
+ staticMembers.setText(sb.toString());
+ staticMembers.setCaretPosition(sb.length());
+ }
+ else if (comp == referenceGroup)
+ {
+ if (nodes.getNodes().length > 0)
+ {
+ String dn = nodes.getNodes()[0].getNode().getDN();
+ referenceGroup.setText(dn);
+ referenceGroup.setCaretPosition(dn.length());
+ }
+ }
+ e.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
+ e.getDropTargetContext().dropComplete(true);
+ }
+ catch (IOException io)
+ {
+ e.rejectDrop();
+ }
+ catch (UnsupportedFlavorException ufe)
+ {
+ e.rejectDrop();
+ }
+ }
+ };
+ new DropTarget(staticMembers, dropTargetlistener);
+ new DropTarget(referenceGroup, dropTargetlistener);
+
+ checkEnabling();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void updateDNValue()
+ {
+ String value = name.getText().trim();
+ if (value.length() > 0)
+ {
+ String rdn = Utilities.getRDNString("cn", value);
+ dn.setText(rdn+","+parentNode.getDN());
+ }
+ else
+ {
+ dn.setText(","+parentNode.getDN());
+ }
+ }
+
+ private void addMembersClicked()
+ {
+ if (membersDlg == null)
+ {
+ membersPanel = new LDAPEntrySelectionPanel();
+ membersPanel.setTitle(INFO_CTRL_PANEL_ADD_MEMBERS_LABEL.get());
+ membersPanel.setFilter(LDAPEntrySelectionPanel.Filter.USERS);
+ membersPanel.setMultipleSelection(true);
+ membersPanel.setInfo(getInfo());
+ membersDlg = new GenericDialog(Utilities.getFrame(this), membersPanel);
+ Utilities.centerGoldenMean(membersDlg,
+ Utilities.getParentDialog(this));
+ membersDlg.setModal(true);
+ }
+ membersDlg.setVisible(true);
+ String[] dns = membersPanel.getDNs();
+ if (dns.length > 0)
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(staticMembers.getText());
+ for (String dn : dns)
+ {
+ if (sb.length() > 0)
+ {
+ sb.append("\n");
+ }
+ sb.append(dn);
+ }
+ staticMembers.setText(sb.toString());
+ staticMembers.setCaretPosition(sb.length());
+ }
+ }
+
+ private void browseReferenceGroupClicked()
+ {
+ if (referenceGroupDlg == null)
+ {
+ referenceGroupPanel = new LDAPEntrySelectionPanel();
+ referenceGroupPanel.setTitle(
+ INFO_CTRL_PANEL_CHOOSE_REFERENCE_GROUP.get());
+ referenceGroupPanel.setFilter(
+ LDAPEntrySelectionPanel.Filter.DYNAMIC_GROUPS);
+ referenceGroupPanel.setMultipleSelection(false);
+ referenceGroupPanel.setInfo(getInfo());
+ referenceGroupDlg = new GenericDialog(Utilities.getFrame(this),
+ referenceGroupPanel);
+ Utilities.centerGoldenMean(referenceGroupDlg,
+ Utilities.getParentDialog(this));
+ referenceGroupDlg.setModal(true);
+ }
+ referenceGroupDlg.setVisible(true);
+ String[] dns = referenceGroupPanel.getDNs();
+ if (dns.length > 0)
+ {
+ referenceGroup.setText(dns[0]);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getLDIF()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append("dn: "+dn.getText()+"\n");
+
+ String[] attrNames = {"cn", "description"};
+ JTextField[] textFields = {name, description};
+ for (int i=0; i<attrNames.length; i++)
+ {
+ String value = textFields[i].getText().trim();
+ if (value.length() > 0)
+ {
+ sb.append(attrNames[i]+": "+value+"\n");
+ }
+ }
+
+ sb.append("objectclass: top\n");
+ if (staticGroup.isSelected())
+ {
+ sb.append("objectClass: "+ServerConstants.OC_GROUP_OF_UNIQUE_NAMES);
+ String[] members = staticMembers.getText().split("\n");
+ LinkedHashSet<DN> dns = new LinkedHashSet<DN>();
+ for (String member : members)
+ {
+ member = member.trim();
+ if (member.length() > 0)
+ {
+ try
+ {
+ dns.add(DN.decode(member));
+ }
+ catch (OpenDsException ode)
+ {
+ throw new IllegalStateException("Unexpected error decoding DN: "+
+ member, ode);
+ }
+ }
+ }
+
+ for (DN dn : dns)
+ {
+ sb.append("\n"+ServerConstants.ATTR_UNIQUE_MEMBER+": "+dn.toString());
+ }
+ }
+ else if (dynamicGroup.isSelected())
+ {
+ sb.append("objectClass: "+ServerConstants.OC_GROUP_OF_URLS+"\n");
+ sb.append(ServerConstants.ATTR_MEMBER_URL+": "+filter.getText().trim());
+ }
+ else
+ {
+ sb.append("objectClass: ds-virtual-static-group\n");
+ sb.append("objectClass: "+ServerConstants.OC_GROUP_OF_URLS+"\n");
+ sb.append("ds-target-group-dn: "+referenceGroup.getText().trim());
+ }
+
+ return sb.toString();
+ }
+
+ private void checkEnabling()
+ {
+ staticMembers.setEnabled(staticGroup.isSelected());
+ addMembers.setEnabled(staticGroup.isSelected());
+ filter.setEnabled(dynamicGroup.isSelected());
+ referenceGroup.setEnabled(virtualGroup.isSelected());
+ browseReferenceGroup.setEnabled(virtualGroup.isSelected());
+
+ lMemberDNs.setEnabled(staticGroup.isSelected());
+ lLDAPURL.setEnabled(dynamicGroup.isSelected());
+ lReferenceGroup.setEnabled(virtualGroup.isSelected());
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
new file mode 100644
index 0000000..091d09f
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
@@ -0,0 +1,770 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JCheckBox;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.CategorizedComboBoxElement;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.guitools.controlpanel.task.OnlineUpdateException;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.ConfigReader;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.Schema;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.ServerConstants;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * Panel that appears when the user defines a new index.
+ *
+ */
+public class NewIndexPanel extends AbstractIndexPanel
+{
+ private static final long serialVersionUID = -3516011638125862137L;
+
+ private String backendName;
+
+ private Component relativeComponent;
+
+ private Schema schema;
+
+ private IndexDescriptor newIndex;
+
+ /**
+ * Constructor of the panel.
+ * @param backendName the backend where the index will be created.
+ * @param relativeComponent the component relative to which the dialog
+ * containing this panel will be centered.
+ */
+ public NewIndexPanel(String backendName, Component relativeComponent)
+ {
+ super();
+ this.backendName = backendName;
+ this.relativeComponent = relativeComponent;
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_INDEX_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return attributes;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ final ServerDescriptor desc = ev.getNewDescriptor();
+
+ Schema s = desc.getSchema();
+ final boolean[] repack = {false};
+ final boolean[] error = {false};
+ if (s != null)
+ {
+ schema = s;
+ repack[0] = attributes.getItemCount() == 0;
+ LinkedHashSet<CategorizedComboBoxElement> newElements =
+ new LinkedHashSet<CategorizedComboBoxElement>();
+
+// Check that the index does not exist
+ BackendDescriptor backend = null;
+ for (BackendDescriptor b : getInfo().getServerDescriptor().getBackends())
+ {
+ if (b.getBackendID().equalsIgnoreCase(backendName))
+ {
+ backend = b;
+ break;
+ }
+ }
+
+ TreeSet<String> standardAttrNames = new TreeSet<String>();
+ TreeSet<String> configurationAttrNames = new TreeSet<String>();
+ TreeSet<String> customAttrNames = new TreeSet<String>();
+ for (AttributeType attr : schema.getAttributeTypes().values())
+ {
+ String name = attr.getPrimaryName();
+ boolean defined = false;
+ if (backend != null)
+ {
+ for (IndexDescriptor index : backend.getIndexes())
+ {
+ if (index.getName().equalsIgnoreCase(name))
+ {
+ defined = true;
+ break;
+ }
+ }
+ }
+ if (!defined)
+ {
+ if (Utilities.isStandard(attr))
+ {
+ standardAttrNames.add(name);
+ }
+ else if (Utilities.isConfiguration(attr))
+ {
+ configurationAttrNames.add(name);
+ }
+ else
+ {
+ customAttrNames.add(name);
+ }
+ }
+ }
+ if (customAttrNames.size() > 0)
+ {
+ newElements.add(new CategorizedComboBoxElement(
+ CUSTOM_ATTRIBUTES,
+ CategorizedComboBoxElement.Type.CATEGORY));
+ for (String attrName : customAttrNames)
+ {
+ newElements.add(new CategorizedComboBoxElement(
+ attrName,
+ CategorizedComboBoxElement.Type.REGULAR));
+ }
+ }
+ if (standardAttrNames.size() > 0)
+ {
+ newElements.add(new CategorizedComboBoxElement(
+ STANDARD_ATTRIBUTES,
+ CategorizedComboBoxElement.Type.CATEGORY));
+ for (String attrName : standardAttrNames)
+ {
+ newElements.add(new CategorizedComboBoxElement(
+ attrName,
+ CategorizedComboBoxElement.Type.REGULAR));
+ }
+ }
+ // Ignore configuration attr names
+ /*
+ if (configurationAttrNames.size() > 0)
+ {
+ newElements.add(new CategorizedComboBoxDescriptor(
+ "Configuration Attributes",
+ CategorizedComboBoxDescriptor.Type.CATEGORY));
+ for (String attrName : configurationAttrNames)
+ {
+ newElements.add(new CategorizedComboBoxDescriptor(
+ attrName,
+ CategorizedComboBoxDescriptor.Type.REGULAR));
+ }
+ }
+ */
+ DefaultComboBoxModel model =
+ (DefaultComboBoxModel)attributes.getModel();
+ updateComboBoxModel(newElements, model);
+ }
+ else
+ {
+ updateErrorPane(errorPane,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_SUMMARY.get(),
+ ColorAndFontConstants.errorTitleFont,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_DETAILS.get(),
+ ColorAndFontConstants.defaultFont);
+ repack[0] = true;
+ error[0] = true;
+ }
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ setEnabledOK(!error[0]);
+ errorPane.setVisible(error[0]);
+ if (repack[0])
+ {
+ packParentDialog();
+ if (relativeComponent != null)
+ {
+ Utilities.centerGoldenMean(
+ Utilities.getParentDialog(NewIndexPanel.this),
+ relativeComponent);
+ }
+ }
+ }
+ });
+ if (!error[0])
+ {
+ updateErrorPaneAndOKButtonIfAuthRequired(desc,
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_NEW_INDEX.get());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ setPrimaryValid(lAttribute);
+ setPrimaryValid(lEntryLimit);
+ setPrimaryValid(lType);
+ ArrayList<Message> errors = new ArrayList<Message>();
+ String attrName = getAttributeName();
+ if (attrName == null)
+ {
+ errors.add(ERR_INFO_CTRL_ATTRIBUTE_NAME_REQUIRED.get());
+ setPrimaryInvalid(lAttribute);
+ }
+
+ String v = entryLimit.getText();
+ try
+ {
+ int n = Integer.parseInt(v);
+ if ((n < MIN_ENTRY_LIMIT) || (n > MAX_ENTRY_LIMIT))
+ {
+ errors.add(ERR_INFO_CTRL_PANEL_ENTRY_LIMIT_NOT_VALID.get(
+ MIN_ENTRY_LIMIT, MAX_ENTRY_LIMIT));
+ setPrimaryInvalid(lEntryLimit);
+ }
+ }
+ catch (Throwable t)
+ {
+ errors.add(ERR_INFO_CTRL_PANEL_ENTRY_LIMIT_NOT_VALID.get(
+ MIN_ENTRY_LIMIT, MAX_ENTRY_LIMIT));
+ setPrimaryInvalid(lEntryLimit);
+ }
+
+ boolean somethingSelected = false;
+ for (JCheckBox type : types)
+ {
+ somethingSelected = type.isSelected() && type.isVisible();
+ if (somethingSelected)
+ {
+ break;
+ }
+ }
+ if (!somethingSelected)
+ {
+ errors.add(ERR_INFO_ONE_INDEX_TYPE_MUST_BE_SELECTED.get());
+ setPrimaryInvalid(lType);
+ }
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_NEW_INDEX_TITLE.get(), getInfo());
+ NewIndexTask newTask = new NewIndexTask(getInfo(), dlg);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.size() == 0)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_CREATING_NEW_INDEX_SUMMARY.get(attrName),
+ INFO_CTRL_PANEL_CREATING_NEW_INDEX_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_CREATING_NEW_INDEX_SUCCESSFUL_DETAILS.get(attrName),
+ ERR_CTRL_PANEL_CREATING_NEW_INDEX_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_CREATING_NEW_INDEX_ERROR_DETAILS.get(),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+
+ private String getAttributeName()
+ {
+ String attrName;
+ CategorizedComboBoxElement o =
+ (CategorizedComboBoxElement)attributes.getSelectedItem();
+ if (o != null)
+ {
+ attrName = o.getValue().toString();
+ }
+ else
+ {
+ attrName = null;
+ }
+ return attrName;
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+
+ createBasicLayout(this, gbc, false);
+
+ attributes.addItemListener(new ItemListener()
+ {
+ public void itemStateChanged(ItemEvent ev)
+ {
+ String n = getAttributeName();
+ AttributeType attr = null;
+ if (n != null)
+ {
+ attr = schema.getAttributeType(n.toLowerCase());
+ }
+ repopulateTypesPanel(attr);
+ }
+ });
+ entryLimit.setText(String.valueOf(DEFAULT_ENTRY_LIMIT));
+ }
+
+ /**
+ * The task in charge of creating the index.
+ *
+ */
+ protected class NewIndexTask extends Task
+ {
+ private Set<String> backendSet;
+ private String attributeName;
+ private int entryLimitValue;
+ private SortedSet<IndexType> indexTypes;
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public NewIndexTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ backendSet.add(backendName);
+ attributeName = getAttributeName();
+ entryLimitValue = Integer.parseInt(entryLimit.getText());
+ indexTypes = getTypes();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.NEW_INDEX;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_NEW_INDEX_TASK_DESCRIPTION.get(
+ attributeName, backendName);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ private void updateConfiguration() throws OpenDsException
+ {
+ boolean configHandlerUpdated = false;
+ try
+ {
+ if (!isServerRunning())
+ {
+ configHandlerUpdated = true;
+ getInfo().stopPooling();
+ if (getInfo().mustDeregisterConfig())
+ {
+ DirectoryServer.deregisterBaseDN(DN.decode("cn=config"));
+ }
+ DirectoryServer.getInstance().initializeConfiguration(
+ org.opends.server.extensions.ConfigFileHandler.class.getName(),
+ ConfigReader.configFile);
+ getInfo().setMustDeregisterConfig(true);
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLineName());
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(
+ getDSConfigCommandLineArguments());
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_INDEX.get()+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_CREATING_NEW_INDEX_PROGRESS.get(
+ attributeName),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ if (isServerRunning())
+ {
+ // Create additional indexes and display the equivalent command.
+ // Everything is done in the method createAdditionalIndexes
+ createIndex(getInfo().getDirContext());
+ }
+ else
+ {
+ createIndex();
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ finally
+ {
+ if (configHandlerUpdated)
+ {
+ DirectoryServer.getInstance().initializeConfiguration(
+ ConfigReader.configClassName, ConfigReader.configFile);
+ getInfo().startPooling(ControlPanelInfo.DEFAULT_POOLING);
+ }
+ }
+ }
+
+ /**
+ * Returns the LDIF representation of the index to be created.
+ * @return the LDIF representation of the index to be created.
+ */
+ private String getIndexLDIF()
+ {
+ String dn = Utilities.getRDNString(
+ "ds-cfg-backend-id", backendName)+",cn=Backends,cn=config";
+ ArrayList<String> lines = new ArrayList<String>();
+ lines.add("dn: "+Utilities.getRDNString("ds-cfg-attribute",
+ attributeName)+
+ ",cn=Index,"+dn);
+ lines.add("objectClass: ds-cfg-local-db-index");
+ lines.add("objectClass: top");
+ lines.add("ds-cfg-attribute: "+attributeName);
+ lines.add("ds-cfg-index-entry-limit: "+entryLimitValue);
+ for (IndexType type : indexTypes)
+ {
+ lines.add("ds-cfg-index-type: "+type.toString());
+ }
+ StringBuilder sb = new StringBuilder();
+ for (String line : lines)
+ {
+ sb.append(line+ServerConstants.EOL);
+ }
+ return sb.toString();
+ }
+
+ private void createIndex() throws OpenDsException
+ {
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ String ldif = getIndexLDIF();
+
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ Entry backendConfigEntry;
+ while ((backendConfigEntry = reader.readEntry()) != null)
+ {
+ DirectoryServer.getConfigHandler().addEntry(backendConfigEntry, null);
+ }
+ DirectoryServer.getConfigHandler().writeUpdatedConfig();
+ }
+ catch (IOException ioe)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
+ ioe);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ }
+
+ private void createIndex(InitialLdapContext ctx) throws OpenDsException
+ {
+ // Instead of adding indexes using management framework, use this approach
+ // so that we have to define the additional indexes only in the method
+ // getBackendLdif.
+ String ldif = getIndexLDIF();
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ Entry indexEntry = reader.readEntry();
+ Attributes attrs = new BasicAttributes();
+
+ BasicAttribute oc = new BasicAttribute("objectClass");
+ Iterator<AttributeValue> it =
+ indexEntry.getObjectClassAttribute().iterator();
+ while (it.hasNext())
+ {
+ oc.add(it.next().getStringValue());
+ }
+ attrs.put(oc);
+
+ List<Attribute> odsAttrs = indexEntry.getAttributes();
+ for (Attribute odsAttr : odsAttrs)
+ {
+ String attrName = odsAttr.getName();
+ BasicAttribute attr = new BasicAttribute(attrName);
+ it = odsAttr.iterator();
+ while (it.hasNext())
+ {
+ attr.add(it.next().getStringValue());
+ }
+ attrs.put(attr);
+ }
+
+ final StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLineName());
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(getDSConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+
+ ctx.createSubcontext(indexEntry.getDN().toString(), attrs);
+ }
+ catch (Throwable t)
+ {
+ throw new OnlineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(t.toString()), t);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ private String getConfigCommandLineName()
+ {
+ if (isServerRunning())
+ {
+ return getCommandLinePath("dsconfig");
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ updateConfiguration();
+ for (BackendDescriptor backend :
+ getInfo().getServerDescriptor().getBackends())
+ {
+ if (backend.getBackendID().equalsIgnoreCase(backendName))
+ {
+ newIndex = new IndexDescriptor(attributeName,
+ schema.getAttributeType(attributeName.toLowerCase()), backend,
+ indexTypes, entryLimitValue);
+ getInfo().registerModifiedIndex(newIndex);
+ notifyConfigurationElementCreated(newIndex);
+ break;
+ }
+ }
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void postOperation()
+ {
+ if ((lastException == null) && (state == State.FINISHED_SUCCESSFULLY) &&
+ (newIndex != null))
+ {
+ rebuildIndexIfNecessary(newIndex, getProgressDialog());
+ }
+ }
+
+ private ArrayList<String> getDSConfigCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("create-local-db-index");
+ args.add("--backend-name");
+ args.add(backendName);
+ args.add("--type");
+ args.add("generic");
+
+ args.add("--index-name");
+ args.add(attributeName);
+
+ for (IndexType type : indexTypes)
+ {
+ args.add("--set");
+ args.add("index-type:"+type.toString());
+ }
+ args.add("--set");
+ args.add("index-entry-limit:"+entryLimitValue);
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+ return args;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
new file mode 100644
index 0000000..e7524d4
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
@@ -0,0 +1,1008 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.NamingException;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.ListCellRenderer;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.guitools.controlpanel.task.OnlineUpdateException;
+import org.opends.guitools.controlpanel.task.SchemaTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.components.BasicExpander;
+import org.opends.guitools.controlpanel.ui.components.DoubleAddRemovePanel;
+import
+org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.CommonSchemaElements;
+import org.opends.server.types.Entry;
+import org.opends.server.types.ExistingFileBehavior;
+import org.opends.server.types.LDIFExportConfig;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.Modification;
+import org.opends.server.types.ModificationType;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.ObjectClassType;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.Schema;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.LDIFWriter;
+import org.opends.server.util.ServerConstants;
+import org.opends.server.util.StaticUtils;
+
+/**
+ * The panel displayed when the user wants to define a new object class in the
+ * schema.
+ *
+ */
+public class NewObjectClassPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = -4956885827963184571L;
+ private JLabel lName = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OBJECTCLASS_NAME_LABEL.get());
+ private JLabel lParent = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OBJECTCLASS_PARENT_LABEL.get());
+ private JLabel lOID = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OBJECTCLASS_OID_LABEL.get());
+ private JLabel lAliases = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OBJECTCLASS_ALIASES_LABEL.get());
+ private JLabel lOrigin = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OBJECTCLASS_ORIGIN_LABEL.get());
+ private JLabel lFile = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OBJECTCLASS_FILE_LABEL.get());
+ private JTextField aliases = Utilities.createLongTextField();
+ private JLabel lDescription = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OBJECTCLASS_DESCRIPTION_LABEL.get());
+ private JLabel lType = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OBJECTCLASS_TYPE_LABEL.get());
+ private JLabel lAttributes = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OBJECTCLASS_ATTRIBUTES_LABEL.get());
+
+ private Set<AttributeType> inheritedOptionalAttributes =
+ new HashSet<AttributeType>();
+ private Set<AttributeType> inheritedRequiredAttributes =
+ new HashSet<AttributeType>();
+
+ private JLabel[] labels = {lName, lParent, lOID, lAliases, lOrigin, lFile,
+ lDescription, lType, lAttributes
+ };
+
+ private JTextField name = Utilities.createMediumTextField();
+ private JComboBox parent = Utilities.createComboBox();
+ private JComboBox type = Utilities.createComboBox();
+ private JTextField oid = Utilities.createMediumTextField();
+ private JTextField description = Utilities.createLongTextField();
+ private JTextField origin = Utilities.createLongTextField();
+ private JTextField file = Utilities.createLongTextField();
+ private JCheckBox obsolete = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_OBJECTCLASS_OBSOLETE_LABEL.get());
+ private DoubleAddRemovePanel<AttributeType> attributes;
+
+ private Schema schema;
+
+ private Component relativeComponent;
+
+ /**
+ * Constructor of the new object class panel.
+ * @param relativeComponent the component relative to which the dialog
+ * containing this panel must be centered.
+ */
+ public NewObjectClassPanel(Component relativeComponent)
+ {
+ super();
+ this.relativeComponent = relativeComponent;
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_OBJECTCLASS_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ final ServerDescriptor desc = ev.getNewDescriptor();
+ Schema s = desc.getSchema();
+
+ final boolean firstSchema = schema == null;
+ final boolean[] repack = {firstSchema};
+ final boolean[] error = {false};
+
+ if (s != null)
+ {
+ schema = s;
+
+ HashMap<String, ObjectClass> objectClassNameMap = new HashMap<String,
+ ObjectClass>();
+ for (String key : schema.getObjectClasses().keySet())
+ {
+ ObjectClass oc = schema.getObjectClass(key);
+ objectClassNameMap.put(oc.getNameOrOID(), oc);
+ }
+ SortedSet<String> orderedKeys = new TreeSet<String>();
+ orderedKeys.addAll(objectClassNameMap.keySet());
+ ArrayList<Object> newParents = new ArrayList<Object>();
+ for (String key : orderedKeys)
+ {
+ newParents.add(objectClassNameMap.get(key));
+ }
+ updateComboBoxModel(newParents,
+ ((DefaultComboBoxModel)parent.getModel()));
+ }
+ else
+ {
+ updateErrorPane(errorPane,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_SUMMARY.get(),
+ ColorAndFontConstants.errorTitleFont,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_DETAILS.get(),
+ ColorAndFontConstants.defaultFont);
+ repack[0] = true;
+ error[0] = true;
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ setEnabledOK(!error[0]);
+ errorPane.setVisible(error[0]);
+ if (schema != null)
+ {
+ if (firstSchema)
+ {
+ parent.setSelectedItem(schema.getObjectClass("top"));
+ }
+ updateAttributes();
+ }
+ if (repack[0])
+ {
+ packParentDialog();
+ if (relativeComponent != null)
+ {
+ Utilities.centerGoldenMean(
+ Utilities.getParentDialog(NewObjectClassPanel.this),
+ relativeComponent);
+ }
+ }
+ }
+ });
+ if (!error[0])
+ {
+ updateErrorPaneAndOKButtonIfAuthRequired(desc,
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_TO_CREATE_OBJECTCLASS_SUMMARY.get());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ for (JLabel label : labels)
+ {
+ setPrimaryValid(label);
+ }
+ String n = getObjectClassName();
+ MessageBuilder err = new MessageBuilder();
+ if (n.length() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_OBJECTCLASS_NAME_REQUIRED.get());
+ }
+ else if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
+ {
+ errors.add(ERR_CTRL_PANEL_INVALID_OBJECTCLASS_NAME.get(err.toString()));
+ err = new MessageBuilder();
+ }
+ else
+ {
+ Message elementType = NewAttributePanel.getSchemaElementType(n, schema);
+ if (elementType != null)
+ {
+ errors.add(ERR_CTRL_PANEL_OBJECTCLASS_NAME_ALREADY_IN_USE.get(n,
+ elementType.toString()));
+ }
+ }
+
+ n = oid.getText().trim();
+ if (n.length() > 0)
+ {
+ if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
+ {
+ errors.add(ERR_CTRL_PANEL_OID_NOT_VALID.get(err.toString()));
+ err = new MessageBuilder();
+ }
+ else
+ {
+ Message elementType = NewAttributePanel.getSchemaElementType(n, schema);
+ if (elementType != null)
+ {
+ errors.add(ERR_CTRL_PANEL_OID_ALREADY_IN_USE.get(n,
+ elementType.toString()));
+ }
+ }
+ }
+
+ if (aliases.getText().trim().length() > 0)
+ {
+ String[] al = aliases.getText().split(",");
+ if (al.length > 0)
+ {
+ for (String alias : al)
+ {
+ if (alias.trim().length() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_EMPTY_ALIAS.get());
+ }
+ else
+ {
+ Message elementType = NewAttributePanel.getSchemaElementType(
+ alias, schema);
+ if (elementType != null)
+ {
+ errors.add(ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE.get(n,
+ elementType.toString()));
+ }
+ }
+ }
+ }
+ }
+
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_NEW_OBJECTCLASS_PANEL_TITLE.get(), getInfo());
+ NewObjectClassTask newTask = null;
+ if (errors.size() == 0)
+ {
+ newTask = new NewObjectClassTask(getInfo(), dlg);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ }
+ if (errors.size() == 0)
+ {
+ String ocName = getObjectClassName();
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_CREATING_OBJECTCLASS_SUMMARY.get(ocName),
+ INFO_CTRL_PANEL_CREATING_OBJECTCLASS_COMPLETE.get(),
+ INFO_CTRL_PANEL_CREATING_OBJECTCLASS_SUCCESSFUL.get(ocName),
+ ERR_CTRL_PANEL_CREATING_OBJECTCLASS_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_CREATING_OBJECTCLASS_ERROR_DETAILS.get(ocName),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ private void updateAttributes()
+ {
+ int[][] selected =
+ {
+ attributes.getAvailableList().getSelectedIndices(),
+ attributes.getSelectedList1().getSelectedIndices(),
+ attributes.getSelectedList2().getSelectedIndices()
+ };
+ JList[] lists =
+ {
+ attributes.getAvailableList(),
+ attributes.getSelectedList1(),
+ attributes.getSelectedList2()
+ };
+ attributes.getAvailableListModel().clear();
+ Collection<AttributeType> allAttrs =
+ schema.getAttributeTypes().values();
+ attributes.getAvailableListModel().addAll(allAttrs);
+
+
+ HashSet<AttributeType> toDelete = new HashSet<AttributeType>();
+ for (AttributeType attr : attributes.getSelectedListModel1().getData())
+ {
+ if (!allAttrs.contains(attr))
+ {
+ toDelete.add(attr);
+ }
+ else
+ {
+ attributes.getAvailableListModel().remove(attr);
+ }
+ }
+ for (AttributeType attr : toDelete)
+ {
+ attributes.getSelectedListModel1().remove(attr);
+ }
+
+ toDelete = new HashSet<AttributeType>();
+ for (AttributeType attr : attributes.getSelectedListModel2().getData())
+ {
+ if (!allAttrs.contains(attr))
+ {
+ toDelete.add(attr);
+ }
+ else
+ {
+ attributes.getAvailableListModel().remove(attr);
+ }
+ }
+ for (AttributeType attr : toDelete)
+ {
+ attributes.getSelectedListModel1().remove(attr);
+ }
+
+ int i = 0;
+ for (int[] sel : selected)
+ {
+ if (sel != null)
+ {
+ ArrayList<Integer> indexes = new ArrayList<Integer>();
+ for (int j=0; j<sel.length; j++)
+ {
+ if (sel[j] < lists[i].getModel().getSize())
+ {
+ indexes.add(sel[j]);
+ }
+ }
+ int[] newSelection = new int[indexes.size()];
+ for (int j=0; j<newSelection.length; j++)
+ {
+ newSelection[j] = indexes.get(j);
+ }
+ lists[i].setSelectedIndices(newSelection);
+ }
+ i++;
+ }
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+
+ Utilities.setRequiredIcon(lName);
+
+ gbc.gridwidth = 2;
+ gbc.gridy = 0;
+ addErrorPane(gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.weighty = 0.0;
+ gbc.gridx = 1;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.fill = GridBagConstraints.NONE;
+ JLabel requiredLabel = createRequiredLabel();
+ gbc.insets.bottom = 10;
+ add(requiredLabel, gbc);
+
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.bottom = 0;
+
+ SchemaElementComboBoxCellRenderer renderer = new
+ SchemaElementComboBoxCellRenderer(parent);
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ parent.setModel(model);
+ parent.setRenderer(renderer);
+ ItemListener itemListener = new ItemListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void itemStateChanged(ItemEvent ev)
+ {
+ // Remove the previous inherited attributes.
+ for (AttributeType attr : inheritedRequiredAttributes)
+ {
+ attributes.getAvailableListModel().add(attr);
+ attributes.getSelectedListModel1().remove(attr);
+ }
+ for (AttributeType attr : inheritedOptionalAttributes)
+ {
+ attributes.getAvailableListModel().add(attr);
+ attributes.getSelectedListModel2().remove(attr);
+ }
+
+ inheritedOptionalAttributes.clear();
+ inheritedRequiredAttributes.clear();
+ ObjectClass p = (ObjectClass)parent.getSelectedItem();
+ while (p != null)
+ {
+ for (AttributeType attr : p.getRequiredAttributeChain())
+ {
+ inheritedRequiredAttributes.add(attr);
+ }
+ for (AttributeType attr : p.getOptionalAttributeChain())
+ {
+ inheritedOptionalAttributes.add(attr);
+ }
+ p = p.getSuperiorClass();
+ }
+ for (AttributeType attr : inheritedRequiredAttributes)
+ {
+ attributes.getAvailableListModel().remove(attr);
+ attributes.getSelectedListModel1().add(attr);
+ }
+ for (AttributeType attr : inheritedOptionalAttributes)
+ {
+ attributes.getAvailableListModel().remove(attr);
+ attributes.getSelectedListModel2().add(attr);
+ }
+ attributes.getAvailableListModel().fireContentsChanged(
+ attributes.getAvailableList(), 0,
+ attributes.getAvailableList().getModel().getSize() - 1);
+ attributes.getSelectedListModel1().fireContentsChanged(
+ attributes.getSelectedList1(), 0,
+ attributes.getSelectedList1().getModel().getSize() - 1);
+ attributes.getSelectedListModel2().fireContentsChanged(
+ attributes.getSelectedList2(), 0,
+ attributes.getSelectedList2().getModel().getSize() - 1);
+
+ Collection<AttributeType> unmovableItems =
+ new ArrayList<AttributeType>(inheritedRequiredAttributes);
+ unmovableItems.addAll(inheritedOptionalAttributes);
+ attributes.setUnmovableItems(unmovableItems);
+ }
+ };
+ parent.addItemListener(itemListener);
+
+ model = new DefaultComboBoxModel();
+ for (ObjectClassType t : ObjectClassType.values())
+ {
+ model.addElement(t);
+ }
+ type.setModel(model);
+ type.setSelectedItem(ObjectClassType.STRUCTURAL);
+ type.setRenderer(renderer);
+
+ attributes =
+ new DoubleAddRemovePanel<AttributeType>(0, AttributeType.class);
+ Comparator<AttributeType> comparator = new Comparator<AttributeType>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public int compare(AttributeType attr1, AttributeType attr2)
+ {
+ return attr1.getNameOrOID().compareTo(attr2.getNameOrOID());
+ }
+ };
+ attributes.getAvailableListModel().setComparator(comparator);
+ attributes.getSelectedListModel1().setComparator(comparator);
+ attributes.getSelectedListModel2().setComparator(comparator);
+
+ Component[] basicComps = {name, oid, description, parent};
+ JLabel[] basicLabels = {lName, lOID, lDescription, lParent};
+ JLabel[] basicInlineHelp = new JLabel[] {null, null, null, null};
+ add(basicLabels, basicComps, basicInlineHelp, this, gbc);
+
+ gbc.gridx = 0;
+ gbc.weightx = 0.0;
+ gbc.insets.left = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ add(lAttributes, gbc);
+
+ gbc.gridx ++;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.insets.left = 10;
+ add(attributes, gbc);
+ attributes.getAvailableLabel().setText(
+ INFO_CTRL_PANEL_ADDREMOVE_AVAILABLE_ATTRIBUTES.get().toString());
+ attributes.getSelectedLabel1().setText(
+ INFO_CTRL_PANEL_ADDREMOVE_REQUIRED_ATTRIBUTES.get().toString());
+ attributes.getSelectedLabel2().setText(
+ INFO_CTRL_PANEL_ADDREMOVE_OPTIONAL_ATTRIBUTES.get().toString());
+ AttributeTypeCellRenderer listRenderer = new AttributeTypeCellRenderer();
+ attributes.getAvailableList().setCellRenderer(listRenderer);
+ attributes.getSelectedList1().setCellRenderer(listRenderer);
+ attributes.getSelectedList2().setCellRenderer(listRenderer);
+
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ gbc.insets.top = 3;
+ JLabel explanation = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_INHERITED_ATTRIBUTES_HELP.get());
+ gbc.insets.top = 3;
+ add(explanation, gbc);
+
+ final BasicExpander expander = new BasicExpander(
+ INFO_CTRL_PANEL_EXTRA_OPTIONS_EXPANDER.get());
+
+ obsolete.setText("Obsolete");
+
+ Component[] comps = {aliases, origin, file, type, obsolete};
+ JLabel[] labels = {lAliases, lOrigin, lFile, lType, null};
+ JLabel[] inlineHelps = {
+ Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_SEPARATED_WITH_COMMAS_HELP.get()), null,
+ Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_SCHEMA_FILE_OBJECTCLASS_HELP.get(File.separator)),
+ null, null};
+ gbc.gridwidth = 2;
+ gbc.gridx = 0;
+ gbc.weighty = 0.0;
+ gbc.insets.left = 0;
+ gbc.gridy ++;
+ add(expander, gbc);
+ final JPanel p = new JPanel(new GridBagLayout());
+ gbc.insets.left = 15;
+ gbc.gridy ++;
+ add(p, gbc);
+ gbc.gridy ++;
+ p.setOpaque(false);
+
+ GridBagConstraints gbc1 = new GridBagConstraints();
+ gbc1.fill = GridBagConstraints.HORIZONTAL;
+ gbc1.gridy = 0;
+
+ add(labels, comps, inlineHelps, p, gbc1);
+ ChangeListener changeListener = new ChangeListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent e)
+ {
+ p.setVisible(expander.isSelected());
+ packParentDialog();
+ }
+ };
+ expander.addChangeListener(changeListener);
+ expander.setSelected(false);
+ changeListener.stateChanged(null);
+
+ file.setText(ConfigConstants.FILE_USER_SCHEMA_ELEMENTS);
+ }
+
+ private String getObjectClassName()
+ {
+ return name.getText().trim();
+ }
+
+ private String getOID()
+ {
+ String o = oid.getText().trim();
+ if (o.length() == 0)
+ {
+ o = getObjectClassName()+"-oid";
+ }
+ return o;
+ }
+
+ private ObjectClass getSuperior()
+ {
+ return (ObjectClass)parent.getSelectedItem();
+ }
+
+ private Map<String, List<String>> getExtraProperties()
+ {
+ Map<String, List<String>> map = new HashMap<String, List<String>>();
+ String f = file.getText().trim();
+ if (f.length() > 0)
+ {
+ ArrayList<String> list = new ArrayList<String>();
+ list.add(f);
+ map.put(ServerConstants.SCHEMA_PROPERTY_FILENAME, list);
+ }
+ String or = origin.getText().trim();
+ if (or.length() > 0)
+ {
+ ArrayList<String> list = new ArrayList<String>();
+ list.add(or);
+ map.put(ServerConstants.SCHEMA_PROPERTY_ORIGIN, list);
+ }
+ return map;
+ }
+
+ private ArrayList<String> getAliases()
+ {
+ ArrayList<String> al = new ArrayList<String>();
+ String s = aliases.getText().trim();
+ if (s.length() > 0)
+ {
+ String[] a = s.split(",");
+ for (String alias : a)
+ {
+ al.add(alias.trim());
+ }
+ }
+ return al;
+ }
+
+ private ArrayList<String> getAllNames()
+ {
+ ArrayList<String> al = new ArrayList<String>();
+ al.add(getObjectClassName());
+ al.addAll(getAliases());
+ return al;
+ }
+
+ private ObjectClass getObjectClass()
+ {
+ ObjectClass oc = new ObjectClass("", getObjectClassName(), getAllNames(),
+ getOID(), description.getText().trim(),
+ getSuperior(),
+ getRequiredAttributes(),
+ getAllowedAttributes(),
+ getObjectClassType(),
+ obsolete.isSelected(),
+ getExtraProperties());
+
+ return oc;
+ }
+
+ private ObjectClassType getObjectClassType()
+ {
+ return (ObjectClassType)type.getSelectedItem();
+ }
+
+ private Set<AttributeType> getRequiredAttributes()
+ {
+ HashSet<AttributeType> attrs = new HashSet<AttributeType>();
+ attrs.addAll(attributes.getSelectedListModel1().getData());
+ return attrs;
+ }
+
+ private Set<AttributeType> getAllowedAttributes()
+ {
+ HashSet<AttributeType> attrs = new HashSet<AttributeType>();
+ attrs.addAll(attributes.getSelectedListModel2().getData());
+ return attrs;
+ }
+
+ /**
+ * The task in charge of creating the object class.
+ *
+ */
+ protected class NewObjectClassTask extends SchemaTask
+ {
+ private ObjectClass oc;
+ private String ocName;
+ private String ocDefinition;
+ private String ocWithoutFileDefinition;
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public NewObjectClassTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ ocName = getObjectClassName();
+ ocDefinition = getSchemaElement().toString();
+ ObjectClass oc = getObjectClass();
+ oc.setExtraProperty(ServerConstants.SCHEMA_PROPERTY_FILENAME,
+ (String)null);
+ ocWithoutFileDefinition = oc.toString();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.NEW_OBJECTCLASS;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected CommonSchemaElements getSchemaElement()
+ {
+ if (oc == null)
+ {
+ oc = getObjectClass();
+ }
+ return oc;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_NEW_OBJECTCLASS_TASK_DESCRIPTION.get(ocName);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getSchemaFileAttributeName()
+ {
+ return "objectClasses";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getSchemaFileAttributeValue()
+ {
+ if (isServerRunning())
+ {
+ return ocDefinition;
+ }
+ else
+ {
+ return ocWithoutFileDefinition;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void updateSchema() throws OpenDsException
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ printEquivalentCommandToAdd();
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_CREATING_OBJECTCLASS_PROGRESS.get(ocName),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+
+ if (isServerRunning())
+ {
+ try
+ {
+ BasicAttribute attr =
+ new BasicAttribute(getSchemaFileAttributeName());
+ attr.add(getSchemaFileAttributeValue());
+ ModificationItem mod = new ModificationItem(DirContext.ADD_ATTRIBUTE,
+ attr);
+ getInfo().getDirContext().modifyAttributes(
+ ConfigConstants.DN_DEFAULT_SCHEMA_ROOT,
+ new ModificationItem[] { mod });
+ }
+ catch (NamingException ne)
+ {
+ throw new OnlineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne.toString()), ne);
+ }
+ }
+ else
+ {
+ updateSchemaFile();
+ }
+ notifyConfigurationElementCreated(oc);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+
+ /**
+ * Updates the contents of the schema file.
+ * @throws OpenDsException if an error occurs updating the schema file.
+ */
+ private void updateSchemaFile() throws OpenDsException
+ {
+ if (isSchemaFileDefined)
+ {
+ LDIFExportConfig exportConfig =
+ new LDIFExportConfig(schemaFile,
+ ExistingFileBehavior.OVERWRITE);
+ LDIFReader reader = null;
+ Entry schemaEntry = null;
+ try
+ {
+ reader = new LDIFReader(new LDIFImportConfig(schemaFile));
+ schemaEntry = reader.readEntry();
+
+ Modification mod = new Modification(ModificationType.ADD,
+ Attributes.create(getSchemaFileAttributeName().toLowerCase(),
+ getSchemaFileAttributeValue()));
+ schemaEntry.applyModification(mod);
+ LDIFWriter writer = new LDIFWriter(exportConfig);
+ writer.writeEntry(schemaEntry);
+ exportConfig.getWriter().newLine();
+ }
+ catch (Throwable t)
+ {
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ try
+ {
+ reader.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ if (exportConfig != null)
+ {
+ try
+ {
+ exportConfig.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ }
+ else
+ {
+ LDIFExportConfig exportConfig =
+ new LDIFExportConfig(schemaFile,
+ ExistingFileBehavior.FAIL);
+ try
+ {
+ ArrayList<String> lines = getSchemaEntryLines();
+ for (String line : lines)
+ {
+ LDIFWriter.writeLDIFLine(new StringBuilder(line),
+ exportConfig.getWriter(), exportConfig.getWrapColumn() > 1,
+ exportConfig.getWrapColumn());
+ }
+ exportConfig.getWriter().newLine();
+ }
+ catch (Throwable t)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(t.toString()), t);
+ }
+ finally
+ {
+ if (exportConfig != null)
+ {
+ try
+ {
+ exportConfig.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * A renderer for the attribute lists. The renderer basically marks the
+ * inherited attributes with an asterisk.
+ *
+ */
+ private class AttributeTypeCellRenderer implements ListCellRenderer
+ {
+ private ListCellRenderer defaultRenderer;
+
+ /**
+ * Renderer constructor.
+ *
+ */
+ public AttributeTypeCellRenderer()
+ {
+ defaultRenderer = attributes.getAvailableList().getCellRenderer();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus)
+ {
+ if (value instanceof AttributeType)
+ {
+ AttributeType attr = (AttributeType)value;
+ if (inheritedOptionalAttributes.contains(value) ||
+ inheritedRequiredAttributes.contains(value))
+ {
+ value = attr.getNameOrOID()+ " (*)";
+ }
+ else
+ {
+ value = attr.getNameOrOID();
+ }
+ }
+ return defaultRenderer.getListCellRendererComponent(list, value, index,
+ isSelected, cellHasFocus);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
new file mode 100644
index 0000000..fe78893
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
@@ -0,0 +1,324 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.util.ArrayList;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The panel used to create a new organization.
+ *
+ */
+public class NewOrganizationPanel extends AbstractNewEntryPanel
+{
+ private static final long serialVersionUID = 6560126551083160773L;
+ /**
+ * The label for the name.
+ */
+ protected final JLabel lName = Utilities.createPrimaryLabel();
+ /**
+ * The label for the description.
+ */
+ protected final JLabel lDescription = Utilities.createPrimaryLabel();
+ /**
+ * The label for the DN.
+ */
+ protected final JLabel lDn = Utilities.createPrimaryLabel();
+
+ /**
+ * An array containing all the labels.
+ */
+ protected final JLabel[] labels = {lName, lDescription, lDn};
+
+ /**
+ * The field containing the name.
+ */
+ protected final JTextField name = Utilities.createLongTextField();
+ /**
+ * The field containing the description.
+ */
+ protected final JTextField description = Utilities.createLongTextField();
+ /**
+ * The label containing the DN value.
+ */
+ protected final JLabel dn = Utilities.createDefaultLabel();
+
+ /**
+ * An array containing all the components.
+ */
+ protected final Component[] comps = {name, description, dn};
+
+ /**
+ * Default constructor.
+ *
+ */
+ public NewOrganizationPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setParent(BasicNode parentNode, BrowserController controller)
+ {
+ super.setParent(parentNode, controller);
+ dn.setText(","+parentNode.getDN());
+ for (Component comp : comps)
+ {
+ if (comp instanceof JTextField)
+ {
+ ((JTextField)comp).setText("");
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_NEW_ORGANIZATION_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return name;
+ }
+
+ /**
+ * Returns the title of the progress dialog.
+ * @return the title of the progress dialog.
+ */
+ protected Message getProgressDialogTitle()
+ {
+ return INFO_CTRL_NEW_ORGANIZATION_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkSyntax(ArrayList<Message> errors)
+ {
+ for (JLabel label : labels)
+ {
+ setPrimaryValid(label);
+ }
+
+ JTextField[] requiredFields = {name};
+ Message[] msgs = {ERR_CTRL_PANEL_NAME_OF_ORGANIZATION_REQUIRED.get()};
+ for (int i=0; i<requiredFields.length; i++)
+ {
+ String v = requiredFields[i].getText().trim();
+ if (v.length() == 0)
+ {
+ errors.add(msgs[i]);
+ }
+ }
+ }
+
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ Message[] ls = {
+ INFO_CTRL_PANEL_NEW_ORGANIZATION_NAME_LABEL.get(),
+ INFO_CTRL_PANEL_NEW_ORGANIZATION_DESCRIPTION_LABEL.get(),
+ INFO_CTRL_PANEL_NEW_ORGANIZATION_ENTRY_DN_LABEL.get()};
+ int i = 0;
+ for (Message l : ls)
+ {
+ labels[i].setText(l.toString());
+ i++;
+ }
+ Utilities.setRequiredIcon(lName);
+
+ gbc.gridwidth = 2;
+ gbc.gridy = 0;
+ addErrorPane(gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.weighty = 0.0;
+ gbc.gridx = 1;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.fill = GridBagConstraints.NONE;
+ JLabel requiredLabel = createRequiredLabel();
+ gbc.insets.bottom = 10;
+ add(requiredLabel, gbc);
+
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.bottom = 0;
+
+ Component[] inlineHelp = {null, null, null};
+
+ for (i=0 ; i< labels.length; i++)
+ {
+ gbc.insets.left = 0;
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ add(labels[i], gbc);
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ gbc.gridx = 1;
+ add(comps[i], gbc);
+ if (inlineHelp[i] != null)
+ {
+ gbc.insets.top = 3;
+ gbc.gridy ++;
+ add(inlineHelp[i], gbc);
+ }
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ }
+ addBottomGlue(gbc);
+
+ DocumentListener listener = new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ updateDNValue();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ insertUpdate(ev);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ insertUpdate(ev);
+ }
+ };
+ JTextField[] toAddListener = {name};
+ for (JTextField tf : toAddListener)
+ {
+ tf.getDocument().addDocumentListener(listener);
+ }
+ }
+
+ /**
+ * Updates the contents of DN value to reflect the data that the user
+ * is providing.
+ *
+ */
+ protected void updateDNValue()
+ {
+ String value = name.getText().trim();
+ if (value.length() > 0)
+ {
+ String rdn = Utilities.getRDNString("o", value);
+ dn.setText(rdn+","+parentNode.getDN());
+ }
+ else
+ {
+ dn.setText(","+parentNode.getDN());
+ }
+ }
+
+ /**
+ * Returns the LDIF representing the new entry.
+ * @return the LDIF representing the new entry.
+ */
+ protected String getLDIF()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append("dn: "+dn.getText()+"\n");
+ String[] attrNames = {"o", "description"};
+ JTextField[] textFields = {name, description};
+ sb.append("objectclass: top\n");
+ sb.append("objectclass: organization\n");
+ for (int i=0; i<attrNames.length; i++)
+ {
+ String value = textFields[i].getText().trim();
+ if (value.length() > 0)
+ {
+ sb.append(attrNames[i]+": "+value+"\n");
+ }
+ }
+ return sb.toString();
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
new file mode 100644
index 0000000..18d7a20
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
@@ -0,0 +1,296 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.io.IOException;
+import java.util.ArrayList;import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * The panel used to create a new organizational unit.
+ *
+ */
+public class NewOrganizationalUnitPanel extends AbstractNewEntryPanel
+{
+ private static final long serialVersionUID = -7145648120019856161L;
+ private JLabel lName = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_OU_NAME_LABEL.get());
+ private JLabel lDescription = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_OU_DESCRIPTION_LABEL.get());
+ private JLabel lAddress = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_OU_ADDRESS_LABEL.get());
+ private JLabel lTelephoneNumber = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_OU_TELEPHONE_NUMBER_LABEL.get());
+ private JLabel lFaxNumber = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_OU_FAX_NUMBER_LABEL.get());
+ private JLabel lEntryDN = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_OU_ENTRY_DN_LABEL.get());
+
+ private JLabel[] labels = {lName, lDescription, lAddress,
+ lTelephoneNumber, lFaxNumber, lEntryDN
+ };
+
+ private JTextField name = Utilities.createLongTextField();
+ private JTextField description = Utilities.createLongTextField();
+ private JTextField address = Utilities.createLongTextField();
+ private JTextField telephoneNumber = Utilities.createLongTextField();
+ private JTextField faxNumber = Utilities.createLongTextField();
+ private JLabel dn = Utilities.createDefaultLabel();
+
+ private Component[] comps = {name, description, address,
+ telephoneNumber, faxNumber, dn};
+
+ /**
+ * Default constructor.
+ *
+ */
+ public NewOrganizationalUnitPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setParent(BasicNode parentNode, BrowserController controller)
+ {
+ super.setParent(parentNode, controller);
+ dn.setText(","+parentNode.getDN());
+ for (Component comp : comps)
+ {
+ if (comp instanceof JTextField)
+ {
+ ((JTextField)comp).setText("");
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_OU_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Message getProgressDialogTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_OU_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkSyntax(ArrayList<Message> errors)
+ {
+ for (JLabel label : labels)
+ {
+ setPrimaryValid(label);
+ }
+
+ JTextField[] requiredFields = {name};
+ Message[] msgs = {ERR_CTRL_PANEL_NAME_OF_OU_REQUIRED.get()};
+ for (int i=0; i<requiredFields.length; i++)
+ {
+ String v = requiredFields[i].getText().trim();
+ if (v.length() == 0)
+ {
+ errors.add(msgs[i]);
+ }
+ }
+
+ if (errors.size() == 0)
+ {
+ try
+ {
+ getEntry();
+ }
+ catch (OpenDsException ode)
+ {
+ errors.add(ode.getMessageObject());
+ }
+ catch (IOException ioe)
+ {
+ // This should not occur
+ throw new IllegalStateException("Unexpected error: "+ioe, ioe);
+ }
+ }
+ }
+
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ Utilities.setRequiredIcon(lName);
+
+ gbc.gridwidth = 2;
+ gbc.gridy = 0;
+ addErrorPane(gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.weighty = 0.0;
+ gbc.gridx = 1;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.fill = GridBagConstraints.NONE;
+ JLabel requiredLabel = createRequiredLabel();
+ gbc.insets.bottom = 10;
+ add(requiredLabel, gbc);
+
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.bottom = 0;
+
+ Component[] inlineHelp = {null, null, null, null,
+ null, null};
+
+ for (int i=0 ; i< labels.length; i++)
+ {
+ gbc.insets.left = 0;
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ add(labels[i], gbc);
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ gbc.gridx = 1;
+ add(comps[i], gbc);
+ if (inlineHelp[i] != null)
+ {
+ gbc.insets.top = 3;
+ gbc.gridy ++;
+ add(inlineHelp[i], gbc);
+ }
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ }
+ addBottomGlue(gbc);
+
+ DocumentListener listener = new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ updateDNValue();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ insertUpdate(ev);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ insertUpdate(ev);
+ }
+ };
+ JTextField[] toAddListener = {name};
+ for (JTextField tf : toAddListener)
+ {
+ tf.getDocument().addDocumentListener(listener);
+ }
+ }
+
+ /**
+ * Updates the contents of DN value to reflect the data that the user
+ * is providing.
+ *
+ */
+ private void updateDNValue()
+ {
+ String value = name.getText().trim();
+ if (value.length() > 0)
+ {
+ String rdn = Utilities.getRDNString("ou", value);
+ dn.setText(rdn+","+parentNode.getDN());
+ }
+ else
+ {
+ dn.setText(","+parentNode.getDN());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getLDIF()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append("dn: "+dn.getText()+"\n");
+ String[] attrNames = {"ou", "description", "postalAddress",
+ "telephoneNumber", "facsimileTelephoneNumber"};
+ JTextField[] textFields = {name, description, address,
+ telephoneNumber, faxNumber};
+ sb.append("objectclass: top\n");
+ sb.append("objectclass: organizationalUnit\n");
+ for (int i=0; i<attrNames.length; i++)
+ {
+ String value = textFields[i].getText().trim();
+ if (value.length() > 0)
+ {
+ sb.append(attrNames[i]+": "+value+"\n");
+ }
+ }
+ return sb.toString();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewUserPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewUserPanel.java
new file mode 100644
index 0000000..346bd37
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewUserPanel.java
@@ -0,0 +1,387 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPasswordField;
+import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * The panel used to create a new user.
+ *
+ */
+public class NewUserPanel extends AbstractNewEntryPanel
+{
+ private static final long serialVersionUID = -2450090053404111892L;
+ private JLabel lFirstName = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_FIRST_NAME_LABEL.get());
+ private JLabel lLastName = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_LAST_NAME_LABEL.get());
+ private JLabel lCommonNames = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_COMMON_NAMES_LABEL.get());
+ private JLabel lUserID = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_UID_LABEL.get());
+ private JLabel lPassword = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_PASSWORD_LABEL.get());
+ private JLabel lConfirmPassword = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_CONFIRM_PASSWORD_LABEL.get());
+ private JLabel lEmail = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_EMAIL_LABEL.get());
+ private JLabel lTelephoneNumber = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_TELEPHONE_NUMBER_LABEL.get());
+ private JLabel lFaxNumber = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_FAX_NUMBER_LABEL.get());
+ private JLabel lNamingAttribute = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_NAMING_ATTRIBUTE_LABEL.get());
+ private JLabel lEntryDN = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NEW_USER_ENTRY_DN_LABEL.get());
+
+ private JLabel[] labels = {lFirstName, lLastName, lCommonNames, lUserID,
+ lPassword, lConfirmPassword, lEmail, lTelephoneNumber, lFaxNumber,
+ lNamingAttribute, lEntryDN
+ };
+
+ private JTextField firstName = Utilities.createLongTextField();
+ private JTextField lastName = Utilities.createLongTextField();
+ private JTextField commonName = Utilities.createLongTextField();
+ private JTextField userID = Utilities.createLongTextField();
+ private JPasswordField password = Utilities.createPasswordField();
+ private JPasswordField confirmPassword = Utilities.createPasswordField(30);
+ private JTextField eMail = Utilities.createLongTextField();
+ private JTextField telephoneNumber = Utilities.createLongTextField();
+ private JTextField faxNumber = Utilities.createLongTextField();
+ private JComboBox namingAttribute = Utilities.createComboBox();
+ private JLabel dn = Utilities.createDefaultLabel();
+
+ Component[] comps = {firstName, lastName, commonName, userID,
+ password, confirmPassword, eMail, telephoneNumber, faxNumber,
+ namingAttribute, dn};
+
+ private final JTextField[] NAMING_ATTRIBUTE_TEXTFIELDS =
+ {commonName, firstName, lastName, userID};
+ private final String[] NAMING_ATTRIBUTES = {"cn", "givenName", "sn", "uid"};
+
+ /**
+ * Default constructor.
+ *
+ */
+ public NewUserPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setParent(BasicNode parentNode, BrowserController controller)
+ {
+ super.setParent(parentNode, controller);
+ dn.setText(namingAttribute.getSelectedItem()+"=,"+parentNode.getDN());
+ for (Component comp : comps)
+ {
+ if (comp instanceof JTextField)
+ {
+ ((JTextField)comp).setText("");
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_USER_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return firstName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Message getProgressDialogTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_USER_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkSyntax(ArrayList<Message> errors)
+ {
+ for (JLabel label : labels)
+ {
+ setPrimaryValid(label);
+ }
+
+ JTextField[] requiredFields = {lastName, commonName};
+ Message[] msgs = {ERR_CTRL_PANEL_USER_LAST_NAME_REQUIRED.get(),
+ ERR_CTRL_PANEL_USER_COMMON_NAME_REQUIRED.get()
+ };
+ for (int i=0; i<requiredFields.length; i++)
+ {
+ String v = requiredFields[i].getText().trim();
+ if (v.length() == 0)
+ {
+ errors.add(msgs[i]);
+ }
+ }
+
+ String attr = (String)namingAttribute.getSelectedItem();
+ for (int i=0 ; i<NAMING_ATTRIBUTE_TEXTFIELDS.length; i++)
+ {
+ boolean isRequired = false;
+ for (JTextField tf : requiredFields)
+ {
+ if (tf == NAMING_ATTRIBUTE_TEXTFIELDS[i])
+ {
+ isRequired = true;
+ break;
+ }
+ }
+ if (!isRequired)
+ {
+ if (attr.equalsIgnoreCase(NAMING_ATTRIBUTES[i]))
+ {
+ String value = NAMING_ATTRIBUTE_TEXTFIELDS[i].getText().trim();
+ if (value.length() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_USER_NAMING_ATTRIBUTE_REQUIRED.get(attr));
+ }
+ break;
+ }
+ }
+ }
+
+ char[] pwd1 = password.getPassword();
+ char[] pwd2 = confirmPassword.getPassword();
+ String sPwd1 = new String(pwd1);
+ String sPwd2 = new String(pwd2);
+ if (!sPwd1.equals(sPwd2))
+ {
+ errors.add(ERR_CTRL_PANEL_PASSWORD_DO_NOT_MATCH.get());
+ }
+
+ if (errors.size() == 0)
+ {
+ try
+ {
+ getEntry();
+ }
+ catch (OpenDsException ode)
+ {
+ errors.add(ode.getMessageObject());
+ }
+ catch (IOException ioe)
+ {
+ // This should not occur
+ throw new IllegalStateException("Unexpected error: "+ioe, ioe);
+ }
+ }
+ }
+
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ Utilities.setRequiredIcon(lLastName);
+ Utilities.setRequiredIcon(lCommonNames);
+
+ gbc.gridwidth = 2;
+ gbc.gridy = 0;
+ addErrorPane(gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.weighty = 0.0;
+ gbc.gridx = 1;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.fill = GridBagConstraints.NONE;
+ JLabel requiredLabel = createRequiredLabel();
+ gbc.insets.bottom = 10;
+ add(requiredLabel, gbc);
+
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.bottom = 0;
+
+ Component[] inlineHelp = {null, null, null, null, null,
+ null, null, null, null, null, null};
+
+ for (int i=0 ; i< labels.length; i++)
+ {
+ gbc.insets.left = 0;
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ add(labels[i], gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ if (comps[i] instanceof JComboBox)
+ {
+ gbc.weightx = 0.0;
+ gbc.fill = GridBagConstraints.NONE;
+ }
+ else
+ {
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ }
+ add(comps[i], gbc);
+ if (inlineHelp[i] != null)
+ {
+ gbc.insets.top = 3;
+ gbc.gridy ++;
+ add(inlineHelp[i], gbc);
+ }
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ }
+ addBottomGlue(gbc);
+
+ DocumentListener listener = new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ updateDNValue();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ insertUpdate(ev);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ insertUpdate(ev);
+ }
+ };
+ JTextField[] toAddListener = {firstName, lastName, commonName, userID};
+ for (JTextField tf : toAddListener)
+ {
+ tf.getDocument().addDocumentListener(listener);
+ }
+
+ DefaultComboBoxModel model = new DefaultComboBoxModel(NAMING_ATTRIBUTES);
+ namingAttribute.setModel(model);
+ namingAttribute.setSelectedItem(NAMING_ATTRIBUTES[0]);
+ namingAttribute.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ updateDNValue();
+ }
+ });
+ }
+
+ /**
+ * Updates the contents of DN value to reflect the data that the user
+ * is providing.
+ *
+ */
+ private void updateDNValue()
+ {
+ String attr = (String)namingAttribute.getSelectedItem();
+ for (int i=0 ; i<NAMING_ATTRIBUTE_TEXTFIELDS.length; i++)
+ {
+ if (attr.equalsIgnoreCase(NAMING_ATTRIBUTES[i]))
+ {
+ String value = NAMING_ATTRIBUTE_TEXTFIELDS[i].getText().trim();
+ String rdn = Utilities.getRDNString(attr, value);
+ dn.setText(rdn+","+parentNode.getDN());
+ break;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getLDIF()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append("dn: "+dn.getText()+"\n");
+ String[] attrNames = {"givenName", "sn", "cn", "uid", "userPassword",
+ "mail", "telephoneNumber", "facsimileTelephoneNumber"};
+ JTextField[] textFields = {firstName, lastName, commonName, userID,
+ password, eMail, telephoneNumber, faxNumber};
+ sb.append("objectclass: top\n");
+ sb.append("objectclass: person\n");
+ sb.append("objectclass: inetOrgPerson\n");
+ for (int i=0; i<attrNames.length; i++)
+ {
+ String value = textFields[i].getText().trim();
+ if (value.length() > 0)
+ {
+ sb.append(attrNames[i]+": "+value+"\n");
+ }
+ }
+ return sb.toString();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
new file mode 100644
index 0000000..786537f
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
@@ -0,0 +1,525 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.guitools.controlpanel.task.OnlineUpdateException;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.ConfigReader;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn.Scope;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * Panel that appears when the user defines a new VLV index.
+ *
+ */
+public class NewVLVIndexPanel extends AbstractVLVIndexPanel
+{
+ private static final long serialVersionUID = 1554866540747530939L;
+
+ /**
+ * Constructor of the panel.
+ * @param backendName the backend where the index will be created.
+ * @param relativeComponent the component relative to which the dialog
+ * containing this panel will be centered.
+ */
+ public NewVLVIndexPanel(String backendName, Component relativeComponent)
+ {
+ super(backendName, relativeComponent);
+ createBasicLayout(this, new GridBagConstraints(), false);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_NEW_VLV_INDEX_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ if (updateLayout(ev))
+ {
+ updateErrorPaneAndOKButtonIfAuthRequired(ev.getNewDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_NEW_VLV.get());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ List<Message> errors = checkErrors(true);
+ if (errors.isEmpty())
+ {
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_NEW_VLV_INDEX_TITLE.get(), getInfo());
+ NewVLVIndexTask newTask = new NewVLVIndexTask(getInfo(), dlg);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ // Check filters
+ if (checkIndexRequired())
+ {
+ String indexName = name.getText().trim();
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_CREATING_NEW_VLV_INDEX_SUMMARY.get(indexName),
+ INFO_CTRL_PANEL_CREATING_NEW_VLV_INDEX_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_CREATING_NEW_VLV_INDEX_SUCCESSFUL_DETAILS.get(
+ indexName),
+ ERR_CTRL_PANEL_CREATING_NEW_VLV_INDEX_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_CREATING_NEW_VLV_INDEX_ERROR_DETAILS.get(),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ }
+
+ if (!errors.isEmpty())
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * The task in charge of creating the VLV index.
+ *
+ */
+ protected class NewVLVIndexTask extends Task
+ {
+ private Set<String> backendSet;
+ private String indexName;
+ private Scope scope;
+ private List<VLVSortOrder> sortOrder;
+ private String baseDN;
+ private String filterValue;
+ private String backendID;
+ private String ldif;
+ private String sortOrderStringValue;
+ private int maxBlock;
+ private VLVIndexDescriptor newIndex;
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public NewVLVIndexTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ backendSet = new HashSet<String>();
+ backendSet.add(backendName.getText());
+ indexName = name.getText().trim();
+ sortOrder = getSortOrder();
+ baseDN = getBaseDN();
+ filterValue = filter.getText().trim();
+ scope = getScope();
+ backendID = backendName.getText();
+ ldif = getIndexLDIF(indexName);
+ sortOrderStringValue = getSortOrderStringValue(sortOrder);
+ maxBlock = Integer.parseInt(maxBlockSize.getText());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.NEW_INDEX;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_NEW_VLV_INDEX_TASK_DESCRIPTION.get(
+ indexName, backendID);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ private void updateConfiguration() throws OpenDsException
+ {
+ boolean configHandlerUpdated = false;
+ try
+ {
+ if (!isServerRunning())
+ {
+ configHandlerUpdated = true;
+ getInfo().stopPooling();
+ if (getInfo().mustDeregisterConfig())
+ {
+ DirectoryServer.deregisterBaseDN(DN.decode("cn=config"));
+ }
+ DirectoryServer.getInstance().initializeConfiguration(
+ org.opends.server.extensions.ConfigFileHandler.class.getName(),
+ ConfigReader.configFile);
+ getInfo().setMustDeregisterConfig(true);
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLineName());
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(
+ getDSConfigCommandLineArguments());
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_VLV_INDEX.get()+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_CREATING_NEW_VLV_INDEX_PROGRESS.get(
+ indexName),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ if (isServerRunning())
+ {
+ // Create additional indexes and display the equivalent command.
+ // Everything is done in the method createAdditionalIndexes
+ createIndex(getInfo().getDirContext());
+ }
+ else
+ {
+ createIndex();
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ finally
+ {
+ if (configHandlerUpdated)
+ {
+ DirectoryServer.getInstance().initializeConfiguration(
+ ConfigReader.configClassName, ConfigReader.configFile);
+ getInfo().startPooling(ControlPanelInfo.DEFAULT_POOLING);
+ }
+ }
+ }
+
+ private void createIndex() throws OpenDsException
+ {
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ Entry backendConfigEntry;
+ while ((backendConfigEntry = reader.readEntry()) != null)
+ {
+ DirectoryServer.getConfigHandler().addEntry(backendConfigEntry, null);
+ }
+ DirectoryServer.getConfigHandler().writeUpdatedConfig();
+ }
+ catch (IOException ioe)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
+ ioe);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ }
+
+ private void createIndex(InitialLdapContext ctx) throws OpenDsException
+ {
+ // Instead of adding indexes using management framework, use this approach
+ // so that we have to define the additional indexes only in the method
+ // getBackendLdif.
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ Entry indexEntry = reader.readEntry();
+ Attributes attrs = new BasicAttributes();
+
+ BasicAttribute oc = new BasicAttribute("objectClass");
+ Iterator<AttributeValue> it =
+ indexEntry.getObjectClassAttribute().iterator();
+ while (it.hasNext())
+ {
+ oc.add(it.next().getStringValue());
+ }
+ attrs.put(oc);
+
+ List<Attribute> odsAttrs = indexEntry.getAttributes();
+ for (Attribute odsAttr : odsAttrs)
+ {
+ String attrName = odsAttr.getName();
+ BasicAttribute attr = new BasicAttribute(attrName);
+ it = odsAttr.iterator();
+ while (it.hasNext())
+ {
+ attr.add(it.next().getStringValue());
+ }
+ attrs.put(attr);
+ }
+
+ ctx.createSubcontext(indexEntry.getDN().toString(), attrs);
+ }
+ catch (Throwable t)
+ {
+ throw new OnlineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(t.toString()), t);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ private String getConfigCommandLineName()
+ {
+ if (isServerRunning())
+ {
+ return getCommandLinePath("dsconfig");
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ updateConfiguration();
+ for (BackendDescriptor backend :
+ getInfo().getServerDescriptor().getBackends())
+ {
+ if (backend.getBackendID().equalsIgnoreCase(backendID))
+ {
+ newIndex = new VLVIndexDescriptor(
+ indexName, backend, DN.decode(baseDN),
+ scope, filterValue, sortOrder, maxBlock);
+ getInfo().registerModifiedIndex(newIndex);
+ notifyConfigurationElementCreated(newIndex);
+ break;
+ }
+ }
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void postOperation()
+ {
+ if ((lastException == null) && (state == State.FINISHED_SUCCESSFULLY) &&
+ (newIndex != null))
+ {
+ rebuildIndexIfNecessary(newIndex, getProgressDialog());
+ }
+ }
+
+ private ArrayList<String> getDSConfigCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("create-local-db-vlv-index");
+ args.add("--backend-name");
+ args.add(backendID);
+ args.add("--type");
+ args.add("generic");
+
+ args.add("--index-name");
+ args.add(indexName);
+
+ args.add("--set");
+ args.add("base-dn:"+baseDN);
+
+ args.add("--set");
+ args.add("filter:"+filterValue);
+
+ args.add("--set");
+ args.add("scope:"+scope.toString());
+
+ args.add("--set");
+ args.add("sort-order:"+sortOrderStringValue);
+
+ args.add("--index-filter");
+ args.add(filterValue);
+
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+ return args;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java
new file mode 100644
index 0000000..ca12ccb
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java
@@ -0,0 +1,83 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * A simple panel containing a message.
+ *
+ */
+public class NoItemSelectedPanel extends JPanel
+{
+ private JLabel l;
+ private Message msg;
+ private static final long serialVersionUID = -8288525745479095426L;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public NoItemSelectedPanel()
+ {
+ super(new GridBagLayout());
+ setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ msg = INFO_CTRL_PANEL_NO_ITEM_SELECTED_LABEL.get();
+ l = Utilities.createPrimaryLabel(msg);
+ add(l, gbc);
+ }
+
+ /**
+ * Sets the message to be displayed.
+ * @param text the message to be displayed.
+ */
+ public void setMessage(Message text)
+ {
+ msg = text;
+ l.setText(text.toString());
+ }
+
+ /**
+ * Returns the displayed message.
+ * @return the displayed message.
+ */
+ public Message getMessage()
+ {
+ return msg;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
new file mode 100644
index 0000000..8a2deeb
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
@@ -0,0 +1,346 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.ObjectClassValue;
+import org.opends.guitools.controlpanel.datamodel.SortableListModel;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.components.AddRemovePanel;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.ObjectClassType;
+import org.opends.server.types.Schema;
+
+/**
+ * This is the class used to edit the object class of a given entry, it displays
+ * the structural objectclass of the entry and its auxiliary objectclasses.
+ *
+ */
+public class ObjectClassEditorPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 6632731109835897496L;
+ private JComboBox structural;
+ private AddRemovePanel<String> auxiliary;
+
+ private ObjectClassValue value;
+
+ private boolean valueChanged;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public ObjectClassEditorPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * Sets the object class to be displayed in the panel.
+ * @param value the object class to be displayed in the panel.
+ */
+ public void setValue(ObjectClassValue value)
+ {
+ this.value = value;
+ String struct = value.getStructural();
+ if (struct != null)
+ {
+ DefaultComboBoxModel structuralModel =
+ (DefaultComboBoxModel)structural.getModel();
+ for (int i=0; i<structuralModel.getSize(); i++)
+ {
+ if (struct.equalsIgnoreCase((String)structuralModel.getElementAt(i)))
+ {
+ structural.setSelectedIndex(i);
+ break;
+ }
+ }
+ }
+ SortableListModel<String> availableListModel =
+ auxiliary.getAvailableListModel();
+ SortableListModel<String> selectedListModel =
+ auxiliary.getSelectedListModel();
+ availableListModel.addAll(selectedListModel.getData());
+ selectedListModel.clear();
+
+ for (String oc : value.getAuxiliary())
+ {
+ int index = -1;
+ for (int i=0; i<availableListModel.getSize(); i++)
+ {
+ if (availableListModel.getElementAt(i).equalsIgnoreCase(oc))
+ {
+ index = i;
+ break;
+ }
+ }
+ if (index != -1)
+ {
+ oc = availableListModel.getElementAt(index);
+ selectedListModel.add(oc);
+ availableListModel.remove(oc);
+ }
+ }
+ selectedListModel.fireContentsChanged(
+ selectedListModel, 0, selectedListModel.getSize());
+ availableListModel.fireContentsChanged(
+ availableListModel, 0, availableListModel.getSize());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return structural;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ valueChanged = false;
+ super.cancelClicked();
+ }
+
+ /**
+ * Returns the object class value displayed by the panel.
+ * @return the object class value displayed by the panel.
+ */
+ public ObjectClassValue getObjectClassValue()
+ {
+ return value;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ String struct = (String) structural.getSelectedItem();
+ TreeSet<String> aux = new TreeSet<String>();
+ aux.addAll(auxiliary.getSelectedListModel().getData());
+ aux.add("top");
+ ObjectClassValue newValue = new ObjectClassValue(struct, aux);
+ valueChanged = !newValue.equals(value);
+ value = newValue;
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_EDIT_OBJECTCLASS_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ final Schema schema = ev.getNewDescriptor().getSchema();
+ if (schema != null)
+ {
+ final SortedSet<String> auxiliaryOcs = new TreeSet<String>();
+ final SortedSet<String> structuralOcs = new TreeSet<String>();
+ for (ObjectClass oc : schema.getObjectClasses().values())
+ {
+ if (oc.getObjectClassType() == ObjectClassType.AUXILIARY)
+ {
+ if (!oc.getNameOrOID().equals("top"))
+ {
+ auxiliaryOcs.add(oc.getNameOrOID());
+ }
+ }
+ else if (oc.getObjectClassType() == ObjectClassType.STRUCTURAL)
+ {
+ structuralOcs.add(oc.getNameOrOID());
+ }
+ }
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ String currentStruct = (String)structural.getSelectedItem();
+
+ SortedSet<String> currentAux;
+ if (currentStruct != null)
+ {
+ currentAux = auxiliary.getSelectedListModel().getData();
+ }
+ else if (value != null)
+ {
+ // This is to handle the case where the schema is updated after
+ // a value was set.
+ currentStruct = value.getStructural();
+ currentAux = value.getAuxiliary();
+ }
+ else
+ {
+ currentAux = new TreeSet<String>();
+ }
+ SortableListModel<String> availableListModel =
+ auxiliary.getAvailableListModel();
+ SortableListModel<String> selectedListModel =
+ auxiliary.getSelectedListModel();
+ DefaultComboBoxModel structuralModel =
+ (DefaultComboBoxModel)structural.getModel();
+ structuralModel.removeAllElements();
+ availableListModel.clear();
+ selectedListModel.clear();
+ for (String oc : structuralOcs)
+ {
+ structuralModel.addElement(oc);
+ }
+ for (String oc : auxiliaryOcs)
+ {
+ availableListModel.add(oc);
+ }
+ if (currentStruct != null)
+ {
+ structural.setSelectedItem(currentStruct);
+ }
+ for (String oc : currentAux)
+ {
+ availableListModel.remove(oc);
+ selectedListModel.add(oc);
+ }
+ selectedListModel.fireContentsChanged(
+ selectedListModel, 0, selectedListModel.getSize());
+ availableListModel.fireContentsChanged(
+ availableListModel, 0, availableListModel.getSize());
+ setEnabledOK(true);
+ }
+ });
+ }
+ else
+ {
+ updateErrorPane(errorPane,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_SUMMARY.get(),
+ ColorAndFontConstants.errorTitleFont,
+ ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_DETAILS.get(),
+ ColorAndFontConstants.defaultFont);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ setEnabledOK(false);
+ }
+ });
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the value changed and <CODE>false</CODE>
+ * otherwise.
+ * @return <CODE>true</CODE> if the value changed and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean valueChanged()
+ {
+ return valueChanged;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return false;
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.weighty = 0.0;
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridwidth = 2;
+ addErrorPane(gbc);
+
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 0.0;
+ JLabel l = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_STRUCTURAL_OBJECTCLASS_LABEL.get());
+ add(l, gbc);
+ gbc.gridx ++;
+ gbc.insets.left = 10;
+ gbc.anchor = GridBagConstraints.WEST;
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ structural = Utilities.createComboBox();
+ structural.setModel(model);
+ gbc.weightx = 1.0;
+ add(structural, gbc);
+
+ gbc.gridy ++;
+ gbc.gridwidth = 2;
+ gbc.gridx = 0;
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+ l = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_AUXILIARY_OBJECTCLASS_LABEL.get());
+ add(l, gbc);
+ gbc.gridy ++;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ auxiliary = new AddRemovePanel<String>(String.class);
+ gbc.insets.left = 30;
+ add(auxiliary, gbc);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java
new file mode 100644
index 0000000..e862ea1
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java
@@ -0,0 +1,593 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.QuickSetupMessages.INFO_CLOSE_BUTTON_LABEL;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JEditorPane;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+import javax.swing.text.html.HTMLDocument;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.PrintStreamListener;
+import org.opends.guitools.controlpanel.ui.components.BasicExpander;
+import org.opends.guitools.controlpanel.util.ApplicationPrintStream;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The dialog that is used to display progress in a task.
+ *
+ */
+public class ProgressDialog extends GenericDialog
+{
+ private static final long serialVersionUID = -6462866257463062629L;
+ private ProgressPanel progressPanel;
+
+ /**
+ * Constructor of the dialog.
+ * @param parentDialog the parent dialog.
+ * @param title the title of the dialog.
+ * @param info the control panel information.
+ */
+ public ProgressDialog(Component parentDialog, Message title,
+ ControlPanelInfo info)
+ {
+ super(Utilities.getFrame(parentDialog), getPanel(info));
+ Utilities.centerGoldenMean(this, parentDialog);
+ setTitle(title.toString());
+ progressPanel = (ProgressPanel)panel;
+ getRootPane().setDefaultButton(progressPanel.closeButton);
+ }
+
+ /**
+ * Creates the panel that will be contained in the dialog.
+ * @param info the control panel information.
+ * @return the panel that will be contained in the dialog.
+ */
+ private static StatusGenericPanel getPanel(ControlPanelInfo info)
+ {
+ ProgressPanel panel = new ProgressPanel();
+ panel.setInfo(info);
+ return panel;
+ }
+
+ /**
+ * Adds two print stream listeners.
+ * @param outPrintStream the output stream listener.
+ * @param errorPrintStream the error stream listener.
+ */
+ public void addPrintStreamListeners(ApplicationPrintStream outPrintStream,
+ ApplicationPrintStream errorPrintStream)
+ {
+ errorPrintStream.addListener(new PrintStreamListener()
+ {
+ public void newLine(final String msg)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ progressPanel.appendErrorLine(msg);
+ }
+ });
+ }
+ });
+ outPrintStream.addListener(new PrintStreamListener()
+ {
+ public void newLine(final String msg)
+ {
+ /**
+ * {@inheritDoc}
+ */
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ progressPanel.appendOutputLine(msg);
+ }
+ });
+ }
+ });
+ }
+
+ /**
+ * Returns the progress bar of the dialog.
+ * @return the progress bar of the dialog.
+ */
+ public JProgressBar getProgressBar()
+ {
+ return progressPanel.getProgressBar();
+ }
+
+ /**
+ * Appends some text in HTML format to the 'Details' section of the dialog.
+ * @param text the text in HTML format to be appended.
+ */
+ public void appendProgressHtml(String text)
+ {
+ progressPanel.appendHtml(text);
+ }
+
+ /**
+ * Resets the contents of the 'Details' section of the dialog.
+ *
+ */
+ public void resetProgressLogs()
+ {
+ progressPanel.resetLogs();
+ }
+
+ /**
+ * Sets the text to be displayed in the summary area of the progress
+ * dialog.
+ * @param text the text to be displayed.
+ */
+ public void setSummary(Message text)
+ {
+ progressPanel.setSummary(text);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setEnabledClose(boolean enable)
+ {
+ progressPanel.closeButton.setEnabled(enable);
+ }
+
+ /**
+ * Note: this will make the dialog to be closed asynchronously. So that
+ * sequential calls to setTaskIsOver(true) and setTaskIsOver(false) on the
+ * event thread are guaranteed not to close the dialog.
+ * @param taskIsOver whether the task is finished or not.
+ */
+ public void setTaskIsOver(boolean taskIsOver)
+ {
+ progressPanel.taskIsOver = taskIsOver;
+ progressPanel.closeWhenOverClicked();
+ }
+
+ /**
+ * The panel contained in the progress dialog.
+ *
+ */
+ static class ProgressPanel extends StatusGenericPanel
+ {
+ private static final long serialVersionUID = -364496083928260306L;
+ private BasicExpander details;
+ private JEditorPane logs;
+ private JScrollPane scroll;
+ private JCheckBox closeWhenOver;
+ private final String LASTID = "lastid";
+ private final String INIT_TEXT = "<span id=\""+LASTID+
+ "\" style=\"bold\"> </span>";
+ private JProgressBar progressBar;
+ private Component extraStrut;
+ private JButton closeButton;
+ private static final String FAKE_PROGRESS_TEXT =
+ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"+
+ "<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>"+
+ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+ private int heightDiff;
+ private int lastCollapsedHeight = -1;
+ private int lastExpandedHeight = -1;
+
+ private static boolean lastShowDetails = false;
+ private static boolean lastCloseWhenOver = false;
+
+ private boolean taskIsOver;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public ProgressPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresBorder()
+ {
+ return false;
+ }
+
+ /**
+ * Appends a line to the logs (Details are) section of the panel. The text
+ * will be preceded by a new line (is similar to println()).
+ * @param msg the HTML formatted text to be appended.
+ */
+ public void appendErrorLine(String msg)
+ {
+ HTMLDocument doc = (HTMLDocument)logs.getDocument();
+ msg = Utilities.applyFont(msg+"<br>", ColorAndFontConstants.progressFont);
+ try
+ {
+ doc.insertBeforeStart(doc.getElement(LASTID), msg);
+ }
+ catch (Throwable t)
+ {
+ // Bug
+ t.printStackTrace();
+ }
+ }
+
+ /**
+ * Sets the text to be displayed in the summary area of the progress
+ * dialog.
+ * @param msg the text to be displayed.
+ */
+ public void setSummary(Message msg)
+ {
+ errorPane.setText(msg.toString());
+ }
+
+ /**
+ * Appends a line to the logs (Details are) section of the panel. The text
+ * will be preceded by a new line (is similar to println()).
+ * @param msg the HTML formatted text to be appended.
+ */
+ public void appendOutputLine(String msg)
+ {
+ appendErrorLine(msg);
+ }
+
+ /**
+ * Appends text to the logs (Details are) section of the panel. The text
+ * will be appended as it is (is similar to print()).
+ * @param msg the HTML formatted text to be appended.
+ */
+ public void appendHtml(String msg)
+ {
+ HTMLDocument doc = (HTMLDocument)logs.getDocument();
+
+ try
+ {
+ doc.insertBeforeStart(doc.getElement(LASTID), msg);
+ }
+ catch (Throwable t)
+ {
+ // Bug
+ t.printStackTrace();
+ }
+ }
+
+ /**
+ * Resets the contents of the logs (Details) section.
+ *
+ */
+ public void resetLogs()
+ {
+ logs.setText(INIT_TEXT);
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated
+ * here).
+ *
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ addErrorPane(gbc);
+
+ errorPane.setVisible(true);
+ errorPane.setText(Utilities.applyFont(
+ INFO_CTRL_PANEL_PLEASE_WAIT_SUMMARY.get().toString(),
+ ColorAndFontConstants.defaultFont));
+
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridwidth = 1;
+ gbc.gridx = 0;
+ gbc.gridy = 1;
+
+ progressBar = new JProgressBar();
+ progressBar.setMaximum(100);
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets = new Insets(10, 20, 0, 30);
+ add(progressBar, gbc);
+
+ gbc.insets.top = 10;
+ gbc.insets.bottom = 5;
+ details =
+ new BasicExpander(INFO_CTRL_PANEL_PROGRESS_DIALOG_DETAILS_LABEL.get());
+ gbc.gridy ++;
+ add(details, gbc);
+
+ logs = Utilities.makeHtmlPane(FAKE_PROGRESS_TEXT,
+ ColorAndFontConstants.progressFont);
+ gbc.gridy ++;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets.top = 5;
+ gbc.insets.right = 20;
+ gbc.insets.bottom = 5;
+ scroll = Utilities.createScrollPane(logs);
+ scroll.setOpaque(false);
+ scroll.getViewport().setOpaque(false);
+ add(scroll, gbc);
+ Dimension scrollDim = scroll.getPreferredSize();
+
+ gbc.weighty = 1.0;
+ extraStrut = Box.createRigidArea(new Dimension(scrollDim.width, 50));
+ add(extraStrut, gbc);
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ add(Box.createHorizontalStrut(scrollDim.width), gbc);
+
+ heightDiff = scrollDim.height - extraStrut.getHeight();
+
+ logs.setText(INIT_TEXT);
+
+ scroll.setPreferredSize(scrollDim);
+
+ updateVisibility(lastShowDetails);
+ details.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ lastShowDetails = details.isSelected();
+ updateVisibility(lastShowDetails);
+ }
+ });
+
+// The button panel
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ gbc.insets = new Insets(0, 0, 0, 0);
+ add(createButtonsPanel(), gbc);
+ }
+
+ private JPanel createButtonsPanel()
+ {
+ JPanel buttonsPanel = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.gridwidth = 1;
+ gbc.gridy = 0;
+ closeWhenOver = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_CLOSE_WINDOW_WHEN_OPERATION_COMPLETES_LABEL.get());
+ closeWhenOver.setOpaque(false);
+ closeWhenOver.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ closeWhenOverClicked();
+ }
+ });
+ closeWhenOver.setSelected(lastCloseWhenOver);
+ gbc.insets = new Insets(10, 10, 10, 10);
+ buttonsPanel.add(closeWhenOver, gbc);
+ gbc.weightx = 1.0;
+ gbc.gridx ++;
+ buttonsPanel.add(Box.createHorizontalStrut(150));
+ buttonsPanel.add(Box.createHorizontalGlue(), gbc);
+ buttonsPanel.setOpaque(true);
+ buttonsPanel.setBackground(ColorAndFontConstants.greyBackground);
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ buttonsPanel.add(Box.createHorizontalStrut(100));
+ gbc.gridx ++;
+ closeButton = Utilities.createButton(INFO_CLOSE_BUTTON_LABEL.get());
+ closeButton.setOpaque(false);
+ gbc.gridx ++;
+ gbc.insets.left = 5;
+ gbc.insets.right = 10;
+ buttonsPanel.add(closeButton, gbc);
+ closeButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ closeClicked();
+ }
+ });
+
+ buttonsPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0,
+ ColorAndFontConstants.defaultBorderColor));
+
+ return buttonsPanel;
+ }
+
+ private void updateVisibility(boolean showDetails)
+ {
+ scroll.setVisible(showDetails);
+ extraStrut.setVisible(!showDetails);
+ details.setSelected(showDetails);
+ if (showDetails)
+ {
+ Window dialog = Utilities.getParentDialog(this);
+ if (dialog != null)
+ {
+ lastCollapsedHeight = dialog.getSize().height;
+ if (lastExpandedHeight == -1)
+ {
+ dialog.setSize(new Dimension(dialog.getSize().width,
+ dialog.getSize().height + heightDiff));
+ }
+ else
+ {
+ dialog.setSize(new Dimension(dialog.getSize().width,
+ lastExpandedHeight));
+ }
+ }
+ }
+ else
+ {
+ Window dialog = Utilities.getParentDialog(this);
+ if (dialog != null)
+ {
+ lastExpandedHeight = dialog.getSize().height;
+ if (lastCollapsedHeight == -1)
+ {
+ packParentDialog();
+ }
+ else
+ {
+ dialog.setSize(new Dimension(dialog.getSize().width,
+ lastCollapsedHeight));
+ }
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return details;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+
+ /**
+ * Returns the progress bar of the dialog.
+ * @return the progress bar of the dialog.
+ */
+ public JProgressBar getProgressBar()
+ {
+ return progressBar;
+ }
+
+ /**
+ * Checks if the 'Close when over' checkbox is selected and if it is the
+ * case, closes the dialog after waiting for 2 seconds (so that the user
+ * can see the result, or cancel the automatic closing of the dialog).
+ *
+ */
+ private void closeWhenOverClicked()
+ {
+ lastCloseWhenOver = closeWhenOver.isSelected();
+ if (lastCloseWhenOver && taskIsOver)
+ {
+ Thread t = new Thread(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ try
+ {
+ Thread.sleep(2000);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ if (closeWhenOver.isSelected() && taskIsOver)
+ {
+ closeClicked();
+ }
+ }
+ });
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ });
+ t.start();
+ }
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
new file mode 100644
index 0000000..6ee5966
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
@@ -0,0 +1,372 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.SortedSet;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.CategorizedComboBoxElement;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.datamodel.SortableListModel;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.IndexModifiedEvent;
+import org.opends.guitools.controlpanel.event.IndexModifiedListener;
+import org.opends.guitools.controlpanel.task.RebuildIndexTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.components.AddRemovePanel;
+import org.opends.guitools.controlpanel.ui.renderer.CustomListCellRenderer;
+import org.opends.guitools.controlpanel.ui.renderer.IndexCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The panel that appears when the user wants to rebuild indexes.
+ *
+ */
+public class RebuildIndexPanel extends StatusGenericPanel
+implements IndexModifiedListener
+{
+ private static final long serialVersionUID = -4805445967165643375L;
+ private JComboBox baseDNs;
+ private AddRemovePanel<AbstractIndexDescriptor> addRemove;
+
+ private JLabel lBaseDN;
+ private JLabel lIndexes;
+ private JLabel lNoBaseDNsFound;
+
+ private HashMap<String, SortedSet<AbstractIndexDescriptor>> hmIndexes =
+ new HashMap<String, SortedSet<AbstractIndexDescriptor>>();
+
+ /**
+ * Constructor of the panel.
+ *
+ */
+ public RebuildIndexPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void indexModified(IndexModifiedEvent ev)
+ {
+ refreshContents(getInfo().getServerDescriptor());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void backendIndexesModified(IndexModifiedEvent ev)
+ {
+ refreshContents(getInfo().getServerDescriptor());
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 3;
+ addErrorPane(gbc);
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.NONE;
+ lBaseDN = Utilities.createPrimaryLabel(INFO_CTRL_PANEL_BASE_DN_LABEL.get());
+ add(lBaseDN, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridy = 0;
+ baseDNs = Utilities.createComboBox();
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ baseDNs.setModel(model);
+ baseDNs.setRenderer(new CustomListCellRenderer(baseDNs));
+ ItemListener listener = new IgnoreItemListener(baseDNs);
+ baseDNs.addItemListener(listener);
+ baseDNs.addItemListener(new ItemListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void itemStateChanged(ItemEvent ev)
+ {
+ comboBoxSelected(hmIndexes,
+ (CategorizedComboBoxElement)baseDNs.getSelectedItem(),
+ addRemove);
+ }
+ });
+ listener.itemStateChanged(null);
+ add(baseDNs, gbc);
+ lNoBaseDNsFound = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NO_BASE_DNS_FOUND_LABEL.get());
+ add(lNoBaseDNsFound, gbc);
+ lNoBaseDNsFound.setVisible(false);
+
+ lIndexes =
+ Utilities.createPrimaryLabel(INFO_CTRL_PANEL_INDEXES_LABEL.get());
+ gbc.insets.top = 10;
+ gbc.insets.left = 0;
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.gridwidth = 1;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ add(lIndexes, gbc);
+
+ addRemove = new AddRemovePanel<AbstractIndexDescriptor>(
+ AbstractIndexDescriptor.class);
+ addRemove.getAvailableLabel().setText(
+ INFO_CTRL_PANEL_AVAILABLE_INDEXES_LABEL.get().toString());
+ addRemove.getSelectedLabel().setText(
+ INFO_CTRL_PANEL_SELECTED_INDEXES_LABEL.get().toString());
+
+ gbc.gridx = 1;
+ gbc.weightx = 1.0;
+ gbc.weighty = 0.0;
+ gbc.gridwidth = 1;
+ gbc.insets.top = 10;
+ gbc.insets.left = 10;
+ gbc.fill = GridBagConstraints.BOTH;
+ add(addRemove, gbc);
+
+ gbc.gridy ++;
+ gbc.insets.top = 3;
+ JLabel explanation = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_REQUIRES_REBUILD_LEGEND.get());
+ add(explanation, gbc);
+
+ addBottomGlue(gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ super.setInfo(info);
+ ListCellRenderer indexCellRenderer = new IndexCellRenderer(
+ addRemove.getAvailableList(), info);
+ addRemove.getAvailableList().setCellRenderer(indexCellRenderer);
+ addRemove.getSelectedList().setCellRenderer(indexCellRenderer);
+ info.addIndexModifiedListener(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_REBUILD_INDEXES_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return baseDNs;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ ServerDescriptor desc = ev.getNewDescriptor();
+ refreshContents(desc);
+ }
+
+ /**
+ * Refresh the contents of the panel with the provided server descriptor.
+ * @param desc the server descriptor.
+ */
+ private void refreshContents(ServerDescriptor desc)
+ {
+ updateIndexMap(desc, hmIndexes);
+ updateBaseDNComboBoxModel((DefaultComboBoxModel)baseDNs.getModel(), desc);
+
+ // Check that all backends
+ boolean allDisabled = false;
+ for (BackendDescriptor backend : desc.getBackends())
+ {
+ if (displayBackend(backend))
+ {
+ if (backend.isEnabled())
+ {
+ allDisabled = false;
+ break;
+ }
+ }
+ }
+ if (!allDisabled)
+ {
+ updateErrorPaneAndOKButtonIfAuthRequired(desc,
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_DISABLE_BACKEND.get());
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ boolean comboVisible = baseDNs.getModel().getSize() > 0;
+ baseDNs.setVisible(comboVisible);
+ lNoBaseDNsFound.setVisible(!comboVisible);
+ addRemove.getAvailableList().repaint();
+ addRemove.getSelectedList().repaint();
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(lBaseDN);
+ setSecondaryValid(addRemove.getSelectedLabel());
+ super.cancelClicked();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ setPrimaryValid(lBaseDN);
+ setSecondaryValid(addRemove.getSelectedLabel());
+
+ final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+
+ String baseDN = getSelectedBaseDN();
+
+ if (baseDN == null)
+ {
+ setPrimaryInvalid(lBaseDN);
+ if (baseDNs.getItemCount() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BASE_DNS_DEFINED_LABEL.get());
+ }
+ else
+ {
+ errors.add(ERR_CTRL_PANEL_MUST_SELECT_BASE_DN.get());
+ }
+ }
+
+ SortableListModel<AbstractIndexDescriptor> model =
+ addRemove.getSelectedListModel();
+ if (model.getSize() == 0)
+ {
+ setSecondaryInvalid(addRemove.getSelectedLabel());
+ errors.add(ERR_CTRL_PANEL_MUST_SELECT_INDEX_TO_REBUILD.get());
+ }
+
+ if (errors.isEmpty())
+ {
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this), getTitle(), getInfo());
+ HashSet<String> baseDNs = new HashSet<String>();
+ baseDNs.add(getSelectedBaseDN());
+ RebuildIndexTask newTask = new RebuildIndexTask(getInfo(), progressDialog,
+ baseDNs, addRemove.getSelectedListModel().getData());
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ boolean confirmed = true;
+
+ if ((errors.isEmpty()) && isServerRunning())
+ {
+ String backendName = newTask.getBackends().iterator().next();
+ confirmed = displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_CONFIRM_REBUILD_INDEX_DETAILS.get(backendName));
+ }
+ if ((errors.isEmpty()) && confirmed)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_REBUILDING_INDEXES_SUMMARY.get(baseDN),
+ INFO_CTRL_PANEL_REBUILDING_INDEXES_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_REBUILDING_INDEXES_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_REBUILDING_INDEXES_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_REBUILDING_INDEXES_ERROR_DETAILS,
+ progressDialog);
+ progressDialog.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected boolean displayBackend(BackendDescriptor backend)
+ {
+ return !backend.isConfigBackend() &&
+ (backend.getType() == BackendDescriptor.Type.LOCAL_DB);
+ }
+
+ private String getSelectedBaseDN()
+ {
+ String dn = null;
+ CategorizedComboBoxElement o =
+ (CategorizedComboBoxElement)baseDNs.getSelectedItem();
+ if (o != null)
+ {
+ dn = (String)o.getValue();
+ }
+ return dn;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
new file mode 100644
index 0000000..e837a59
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
@@ -0,0 +1,220 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.util.ArrayList;
+
+import javax.swing.JLabel;
+import javax.swing.JPasswordField;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.ResetUserPasswordTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * Panel that appears when the user wants to change the password of a user.
+ *
+ */
+public class ResetUserPasswordPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 8733172823605832626L;
+ private JLabel dn = Utilities.createDefaultLabel();
+ private JLabel name = Utilities.createDefaultLabel();
+ private JLabel lPassword = Utilities.createPrimaryLabel();
+ private JLabel lConfirmPassword = Utilities.createPrimaryLabel();
+ private JPasswordField password = Utilities.createPasswordField(25);
+ private JPasswordField confirmPassword = Utilities.createPasswordField(25);
+
+ private BasicNode node;
+ private BrowserController controller;
+
+ /**
+ * Constructor of the panel.
+ *
+ */
+ public ResetUserPasswordPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * Sets the node representing the entry that the user wants to modify the
+ * password from.
+ * @param node the node.
+ * @param controller the browser controller.
+ */
+ public void setValue(BasicNode node, BrowserController controller)
+ {
+ this.node = node;
+ this.controller = controller;
+ setPrimaryValid(lPassword);
+ setPrimaryValid(lConfirmPassword);
+
+ dn.setText(node.getDN());
+ name.setText(node.getDisplayName());
+
+ password.setText("");
+ confirmPassword.setText("");
+
+ packParentDialog();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return password;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ final ArrayList<Message> errors = new ArrayList<Message>();
+
+ setPrimaryValid(lPassword);
+ setPrimaryValid(lConfirmPassword);
+
+ String pwd1 = new String(password.getPassword());
+ String pwd2 = new String(confirmPassword.getPassword());
+
+ if (pwd1.length() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_NEW_PASSWORD_REQUIRED.get());
+ setPrimaryInvalid(lPassword);
+ }
+ else if (pwd1.equals(pwd2))
+ {
+ errors.add(ERR_CTRL_PANEL_PASSWORD_DO_NOT_MATCH.get());
+ setPrimaryInvalid(lPassword);
+ setPrimaryInvalid(lConfirmPassword);
+ }
+ if (errors.size() == 0)
+ {
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_RESET_USER_PASSWORD_TITLE.get(),
+ getInfo());
+ ResetUserPasswordTask newTask =
+ new ResetUserPasswordTask(getInfo(), dlg, node, controller,
+ password.getPassword());
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.size() == 0)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_RESETTING_USER_PASSWORD_SUMMARY.get(),
+ INFO_CTRL_PANEL_RESETTING_USER_PASSWORD_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_RESETTING_USER_PASSWORD_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_RESETTING_USER_PASSWORD_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_RESETTING_USER_PASSWORD_ERROR_DETAILS.get(),
+ null,
+ dlg);
+ Utilities.getParentDialog(this).setVisible(false);
+ dlg.setVisible(true);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_RESET_USER_PASSWORD_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+
+ Message[] strings =
+ {
+ INFO_CTRL_PANEL_RESET_USER_PASSWORD_DN_LABEL.get(),
+ INFO_CTRL_PANEL_RESET_USER_PASSWORD_NAME_LABEL.get(),
+ INFO_CTRL_PANEL_RESET_USER_PASSWORD_PWD_LABEL.get(),
+ INFO_CTRL_PANEL_RESET_USER_PASSWORD_CONFIRM_LABEL.get()
+ };
+ JLabel[] labels = {null, null, lPassword, lConfirmPassword};
+ Component[] comps = {dn, name, password, confirmPassword};
+
+ for (int i=0; i<strings.length; i++)
+ {
+ if (labels[i] == null)
+ {
+ labels[i] = Utilities.createPrimaryLabel(strings[i]);
+ }
+
+ gbc.gridx = 0;
+ gbc.insets.left = 0;
+ gbc.weightx = 0.0;
+ add(labels[i], gbc);
+ gbc.insets.left = 10;
+ gbc.gridx ++;
+ gbc.weightx = 1.0;
+ add(comps[i], gbc);
+
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ }
+
+ addBottomGlue(gbc);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
new file mode 100644
index 0000000..8a6ff67
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
@@ -0,0 +1,465 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.GridBagConstraints;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.swing.SwingUtilities;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackupDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.event.BackupCreatedEvent;
+import org.opends.guitools.controlpanel.event.BackupCreatedListener;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.tools.RestoreDB;
+
+/**
+ * The panel that appears when the user wants to restore from a backup.
+ *
+ */
+public class RestorePanel extends BackupListPanel
+implements BackupCreatedListener
+{
+ private static final long serialVersionUID = -205585323128518051L;
+ private ListSelectionListener listener;
+
+ /**
+ * Constructor of the panel.
+ *
+ */
+ public RestorePanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_RESTORE_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void backupCreated(BackupCreatedEvent ev)
+ {
+ boolean refreshList = false;
+ File f = new File(parentDirectory.getText());
+ File fBackup = ev.getBackupDescriptor().getPath();
+ if (fBackup.equals(f))
+ {
+ refreshList = true;
+ }
+ else
+ {
+ f = f.getParentFile();
+ if (f != null)
+ {
+ refreshList = fBackup.equals(f);
+ }
+ }
+ if (refreshList && isVisible())
+ {
+ // If not visible the list will be refreshed next time the dialog is
+ // opened.
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ refreshList();
+ }
+ });
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ super.setInfo(info);
+ info.addBackupCreatedListener(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ if (visible)
+ {
+ listener.valueChanged(null);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ super.configurationChanged(ev);
+ updateErrorPaneAndOKButtonIfAuthRequired(getInfo().getServerDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_RESTORE.get());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void verifyBackupClicked()
+ {
+ LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+// Launch the task in another progress dialog.
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_VERIFY_BACKUP_TITLE.get(),
+ getInfo());
+ RestoreTask newTask = new RestoreTask(getInfo(), dlg, true);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ BackupDescriptor backup = getSelectedBackup();
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_VERIFYING_BACKUP_SUMMARY.get(backup.getID()),
+ INFO_CTRL_PANEL_VERIFYING_BACKUP_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_VERIFYING_BACKUP_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_VERIFYING_BACKUP_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_VERIFYING_BACKUP_ERROR_DETAILS,
+ dlg);
+ dlg.setVisible(true);
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+
+ gbc.gridwidth = 3;
+ addErrorPane(gbc);
+
+ super.createLayout(gbc);
+
+ listener = new ListSelectionListener()
+ {
+ public void valueChanged(ListSelectionEvent ev)
+ {
+ BackupDescriptor backup = getSelectedBackup();
+ setEnabledOK((backup != null) && !errorPane.isVisible());
+ }
+ };
+ backupList.getSelectionModel().addListSelectionListener(listener);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void checkOKButtonEnable()
+ {
+ listener.valueChanged(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ setPrimaryValid(lPath);
+ setPrimaryValid(lAvailableBackups);
+
+ final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+
+ BackupDescriptor backup = getSelectedBackup();
+
+ boolean selected = backupList.isVisible() && (backup != null);
+ if (!selected)
+ {
+ if (backupList.getRowCount() == 0)
+ {
+ setPrimaryInvalid(lPath);
+ errors.add(ERR_CTRL_PANEL_NO_PARENT_BACKUP_TO_VERIFY.get());
+ }
+ else
+ {
+ errors.add(ERR_CTRL_PANEL_REQUIRED_BACKUP_TO_VERIFY.get());
+ }
+ setPrimaryInvalid(lAvailableBackups);
+ }
+
+ if (errors.isEmpty())
+ {
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this), getTitle(), getInfo());
+ RestoreTask newTask = new RestoreTask(getInfo(), progressDialog, false);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+// Ask for confirmation
+ boolean confirmed = true;
+ if (errors.isEmpty())
+ {
+ confirmed = displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_CONFIRM_RESTORE_DETAILS.get());
+ }
+
+ if ((errors.isEmpty()) && confirmed)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_RESTORING_SUMMARY.get(backup.getID()),
+ INFO_CTRL_PANEL_RESTORING_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_RESTORING_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_RESTORING_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_RESTORING_ERROR_DETAILS,
+ progressDialog);
+ progressDialog.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(lPath);
+ setPrimaryValid(lAvailableBackups);
+
+ super.cancelClicked();
+ }
+
+ /**
+ * The task in charge of restoring or verifying the backup.
+ *
+ */
+ protected class RestoreTask extends Task
+ {
+ private Set<String> backendSet;
+ private String dir;
+ private String backupID;
+ private boolean verify;
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ * @param verify whether this is an actual restore or a verify of the
+ * backup.
+ */
+ public RestoreTask(ControlPanelInfo info, ProgressDialog dlg,
+ boolean verify)
+ {
+ super(info, dlg);
+ this.verify = verify;
+ dir = parentDirectory.getText();
+ BackupDescriptor backup = getSelectedBackup();
+ backupID = backup.getID();
+ backendSet = new HashSet<String>();
+ for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
+ {
+ if (!backend.isConfigBackend())
+ {
+ backendSet.add(backend.getBackendID());
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.RESTORE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ if (verify)
+ {
+ return INFO_CTRL_PANEL_VERIFY_TASK_DESCRIPTION.get(backupID, dir);
+ }
+ else
+ {
+ return INFO_CTRL_PANEL_RESTORE_TASK_DESCRIPTION.get(backupID, dir);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+ try
+ {
+ ArrayList<String> arguments = getCommandLineArguments();
+
+ String[] args = new String[arguments.size()];
+
+ arguments.toArray(args);
+ if (isServerRunning())
+ {
+ returnCode = RestoreDB.mainRestoreDB(args, false, outPrintStream,
+ errorPrintStream);
+ }
+ else
+ {
+ returnCode = executeCommandLine(getCommandLinePath(), args);
+ }
+ if (returnCode != 0)
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ if (!verify)
+ {
+ for (String backend : getBackends())
+ {
+ getInfo().unregisterModifiedIndexesInBackend(backend);
+ }
+ }
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+
+ args.add("--backupDirectory");
+ args.add(dir);
+
+ args.add("--backupID");
+ args.add(backupID);
+
+ if (verify)
+ {
+ args.add("--dry-run");
+ }
+
+ args.addAll(getConnectionCommandLineArguments());
+
+ if (isServerRunning())
+ {
+ args.addAll(getConfigCommandLineArguments());
+ }
+
+ return args;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return getCommandLinePath("restore");
+ }
+ };
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
new file mode 100644
index 0000000..1087296
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
@@ -0,0 +1,375 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+
+import javax.swing.JPanel;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.SchemaElementSelectionListener;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.api.AttributeSyntax;
+import org.opends.server.api.MatchingRule;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.Schema;
+
+/**
+ * The panel on the right of the 'Manage Schema' panel.
+ *
+ */
+public class SchemaBrowserRightPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 5294502011852239497L;
+ private JPanel mainPanel;
+ private StandardObjectClassPanel standardObjectClassPanel =
+ new StandardObjectClassPanel();
+ private ConfigurationObjectClassPanel configurationObjectClassPanel =
+ new ConfigurationObjectClassPanel();
+ private CustomObjectClassPanel customObjectClassPanel =
+ new CustomObjectClassPanel();
+ private StandardAttributePanel standardAttributePanel =
+ new StandardAttributePanel();
+ private ConfigurationAttributePanel configurationAttributePanel =
+ new ConfigurationAttributePanel();
+ private CustomAttributePanel customAttributePanel =
+ new CustomAttributePanel();
+ private MatchingRulePanel matchingRulePanel = new MatchingRulePanel();
+ private AttributeSyntaxPanel attributeSyntaxPanel =
+ new AttributeSyntaxPanel();
+
+ private NoItemSelectedPanel noEntryPanel = new NoItemSelectedPanel();
+
+ private final String NOTHING_SELECTED = "Nothing Selected";
+
+
+ private SchemaElementPanel schemaElementPanel;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public SchemaBrowserRightPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * Displays a panel containing a message.
+ * @param msg the message.
+ *
+ */
+ public void displayMessage(Message msg)
+ {
+ schemaElementPanel = null;
+ noEntryPanel.setMessage(msg);
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel, NOTHING_SELECTED);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ super.setInfo(info);
+ StatusGenericPanel[] panels = {standardObjectClassPanel,
+ configurationObjectClassPanel, customObjectClassPanel,
+ standardAttributePanel, configurationAttributePanel,
+ customAttributePanel, matchingRulePanel,
+ attributeSyntaxPanel
+ };
+ for (StatusGenericPanel panel : panels)
+ {
+ panel.setInfo(info);
+ }
+ }
+
+ /**
+ * Adds an schema element selection listener.
+ * @param listener the schema element selection listener.
+ */
+ public void addSchemaElementSelectionListener(
+ SchemaElementSelectionListener listener)
+ {
+ standardObjectClassPanel.addSchemaElementSelectionListener(listener);
+ configurationObjectClassPanel.addSchemaElementSelectionListener(listener);
+ customObjectClassPanel.addSchemaElementSelectionListener(listener);
+ standardAttributePanel.addSchemaElementSelectionListener(listener);
+ configurationAttributePanel.addSchemaElementSelectionListener(listener);
+ customAttributePanel.addSchemaElementSelectionListener(listener);
+ matchingRulePanel.addSchemaElementSelectionListener(listener);
+ attributeSyntaxPanel.addSchemaElementSelectionListener(listener);
+ }
+
+ /**
+ * Removes an schema element selection listener.
+ * @param listener the schema element selection listener.
+ */
+ public void removeSchemaElementSelectionListener(
+ SchemaElementSelectionListener listener)
+ {
+ standardObjectClassPanel.removeSchemaElementSelectionListener(listener);
+ configurationObjectClassPanel.removeSchemaElementSelectionListener(
+ listener);
+ customObjectClassPanel.removeSchemaElementSelectionListener(listener);
+ standardAttributePanel.removeSchemaElementSelectionListener(listener);
+ configurationAttributePanel.removeSchemaElementSelectionListener(listener);
+ customAttributePanel.removeSchemaElementSelectionListener(listener);
+ matchingRulePanel.removeSchemaElementSelectionListener(listener);
+ attributeSyntaxPanel.removeSchemaElementSelectionListener(listener);
+ }
+
+ /**
+ * Updates the contents of the panel with the provided standard object class.
+ * @param oc the object class.
+ * @param schema the schema.
+ */
+ public void updateStandardObjectClass(ObjectClass oc, Schema schema)
+ {
+ standardObjectClassPanel.update(oc, schema);
+ schemaElementPanel = standardObjectClassPanel;
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ standardObjectClassPanel.getTitle().toString());
+ }
+
+ /**
+ * Updates the contents of the panel with the provided configuration object
+ * class.
+ * @param oc the object class.
+ * @param schema the schema.
+ */
+ public void updateConfigurationObjectClass(ObjectClass oc, Schema schema)
+ {
+ configurationObjectClassPanel.update(oc, schema);
+ schemaElementPanel = configurationObjectClassPanel;
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ configurationObjectClassPanel.getTitle().toString());
+ }
+
+ /**
+ * Updates the contents of the panel with the provided custom object class.
+ * @param oc the object class.
+ * @param schema the schema.
+ */
+ public void updateCustomObjectClass(ObjectClass oc, Schema schema)
+ {
+ customObjectClassPanel.update(oc, schema);
+ schemaElementPanel = customObjectClassPanel;
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ customObjectClassPanel.getTitle().toString());
+ }
+
+ /**
+ * Updates the contents of the panel with the provided standard attribute.
+ * @param attr the attribute.
+ * @param schema the schema.
+ */
+ public void updateStandardAttribute(AttributeType attr, Schema schema)
+ {
+ standardAttributePanel.update(attr, schema);
+ schemaElementPanel = standardAttributePanel;
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ standardAttributePanel.getTitle().toString());
+ }
+
+ /**
+ * Updates the contents of the panel with the provided configuration
+ * attribute.
+ * @param attr the attribute.
+ * @param schema the schema.
+ */
+ public void updateConfigurationAttribute(AttributeType attr, Schema schema)
+ {
+ configurationAttributePanel.update(attr, schema);
+ schemaElementPanel = configurationAttributePanel;
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ configurationAttributePanel.getTitle().toString());
+ }
+
+ /**
+ * Updates the contents of the panel with the provided custom attribute.
+ * @param attr the attribute.
+ * @param schema the schema.
+ */
+ public void updateCustomAttribute(AttributeType attr, Schema schema)
+ {
+ customAttributePanel.update(attr, schema);
+ schemaElementPanel = customAttributePanel;
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ customAttributePanel.getTitle().toString());
+ }
+
+ /**
+ * Updates the contents of the panel with the provided matching rule.
+ * @param matchingRule the matching rule.
+ * @param schema the schema.
+ */
+ public void updateMatchingRule(MatchingRule matchingRule, Schema schema)
+ {
+ matchingRulePanel.update(matchingRule, schema);
+ schemaElementPanel = matchingRulePanel;
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ matchingRulePanel.getTitle().toString());
+ }
+
+ /**
+ * Updates the contents of the panel with the provided attribute syntax.
+ * @param syntax the attribute syntax.
+ * @param schema the schema.
+ */
+ public void updateAttributeSyntax(AttributeSyntax syntax, Schema schema)
+ {
+ attributeSyntaxPanel.update(syntax, schema);
+ schemaElementPanel = attributeSyntaxPanel;
+ ((CardLayout)mainPanel.getLayout()).show(mainPanel,
+ attributeSyntaxPanel.getTitle().toString());
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ CardLayout cardLayout = new CardLayout();
+ mainPanel = new JPanel(cardLayout);
+ mainPanel.setOpaque(false);
+ noEntryPanel.setMessage(
+ INFO_CTRL_PANEL_NO_SCHEMA_ITEM_SELECTED_LABEL.get());
+ mainPanel.add(noEntryPanel, NOTHING_SELECTED);
+ StatusGenericPanel[] panelsWithScroll =
+ {
+ standardObjectClassPanel,
+ configurationObjectClassPanel,
+ standardAttributePanel,
+ configurationAttributePanel,
+ matchingRulePanel,
+ attributeSyntaxPanel
+ };
+ StatusGenericPanel[] panelsWithNoScroll =
+ {
+ customObjectClassPanel,
+ customAttributePanel
+ };
+ for (StatusGenericPanel panel : panelsWithScroll)
+ {
+ mainPanel.add(Utilities.createBorderLessScrollBar(panel),
+ panel.getTitle().toString());
+ }
+ for (StatusGenericPanel panel : panelsWithNoScroll)
+ {
+ mainPanel.add(panel, panel.getTitle().toString());
+ }
+ cardLayout.show(mainPanel, NOTHING_SELECTED);
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ add(mainPanel, gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ // No ok button
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_SCHEMA_BROWSER_RIGHT_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ // TODO
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * Method used to know if there are unsaved changes or not. It is used by
+ * the schema selection listener when the user changes the selection.
+ * @return <CODE>true</CODE> if there are unsaved changes (and so the
+ * selection of the schema should be canceled) and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean mustCheckUnsavedChanges()
+ {
+ return (schemaElementPanel != null) &&
+ schemaElementPanel.mustCheckUnsavedChanges();
+ }
+
+ /**
+ * Tells whether the user chose to save the changes in the panel, to not save
+ * them or simply cancelled the selection in the tree.
+ * @return the value telling whether the user chose to save the changes in the
+ * panel, to not save them or simply cancelled the selection in the tree.
+ */
+ public UnsavedChangesDialog.Result checkUnsavedChanges()
+ {
+ if (schemaElementPanel == null)
+ {
+ return UnsavedChangesDialog.Result.DO_NOT_SAVE;
+ }
+ else
+ {
+ return schemaElementPanel.checkUnsavedChanges();
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
new file mode 100644
index 0000000..1a0699d
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
@@ -0,0 +1,109 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+
+import org.opends.guitools.controlpanel.event.SchemaElementSelectionEvent;
+import org.opends.guitools.controlpanel.event.SchemaElementSelectionListener;
+
+/**
+ * Abstract class used to refactor some code among the panels that display the
+ * contents of a schema element.
+ *
+ */
+public abstract class SchemaElementPanel extends StatusGenericPanel
+{
+ private Set<SchemaElementSelectionListener> listeners =
+ new HashSet<SchemaElementSelectionListener>();
+
+ /**
+ * The empty border shared by all the schema element panels.
+ */
+ protected Border PANEL_BORDER = new EmptyBorder(10, 10, 10, 10);
+
+ /**
+ * Adds a schema element selection listener.
+ * @param listener the listener.
+ */
+ public void addSchemaElementSelectionListener(
+ SchemaElementSelectionListener listener)
+ {
+ listeners.add(listener);
+ }
+
+ /**
+ * Removes a schema element selection listener.
+ * @param listener the listener.
+ */
+ public void removeSchemaElementSelectionListener(
+ SchemaElementSelectionListener listener)
+ {
+ listeners.add(listener);
+ }
+
+ /**
+ * Notifies to all the listeners that a new schema element was selected.
+ * @param schemaElement the new schema element that has been selected.
+ */
+ protected void notifySchemaSelectionListeners(Object schemaElement)
+ {
+ for (SchemaElementSelectionListener listener : listeners)
+ {
+ listener.schemaElementSelected(
+ new SchemaElementSelectionEvent(this, schemaElement));
+ }
+ }
+
+ /**
+ * Method used to know if there are unsaved changes or not. It is used by
+ * the schema selection listener when the user changes the selection.
+ * @return <CODE>true</CODE> if there are unsaved changes (and so the
+ * selection of the schema should be canceled) and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean mustCheckUnsavedChanges()
+ {
+ return false;
+ }
+
+ /**
+ * Tells whether the user chose to save the changes in the panel, to not save
+ * them or simply cancelled the selection in the tree.
+ * @return the value telling whether the user chose to save the changes in the
+ * panel, to not save them or simply cancelled the selection in the tree.
+ */
+ public UnsavedChangesDialog.Result checkUnsavedChanges()
+ {
+ return UnsavedChangesDialog.Result.DO_NOT_SAVE;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
new file mode 100644
index 0000000..7c3e77d
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -0,0 +1,2088 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.DropTargetListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.io.StringReader;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.JTextComponent;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.datamodel.BinaryValue;
+import org.opends.guitools.controlpanel.datamodel.CheckEntrySyntaxException;
+import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
+import org.opends.guitools.controlpanel.datamodel.ObjectClassValue;
+import org.opends.guitools.controlpanel.event.ScrollPaneBorderListener;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.guitools.controlpanel.ui.components.BinaryCellPanel;
+import org.opends.guitools.controlpanel.ui.components.ObjectClassCellPanel;
+import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
+import org.opends.guitools.controlpanel.ui.nodes.DndBrowserNodes;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.server.schema.SchemaConstants;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.RDN;
+import org.opends.server.types.Schema;
+import org.opends.server.util.Base64;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * The panel displaying a simplified view of an entry.
+ *
+ */
+public class SimplifiedViewEntryPanel extends ViewEntryPanel
+{
+ private static final long serialVersionUID = 2775960608128921072L;
+ private JPanel attributesPanel;
+ private ScrollPaneBorderListener scrollListener;
+ private GenericDialog binaryDlg;
+ private BinaryValuePanel binaryPanel;
+ private GenericDialog editBinaryDlg;
+ private BinaryAttributeEditorPanel editBinaryPanel;
+ private GenericDialog editOcDlg;
+ private ObjectClassEditorPanel editOcPanel;
+ private JLabel requiredLabel;
+ private JCheckBox showOnlyAttrsWithValues;
+
+ private DropTargetListener dropTargetListener;
+
+ private GenericDialog browseEntriesDlg;
+ private LDAPEntrySelectionPanel browseEntriesPanel;
+
+ private Map<String, Set<String>> lastUserPasswords =
+ new HashMap<String,Set<String>>();
+
+ private CustomSearchResult searchResult;
+ private boolean isReadOnly;
+ private TreePath treePath;
+ private JScrollPane scrollAttributes;
+
+ private LinkedHashMap<String, Set<EditorComponent>> hmEditors =
+ new LinkedHashMap<String, Set<EditorComponent>>();
+
+ private Set<String> requiredAttrs = new HashSet<String>();
+ private Map<String, JComponent> hmLabels = new HashMap<String, JComponent>();
+ private Map<String, String> hmDisplayedNames = new HashMap<String, String>();
+ private Map<String, JComponent> hmComponents =
+ new HashMap<String, JComponent>();
+
+ private final String CONFIRM_PASSWORD = "confirm password";
+
+ // Map containing as key the attribute name and as value a localizable
+ // message.
+ static Map<String, Message> hmFriendlyAttrNames =
+ new HashMap<String, Message>();
+ // Map containing as key an object class and as value the preferred naming
+ // attribute for the objectclass.
+ static Map<String, String> hmNameAttrNames = new HashMap<String, String>();
+ static Map<String, String[]> hmOrdereredAttrNames =
+ new HashMap<String, String[]>();
+ static
+ {
+ hmFriendlyAttrNames.put(ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME,
+ INFO_CTRL_PANEL_OBJECTCLASS_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_COMMON_NAME,
+ INFO_CTRL_PANEL_CN_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("givenname",
+ INFO_CTRL_PANEL_GIVENNAME_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("sn",
+ INFO_CTRL_PANEL_SN_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("uid",
+ INFO_CTRL_PANEL_UID_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("employeenumber",
+ INFO_CTRL_PANEL_EMPLOYEENUMBER_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("userpassword",
+ INFO_CTRL_PANEL_USERPASSWORD_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("authpassword",
+ INFO_CTRL_PANEL_AUTHPASSWORD_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("mail",
+ INFO_CTRL_PANEL_MAIL_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("street",
+ INFO_CTRL_PANEL_STREET_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("l",
+ INFO_CTRL_PANEL_L_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("st",
+ INFO_CTRL_PANEL_ST_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("postalcode",
+ INFO_CTRL_PANEL_POSTALCODE_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("mobile",
+ INFO_CTRL_PANEL_MOBILE_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("homephone",
+ INFO_CTRL_PANEL_HOMEPHONE_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("telephonenumber",
+ INFO_CTRL_PANEL_TELEPHONENUMBER_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("pager",
+ INFO_CTRL_PANEL_PAGER_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("facsimiletelephonenumber",
+ INFO_CTRL_PANEL_FACSIMILETELEPHONENUMBER_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("description",
+ INFO_CTRL_PANEL_DESCRIPTION_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("postaladdress",
+ INFO_CTRL_PANEL_POSTALADDRESS_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_UNIQUE_MEMBER_LC,
+ INFO_CTRL_PANEL_UNIQUEMEMBER_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_MEMBER_URL_LC,
+ INFO_CTRL_PANEL_MEMBERURL_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_C,
+ INFO_CTRL_PANEL_C_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("ds-target-group-dn",
+ INFO_CTRL_PANEL_DS_TARGET_GROUP_DN_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("usercertificate",
+ INFO_CTRL_PANEL_USERCERTIFICATE_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put("jpegphoto",
+ INFO_CTRL_PANEL_JPEGPHOTO_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_SUPPORTED_AUTH_PW_SCHEMES_LC,
+ INFO_CTRL_PANEL_SUPPORTEDPWDSCHEMES_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_SUPPORTED_CONTROL_LC,
+ INFO_CTRL_PANEL_SUPPORTEDCONTROLS_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_SUPPORTED_LDAP_VERSION_LC,
+ INFO_CTRL_PANEL_SUPPORTEDLDAPVERSIONS_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_SUPPORTED_CONTROL_LC,
+ INFO_CTRL_PANEL_SUPPORTEDCONTROLS_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_SUPPORTED_EXTENSION_LC,
+ INFO_CTRL_PANEL_SUPPORTEDEXTENSIONS_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_SUPPORTED_FEATURE_LC,
+ INFO_CTRL_PANEL_SUPPORTEDFEATURES_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_VENDOR_NAME_LC,
+ INFO_CTRL_PANEL_VENDORNAME_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_VENDOR_VERSION_LC,
+ INFO_CTRL_PANEL_VENDORVERSION_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_NAMING_CONTEXTS_LC,
+ INFO_CTRL_PANEL_NAMINGCONTEXTS_FRIENDLY_NAME.get());
+ hmFriendlyAttrNames.put(ServerConstants.ATTR_PRIVATE_NAMING_CONTEXTS,
+ INFO_CTRL_PANEL_PRIVATENAMINGCONTEXTS_FRIENDLY_NAME.get());
+
+ hmNameAttrNames.put("organizationalunit", ServerConstants.ATTR_OU);
+ hmNameAttrNames.put("domain", ServerConstants.ATTR_DC);
+ hmNameAttrNames.put("organization", ServerConstants.ATTR_O);
+ hmNameAttrNames.put(ServerConstants.OC_GROUP_OF_URLS_LC,
+ ServerConstants.ATTR_COMMON_NAME);
+ hmNameAttrNames.put(ServerConstants.OC_GROUP_OF_NAMES_LC,
+ ServerConstants.ATTR_COMMON_NAME);
+
+ hmOrdereredAttrNames.put("person",
+ new String[]{"givenname", "sn", ServerConstants.ATTR_COMMON_NAME, "uid",
+ "userpassword", "mail", "telephonenumber", "facsimiletelephonenumber",
+ "employeenumber", "street", "l", "st", "postalcode", "mobile",
+ "homephone", "pager", "description", "postaladdress"});
+ hmOrdereredAttrNames.put(ServerConstants.OC_GROUP_OF_NAMES_LC,
+ new String[]{"cn", "description",
+ ServerConstants.ATTR_UNIQUE_MEMBER_LC, "ds-target-group-dn"});
+ hmOrdereredAttrNames.put(ServerConstants.OC_GROUP_OF_URLS_LC,
+ new String[]{"cn", "description", ServerConstants.ATTR_MEMBER_URL_LC});
+ hmOrdereredAttrNames.put("organizationalunit",
+ new String[]{"ou", "description", "postalAddress", "telephonenumber",
+ "facsimiletelephonenumber"});
+ hmOrdereredAttrNames.put("organization", new String[]{"o", "description"});
+ hmOrdereredAttrNames.put("domain", new String[]{"dc", "description"});
+ };
+
+ private Message NAME = INFO_CTRL_PANEL_NAME_LABEL.get();
+
+ /**
+ * Default constructor.
+ *
+ */
+ public SimplifiedViewEntryPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresBorder()
+ {
+ return false;
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ dropTargetListener = new DropTargetListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void dragEnter(DropTargetDragEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dragExit(DropTargetEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dragOver(DropTargetDragEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dropActionChanged(DropTargetDragEvent e)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void drop(DropTargetDropEvent e)
+ {
+ try {
+ Transferable tr = e.getTransferable();
+
+ //flavor not supported, reject drop
+ if (!tr.isDataFlavorSupported(DndBrowserNodes.INFO_FLAVOR))
+ {
+ e.rejectDrop();
+ }
+
+ //cast into appropriate data type
+ DndBrowserNodes nodes =
+ (DndBrowserNodes) tr.getTransferData(DndBrowserNodes.INFO_FLAVOR);
+
+ Component comp = e.getDropTargetContext().getComponent();
+ if (comp instanceof JTextArea)
+ {
+ JTextArea ta = (JTextArea)comp;
+ StringBuilder sb = new StringBuilder();
+ sb.append(ta.getText());
+ for (BrowserNodeInfo node : nodes.getNodes())
+ {
+ if (sb.length() > 0)
+ {
+ sb.append("\n");
+ }
+ sb.append(node.getNode().getDN());
+ }
+ ta.setText(sb.toString());
+ ta.setCaretPosition(sb.length());
+ }
+ else if (comp instanceof JTextField)
+ {
+ JTextField tf = (JTextField)comp;
+ if (nodes.getNodes().length > 0)
+ {
+ String dn = nodes.getNodes()[0].getNode().getDN();
+ tf.setText(dn);
+ tf.setCaretPosition(dn.length());
+ }
+ }
+ e.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
+ e.getDropTargetContext().dropComplete(true);
+ }
+ catch (IOException io)
+ {
+ e.rejectDrop();
+ }
+ catch (UnsupportedFlavorException ufe)
+ {
+ e.rejectDrop();
+ }
+ }
+ };
+
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 2;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 1.0;
+ gbc.insets = new Insets(10, 10, 0, 10);
+
+ addTitlePanel(this, gbc);
+
+ gbc.gridy ++;
+ gbc.insets = new Insets(5, 10, 5, 10);
+
+ gbc.gridwidth = 1;
+ showOnlyAttrsWithValues =
+ Utilities.createCheckBox(
+ INFO_CTRL_PANEL_SHOW_ATTRS_WITH_VALUES_LABEL.get());
+ showOnlyAttrsWithValues.setSelected(displayOnlyWithAttrs);
+ showOnlyAttrsWithValues.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ updateAttributeVisibility(!showOnlyAttrsWithValues.isSelected());
+ displayOnlyWithAttrs = showOnlyAttrsWithValues.isSelected();
+ }
+ });
+ gbc.weightx = 0.0;
+ gbc.anchor = GridBagConstraints.WEST;
+ add(showOnlyAttrsWithValues, gbc);
+ gbc.gridx ++;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.fill = GridBagConstraints.NONE;
+ requiredLabel = createRequiredLabel();
+ add(requiredLabel, gbc);
+ gbc.insets = new Insets(0, 0, 0, 0);
+ add(Box.createVerticalStrut(10), gbc);
+
+ showOnlyAttrsWithValues.setFont(requiredLabel.getFont());
+
+ attributesPanel = new JPanel(new GridBagLayout());
+ attributesPanel.setOpaque(false);
+ attributesPanel.setBorder(new EmptyBorder(5, 10, 5, 10));
+ gbc.gridx = 0;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.gridwidth = 2;
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.BOTH;
+ scrollAttributes = Utilities.createBorderLessScrollBar(attributesPanel);
+ scrollListener = new ScrollPaneBorderListener(scrollAttributes, true);
+ gbc.insets = new Insets(0, 0, 0, 0);
+ add(scrollAttributes, gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void update(CustomSearchResult sr, boolean isReadOnly, TreePath path)
+ {
+ boolean sameEntry = false;
+ if ((searchResult != null) && (sr != null))
+ {
+ sameEntry = searchResult.getDN().equals(sr.getDN());
+ }
+ final Point p = sameEntry ?
+ scrollAttributes.getViewport().getViewPosition() : new Point(0, 0);
+ searchResult = sr;
+ this.isReadOnly = isReadOnly;
+ this.treePath = path;
+
+ updateTitle(sr, path);
+
+ requiredLabel.setVisible(!isReadOnly);
+ showOnlyAttrsWithValues.setVisible(!isReadOnly);
+
+ attributesPanel.removeAll();
+
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+
+ lastUserPasswords.clear();
+ hmEditors.clear();
+
+ hmLabels.clear();
+ hmDisplayedNames.clear();
+ hmComponents.clear();
+ requiredAttrs.clear();
+
+
+ // Build the attributes panel.
+ Collection<String> sortedAttributes = getSortedAttributes(sr, isReadOnly);
+ if (isReadOnly)
+ {
+ for (String attr : sortedAttributes)
+ {
+ JLabel label = getLabelForAttribute(attr, sr);
+ Set<Object> values = sr.getAttributeValues(attr);
+ JComponent comp = getReadOnlyComponent(attr, values);
+ gbc.weightx = 0.0;
+ if (values.size() > 1)
+ {
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ }
+ else
+ {
+ gbc.anchor = GridBagConstraints.WEST;
+ }
+ gbc.insets.left = 0;
+ gbc.gridwidth = GridBagConstraints.RELATIVE;
+ attributesPanel.add(label, gbc);
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ attributesPanel.add(comp, gbc);
+ gbc.insets.top = 10;
+ }
+ }
+ else
+ {
+ for (String attr : sortedAttributes)
+ {
+ JLabel label = getLabelForAttribute(attr, sr);
+ if (isRequired(attr, sr))
+ {
+ Utilities.setRequiredIcon(label);
+ requiredAttrs.add(attr.toLowerCase());
+ }
+ Set<Object> values = sr.getAttributeValues(attr);
+ if (values.isEmpty())
+ {
+ values = new HashSet<Object>(1);
+ if (isBinary(attr))
+ {
+ values.add(new byte[]{});
+ }
+ else
+ {
+ values.add("");
+ }
+ }
+
+ if (isPassword(attr))
+ {
+ Set<String> pwds = new HashSet<String>();
+ for (Object o : values)
+ {
+ pwds.add(getPasswordStringValue(o));
+ }
+ lastUserPasswords.put(attr.toLowerCase(), pwds);
+ }
+
+ JComponent comp = getReadWriteComponent(attr, values);
+
+ gbc.weightx = 0.0;
+ if (attr.equalsIgnoreCase(
+ ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME))
+ {
+ int nOcs = 0;
+ for (Object o : values)
+ {
+ if (!"top".equals(o))
+ {
+ nOcs ++;
+ }
+ }
+ if (nOcs > 1)
+ {
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ }
+ else
+ {
+ gbc.anchor = GridBagConstraints.WEST;
+ }
+ }
+ else if (isSingleValue(attr))
+ {
+ gbc.anchor = GridBagConstraints.WEST;
+ }
+ else if ((values.size() <= 1) &&
+ (hasBinaryValue(values) || isBinary(attr)))
+ {
+ gbc.anchor = GridBagConstraints.WEST;
+ }
+ else
+ {
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ }
+ gbc.insets.left = 0;
+ gbc.gridwidth = GridBagConstraints.RELATIVE;
+ attributesPanel.add(label, gbc);
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ attributesPanel.add(comp, gbc);
+ gbc.insets.top = 10;
+ hmLabels.put(attr.toLowerCase(), label);
+ hmComponents.put(attr.toLowerCase(), comp);
+
+ if (isPassword(attr))
+ {
+ label = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_PASSWORD_CONFIRM_LABEL.get());
+ String key = getConfirmPasswordKey(attr);
+ comp = getReadWriteComponent(key, values);
+
+ hmLabels.put(key, label);
+ hmComponents.put(key, comp);
+
+ gbc.weightx = 0.0;
+ if (isSingleValue(attr))
+ {
+ gbc.anchor = GridBagConstraints.WEST;
+ }
+ else
+ {
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ }
+ gbc.insets.left = 0;
+ gbc.gridwidth = GridBagConstraints.RELATIVE;
+ attributesPanel.add(label, gbc);
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ attributesPanel.add(comp, gbc);
+ gbc.insets.top = 10;
+ }
+ }
+ }
+ gbc.weighty = 1.0;
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ gbc.insets = new Insets(0, 0, 0, 0);
+ attributesPanel.add(Box.createVerticalGlue(), gbc);
+ scrollListener.updateBorder();
+
+ if (showOnlyAttrsWithValues.isSelected())
+ {
+ updateAttributeVisibility(false);
+ }
+ else if (isVisible())
+ {
+ repaint();
+ }
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ if ((p != null) && (scrollAttributes.getViewport().contains(p)))
+ {
+ scrollAttributes.getViewport().setViewPosition(p);
+ }
+ ignoreEntryChangeEvents = false;
+ }
+ });
+ }
+
+ private JLabel getLabelForAttribute(String attrName, CustomSearchResult sr)
+ {
+ MessageBuilder l = new MessageBuilder();
+ int index = attrName.indexOf(";");
+ String basicAttrName;
+ String subType;
+ if (index == -1)
+ {
+ basicAttrName = attrName;
+ subType = null;
+ }
+ else
+ {
+ basicAttrName = attrName.substring(0, index);
+ subType = attrName.substring(index + 1);
+ }
+ if ((subType != null) && (subType.equalsIgnoreCase("binary")))
+ {
+ // TODO: use message
+ subType = "binary";
+ }
+ boolean isNameAttribute = isAttrName(basicAttrName, sr);
+ if (isNameAttribute)
+ {
+ if (subType != null)
+ {
+ l.append(NAME + " ("+subType+")");
+ }
+ else
+ {
+ l.append(NAME);
+ }
+ }
+ else
+ {
+ Message friendly = hmFriendlyAttrNames.get(basicAttrName.toLowerCase());
+ if (friendly == null)
+ {
+ l.append(attrName);
+ }
+ else
+ {
+ l.append(friendly);
+ if (subType != null)
+ {
+ l.append(" ("+subType+")");
+ }
+ }
+ }
+ hmDisplayedNames.put(attrName.toLowerCase(), l.toString());
+ l.append(":");
+ return Utilities.createPrimaryLabel(l.toMessage());
+ }
+
+ private Collection<String> getSortedAttributes(CustomSearchResult sr,
+ boolean isReadOnly)
+ {
+ LinkedHashSet<String> attrNames = new LinkedHashSet<String>();
+
+// Get all attributes that the entry can have
+ Set<String> attributes = new LinkedHashSet<String>();
+ ArrayList<String> entryAttrs = new ArrayList<String>();
+ entryAttrs.addAll(sr.getAttributeNames());
+
+ ArrayList<String> attrsWithNoOptions = new ArrayList<String>();
+ for (String attr : entryAttrs)
+ {
+ attrsWithNoOptions.add(
+ Utilities.getAttributeNameWithoutOptions(attr).toLowerCase());
+ }
+
+ Set<Object> values =
+ sr.getAttributeValues(ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME);
+
+ // Put first the attributes associated with the objectclass in
+ // hmOrderedAttrNames
+ for (Object o : values)
+ {
+ String ocName = (String)o;
+ String[] attrs = hmOrdereredAttrNames.get(ocName.toLowerCase());
+ if (attrs != null)
+ {
+ for (String attr : attrs)
+ {
+ int index = attrsWithNoOptions.indexOf(attr.toLowerCase());
+ if (index != -1)
+ {
+ attrNames.add(entryAttrs.get(index));
+ }
+ else
+ {
+ attrNames.add(attr);
+ }
+ }
+ }
+ }
+ // Handle the root entry separately: most of its attributes are operational
+ // so we filter a list of harcoded attributes.
+ boolean isRootEntry = sr.getDN().equals("");
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (isRootEntry)
+ {
+ String[] attrsNotToAdd = {"entryuuid", "hasnumsubordinates",
+ "numsubordinates", "subschemasubentry", "entrydn",
+ "hassubordinates"};
+ for (String attr : sr.getAttributeNames())
+ {
+ boolean found = false;
+ for (String addedAttr : attrNames)
+ {
+ found = addedAttr.equalsIgnoreCase(attr);
+ if (found)
+ {
+ break;
+ }
+ }
+ if (!found)
+ {
+ for (String notToAddAttr : attrsNotToAdd)
+ {
+ found = notToAddAttr.equalsIgnoreCase(attr);
+ if (found)
+ {
+ break;
+ }
+ }
+ }
+ if (!found)
+ {
+ attrNames.add(attr);
+ }
+ }
+ }
+ else
+ {
+ // Try to get the attributes from the schema: first display the required
+ // attributes with a friendly name (in alphabetical order), then (in
+ // alphabetical order) the attributes with no friendly name. Finally
+ // do the same with the other attributes.
+
+ SortedSet<String> requiredAttributes = new TreeSet<String>();
+ SortedSet<String> allowedAttributes = new TreeSet<String>();
+
+ if (schema != null)
+ {
+ Set<Object> ocs = sr.getAttributeValues(
+ ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME);
+ for (Object o : ocs)
+ {
+ String oc = (String)o;
+ ObjectClass objectClass = schema.getObjectClass(oc.toLowerCase());
+ if (objectClass != null)
+ {
+ for (AttributeType attr : objectClass.getRequiredAttributeChain())
+ {
+ requiredAttributes.add(attr.getNameOrOID());
+ }
+ for (AttributeType attr : objectClass.getOptionalAttributeChain())
+ {
+ allowedAttributes.add(attr.getNameOrOID());
+ }
+ }
+ }
+ }
+ // Now try to put first the attributes for which we have a friendly
+ // name (the most common ones).
+ updateAttributes(attributes, requiredAttributes, entryAttrs,
+ attrsWithNoOptions, true);
+ updateAttributes(attributes, requiredAttributes, entryAttrs,
+ attrsWithNoOptions, false);
+ updateAttributes(attributes, allowedAttributes, entryAttrs,
+ attrsWithNoOptions, true);
+ updateAttributes(attributes, allowedAttributes, entryAttrs,
+ attrsWithNoOptions, false);
+
+
+ for (String attr : entryAttrs)
+ {
+ attributes.add(attr);
+ }
+
+ attributes.add("aci");
+
+ // In read-only mode display only the attributes with values
+ if (isReadOnly)
+ {
+ attributes.retainAll(entryAttrs);
+ }
+
+ for (String attr : attributes)
+ {
+ boolean add = isEditable(attr, schema);
+
+ if (add)
+ {
+ boolean found = false;
+ for (String addedAttr : attrNames)
+ {
+ found = addedAttr.equalsIgnoreCase(attr);
+ if (found)
+ {
+ break;
+ }
+ }
+ if (!found)
+ {
+ attrNames.add(attr);
+ }
+ }
+ }
+ }
+ return attrNames;
+ }
+
+ private void updateAttributes(
+ Collection<String> attributes,
+ Set<String> newAttributes,
+ ArrayList<String> entryAttrs,
+ ArrayList<String> attrsWithNoOptions,
+ boolean addIfFriendlyName)
+ {
+ for (String attr : newAttributes)
+ {
+ String attrLc = attr.toLowerCase();
+ boolean hasFriendlyName = hmFriendlyAttrNames.get(attrLc) != null;
+ if (hasFriendlyName == addIfFriendlyName)
+ {
+ int index = attrsWithNoOptions.indexOf(attrLc);
+ if (index != -1)
+ {
+ attributes.add(entryAttrs.get(index));
+ }
+ else
+ {
+ if (!hasCertificateSyntax(attr,
+ getInfo().getServerDescriptor().getSchema()))
+ {
+ attributes.add(attr);
+ }
+ else
+ {
+ attributes.add(attr+";binary");
+ }
+ }
+ }
+ }
+ }
+
+ private JComponent getReadOnlyComponent(final String attrName,
+ Set<Object> values)
+ {
+// GridLayout is used to avoid the 512 limit of GridBagLayout
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridy = 0;
+
+ boolean isBinary = hasBinaryValue(values);
+ for (Object o : values)
+ {
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 1.0;
+ gbc.gridx = 0;
+
+ if (attrName.equalsIgnoreCase(
+ ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME))
+ {
+ ObjectClassCellPanel ocPanel = new ObjectClassCellPanel();
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ ObjectClassValue ocDescriptor = getObjectClassDescriptor(values,
+ schema);
+ ocPanel.setValue(ocDescriptor);
+ }
+ ocPanel.setEditButtonVisible(false);
+ panel.add(ocPanel, gbc);
+ break;
+ }
+ else if (Utilities.mustObfuscate(attrName,
+ getInfo().getServerDescriptor().getSchema()))
+ {
+ panel.add(
+ Utilities.createDefaultLabel(
+ Message.raw(Utilities.OBFUSCATED_VALUE)), gbc);
+ }
+ else if (!isBinary)
+ {
+ Set<String> sValues = new TreeSet<String>();
+ for (Object value : values)
+ {
+ sValues.add(String.valueOf(value));
+ }
+ final JTextArea ta;
+ JComponent toAdd;
+ if (values.size() > 15)
+ {
+ ta = Utilities.createNonEditableTextArea(
+ Message.raw(Utilities.getStringFromCollection(sValues, "\n")),
+ 15, 20);
+ toAdd = Utilities.createScrollPane(ta);
+ }
+ else
+ {
+ ta = Utilities.createNonEditableTextArea(
+ Message.raw(Utilities.getStringFromCollection(sValues, "\n")),
+ values.size(), 20);
+ toAdd = ta;
+ }
+ panel.add(toAdd, gbc);
+ break;
+ }
+ else
+ {
+ final BinaryCellPanel pane = new BinaryCellPanel();
+ pane.setEditButtonText(INFO_CTRL_PANEL_VIEW_BUTTON_LABEL.get());
+ final byte[] binaryValue = (byte[])o;
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ final boolean isImage = Utilities.hasImageSyntax(attrName, schema);
+ pane.setValue(binaryValue, isImage);
+ pane.addEditActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ if (binaryDlg == null)
+ {
+ binaryPanel = new BinaryValuePanel();
+ binaryPanel.setInfo(getInfo());
+ binaryDlg = new GenericDialog(
+ Utilities.getFrame(SimplifiedViewEntryPanel.this),
+ binaryPanel);
+ binaryDlg.setModal(true);
+ Utilities.centerGoldenMean(binaryDlg,
+ Utilities.getParentDialog(SimplifiedViewEntryPanel.this));
+ }
+ binaryPanel.setValue(attrName, binaryValue);
+ binaryDlg.setVisible(true);
+ }
+ });
+ panel.add(pane, gbc);
+ }
+ }
+ return panel;
+ }
+
+ private JComponent getReadWriteComponent(final String attrName,
+ Set<Object> values)
+ {
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridy = 0;
+
+ Set<EditorComponent> components = new LinkedHashSet<EditorComponent>();
+ hmEditors.put(attrName.toLowerCase(), components);
+
+ boolean isBinary = hasBinaryValue(values);
+ for (Object o : values)
+ {
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 1.0;
+ gbc.gridx = 0;
+ if (attrName.equalsIgnoreCase(
+ ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME))
+ {
+ final ObjectClassCellPanel ocCellPanel = new ObjectClassCellPanel();
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ final ObjectClassValue ocDescriptor;
+ if (schema != null)
+ {
+ ocDescriptor = getObjectClassDescriptor(values, schema);
+ ocCellPanel.setValue(ocDescriptor);
+ }
+ else
+ {
+ ocDescriptor = null;
+ }
+ ocCellPanel.addEditActionListener(new ActionListener()
+ {
+ private ObjectClassValue newValue;
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ if (editOcDlg == null)
+ {
+ editOcPanel = new ObjectClassEditorPanel();
+ editOcPanel.setInfo(getInfo());
+ editOcDlg = new GenericDialog(
+ null,
+ editOcPanel);
+ editOcDlg.setModal(true);
+ Utilities.centerGoldenMean(editOcDlg,
+ Utilities.getParentDialog(SimplifiedViewEntryPanel.this));
+ }
+ if ((newValue == null) && (ocDescriptor != null))
+ {
+ editOcPanel.setValue(ocDescriptor);
+ }
+ else
+ {
+ editOcPanel.setValue(newValue);
+ }
+ editOcDlg.setVisible(true);
+ if (editOcPanel.valueChanged())
+ {
+ newValue = editOcPanel.getObjectClassValue();
+ ocCellPanel.setValue(newValue);
+ updatePanel(newValue);
+ }
+ }
+ });
+ panel = ocCellPanel;
+ components.add(new EditorComponent(ocCellPanel));
+ break;
+ }
+ else if (isPassword(attrName) || isConfirmPassword(attrName))
+ {
+ JPasswordField pf;
+ if (o.equals(""))
+ {
+ pf = Utilities.createPasswordField();
+ }
+ else
+ {
+ pf = Utilities.createPasswordField();
+ pf.setText(getPasswordStringValue(o));
+ }
+ panel.add(pf, gbc);
+ components.add(new EditorComponent(pf));
+ }
+ else if (!isBinary)
+ {
+ if (isSingleValue(attrName))
+ {
+ final JTextField tf = Utilities.createMediumTextField();
+ tf.setText(String.valueOf(o));
+ if (mustAddBrowseButton(attrName))
+ {
+ gbc.gridx = 0;
+ panel.add(tf, gbc);
+ gbc.insets.left = 5;
+ gbc.weightx = 0.0;
+ gbc.gridx ++;
+ gbc.anchor = GridBagConstraints.NORTH;
+ JButton browse = Utilities.createButton(
+ INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ browse.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ addBrowseClicked(attrName, tf);
+ }
+ });
+ panel.add(browse, gbc);
+ new DropTarget(tf, dropTargetListener);
+ }
+ else
+ {
+ gbc.gridx = 0;
+ panel.add(tf, gbc);
+ }
+ components.add(new EditorComponent(tf));
+ }
+ else
+ {
+ Set<String> sValues = new TreeSet<String>();
+ for (Object value : values)
+ {
+ sValues.add(String.valueOf(value));
+ }
+ final JTextArea ta;
+ JComponent toAdd;
+ if (values.size() > 15)
+ {
+ ta = Utilities.createTextArea(
+ Message.raw(Utilities.getStringFromCollection(sValues, "\n")),
+ 15, 20);
+ toAdd = Utilities.createScrollPane(ta);
+ }
+ else
+ {
+ ta = Utilities.createTextAreaWithBorder(
+ Message.raw(Utilities.getStringFromCollection(sValues, "\n")),
+ values.size(), 20);
+ toAdd = ta;
+ }
+ if (mustAddBrowseButton(attrName))
+ {
+ panel.add(toAdd, gbc);
+ gbc.insets.left = 5;
+ gbc.weightx = 0.0;
+ gbc.gridx ++;
+ gbc.anchor = GridBagConstraints.NORTH;
+ final JButton browse = Utilities.createButton(
+ INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
+ browse.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ addBrowseClicked(attrName, ta);
+ }
+ });
+ if (attrName.equalsIgnoreCase(
+ ServerConstants.ATTR_UNIQUE_MEMBER_LC))
+ {
+ browse.setText(
+ INFO_CTRL_PANEL_ADD_MEMBERS_BUTTON.get().toString());
+ }
+ panel.add(browse, gbc);
+ new DropTarget(ta, dropTargetListener);
+ }
+ else
+ {
+ panel.add(toAdd, gbc);
+ }
+ components.add(new EditorComponent(ta));
+ }
+ break;
+ }
+ else
+ {
+ final BinaryCellPanel pane = new BinaryCellPanel();
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ final boolean isImage = Utilities.hasImageSyntax(attrName, schema);
+ pane.setDisplayDelete(true);
+ final byte[] binaryValue = (byte[])o;
+ if (binaryValue.length > 0)
+ {
+ pane.setValue(binaryValue, isImage);
+ }
+ pane.addEditActionListener(new ActionListener()
+ {
+ private BinaryValue newValue;
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ if (editBinaryDlg == null)
+ {
+ editBinaryPanel = new BinaryAttributeEditorPanel();
+ editBinaryPanel.setInfo(getInfo());
+ editBinaryDlg = new GenericDialog(
+ Utilities.getFrame(SimplifiedViewEntryPanel.this),
+ editBinaryPanel);
+ editBinaryDlg.setModal(true);
+ Utilities.centerGoldenMean(editBinaryDlg,
+ Utilities.getParentDialog(SimplifiedViewEntryPanel.this));
+ }
+ if (newValue == null)
+ {
+ // We use an empty binary array to not breaking the logic:
+ // it means that there is no value for the attribute.
+ if ((binaryValue != null) && (binaryValue.length > 0))
+ {
+ newValue = BinaryValue.createBase64(binaryValue);
+ editBinaryPanel.setValue(attrName, newValue);
+ }
+ else
+ {
+ editBinaryPanel.setValue(attrName, null);
+ }
+ }
+ else
+ {
+ editBinaryPanel.setValue(attrName, newValue);
+ }
+ editBinaryDlg.setVisible(true);
+ if (editBinaryPanel.valueChanged())
+ {
+ newValue = editBinaryPanel.getBinaryValue();
+ pane.setValue(newValue, isImage);
+ notifyListeners();
+ }
+ }
+ });
+ pane.addDeleteActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ pane.setValue((byte[])null, false);
+ if (editBinaryPanel != null)
+ {
+ editBinaryPanel.setValue(attrName, null);
+ }
+ notifyListeners();
+ }
+ });
+ panel.add(pane, gbc);
+ components.add(new EditorComponent(pane));
+ }
+ gbc.gridy ++;
+ gbc.insets.top = 10;
+ }
+ return panel;
+ }
+
+ private boolean isSingleValue(String attrName)
+ {
+ boolean isSingleValue = false;
+
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ AttributeType attr = schema.getAttributeType(attrName.toLowerCase());
+ if (attr != null)
+ {
+ isSingleValue = attr.isSingleValue();
+ }
+ }
+
+ return isSingleValue;
+ }
+
+ private boolean isRequired(String attrName, CustomSearchResult sr)
+ {
+ boolean isRequired = false;
+
+ attrName = Utilities.getAttributeNameWithoutOptions(attrName);
+
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ AttributeType attr = schema.getAttributeType(attrName.toLowerCase());
+ if (attr != null)
+ {
+ Set<Object> ocs = sr.getAttributeValues(
+ ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME);
+ for (Object o : ocs)
+ {
+ String oc = (String)o;
+ ObjectClass objectClass = schema.getObjectClass(oc.toLowerCase());
+ if (objectClass != null)
+ {
+ if (objectClass.isRequired(attr))
+ {
+ isRequired = true;
+ break;
+ }
+ }
+ }
+ }
+ }
+ return isRequired;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Entry getEntry() throws OpenDsException
+ {
+ Entry entry = null;
+
+ ArrayList<Message> errors = new ArrayList<Message>();
+
+ try
+ {
+ DN.decode(getDisplayedDN());
+ }
+ catch (Throwable t)
+ {
+ errors.add(ERR_CTRL_PANEL_DN_NOT_VALID.get());
+ }
+
+ for (String attrName : hmLabels.keySet())
+ {
+ setPrimaryValid(hmLabels.get(attrName));
+ }
+
+
+ // Check passwords
+ for (String attrName : lastUserPasswords.keySet())
+ {
+ Set<String> pwds = getNewPasswords(attrName);
+ Set<String> confirmPwds = getConfirmPasswords(attrName);
+ if (!pwds.equals(confirmPwds))
+ {
+ setPrimaryInvalid(hmLabels.get(attrName));
+ setPrimaryInvalid(hmLabels.get(getConfirmPasswordKey(attrName)));
+ Message msg = ERR_CTRL_PANEL_PASSWORD_DO_NOT_MATCH.get();
+ if (!errors.contains(msg))
+ {
+ errors.add(msg);
+ }
+ }
+ }
+ for (String attrName : requiredAttrs)
+ {
+ if (!hasValue(attrName))
+ {
+ setPrimaryInvalid(hmLabels.get(getConfirmPasswordKey(attrName)));
+ errors.add(ERR_CTRL_PANEL_ATTRIBUTE_REQUIRED.get(
+ hmDisplayedNames.get(attrName)));
+ }
+ }
+
+ if (errors.size() > 0)
+ {
+ throw new CheckEntrySyntaxException(errors);
+ }
+
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ String ldif = getLDIF();
+
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ entry = reader.readEntry(checkSchema());
+ addValuesInRDN(entry);
+ }
+ catch (IOException ioe)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe.toString()),
+ ioe);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ return entry;
+ }
+
+ private Set<String> getDisplayedStringValues(String attrName)
+ {
+ Set<String> values = new LinkedHashSet<String>();
+ Set<EditorComponent> comps =
+ hmEditors.get(attrName.toLowerCase());
+ if (comps != null)
+ {
+ for (EditorComponent comp : comps)
+ {
+ Object value = comp.getValue();
+ if (value instanceof ObjectClassValue)
+ {
+ ObjectClassValue ocValue = (ObjectClassValue)value;
+ if (ocValue.getStructural() != null)
+ {
+ values.add(ocValue.getStructural());
+ }
+ values.addAll(ocValue.getAuxiliary());
+ }
+ else if (value instanceof Collection)
+ {
+ for (Object o : (Collection)value)
+ {
+ values.add((String)o);
+ }
+ }
+ else
+ {
+ values.add(String.valueOf(comp.getValue()));
+ }
+ }
+ }
+ return values;
+ }
+
+ private Set<String> getNewPasswords(String attrName)
+ {
+ String attr =
+ Utilities.getAttributeNameWithoutOptions(attrName).toLowerCase();
+ return getDisplayedStringValues(attr);
+ }
+
+ private Set<String> getConfirmPasswords(String attrName)
+ {
+ return getDisplayedStringValues(getConfirmPasswordKey(attrName));
+ }
+
+ private String getConfirmPasswordKey(String attrName)
+ {
+ return CONFIRM_PASSWORD+
+ Utilities.getAttributeNameWithoutOptions(attrName).toLowerCase();
+ }
+
+ private boolean isConfirmPassword(String key)
+ {
+ return key.startsWith(CONFIRM_PASSWORD);
+ }
+
+ /**
+ * Returns the LDIF representation of the displayed entry.
+ * @return the LDIF representation of the displayed entry.
+ */
+ private String getLDIF()
+ {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("dn: "+getDisplayedDN());
+
+ for (String attrName : hmEditors.keySet())
+ {
+ if (isConfirmPassword(attrName))
+ {
+ continue;
+ }
+ else if (isPassword(attrName))
+ {
+ Set<String> newPwds = getNewPasswords(attrName);
+ if (newPwds.equals(lastUserPasswords.get(attrName.toLowerCase())))
+ {
+ Set<Object> oldValues = searchResult.getAttributeValues(attrName);
+ if (!oldValues.isEmpty())
+ {
+ appendLDIFLines(sb, attrName, oldValues);
+ }
+ }
+ else
+ {
+ appendLDIFLines(sb, attrName);
+ }
+ }
+ else
+ if (!schemaReadOnlyAttributesLowerCase.contains(attrName.toLowerCase()))
+ {
+ appendLDIFLines(sb, attrName);
+ }
+ }
+
+ // Add the attributes that are not displayed
+ for (String attrName : schemaReadOnlyAttributesLowerCase)
+ {
+ Set<Object> values = searchResult.getAttributeValues(attrName);
+ if (!values.isEmpty())
+ {
+ appendLDIFLines(sb, attrName, values);
+ }
+ }
+ return sb.toString();
+ }
+
+ private boolean isAttrName(String attrName, CustomSearchResult sr)
+ {
+ boolean isAttrName = false;
+ Set<Object> values =
+ sr.getAttributeValues(ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME);
+ for (Object o : values)
+ {
+ String ocName = (String)o;
+ String attr = hmNameAttrNames.get(ocName.toLowerCase());
+ if ((attr != null) && (attr.equalsIgnoreCase(attrName)))
+ {
+ isAttrName = true;
+ break;
+ }
+ }
+
+ return isAttrName;
+ }
+
+ private boolean hasBinaryValue(Set<Object> values)
+ {
+ boolean isBinary = false;
+ if (values.size() > 0)
+ {
+ isBinary = values.iterator().next() instanceof byte[];
+ }
+ return isBinary;
+ }
+
+ private boolean mustAddBrowseButton(String attrName)
+ {
+ boolean mustAddBrowseButton =
+ attrName.equalsIgnoreCase(ServerConstants.ATTR_UNIQUE_MEMBER_LC) ||
+ attrName.equalsIgnoreCase("ds-target-group-dn");
+ if (!mustAddBrowseButton)
+ {
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ AttributeType attr = schema.getAttributeType(attrName.toLowerCase());
+ if (attr != null)
+ {
+ mustAddBrowseButton =
+ attr.getSyntax().getSyntaxName().equalsIgnoreCase(
+ SchemaConstants.SYNTAX_DN_NAME);
+ }
+ }
+ }
+ return mustAddBrowseButton;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Set<Object> getValues(String attrName)
+ {
+ Set<Object> values = new LinkedHashSet<Object>();
+ Set<EditorComponent> comps = hmEditors.get(attrName);
+ if (comps.size() > 0)
+ {
+ for (EditorComponent comp : comps)
+ {
+ if (hasValue(comp))
+ {
+ Object value = comp.getValue();
+ if (value instanceof Collection)
+ {
+ for (Object o : (Collection)value)
+ {
+ values.add(o);
+ }
+ }
+ else
+ {
+ values.add(value);
+ }
+ }
+ }
+ }
+ return values;
+ }
+
+ private void appendLDIFLines(StringBuilder sb, String attrName)
+ {
+ Set<Object> values = getValues(attrName);
+
+ if (values.size() > 0)
+ {
+ appendLDIFLines(sb, attrName, values);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getDisplayedDN()
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ DN oldDN = DN.decode(searchResult.getDN());
+ if (oldDN.getNumComponents() > 0)
+ {
+ RDN rdn = oldDN.getRDN();
+ List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
+ List<String> attributeNames = new ArrayList<String>();
+ List<AttributeValue> attributeValues = new ArrayList<AttributeValue>();
+ for (int i=0; i<rdn.getNumValues(); i++)
+ {
+ String attrName = rdn.getAttributeName(i);
+ AttributeValue value = rdn.getAttributeValue(i);
+
+ String sValue = value.getStringValue();
+
+ Set<String> values = getDisplayedStringValues(attrName);
+ if (!values.contains(sValue))
+ {
+ if (values.size() > 0)
+ {
+ String firstNonEmpty = null;
+ for (String v : values)
+ {
+ v = v.trim();
+ if (v.length() > 0)
+ {
+ firstNonEmpty = v;
+ break;
+ }
+ }
+ if (firstNonEmpty != null)
+ {
+ AttributeType attr = rdn.getAttributeType(i);
+ attributeTypes.add(attr);
+ attributeNames.add(rdn.getAttributeName(i));
+ attributeValues.add(new AttributeValue(attr, firstNonEmpty));
+ }
+ }
+ }
+ else
+ {
+ attributeTypes.add(rdn.getAttributeType(i));
+ attributeNames.add(rdn.getAttributeName(i));
+ attributeValues.add(value);
+ }
+ }
+ if (attributeTypes.size() == 0)
+ {
+ // Check the attributes in the order that we display them and use
+ // the first one.
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ for (String attrName : hmEditors.keySet())
+ {
+ if (isPassword(attrName) ||
+ isConfirmPassword(attrName))
+ {
+ continue;
+ }
+ Set<EditorComponent> comps = hmEditors.get(attrName);
+ if (comps.size() > 0)
+ {
+ Object o = comps.iterator().next().getValue();
+ if (o instanceof String)
+ {
+ String aName =
+ Utilities.getAttributeNameWithoutOptions(attrName);
+ AttributeType attr =
+ schema.getAttributeType(aName.toLowerCase());
+ if (attr != null)
+ {
+ attributeTypes.add(attr);
+ attributeNames.add(attrName);
+ attributeValues.add(new AttributeValue(attr, (String)o));
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
+ DN parent = oldDN.getParent();
+ if (attributeTypes.size() > 0)
+ {
+ DN newDN;
+ RDN newRDN = new RDN(attributeTypes, attributeNames, attributeValues);
+
+ if (parent == null)
+ {
+ newDN = new DN(new RDN[]{newRDN});
+ }
+ else
+ {
+ newDN = parent.concat(newRDN);
+ }
+ sb.append(newDN.toString());
+ }
+ else
+ {
+ if (parent != null)
+ {
+ sb.append(","+parent.toString());
+ }
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ return sb.toString();
+ }
+
+ private void addBrowseClicked(String attrName, JTextComponent textComponent)
+ {
+ Message previousTitle = null;
+ LDAPEntrySelectionPanel.Filter previousFilter = null;
+ Message title;
+ LDAPEntrySelectionPanel.Filter filter;
+ if (browseEntriesDlg == null)
+ {
+ browseEntriesPanel = new LDAPEntrySelectionPanel();
+ browseEntriesPanel.setMultipleSelection(false);
+ browseEntriesPanel.setInfo(getInfo());
+ browseEntriesDlg = new GenericDialog(Utilities.getFrame(this),
+ browseEntriesPanel);
+ Utilities.centerGoldenMean(browseEntriesDlg,
+ Utilities.getParentDialog(this));
+ browseEntriesDlg.setModal(true);
+ }
+ else
+ {
+ previousTitle = browseEntriesPanel.getTitle();
+ previousFilter = browseEntriesPanel.getFilter();
+ }
+ if (attrName.equalsIgnoreCase(ServerConstants.ATTR_UNIQUE_MEMBER_LC))
+ {
+ title = INFO_CTRL_PANEL_ADD_MEMBERS_LABEL.get();
+ filter = LDAPEntrySelectionPanel.Filter.USERS;
+ }
+ else if (attrName.equalsIgnoreCase("ds-target-group-dn"))
+ {
+ title = INFO_CTRL_PANEL_CHOOSE_REFERENCE_GROUP.get();
+ filter = LDAPEntrySelectionPanel.Filter.DYNAMIC_GROUPS;
+ }
+ else
+ {
+ title = INFO_CTRL_PANEL_CHOOSE_ENTRIES.get();
+ filter = LDAPEntrySelectionPanel.Filter.DEFAULT;
+ }
+ if (!title.equals(previousTitle))
+ {
+ browseEntriesPanel.setTitle(title);
+ }
+ if (!filter.equals(previousFilter))
+ {
+ browseEntriesPanel.setFilter(filter);
+ }
+ browseEntriesPanel.setMultipleSelection(!isSingleValue(attrName));
+
+ browseEntriesDlg.setVisible(true);
+ if (textComponent instanceof JTextArea)
+ {
+ String[] dns = browseEntriesPanel.getDNs();
+ if (dns.length > 0)
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(textComponent.getText());
+ for (String dn : dns)
+ {
+ if (sb.length() > 0)
+ {
+ sb.append("\n");
+ }
+ sb.append(dn);
+ }
+ textComponent.setText(sb.toString());
+ textComponent.setCaretPosition(sb.length());
+ }
+ }
+ else
+ {
+ String[] dns = browseEntriesPanel.getDNs();
+ if (dns.length > 0)
+ {
+ textComponent.setText(dns[0]);
+ }
+ }
+ }
+
+ private String getPasswordStringValue(Object o)
+ {
+ if (o instanceof byte[])
+ {
+ return Base64.encode((byte[])o);
+ }
+ else
+ {
+ return String.valueOf(o);
+ }
+ }
+
+ private void updatePanel(ObjectClassValue newValue)
+ {
+ CustomSearchResult oldResult = searchResult;
+ CustomSearchResult newResult = new CustomSearchResult(searchResult.getDN());
+
+ for (String attrName : schemaReadOnlyAttributesLowerCase)
+ {
+ Set<Object> values = searchResult.getAttributeValues(attrName);
+ if (!values.isEmpty())
+ {
+ newResult.set(attrName, values);
+ }
+ }
+ ignoreEntryChangeEvents = true;
+
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ ArrayList<String> attributes = new ArrayList<String>();
+ ArrayList<String> ocs = new ArrayList<String>();
+ if (newValue.getStructural() != null)
+ {
+ ocs.add(newValue.getStructural().toLowerCase());
+ }
+ for (String oc : newValue.getAuxiliary())
+ {
+ ocs.add(oc.toLowerCase());
+ }
+ for (String oc : ocs)
+ {
+ ObjectClass objectClass = schema.getObjectClass(oc);
+ if (objectClass != null)
+ {
+ for (AttributeType attr : objectClass.getRequiredAttributeChain())
+ {
+ attributes.add(attr.getNameOrOID().toLowerCase());
+ }
+ for (AttributeType attr : objectClass.getOptionalAttributeChain())
+ {
+ attributes.add(attr.getNameOrOID().toLowerCase());
+ }
+ }
+ }
+ for (String attrName : editableOperationalAttrNames)
+ {
+ attributes.add(attrName.toLowerCase());
+ }
+ for (String attrName : hmEditors.keySet())
+ {
+ String attrNoOptions =
+ Utilities.getAttributeNameWithoutOptions(attrName);
+ if (!attributes.contains(attrNoOptions))
+ {
+ continue;
+ }
+ if (isPassword(attrName))
+ {
+ Set<String> newPwds = getNewPasswords(attrName);
+ if (newPwds.equals(lastUserPasswords.get(attrName)))
+ {
+ Set<Object> oldValues = searchResult.getAttributeValues(attrName);
+ newResult.set(attrName, oldValues);
+ }
+ else
+ {
+ setValues(newResult, attrName);
+ }
+ }
+ else if (!schemaReadOnlyAttributesLowerCase.contains(
+ attrName.toLowerCase()))
+ {
+ setValues(newResult, attrName);
+ }
+ }
+ }
+ update(newResult, isReadOnly, treePath);
+ ignoreEntryChangeEvents = false;
+ searchResult = oldResult;
+ notifyListeners();
+ }
+
+ private void updateAttributeVisibility(boolean showAll)
+ {
+ for (String attrName : hmLabels.keySet())
+ {
+ Component label = hmLabels.get(attrName);
+ Component comp = hmComponents.get(attrName);
+
+ if (showAll || requiredAttrs.contains(attrName))
+ {
+ label.setVisible(true);
+ comp.setVisible(true);
+ }
+ else
+ {
+ Set<EditorComponent> editors = hmEditors.get(attrName);
+ boolean hasValue = false;
+
+ for (EditorComponent editor : editors)
+ {
+ hasValue = hasValue(editor);
+ if (hasValue)
+ {
+ break;
+ }
+ }
+ label.setVisible(hasValue);
+ comp.setVisible(hasValue);
+ }
+ }
+ repaint();
+ }
+
+ private boolean hasValue(String attrName)
+ {
+ return getValues(attrName).size() > 0;
+ }
+
+ private boolean hasValue(EditorComponent editor)
+ {
+ boolean hasValue = false;
+ Object value = editor.getValue();
+ if (value != null)
+ {
+ if (value instanceof byte[])
+ {
+ hasValue = ((byte[])value).length > 0;
+ }
+ else if (value instanceof String)
+ {
+ hasValue = ((String)value).trim().length() > 0;
+ }
+ else if (value instanceof Collection)
+ {
+ hasValue = ((Collection)value).size() > 0;
+ }
+ else
+ {
+ hasValue = true;
+ }
+ }
+ return hasValue;
+ }
+
+ /**
+ * A class that makes an association between a component (JTextField, a
+ * BinaryCellValue...) and the associated value that will be used to create
+ * the modified entry corresponding to the contents of the panel.
+ *
+ */
+ class EditorComponent
+ {
+ private Component comp;
+
+ /**
+ * Creats an EditorComponent using a text component.
+ * @param tf the text component.
+ */
+ public EditorComponent(JTextComponent tf)
+ {
+ comp = tf;
+ tf.getDocument().addDocumentListener(new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ notifyListeners();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ notifyListeners();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ notifyListeners();
+ }
+ });
+ }
+
+ /**
+ * Creats an EditorComponent using a BinaryCellPanel.
+ * @param binaryPanel the BinaryCellPanel.
+ */
+ public EditorComponent(BinaryCellPanel binaryPanel)
+ {
+ comp = binaryPanel;
+ }
+
+ /**
+ * Creats an EditorComponent using a ObjectClassCellPanel.
+ * @param ocPanel the ObjectClassCellPanel.
+ */
+ public EditorComponent(ObjectClassCellPanel ocPanel)
+ {
+ comp = ocPanel;
+ }
+
+ /**
+ * Returns the value that the component is displaying. The returned value
+ * is a Set of Strings (for multivalued attributes), a byte[] for binary
+ * values or a String for single-valued attributes. Single-valued
+ * attributes refer to the definition in the schema (and not to the fact
+ * that there is a single value for the attribute in this entry).
+ * @return the value that the component is displaying.
+ */
+ public Object getValue()
+ {
+ Object returnValue;
+ if (comp instanceof ObjectClassCellPanel)
+ {
+ ObjectClassValue ocDesc = ((ObjectClassCellPanel)comp).getValue();
+ LinkedHashSet<String> values = new LinkedHashSet<String>();
+ String structural = ocDesc.getStructural();
+ if (structural != null)
+ {
+ values.add(structural);
+ }
+ values.addAll(ocDesc.getAuxiliary());
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ ObjectClass oc = schema.getObjectClass(structural.toLowerCase());
+ if (oc != null)
+ {
+ ObjectClass parent = oc.getSuperiorClass();
+ while (parent != null)
+ {
+ values.add(parent.getNameOrOID());
+ parent = parent.getSuperiorClass();
+ }
+ }
+ }
+ returnValue = values;
+ } else if (comp instanceof JTextArea)
+ {
+ LinkedHashSet<String> values = new LinkedHashSet<String>();
+ String value = ((JTextArea)comp).getText();
+ String[] lines = value.split("\n");
+ for (String line : lines)
+ {
+ line = line.trim();
+ if (line.length() > 0)
+ {
+ values.add(line);
+ }
+ }
+ returnValue = values;
+ }
+ else if (comp instanceof JTextComponent)
+ {
+ returnValue = ((JTextComponent)comp).getText();
+ }
+ else
+ {
+ Object o = ((BinaryCellPanel)comp).getValue();
+ if (o instanceof BinaryValue)
+ {
+ try
+ {
+ returnValue = ((BinaryValue)o).getBytes();
+ }
+ catch (ParseException pe)
+ {
+ throw new IllegalStateException("Unexpected error: "+pe);
+ }
+ }
+ else
+ {
+ returnValue = o;
+ }
+ }
+ return returnValue;
+ }
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
new file mode 100644
index 0000000..4fb1188
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
@@ -0,0 +1,400 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.GridBagConstraints;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JLabel;
+import javax.swing.JList;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.components.TitlePanel;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.server.api.MatchingRule;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.Schema;
+
+/**
+ * The panel that displays a standard attribute definition.
+ *
+ */
+public class StandardAttributePanel extends SchemaElementPanel
+{
+ private static final long serialVersionUID = -7922968631524763675L;
+ private TitlePanel titlePanel = new TitlePanel(Message.EMPTY,
+ Message.EMPTY);
+ private JLabel name = Utilities.createDefaultLabel();
+ private JLabel parent = Utilities.createDefaultLabel();
+ private JLabel oid = Utilities.createDefaultLabel();
+ private JLabel aliases = Utilities.createDefaultLabel();
+ private JLabel origin = Utilities.createDefaultLabel();
+ private JLabel description = Utilities.createDefaultLabel();
+ private JLabel usage = Utilities.createDefaultLabel();
+ private JLabel syntax = Utilities.createDefaultLabel();
+ private JLabel approximate = Utilities.createDefaultLabel();
+ private JLabel equality = Utilities.createDefaultLabel();
+ private JLabel ordering = Utilities.createDefaultLabel();
+ private JLabel substring = Utilities.createDefaultLabel();
+ private JLabel type = Utilities.createDefaultLabel();
+ private JList requiredBy = new JList(new DefaultListModel());
+ private JList optionalBy = new JList(new DefaultListModel());
+
+ /**
+ * Default constructor of the panel.
+ *
+ */
+ public StandardAttributePanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_STANDARD_ATTRIBUTE_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return requiredBy;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ protected void createLayout()
+ {
+ createBasicLayout(this, new GridBagConstraints());
+ setBorder(PANEL_BORDER);
+ }
+
+ /**
+ * Creates the basic layout of the panel.
+ * @param c the container where all the components will be layed out.
+ * @param gbc the grid bag constraints.
+ */
+ protected void createBasicLayout(Container c, GridBagConstraints gbc)
+ {
+ requiredBy.setVisibleRowCount(5);
+ optionalBy.setVisibleRowCount(9);
+
+ Message[] labels = {
+ INFO_CTRL_PANEL_ATTRIBUTE_NAME_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_PARENT_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_OID_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_ALIASES_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_ORIGIN_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_DESCRIPTION_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_USAGE_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_APPROXIMATE_MATCHING_RULE_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_EQUALITY_MATCHING_RULE_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_ORDERING_MATCHING_RULE_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_SUBSTRING_MATCHING_RULE_LABEL.get()
+ };
+ JLabel[] values = {name, parent, oid, aliases, origin, description, usage,
+ syntax, approximate, equality, ordering, substring, type};
+ gbc.gridy = 0;
+ gbc.gridwidth = 2;
+ addErrorPane(c, gbc);
+ gbc.gridy ++;
+
+ gbc.anchor = GridBagConstraints.WEST;
+ titlePanel.setTitle(INFO_CTRL_PANEL_ATTRIBUTE_DETAILS.get());
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.insets.top = 5;
+ gbc.insets.bottom = 7;
+ c.add(titlePanel, gbc);
+
+ gbc.insets.bottom = 0;
+ gbc.insets.top = 8;
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ for (int i=0; i < labels.length; i++)
+ {
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ JLabel l = Utilities.createPrimaryLabel(labels[i]);
+ c.add(l, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ c.add(values[i], gbc);
+ gbc.gridy ++;
+ }
+ labels = new Message[] {
+ INFO_CTRL_PANEL_REQUIRED_BY_LABEL.get(),
+ INFO_CTRL_PANEL_ALLOWED_BY_LABEL.get()
+ };
+ JList[] lists = {requiredBy, optionalBy};
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ for (int i=0; i<2; i++)
+ {
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ JLabel l = Utilities.createPrimaryLabel(labels[i]);
+ gbc.weightx = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ c.add(l, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ if (i == 0)
+ {
+ gbc.weighty = 0.35;
+ }
+ else
+ {
+ gbc.weighty = 0.65;
+ }
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets.top = 10;
+ c.add(Utilities.createScrollPane(lists[i]), gbc);
+ gbc.gridy ++;
+
+ final JList list = lists[i];
+ MouseAdapter doubleClickListener = new MouseAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseClicked(MouseEvent ev)
+ {
+ if (ev.getClickCount() > 1)
+ {
+ String o = (String)list.getSelectedValue();
+ if (o != null)
+ {
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ ObjectClass oc = schema.getObjectClass(o.toLowerCase());
+ if (oc != null)
+ {
+ notifySchemaSelectionListeners(oc);
+ }
+ }
+ }
+ }
+ }
+ };
+ list.addMouseListener(doubleClickListener);
+ }
+ }
+
+ /**
+ * Updates the contents of the panel with the provided attribute.
+ * @param attr the attribute.
+ * @param schema the schema.
+ */
+ public void update(AttributeType attr, Schema schema)
+ {
+ String n = attr.getPrimaryName();
+ if (n == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ titlePanel.setDetails(Message.raw(n));
+ name.setText(n);
+ AttributeType superior = attr.getSuperiorType();
+ if (superior == null)
+ {
+ n = null;
+ }
+ else
+ {
+ n = superior.getPrimaryName();
+ }
+ if (n == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ parent.setText(n);
+ oid.setText(attr.getOID());
+ origin.setText(StandardObjectClassPanel.getOrigin(attr).toString());
+ n = attr.getDescription();
+ if (n == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ description.setText(n);
+ if (attr.getUsage() == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ else
+ {
+ n = attr.getUsage().toString();
+ }
+ usage.setText(n);
+ ArrayList<String> otherNames = new ArrayList<String>();
+ Iterable<String> ocNames = attr.getNormalizedNames();
+ String primaryName = attr.getPrimaryName();
+ if (primaryName == null)
+ {
+ primaryName = "";
+ }
+ for (String name : ocNames)
+ {
+ if (!name.equalsIgnoreCase(primaryName))
+ {
+ otherNames.add(name);
+ }
+ }
+ if (otherNames.size() > 0)
+ {
+ n = Utilities.getStringFromCollection(otherNames, ", ");
+ }
+ else
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ aliases.setText(n);
+ syntax.setText(Utilities.getSyntaxText(attr.getSyntax()));
+ JLabel[] labels = {approximate, equality, ordering, substring};
+ MatchingRule[] rules = {attr.getApproximateMatchingRule(),
+ attr.getEqualityMatchingRule(), attr.getOrderingMatchingRule(),
+ attr.getSubstringMatchingRule()
+ };
+ for (int i=0; i<labels.length; i++)
+ {
+ if (rules[i] != null)
+ {
+ labels[i].setText(Utilities.getMatchingRuleText(rules[i]));
+ }
+ else
+ {
+ labels[i].setText(NOT_APPLICABLE.toString());
+ }
+ }
+
+ type.setText(getTypeValue(attr).toString());
+
+ SortedSet<String> requiredByOcs = new TreeSet<String>();
+ for (ObjectClass oc : schema.getObjectClasses().values())
+ {
+ if (oc.getRequiredAttributeChain().contains(attr))
+ {
+ requiredByOcs.add(oc.getNameOrOID());
+ }
+ }
+
+ DefaultListModel model = (DefaultListModel)requiredBy.getModel();
+ model.clear();
+ for (String oc : requiredByOcs)
+ {
+ model.addElement(oc);
+ }
+
+ SortedSet<String> optionalByOcs = new TreeSet<String>();
+ for (ObjectClass oc : schema.getObjectClasses().values())
+ {
+ if (oc.getOptionalAttributeChain().contains(attr))
+ {
+ optionalByOcs.add(oc.getNameOrOID());
+ }
+ }
+
+ model = (DefaultListModel)optionalBy.getModel();
+ model.clear();
+ for (String oc : optionalByOcs)
+ {
+ model.addElement(oc);
+ }
+ }
+
+ /**
+ * Returns the message describing the attribute type (operational, single
+ * valued, etc.).
+ * @param attr the attribute.
+ * @return the message describing the attribute type (operational, single
+ * valued, etc.).
+ */
+ static Message getTypeValue(AttributeType attr)
+ {
+ MessageBuilder mb = new MessageBuilder();
+ Boolean[] props = {attr.isOperational(), attr.isSingleValue(),
+ attr.isNoUserModification(), attr.isCollective(),
+ attr.isObsolete()};
+ Message[][] values = {
+ {INFO_CTRL_PANEL_ATTRIBUTE_OPERATIONAL_LABEL.get(), null},
+ {INFO_CTRL_PANEL_ATTRIBUTE_SINGLE_VALUED_LABEL.get(),
+ INFO_CTRL_PANEL_ATTRIBUTE_MULTI_VALUED_LABEL.get()},
+ {INFO_CTRL_PANEL_ATTRIBUTE_NON_MODIFIABLE_LABEL.get(), null},
+ {INFO_CTRL_PANEL_ATTRIBUTE_COLLECTIVE_LABEL.get(), null},
+ {INFO_CTRL_PANEL_ATTRIBUTE_OBSOLETE_LABEL.get(), null}};
+ int i = 0;
+ for (Boolean prop : props)
+ {
+ Message value = prop ? values[i][0] : values[i][1];
+ if (value != null)
+ {
+ if (mb.length() > 0)
+ {
+ mb.append(", ");
+ }
+ mb.append(value);
+ }
+ i++;
+ }
+ return mb.toMessage();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
new file mode 100644
index 0000000..91eb782
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
@@ -0,0 +1,456 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.GridBagConstraints;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JLabel;
+import javax.swing.JList;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.components.TitlePanel;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.CommonSchemaElements;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.Schema;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * The panel that displays a standard object class definition.
+ *
+ */
+public class StandardObjectClassPanel extends SchemaElementPanel
+{
+ private static final long serialVersionUID = 5561268287795223026L;
+ private TitlePanel titlePanel = new TitlePanel(Message.EMPTY, Message.EMPTY);
+ private JLabel name = Utilities.createDefaultLabel();
+ private JLabel parent = Utilities.createDefaultLabel();
+ private JLabel oid = Utilities.createDefaultLabel();
+ private JLabel origin = Utilities.createDefaultLabel();
+ private JLabel description = Utilities.createDefaultLabel();
+ private JLabel aliases = Utilities.createDefaultLabel();
+ private JLabel type = Utilities.createDefaultLabel();
+ private JList requiredAttributes = new JList(new DefaultListModel());
+ private JList optionalAttributes = new JList(new DefaultListModel());
+
+ private static Message ABSTRACT_VALUE =
+ INFO_CTRL_PANEL_OBJECTCLASS_ABSTRACT_LABEL.get();
+ private static Message STRUCTURAL_VALUE =
+ INFO_CTRL_PANEL_OBJECTCLASS_STRUCTURAL_LABEL.get();
+ private static Message AUXILIARY_VALUE =
+ INFO_CTRL_PANEL_OBJECTCLASS_AUXILIARY_LABEL.get();
+ private static Message OBSOLETE_VALUE =
+ INFO_CTRL_PANEL_OBJECTCLASS_OBSOLETE_LABEL.get();
+
+ private Map<String, AttributeType> hmAttrs =
+ new HashMap<String, AttributeType>();
+
+ /**
+ * Default constructor of the panel.
+ *
+ */
+ public StandardObjectClassPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_STANDARD_OBJECTCLASS_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return requiredAttributes;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ protected void createLayout()
+ {
+ createBasicLayout(this, new GridBagConstraints());
+ setBorder(PANEL_BORDER);
+ }
+
+ /**
+ * Creates the basic layout of the panel.
+ * @param c the container where all the components will be layed out.
+ * @param gbc the grid bag constraints.
+ */
+ protected void createBasicLayout(Container c, GridBagConstraints gbc)
+ {
+
+ requiredAttributes.setVisibleRowCount(5);
+ optionalAttributes.setVisibleRowCount(9);
+
+ Message[] labels = {
+ INFO_CTRL_PANEL_OBJECTCLASS_NAME_LABEL.get(),
+ INFO_CTRL_PANEL_OBJECTCLASS_PARENT_LABEL.get(),
+ INFO_CTRL_PANEL_OBJECTCLASS_OID_LABEL.get(),
+ INFO_CTRL_PANEL_OBJECTCLASS_ALIASES_LABEL.get(),
+ INFO_CTRL_PANEL_OBJECTCLASS_ORIGIN_LABEL.get(),
+ INFO_CTRL_PANEL_OBJECTCLASS_DESCRIPTION_LABEL.get(),
+ INFO_CTRL_PANEL_OBJECTCLASS_TYPE_LABEL.get()
+ };
+
+ JLabel[] values = {name, parent, oid, aliases, origin, description, type};
+ gbc.gridy = 0;
+ gbc.gridwidth = 2;
+ addErrorPane(c, gbc);
+ gbc.gridy ++;
+ titlePanel.setTitle(INFO_CTRL_PANEL_OBJECTCLASS_DETAILS.get());
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets.top = 5;
+ gbc.insets.bottom = 7;
+ c.add(titlePanel, gbc);
+
+ gbc.insets.bottom = 0;
+ gbc.insets.top = 8;
+ gbc.gridy ++;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ for (int i=0; i < labels.length; i++)
+ {
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ JLabel l = Utilities.createPrimaryLabel(labels[i]);
+ c.add(l, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ c.add(values[i], gbc);
+ gbc.gridy ++;
+ }
+ labels = new Message[] {
+ INFO_CTRL_PANEL_REQUIRED_ATTRIBUTES_LABEL.get(),
+ INFO_CTRL_PANEL_OPTIONAL_ATTRIBUTES_LABEL.get()
+ };
+ JList[] lists = {requiredAttributes, optionalAttributes};
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ for (int i=0; i<2; i++)
+ {
+ gbc.insets.left = 0;
+ gbc.gridx = 0;
+ JLabel l = Utilities.createPrimaryLabel(labels[i]);
+ gbc.weightx = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ c.add(l, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ if (i == 0)
+ {
+ gbc.weighty = 0.35;
+ }
+ else
+ {
+ gbc.weighty = 0.65;
+ }
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets.top = 10;
+ c.add(Utilities.createScrollPane(lists[i]), gbc);
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ JLabel explanation = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_INHERITED_ATTRIBUTES_HELP.get());
+ gbc.insets.top = 3;
+ c.add(explanation, gbc);
+ gbc.gridy ++;
+
+ final JList list = lists[i];
+ MouseAdapter doubleClickListener = new MouseAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseClicked(MouseEvent ev)
+ {
+ if (ev.getClickCount() > 1)
+ {
+ String o = (String)list.getSelectedValue();
+ if (o != null)
+ {
+ AttributeType attr = hmAttrs.get(o);
+ if (attr != null)
+ {
+ notifySchemaSelectionListeners(attr);
+ }
+ }
+ }
+ }
+ };
+ list.addMouseListener(doubleClickListener);
+ }
+ }
+
+ /**
+ * Returns the message describing the schema element origin (file, RFC, etc.).
+ * @param element the schema element.
+ * @return the message describing the schema element origin (file, RFC, etc.).
+ */
+ static Message getOrigin(CommonSchemaElements element)
+ {
+ MessageBuilder returnValue = new MessageBuilder();
+ String fileName = element.getSchemaFile();
+ String xOrigin = null;
+ Iterable<String> it =
+ element.getExtraProperty(ServerConstants.SCHEMA_PROPERTY_ORIGIN);
+ if (it != null)
+ {
+ Iterator<String> iterator = it.iterator();
+ if (iterator.hasNext())
+ {
+ xOrigin = iterator.next();
+ }
+ }
+ if (xOrigin != null)
+ {
+ returnValue.append(xOrigin);
+ if (fileName != null)
+ {
+ returnValue.append(" -");
+ returnValue.append(
+ INFO_CTRL_PANEL_DEFINED_IN_SCHEMA_FILE.get(fileName));
+ }
+ }
+ else if (fileName != null)
+ {
+ returnValue.append(INFO_CTRL_PANEL_DEFINED_IN_SCHEMA_FILE.get(fileName));
+ }
+ else
+ {
+ returnValue.append(NOT_APPLICABLE);
+ }
+ return returnValue.toMessage();
+ }
+
+ /**
+ * Updates the contents of the panel with the provided object class.
+ * @param oc the object class.
+ * @param schema the schema.
+ */
+ public void update(ObjectClass oc, Schema schema)
+ {
+ if ((oc == null) || (schema == null))
+ {
+ // Ignore: this is called to get an initial panel size.
+ return;
+ }
+ hmAttrs.clear();
+ String n = oc.getPrimaryName();
+ if (n == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ titlePanel.setDetails(Message.raw(n));
+ name.setText(n);
+ ObjectClass superior = oc.getSuperiorClass();
+ if (superior == null)
+ {
+ n = null;
+ }
+ else
+ {
+ n = superior.getPrimaryName();
+ }
+ if (n == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ parent.setText(n);
+ oid.setText(oc.getOID());
+ origin.setText(getOrigin(oc).toString());
+ n = oc.getDescription();
+ if (n == null)
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ description.setText(n);
+ ArrayList<String> otherNames = new ArrayList<String>();
+ Iterable<String> ocNames = oc.getNormalizedNames();
+ String primaryName = oc.getPrimaryName();
+ if (primaryName == null)
+ {
+ primaryName = "";
+ }
+ for (String name : ocNames)
+ {
+ if (!name.equalsIgnoreCase(primaryName))
+ {
+ otherNames.add(name);
+ }
+ }
+ if (otherNames.size() > 0)
+ {
+ n = Utilities.getStringFromCollection(otherNames, ", ");
+ }
+ else
+ {
+ n = NOT_APPLICABLE.toString();
+ }
+ aliases.setText(n);
+
+ type.setText(getTypeValue(oc).toString());
+
+ SortedSet<String> requiredAttrs = new TreeSet<String>();
+ Set<String> inheritedAttrs = new HashSet<String>();
+ for (AttributeType attr : oc.getRequiredAttributeChain())
+ {
+ requiredAttrs.add(attr.getNameOrOID());
+ }
+ ObjectClass parent = oc.getSuperiorClass();
+ if (parent != null)
+ {
+ for (AttributeType attr : parent.getRequiredAttributeChain())
+ {
+ inheritedAttrs.add(attr.getNameOrOID());
+ }
+ }
+
+ DefaultListModel model = (DefaultListModel)requiredAttributes.getModel();
+ model.clear();
+ for (String attr : requiredAttrs)
+ {
+ String v;
+ if (inheritedAttrs.contains(attr))
+ {
+ v = attr+" (*)";
+ }
+ else
+ {
+ v = attr;
+ }
+ model.addElement(v);
+ hmAttrs.put(v, schema.getAttributeType(attr.toLowerCase()));
+ }
+
+ SortedSet<String> optionalAttrs = new TreeSet<String>();
+ inheritedAttrs = new HashSet<String>();
+ for (AttributeType attr : oc.getOptionalAttributeChain())
+ {
+ optionalAttrs.add(attr.getNameOrOID());
+ }
+ parent = oc.getSuperiorClass();
+ if (parent != null)
+ {
+ for (AttributeType attr : parent.getOptionalAttributeChain())
+ {
+ inheritedAttrs.add(attr.getNameOrOID());
+ }
+ }
+ model = (DefaultListModel)optionalAttributes.getModel();
+ model.clear();
+ for (String attr : optionalAttrs)
+ {
+ String v;
+ if (inheritedAttrs.contains(attr))
+ {
+ v = attr+" (*)";
+ }
+ else
+ {
+ v = attr;
+ }
+ model.addElement(v);
+ hmAttrs.put(v, schema.getAttributeType(attr.toLowerCase()));
+ }
+ }
+
+ /**
+ * Returns the message describing the object class type (structural, obsolete,
+ * etc.) of a given object class.
+ * @param oc the object class.
+ * @return the message describing the object class type (structural, obsolete,
+ * etc.) of the provided object class.
+ */
+ static Message getTypeValue(ObjectClass oc)
+ {
+ MessageBuilder mb = new MessageBuilder();
+ switch (oc.getObjectClassType())
+ {
+ case ABSTRACT:
+ mb.append(ABSTRACT_VALUE);
+ break;
+ case STRUCTURAL:
+ mb.append(STRUCTURAL_VALUE);
+ break;
+ case AUXILIARY:
+ mb.append(AUXILIARY_VALUE);
+ break;
+ }
+ if (oc.isObsolete())
+ {
+ if (mb.length() > 0)
+ {
+ mb.append(", ");
+ }
+ mb.append(OBSOLETE_VALUE);
+ }
+ return mb.toMessage();
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
new file mode 100644
index 0000000..5be1c2d
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -0,0 +1,1943 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.swing.Box;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JMenuBar;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.CategorizedComboBoxElement;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.*;
+import org.opends.guitools.controlpanel.task.RebuildIndexTask;
+import org.opends.guitools.controlpanel.task.RestartServerTask;
+import org.opends.guitools.controlpanel.task.StartServerTask;
+import org.opends.guitools.controlpanel.task.StopServerTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.components.AddRemovePanel;
+import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.messages.MessageDescriptor;
+import org.opends.quicksetup.ui.CustomHTMLEditorKit;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * An abstract class that contains a number of methods that are shared by all
+ * the inheriting classes. In general a StatusGenericPanel is contained in a
+ * GenericDialog and specifies the kind of buttons that this dialog has. The
+ * StatusGenericPanel is also notified when the dialog is displayed (through
+ * the toBeDisplayed method)
+ *
+ */
+
+public abstract class StatusGenericPanel extends JPanel
+implements ConfigChangeListener
+{
+ /**
+ * The string to be used as combo separator.
+ */
+ public static final String COMBO_SEPARATOR = "----------";
+
+ /**
+ * The not applicable message.
+ */
+ protected final static Message NOT_APPLICABLE =
+ INFO_NOT_APPLICABLE_LABEL.get();
+
+ private Message AUTHENTICATE = INFO_AUTHENTICATE_BUTTON_LABEL.get();
+ private Message START = INFO_START_BUTTON_LABEL.get();
+
+ private ControlPanelInfo info;
+
+ private boolean enableClose = true;
+ private boolean enableCancel = true;
+ private boolean enableOK = true;
+
+ private boolean disposeOnClose = false;
+
+ private JPanel mainPanel;
+ private JLabel message;
+
+ private GenericDialog loginDialog;
+
+ /**
+ * The error pane.
+ */
+ protected JEditorPane errorPane;
+
+ /**
+ * The last displayed message in the error pane.
+ */
+ protected String lastDisplayedError = null;
+
+ private ArrayList<ConfigurationElementCreatedListener> confListeners =
+ new ArrayList<ConfigurationElementCreatedListener>();
+
+ private boolean sizeSet = false;
+ private boolean focusSet = false;
+
+ /**
+ * Returns the title that will be used as title of the dialog.
+ * @return the title that will be used as title of the dialog.
+ */
+ public abstract Message getTitle();
+
+ /**
+ * Returns the buttons that the dialog where this panel is contained should
+ * display.
+ * @return the buttons that the dialog where this panel is contained should
+ * display.
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.OK_CANCEL;
+ }
+
+ /**
+ * Returns the component that should get the focus when the dialog that
+ * contains this panel is displayed.
+ * @return the component that should get the focus.
+ */
+ public abstract Component getPreferredFocusComponent();
+
+ /**
+ * Returns <CODE>true</CODE> if this panel requires some bordering (in general
+ * an EmptyBorder with some insets) and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if this panel requires some bordering (in general
+ * an EmptyBorder with some insets) and <CODE>false</CODE> otherwise.
+ */
+ public boolean requiresBorder()
+ {
+ return true;
+ }
+
+ /**
+ * Returns the menu bar that the panel might have. Returns
+ * <CODE>null</CODE> if the panel has no menu bar associated.
+ * @return the menu bar that the panel might have.
+ */
+ public JMenuBar getMenuBar()
+ {
+ return null;
+ }
+
+
+ /**
+ * This method is called to indicate that the configuration changes should
+ * be called in the background. In the case of panels which require some
+ * time to be updated with the new configuration this method returns
+ * <CODE>true</CODE> and the operation will be performed in the background
+ * while a message of type 'Loading...' is displayed on the panel.
+ * @return <CODE>true</CODE> if changes should be loaded in the background and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean callConfigurationChangedInBackground()
+ {
+ return false;
+ }
+
+ /**
+ * The panel is notified that the dialog is going to be visible or invisible.
+ * @param visible whether is going to be visible or not.
+ */
+ public void toBeDisplayed(boolean visible)
+ {
+ }
+
+ /**
+ * Tells whether this panel should be contained in a scroll pane or not.
+ * @return <CODE>true</CODE> if this panel should be contained in a scroll
+ * pane and <CODE>false</CODE> otherwise.
+ */
+ public boolean requiresScroll()
+ {
+ return true;
+ }
+
+ /**
+ * Constructor.
+ *
+ */
+ protected StatusGenericPanel()
+ {
+ super(new GridBagLayout());
+ setBackground(ColorAndFontConstants.background);
+
+ mainPanel = new JPanel(new GridBagLayout());
+ mainPanel.setOpaque(false);
+
+ message = Utilities.createDefaultLabel();
+
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ super.add(mainPanel, gbc);
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.CENTER;
+ super.add(message, gbc);
+ message.setVisible(false);
+ }
+
+ /**
+ * The components are not added directly to the panel but to the main panel.
+ * This is done to be able to display a message that takes the whole panel
+ * (of type 'Loading...') when we are doing long operations.
+ * @param comp the Component to be added.
+ * @param constraints the constraints.
+ */
+ public void add(Component comp, Object constraints)
+ {
+ mainPanel.add(comp, constraints);
+ }
+
+ /**
+ * Adds a bottom glue to the main panel with the provided constraints.
+ * @param gbc the constraints.
+ */
+ protected void addBottomGlue(GridBagConstraints gbc)
+ {
+ GridBagConstraints gbc2 = (GridBagConstraints)gbc.clone();
+ gbc2.insets = new Insets(0, 0, 0, 0);
+ gbc2.gridy ++;
+ gbc2.gridwidth = GridBagConstraints.REMAINDER;
+ gbc2.weighty = 1.0;
+ gbc2.fill = GridBagConstraints.VERTICAL;
+ add(Box.createVerticalGlue(), gbc2);
+ gbc.gridy ++;
+ }
+
+ /**
+ * Returns a label with text 'Required Field' and an icon (used as legend in
+ * some panels).
+ * @return a label with text 'Required Field' and an icon (used as legend in
+ * some panels).
+ */
+ protected JLabel createRequiredLabel()
+ {
+ JLabel requiredLabel = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_INDICATES_REQUIRED_FIELD_LABEL.get());
+ requiredLabel.setIcon(
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+"/required.gif"));
+
+ return requiredLabel;
+ }
+
+ /**
+ * Creates and adds an error pane. Is up to the caller to set the proper
+ * gridheight, gridwidth, gridx and gridy on the provided GridBagConstraints.
+ * @param baseGbc the GridBagConstraints to be used.
+ */
+ protected void addErrorPane(GridBagConstraints baseGbc)
+ {
+ addErrorPane(this, baseGbc);
+ }
+
+ /**
+ * Adds an error pane to the provided container.
+ * Is up to the caller to set the proper gridheight, gridwidth, gridx and
+ * gridy on the provided GridBagConstraints.
+ * @param baseGbc the GridBagConstraints to be used.
+ * @param p the container.
+ */
+ protected void addErrorPane(Container p, GridBagConstraints baseGbc)
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = baseGbc.gridx;
+ gbc.gridy = baseGbc.gridy;
+ gbc.gridwidth = baseGbc.gridwidth;
+ gbc.gridheight = baseGbc.gridheight;
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ if (requiresBorder())
+ {
+ gbc.insets = new Insets(0, 0, 10, 0);
+ }
+ else
+ {
+ gbc.insets = new Insets(20, 20, 0, 20);
+ }
+ errorPane = Utilities.makeHtmlPane("", ColorAndFontConstants.progressFont);
+ errorPane.setOpaque(false);
+ errorPane.setEditable(false);
+ errorPane.setVisible(false);
+ CustomHTMLEditorKit htmlEditor = new CustomHTMLEditorKit();
+ htmlEditor.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ if (AUTHENTICATE.toString().equals(ev.getActionCommand()))
+ {
+ authenticate();
+ }
+ else if (START.toString().equals(ev.getActionCommand()))
+ {
+ startServer();
+ }
+ }
+ });
+ errorPane.setEditorKit(htmlEditor);
+ p.add(errorPane, gbc);
+ }
+
+ /**
+ * Commodity method used to add lines, where each line contains a label, a
+ * component and an inline help label.
+ * @param labels the labels.
+ * @param comps the components.
+ * @param inlineHelp the inline help labels.
+ * @param panel the panel where we will add the lines.
+ * @param gbc the grid bag constraints.
+ */
+ protected void add(JLabel[] labels, Component[] comps, JLabel[] inlineHelp,
+ Container panel, GridBagConstraints gbc)
+ {
+ int i = 0;
+ for (Component comp : comps)
+ {
+ gbc.insets.left = 0;
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ if (labels[i] != null)
+ {
+ panel.add(labels[i], gbc);
+ }
+ gbc.insets.left = 10;
+ gbc.weightx = 1.0;
+ gbc.gridx = 1;
+ panel.add(comp, gbc);
+ if (inlineHelp[i] != null)
+ {
+ gbc.insets.top = 3;
+ gbc.gridy ++;
+ panel.add(inlineHelp[i], gbc);
+ }
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ i++;
+ }
+ }
+
+ /**
+ * Enables the OK button in the parent dialog.
+ * @param enable whether to enable or disable the button.
+ */
+ protected void setEnabledOK(boolean enable)
+ {
+ Window parent = Utilities.getParentDialog(this);
+ if ((parent != null) && (parent instanceof GenericDialog))
+ {
+ ((GenericDialog)parent).setEnabledOK(enable);
+ }
+ enableOK = enable;
+ }
+
+ /**
+ * Enables the Cancel button in the parent dialog.
+ * @param enable whether to enable or disable the button.
+ */
+ protected void setEnabledCancel(boolean enable)
+ {
+ JDialog parent = (JDialog)Utilities.getParentDialog(this);
+ if ((parent != null) && (parent instanceof GenericDialog))
+ {
+ ((GenericDialog)parent).setEnabledCancel(enable);
+ }
+ enableCancel = enable;
+ }
+
+ /**
+ * Updates the font type and color of the component to be invalid and
+ * primary.
+ * @param comp the component to update.
+ */
+ protected void setPrimaryInvalid(JComponent comp)
+ {
+ comp.setFont(ColorAndFontConstants.primaryInvalidFont);
+ comp.setForeground(ColorAndFontConstants.invalidFontColor);
+ }
+
+ /**
+ * Updates the font type and color of the component to be valid and
+ * primary.
+ * @param comp the component to update.
+ */
+ protected void setPrimaryValid(JComponent comp)
+ {
+ comp.setForeground(ColorAndFontConstants.validFontColor);
+ comp.setFont(ColorAndFontConstants.primaryFont);
+ }
+
+ /**
+ * Updates the font type and color of the component to be invalid and
+ * secondary.
+ * @param comp the component to update.
+ */
+ protected void setSecondaryInvalid(JComponent comp)
+ {
+ comp.setForeground(ColorAndFontConstants.invalidFontColor);
+ comp.setFont(ColorAndFontConstants.invalidFont);
+ }
+
+ /**
+ * Updates the font type and color of the component to be valid and
+ * secondary.
+ * @param comp the component to update.
+ */
+ protected void setSecondaryValid(JComponent comp)
+ {
+ comp.setForeground(ColorAndFontConstants.validFontColor);
+ comp.setFont(ColorAndFontConstants.defaultFont);
+ }
+
+ /**
+ * Packs the parent dialog.
+ *
+ */
+ protected void packParentDialog()
+ {
+ Window dlg = Utilities.getParentDialog(this);
+ if (dlg != null)
+ {
+ invalidate();
+ dlg.invalidate();
+ dlg.pack();
+ if (!SwingUtilities.isEventDispatchThread())
+ {
+ Thread.dumpStack();
+ }
+ }
+ }
+
+ /**
+ * Notification that the ok button has been clicked, the panel is in charge
+ * of doing whatever is required (close the dialog, launch a task, etc.).
+ *
+ */
+ abstract public void okClicked();
+
+ /**
+ * Adds a configuration element created listener.
+ * @param listener the listener.
+ */
+ public void addConfigurationElementCreatedListener(
+ ConfigurationElementCreatedListener listener)
+ {
+ confListeners.add(listener);
+ }
+
+ /**
+ * Removes a configuration element created listener.
+ * @param listener the listener.
+ */
+ public void removeConfigurationElementCreatedListener(
+ ConfigurationElementCreatedListener listener)
+ {
+ confListeners.remove(listener);
+ }
+
+ /**
+ * Notifies the configuraton element created listener that a new object has
+ * been created.
+ * @param configObject the created object.
+ */
+ protected void notifyConfigurationElementCreated(Object configObject)
+ {
+ for (ConfigurationElementCreatedListener listener : confListeners)
+ {
+ listener.elementCreated(
+ new ConfigurationElementCreatedEvent(this, configObject));
+ }
+ }
+
+ /**
+ * Notification that cancel was clicked, the panel is in charge
+ * of doing whatever is required (close the dialog, etc.).
+ *
+ */
+ public void cancelClicked()
+ {
+ // Default implementation
+ Utilities.getParentDialog(this).setVisible(false);
+ if (isDisposeOnClose())
+ {
+ Utilities.getParentDialog(this).dispose();
+ }
+ }
+
+ /**
+ * Whether the dialog should be disposed when the user closes it.
+ * @return <CODE>true</CODE> if the dialog should be disposed when the user
+ * closes it or <CODE>true</CODE> otherwise.
+ */
+ public boolean isDisposeOnClose()
+ {
+ return disposeOnClose;
+ }
+
+ /**
+ * Sets whether the dialog should be disposed when the user closes it or not.
+ * @param disposeOnClose <CODE>true</CODE> if the dialog should be disposed
+ * when the user closes it or <CODE>true</CODE> otherwise.
+ */
+ public void setDisposeOnClose(boolean disposeOnClose)
+ {
+ this.disposeOnClose = disposeOnClose;
+ }
+
+ /**
+ * Notification that close was clicked, the panel is in charge
+ * of doing whatever is required (close the dialog, etc.).
+ *
+ */
+ public void closeClicked()
+ {
+ // Default implementation
+ Utilities.getParentDialog(this).setVisible(false);
+ if (isDisposeOnClose())
+ {
+ Utilities.getParentDialog(this).dispose();
+ }
+ }
+
+ /**
+ * Displays a dialog with the provided list of error messages.
+ * @param errors the error messages.
+ */
+ protected void displayErrorDialog(Collection<Message> errors)
+ {
+ Utilities.displayErrorDialog(Utilities.getParentDialog(this), errors);
+ }
+
+ /**
+ * Displays a confirmation message.
+ * @param title the title/summary of the message.
+ * @param msg the description of the confirmation.
+ * @return <CODE>true</CODE> if the user confirms and <CODE>false</CODE>
+ * otherwise.
+ */
+ protected boolean displayConfirmationDialog(Message title, Message msg)
+ {
+ return Utilities.displayConfirmationDialog(Utilities.getParentDialog(this),
+ title, msg);
+ }
+
+
+ /**
+ * If the index must be rebuilt, asks the user for confirmation. If the user
+ * confirms launches a task that will rebuild the indexes. The progress will
+ * be displayed in the provided progress dialog.
+ * @param index the index.
+ * @param progressDialog the progress dialog.
+ */
+ protected void rebuildIndexIfNecessary(AbstractIndexDescriptor index,
+ ProgressDialog progressDialog)
+ {
+ progressDialog.setTaskIsOver(false);
+ boolean rebuildIndexes;
+ String backendName = index.getBackend().getBackendID();
+ if (!isServerRunning())
+ {
+ rebuildIndexes = Utilities.displayConfirmationDialog(progressDialog,
+ INFO_CTRL_PANEL_INDEX_REBUILD_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_INDEX_REBUILD_REQUIRED_OFFLINE_DETAILS.get(
+ index.getName(), backendName));
+ }
+ else
+ {
+ rebuildIndexes = Utilities.displayConfirmationDialog(progressDialog,
+ INFO_CTRL_PANEL_INDEX_REBUILD_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_INDEX_REBUILD_REQUIRED_ONLINE_DETAILS.get(
+ index.getName(), backendName, backendName));
+ }
+ if (rebuildIndexes)
+ {
+ SortedSet<AbstractIndexDescriptor> indexes =
+ new TreeSet<AbstractIndexDescriptor>();
+ indexes.add(index);
+ SortedSet<String> baseDNs = new TreeSet<String>();
+ for (BaseDNDescriptor b : index.getBackend().getBaseDns())
+ {
+ String baseDN = Utilities.unescapeUtf8(b.getDn().toString());
+ baseDNs.add(baseDN);
+ }
+
+ RebuildIndexTask newTask = new RebuildIndexTask(getInfo(),
+ progressDialog, baseDNs, indexes);
+ ArrayList<Message> errors = new ArrayList<Message>();
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.size() == 0)
+ {
+ progressDialog.appendProgressHtml("<br><br>");
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_REBUILDING_INDEXES_SUMMARY.get(backendName),
+ INFO_CTRL_PANEL_REBUILDING_INDEXES_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_REBUILDING_INDEXES_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_REBUILDING_INDEXES_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_REBUILDING_INDEXES_ERROR_DETAILS,
+ progressDialog, false);
+ progressDialog.toFront();
+ progressDialog.setVisible(true);
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+ else
+ {
+ progressDialog.setTaskIsOver(true);
+ if (progressDialog.isVisible())
+ {
+ progressDialog.toFront();
+ }
+ }
+ }
+
+
+ /**
+ * A class used to avoid the possibility a certain type of objects in a combo
+ * box. This is used for instance in the combo box that contains base DNs
+ * where the base DNs are separated in backends, so the combo box displays
+ * both the backends (~ categories) and base DNs (~ values) and we do not
+ * allow to select the backends (~ categories).
+ *
+ */
+ protected class IgnoreItemListener implements ItemListener
+ {
+ private Object selectedItem;
+ private JComboBox combo;
+
+ /**
+ * Constructor.
+ * @param combo the combo box.
+ */
+ IgnoreItemListener(JComboBox combo)
+ {
+ this.combo = combo;
+ selectedItem = combo.getSelectedItem();
+ if (isCategory(selectedItem))
+ {
+ selectedItem = null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void itemStateChanged(ItemEvent ev)
+ {
+ Object o = combo.getSelectedItem();
+ if (isCategory(o))
+ {
+ if (selectedItem == null)
+ {
+ // Look for the first element that is not a category
+ for (int i=0; i<combo.getModel().getSize(); i++)
+ {
+ Object item = combo.getModel().getElementAt(i);
+ if (item instanceof CategorizedComboBoxElement)
+ {
+ if (!isCategory(item))
+ {
+ selectedItem = item;
+ break;
+ }
+ }
+ }
+ }
+ if (selectedItem != null)
+ {
+ combo.setSelectedItem(selectedItem);
+ }
+ }
+ else if (COMBO_SEPARATOR.equals(o))
+ {
+ combo.setSelectedItem(selectedItem);
+ }
+ else
+ {
+ selectedItem = o;
+ }
+ }
+ }
+
+ /**
+ * Returns the HTML required to render an Authenticate button in HTML.
+ * @return the HTML required to render an Authenticate button in HTML.
+ */
+ protected String getAuthenticateHTML()
+ {
+ return "<INPUT type=\"submit\" value=\""+AUTHENTICATE+"\"></INPUT>";
+ }
+
+ /**
+ * Returns the HTML required to render an Start button in HTML.
+ * @return the HTML required to render an Start button in HTML.
+ */
+ protected String getStartServerHTML()
+ {
+ return "<INPUT type=\"submit\" value=\""+START+"\"></INPUT>";
+ }
+
+ /**
+ * Updates the error panel and enables/disables the OK button depending on
+ * the status of the server.
+ * @param desc the Server Descriptor.
+ * @param details the message to be displayed if authentication has not been
+ * provided and the server is running.
+ */
+ protected void updateErrorPaneAndOKButtonIfAuthRequired(ServerDescriptor desc,
+ Message details)
+ {
+ if (authenticationRequired(desc))
+ {
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(details);
+ mb.append("<br><br>"+getAuthenticateHTML());
+ Message title = INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_SUMMARY.get();
+ updateErrorPane(errorPane, title, ColorAndFontConstants.errorTitleFont,
+ mb.toMessage(), ColorAndFontConstants.defaultFont);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ errorPane.setVisible(true);
+ packParentDialog();
+ setEnabledOK(false);
+ }
+ });
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ errorPane.setVisible(false);
+ checkOKButtonEnable();
+ }
+ });
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the server is running and the user did not
+ * provide authentication and <CODE>false</CODE> otherwise.
+ * @param desc the server descriptor.
+ * @return <CODE>true</CODE> if the server is running and the user did not
+ * provide authentication and <CODE>false</CODE> otherwise.
+ */
+ protected boolean authenticationRequired(ServerDescriptor desc)
+ {
+ boolean returnValue;
+ ServerDescriptor.ServerStatus status = desc.getStatus();
+ if ((status == ServerDescriptor.ServerStatus.STARTED) &&
+ !desc.isAuthenticated())
+ {
+ returnValue = true;
+ }
+ else
+ {
+ returnValue = false;
+ }
+ return returnValue;
+ }
+
+ /**
+ * Updates the error panel depending on the status of the server.
+ * @param desc the Server Descriptor.
+ * @param details the message to be displayed if authentication has not been
+ * provided and the server is running.
+ */
+ protected void updateErrorPaneIfAuthRequired(ServerDescriptor desc,
+ Message details)
+ {
+ if (authenticationRequired(desc))
+ {
+ Message title = INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_SUMMARY.get();
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(details);
+ mb.append("<br><br>"+getAuthenticateHTML());
+ updateErrorPane(errorPane, title, ColorAndFontConstants.errorTitleFont,
+ mb.toMessage(), ColorAndFontConstants.defaultFont);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ errorPane.setVisible(true);
+ packParentDialog();
+ }
+ });
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ errorPane.setVisible(false);
+ }
+ });
+ }
+ }
+
+ /**
+ * Updates the error panel depending on the status of the server. This
+ * method will display an error message in the error pane if the server is not
+ * running and another message if the server is running but authentication
+ * has not been provided.
+ * @param desc the Server Descriptor.
+ * @param detailsServerNotRunning the message to be displayed if the server is
+ * not running.
+ * @param authRequired the message to be displayed if authentication has not
+ * been provided and the server is running.
+ */
+ protected void updateErrorPaneIfServerRunningAndAuthRequired(
+ ServerDescriptor desc, Message detailsServerNotRunning,
+ Message authRequired)
+ {
+ ServerDescriptor.ServerStatus status = desc.getStatus();
+ if (status != ServerDescriptor.ServerStatus.STARTED)
+ {
+ Message title = INFO_CTRL_PANEL_SERVER_NOT_RUNNING_SUMMARY.get();
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(detailsServerNotRunning);
+ mb.append("<br><br>"+getStartServerHTML());
+ updateErrorPane(errorPane, title, ColorAndFontConstants.errorTitleFont,
+ mb.toMessage(),
+ ColorAndFontConstants.defaultFont);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ errorPane.setVisible(true);
+ packParentDialog();
+ }
+ });
+ }
+ else if (authenticationRequired(desc))
+ {
+ Message title = INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_SUMMARY.get();
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(authRequired);
+ mb.append("<br><br>"+getAuthenticateHTML());
+ updateErrorPane(errorPane, title, ColorAndFontConstants.errorTitleFont,
+ mb.toMessage(), ColorAndFontConstants.defaultFont);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ errorPane.setVisible(true);
+ packParentDialog();
+ }
+ });
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ errorPane.setVisible(false);
+ }
+ });
+ }
+ }
+
+ /**
+ * Updates the enabling/disabling of the OK button. The code assumes that
+ * the error pane has already been updated.
+ *
+ */
+ protected void checkOKButtonEnable()
+ {
+ setEnabledOK(!errorPane.isVisible());
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided object is a category object in
+ * a combo box.
+ * @param o the item in the combo box.
+ * @return <CODE>true</CODE> if the provided object is a category object in
+ * a combo box.
+ */
+ protected boolean isCategory(Object o)
+ {
+ boolean isCategory = false;
+ if (o instanceof CategorizedComboBoxElement)
+ {
+ CategorizedComboBoxElement desc = (CategorizedComboBoxElement)o;
+ isCategory = desc.getType() == CategorizedComboBoxElement.Type.CATEGORY;
+ }
+ return isCategory;
+ }
+
+ /**
+ * Returns the control panel info object.
+ * @return the control panel info object.
+ */
+ public ControlPanelInfo getInfo()
+ {
+ return info;
+ }
+
+ /**
+ * Sets the control panel info object.
+ * @param info the control panel info object.
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ if (!info.equals(this.info))
+ {
+ if (this.info != null)
+ {
+ this.info.removeConfigChangeListener(this);
+ }
+ this.info = info;
+ this.info.addConfigChangeListener(this);
+ if (SwingUtilities.isEventDispatchThread() &&
+ callConfigurationChangedInBackground())
+ {
+ final Color savedBackground = getBackground();
+ setBackground(ColorAndFontConstants.background);
+ if (!sizeSet)
+ {
+ setPreferredSize(mainPanel.getPreferredSize());
+ sizeSet = true;
+ }
+ // Do it outside the event thread if the panel requires it.
+ BackgroundTask<Void> worker = new BackgroundTask<Void>()
+ {
+ public Void processBackgroundTask() throws Throwable
+ {
+ try
+ {
+ Thread.sleep(1000);
+ }
+ catch (Throwable t)
+ {
+ }
+ configurationChanged(new ConfigurationChangeEvent(
+ StatusGenericPanel.this.info,
+ StatusGenericPanel.this.info.getServerDescriptor()));
+ return null;
+ }
+
+
+ public void backgroundTaskCompleted(Void returnValue,
+ Throwable t)
+ {
+ setBackground(savedBackground);
+ displayMainPanel();
+ if (!focusSet)
+ {
+ focusSet = true;
+ Component comp = getPreferredFocusComponent();
+ if (comp != null)
+ {
+ comp.requestFocusInWindow();
+ }
+ }
+ }
+ };
+ displayMessage(INFO_CTRL_PANEL_LOADING_PANEL_SUMMARY.get());
+ worker.startBackgroundTask();
+ }
+ else
+ {
+ configurationChanged(new ConfigurationChangeEvent(
+ this.info, this.info.getServerDescriptor()));
+ }
+ }
+ }
+
+ /**
+ * Displays the main panel.
+ *
+ */
+ protected void displayMainPanel()
+ {
+ mainPanel.setVisible(true);
+ message.setVisible(false);
+ }
+
+ /**
+ * Displays a message and hides the main panel.
+ * @param msg the message to be displayed.
+ */
+ protected void displayMessage(Message msg)
+ {
+ message.setText(msg.toString());
+ mainPanel.setVisible(false);
+ message.setVisible(true);
+ }
+
+ /**
+ * Updates the contents of an editor pane using the error format.
+ * @param pane the editor pane to be updated.
+ * @param title the title.
+ * @param titleFont the font to be used for the title.
+ * @param details the details message.
+ * @param detailsFont the font to be used for the details.
+ */
+ protected void updateErrorPane(JEditorPane pane, Message title,
+ Font titleFont, Message details, Font detailsFont)
+ {
+ updatePane(pane, title, titleFont, details, detailsFont, PanelType.ERROR);
+ }
+
+ /**
+ * Updates the contents of an editor pane using the confirmation format.
+ * @param pane the editor pane to be updated.
+ * @param title the title.
+ * @param titleFont the font to be used for the title.
+ * @param details the details message.
+ * @param detailsFont the font to be used for the details.
+ */
+ protected void updateConfirmationPane(JEditorPane pane, Message title,
+ Font titleFont, Message details, Font detailsFont)
+ {
+ updatePane(pane, title, titleFont, details, detailsFont,
+ PanelType.CONFIRMATION);
+ }
+
+ /**
+ * The different types of panel that are handled.
+ *
+ */
+ private enum PanelType
+ {
+ ERROR, CONFIRMATION, INFORMATION
+ };
+
+ /**
+ * Updates the contents of an editor pane using the provided format.
+ * @param pane the editor pane to be updated.
+ * @param title the title.
+ * @param titleFont the font to be used for the title.
+ * @param details the details message.
+ * @param detailsFont the font to be used for the details.
+ * @param type the type of panel.
+ */
+ private void updatePane(JEditorPane pane, Message title,
+ Font titleFont, Message details, Font detailsFont, PanelType type)
+ {
+ String text;
+ switch (type)
+ {
+ case ERROR:
+ text = Utilities.getFormattedError(title, titleFont, details,
+ detailsFont);
+ break;
+ case CONFIRMATION:
+ text = Utilities.getFormattedConfirmation(title, titleFont, details,
+ detailsFont);
+ break;
+ default:
+ text = Utilities.getFormattedSuccess(title, titleFont, details,
+ detailsFont);
+ break;
+ }
+ if (!text.equals(lastDisplayedError))
+ {
+ JEditorPane pane1 = Utilities.makeHtmlPane(null, pane.getFont());
+ String text1;
+ switch (type)
+ {
+ case ERROR:
+ text1 = Utilities.getFormattedError(title, titleFont,
+ null, detailsFont);
+ break;
+ default:
+ text1 = Utilities.getFormattedSuccess(title, titleFont,
+ null, detailsFont);
+ break;
+ }
+ pane1.setText(text1);
+ Dimension d1 = pane1.getPreferredSize();
+ JEditorPane pane2 = Utilities.makeHtmlPane(null, pane.getFont());
+ pane2.setText(details.toString());
+ String plainText = details.toString().replaceAll("<br>",
+ ServerConstants.EOL);
+ Utilities.updatePreferredSize(pane2, 100, plainText, detailsFont, true);
+ Dimension d2 = pane2.getPreferredSize();
+ pane.setPreferredSize(new Dimension(Math.max(d1.width, d2.width),
+ d1.height + d2.height));
+
+ lastDisplayedError = text;
+ pane.setText(text);
+ }
+ }
+
+ /**
+ * Commodity method used to update the elements of a combo box that contains
+ * the different user backends. If no backends are found the combo box will
+ * be made invisible and a label will be made visible. This method does not
+ * update the label's text nor creates any layout.
+ * @param combo the combo to be updated.
+ * @param lNoBackendsFound the label that must be shown if no user backends
+ * are found.
+ * @param desc the server descriptor that contains the configuration.
+ */
+ protected void updateSimpleBackendComboBoxModel(final JComboBox combo,
+ final JLabel lNoBackendsFound, ServerDescriptor desc)
+ {
+ final SortedSet<String> newElements = new TreeSet<String>();
+ for (BackendDescriptor backend : desc.getBackends())
+ {
+ if (!backend.isConfigBackend())
+ {
+ newElements.add(backend.getBackendID());
+ }
+ }
+ DefaultComboBoxModel model = (DefaultComboBoxModel)combo.getModel();
+ updateComboBoxModel(newElements, model);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ combo.setVisible(newElements.size() > 0);
+ lNoBackendsFound.setVisible(newElements.size() == 0);
+ }
+ });
+ }
+
+ /**
+ * Method that says if a backend must be displayed. Only non-config backends
+ * are displayed.
+ * @param backend the backend.
+ * @return <CODE>true</CODE> if the backend must be displayed and
+ * <CODE>false</CODE> otherwise.
+ */
+ protected boolean displayBackend(BackendDescriptor backend)
+ {
+ return !backend.isConfigBackend();
+ }
+
+ /**
+ * Commodity method to update a combo box model with the backends of a server.
+ * @param model the combo box model to be updated.
+ * @param desc the server descriptor containing the configuration.
+ */
+ protected void updateBaseDNComboBoxModel(DefaultComboBoxModel model,
+ ServerDescriptor desc)
+ {
+ LinkedHashSet<CategorizedComboBoxElement> newElements =
+ new LinkedHashSet<CategorizedComboBoxElement>();
+ SortedSet<String> backendIDs = new TreeSet<String>();
+ HashMap<String, SortedSet<String>> hmBaseDNs =
+ new HashMap<String, SortedSet<String>>();
+
+ for (BackendDescriptor backend : desc.getBackends())
+ {
+ if (displayBackend(backend))
+ {
+ String backendID = backend.getBackendID();
+ backendIDs.add(backendID);
+ SortedSet<String> baseDNs = new TreeSet<String>();
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ try
+ {
+ baseDNs.add(Utilities.unescapeUtf8(baseDN.getDn().toString()));
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ }
+ hmBaseDNs.put(backendID, baseDNs);
+ }
+ }
+
+ for (String backendID : backendIDs)
+ {
+ newElements.add(new CategorizedComboBoxElement(backendID,
+ CategorizedComboBoxElement.Type.CATEGORY));
+ SortedSet<String> baseDNs = hmBaseDNs.get(backendID);
+ for (String baseDN : baseDNs)
+ {
+ newElements.add(new CategorizedComboBoxElement(baseDN,
+ CategorizedComboBoxElement.Type.REGULAR));
+ }
+ }
+ updateComboBoxModel(newElements, model);
+ }
+
+ /**
+ * Updates a combo box model with a number of items.
+ * @param newElements the new items for the combo box model.
+ * @param model the combo box model to be updated.
+ */
+ protected void updateComboBoxModel(final Collection<?> newElements,
+ final DefaultComboBoxModel model)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ boolean changed = newElements.size() != model.getSize();
+ if (!changed)
+ {
+ int i = 0;
+ for (Object newElement : newElements)
+ {
+ changed = !newElement.equals(model.getElementAt(i));
+ if (changed)
+ {
+ break;
+ }
+ i++;
+ }
+ }
+ if (changed)
+ {
+ Object selected = model.getSelectedItem();
+ model.removeAllElements();
+ boolean selectDefault = false;
+ for (Object newElement : newElements)
+ {
+ model.addElement(newElement);
+ }
+ if (selected != null)
+ {
+ if (model.getIndexOf(selected) != -1)
+ {
+ model.setSelectedItem(selected);
+ }
+ else
+ {
+ selectDefault = true;
+ }
+ }
+ else
+ {
+ selectDefault = true;
+ }
+ if (selectDefault)
+ {
+ for (int i=0; i<model.getSize(); i++)
+ {
+ Object o = model.getElementAt(i);
+ if (o instanceof CategorizedComboBoxElement)
+ {
+ if (((CategorizedComboBoxElement)o).getType() ==
+ CategorizedComboBoxElement.Type.CATEGORY)
+ {
+ continue;
+ }
+ }
+ model.setSelectedItem(o);
+ break;
+ }
+ }
+ }
+ }
+ });
+ }
+
+ /**
+ * Updates a map, so that the keys are the base DN where the indexes are
+ * defined and the values are a sorted set of indexes.
+ * @param desc the server descriptor containing the index configuration.
+ * @param hmIndexes the map to be updated.
+ */
+ protected void updateIndexMap(ServerDescriptor desc,
+ HashMap<String, SortedSet<AbstractIndexDescriptor>> hmIndexes)
+ {
+ synchronized (hmIndexes)
+ {
+ HashSet<String> dns = new HashSet<String>();
+ for (BackendDescriptor backend : desc.getBackends())
+ {
+ if (backend.getType() == BackendDescriptor.Type.LOCAL_DB)
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ String dn;
+ try
+ {
+ dn = Utilities.unescapeUtf8(baseDN.getDn().toString());
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ dns.add(dn);
+ SortedSet<AbstractIndexDescriptor> indexes =
+ new TreeSet<AbstractIndexDescriptor>();
+ indexes.addAll(backend.getIndexes());
+ indexes.addAll(backend.getVLVIndexes());
+ SortedSet<AbstractIndexDescriptor> currentIndexes =
+ hmIndexes.get(dn);
+ if (currentIndexes != null)
+ {
+ if (!currentIndexes.equals(indexes))
+ {
+ hmIndexes.put(dn, indexes);
+ }
+ }
+ else
+ {
+ hmIndexes.put(dn, indexes);
+ }
+ }
+ }
+ }
+ for (String dn : new HashSet<String>(hmIndexes.keySet()))
+ {
+ if (!dns.contains(dn))
+ {
+ hmIndexes.remove(dn);
+ }
+ }
+ }
+ }
+
+
+
+ /**
+ * Updates and addremove panel with the contents of the provided item. The
+ * selected item represents a base DN.
+ * @param hmIndexes the map that contains the indexes definitions as values
+ * and the base DNs as keys.
+ * @param selectedItem the selected item.
+ * @param addRemove the add remove panel to be updated.
+ */
+ protected void comboBoxSelected(
+ HashMap<String, SortedSet<AbstractIndexDescriptor>> hmIndexes,
+ CategorizedComboBoxElement selectedItem,
+ AddRemovePanel<AbstractIndexDescriptor> addRemove)
+ {
+ synchronized (hmIndexes)
+ {
+ String selectedDn = null;
+ if (selectedItem != null)
+ {
+ selectedDn = (String)selectedItem.getValue();
+ }
+ if (selectedDn != null)
+ {
+ SortedSet<AbstractIndexDescriptor> indexes =
+ hmIndexes.get(selectedDn);
+ if (indexes != null)
+ {
+ boolean availableChanged = false;
+ boolean selectedChanged = false;
+ SortedSet<AbstractIndexDescriptor> availableIndexes =
+ addRemove.getAvailableListModel().getData();
+ SortedSet<AbstractIndexDescriptor> selectedIndexes =
+ addRemove.getSelectedListModel().getData();
+ availableChanged = availableIndexes.retainAll(indexes);
+ selectedChanged = selectedIndexes.retainAll(indexes);
+
+ for (AbstractIndexDescriptor index : indexes)
+ {
+ if (!availableIndexes.contains(index) &&
+ !selectedIndexes.contains(index))
+ {
+ availableIndexes.add(index);
+ availableChanged = true;
+ }
+ }
+ if (availableChanged)
+ {
+ addRemove.getAvailableListModel().clear();
+ addRemove.getAvailableListModel().addAll(availableIndexes);
+ addRemove.getAvailableListModel().fireContentsChanged(
+ addRemove.getAvailableListModel(), 0,
+ addRemove.getAvailableListModel().getSize());
+ }
+ if (selectedChanged)
+ {
+ addRemove.getSelectedListModel().clear();
+ addRemove.getSelectedListModel().addAll(selectedIndexes);
+ addRemove.getSelectedListModel().fireContentsChanged(
+ addRemove.getSelectedListModel(), 0,
+ addRemove.getSelectedListModel().getSize());
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the cancel button is enabled and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the cancel button is enabled and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isEnableCancel()
+ {
+ return enableCancel;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the close button is enabled and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the close button is enabled and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isEnableClose()
+ {
+ return enableClose;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the ok button is enabled and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the ok button is enabled and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isEnableOK()
+ {
+ return enableOK;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the server is running and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the server is running and
+ * <CODE>false</CODE> otherwise.
+ */
+ protected boolean isServerRunning()
+ {
+ return getInfo().getServerDescriptor().getStatus() ==
+ ServerDescriptor.ServerStatus.STARTED;
+ }
+
+ /**
+ * Launch an task.
+ * @param task the task to be launched.
+ * @param initialSummary the initial summary to be displayed in the progress
+ * dialog.
+ * @param successSummary the success summary to be displayed in the progress
+ * dialog if the task is successful.
+ * @param successDetail the success details to be displayed in the progress
+ * dialog if the task is successful.
+ * @param errorSummary the error summary to be displayed in the progress
+ * dialog if the task ended with error.
+ * @param errorDetail error details to be displayed in the progress
+ * dialog if the task ended with error.
+ * @param errorDetailCode error detail message to be displayed in the progress
+ * dialog if the task ended with error and we have an exit error code (for
+ * instance if the error occurred when launching a script we will have an
+ * error code).
+ * @param dialog the progress dialog.
+ */
+ protected void launchOperation(final Task task, Message initialSummary,
+ final Message successSummary, final Message successDetail,
+ final Message errorSummary,
+ final Message errorDetail,
+ final MessageDescriptor.Arg1<Number> errorDetailCode,
+ final ProgressDialog dialog)
+ {
+ launchOperation(task, initialSummary, successSummary, successDetail,
+ errorSummary, errorDetail, errorDetailCode, dialog, true);
+ }
+
+ /**
+ * Launch an task.
+ * @param task the task to be launched.
+ * @param initialSummary the initial summary to be displayed in the progress
+ * dialog.
+ * @param successSummary the success summary to be displayed in the progress
+ * dialog if the task is successful.
+ * @param successDetail the success details to be displayed in the progress
+ * dialog if the task is successful.
+ * @param errorSummary the error summary to be displayed in the progress
+ * dialog if the task ended with error.
+ * @param errorDetail error details to be displayed in the progress
+ * dialog if the task ended with error.
+ * @param errorDetailCode error detail message to be displayed in the progress
+ * dialog if the task ended with error and we have an exit error code (for
+ * instance if the error occurred when launching a script we will have an
+ * error code).
+ * @param dialog the progress dialog.
+ * @param resetLogs whether the contents of the progress dialog should be
+ * reset or not.
+ */
+ protected void launchOperation(final Task task, Message initialSummary,
+ final Message successSummary, final Message successDetail,
+ final Message errorSummary,
+ final Message errorDetail,
+ final MessageDescriptor.Arg1<Number> errorDetailCode,
+ final ProgressDialog dialog, boolean resetLogs)
+ {
+ dialog.setTaskIsOver(false);
+ dialog.getProgressBar().setIndeterminate(true);
+ dialog.addPrintStreamListeners(task.getOutPrintStream(),
+ task.getErrorPrintStream());
+ if (resetLogs)
+ {
+ dialog.resetProgressLogs();
+ }
+ String cmdLine = task.getCommandLineToDisplay();
+ if (cmdLine != null)
+ {
+ dialog.appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_COMMAND_LINE.get()+"<br><b>"+cmdLine+
+ "</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ dialog.setEnabledClose(false);
+ dialog.setSummary(Message.raw(
+ Utilities.applyFont(initialSummary.toString(),
+ ColorAndFontConstants.defaultFont)));
+ dialog.getProgressBar().setVisible(true);
+ BackgroundTask<Task> worker = new BackgroundTask<Task>()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public Task processBackgroundTask() throws Throwable
+ {
+ task.runTask();
+ if (task.regenerateDescriptor())
+ {
+ getInfo().regenerateDescriptor();
+ }
+ return task;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(Task returnValue, Throwable t)
+ {
+ String summaryMsg;
+ if (task.getState() == Task.State.FINISHED_SUCCESSFULLY)
+ {
+ summaryMsg = Utilities.getFormattedSuccess(successSummary,
+ ColorAndFontConstants.errorTitleFont,
+ successDetail, ColorAndFontConstants.defaultFont);
+ }
+ else
+ {
+ if (t == null)
+ {
+ t = task.getLastException();
+ }
+
+ if (t != null)
+ {
+ if ((task.getReturnCode() != null) &&
+ (errorDetailCode != null))
+ {
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(errorDetailCode.get(task.getReturnCode()));
+ mb.append(
+ ". "+INFO_CTRL_PANEL_DETAILS_THROWABLE.get(t.toString()));
+ summaryMsg = Utilities.getFormattedError(errorSummary,
+ ColorAndFontConstants.errorTitleFont,
+ mb.toMessage(), ColorAndFontConstants.defaultFont);
+ }
+ else if (errorDetail != null)
+ {
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(errorDetail);
+ mb.append(
+ ". "+INFO_CTRL_PANEL_DETAILS_THROWABLE.get(t.toString()));
+ summaryMsg = Utilities.getFormattedError(errorSummary,
+ ColorAndFontConstants.errorTitleFont,
+ mb.toMessage(), ColorAndFontConstants.defaultFont);
+ }
+ else
+ {
+ summaryMsg = null;
+ }
+ }
+ else if ((task.getReturnCode() != null) &&
+ (errorDetailCode != null))
+ {
+ summaryMsg = Utilities.getFormattedError(errorSummary,
+ ColorAndFontConstants.errorTitleFont,
+ errorDetailCode.get(task.getReturnCode()),
+ ColorAndFontConstants.defaultFont);
+ }
+ else if (errorDetail != null)
+ {
+ summaryMsg = Utilities.getFormattedError(errorSummary,
+ ColorAndFontConstants.errorTitleFont,
+ errorDetail, ColorAndFontConstants.defaultFont);
+ }
+ else
+ {
+ summaryMsg = null;
+ }
+ }
+ if (summaryMsg != null)
+ {
+ dialog.setSummary(Message.raw(summaryMsg));
+ }
+ dialog.setEnabledClose(true);
+ dialog.getProgressBar().setVisible(false);
+ if (task.getState() == Task.State.FINISHED_SUCCESSFULLY)
+ {
+ dialog.setTaskIsOver(true);
+ }
+ task.postOperation();
+ }
+ };
+ getInfo().registerTask(task);
+ worker.startBackgroundTask();
+ }
+
+ /**
+ * Checks that the provided string value is a valid integer and if it is not
+ * updates a list of error messages with an error.
+ * @param errors the list of error messages to be updated.
+ * @param stringValue the string value to analyze.
+ * @param minValue the minimum integer value accepted.
+ * @param maxValue the maximum integer value accepted.
+ * @param errMsg the error message to use to update the error list if the
+ * provided value is not valid.
+ */
+ protected void checkIntValue(Collection<Message> errors, String stringValue,
+ int minValue, int maxValue, Message errMsg)
+ {
+ try
+ {
+ int n = Integer.parseInt(stringValue);
+ if ((n > maxValue) || (n < minValue))
+ {
+ throw new IllegalStateException("Invalid value");
+ }
+ }
+ catch (Throwable t)
+ {
+ errors.add(errMsg);
+ }
+ }
+
+ /**
+ * Starts the server. This method will launch a task and open a progress
+ * dialog that will start the server. This method must be called from the
+ * event thread.
+ *
+ */
+ protected void startServer()
+ {
+ LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_START_SERVER_PROGRESS_DLG_TITLE.get(), getInfo());
+ StartServerTask newTask = new StartServerTask(getInfo(), progressDialog);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.size() == 0)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_STARTING_SERVER_SUMMARY.get(),
+ INFO_CTRL_PANEL_STARTING_SERVER_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_STARTING_SERVER_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_STARTING_SERVER_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_STARTING_SERVER_ERROR_DETAILS,
+ progressDialog);
+ progressDialog.setVisible(true);
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Stops the server. This method will launch a task and open a progress
+ * dialog that will stop the server. This method must be called from the
+ * event thread.
+ *
+ */
+ protected void stopServer()
+ {
+ LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_STOP_SERVER_PROGRESS_DLG_TITLE.get(), getInfo());
+ StopServerTask newTask = new StopServerTask(getInfo(), progressDialog);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ boolean confirmed = true;
+ if (errors.size() == 0)
+ {
+ confirmed = displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_CONFIRM_STOP_SERVER_DETAILS.get());
+ }
+ if ((errors.size() == 0) && confirmed)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_STOPPING_SERVER_SUMMARY.get(),
+ INFO_CTRL_PANEL_STOPPING_SERVER_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_STOPPING_SERVER_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_STOPPING_SERVER_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_STOPPING_SERVER_ERROR_DETAILS,
+ progressDialog);
+ progressDialog.setVisible(true);
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Restarts the server. This method will launch a task and open a progress
+ * dialog that will restart the server. This method must be called from the
+ * event thread.
+ *
+ */
+ protected void restartServer()
+ {
+ LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_RESTART_SERVER_PROGRESS_DLG_TITLE.get(), getInfo());
+ RestartServerTask newTask = new RestartServerTask(getInfo(),
+ progressDialog);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ boolean confirmed = true;
+ if (errors.size() == 0)
+ {
+ confirmed = displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_CONFIRM_RESTART_SERVER_DETAILS.get());
+ }
+ if ((errors.size() == 0) && confirmed)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_STOPPING_SERVER_SUMMARY.get(),
+ INFO_CTRL_PANEL_RESTARTING_SERVER_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_RESTARTING_SERVER_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_RESTARTING_SERVER_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_RESTARTING_SERVER_ERROR_DETAILS,
+ progressDialog);
+ progressDialog.setVisible(true);
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * Displays a dialog asking for authentication. This method must be called
+ * from the event thread.
+ *
+ */
+ protected void authenticate()
+ {
+ if (!getLoginDialog().isVisible())
+ {
+ getLoginDialog().setVisible(true);
+ }
+ getLoginDialog().toFront();
+ }
+
+ /**
+ * Returns the login dialog that is displayed when the method authenticate
+ * is called.
+ * @return the login dialog that is displayed when the method authenticate
+ * is called.
+ */
+ GenericDialog getLoginDialog()
+ {
+ if (loginDialog == null)
+ {
+ LoginPanel loginPanel = new LoginPanel();
+ loginDialog = new GenericDialog(Utilities.getFrame(this), loginPanel);
+ loginPanel.setInfo(getInfo());
+ Utilities.centerGoldenMean(loginDialog, Utilities.getFrame(this));
+ loginDialog.setModal(true);
+ }
+ return loginDialog;
+ }
+
+ /**
+ * Tells whether an entry exists or not. Actually it tells if we could find
+ * a given entry or not.
+ * @param dn the DN of the entry to look for.
+ * @return <CODE>true</CODE> if the entry with the provided DN could be found
+ * and <CODE>false</CODE> otherwise.
+ */
+ protected boolean entryExists(String dn)
+ {
+ boolean entryExists = false;
+ try
+ {
+ SearchControls ctls = new SearchControls();
+ ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
+ ctls.setReturningAttributes(
+ new String[] {
+ "dn"
+ });
+ String filter = BrowserController.ALL_OBJECTS_FILTER;
+ NamingEnumeration<SearchResult> result =
+ getInfo().getDirContext().search(Utilities.getJNDIName(dn),
+ filter, ctls);
+
+ while (result.hasMore())
+ {
+ SearchResult sr = result.next();
+ entryExists = sr != null;
+ }
+ }
+ catch (Throwable t)
+ {
+ }
+ return entryExists;
+ }
+
+ /**
+ * Tells whether a given entry exists and contains the specified object class.
+ * @param dn the DN of the entry.
+ * @param objectClass the object class.
+ * @return <CODE>true</CODE> if the entry exists and contains the specified
+ * object class and <CODE>false</CODE> otherwise.
+ */
+ protected boolean hasObjectClass(String dn, String objectClass)
+ {
+ boolean hasObjectClass = false;
+ try
+ {
+ SearchControls ctls = new SearchControls();
+ ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
+ ctls.setReturningAttributes(
+ new String[] {
+ ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME
+ });
+ String filter = BrowserController.ALL_OBJECTS_FILTER;
+ NamingEnumeration<SearchResult> result =
+ getInfo().getDirContext().search(Utilities.getJNDIName(dn),
+ filter, ctls);
+
+ while (result.hasMore())
+ {
+ SearchResult sr = result.next();
+ Set<String> values = ConnectionUtils.getValues(sr,
+ ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME);
+ if (values != null)
+ {
+ for (String s : values)
+ {
+ if (s.equalsIgnoreCase(objectClass))
+ {
+ hasObjectClass = true;
+ break;
+ }
+ }
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ }
+ return hasObjectClass;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusPanel.java
new file mode 100644
index 0000000..0035917
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusPanel.java
@@ -0,0 +1,706 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTable;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNTableModel;
+import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerTableModel;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.components.LabelWithHelpIcon;
+import org.opends.guitools.controlpanel.ui.renderer.BaseDNCellRenderer;
+import org.opends.guitools.controlpanel.ui.renderer.CustomCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.server.types.DN;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * The panel displaying the general status of the server (started/stopped),
+ * basic configuration (base DNs, connection listeners) and that allows to start
+ * and stop the server.
+ *
+ */
+class StatusPanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = -6493442314639004717L;
+ // The placeholder where we display errors.
+ private JLabel serverStatus;
+ private LabelWithHelpIcon currentConnections;
+ private JLabel hostName;
+ private JLabel administrativeUsers;
+ private JLabel installPath;
+ private JLabel opendsVersion;
+ private LabelWithHelpIcon javaVersion;
+ private JLabel adminConnector;
+ private JLabel dbTableEmpty;
+ private JLabel connectionHandlerTableEmpty;
+ private JButton stopButton;
+ private JButton startButton;
+ private JButton restartButton;
+ private BaseDNTableModel dbTableModelWithReplication;
+ private BaseDNTableModel dbTableModelWithoutReplication;
+ private JTable noReplicatedBaseDNsTable;
+ private JTable replicationBaseDNsTable;
+
+ private ConnectionHandlerTableModel connectionHandlerTableModel;
+ private JTable connectionHandlersTable;
+
+ private JButton authenticate;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public StatusPanel()
+ {
+ super();
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 1;
+ addErrorPane(gbc);
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets = new Insets(0, 0, 0, 0);
+ gbc.weightx = 1.0;
+ add(createServerStatusPanel(), gbc);
+
+ gbc.insets.top = 15;
+
+ gbc.gridy ++;
+ add(createServerDetailsPanel(), gbc);
+
+ // To compensate titled border.
+ gbc.insets.left = 3;
+ gbc.insets.right = 3;
+ gbc.gridy ++;
+ add(createListenersPanel(), gbc);
+
+ gbc.gridy ++;
+ add(createBackendsPanel(), gbc);
+
+ addBottomGlue(gbc);
+
+ gbc.gridy ++;
+ gbc.anchor = GridBagConstraints.EAST;
+ authenticate = Utilities.createButton(
+ INFO_AUTHENTICATE_BUTTON_LABEL.get());
+ authenticate.setToolTipText(
+ INFO_AUTHENTICATE_CONTROL_PANEL_BUTTON_TOOLTIP.get().toString());
+ authenticate.setOpaque(false);
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.insets.bottom = 0;
+ authenticate.setOpaque(false);
+ authenticate.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ authenticate();
+ }
+ });
+ add(authenticate, gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ if (authenticate.isVisible())
+ {
+ return authenticate;
+ }
+ else if (startButton.isVisible())
+ {
+ return startButton;
+ }
+ else
+ {
+ return stopButton;
+ }
+ }
+
+ private void recalculateSizes()
+ {
+ Utilities.updateTableSizes(replicationBaseDNsTable);
+ Utilities.updateTableSizes(noReplicatedBaseDNsTable);
+ Utilities.updateTableSizes(connectionHandlersTable);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_STATUS_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(final ConfigurationChangeEvent ev)
+ {
+ if (SwingUtilities.isEventDispatchThread())
+ {
+ updateContents(ev.getNewDescriptor());
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ updateContents(ev.getNewDescriptor());
+ }
+ });
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+
+ /**
+ * Updates the contents of the panel with the provided ServerDescriptor.
+ * @param desc the ServerDescriptor.
+ */
+ public void updateContents(ServerDescriptor desc)
+ {
+ Collection<OpenDsException> exceptions = desc.getExceptions();
+ if (exceptions.size() == 0)
+ {
+ errorPane.setVisible(false);
+ }
+ else
+ {
+ ArrayList<Message> msgs = new ArrayList<Message>();
+ for (OpenDsException oe : exceptions)
+ {
+ msgs.add(oe.getMessageObject());
+ }
+ Message title = ERR_CTRL_PANEL_ERROR_READING_CONFIGURATION_SUMMARY.get();
+ MessageBuilder mb = new MessageBuilder();
+ for (Message error : msgs)
+ {
+ if (mb.length() > 0)
+ {
+ mb.append("<br>");
+ }
+ mb.append(error);
+ }
+ updateErrorPane(errorPane, title, ColorAndFontConstants.errorTitleFont,
+ mb.toMessage(), ColorAndFontConstants.defaultFont);
+
+ if (!errorPane.isVisible())
+ {
+ errorPane.setVisible(true);
+ }
+ }
+
+ serverStatus.setText(desc.getStatus().toString().toLowerCase());
+
+ boolean isRunning = desc.getStatus() ==
+ ServerDescriptor.ServerStatus.STARTED;
+ boolean isAuthenticated = desc.isAuthenticated();
+
+ startButton.setVisible(desc.getStatus() ==
+ ServerDescriptor.ServerStatus.STOPPED);
+ restartButton.setVisible(isRunning);
+ stopButton.setVisible(isRunning);
+
+ if (!isRunning)
+ {
+ Utilities.setNotAvailableBecauseServerIsDown(currentConnections);
+ }
+ else if (!isAuthenticated)
+ {
+ Utilities.setNotAvailableBecauseAuthenticationIsRequired(
+ currentConnections);
+ }
+ else
+ {
+ int nConnections = desc.getOpenConnections();
+ if (nConnections >= 0)
+ {
+ Utilities.setTextValue(currentConnections,
+ String.valueOf(nConnections));
+ }
+ else
+ {
+ Utilities.setNotAvailable(currentConnections);
+ }
+ }
+
+ hostName.setText(desc.getHostname());
+
+ Set<DN> rootUsers = desc.getAdministrativeUsers();
+
+ SortedSet<String> sortedRootUsers = new TreeSet<String>();
+ for (DN dn : rootUsers)
+ {
+ try
+ {
+ sortedRootUsers.add(Utilities.unescapeUtf8(dn.toString()));
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ }
+
+ String htmlString = "<html>"+Utilities.applyFont(
+ Utilities.getStringFromCollection(sortedRootUsers, "<br>"),
+ administrativeUsers.getFont());
+ administrativeUsers.setText(htmlString);
+
+ installPath.setText(desc.getInstallPath().getAbsolutePath());
+
+ opendsVersion.setText(desc.getOpenDSVersion());
+
+ if (!isRunning)
+ {
+ Utilities.setNotAvailableBecauseServerIsDown(javaVersion);
+ }
+ else if (!isAuthenticated)
+ {
+ Utilities.setNotAvailableBecauseAuthenticationIsRequired(javaVersion);
+ }
+ else
+ {
+ String jVersion = desc.getJavaVersion();
+ if (jVersion != null)
+ {
+ Utilities.setTextValue(javaVersion, jVersion);
+ }
+ else
+ {
+ Utilities.setNotAvailable(javaVersion);
+ }
+ }
+
+ adminConnector.setText(
+ getAdminConnectorStringValue(desc.getAdminConnector()));
+
+ Set<BaseDNDescriptor> baseDNs = new HashSet<BaseDNDescriptor>();
+
+ for (BackendDescriptor backend : desc.getBackends())
+ {
+ if (!backend.isConfigBackend())
+ {
+ baseDNs.addAll(backend.getBaseDns());
+ }
+ }
+
+ boolean oneReplicated = false;
+ for (BaseDNDescriptor baseDN : baseDNs)
+ {
+ if (baseDN.getType() == BaseDNDescriptor.Type.REPLICATED)
+ {
+ oneReplicated = true;
+ break;
+ }
+ }
+
+ boolean hasBaseDNs = baseDNs.size() > 0;
+
+ replicationBaseDNsTable.setVisible(oneReplicated && hasBaseDNs);
+ replicationBaseDNsTable.getTableHeader().setVisible(
+ oneReplicated && hasBaseDNs);
+ noReplicatedBaseDNsTable.setVisible(!oneReplicated && hasBaseDNs);
+ noReplicatedBaseDNsTable.getTableHeader().setVisible(
+ !oneReplicated && hasBaseDNs);
+ dbTableEmpty.setVisible(!hasBaseDNs);
+
+ dbTableModelWithReplication.setData(baseDNs, desc.getStatus(),
+ desc.isAuthenticated());
+ dbTableModelWithoutReplication.setData(baseDNs, desc.getStatus(),
+ desc.isAuthenticated());
+
+ Set<ConnectionHandlerDescriptor> connectionHandlers =
+ desc.getConnectionHandlers();
+ connectionHandlerTableModel.setData(connectionHandlers);
+
+ boolean hasConnectionHandlers = connectionHandlers.size() > 0;
+ connectionHandlersTable.setVisible(hasConnectionHandlers);
+ connectionHandlersTable.getTableHeader().setVisible(hasConnectionHandlers);
+ connectionHandlerTableEmpty.setVisible(!hasConnectionHandlers);
+
+ authenticate.setVisible(!isAuthenticated && isRunning);
+
+ recalculateSizes();
+ }
+
+ /**
+ * Creates the server status subsection panel.
+ * @return the server status subsection panel.
+ */
+ private JPanel createServerStatusPanel()
+ {
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.weightx = 1.0;
+ gbc.insets = new Insets(0, 0, 0, 0);
+
+ p.setBorder(Utilities.makeTitledBorder(
+ INFO_CTRL_PANEL_SERVER_STATUS_TITLE_BORDER.get()));
+ JPanel auxPanel = new JPanel(new GridBagLayout());
+ auxPanel.setOpaque(false);
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.gridwidth = GridBagConstraints.RELATIVE;
+ JLabel l = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_SERVER_STATUS_LABEL.get());
+ auxPanel.add(l, gbc);
+
+ JPanel statusPanel = new JPanel(new GridBagLayout());
+ statusPanel.setOpaque(false);
+ gbc.gridwidth = 6;
+ gbc.weightx = 0.0;
+ serverStatus = Utilities.createDefaultLabel();
+ statusPanel.add(serverStatus, gbc);
+ gbc.gridwidth--;
+
+ stopButton = Utilities.createButton(INFO_STOP_BUTTON_LABEL.get());
+ stopButton.setOpaque(false);
+ stopButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ stopServer();
+ }
+ });
+ gbc.insets.left = 10;
+ statusPanel.add(stopButton, gbc);
+
+ gbc.gridwidth--;
+ gbc.insets.left = 10;
+ startButton = Utilities.createButton(INFO_START_BUTTON_LABEL.get());
+ startButton.setOpaque(false);
+ statusPanel.add(startButton, gbc);
+ startButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ startServer();
+ }
+ });
+
+ gbc.gridwidth--;
+ gbc.insets.left = 5;
+ restartButton = Utilities.createButton(INFO_RESTART_BUTTON_LABEL.get());
+ restartButton.setOpaque(false);
+ restartButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ restartServer();
+ }
+ });
+ statusPanel.add(restartButton, gbc);
+
+ gbc.gridwidth = GridBagConstraints.RELATIVE;
+ gbc.weightx = 1.0;
+ gbc.insets.left = 0;
+ statusPanel.add(Box.createHorizontalGlue(), gbc);
+
+ int maxButtonHeight = 0;
+ maxButtonHeight = Math.max(maxButtonHeight,
+ (int)startButton.getPreferredSize().getHeight());
+ maxButtonHeight = Math.max(maxButtonHeight,
+ (int)restartButton.getPreferredSize().getHeight());
+ maxButtonHeight = Math.max(maxButtonHeight,
+ (int)stopButton.getPreferredSize().getHeight());
+
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.weightx = 0.0;
+ statusPanel.add(Box.createVerticalStrut(maxButtonHeight), gbc);
+
+ gbc.weightx = 1.0;
+ gbc.insets.left = 5;
+ auxPanel.add(statusPanel, gbc);
+
+ gbc.insets.left = 0;
+ gbc.weightx = 0.0;
+ gbc.insets.top = 5;
+ gbc.gridwidth = GridBagConstraints.RELATIVE;
+ l = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OPEN_CONNECTIONS_LABEL.get());
+ auxPanel.add(l, gbc);
+ currentConnections = new LabelWithHelpIcon(Message.EMPTY, null);
+
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.insets.left = 5;
+ auxPanel.add(currentConnections, gbc);
+
+ gbc.insets.top = 2;
+ gbc.insets.right = 5;
+ gbc.insets.left = 5;
+ gbc.insets.bottom = 5;
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.weightx = 1.0;
+ p.add(auxPanel, gbc);
+
+ restartButton.setVisible(false);
+ stopButton.setVisible(false);
+ return p;
+ }
+
+
+ /**
+ * Creates the server details subsection panel.
+ * @return the server details subsection panel.
+ */
+ private JPanel createServerDetailsPanel()
+ {
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.insets = new Insets(0, 0, 0, 0);
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.weightx = 1.0;
+
+ p.setBorder(Utilities.makeTitledBorder(
+ INFO_CTRL_PANEL_SERVER_DETAILS_TITLE_BORDER.get()));
+ JPanel auxPanel = new JPanel(new GridBagLayout());
+ auxPanel.setOpaque(false);
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.weightx = 0.0;
+ JLabel[] leftLabels =
+ {
+ Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_HOST_NAME_LABEL.get()),
+ Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ADMINISTRATIVE_USERS_LABEL.get()),
+ Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_INSTALLATION_PATH_LABEL.get()),
+ Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_OPENDS_VERSION_LABEL.get()),
+ Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_JAVA_VERSION_LABEL.get()),
+ Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ADMIN_CONNECTOR_LABEL.get())
+ };
+
+ hostName = Utilities.createDefaultLabel();
+ administrativeUsers = Utilities.createDefaultLabel();
+ installPath = Utilities.createDefaultLabel();
+ opendsVersion = Utilities.createDefaultLabel();
+ javaVersion = new LabelWithHelpIcon(Message.EMPTY, null);
+ adminConnector = Utilities.createDefaultLabel();
+
+ JComponent[] rightLabels =
+ {
+ hostName, administrativeUsers, installPath, opendsVersion,
+ javaVersion, adminConnector
+ };
+
+
+ for (int i=0; i<leftLabels.length; i++)
+ {
+ gbc.insets.left = 0;
+ if (i != 0)
+ {
+ gbc.insets.top = 5;
+ }
+ gbc.gridwidth = GridBagConstraints.RELATIVE;
+ auxPanel.add(leftLabels[i], gbc);
+
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.insets.left = 5;
+ auxPanel.add(rightLabels[i], gbc);
+ }
+
+ gbc.insets.top = 2;
+ gbc.insets.right = 5;
+ gbc.insets.left = 5;
+ gbc.insets.bottom = 5;
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.weightx = 1.0;
+ p.add(auxPanel, gbc);
+
+ return p;
+ }
+
+ /**
+ * Creates the server listeners subsection panel.
+ * @return the server listeners subsection panel.
+ */
+ private JPanel createListenersPanel()
+ {
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.insets = new Insets(0, 0, 0, 0);
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.weightx = 1.0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+
+ JLabel l = Utilities.createTitleLabel(
+ INFO_CTRL_PANEL_CONNECTION_HANDLERS.get());
+ p.add(l, gbc);
+
+ connectionHandlerTableModel = new ConnectionHandlerTableModel();
+ connectionHandlersTable =
+ Utilities.createSortableTable(connectionHandlerTableModel,
+ new CustomCellRenderer());
+
+ gbc.insets.top = 5;
+ p.add(connectionHandlersTable.getTableHeader(), gbc);
+ gbc.insets.top = 0;
+ p.add(connectionHandlersTable, gbc);
+
+ connectionHandlerTableEmpty =
+ Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NO_CONNECTION_HANDLER_FOUND.get());
+ connectionHandlerTableEmpty.setHorizontalAlignment(SwingConstants.CENTER);
+ gbc.insets.top = 5;
+ p.add(connectionHandlerTableEmpty, gbc);
+ connectionHandlerTableEmpty.setVisible(false);
+
+ return p;
+ }
+
+ /**
+ * Creates the server backends subsection panel.
+ * @return the server backends subsection panel.
+ */
+ private JPanel createBackendsPanel()
+ {
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.insets = new Insets(0, 0, 0, 0);
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.weightx = 1.0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+
+ JLabel l = Utilities.createTitleLabel(INFO_CTRL_PANEL_DATA_SOURCES.get());
+ p.add(l, gbc);
+
+ dbTableModelWithReplication = new BaseDNTableModel(true);
+ dbTableModelWithoutReplication = new BaseDNTableModel(false);
+ noReplicatedBaseDNsTable =
+ Utilities.createSortableTable(dbTableModelWithoutReplication,
+ new BaseDNCellRenderer());
+ noReplicatedBaseDNsTable.setVisible(false);
+ noReplicatedBaseDNsTable.getTableHeader().setVisible(false);
+ replicationBaseDNsTable =
+ Utilities.createSortableTable(dbTableModelWithReplication,
+ new BaseDNCellRenderer());
+
+ gbc.insets.top = 5;
+ p.add(noReplicatedBaseDNsTable.getTableHeader(), gbc);
+ gbc.insets.top = 0;
+ p.add(noReplicatedBaseDNsTable, gbc);
+
+ gbc.insets.top = 5;
+ p.add(replicationBaseDNsTable.getTableHeader(), gbc);
+ gbc.insets.top = 0;
+ p.add(replicationBaseDNsTable, gbc);
+ replicationBaseDNsTable.setVisible(true);
+ replicationBaseDNsTable.getTableHeader().setVisible(true);
+
+ gbc.insets.top = 5;
+ dbTableEmpty = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_NO_DATA_SOURCES_FOUND.get());
+ dbTableEmpty.setHorizontalAlignment(SwingConstants.CENTER);
+ gbc.anchor = GridBagConstraints.CENTER;
+ p.add(dbTableEmpty, gbc);
+ dbTableEmpty.setVisible(false);
+ return p;
+ }
+
+ /**
+ * Returns an string representation of the administration connector.
+ * @param adminConnector the administration connector.
+ * @return an string representation of the administration connector.
+ */
+ private static String getAdminConnectorStringValue(
+ ConnectionHandlerDescriptor adminConnector)
+ {
+ if (adminConnector != null)
+ {
+ return INFO_CTRL_PANEL_ADMIN_CONNECTOR_DESCRIPTION.get(
+ adminConnector.getPort()).toString();
+ }
+ else
+ {
+ return INFO_NOT_AVAILABLE_SHORT_LABEL.get().toString();
+ }
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
new file mode 100644
index 0000000..d9bec01
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -0,0 +1,938 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.Box;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.datamodel.BinaryValue;
+import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
+import org.opends.guitools.controlpanel.datamodel.ObjectClassValue;
+import org.opends.guitools.controlpanel.datamodel.SortableTableModel;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.guitools.controlpanel.ui.renderer.AttributeCellEditor;
+import org.opends.guitools.controlpanel.ui.renderer.LDAPEntryTableCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.RDN;
+import org.opends.server.types.Schema;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * The panel displaying a table view of an LDAP entry.
+ *
+ */
+
+public class TableViewEntryPanel extends ViewEntryPanel
+{
+ private static final long serialVersionUID = 2135331526526472175L;
+ private CustomSearchResult searchResult;
+ private LDAPEntryTableModel tableModel;
+ private LDAPEntryTableCellRenderer renderer;
+ private JTable table;
+ private boolean isReadOnly;
+ private TreePath treePath;
+ private JScrollPane scroll;
+ private AttributeCellEditor editor;
+ private JLabel requiredLabel;
+ private JCheckBox showOnlyAttrsWithValues;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public TableViewEntryPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return table;
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 2;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 1.0;
+
+ addTitlePanel(this, gbc);
+
+ gbc.gridy ++;
+ gbc.insets.top = 5;
+ gbc.gridwidth = 1;
+ showOnlyAttrsWithValues = Utilities.createCheckBox(
+ INFO_CTRL_PANEL_SHOW_ATTRS_WITH_VALUES_LABEL.get());
+ showOnlyAttrsWithValues.setSelected(displayOnlyWithAttrs);
+ showOnlyAttrsWithValues.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ updateAttributeVisibility();
+ displayOnlyWithAttrs = showOnlyAttrsWithValues.isSelected();
+ }
+ });
+ gbc.weightx = 0.0;
+ gbc.anchor = GridBagConstraints.WEST;
+ add(showOnlyAttrsWithValues, gbc);
+
+ gbc.gridx ++;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.fill = GridBagConstraints.NONE;
+ requiredLabel = createRequiredLabel();
+ add(requiredLabel, gbc);
+ gbc.insets = new Insets(0, 0, 0, 0);
+ add(Box.createVerticalStrut(10), gbc);
+
+ showOnlyAttrsWithValues.setFont(requiredLabel.getFont());
+
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.insets.top = 10;
+ gbc.gridwidth = 2;
+ tableModel = new LDAPEntryTableModel();
+ renderer = new LDAPEntryTableCellRenderer();
+ table = Utilities.createSortableTable(tableModel, renderer);
+ renderer.setTable(table);
+ editor = new AttributeCellEditor();
+ table.getColumnModel().getColumn(1).setCellEditor(editor);
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridy ++;
+ scroll = Utilities.createScrollPane(table);
+ add(scroll, gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void update(CustomSearchResult sr, boolean isReadOnly, TreePath path)
+ {
+ boolean sameEntry = false;
+ if ((searchResult != null) && (sr != null))
+ {
+ sameEntry = searchResult.getDN().equals(sr.getDN());
+ }
+
+ searchResult = sr;
+ final Point p = sameEntry ? scroll.getViewport().getViewPosition() :
+ new Point(0, 0);
+ renderer.setSchema(getInfo().getServerDescriptor().getSchema());
+ editor.setInfo(getInfo());
+ requiredLabel.setVisible(!isReadOnly);
+ this.isReadOnly = isReadOnly;
+ this.treePath = path;
+ updateTitle(sr, path);
+ ignoreEntryChangeEvents = true;
+ tableModel.displayEntry(searchResult);
+ Utilities.updateTableSizes(table);
+ Utilities.updateScrollMode(scroll, table);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ if ((p != null) && (scroll.getViewport().contains(p)))
+ {
+ scroll.getViewport().setViewPosition(p);
+ }
+ ignoreEntryChangeEvents = false;
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Entry getEntry() throws OpenDsException
+ {
+ Entry entry = null;
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ String ldif = getLDIF();
+
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ entry = reader.readEntry(checkSchema());
+ addValuesInRDN(entry);
+
+ }
+ catch (IOException ioe)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe.toString()),
+ ioe);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ return entry;
+ }
+
+ /**
+ * Returns the LDIF representation of the displayed entry.
+ * @return the LDIF representation of the displayed entry.
+ */
+ private String getLDIF()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append("dn: "+getDisplayedDN());
+ for (int i=0; i<tableModel.getRowCount(); i++)
+ {
+ String attrName = (String)tableModel.getValueAt(i, 0);
+ if (!schemaReadOnlyAttributesLowerCase.contains(attrName.toLowerCase()))
+ {
+ Object value = tableModel.getValueAt(i, 1);
+ appendLDIFLine(sb, attrName, value);
+ }
+ }
+ return sb.toString();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getDisplayedDN()
+ {
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ DN oldDN = DN.decode(searchResult.getDN());
+ if (oldDN.getNumComponents() > 0)
+ {
+ RDN rdn = oldDN.getRDN();
+ List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
+ List<String> attributeNames = new ArrayList<String>();
+ List<AttributeValue> attributeValues = new ArrayList<AttributeValue>();
+ for (int i=0; i<rdn.getNumValues(); i++)
+ {
+ String attrName = rdn.getAttributeName(i);
+ AttributeValue value = rdn.getAttributeValue(i);
+
+ String sValue = value.getStringValue();
+
+ Set<String> values = getDisplayedStringValues(attrName);
+ if (!values.contains(sValue))
+ {
+ if (values.size() > 0)
+ {
+ String firstNonEmpty = null;
+ for (String v : values)
+ {
+ v = v.trim();
+ if (v.length() > 0)
+ {
+ firstNonEmpty = v;
+ break;
+ }
+ }
+ if (firstNonEmpty != null)
+ {
+ AttributeType attr = rdn.getAttributeType(i);
+ attributeTypes.add(attr);
+ attributeNames.add(rdn.getAttributeName(i));
+ attributeValues.add(new AttributeValue(attr, firstNonEmpty));
+ }
+ }
+ }
+ else
+ {
+ attributeTypes.add(rdn.getAttributeType(i));
+ attributeNames.add(rdn.getAttributeName(i));
+ attributeValues.add(value);
+ }
+ }
+ if (attributeTypes.size() == 0)
+ {
+ // Check the attributes in the order that we display them and use
+ // the first one.
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ for (int i=0; i<table.getRowCount(); i++)
+ {
+ String attrName = (String)table.getValueAt(i, 0);
+ if (isPassword(attrName) ||
+ attrName.equals(
+ ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME) ||
+ !table.isCellEditable(i, 1))
+ {
+ continue;
+ }
+ Object o = table.getValueAt(i, 1);
+ if (o instanceof String)
+ {
+ String aName =
+ Utilities.getAttributeNameWithoutOptions(attrName);
+ AttributeType attr =
+ schema.getAttributeType(aName.toLowerCase());
+ if (attr != null)
+ {
+ attributeTypes.add(attr);
+ attributeNames.add(attrName);
+ attributeValues.add(new AttributeValue(attr, (String)o));
+ }
+ break;
+ }
+ }
+ }
+ }
+ DN parent = oldDN.getParent();
+ if (attributeTypes.size() > 0)
+ {
+ DN newDN;
+ RDN newRDN = new RDN(attributeTypes, attributeNames, attributeValues);
+
+ if (parent == null)
+ {
+ newDN = new DN(new RDN[]{newRDN});
+ }
+ else
+ {
+ newDN = parent.concat(newRDN);
+ }
+ sb.append(newDN.toString());
+ }
+ else
+ {
+ if (parent != null)
+ {
+ sb.append(","+parent.toString());
+ }
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalStateException("Unexpected error: "+t, t);
+ }
+ return sb.toString();
+ }
+
+ private Set<String> getDisplayedStringValues(String attrName)
+ {
+ Set<String> values = new LinkedHashSet<String>();
+ for (int i=0; i<table.getRowCount(); i++)
+ {
+ if (attrName.equalsIgnoreCase((String)table.getValueAt(i, 0)))
+ {
+ Object o = table.getValueAt(i, 1);
+ if (o instanceof String)
+ {
+ values.add((String)o);
+ }
+ }
+ }
+ return values;
+ }
+
+ private void updateAttributeVisibility()
+ {
+ tableModel.updateAttributeVisibility();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Set<Object> getValues(String attrName)
+ {
+ return tableModel.getValues(attrName);
+ }
+
+ /**
+ * The table model used by the tree in the panel.
+ *
+ */
+ protected class LDAPEntryTableModel extends SortableTableModel
+ implements Comparator<AttributeValuePair>
+ {
+ private static final long serialVersionUID = -1240282431326505113L;
+ private ArrayList<AttributeValuePair> dataArray =
+ new ArrayList<AttributeValuePair>();
+ private SortedSet<AttributeValuePair> allSortedValues =
+ new TreeSet<AttributeValuePair>(this);
+ Set<String> requiredAttrs = new HashSet<String>();
+ private final String[] COLUMN_NAMES = new String[] {
+ getHeader(Message.raw("Attribute"), 40),
+ getHeader(Message.raw("Value", 40))};
+ private int sortColumn = 0;
+ private boolean sortAscending = true;
+
+ /**
+ * Sets the entry to be displayed by this table model.
+ * @param searchResult the entry to be displayed.
+ */
+ public void displayEntry(CustomSearchResult searchResult)
+ {
+ updateDataArray();
+ fireTableDataChanged();
+ }
+
+ /**
+ * Updates the table model contents and sorts its contents depending on the
+ * sort options set by the user.
+ */
+ public void forceResort()
+ {
+ updateDataArray();
+ fireTableDataChanged();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compare(AttributeValuePair desc1, AttributeValuePair desc2)
+ {
+ int result;
+ int[] possibleResults = {
+ desc1.attrName.compareTo(desc2.attrName),
+ compareValues(desc1.value, desc2.value)};
+ result = possibleResults[sortColumn];
+ if (result == 0)
+ {
+ for (int i : possibleResults)
+ {
+ if (i != 0)
+ {
+ result = i;
+ break;
+ }
+ }
+ }
+ if (!sortAscending)
+ {
+ result = -result;
+ }
+ return result;
+ }
+
+ private int compareValues(Object o1, Object o2)
+ {
+ if (o1 == null)
+ {
+ if (o2 == null)
+ {
+ return 0;
+ }
+ else
+ {
+ return -1;
+ }
+ }
+ else if (o2 == null)
+ {
+ return 1;
+ }
+ if (o1 instanceof ObjectClassValue)
+ {
+ o1 = renderer.getString((ObjectClassValue)o1);
+ }
+ else if (o1 instanceof BinaryValue)
+ {
+ o1 = renderer.getString((BinaryValue)o1);
+ }
+ else if (o1 instanceof byte[])
+ {
+ o1 = renderer.getString((byte[])o1);
+ }
+ if (o2 instanceof ObjectClassValue)
+ {
+ o2 = renderer.getString((ObjectClassValue)o2);
+ }
+ else if (o2 instanceof BinaryValue)
+ {
+ o2 = renderer.getString((BinaryValue)o2);
+ }
+ else if (o2 instanceof byte[])
+ {
+ o2 = renderer.getString((byte[])o2);
+ }
+ if (o1.getClass().equals(o2.getClass()))
+ {
+ if (o1 instanceof String)
+ {
+ return ((String)o1).compareTo((String)o2);
+ }
+ else if (o1 instanceof Integer)
+ {
+ return ((Integer)o1).compareTo((Integer)o2);
+ }
+ else if (o1 instanceof Long)
+ {
+ return ((Long)o1).compareTo((Long)o2);
+ }
+ else
+ {
+ return String.valueOf(o1).compareTo(String.valueOf(o2));
+ }
+ }
+ else
+ {
+ return String.valueOf(o1).compareTo(String.valueOf(o2));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getColumnCount()
+ {
+ return COLUMN_NAMES.length;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getRowCount()
+ {
+ return dataArray.size();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object getValueAt(int row, int col)
+ {
+ if (col == 0)
+ {
+ return dataArray.get(row).attrName;
+ }
+ else
+ {
+ return dataArray.get(row).value;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getColumnName(int col) {
+ return COLUMN_NAMES[col];
+ }
+
+
+ /**
+ * Returns whether the sort is ascending or descending.
+ * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isSortAscending()
+ {
+ return sortAscending;
+ }
+
+ /**
+ * Sets whether to sort ascending of descending.
+ * @param sortAscending whether to sort ascending or descending.
+ */
+ public void setSortAscending(boolean sortAscending)
+ {
+ this.sortAscending = sortAscending;
+ }
+
+ /**
+ * Returns the column index used to sort.
+ * @return the column index used to sort.
+ */
+ public int getSortColumn()
+ {
+ return sortColumn;
+ }
+
+ /**
+ * Sets the column index used to sort.
+ * @param sortColumn column index used to sort..
+ */
+ public void setSortColumn(int sortColumn)
+ {
+ this.sortColumn = sortColumn;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isCellEditable(int row, int col) {
+ if (col == 0)
+ {
+ return false;
+ }
+ else
+ {
+ if (!isReadOnly)
+ {
+ return !schemaReadOnlyAttributesLowerCase.contains(
+ dataArray.get(row).attrName.toLowerCase());
+ }
+ else
+ {
+ return false;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValueAt(Object value, int row, int col)
+ {
+ dataArray.get(row).value = value;
+ if (value instanceof ObjectClassValue)
+ {
+ updateObjectClass((ObjectClassValue)value);
+ }
+ else
+ {
+ fireTableCellUpdated(row, col);
+
+ notifyListeners();
+ }
+ }
+
+ private void updateDataArray()
+ {
+ allSortedValues.clear();
+ requiredAttrs.clear();
+ Set<String> addedAttrs = new HashSet<String>();
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ Set<Object> ocs = null;
+ for (String attrName : searchResult.getAttributeNames())
+ {
+ if (attrName.equalsIgnoreCase(
+ ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME))
+ {
+ if (schema != null)
+ {
+ ocs = searchResult.getAttributeValues(attrName);
+ ObjectClassValue ocValue = getObjectClassDescriptor(
+ ocs, schema);
+ allSortedValues.add(new AttributeValuePair(attrName, ocValue));
+ }
+ }
+ else
+ {
+ for (Object v : searchResult.getAttributeValues(attrName))
+ {
+ allSortedValues.add(new AttributeValuePair(attrName, v));
+ }
+ }
+ addedAttrs.add(
+ Utilities.getAttributeNameWithoutOptions(attrName).toLowerCase());
+ }
+ if ((ocs != null) && (schema != null))
+ {
+ for (Object o : ocs)
+ {
+ String oc = (String)o;
+ ObjectClass objectClass = schema.getObjectClass(oc.toLowerCase());
+ if (objectClass != null)
+ {
+ for (AttributeType attr : objectClass.getRequiredAttributeChain())
+ {
+ String attrName = attr.getNameOrOID();
+ if (!addedAttrs.contains(attrName.toLowerCase()))
+ {
+ if (isBinary(attrName) || isPassword(attrName))
+ {
+ allSortedValues.add(new AttributeValuePair(attrName,
+ new byte[]{}));
+ }
+ else
+ {
+ allSortedValues.add(new AttributeValuePair(attrName, ""));
+ }
+ }
+ requiredAttrs.add(attrName.toLowerCase());
+ }
+ for (AttributeType attr : objectClass.getOptionalAttributeChain())
+ {
+ String attrName = attr.getNameOrOID();
+ if (!addedAttrs.contains(attrName.toLowerCase()))
+ {
+ if (isBinary(attrName) || isPassword(attrName))
+ {
+ allSortedValues.add(new AttributeValuePair(attrName,
+ new byte[]{}));
+ }
+ else
+ {
+ allSortedValues.add(new AttributeValuePair(attrName, ""));
+ }
+ }
+ }
+ }
+ }
+ }
+ dataArray.clear();
+ for (AttributeValuePair value : allSortedValues)
+ {
+ if (!showOnlyAttrsWithValues.isSelected() ||
+ isRequired(value) || hasValue(value))
+ {
+ dataArray.add(value);
+ }
+ }
+ renderer.setRequiredAttrs(requiredAttrs);
+ }
+
+ /**
+ * Checks if we have to display all the attributes or only those that
+ * contain a value and updates the contents of the model accordingly. Note
+ * that even if the required attributes have no value they will be
+ * displayed.
+ *
+ */
+ void updateAttributeVisibility()
+ {
+ dataArray.clear();
+ for (AttributeValuePair value : allSortedValues)
+ {
+ if (!showOnlyAttrsWithValues.isSelected() ||
+ isRequired(value) || hasValue(value))
+ {
+ dataArray.add(value);
+ }
+ }
+ fireTableDataChanged();
+
+ Utilities.updateTableSizes(table);
+ Utilities.updateScrollMode(scroll, table);
+ }
+
+ /**
+ * Returns the set of values associated with a given attribute.
+ * @param attrName the name of the attribute.
+ * @return the set of values associated with a given attribute.
+ */
+ public Set<Object> getValues(String attrName)
+ {
+ Set<Object> values = new LinkedHashSet<Object>();
+ for (AttributeValuePair valuePair : dataArray)
+ {
+ if (valuePair.attrName.equalsIgnoreCase(attrName))
+ {
+ if (hasValue(valuePair))
+ {
+ if (valuePair.value instanceof Collection)
+ {
+ for (Object o : (Collection)valuePair.value)
+ {
+ values.add(o);
+ }
+ }
+ else
+ {
+ values.add(valuePair.value);
+ }
+ }
+ }
+ }
+ return values;
+ }
+
+ private void updateObjectClass(ObjectClassValue newValue)
+ {
+ CustomSearchResult oldResult = searchResult;
+ CustomSearchResult newResult =
+ new CustomSearchResult(searchResult.getDN());
+
+ for (String attrName : schemaReadOnlyAttributesLowerCase)
+ {
+ Set<Object> values = searchResult.getAttributeValues(attrName);
+ if (!values.isEmpty())
+ {
+ newResult.set(attrName, values);
+ }
+ }
+ ignoreEntryChangeEvents = true;
+
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ ArrayList<String> attributes = new ArrayList<String>();
+ ArrayList<String> ocs = new ArrayList<String>();
+ if (newValue.getStructural() != null)
+ {
+ ocs.add(newValue.getStructural().toLowerCase());
+ }
+ for (String oc : newValue.getAuxiliary())
+ {
+ ocs.add(oc.toLowerCase());
+ }
+ for (String oc : ocs)
+ {
+ ObjectClass objectClass = schema.getObjectClass(oc);
+ if (objectClass != null)
+ {
+ for (AttributeType attr : objectClass.getRequiredAttributeChain())
+ {
+ attributes.add(attr.getNameOrOID().toLowerCase());
+ }
+ for (AttributeType attr : objectClass.getOptionalAttributeChain())
+ {
+ attributes.add(attr.getNameOrOID().toLowerCase());
+ }
+ }
+ }
+ for (String attrName : editableOperationalAttrNames)
+ {
+ attributes.add(attrName.toLowerCase());
+ }
+ for (AttributeValuePair currValue : allSortedValues)
+ {
+ String attrNoOptions = Utilities.getAttributeNameWithoutOptions(
+ currValue.attrName).toLowerCase();
+ if (!attributes.contains(attrNoOptions))
+ {
+ continue;
+ }
+ else if (!schemaReadOnlyAttributesLowerCase.contains(
+ currValue.attrName.toLowerCase()))
+ {
+ setValues(newResult, currValue.attrName);
+ }
+ }
+ }
+ update(newResult, isReadOnly, treePath);
+ ignoreEntryChangeEvents = false;
+ searchResult = oldResult;
+ notifyListeners();
+ }
+
+ private boolean isRequired(AttributeValuePair value)
+ {
+ return requiredAttrs.contains(
+ Utilities.getAttributeNameWithoutOptions(
+ value.attrName.toLowerCase()));
+ }
+
+ private boolean hasValue(AttributeValuePair value)
+ {
+ boolean hasValue = value.value != null;
+ if (hasValue)
+ {
+ if (value.value instanceof String)
+ {
+ hasValue = ((String)value.value).length() > 0;
+ }
+ else if (value.value instanceof byte[])
+ {
+ hasValue = ((byte[])value.value).length > 0;
+ }
+ }
+ return hasValue;
+ }
+ }
+
+ /**
+ * A simple class that contains an attribute name and a single value. It is
+ * used by the table model to be able to retrieve more easily all the values
+ * for a given attribute.
+ *
+ */
+ class AttributeValuePair
+ {
+ /**
+ * The attribute name.
+ */
+ String attrName;
+ /**
+ * The value.
+ */
+ Object value;
+ /**
+ * Constructor.
+ * @param attrName the attribute name.
+ * @param value the value.
+ */
+ public AttributeValuePair(String attrName, Object value)
+ {
+ this.attrName = attrName;
+ this.value = value;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
new file mode 100644
index 0000000..b58f356
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
@@ -0,0 +1,310 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * Dialog used to inform the user that there are unsaved changes in a panel.
+ * It proposes the user to save the changes, do not save them or cancel the
+ * action that make the dialog appear (for instance when the user is editing
+ * an entry and clicks on another node, this dialog appears).
+ *
+ */
+public class UnsavedChangesDialog extends GenericDialog
+{
+ /**
+ * The different input that the user can provide.
+ *
+ */
+ public enum Result
+ {
+ /**
+ * The user asks to save the changes.
+ */
+ SAVE,
+ /**
+ * The user asks to not to save the changes.
+ */
+ DO_NOT_SAVE,
+ /**
+ * The user asks to cancel the operation that made this dialog to appear.
+ */
+ CANCEL
+ }
+ private static final long serialVersionUID = -4436794801035162388L;
+
+ /**
+ * Constructor of the dialog.
+ * @param parentDialog the parent dialog.
+ * @param info the control panel info.
+ */
+ public UnsavedChangesDialog(Component parentDialog,
+ ControlPanelInfo info)
+ {
+ super(Utilities.getFrame(parentDialog), getPanel(info));
+ Utilities.centerGoldenMean(this, parentDialog);
+ getRootPane().setDefaultButton(
+ ((UnsavedChangesPanel)panel).saveButton);
+ setModal(true);
+ }
+
+ /**
+ * Sets the message to be displayed in this dialog.
+ * @param title the title of the message.
+ * @param details the details of the message.
+ */
+ public void setMessage(Message title, Message details)
+ {
+ panel.updateConfirmationPane(panel.errorPane, title,
+ ColorAndFontConstants.errorTitleFont, details,
+ ColorAndFontConstants.defaultFont);
+ invalidate();
+ pack();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setVisible(boolean visible)
+ {
+ if (visible)
+ {
+ ((UnsavedChangesPanel)panel).result = Result.CANCEL;
+ }
+ super.setVisible(visible);
+ }
+
+ /**
+ * Returns the option the user gave when closing this dialog.
+ * @return the option the user gave when closing this dialog.
+ */
+ public Result getResult()
+ {
+ return ((UnsavedChangesPanel)panel).result;
+ }
+
+ /**
+ * Creates the panel to be displayed inside the dialog.
+ * @param info the control panel info.
+ * @return the panel to be displayed inside the dialog.
+ */
+ private static StatusGenericPanel getPanel(ControlPanelInfo info)
+ {
+ UnsavedChangesPanel panel = new UnsavedChangesPanel();
+ panel.setInfo(info);
+ return panel;
+ }
+
+ /**
+ * The panel to be displayed inside the dialog.
+ *
+ */
+ private static class UnsavedChangesPanel extends StatusGenericPanel
+ {
+ private static final long serialVersionUID = -1528939816762604059L;
+
+ private JButton saveButton;
+ private JButton doNotSaveButton;
+ private JButton cancelButton;
+
+ private Result result;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public UnsavedChangesPanel()
+ {
+ super();
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 1;
+ addErrorPane(gbc);
+ errorPane.setVisible(true);
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ gbc.weighty = 1.0;
+ add(Box.createVerticalGlue(), gbc);
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+// The button panel
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ gbc.insets = new Insets(0, 0, 0, 0);
+ add(createButtonsPanel(), gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresBorder()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresScroll()
+ {
+ return false;
+ }
+
+ private JPanel createButtonsPanel()
+ {
+ JPanel buttonsPanel = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.gridwidth = 1;
+ gbc.gridy = 0;
+ doNotSaveButton =
+ Utilities.createButton(INFO_CTRL_PANEL_DO_NOT_SAVE_BUTTON_LABEL.get());
+ doNotSaveButton.setOpaque(false);
+ gbc.insets = new Insets(10, 10, 10, 10);
+ buttonsPanel.add(doNotSaveButton, gbc);
+ doNotSaveButton.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ result = Result.DO_NOT_SAVE;
+ cancelClicked();
+ }
+ });
+ gbc.weightx = 1.0;
+ gbc.gridx ++;
+ buttonsPanel.add(Box.createHorizontalStrut(150));
+ buttonsPanel.add(Box.createHorizontalGlue(), gbc);
+ buttonsPanel.setOpaque(true);
+ buttonsPanel.setBackground(ColorAndFontConstants.greyBackground);
+ gbc.gridx ++;
+ gbc.weightx = 0.0;
+ buttonsPanel.add(Box.createHorizontalStrut(100));
+ gbc.gridx ++;
+ cancelButton = Utilities.createButton(
+ INFO_CTRL_PANEL_CANCEL_BUTTON_LABEL.get());
+ cancelButton.setOpaque(false);
+ gbc.insets.right = 0;
+ buttonsPanel.add(cancelButton, gbc);
+ cancelButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ result = Result.CANCEL;
+ cancelClicked();
+ }
+ });
+ saveButton = Utilities.createButton(
+ INFO_CTRL_PANEL_SAVE_BUTTON_LABEL.get());
+ saveButton.setOpaque(false);
+ gbc.gridx ++;
+ gbc.insets.left = 5;
+ gbc.insets.right = 10;
+ buttonsPanel.add(saveButton, gbc);
+ saveButton.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ result = Result.SAVE;
+ cancelClicked();
+ }
+ });
+
+ buttonsPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0,
+ ColorAndFontConstants.defaultBorderColor));
+
+ return buttonsPanel;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return doNotSaveButton;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_UNSAVED_CHANGES_DIALOG_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
new file mode 100644
index 0000000..347cb91
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -0,0 +1,954 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.Box;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.CategorizedComboBoxElement;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.ScrollPaneBorderListener;
+import org.opends.guitools.controlpanel.task.DeleteIndexTask;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.ConfigReader;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.admin.client.ManagementContext;
+import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
+import org.opends.server.admin.client.ldap.LDAPManagementContext;
+import org.opends.server.admin.std.client.LocalDBBackendCfgClient;
+import org.opends.server.admin.std.client.LocalDBVLVIndexCfgClient;
+import org.opends.server.admin.std.client.RootCfgClient;
+import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn.Scope;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.LDIFReader;
+import org.opends.server.util.cli.CommandBuilder;
+
+/**
+ * The panel that displays an existing VLV index (it appears on the right of the
+ * 'Manage Indexes' dialog).
+ *
+ */
+public class VLVIndexPanel extends AbstractVLVIndexPanel
+{
+ private static final long serialVersionUID = 6333337497315464283L;
+ private JButton deleteIndex = Utilities.createButton(
+ INFO_CTRL_PANEL_DELETE_INDEX_LABEL.get());
+ private JButton saveChanges = Utilities.createButton(
+ INFO_CTRL_PANEL_SAVE_CHANGES_LABEL.get());
+ private JLabel warning = Utilities.createDefaultLabel();
+
+ private ScrollPaneBorderListener scrollListener;
+
+ private ModifyVLVIndexTask newModifyTask;
+
+ private boolean ignoreCheckSave;
+
+ private Message INDEX_MODIFIED =
+ INFO_CTRL_PANEL_INDEX_MODIFIED_MESSAGE.get();
+
+
+ private VLVIndexDescriptor index;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public VLVIndexPanel()
+ {
+ super(null, null);
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_VLV_INDEX_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return baseDN;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(final ConfigurationChangeEvent ev)
+ {
+ if (updateLayout(ev))
+ {
+ updateErrorPaneIfAuthRequired(ev.getNewDescriptor(),
+ INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_VLV_INDEX_EDITING.get());
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ checkSaveButton();
+ deleteIndex.setEnabled(
+ !authenticationRequired(ev.getNewDescriptor()));
+ }
+ });
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ }
+
+ /**
+ * Method used to know if there are unsaved changes or not. It is used by
+ * the index selection listener when the user changes the selection.
+ * @return <CODE>true</CODE> if there are unsaved changes (and so the
+ * selection of the index should be canceled) and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean mustCheckUnsavedChanges()
+ {
+ return (index != null) &&
+ saveChanges.isVisible() && saveChanges.isEnabled();
+ }
+
+ /**
+ * Tells whether the user chose to save the changes in the panel, to not save
+ * them or simply cancelled the selection in the tree.
+ * @return the value telling whether the user chose to save the changes in the
+ * panel, to not save them or simply cancelled the selection change in the
+ * tree.
+ */
+ public UnsavedChangesDialog.Result checkUnsavedChanges()
+ {
+ UnsavedChangesDialog.Result result;
+ UnsavedChangesDialog unsavedChangesDlg = new UnsavedChangesDialog(
+ Utilities.getParentDialog(this), getInfo());
+ unsavedChangesDlg.setMessage(INFO_CTRL_PANEL_UNSAVED_CHANGES_SUMMARY.get(),
+ INFO_CTRL_PANEL_UNSAVED_INDEX_CHANGES_DETAILS.get(index.getName()));
+ Utilities.centerGoldenMean(unsavedChangesDlg,
+ Utilities.getParentDialog(this));
+ unsavedChangesDlg.setVisible(true);
+ result = unsavedChangesDlg.getResult();
+ if (result == UnsavedChangesDialog.Result.SAVE)
+ {
+ saveIndex(false);
+ if ((newModifyTask == null) || // The user data is not valid
+ (newModifyTask.getState() != Task.State.FINISHED_SUCCESSFULLY))
+ {
+ result = UnsavedChangesDialog.Result.CANCEL;
+ }
+ }
+
+ return result;
+ }
+
+ private void checkSaveButton()
+ {
+ if (!ignoreCheckSave && (index != null))
+ {
+ saveChanges.setEnabled(
+ !authenticationRequired(getInfo().getServerDescriptor()) &&
+ isModified());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ *
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ JPanel p = new JPanel(new GridBagLayout());
+ p.setOpaque(false);
+ super.createBasicLayout(p, gbc, true);
+ p.setBorder(new EmptyBorder(10, 10, 10, 10));
+ gbc = new GridBagConstraints();
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ JScrollPane scroll = Utilities.createBorderLessScrollBar(p);
+ scrollListener = new ScrollPaneBorderListener(scroll);
+ add(scroll, gbc);
+
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.weightx = 1.0;
+ gbc.weighty = 0.0;
+ gbc.insets.left = 0;
+ gbc.gridwidth = 2;
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets.top = 10;
+
+ gbc.gridwidth = 3;
+ gbc.insets = new Insets(10, 10, 0, 10);
+ add(warning, gbc);
+ Utilities.setWarningLabel(warning, INDEX_MODIFIED);
+
+ gbc.gridy ++;
+ JPanel buttonPanel = new JPanel(new GridBagLayout());
+ buttonPanel.setOpaque(false);
+ gbc.insets = new Insets(10, 10, 10, 10);
+ add(buttonPanel, gbc);
+
+ gbc.insets = new Insets(0, 0, 0, 0);
+ gbc.gridy = 0;
+ gbc.gridx = 0;
+ gbc.weightx = 0.0;
+ gbc.gridwidth = 1;
+ deleteIndex.setOpaque(false);
+ gbc.insets.left = 0;
+ buttonPanel.add(deleteIndex, gbc);
+ deleteIndex.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ deleteIndex();
+ }
+ });
+ gbc.gridx = 2;
+ gbc.weightx = 1.0;
+ buttonPanel.add(Box.createHorizontalGlue(), gbc);
+ gbc.weightx = 0.0;
+ gbc.insets.left = 10;
+ saveChanges.setOpaque(false);
+ gbc.gridx = 3;
+ buttonPanel.add(saveChanges, gbc);
+ saveChanges.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ saveIndex(false);
+ }
+ });
+
+ DocumentListener documentListener = new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ checkSaveButton();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ checkSaveButton();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ checkSaveButton();
+ }
+ };
+
+ ActionListener actionListener = new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ checkSaveButton();
+ }
+ };
+
+
+ baseDNs.addActionListener(actionListener);
+ baseObject.addActionListener(actionListener);
+ singleLevel.addActionListener(actionListener);
+ subordinateSubtree.addActionListener(actionListener);
+ wholeSubtree.addActionListener(actionListener);
+ attributes.addActionListener(actionListener);
+ sortOrder.getModel().addListDataListener(new ListDataListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void contentsChanged(ListDataEvent e)
+ {
+ checkSaveButton();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void intervalAdded(ListDataEvent e)
+ {
+ checkSaveButton();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void intervalRemoved(ListDataEvent e)
+ {
+ checkSaveButton();
+ }
+ });
+
+ baseDN.getDocument().addDocumentListener(documentListener);
+ filter.getDocument().addDocumentListener(documentListener);
+ maxBlockSize.getDocument().addDocumentListener(documentListener);
+ baseDN.getDocument().addDocumentListener(documentListener);
+ }
+
+ private void deleteIndex()
+ {
+ ArrayList<Message> errors = new ArrayList<Message>();
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_DELETE_VLV_INDEX_TITLE.get(), getInfo());
+ ArrayList<AbstractIndexDescriptor> indexesToDelete =
+ new ArrayList<AbstractIndexDescriptor>();
+ indexesToDelete.add(index);
+ DeleteIndexTask newTask = new DeleteIndexTask(getInfo(), dlg,
+ indexesToDelete);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ String indexName = index.getName();
+ String backendName = index.getBackend().getBackendID();
+ if (displayConfirmationDialog(
+ INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get(),
+ INFO_CTRL_PANEL_CONFIRMATION_VLV_INDEX_DELETE_DETAILS.get(indexName,
+ backendName)))
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DELETING_VLV_INDEX_SUMMARY.get(),
+ INFO_CTRL_PANEL_DELETING_VLV_INDEX_COMPLETE.get(),
+ INFO_CTRL_PANEL_DELETING_VLV_INDEX_SUCCESSFUL.get(indexName,
+ backendName),
+ ERR_CTRL_PANEL_DELETING_VLV_INDEX_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_DELETING_VLV_INDEX_ERROR_DETAILS.get(indexName),
+ null,
+ dlg);
+ dlg.setVisible(true);
+ }
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ private void saveIndex(boolean modal)
+ {
+ newModifyTask = null;
+ if (!isModified())
+ {
+ return;
+ }
+ List<Message> errors = checkErrors(false);
+
+ if (errors.isEmpty())
+ {
+ ProgressDialog dlg = new ProgressDialog(
+ Utilities.getParentDialog(this),
+ INFO_CTRL_PANEL_MODIFYING_INDEX_TITLE.get(), getInfo());
+ dlg.setModal(modal);
+ newModifyTask = new ModifyVLVIndexTask(getInfo(), dlg);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newModifyTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ // Check filters
+ if (checkIndexRequired())
+ {
+ String indexName = index.getName();
+ String backendName = index.getBackend().getBackendID();
+ launchOperation(newModifyTask,
+ INFO_CTRL_PANEL_MODIFYING_VLV_INDEX_SUMMARY.get(indexName),
+ INFO_CTRL_PANEL_MODIFYING_VLV_INDEX_COMPLETE.get(),
+ INFO_CTRL_PANEL_MODIFYING_VLV_INDEX_SUCCESSFUL.get(indexName,
+ backendName),
+ ERR_CTRL_PANEL_MODIFYING_VLV_INDEX_ERROR_SUMMARY.get(),
+ ERR_CTRL_PANEL_MODIFYING_VLV_INDEX_ERROR_DETAILS.get(indexName),
+ null,
+ dlg);
+ saveChanges.setEnabled(false);
+ dlg.setVisible(true);
+ }
+ }
+ }
+
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+
+ /**
+ * Updates the contents of the panel with the provided VLV index.
+ * @param index the VLV index descriptor to be used to update the panel.
+ */
+ public void update(VLVIndexDescriptor index)
+ {
+ ignoreCheckSave = true;
+ readOnlyName.setText(index.getName());
+ titlePanel.setDetails(Message.raw(index.getName()));
+ if (index.getBackend() != null)
+ {
+ updateBaseDNCombo(index.getBackend());
+ backendName.setText(index.getBackend().getBackendID());
+ }
+ String dn = Utilities.unescapeUtf8(index.getBaseDN().toString());
+ if (((DefaultComboBoxModel)baseDNs.getModel()).getIndexOf(dn) != -1)
+ {
+ baseDN.setText("");
+ baseDNs.setSelectedItem(dn);
+ }
+ else
+ {
+ baseDN.setText(dn);
+ baseDNs.setSelectedItem(OTHER_BASE_DN);
+ }
+ switch (index.getScope())
+ {
+ case BASE_OBJECT:
+ baseObject.setSelected(true);
+ break;
+ case SINGLE_LEVEL:
+ singleLevel.setSelected(true);
+ break;
+ case SUBORDINATE_SUBTREE:
+ subordinateSubtree.setSelected(true);
+ break;
+ case WHOLE_SUBTREE:
+ wholeSubtree.setSelected(true);
+ break;
+ }
+ filter.setText(index.getFilter());
+
+ // Simulate a remove to update the attribute combo box and add them again.
+ int indexes[] = new int[sortOrderModel.getSize()];
+
+ for (int i=0; i<indexes.length; i++)
+ {
+ indexes[i] = i;
+ }
+ sortOrder.setSelectedIndices(indexes);
+ remove.doClick();
+
+ // The list is now empty and the attribute combo properly updated.
+ DefaultComboBoxModel model =
+ (DefaultComboBoxModel)attributes.getModel();
+ for (VLVSortOrder s : index.getSortOrder())
+ {
+ sortOrderModel.addElement(s);
+ for (int i=0; i<model.getSize(); i++)
+ {
+ CategorizedComboBoxElement o =
+ (CategorizedComboBoxElement)model.getElementAt(i);
+ if ((o.getType() == CategorizedComboBoxElement.Type.REGULAR) &&
+ o.getValue().equals(s.getAttributeName()))
+ {
+ model.removeElementAt(i);
+ break;
+ }
+ }
+ }
+ if (model.getSize() > 1)
+ {
+ attributes.setSelectedIndex(1);
+ }
+
+ if (getInfo() != null)
+ {
+ if (getInfo().mustReindex(index))
+ {
+ Utilities.setWarningLabel(warning, INDEX_MODIFIED);
+ warning.setVisible(true);
+ warning.setVerticalTextPosition(SwingConstants.TOP);
+ }
+ else
+ {
+ warning.setVisible(false);
+ }
+ }
+ this.index = index;
+
+ ignoreCheckSave = false;
+ checkSaveButton();
+
+ scrollListener.updateBorder();
+ }
+
+ private boolean isModified()
+ {
+ try
+ {
+ return !index.getBaseDN().equals(DN.decode(getBaseDN())) ||
+ (getScope() != index.getScope()) ||
+ !filter.getText().trim().equals(index.getFilter()) ||
+ !getSortOrder().equals(index.getSortOrder()) ||
+ !String.valueOf(index.getMaxBlockSize()).equals(
+ maxBlockSize.getText().trim());
+ }
+ catch (OpenDsException odse)
+ {
+ // The base DN is not valid. This means that the index has been modified.
+ return true;
+ }
+ }
+
+ /**
+ * The task in charge of modifying the VLV index.
+ *
+ */
+ protected class ModifyVLVIndexTask extends Task
+ {
+ private Set<String> backendSet;
+ private String indexName;
+ private String baseDN;
+ private String filterValue;
+ private Scope scope;
+ private List<VLVSortOrder> sortOrder;
+ private String backendID;
+ private String sortOrderStringValue;
+ private String ldif;
+ private VLVIndexDescriptor indexToModify;
+ private int maxBlock;
+ private VLVIndexDescriptor modifiedIndex;
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public ModifyVLVIndexTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg);
+ backendID = index.getBackend().getBackendID();
+ backendSet = new HashSet<String>();
+ backendSet.add(backendID);
+ indexName = index.getName();
+ sortOrder = getSortOrder();
+ baseDN = getBaseDN();
+ filterValue = filter.getText().trim();
+ scope = getScope();
+ sortOrderStringValue = getSortOrderStringValue(sortOrder);
+ ldif = getIndexLDIF(indexName);
+ maxBlock = Integer.parseInt(maxBlockSize.getText());
+ indexToModify = index;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.MODIFY_INDEX;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_MODIFY_VLV_INDEX_TASK_DESCRIPTION.get(
+ indexName, backendID);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend for safety. This is a short operation so the limitation
+ // has not a lot of impact.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ if (backends.size() > 0)
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ private void updateConfiguration() throws OpenDsException
+ {
+ boolean configHandlerUpdated = false;
+ try
+ {
+ if (!isServerRunning())
+ {
+ configHandlerUpdated = true;
+ getInfo().stopPooling();
+ if (getInfo().mustDeregisterConfig())
+ {
+ DirectoryServer.deregisterBaseDN(DN.decode("cn=config"));
+ }
+ DirectoryServer.getInstance().initializeConfiguration(
+ org.opends.server.extensions.ConfigFileHandler.class.getName(),
+ ConfigReader.configFile);
+ getInfo().setMustDeregisterConfig(true);
+ }
+ else
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLineName());
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(
+ getDSConfigCommandLineArguments());
+ args.removeAll(getConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_MODIFY_VLV_INDEX.get()+
+ "<br><b>"+sb.toString()+"</b><br><br>",
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_MODIFYING_VLV_INDEX_PROGRESS.get(indexName),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ if (isServerRunning())
+ {
+ // Create additional indexes and display the equivalent command.
+ // Everything is done in the method createAdditionalIndexes
+ modifyIndex(getInfo().getDirContext());
+ }
+ else
+ {
+ modifyIndex();
+ }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressDone(ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+ finally
+ {
+ if (configHandlerUpdated)
+ {
+ DirectoryServer.getInstance().initializeConfiguration(
+ ConfigReader.configClassName, ConfigReader.configFile);
+ getInfo().startPooling(ControlPanelInfo.DEFAULT_POOLING);
+ }
+ }
+ }
+
+ private void modifyIndex() throws OpenDsException
+ {
+ LDIFImportConfig ldifImportConfig = null;
+ try
+ {
+ ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
+ LDIFReader reader = new LDIFReader(ldifImportConfig);
+ Entry newConfigEntry = reader.readEntry();
+ Entry oldEntry = DirectoryServer.getConfigEntry(
+ newConfigEntry.getDN()).getEntry();
+ DirectoryServer.getConfigHandler().replaceEntry(oldEntry,
+ newConfigEntry,
+ null);
+ DirectoryServer.getConfigHandler().writeUpdatedConfig();
+ }
+ catch (IOException ioe)
+ {
+ throw new OfflineUpdateException(
+ ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
+ ioe);
+ }
+ finally
+ {
+ if (ldifImportConfig != null)
+ {
+ ldifImportConfig.close();
+ }
+ }
+ }
+
+ /**
+ * Modifies index using the provided connection.
+ * @param ctx the connection to be used to update the index configuration.
+ * @throws OpenDsException if there is an error updating the server.
+ */
+ private void modifyIndex(InitialLdapContext ctx) throws OpenDsException
+ {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(getConfigCommandLineName());
+ Collection<String> args =
+ getObfuscatedCommandLineArguments(getDSConfigCommandLineArguments());
+ for (String arg : args)
+ {
+ sb.append(" "+CommandBuilder.escapeValue(arg));
+ }
+
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ LocalDBBackendCfgClient backend =
+ (LocalDBBackendCfgClient)root.getBackend(backendID);
+ LocalDBVLVIndexCfgClient index = backend.getLocalDBVLVIndex(indexName);
+ DN b = DN.decode(baseDN);
+ if (!indexToModify.getBaseDN().equals(b))
+ {
+ index.setBaseDN(b);
+ }
+ if (!indexToModify.getFilter().equals(filterValue))
+ {
+ index.setFilter(filterValue);
+ }
+ if (indexToModify.getScope() != scope)
+ {
+ index.setScope(scope);
+ }
+ if (!indexToModify.getScope().equals(sortOrder))
+ {
+ index.setSortOrder(sortOrderStringValue);
+ }
+ index.commit();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ return new ArrayList<String>();
+ }
+
+ private String getConfigCommandLineName()
+ {
+ if (isServerRunning() && isModified())
+ {
+ return getCommandLinePath("dsconfig");
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+
+ try
+ {
+ updateConfiguration();
+ modifiedIndex = new VLVIndexDescriptor(
+ indexName, indexToModify.getBackend(), DN.decode(baseDN),
+ scope, filterValue, sortOrder, maxBlock);
+ getInfo().registerModifiedIndex(modifiedIndex);
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void postOperation()
+ {
+ if ((lastException == null) && (state == State.FINISHED_SUCCESSFULLY))
+ {
+ rebuildIndexIfNecessary(modifiedIndex, getProgressDialog());
+ }
+ }
+
+ private ArrayList<String> getDSConfigCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+ args.add("set-local-db-vlv-index-prop");
+ args.add("--backend-name");
+ args.add(backendID);
+
+ args.add("--index-name");
+ args.add(indexName);
+
+ try
+ {
+ DN b = DN.decode(baseDN);
+ if (!indexToModify.getBaseDN().equals(b))
+ {
+ args.add("--set");
+ args.add("base-dn:"+baseDN);
+ }
+ }
+ catch (OpenDsException odse)
+ {
+ throw new IllegalStateException("Unexpected error parsing DN "+
+ getBaseDN()+": "+odse, odse);
+ }
+ if (indexToModify.getScope() != scope)
+ {
+ args.add("--set");
+ args.add("scope:"+scope.toString());
+ }
+ if (!indexToModify.getFilter().equals(filterValue))
+ {
+ args.add("--set");
+ args.add("filter:"+filterValue);
+ }
+
+ if (!indexToModify.getScope().equals(sortOrder))
+ {
+ args.add("--set");
+ args.add("sort-order:"+sortOrderStringValue);
+ }
+
+ args.addAll(getConnectionCommandLineArguments());
+ args.add("--no-prompt");
+
+ return args;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
new file mode 100644
index 0000000..a9e9535
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
@@ -0,0 +1,672 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.ButtonGroup;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JRadioButton;
+import javax.swing.ListCellRenderer;
+import javax.swing.SwingUtilities;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.CategorizedComboBoxElement;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.datamodel.SortableListModel;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.IndexModifiedEvent;
+import org.opends.guitools.controlpanel.event.IndexModifiedListener;
+import org.opends.guitools.controlpanel.task.IndexTask;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.ui.components.AddRemovePanel;
+import org.opends.guitools.controlpanel.ui.renderer.CustomListCellRenderer;
+import org.opends.guitools.controlpanel.ui.renderer.IndexCellRenderer;
+import org.opends.guitools.controlpanel.ui.renderer.IndexComboBoxCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * The panel that appears when the user wants to verify an index.
+ *
+ */
+public class VerifyIndexPanel extends StatusGenericPanel
+implements IndexModifiedListener
+{
+ private static final long serialVersionUID = 5252070109221657041L;
+ private JComboBox baseDNs;
+ private JRadioButton verifyIndexContents;
+ private JRadioButton verifyKeyEntryIDs;
+ private AddRemovePanel<AbstractIndexDescriptor> addRemove;
+ private JComboBox keyEntryIDs;
+ private HashMap<String, SortedSet<AbstractIndexDescriptor>> hmIndexes =
+ new HashMap<String, SortedSet<AbstractIndexDescriptor>>();
+
+ private JLabel lBaseDN;
+ private JLabel lAction;
+ private JLabel lIndex;
+ private JLabel lNoBaseDNsFound;
+
+ private final String DATABASE_INDEXES =
+ INFO_CTRL_PANEL_DATABASE_INDEXES.get().toString();
+ private final String ATTRIBUTE_INDEXES =
+ INFO_CTRL_PANEL_ATTRIBUTE_INDEXES.get().toString();
+ private final String VLV_INDEXES =
+ INFO_CTRL_PANEL_VLV_INDEXES.get().toString();
+
+ /**
+ * Constructor of the panel.
+ *
+ */
+ public VerifyIndexPanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ super.setInfo(info);
+ ListCellRenderer indexCellRenderer = new IndexCellRenderer(
+ addRemove.getAvailableList(), info);
+ addRemove.getAvailableList().setCellRenderer(indexCellRenderer);
+ addRemove.getSelectedList().setCellRenderer(indexCellRenderer);
+ info.addIndexModifiedListener(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void indexModified(IndexModifiedEvent ev)
+ {
+ refreshContents(getInfo().getServerDescriptor());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void backendIndexesModified(IndexModifiedEvent ev)
+ {
+ refreshContents(getInfo().getServerDescriptor());
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 1;
+ gbc.fill = GridBagConstraints.NONE;
+ lBaseDN = Utilities.createPrimaryLabel(INFO_CTRL_PANEL_BASE_DN_LABEL.get());
+ add(lBaseDN, gbc);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridy = 0;
+ baseDNs = Utilities.createComboBox();
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ baseDNs.setModel(model);
+ baseDNs.setRenderer(new CustomListCellRenderer(baseDNs));
+ ItemListener listener = new IgnoreItemListener(baseDNs);
+ baseDNs.addItemListener(listener);
+ baseDNs.addItemListener(new ItemListener()
+ {
+ public void itemStateChanged(ItemEvent ev)
+ {
+ comboBoxSelected(hmIndexes,
+ (CategorizedComboBoxElement)baseDNs.getSelectedItem(),
+ addRemove);
+ updateVerifyKeyEntriesComboBox();
+ }
+ });
+ listener.itemStateChanged(null);
+ gbc.gridwidth = 2;
+ add(baseDNs, gbc);
+ lNoBaseDNsFound = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NO_BASE_DNS_FOUND_LABEL.get());
+ add(lNoBaseDNsFound, gbc);
+ lNoBaseDNsFound.setVisible(false);
+
+
+ lAction = Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_ACTION_LABEL.get());
+ gbc.insets.top = 10;
+ gbc.gridy ++;
+ gbc.gridx = 0;
+ gbc.gridwidth = 1;
+ add(lAction, gbc);
+
+ verifyIndexContents = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_VERIFY_ENTRY_CONTEXT_ARE_INDEXES.get());
+ verifyIndexContents.setSelected(true);
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ add(verifyIndexContents, gbc);
+
+ addRemove = new AddRemovePanel<AbstractIndexDescriptor>(
+ AbstractIndexDescriptor.class);
+ addRemove.getAvailableLabel().setText(
+ INFO_CTRL_PANEL_AVAILABLE_INDEXES_LABEL.get().toString());
+ addRemove.getSelectedLabel().setText(
+ INFO_CTRL_PANEL_SELECTED_INDEXES_LABEL.get().toString());
+
+ gbc.gridy ++;
+ gbc.weightx = 1.0;
+ gbc.weighty = 0.0;
+ gbc.gridwidth = 2;
+ gbc.insets.top = 5;
+ gbc.insets.left = 30;
+ gbc.fill = GridBagConstraints.BOTH;
+ add(addRemove, gbc);
+
+ gbc.gridy ++;
+ JLabel explanation = Utilities.createInlineHelpLabel(
+ INFO_CTRL_PANEL_REQUIRES_REBUILD_LEGEND.get());
+ gbc.insets.top = 3;
+ add(explanation, gbc);
+
+ verifyKeyEntryIDs = Utilities.createRadioButton(
+ INFO_CTRL_PANEL_VERIFY_ALL_KEYS.get());
+ verifyKeyEntryIDs.setSelected(true);
+ gbc.insets.left = 10;
+ gbc.insets.top = 10;
+ gbc.gridx = 1;
+ gbc.gridwidth = 2;
+ gbc.gridy ++;
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.NONE;
+ add(verifyKeyEntryIDs, gbc);
+
+ gbc.gridy ++;
+ gbc.insets.left = 30;
+ gbc.insets.top = 5;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ lIndex = Utilities.createDefaultLabel(INFO_CTRL_PANEL_INDEX_LABEL.get());
+ add(lIndex, gbc);
+
+ keyEntryIDs = Utilities.createComboBox();
+ model = new DefaultComboBoxModel();
+ keyEntryIDs.setModel(model);
+ keyEntryIDs.setRenderer(new IndexComboBoxCellRenderer(keyEntryIDs));
+ listener = new IgnoreItemListener(keyEntryIDs);
+ keyEntryIDs.addItemListener(listener);
+ listener.itemStateChanged(null);
+ gbc.gridx = 2;
+ gbc.insets.left = 5;
+ add(keyEntryIDs, gbc);
+
+ addBottomGlue(gbc);
+
+ ButtonGroup group = new ButtonGroup();
+ group.add(verifyIndexContents);
+ group.add(verifyKeyEntryIDs);
+ verifyIndexContents.setSelected(true);
+ listener = new ItemListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void itemStateChanged(ItemEvent ev)
+ {
+ addRemove.setEnabled(verifyIndexContents.isSelected());
+ keyEntryIDs.setEnabled(!verifyIndexContents.isSelected());
+ lIndex.setEnabled(!verifyIndexContents.isSelected());
+ }
+ };
+ verifyIndexContents.addItemListener(listener);
+ listener.itemStateChanged(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_VERIFY_INDEXES_PANEL_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return baseDNs;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ refreshContents(ev.getNewDescriptor());
+ }
+
+ private void refreshContents(ServerDescriptor desc)
+ {
+ updateIndexMap(desc, hmIndexes);
+ updateBaseDNComboBoxModel((DefaultComboBoxModel)baseDNs.getModel(), desc);
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ comboBoxSelected(hmIndexes,
+ (CategorizedComboBoxElement)baseDNs.getSelectedItem(),
+ addRemove);
+ updateVerifyKeyEntriesComboBox();
+ addRemove.getAvailableList().repaint();
+ addRemove.getSelectedList().repaint();
+ boolean comboVisible = baseDNs.getModel().getSize() > 0;
+ baseDNs.setVisible(comboVisible);
+ lNoBaseDNsFound.setVisible(!comboVisible);
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancelClicked()
+ {
+ setPrimaryValid(lBaseDN);
+ setSecondaryValid(addRemove.getSelectedLabel());
+ setSecondaryValid(lIndex);
+ super.cancelClicked();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ setPrimaryValid(lBaseDN);
+ setSecondaryValid(addRemove.getSelectedLabel());
+ setSecondaryValid(lIndex);
+
+ final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+
+ String baseDN = getSelectedBaseDN();
+
+ if (baseDN == null)
+ {
+ setPrimaryInvalid(lBaseDN);
+ if (baseDNs.getItemCount() == 0)
+ {
+ errors.add(ERR_CTRL_PANEL_NO_BASE_DNS_DEFINED_LABEL.get());
+ }
+ else
+ {
+ errors.add(ERR_CTRL_PANEL_MUST_SELECT_BASE_DN.get());
+ }
+ }
+
+ if (verifyIndexContents.isSelected())
+ {
+ SortableListModel<AbstractIndexDescriptor> model =
+ addRemove.getSelectedListModel();
+ if (model.getSize() == 0)
+ {
+ setSecondaryInvalid(addRemove.getSelectedLabel());
+ errors.add(ERR_CTRL_PANEL_INDEX_TO_BE_VERIFIED_REQUIRED.get());
+ }
+ }
+ else
+ {
+ AbstractIndexDescriptor index = getSelectedIndex();
+
+ if (index == null)
+ {
+ setPrimaryInvalid(lIndex);
+ if ((keyEntryIDs.getItemCount() == 0) && (baseDN != null))
+ {
+ errors.add(ERR_CTRL_PANEL_NO_INDEXES_FOR_BASEDN.get(baseDN));
+ }
+ else
+ {
+ errors.add(ERR_CTRL_PANEL_INDEX_MUST_BE_SELECTED.get());
+ }
+ }
+ }
+
+ if (errors.isEmpty())
+ {
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this), getTitle(), getInfo());
+ VerifyIndexTask newTask = new VerifyIndexTask(getInfo(), progressDialog);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_VERIFYING_INDEXES_SUMMARY.get(baseDN),
+ INFO_CTRL_PANEL_VERIFYING_INDEXES_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_VERIFYING_INDEXES_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_VERIFYING_INDEXES_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_VERIFYING_INDEXES_ERROR_DETAILS,
+ progressDialog);
+ progressDialog.setVisible(true);
+ Utilities.getParentDialog(this).setVisible(false);
+ }
+ }
+ if (errors.size() > 0)
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected boolean displayBackend(BackendDescriptor backend)
+ {
+ return !backend.isConfigBackend() &&
+ (backend.getType() == BackendDescriptor.Type.LOCAL_DB);
+ }
+
+ private String getSelectedBaseDN()
+ {
+ String dn = null;
+ CategorizedComboBoxElement o =
+ (CategorizedComboBoxElement)baseDNs.getSelectedItem();
+ if (o != null)
+ {
+ dn = (String)o.getValue();
+ }
+ return dn;
+ }
+
+ private AbstractIndexDescriptor getSelectedIndex()
+ {
+ AbstractIndexDescriptor index = null;
+ CategorizedComboBoxElement o =
+ (CategorizedComboBoxElement)keyEntryIDs.getSelectedItem();
+ if (o != null)
+ {
+ index = (AbstractIndexDescriptor)o.getValue();
+ }
+ return index;
+ }
+
+ private void updateVerifyKeyEntriesComboBox()
+ {
+ String dn = getSelectedBaseDN();
+ if (dn != null)
+ {
+ SortedSet<AbstractIndexDescriptor> indexes = hmIndexes.get(dn);
+ if (indexes != null)
+ {
+ ArrayList<CategorizedComboBoxElement> newElements =
+ new ArrayList<CategorizedComboBoxElement>();
+ ArrayList<AbstractIndexDescriptor> databaseIndexes =
+ new ArrayList<AbstractIndexDescriptor>();
+ ArrayList<AbstractIndexDescriptor> attributeIndexes =
+ new ArrayList<AbstractIndexDescriptor>();
+ ArrayList<AbstractIndexDescriptor> vlvIndexes =
+ new ArrayList<AbstractIndexDescriptor>();
+ for (AbstractIndexDescriptor index : indexes)
+ {
+ if (index instanceof IndexDescriptor)
+ {
+ IndexDescriptor standardIndex = (IndexDescriptor)index;
+ if (standardIndex.isDatabaseIndex())
+ {
+ databaseIndexes.add(standardIndex);
+ }
+ else
+ {
+ attributeIndexes.add(standardIndex);
+ }
+ }
+ else
+ {
+ // VLV index
+ vlvIndexes.add(index);
+ }
+ }
+ if (databaseIndexes.size() > 0)
+ {
+ newElements.add(new CategorizedComboBoxElement(DATABASE_INDEXES,
+ CategorizedComboBoxElement.Type.CATEGORY));
+ for (AbstractIndexDescriptor index : databaseIndexes)
+ {
+ newElements.add(new CategorizedComboBoxElement(index,
+ CategorizedComboBoxElement.Type.REGULAR));
+ }
+ }
+ if (attributeIndexes.size() > 0)
+ {
+ newElements.add(new CategorizedComboBoxElement(ATTRIBUTE_INDEXES,
+ CategorizedComboBoxElement.Type.CATEGORY));
+ for (AbstractIndexDescriptor index : attributeIndexes)
+ {
+ newElements.add(new CategorizedComboBoxElement(index,
+ CategorizedComboBoxElement.Type.REGULAR));
+ }
+ }
+ if (vlvIndexes.size() > 0)
+ {
+ newElements.add(new CategorizedComboBoxElement(VLV_INDEXES,
+ CategorizedComboBoxElement.Type.CATEGORY));
+ for (AbstractIndexDescriptor index : vlvIndexes)
+ {
+ newElements.add(new CategorizedComboBoxElement(index,
+ CategorizedComboBoxElement.Type.REGULAR));
+ }
+ }
+ updateComboBoxModel(newElements,
+ (DefaultComboBoxModel)keyEntryIDs.getModel());
+ }
+ }
+ }
+
+ /**
+ * The task in charge of verifying the index.
+ *
+ */
+ protected class VerifyIndexTask extends IndexTask
+ {
+ private String baseDN;
+
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ */
+ public VerifyIndexTask(ControlPanelInfo info, ProgressDialog dlg)
+ {
+ super(info, dlg, getSelectedBaseDN());
+ this.baseDN = getSelectedBaseDN();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ return Type.VERIFY_INDEXES;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ return INFO_CTRL_PANEL_VERIFY_INDEX_TASK_DESCRIPTION.get(baseDN);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ // All the operations are incompatible if they apply to this
+ // backend.
+ Set<String> backends =
+ new TreeSet<String>(taskToBeLaunched.getBackends());
+ backends.retainAll(getBackends());
+ Task.Type type = taskToBeLaunched.getType();
+ if ((type != Task.Type.BACKUP) &&
+ (type != Task.Type.EXPORT_LDIF) &&
+ (type != Task.Type.ENABLE_WINDOWS_SERVICE) &&
+ (type != Task.Type.DISABLE_WINDOWS_SERVICE) &&
+ (backends.size() > 0))
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+ try
+ {
+ ArrayList<String> arguments = getCommandLineArguments();
+
+ String[] args = new String[arguments.size()];
+
+ arguments.toArray(args);
+ returnCode = executeCommandLine(getCommandLinePath(), args);
+
+ if (returnCode != 0)
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+
+ args.add("--baseDN");
+ args.add(getSelectedBaseDN());
+
+ if (verifyIndexContents.isSelected())
+ {
+ SortableListModel<AbstractIndexDescriptor> model =
+ addRemove.getSelectedListModel();
+ for (AbstractIndexDescriptor index : model.getData())
+ {
+ args.add("--index");
+ if (index instanceof VLVIndexDescriptor)
+ {
+ args.add(
+ Utilities.getVLVNameInCommandLine((VLVIndexDescriptor)index));
+ }
+ else
+ {
+ args.add(index.getName());
+ }
+ }
+ }
+ else
+ {
+ args.add("--index");
+ AbstractIndexDescriptor index = getSelectedIndex();
+ if (index instanceof VLVIndexDescriptor)
+ {
+ args.add(
+ Utilities.getVLVNameInCommandLine((VLVIndexDescriptor)index));
+ }
+ else
+ {
+ args.add(index.getName());
+ }
+ args.add("--clean");
+ }
+
+ args.add("--countErrors");
+
+ return args;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return getCommandLinePath("verify-index");
+ }
+ };
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
new file mode 100644
index 0000000..60ba960
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -0,0 +1,657 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Container;
+import java.awt.GridBagConstraints;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.swing.JLabel;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.datamodel.BinaryValue;
+import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
+import org.opends.guitools.controlpanel.datamodel.ObjectClassValue;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.event.LDAPEntryChangedEvent;
+import org.opends.guitools.controlpanel.event.LDAPEntryChangedListener;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.api.AttributeSyntax;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.schema.SchemaConstants;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.Entry;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.ObjectClassType;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.RDN;
+import org.opends.server.types.Schema;
+import org.opends.server.util.Base64;
+import org.opends.server.util.ServerConstants;
+
+/**
+ * Abstract class containing code shared by the different LDAP entry view
+ * panels (Simplified View, Attribute View and LDIF View).
+ *
+ */
+public abstract class ViewEntryPanel extends StatusGenericPanel
+{
+ /**
+ * The read-only attributes as they appear on the schema.
+ */
+ protected SortedSet<String> schemaReadOnlyAttributes = new TreeSet<String>();
+ /**
+ * The read-only attributes in lower case.
+ */
+ protected SortedSet<String> schemaReadOnlyAttributesLowerCase =
+ new TreeSet<String>();
+ private JLabel title= Utilities.createDefaultLabel();
+
+ private Set<LDAPEntryChangedListener> listeners =
+ new LinkedHashSet<LDAPEntryChangedListener>();
+
+ /**
+ * Whether the entry change events should be ignored or not.
+ */
+ protected boolean ignoreEntryChangeEvents;
+
+ /**
+ * Static boolean used to know whether only attributes with values should be
+ * displayed or not.
+ */
+ protected static boolean displayOnlyWithAttrs = true;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ // No ok button
+ }
+
+ /**
+ * Returns an Entry object representing what the panel is displaying.
+ * @return an Entry object representing what the panel is displaying.
+ * @throws OpenDsException if the entry cannot be generated (in particular if
+ * the user provided invalid data).
+ */
+ public abstract Entry getEntry() throws OpenDsException;
+
+ /**
+ * Updates the contents of the panel.
+ * @param sr the search result to be used to update the panel.
+ * @param isReadOnly whether the entry is read-only or not.
+ * @param path the tree path associated with the entry in the tree.
+ */
+ public abstract void update(CustomSearchResult sr, boolean isReadOnly,
+ TreePath path);
+
+ /**
+ * Adds a title panel to the container.
+ * @param c the container where the title panel must be added.
+ * @param gbc the grid bag constraints to be used.
+ */
+ protected void addTitlePanel(Container c, GridBagConstraints gbc)
+ {
+ c.add(title, gbc);
+ }
+
+ /**
+ * Whether the schema must be checked or not.
+ * @return <CODE>true</CODE> if the server is configured to check schema and
+ * <CODE>false</CODE> otherwise.
+ */
+ protected boolean checkSchema()
+ {
+ return getInfo().getServerDescriptor().isSchemaEnabled();
+ }
+
+ /**
+ * Adds an LDAP entry change listener.
+ * @param listener the listener.
+ */
+ public void addLDAPEntryChangedListener(LDAPEntryChangedListener listener)
+ {
+ listeners.add(listener);
+ }
+
+ /**
+ * Removes an LDAP entry change listener.
+ * @param listener the listener.
+ */
+ public void removeLDAPEntryChangedListener(LDAPEntryChangedListener listener)
+ {
+ listeners.remove(listener);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean requiresBorder()
+ {
+ return true;
+ }
+
+ /**
+ * Returns the DN of the entry that the user is editing (it might differ
+ * from the DN of the entry in the tree if the user modified the DN).
+ * @return the DN of the entry that the user is editing.
+ */
+ protected abstract String getDisplayedDN();
+
+ /**
+ * Notifies the entry changed listeners that the entry changed.
+ *
+ */
+ protected void notifyListeners()
+ {
+ if (ignoreEntryChangeEvents)
+ {
+ return;
+ }
+ // TODO: With big entries this is pretty slow. Until there is a fix, try
+ // simply to update the dn
+ Entry entry = null;
+ String dn = getDisplayedDN();
+ if ((dn != null) && !dn.equals(title.getText()))
+ {
+ title.setText(dn);
+ }
+ /*
+ Entry entry;
+ try
+ {
+ entry = getEntry();
+ String dn = entry.getDN().toString();
+ if (!dn.equals(title.getText()))
+ {
+ title.setText(dn);
+ }
+ }
+ catch (OpenDsException de)
+ {
+ entry = null;
+ }
+ catch (Throwable t)
+ {
+ entry = null;
+ LOG.log(Level.WARNING, "Unexpected error: "+t, t);
+ }
+ */
+ LDAPEntryChangedEvent ev = new LDAPEntryChangedEvent(this, entry);
+ for (LDAPEntryChangedListener listener : listeners)
+ {
+ listener.entryChanged(ev);
+ }
+ }
+
+ /**
+ * Updates the title panel with the provided entry.
+ * @param sr the search result.
+ * @param path the path to the node of the entry selected in the tree. Used
+ * to display the same icon as in the tree.
+ */
+ protected void updateTitle(CustomSearchResult sr, TreePath path)
+ {
+ String dn = sr.getDN();
+ if ((dn != null) && (dn.length() > 0))
+ {
+ title.setText(sr.getDN());
+ }
+ else if (path != null)
+ {
+ BasicNode node = (BasicNode)path.getLastPathComponent();
+ title.setText(node.getDisplayName());
+ }
+
+ if (path != null)
+ {
+ BasicNode node = (BasicNode)path.getLastPathComponent();
+ title.setIcon(node.getIcon());
+ }
+ else
+ {
+ title.setIcon(null);
+ }
+
+ Set<Object> ocs =
+ sr.getAttributeValues(ServerConstants.OBJECTCLASS_ATTRIBUTE_TYPE_NAME);
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (!ocs.isEmpty() && (schema != null))
+ {
+ ObjectClassValue ocDesc = getObjectClassDescriptor(ocs, schema);
+ StringBuffer sb = new StringBuffer();
+ sb.append("<html>");
+ if (ocDesc.getStructural() != null)
+ {
+ sb.append(INFO_CTRL_OBJECTCLASS_DESCRIPTOR.get(ocDesc.getStructural()));
+ }
+ if (ocDesc.getAuxiliary().size() > 0)
+ {
+ if (sb.length() > 0)
+ {
+ sb.append("<br>");
+ }
+ sb.append(INFO_CTRL_AUXILIARY_OBJECTCLASS_DESCRIPTOR.get(
+ Utilities.getStringFromCollection(ocDesc.getAuxiliary(), ", ")));
+ }
+ title.setToolTipText(sb.toString());
+ }
+ else
+ {
+ title.setToolTipText(null);
+ }
+ }
+
+ /**
+ * Returns an object class value representing all the object class values of
+ * the entry.
+ * @param ocValues the set of object class values.
+ * @param schema the schema.
+ * @return an object class value representing all the object class values of
+ * the entry.
+ */
+ protected ObjectClassValue getObjectClassDescriptor(Set<Object> ocValues,
+ Schema schema)
+ {
+ ObjectClass structuralObjectClass = null;
+ SortedSet<String> auxiliaryClasses = new TreeSet<String>();
+ for (Object o : ocValues)
+ {
+ ObjectClass objectClass =
+ schema.getObjectClass(((String)o).toLowerCase());
+ if (objectClass != null)
+ {
+ if (objectClass.getObjectClassType() == ObjectClassType.STRUCTURAL)
+ {
+ if (structuralObjectClass == null)
+ {
+ structuralObjectClass = objectClass;
+ }
+ else
+ {
+ if (objectClass.isDescendantOf(structuralObjectClass))
+ {
+ structuralObjectClass = objectClass;
+ }
+ }
+ }
+ else
+ {
+ String name = objectClass.getNameOrOID();
+ if (!name.equals(SchemaConstants.TOP_OBJECTCLASS_NAME))
+ {
+ auxiliaryClasses.add(objectClass.getNameOrOID());
+ }
+ }
+ }
+ }
+ String structural = structuralObjectClass != null ?
+ structuralObjectClass.getNameOrOID() : null;
+ return new ObjectClassValue(structural, auxiliaryClasses);
+ }
+
+ /**
+ * Adds the values in the RDN to the entry definition.
+ * @param entry the entry to be updated.
+ */
+ protected void addValuesInRDN(Entry entry)
+ {
+// Add the values in the RDN if they are not there
+ RDN rdn = entry.getDN().getRDN();
+ for (int i=0; i<rdn.getNumValues(); i++)
+ {
+ String attrName = rdn.getAttributeName(i);
+ AttributeValue value = rdn.getAttributeValue(i);
+ List<org.opends.server.types.Attribute> attrs =
+ entry.getAttribute(attrName.toLowerCase());
+ boolean done = false;
+ if (attrs != null)
+ {
+ for (org.opends.server.types.Attribute attr : attrs)
+ {
+ if (attr.getNameWithOptions().equals(attrName))
+ {
+ ArrayList<AttributeValue> newValues =
+ new ArrayList<AttributeValue>();
+ Iterator<AttributeValue> it = attr.iterator();
+ while (it.hasNext())
+ {
+ newValues.add(it.next());
+ }
+ newValues.add(value);
+ entry.addAttribute(attr, newValues);
+ done = true;
+ break;
+ }
+ }
+ }
+ if (!done)
+ {
+ org.opends.server.types.Attribute attr =
+ Attributes.create(rdn.getAttributeType(i), value);
+ ArrayList<AttributeValue> newValues =
+ new ArrayList<AttributeValue>();
+ newValues.add(value);
+ entry.addAttribute(attr, newValues);
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_EDIT_LDAP_ENTRY_TITLE.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ Schema schema = ev.getNewDescriptor().getSchema();
+ if (schema != null)
+ {
+ schemaReadOnlyAttributes.clear();
+ schemaReadOnlyAttributesLowerCase.clear();
+ for (AttributeType attr : schema.getAttributeTypes().values())
+ {
+ if (attr.isOperational())
+ {
+ String attrName = attr.getNameOrOID();
+ if (!isEditable(attrName, schema))
+ {
+ schemaReadOnlyAttributes.add(attrName);
+ schemaReadOnlyAttributesLowerCase.add(attrName.toLowerCase());
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Appends the LDIF lines corresponding to the different values of an
+ * attribute to the provided StringBuilder.
+ * @param sb the StringBuilder that must be udpated.
+ * @param attrName the attribute name.
+ * @param values the attribute values.
+ */
+ protected void appendLDIFLines(StringBuilder sb, String attrName,
+ Set<Object> values)
+ {
+ for (Object value : values)
+ {
+ appendLDIFLine(sb, attrName, value);
+ }
+ }
+
+ /**
+ * Appends the LDIF line corresponding to the value of an
+ * attribute to the provided StringBuilder.
+ * @param sb the StringBuilder that must be udpated.
+ * @param attrName the attribute name.
+ * @param value the attribute value.
+ */
+ protected void appendLDIFLine(StringBuilder sb, String attrName, Object value)
+ {
+ if (value instanceof ObjectClassValue)
+ {
+ ObjectClassValue ocValue = (ObjectClassValue)value;
+ if (ocValue.getStructural() != null)
+ {
+ sb.append("\n");
+ sb.append(attrName+": "+ocValue.getStructural());
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ if (schema != null)
+ {
+ ObjectClass oc =
+ schema.getObjectClass(ocValue.getStructural().toLowerCase());
+ if (oc != null)
+ {
+ ObjectClass parent = oc.getSuperiorClass();
+ while (parent != null)
+ {
+ sb.append("\n");
+ sb.append(attrName+": "+parent.getNameOrOID());
+ parent = parent.getSuperiorClass();
+ }
+ }
+ }
+ }
+ for (String v : ocValue.getAuxiliary())
+ {
+ sb.append("\n");
+ sb.append(attrName+": "+v);
+ }
+ }
+ else if (value instanceof byte[])
+ {
+ if (((byte[])value).length > 0)
+ {
+ sb.append("\n");
+ sb.append(attrName+":: "+Base64.encode((byte[])value));
+ }
+ }
+ else if (value instanceof BinaryValue)
+ {
+ sb.append("\n");
+ sb.append(attrName+":: "+((BinaryValue)value).getBase64());
+ }
+ else
+ {
+ if (String.valueOf(value).trim().length() > 0)
+ {
+ sb.append("\n");
+ sb.append(attrName+": "+value);
+ }
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided attribute name has binary syntax
+ * and <CODE>false</CODE> otherwise.
+ * @param attrName the attribute name.
+ * @return <CODE>true</CODE> if the provided attribute name has binary syntax
+ * and <CODE>false</CODE> otherwise.
+ */
+ protected boolean isBinary(String attrName)
+ {
+ boolean isBinary = false;
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ isBinary = Utilities.hasBinarySyntax(attrName, schema);
+ return isBinary;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided attribute name has password
+ * syntax and <CODE>false</CODE> otherwise.
+ * @param attrName the attribute name.
+ * @return <CODE>true</CODE> if the provided attribute name has password
+ * syntax and <CODE>false</CODE> otherwise.
+ */
+ protected boolean isPassword(String attrName)
+ {
+ boolean isBinary = false;
+ Schema schema = getInfo().getServerDescriptor().getSchema();
+ isBinary = Utilities.hasPasswordSyntax(attrName, schema);
+ return isBinary;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided attribute name has certificate
+ * syntax and <CODE>false</CODE> otherwise.
+ * @param attrName the attribute name.
+ * @param schema the schema.
+ * @return <CODE>true</CODE> if the provided attribute name has certificate
+ * syntax and <CODE>false</CODE> otherwise.
+ */
+ protected boolean hasCertificateSyntax(String attrName, Schema schema)
+ {
+ boolean isCertificate = false;
+ // Check all the attributes that we consider binaries.
+ if (schema != null)
+ {
+ AttributeType attr = schema.getAttributeType(
+ Utilities.getAttributeNameWithoutOptions(attrName).toLowerCase());
+ if (attr != null)
+ {
+ AttributeSyntax syntax = attr.getSyntax();
+ if (syntax != null)
+ {
+ isCertificate = syntax.getOID().equals(
+ SchemaConstants.SYNTAX_CERTIFICATE_OID);
+ }
+ }
+ }
+ return isCertificate;
+ }
+
+ static String[] editableOperationalAttrNames = {
+ ConfigConstants.ATTR_OBJECTCLASSES,
+ ConfigConstants.ATTR_ATTRIBUTE_TYPES,
+ ConfigConstants.ATTR_MATCHING_RULES,
+ ConfigConstants.ATTR_NAME_FORMS,
+ ConfigConstants.ATTR_LDAP_SYNTAXES,
+ ConfigConstants.ATTR_DIT_STRUCTURE_RULES,
+ "aci"
+ };
+
+ /**
+ * Returns <CODE>true</CODE> if the provided attribute name is an editable
+ * operational attribute and <CODE>false</CODE> otherwise.
+ * @param attrName the attribute name.
+ * @return <CODE>true</CODE> if the provided attribute name is an editable
+ * operational attribute and <CODE>false</CODE> otherwise.
+ */
+ private static boolean isEditableOperationalAttribute(String attrName)
+ {
+ boolean isEditableOperationalAttribute = false;
+ for (String attr : editableOperationalAttrNames)
+ {
+ if (attr.equalsIgnoreCase(attrName))
+ {
+ isEditableOperationalAttribute = true;
+ break;
+ }
+ }
+ return isEditableOperationalAttribute;
+ }
+
+ /**
+ * Gets the values associated with a given attribute. The values are the
+ * ones displayed in the panel.
+ * @param attrName the attribute name.
+ * @return the values associated with a given attribute.
+ */
+ protected abstract Set<Object> getValues(String attrName);
+
+ /**
+ * Sets the values displayed in the panel for a given attribute in the
+ * provided search result.
+ * @param sr the search result to be updated.
+ * @param attrName the attribute name.
+ */
+ protected void setValues(CustomSearchResult sr, String attrName)
+ {
+ Set<Object> values = getValues(attrName);
+ Set<Object> valuesToSet = new LinkedHashSet<Object>();
+ for (Object value : values)
+ {
+ if (value instanceof ObjectClassValue)
+ {
+ ObjectClassValue ocValue = (ObjectClassValue)value;
+ if (ocValue.getStructural() != null)
+ {
+ valuesToSet.add(ocValue.getStructural());
+ }
+ valuesToSet.addAll(ocValue.getAuxiliary());
+ }
+ else if (value instanceof byte[])
+ {
+ valuesToSet.add(value);
+ }
+ else if (value instanceof BinaryValue)
+ {
+ try
+ {
+ valuesToSet.add(((BinaryValue)value).getBytes());
+ }
+ catch (ParseException pe)
+ {
+ throw new IllegalStateException("Unexpected error: "+pe, pe);
+ }
+ }
+ else
+ {
+ if (String.valueOf(value).trim().length() > 0)
+ {
+ valuesToSet.add(String.valueOf(value));
+ }
+ }
+ }
+ if (valuesToSet.size() > 0)
+ {
+ sr.set(attrName, valuesToSet);
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided attribute name is an editable
+ * attribute and <CODE>false</CODE> otherwise.
+ * @param attrName the attribute name.
+ * @param schema the schema.
+ * @return <CODE>true</CODE> if the provided attribute name is an editable
+ * attribute and <CODE>false</CODE> otherwise.
+ */
+ public static boolean isEditable(String attrName, Schema schema)
+ {
+ boolean isOperational = false;
+ attrName = Utilities.getAttributeNameWithoutOptions(attrName);
+ AttributeType attrType = schema.getAttributeType(attrName.toLowerCase());
+ if (attrType != null)
+ {
+ isOperational = attrType.isOperational();
+ }
+ return !isOperational || isEditableOperationalAttribute(attrName);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
new file mode 100644
index 0000000..9bd1032
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
@@ -0,0 +1,411 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.task.Task;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.server.tools.ConfigureWindowsService;
+
+/**
+ * The panel that displays the Windows Service panel configuration for the
+ * server.
+ *
+ */
+public class WindowsServicePanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 6415350296295459469L;
+ private JLabel lState;
+ private JButton bEnable;
+ private JButton bDisable;
+
+ private boolean isWindowsServiceEnabled;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public WindowsServicePanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return INFO_CTRL_PANEL_WINDOWS_SERVICE_TITLE.get();
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 0.0;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 4;
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+
+ String text = INFO_CTRL_PANEL_WINDOWS_SERVICE_PANEL_TEXT.get().toString();
+
+ JEditorPane pane = Utilities.makeHtmlPane(text,
+ ColorAndFontConstants.defaultFont);
+
+ Utilities.updatePreferredSize(pane, 100, text,
+ ColorAndFontConstants.defaultFont, false);
+ gbc.weighty = 0.0;
+ add(pane, gbc);
+
+ gbc.gridy = 1;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ JLabel lWindowsService =Utilities.createPrimaryLabel(
+ INFO_CTRL_PANEL_WINDOWS_SERVICE_INTEGRATION_LABEL.get());
+ gbc.insets.top = 10;
+ add(lWindowsService, gbc);
+ lState = Utilities.createDefaultLabel();
+ lState.setText(isWindowsServiceEnabled ?
+ INFO_ENABLED_LABEL.get().toString() :
+ INFO_DISABLED_LABEL.get().toString());
+ gbc.insets.left = 10;
+ gbc.gridx = 1;
+ add(lState, gbc);
+
+ bEnable = Utilities.createButton(
+ INFO_CTRL_PANEL_ENABLE_WINDOWS_SERVICE_BUTTON.get());
+ bDisable = Utilities.createButton(
+ INFO_CTRL_PANEL_DISABLE_WINDOWS_SERVICE_BUTTON.get());
+ bEnable.setOpaque(false);
+ bDisable.setOpaque(false);
+ int maxWidth = Math.max(bEnable.getPreferredSize().width,
+ bDisable.getPreferredSize().width);
+ int maxHeight = Math.max(bEnable.getPreferredSize().height,
+ bDisable.getPreferredSize().height);
+ bEnable.setPreferredSize(new Dimension(maxWidth, maxHeight));
+ bDisable.setPreferredSize(new Dimension(maxWidth, maxHeight));
+
+ ActionListener listener = new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ updateWindowsService();
+ }
+ };
+ bEnable.addActionListener(listener);
+ bDisable.addActionListener(listener);
+
+ gbc.gridx = 2;
+ add(bEnable, gbc);
+ add(bDisable, gbc);
+
+ gbc.weightx = 1.0;
+ gbc.gridx = 3;
+ add(Box.createHorizontalGlue(), gbc);
+
+ bEnable.setVisible(!isWindowsServiceEnabled);
+ bDisable.setVisible(isWindowsServiceEnabled);
+ addBottomGlue(gbc);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.CLOSE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ if (!isWindowsServiceEnabled)
+ {
+ return bEnable;
+ }
+ else
+ {
+ return bDisable;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ boolean previousValue = isWindowsServiceEnabled;
+ isWindowsServiceEnabled = ev.getNewDescriptor().isWindowsServiceEnabled();
+ if (isWindowsServiceEnabled != previousValue)
+ {
+ lState.setText(isWindowsServiceEnabled ?
+ INFO_ENABLED_LABEL.get().toString() :
+ INFO_DISABLED_LABEL.get().toString());
+ bEnable.setVisible(!isWindowsServiceEnabled);
+ bDisable.setVisible(isWindowsServiceEnabled);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ // NO ok button
+ }
+
+ private void updateWindowsService()
+ {
+ LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+ ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.getParentDialog(this), getTitle(), getInfo());
+ WindowsServiceTask newTask = new WindowsServiceTask(getInfo(),
+ progressDialog, !isWindowsServiceEnabled);
+ for (Task task : getInfo().getTasks())
+ {
+ task.canLaunch(newTask, errors);
+ }
+ if (errors.isEmpty())
+ {
+ if (isWindowsServiceEnabled)
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_DISABLING_WINDOWS_SERVICE_SUMMARY.get(),
+ INFO_CTRL_PANEL_DISABLING_WINDOWS_SERVICE_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_DISABLING_WINDOWS_SERVICE_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_DISABLING_WINDOWS_SERVICE_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_DISABLING_WINDOWS_SERVICE_ERROR_DETAILS,
+ progressDialog);
+ }
+ else
+ {
+ launchOperation(newTask,
+ INFO_CTRL_PANEL_ENABLING_WINDOWS_SERVICE_SUMMARY.get(),
+ INFO_CTRL_PANEL_ENABLING_WINDOWS_SERVICE_SUCCESSFUL_SUMMARY.get(),
+ INFO_CTRL_PANEL_ENABLING_WINDOWS_SERVICE_SUCCESSFUL_DETAILS.get(),
+ ERR_CTRL_PANEL_ENABLING_WINDOWS_SERVICE_ERROR_SUMMARY.get(),
+ null,
+ ERR_CTRL_PANEL_ENABLING_WINDOWS_SERVICE_ERROR_DETAILS,
+ progressDialog);
+ }
+ progressDialog.setVisible(true);
+ }
+ else
+ {
+ displayErrorDialog(errors);
+ }
+ }
+
+ /**
+ * The task in charge of updating the windows service configuration.
+ *
+ */
+ protected class WindowsServiceTask extends Task
+ {
+ Set<String> backendSet;
+ private boolean enableService;
+ /**
+ * The constructor of the task.
+ * @param info the control panel info.
+ * @param dlg the progress dialog that shows the progress of the task.
+ * @param enableService whether the windows service must be enabled or
+ * disabled.
+ */
+ public WindowsServiceTask(ControlPanelInfo info, ProgressDialog dlg,
+ boolean enableService)
+ {
+ super(info, dlg);
+ this.enableService = enableService;
+ backendSet = new HashSet<String>();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Type getType()
+ {
+ if (enableService)
+ {
+ return Type.ENABLE_WINDOWS_SERVICE;
+ }
+ else
+ {
+ return Type.DISABLE_WINDOWS_SERVICE;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTaskDescription()
+ {
+ if (enableService)
+ {
+ return INFO_CTRL_PANEL_ENABLE_WINDOWS_SERVICE_TASK_DESCRIPTION.get();
+ }
+ else
+ {
+ return INFO_CTRL_PANEL_DISABLE_WINDOWS_SERVICE_TASK_DESCRIPTION.get();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canLaunch(Task taskToBeLaunched,
+ Collection<Message> incompatibilityReasons)
+ {
+ boolean canLaunch = true;
+ if (state == State.RUNNING)
+ {
+ if ((taskToBeLaunched.getType() == Type.ENABLE_WINDOWS_SERVICE) ||
+ (taskToBeLaunched.getType() == Type.DISABLE_WINDOWS_SERVICE))
+ {
+ incompatibilityReasons.add(getIncompatibilityMessage(this,
+ taskToBeLaunched));
+ canLaunch = false;
+ }
+ }
+ return canLaunch;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void runTask()
+ {
+ state = State.RUNNING;
+ lastException = null;
+ try
+ {
+ if (enableService)
+ {
+ returnCode = ConfigureWindowsService.enableService(outPrintStream,
+ errorPrintStream);
+ if ((returnCode != ConfigureWindowsService.SERVICE_ALREADY_ENABLED) &&
+ (returnCode != ConfigureWindowsService.SERVICE_ENABLE_SUCCESS))
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ else
+ {
+ returnCode = ConfigureWindowsService.disableService(outPrintStream,
+ errorPrintStream);
+ if ((returnCode != ConfigureWindowsService.SERVICE_ALREADY_DISABLED)
+ &&
+ (returnCode != ConfigureWindowsService.SERVICE_DISABLE_SUCCESS))
+ {
+ state = State.FINISHED_WITH_ERROR;
+ }
+ else
+ {
+ state = State.FINISHED_SUCCESSFULLY;
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ state = State.FINISHED_WITH_ERROR;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getBackends()
+ {
+ return backendSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ArrayList<String> getCommandLineArguments()
+ {
+ ArrayList<String> args = new ArrayList<String>();
+
+ if (enableService)
+ {
+ args.add("--enableService");
+ }
+ else
+ {
+ args.add("--disableService");
+ }
+
+ return args;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getCommandLinePath()
+ {
+ return getCommandLinePath("windows-service");
+ }
+ };
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
new file mode 100644
index 0000000..f39e339
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
@@ -0,0 +1,83 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.border;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Insets;
+
+import javax.swing.border.Border;
+
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+
+/**
+ * The border specific to the accordion element.
+ *
+ */
+public class AccordionElementBorder implements Border
+{
+ private Insets insets = new Insets(1, 1, 1, 1);
+
+ /**
+ * Default constructor.
+ *
+ */
+ public AccordionElementBorder() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Insets getBorderInsets(Component c) {
+ return insets;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBorderOpaque() {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void paintBorder(Component c, Graphics g, int x, int y, int width,
+ int height) {
+ g.setColor(ColorAndFontConstants.topAccordionBorderColor);
+ // render highlight at top
+ g.drawLine(x, y, x + width - 1, y);
+ // render left
+ g.drawLine(x, y, x, y + height - 1);
+ // render right
+ g.drawLine(x + width - 1, y, x + width - 1, y + height - 1);
+ // render shadow on bottom
+ g.setColor(ColorAndFontConstants.defaultBorderColor);
+ g.drawLine(x, y + height - 1, x + width - 1, y + height - 1);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
new file mode 100644
index 0000000..a0d0f41
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
@@ -0,0 +1,79 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.border;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Insets;
+
+import javax.swing.border.Border;
+
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+
+/**
+ * The border of the CategoryButton when is selected.
+ *
+ */
+public class SelectedCategoryBorder implements Border
+{
+ private Insets insets = new Insets(5, 5, 6, 5);
+
+ /**
+ * Default constructor.
+ *
+ */
+ public SelectedCategoryBorder() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Insets getBorderInsets(Component c)
+ {
+ return insets;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBorderOpaque()
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void paintBorder(Component c, Graphics g, int x, int y, int width,
+ int height)
+ {
+ // render shadow on bottom
+ g.setColor(ColorAndFontConstants.defaultBorderColor);
+ g.drawLine(x, y + height - 1, x + width - 1, y + height - 1);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/package-info.java
new file mode 100644
index 0000000..9f36599
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/border/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Contains some specific borders used in the Control Panel.
+ *
+ */
+package org.opends.guitools.controlpanel.ui.border;
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/ActionButton.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/ActionButton.java
new file mode 100644
index 0000000..c506884
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/ActionButton.java
@@ -0,0 +1,231 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+
+import org.opends.guitools.controlpanel.datamodel.Action;
+import org.opends.guitools.controlpanel.datamodel.Category;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.messages.Message;
+
+/**
+ * A basic extension of a button that changes its rendering so that the looks
+ * are more similar to a row in a list. It is used in the actions on the left
+ * of the main Control Center dialog (in actions like 'Manage Entries...',
+ * 'Import from LDIF...' etc.
+ *
+ */
+public class ActionButton extends JButton
+{
+ private static final long serialVersionUID = -1898192406268037714L;
+
+ private Action action;
+ private boolean isBeingPressed;
+ private boolean hasMouseOver;
+ private static Border buttonBorder;
+ private static Border focusBorder;
+ static
+ {
+ //Calculate border based on category settings
+ Category cat = new Category();
+ cat.setName(Message.EMPTY);
+ CategoryButton b = new CategoryButton(cat);
+ int n = b.getIconTextGap() + b.getIcon().getIconWidth() +
+ b.getBorder().getBorderInsets(b).left;
+ buttonBorder = new EmptyBorder(5, n, 5, 25);
+ focusBorder = BorderFactory.createCompoundBorder(
+ UIManager.getBorder("List.focusCellHighlightBorder"), buttonBorder);
+ };
+
+ private static final Color defaultBackground =
+ ColorAndFontConstants.background;
+
+ private static final Color defaultForeground =
+ ColorAndFontConstants.foreground;
+
+ private static final Color mouseOverBackground =
+ ColorAndFontConstants.mouseOverBackground;
+
+ private static final Color mouseOverForeground =
+ ColorAndFontConstants.mouseOverForeground;
+
+ private static final Color pressedBackground =
+ ColorAndFontConstants.pressedBackground;
+
+ private static final Color pressedForeground =
+ ColorAndFontConstants.pressedForeground;
+
+ static final Font actionFont = ColorAndFontConstants.defaultFont;
+
+
+ /**
+ * Creates a button associated with the provided action.
+ * @param action the action.
+ */
+ public ActionButton(Action action) {
+ super();
+ this.action = action;
+ setText(action.getName().toString());
+ setIconTextGap(0);
+ setHorizontalTextPosition(SwingConstants.TRAILING);
+ setHorizontalAlignment(SwingConstants.LEADING);
+ setOpaque(true);
+
+ setBorder(buttonBorder);
+ setFont(actionFont);
+
+ setFocusPainted(true);
+ setContentAreaFilled(false);
+ setToolTipText(action.getName().toString());
+ setRolloverEnabled(false);
+
+ Dimension d1 = getPreferredSize();
+ setBorder(focusBorder);
+ Dimension d2 = getPreferredSize();
+ setPreferredSize(new Dimension(Math.max(d1.width,d2.width),
+ Math.max(d1.height, d2.height)));
+ setBorder(buttonBorder);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ isBeingPressed = true;
+ final boolean[] hadMouseOver = {hasMouseOver};
+ hasMouseOver = true;
+ repaint();
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ isBeingPressed = false;
+ hasMouseOver = hadMouseOver[0];
+ repaint();
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mousePressed(MouseEvent e)
+ {
+ isBeingPressed = true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseReleased(MouseEvent e)
+ {
+ isBeingPressed = false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseExited(MouseEvent e)
+ {
+ hasMouseOver = false;
+ repaint();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseEntered(MouseEvent e)
+ {
+ hasMouseOver = true;
+ repaint();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void updateUI() {
+ super.updateUI();
+ // some look and feels replace our border, so take it back
+ setBorder(buttonBorder);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void paintComponent(Graphics g) {
+ setBorder(hasFocus() ? focusBorder : buttonBorder);
+ if (isBeingPressed && hasMouseOver)
+ {
+ setBackground(pressedBackground);
+ g.setColor(pressedBackground);
+ Dimension size = getSize();
+ g.fillRect(0, 0, size.width, size.height);
+ setForeground(pressedForeground);
+ }
+ else if (hasMouseOver)
+ {
+ setBackground(mouseOverBackground);
+ g.setColor(mouseOverBackground);
+ Dimension size = getSize();
+ g.fillRect(0, 0, size.width, size.height);
+ setForeground(mouseOverForeground);
+ }
+ else {
+ setBackground(defaultBackground);
+ g.setColor(defaultBackground);
+ Dimension size = getSize();
+ g.fillRect(0, 0, size.width, size.height);
+ setForeground(defaultForeground);
+ }
+ super.paintComponent(g);
+ }
+
+ /**
+ * Returns the action associated with this button.
+ * @return the action associated with this button.
+ */
+ public Action getActionObject() {
+ return action;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
new file mode 100644
index 0000000..bfbe8f7
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
@@ -0,0 +1,471 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.opends.guitools.controlpanel.datamodel.SortableListModel;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * This component displays two list (available list and selected list) with
+ * some buttons to move the components of one list to the other.
+ *
+ * @param <T> the type of the objects in the list.
+ */
+public class AddRemovePanel<T> extends JPanel
+{
+ private static final long serialVersionUID = 461800576153651284L;
+ private SortableListModel<T> availableListModel;
+ private SortableListModel<T> selectedListModel;
+ private JLabel selectedLabel;
+ private JLabel availableLabel;
+ private JButton add;
+ private JButton remove;
+ private JButton addAll;
+ private JButton removeAll;
+ private JScrollPane availableScroll;
+ private JScrollPane selectedScroll;
+ private JList availableList;
+ private JList selectedList;
+ private Class<T> theClass;
+
+ /**
+ * Mask used as display option. If the provided display options contain
+ * this mask, the panel will display the remove all button.
+ */
+ public static final int DISPLAY_REMOVE_ALL = 0x001;
+
+ /**
+ * Mask used as display option. If the provided display options contain
+ * this mask, the panel will display the add all button.
+ */
+ public static final int DISPLAY_ADD_ALL = 0x010;
+
+
+ /**
+ * Constructor of the default add remove panel (including 'Add All' and
+ * 'Remove All' buttons).
+ * The class is required to avoid warnings in compilation.
+ * @param theClass the class of the objects in the panel.
+ */
+ public AddRemovePanel(Class<T> theClass)
+ {
+ this(DISPLAY_REMOVE_ALL | DISPLAY_ADD_ALL, theClass);
+ }
+
+ /**
+ * Constructor of the add remove panel allowing the user to provide some
+ * display options.
+ * The class is required to avoid warnings in compilation.
+ * @param displayOptions the display options.
+ * @param theClass the class of the objects in the panel.
+ */
+ public AddRemovePanel(int displayOptions, Class<T> theClass)
+ {
+ super(new GridBagLayout());
+ setOpaque(false);
+ this.theClass = theClass;
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.gridwidth = 1;
+ gbc.gridheight = 1;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.WEST;
+
+ availableLabel = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_AVAILABLE_LABEL.get());
+ add(availableLabel, gbc);
+ gbc.gridx = 2;
+ selectedLabel = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_SELECTED_LABEL.get());
+ add(selectedLabel, gbc);
+ gbc.gridy ++;
+
+ ListDataListener listDataListener = new ListDataListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void intervalRemoved(ListDataEvent ev)
+ {
+ updateButtonEnabling();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void intervalAdded(ListDataEvent ev)
+ {
+ updateButtonEnabling();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void contentsChanged(ListDataEvent ev)
+ {
+ updateButtonEnabling();
+ }
+ };
+ MouseAdapter doubleClickListener = new MouseAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseClicked(MouseEvent e) {
+ if (isEnabled() && (e.getClickCount() == 2))
+ {
+ if (e.getSource() == availableList)
+ {
+ if (availableList.getSelectedValue() != null)
+ {
+ addClicked();
+ }
+ }
+ else if (e.getSource() == selectedList)
+ {
+ if (selectedList.getSelectedValue() != null)
+ {
+ removeClicked();
+ }
+ }
+ }
+ }
+ };
+
+
+ availableListModel = new SortableListModel<T>();
+ availableListModel.addListDataListener(listDataListener);
+ availableList = new JList();
+ availableList.setModel(availableListModel);
+ availableList.setVisibleRowCount(15);
+ availableList.addMouseListener(doubleClickListener);
+
+ selectedListModel = new SortableListModel<T>();
+ selectedListModel.addListDataListener(listDataListener);
+ selectedList = new JList();
+ selectedList.setModel(selectedListModel);
+ selectedList.setVisibleRowCount(15);
+ selectedList.addMouseListener(doubleClickListener);
+
+ gbc.weighty = 1.0;
+ gbc.weightx = 1.0;
+ gbc.gridheight = 3;
+ if ((displayOptions &= DISPLAY_ADD_ALL) != 0)
+ {
+ gbc.gridheight ++;
+ }
+ if ((displayOptions &= DISPLAY_REMOVE_ALL) != 0)
+ {
+ gbc.gridheight ++;
+ }
+ int listGridHeight = gbc.gridheight;
+ int listGridY = gbc.gridy;
+ gbc.gridx = 0;
+ gbc.insets.top = 5;
+ availableScroll = Utilities.createScrollPane(availableList);
+ gbc.fill = GridBagConstraints.BOTH;
+ add(availableScroll, gbc);
+
+ gbc.gridx = 1;
+ gbc.gridheight = 1;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add = Utilities.createButton(INFO_CTRL_PANEL_ADDREMOVE_ADD_BUTTON.get());
+ add.setOpaque(false);
+ add.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ addClicked();
+ }
+ });
+ gbc.insets = new Insets(5, 5, 0, 5);
+ add(add, gbc);
+
+ if ((displayOptions &= DISPLAY_ADD_ALL) != 0)
+ {
+ addAll = Utilities.createButton(
+ INFO_CTRL_PANEL_ADDREMOVE_ADD_ALL_BUTTON.get());
+ addAll.setOpaque(false);
+ addAll.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ selectedListModel.addAll(availableListModel.getData());
+ availableListModel.clear();
+ selectedListModel.fireContentsChanged(selectedListModel, 0,
+ selectedListModel.getSize());
+ availableListModel.fireContentsChanged(availableListModel, 0,
+ availableListModel.getSize());
+ }
+ });
+ gbc.gridy ++;
+ add(addAll, gbc);
+ }
+
+ remove = Utilities.createButton(
+ INFO_CTRL_PANEL_ADDREMOVE_REMOVE_BUTTON.get());
+ remove.setOpaque(false);
+ remove.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ removeClicked();
+ }
+ });
+ gbc.gridy ++;
+ gbc.insets.top = 10;
+ add(remove, gbc);
+
+ if ((displayOptions &= DISPLAY_REMOVE_ALL) != 0)
+ {
+ removeAll = Utilities.createButton(
+ INFO_CTRL_PANEL_ADDREMOVE_REMOVE_ALL_BUTTON.get());
+ removeAll.setOpaque(false);
+ removeAll.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ availableListModel.addAll(selectedListModel.getData());
+ selectedListModel.clear();
+ selectedListModel.fireContentsChanged(selectedListModel, 0,
+ selectedListModel.getSize());
+ availableListModel.fireContentsChanged(availableListModel, 0,
+ availableListModel.getSize());
+ }
+ });
+ gbc.gridy ++;
+ gbc.insets.top = 5;
+ add(removeAll, gbc);
+ }
+
+
+ gbc.weighty = 1.0;
+ gbc.insets = new Insets(0, 0, 0, 0);
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ add(Box.createVerticalGlue(), gbc);
+
+ gbc.weightx = 1.0;
+ gbc.insets = new Insets(5, 0, 0, 0);
+ gbc.gridheight = listGridHeight;
+ gbc.gridy = listGridY;
+ gbc.gridx = 2;
+ gbc.fill = GridBagConstraints.BOTH;
+ selectedScroll = Utilities.createScrollPane(selectedList);
+ add(selectedScroll, gbc);
+
+ selectedList.getSelectionModel().setSelectionMode(
+ ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ ListSelectionListener listener = new ListSelectionListener()
+ {
+ public void valueChanged(ListSelectionEvent ev)
+ {
+ updateButtonEnabling();
+ }
+ };
+ selectedList.getSelectionModel().addListSelectionListener(listener);
+ availableList.getSelectionModel().setSelectionMode(
+ ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ availableList.getSelectionModel().addListSelectionListener(listener);
+
+ add.setEnabled(false);
+ remove.setEnabled(false);
+
+ // Set preferred size for the scroll panes.
+ Component comp =
+ availableList.getCellRenderer().getListCellRendererComponent(
+ availableList,
+ "The cell that we want to display", 0, true, true);
+ Dimension d = new Dimension(comp.getPreferredSize().width,
+ availableScroll.getPreferredSize().height);
+ availableScroll.setPreferredSize(d);
+ selectedScroll.setPreferredSize(d);
+ }
+
+ /**
+ * Enables the state of the components in the panel.
+ * @param enable whether to enable the components in the panel or not.
+ */
+ public void setEnabled(boolean enable)
+ {
+ super.setEnabled(enable);
+
+ selectedLabel.setEnabled(enable);
+ availableLabel.setEnabled(enable);
+ availableList.setEnabled(enable);
+ selectedList.setEnabled(enable);
+ availableScroll.setEnabled(enable);
+ selectedScroll.setEnabled(enable);
+
+ updateButtonEnabling();
+ }
+
+ /**
+ * Returns the available label contained in the panel.
+ * @return the available label contained in the panel.
+ */
+ public JLabel getAvailableLabel()
+ {
+ return availableLabel;
+ }
+
+ /**
+ * Returns the list of elements in the available list.
+ * @return the list of elements in the available list.
+ */
+ public SortableListModel<T> getAvailableListModel()
+ {
+ return availableListModel;
+ }
+
+ /**
+ * Returns the selected label contained in the panel.
+ * @return the selected label contained in the panel.
+ */
+ public JLabel getSelectedLabel()
+ {
+ return selectedLabel;
+ }
+
+ /**
+ * Returns the list of elements in the selected list.
+ * @return the list of elements in the selected list.
+ */
+ public SortableListModel<T> getSelectedListModel()
+ {
+ return selectedListModel;
+ }
+
+ private void updateButtonEnabling()
+ {
+ int index = availableList.getSelectedIndex();
+ add.setEnabled((index != -1) &&
+ (index <availableListModel.getSize()) && isEnabled());
+ index = selectedList.getSelectedIndex();
+ remove.setEnabled((index != -1) &&
+ (index <selectedListModel.getSize()) && isEnabled());
+
+ if (addAll != null)
+ {
+ addAll.setEnabled((availableListModel.getSize() > 0) && isEnabled());
+ }
+ if (removeAll != null)
+ {
+ removeAll.setEnabled((selectedListModel.getSize() > 0) && isEnabled());
+ }
+ }
+
+ /**
+ * Returns the available list.
+ * @return the available list.
+ */
+ public JList getAvailableList()
+ {
+ return availableList;
+ }
+
+ /**
+ * Returns the selected list.
+ * @return the selected list.
+ */
+ public JList getSelectedList()
+ {
+ return selectedList;
+ }
+
+ private void addClicked()
+ {
+ Object[] selectedObjects = availableList.getSelectedValues();
+ for (int i=0; i<selectedObjects.length; i++)
+ {
+ T value = AddRemovePanel.this.theClass.cast(selectedObjects[i]);
+ selectedListModel.add(value);
+ availableListModel.remove(value);
+ }
+ selectedListModel.fireContentsChanged(selectedListModel, 0,
+ selectedListModel.getSize());
+ availableListModel.fireContentsChanged(availableListModel, 0,
+ availableListModel.getSize());
+ }
+
+ private void removeClicked()
+ {
+ Object[] selectedObjects = selectedList.getSelectedValues();
+ for (int i=0; i<selectedObjects.length; i++)
+ {
+ T value = AddRemovePanel.this.theClass.cast(selectedObjects[i]);
+ availableListModel.add(value);
+ selectedListModel.remove(value);
+ }
+ selectedListModel.fireContentsChanged(selectedListModel, 0,
+ selectedListModel.getSize());
+ availableListModel.fireContentsChanged(availableListModel, 0,
+ availableListModel.getSize());
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/BasicExpander.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/BasicExpander.java
new file mode 100644
index 0000000..64a4d92
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/BasicExpander.java
@@ -0,0 +1,65 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import javax.swing.JCheckBox;
+import javax.swing.SwingConstants;
+
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * A component that acts as a checkbox but uses some customized buttons to
+ * indicate the selected and unselected states. This component is used in the
+ * 'Import LDIF' and 'Export LDIF' panels to hide parts of the dialog.
+ *
+ */
+public class BasicExpander extends JCheckBox
+{
+ private static final long serialVersionUID = 2997408236059683190L;
+
+ /**
+ * Constructor of the BasicExpander.
+ * @param text the text to be displayed in the label of the BasicExpander.
+ */
+ public BasicExpander(Message text)
+ {
+ super(text.toString());
+ setHorizontalTextPosition(SwingConstants.TRAILING);
+ setHorizontalAlignment(SwingConstants.LEADING);
+ setFocusPainted(true);
+ setOpaque(false);
+ setSelectedIcon(
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+"/downarrow.png"));
+ setIcon(Utilities.createImageIcon(IconPool.IMAGE_PATH+"/rightarrow.png"));
+ setFont(ColorAndFontConstants.expanderFont);
+ setForeground(ColorAndFontConstants.expanderForeground);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
new file mode 100644
index 0000000..782b5e2
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
@@ -0,0 +1,375 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+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 javax.swing.Box;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.datamodel.BinaryValue;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * A simple panel used in the LDAP entry viewers to display a binary value.
+ * It does not allow to edit the binary value. It is used for instance in the
+ * tables.
+ *
+ */
+public class BinaryCellPanel extends JPanel
+{
+ private static final long serialVersionUID = 6607973945986559802L;
+ private JButton iconButton;
+ private JLabel label;
+ private CellEditorButton editButton;
+ private CellEditorButton deleteButton;
+ private boolean displayDelete;
+ private JLabel lockLabel = Utilities.createDefaultLabel();
+
+ private ImageIcon lockIcon =
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+"/field-locked.png");
+
+ private Object value;
+
+ private final static int THUMBNAIL_HEIGHT = 50;
+
+ private static final Logger LOG =
+ Logger.getLogger(BinaryCellPanel.class.getName());
+
+ /**
+ * Default constructor.
+ *
+ */
+ public BinaryCellPanel()
+ {
+ super(new GridBagLayout());
+ setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ iconButton = Utilities.createButton(Message.EMPTY);
+ label = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NO_VALUE_SPECIFIED.get());
+ add(iconButton);
+ iconButton.setVisible(false);
+ gbc.weightx = 1.0;
+ gbc.gridx ++;
+ add(label, gbc);
+ add(Box.createHorizontalGlue(), gbc);
+ gbc.gridx ++;
+ editButton = new CellEditorButton(INFO_CTRL_PANEL_EDIT_BUTTON_LABEL.get());
+ editButton.setForeground(ColorAndFontConstants.buttonForeground);
+ editButton.setOpaque(false);
+ gbc.insets.left = 5;
+ gbc.weightx = 0.0;
+ add(editButton, gbc);
+
+ gbc.gridx ++;
+ deleteButton =
+ new CellEditorButton(INFO_CTRL_PANEL_DELETE_BUTTON_LABEL.get());
+ deleteButton.setForeground(ColorAndFontConstants.buttonForeground);
+ deleteButton.setOpaque(false);
+ deleteButton.setVisible(isDisplayDelete());
+ add(deleteButton, gbc);
+
+ gbc.insets.left = 5;
+ gbc.gridx ++;
+ add(lockLabel, gbc);
+ lockLabel.setVisible(false);
+ }
+
+ /**
+ * Returns the message describing the provided array of bytes.
+ * @param value the array of bytes.
+ * @param isImage whether the array of bytes represents an image or not.
+ * @return the message describing the provided array of bytes.
+ */
+ public Message getString(byte[] value, boolean isImage)
+ {
+ if (value == null)
+ {
+ return INFO_CTRL_PANEL_NO_VALUE_SPECIFIED.get();
+ }
+ else if (isImage)
+ {
+ return Message.EMPTY;
+ }
+ else
+ {
+ return INFO_CTRL_PANEL_BINARY_VALUE.get();
+ }
+ }
+
+ /**
+ * Updates the visibility of the lock icon.
+ * @param visible whether the lock icon is visible or not.
+ */
+ public void setLockIconVisible(boolean visible)
+ {
+ if (visible)
+ {
+ lockLabel.setIcon(lockIcon);
+ lockLabel.setVisible(true);
+ }
+ else
+ {
+ lockLabel.setIcon(null);
+ lockLabel.setVisible(false);
+ }
+ }
+
+ /**
+ * Sets the text of the edit button (for instance if this panel is displaying
+ * a read-only value, the user might set a value of 'View...' that launches
+ * a viewer).
+ * @param text the text of the button.
+ */
+ public void setEditButtonText(Message text)
+ {
+ editButton.setText(text.toString());
+ }
+
+ /**
+ * Returns the message describing the provided binary value.
+ * @param value the binary value.
+ * @param isImage whether the binary value represents an image or not.
+ * @return the message describing the provided binary value.
+ */
+ public Message getMessage(BinaryValue value, boolean isImage)
+ {
+ Message returnValue;
+ if (value == null)
+ {
+ returnValue = INFO_CTRL_PANEL_NO_VALUE_SPECIFIED.get();
+ }
+ else if (isImage)
+ {
+ returnValue = Message.EMPTY;
+ }
+ else if (value.getType() == BinaryValue.Type.BASE64_STRING)
+ {
+ returnValue = INFO_CTRL_PANEL_BINARY_VALUE.get();
+ }
+ else
+ {
+ returnValue = INFO_CTRL_PANEL_CONTENTS_OF_FILE.get(
+ value.getFile().toString());
+ }
+ return returnValue;
+ }
+
+ /**
+ * Sets the value to be displayed by this panel.
+ * @param value the binary value as an array of bytes.
+ * @param isImage whether the binary value represents an image or not.
+ */
+ public void setValue(byte[] value, boolean isImage)
+ {
+ label.setText(getString(value, isImage).toString());
+ deleteButton.setVisible((value != null) && isDisplayDelete());
+ this.value = value;
+ if (!isImage)
+ {
+ label.setIcon(null);
+ label.setVisible(true);
+ iconButton.setVisible(false);
+ }
+ else
+ {
+ updateIcon(value);
+ }
+ }
+
+ /**
+ * Sets the value to be displayed by this panel.
+ * @param value the binary value as a BinaryValue object.
+ * @param isImage whether the binary value represents an image or not.
+ */
+ public void setValue(BinaryValue value, boolean isImage)
+ {
+ label.setText(getMessage(value, isImage).toString());
+ deleteButton.setVisible((value != null) && isDisplayDelete());
+ this.value = value;
+ if (!isImage)
+ {
+ label.setIcon(null);
+ label.setVisible(true);
+ iconButton.setVisible(false);
+ }
+ else
+ {
+ try
+ {
+ updateIcon(value.getBytes());
+ }
+ catch (ParseException pe)
+ {
+ LOG.log(Level.WARNING, "Error decoding base 64 value: "+pe, pe);
+ Utilities.setWarningLabel(label, ERR_LOADING_IMAGE.get());
+ }
+ }
+ }
+
+ private void updateIcon(byte[] value)
+ {
+ if (value == null)
+ {
+ label.setVisible(true);
+ iconButton.setVisible(false);
+ }
+ else
+ {
+ Icon icon = getIcon(value);
+ if ((icon == null) || (icon.getIconHeight() <= 0))
+ {
+ Utilities.setWarningLabel(label, ERR_LOADING_IMAGE.get());
+ label.setVisible(true);
+ iconButton.setVisible(false);
+ }
+ else
+ {
+ iconButton.setVisible(true);
+ iconButton.setIcon(icon);
+ label.setVisible(false);
+ }
+ }
+ }
+
+ /**
+ * Returns the object represented by this panel.
+ * @return the object represented by this panel.
+ */
+ public Object getValue()
+ {
+ return value;
+ }
+
+ /**
+ * Explicitly request the focus for the edit button of this panel.
+ *
+ */
+ public void requestFocusForButton()
+ {
+ editButton.requestFocusInWindow();
+ }
+
+ /**
+ * Adds an action listener to this panel. The action listener will be
+ * invoked when the user clicks on the 'Edit' button or the icon.
+ * @param listener the action listener.
+ */
+ public void addEditActionListener(ActionListener listener)
+ {
+ editButton.addActionListener(listener);
+ iconButton.addActionListener(listener);
+ }
+
+ /**
+ * Removes an action listener previously added with the method
+ * addEditActionListener.
+ * @param listener the action listener.
+ */
+ public void removeEditActionListener(ActionListener listener)
+ {
+ editButton.removeActionListener(listener);
+ iconButton.removeActionListener(listener);
+ }
+
+ /**
+ * Adds an action listener to this panel. The action listener will be
+ * invoked when the user clicks on the 'Delete'.
+ * @param listener the action listener.
+ */
+ public void addDeleteActionListener(ActionListener listener)
+ {
+ deleteButton.addActionListener(listener);
+ }
+
+ /**
+ * Removes an action listener previously added with the method
+ * addDeleteActionListener.
+ * @param listener the action listener.
+ */
+ public void removeDeleteActionListener(ActionListener listener)
+ {
+ deleteButton.removeActionListener(listener);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected boolean processKeyBinding(KeyStroke ks, KeyEvent e,
+ int condition, boolean pressed)
+ {
+ // This method is used to transfer the key events to the button.
+ return editButton.processKeyBinding(ks, e, condition, pressed);
+ }
+
+ /**
+ * Tells whether the 'Delete' button is displayed or not.
+ * @return <CODE>true</CODE> if the 'Delete' button is visible and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isDisplayDelete()
+ {
+ return displayDelete;
+ }
+
+ /**
+ * Sets whether the 'Delete' button must be displayed or not.
+ * @param displayDelete whether the 'Delete' button must be displayed or not.
+ */
+ public void setDisplayDelete(boolean displayDelete)
+ {
+ this.displayDelete = displayDelete;
+ }
+
+ private Icon getIcon(byte[] bytes)
+ {
+ return Utilities.createImageIcon(bytes, THUMBNAIL_HEIGHT,
+ INFO_CTRL_PANEL_THUMBNAIL_DESCRIPTION.get(),
+ true);
+ }
+}
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryButton.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
new file mode 100644
index 0000000..360f362
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
@@ -0,0 +1,120 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+
+import javax.swing.JCheckBox;
+import javax.swing.SwingConstants;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.datamodel.Category;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.border.SelectedCategoryBorder;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+
+/**
+ * A component that acts as a checkbox but uses some customized buttons to
+ * indicate the selected and unselected states. This component is used in the
+ * 'Import LDIF' and 'Export LDIF' panels to hide parts of the dialog.
+ *
+ */
+class CategoryButton extends JCheckBox
+{
+ private static final long serialVersionUID = 6191857253411571940L;
+ private Border buttonSelectedBorder;
+ private Border buttonUnselectedBorder;
+ private final static Color backgroundColor =
+ ColorAndFontConstants.greyBackground;
+
+ /**
+ * Constructor of the category button.
+ * @param category the category associated with this button.
+ */
+ public CategoryButton(Category category)
+ {
+ super();
+ setText(category.getName().toString());
+ setHorizontalTextPosition(SwingConstants.TRAILING);
+ setHorizontalAlignment(SwingConstants.LEADING);
+ setFocusPainted(true);
+ setRolloverEnabled(false);
+ setContentAreaFilled(false);
+ setOpaque(true);
+ setBorderPainted(true);
+ setSelectedIcon(Utilities.createImageIcon(
+ IconPool.IMAGE_PATH+"/downarrow.png"));
+ setIcon(Utilities.createImageIcon(IconPool.IMAGE_PATH+"/rightarrow.png"));
+ setRolloverIcon(getIcon());
+ setRolloverSelectedIcon(getSelectedIcon());
+ setPressedIcon(getSelectedIcon());
+ buttonSelectedBorder = new SelectedCategoryBorder();
+ buttonUnselectedBorder = new EmptyBorder(5, 5, 5, 5);
+ setBorder(isSelected() ? buttonSelectedBorder : buttonUnselectedBorder);
+ addChangeListener(new ChangeListener()
+ {
+ public void stateChanged(ChangeEvent e)
+ {
+ setBorder(isSelected() ? buttonSelectedBorder : buttonUnselectedBorder);
+ }
+ });
+ setBackground(backgroundColor);
+ setForeground(ColorAndFontConstants.categoryForeground);
+ setFont(ColorAndFontConstants.categoryFont);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void updateUI()
+ {
+ super.updateUI();
+ // some look and feels replace our border, so take it back
+ setBorder(isSelected() ? buttonSelectedBorder : buttonUnselectedBorder);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void paintComponent(Graphics g) {
+ setBackground(backgroundColor);
+ g.setColor(backgroundColor);
+ g.setFont(ColorAndFontConstants.categoryFont);
+ Dimension size = getSize();
+ g.fillRect(0, 0, size.width, size.height);
+ setBorder(isSelected() ? buttonSelectedBorder : buttonUnselectedBorder);
+ super.paintComponent(g);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
new file mode 100644
index 0000000..1c5b82c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
@@ -0,0 +1,134 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.border.Border;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.opends.guitools.controlpanel.datamodel.Category;
+import org.opends.guitools.controlpanel.ui.border.AccordionElementBorder;
+
+/**
+ * The panel representing a category. It contains a CategoryButton and a panel
+ * that is displayed when the CategoryButton is in a certain state. They
+ * are used on the left side of the main Control Panel.
+ *
+ */
+public class CategoryPanel extends JPanel {
+ private static final long serialVersionUID = 8941374689175404431L;
+ private JPanel panel;
+ private JComponent child;
+
+ private CategoryButton expandButton;
+ private boolean expanded = true;
+
+ static final Border categoryBorder = new AccordionElementBorder();
+
+ /**
+ * Constructor the the panel.
+ * @param child the component that must be displayed by this panel if its
+ * CategoryButton is in a certain state.
+ * @param category the Category associated with the panel.
+ */
+ public CategoryPanel(JComponent child, Category category)
+ {
+ this.child = child;
+ setLayout(new BorderLayout());
+ panel = new JPanel(new BorderLayout());
+ add(panel, BorderLayout.CENTER);
+ panel.add(child, BorderLayout.CENTER);
+
+ expandButton = new CategoryButton(category);
+ expandButton.setSelected(isExpanded());
+ expandButton.addChangeListener(new CollapseListener());
+ add(expandButton, BorderLayout.NORTH);
+
+ setBorder(categoryBorder);
+ }
+
+ /**
+ * Sets whether the state of the panel is extended or not (if expanded the
+ * Component provided in the constructor will be displayed).
+ * @param expanded whether the panel is extended or not.
+ */
+ public void setExpanded(boolean expanded) {
+ boolean oldExpanded = this.expanded;
+ if (oldExpanded != expanded) {
+ expandButton.setSelected(expanded);
+ this.expanded = expanded;
+
+ //setCollapseHeight(expanded? childPrefSize.height : 0);
+ child.setVisible(expanded);
+ firePropertyChange("expanded", oldExpanded, expanded);
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the panel is extended and <CODE>false</CODE>
+ * otherwise.
+ * @return <CODE>true</CODE> if the panel is extended and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isExpanded()
+ {
+ return expanded;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setForeground(Color foreground)
+ {
+ super.setForeground(foreground);
+ if (expandButton != null)
+ {
+ expandButton.setForeground(foreground);
+ }
+ }
+
+
+ /**
+ * The custom listener used to display the child component.
+ *
+ */
+ private class CollapseListener implements ChangeListener
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void stateChanged(ChangeEvent event) {
+ setExpanded(expandButton.isSelected());
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
new file mode 100644
index 0000000..3231f55
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
@@ -0,0 +1,63 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import java.awt.event.KeyEvent;
+
+import javax.swing.JButton;
+import javax.swing.KeyStroke;
+
+import org.opends.messages.Message;
+
+/**
+ * This is a simple extension of the JButton class used to be able to invoke
+ * the method processKeyBinding.
+ *
+ */
+public class CellEditorButton extends JButton
+{
+ private static final long serialVersionUID = -1491628553090264453L;
+
+ /**
+ * The constructor of the cell editor button.
+ * @param label the label of the button.
+ */
+ public CellEditorButton(Message label)
+ {
+ super(label.toString());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean processKeyBinding(KeyStroke ks, KeyEvent e,
+ int condition, boolean pressed)
+ {
+ return super.processKeyBinding(ks, e, condition, pressed);
+ }
+}
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CustomTree.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CustomTree.java
new file mode 100644
index 0000000..d0b47e8
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/CustomTree.java
@@ -0,0 +1,340 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.swing.JPopupMenu;
+import javax.swing.JTree;
+import javax.swing.tree.TreePath;
+
+import org.opends.guitools.controlpanel.ui.renderer.TreeCellRenderer;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * The tree that is used in different places in the Control Panel (schema
+ * browser, index browser or the LDAP entries browser). It renders in a
+ * different manner than the default tree (selection takes the whole width
+ * of the tree, in a similar manner as happens with trees in Mac OS).
+ *
+ */
+public class CustomTree extends JTree
+{
+ private static final long serialVersionUID = -8351107707374485555L;
+ private Set<MouseListener> mouseListeners;
+ private JPopupMenu popupMenu;
+ private final int MAX_ICON_HEIGHT = 18;
+
+ /**
+ * Internal enumeration used to translate mouse events.
+ *
+ */
+ private enum NewEventType
+ {
+ MOUSE_PRESSED, MOUSE_CLICKED, MOUSE_RELEASED
+ };
+
+ /**
+ * {@inheritDoc}
+ */
+ public void paintComponent(Graphics g)
+ {
+ int[] selectedRows = this.getSelectionRows();
+ if (selectedRows == null)
+ {
+ selectedRows = new int[] {};
+ }
+ Insets insets = getInsets();
+ int w = getWidth( ) - insets.left - insets.right;
+ int h = getHeight( ) - insets.top - insets.bottom;
+ int x = insets.left;
+ int y = insets.top;
+ int nRows = getRowCount();
+ for ( int i = 0; i < nRows; i++)
+ {
+ int rowHeight = getRowBounds( i ).height;
+ boolean isSelected = false;
+ for (int j=0; j<selectedRows.length; j++)
+ {
+ if (selectedRows[j] == i)
+ {
+ isSelected = true;
+ break;
+ }
+ }
+ if (isSelected)
+ {
+ g.setColor(TreeCellRenderer.selectionBackground);
+ }
+ else
+ {
+ g.setColor(TreeCellRenderer.nonselectionBackground);
+ }
+ g.fillRect( x, y, w, rowHeight );
+ y += rowHeight;
+ }
+ final int remainder = insets.top + h - y;
+ if ( remainder > 0 )
+ {
+ g.setColor(TreeCellRenderer.nonselectionBackground);
+ g.fillRect(x, y, w, remainder);
+ }
+
+ boolean isOpaque = isOpaque();
+ setOpaque(false);
+ super.paintComponent(g);
+ setOpaque(isOpaque);
+ }
+
+ /**
+ * Sets a popup menu that will be displayed when the user clicks on the tree.
+ * @param popMenu the popup menu.
+ */
+ public void setPopupMenu(JPopupMenu popMenu)
+ {
+ this.popupMenu = popMenu;
+ }
+
+ /**
+ * Default constructor.
+ *
+ */
+ public CustomTree()
+ {
+ putClientProperty("JTree.lineStyle", "Angled");
+ // This mouse listener is used so that when the user clicks on a row,
+ // the items are selected (is not required to click directly on the label).
+ // This code tries to have a similar behavior as in Mac OS).
+ MouseListener mouseListener = new MouseAdapter()
+ {
+ private boolean ignoreEvents;
+ /**
+ * {@inheritDoc}
+ */
+ public void mousePressed(MouseEvent ev)
+ {
+ if (ignoreEvents)
+ {
+ return;
+ }
+ MouseEvent newEvent = getTranslatedEvent(ev);
+
+ if (Utilities.isMacOS() && ev.isPopupTrigger() &&
+ (ev.getButton() != MouseEvent.BUTTON1))
+ {
+ MouseEvent baseEvent = ev;
+ if (newEvent != null)
+ {
+ baseEvent = newEvent;
+ }
+ int mods = baseEvent.getModifiersEx();
+ mods &= (InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK |
+ InputEvent.SHIFT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK);
+ mods |= InputEvent.BUTTON1_DOWN_MASK;
+ final MouseEvent macEvent = new MouseEvent(
+ baseEvent.getComponent(),
+ baseEvent.getID(),
+ System.currentTimeMillis(),
+ mods,
+ baseEvent.getX(),
+ baseEvent.getY(),
+ baseEvent.getClickCount(),
+ false,
+ MouseEvent.BUTTON1);
+ // This is done to select the node when the user does a right
+ // click on Mac OS.
+ notifyNewEvent(macEvent, NewEventType.MOUSE_PRESSED);
+ }
+
+ if (ev.isPopupTrigger() && (popupMenu != null)) {
+ if ((getPathForLocation(ev.getPoint().x, ev.getPoint().y) != null) ||
+ (newEvent != null))
+ {
+ popupMenu.show(ev.getComponent(), ev.getX(), ev.getY());
+ }
+ }
+ if (newEvent != null)
+ {
+ notifyNewEvent(newEvent, NewEventType.MOUSE_PRESSED);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseReleased(MouseEvent ev)
+ {
+ if (ignoreEvents)
+ {
+ return;
+ }
+ MouseEvent newEvent = getTranslatedEvent(ev);
+ if (ev.isPopupTrigger() && (popupMenu != null) &&
+ !popupMenu.isVisible()) {
+ if ((getPathForLocation(ev.getPoint().x, ev.getPoint().y) != null) ||
+ (newEvent != null))
+ {
+ popupMenu.show(ev.getComponent(), ev.getX(), ev.getY());
+ }
+ }
+
+ if (newEvent != null)
+ {
+ notifyNewEvent(newEvent, NewEventType.MOUSE_RELEASED);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseClicked(MouseEvent ev)
+ {
+ if (ignoreEvents)
+ {
+ return;
+ }
+ MouseEvent newEvent = getTranslatedEvent(ev);
+ if (newEvent != null)
+ {
+ notifyNewEvent(newEvent, NewEventType.MOUSE_CLICKED);
+ }
+ }
+
+ private void notifyNewEvent(MouseEvent newEvent, NewEventType type)
+ {
+ ignoreEvents = true;
+ // New ArrayList to avoid concurrent modifications (the listeners
+ // could be unregistering themselves).
+ for (MouseListener mouseListener :
+ new ArrayList<MouseListener>(mouseListeners))
+ {
+ if (mouseListener != this)
+ {
+ switch (type)
+ {
+ case MOUSE_RELEASED:
+ mouseListener.mouseReleased(newEvent);
+ break;
+ case MOUSE_CLICKED:
+ mouseListener.mouseClicked(newEvent);
+ break;
+ default:
+ mouseListener.mousePressed(newEvent);
+ }
+ }
+ }
+ ignoreEvents = false;
+ }
+
+ private MouseEvent getTranslatedEvent(MouseEvent ev)
+ {
+ MouseEvent newEvent = null;
+ int x = ev.getPoint().x;
+ int y = ev.getPoint().y;
+ if (getPathForLocation(x, y) == null)
+ {
+ TreePath path = getWidePathForLocation(x, y);
+ if (path != null)
+ {
+ Rectangle r = getPathBounds(path);
+ if (r != null)
+ {
+ int newX = r.x + (r.width / 2);
+ int newY = r.y + (r.height / 2);
+ // Simulate an event
+ newEvent = new MouseEvent(
+ ev.getComponent(),
+ ev.getID(),
+ ev.getWhen(),
+ ev.getModifiersEx(),
+ newX,
+ newY,
+ ev.getClickCount(),
+ ev.isPopupTrigger(),
+ ev.getButton());
+ }
+ }
+ }
+ return newEvent;
+ }
+ };
+ addMouseListener(mouseListener);
+ if (getRowHeight() <= MAX_ICON_HEIGHT)
+ {
+ setRowHeight(MAX_ICON_HEIGHT + 1);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addMouseListener(MouseListener mouseListener)
+ {
+ super.addMouseListener(mouseListener);
+ if (mouseListeners == null)
+ {
+ mouseListeners = new HashSet<MouseListener>();
+ }
+ mouseListeners.add(mouseListener);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeMouseListener(MouseListener mouseListener)
+ {
+ super.removeMouseListener(mouseListener);
+ mouseListeners.remove(mouseListener);
+ }
+
+ private TreePath getWidePathForLocation(int x, int y)
+ {
+ TreePath path = null;
+ TreePath closestPath = getClosestPathForLocation(x, y);
+ if (closestPath != null)
+ {
+ Rectangle pathBounds = getPathBounds(closestPath);
+ if (pathBounds != null &&
+ x >= pathBounds.x && x < (getX() + getWidth()) &&
+ y >= pathBounds.y && y < (pathBounds.y + pathBounds.height))
+ {
+ path = closestPath;
+ }
+ }
+ return path;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
new file mode 100644
index 0000000..05797dc
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
@@ -0,0 +1,743 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.opends.guitools.controlpanel.datamodel.SortableListModel;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * This component displays three list (one available list and two selected
+ * lists) with some buttons to move the components of one list to the other.
+ *
+ * @param <T> the type of the objects in the list.
+ */
+public class DoubleAddRemovePanel<T> extends JPanel
+{
+ private static final long serialVersionUID = 6881453848780359594L;
+ private SortableListModel<T> availableListModel;
+ private SortableListModel<T> selectedListModel1;
+ private SortableListModel<T> selectedListModel2;
+ private JLabel selectedLabel1;
+ private JLabel selectedLabel2;
+ private JLabel availableLabel;
+ private JButton add1;
+ private JButton remove1;
+ private JButton add2;
+ private JButton remove2;
+ private JButton addAll1;
+ private JButton removeAll1;
+ private JButton addAll2;
+ private JButton removeAll2;
+ private JScrollPane availableScroll;
+ private JScrollPane selectedScroll1;
+ private JScrollPane selectedScroll2;
+ private JList availableList;
+ private JList selectedList1;
+ private JList selectedList2;
+ private Class<T> theClass;
+ private Collection<T> unmovableItems = new ArrayList<T>();
+ private boolean ignoreListEvents;
+
+ /**
+ * Mask used as display option. If the provided display options contain
+ * this mask, the panel will display the remove all button.
+ */
+ public static final int DISPLAY_REMOVE_ALL = 0x001;
+
+ /**
+ * Mask used as display option. If the provided display options contain
+ * this mask, the panel will display the add all button.
+ */
+ public static final int DISPLAY_ADD_ALL = 0x010;
+
+
+ /**
+ * Constructor of the default double add remove panel (including 'Add All' and
+ * 'Remove All' buttons).
+ * The class is required to avoid warnings in compilation.
+ * @param theClass the class of the objects in the panel.
+ */
+ public DoubleAddRemovePanel(Class<T> theClass)
+ {
+ this(DISPLAY_REMOVE_ALL | DISPLAY_ADD_ALL, theClass);
+ }
+
+ /**
+ * Constructor of the double add remove panel allowing the user to provide
+ * some display options.
+ * The class is required to avoid warnings in compilation.
+ * @param displayOptions the display options.
+ * @param theClass the class of the objects in the panel.
+ */
+ public DoubleAddRemovePanel(int displayOptions, Class<T> theClass)
+ {
+ super(new GridBagLayout());
+ setOpaque(false);
+ this.theClass = theClass;
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.gridwidth = 1;
+ gbc.gridheight = 1;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.anchor = GridBagConstraints.WEST;
+
+ availableLabel = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_AVAILABLE_LABEL.get());
+ add(availableLabel, gbc);
+ gbc.gridx = 2;
+ selectedLabel1 = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_SELECTED_LABEL.get());
+ add(selectedLabel1, gbc);
+ gbc.gridy ++;
+
+ ListDataListener listDataListener = new ListDataListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void intervalRemoved(ListDataEvent ev)
+ {
+ listSelectionChanged();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void intervalAdded(ListDataEvent ev)
+ {
+ listSelectionChanged();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void contentsChanged(ListDataEvent ev)
+ {
+ listSelectionChanged();
+ }
+ };
+ MouseAdapter doubleClickListener = new MouseAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseClicked(MouseEvent e) {
+ if (isEnabled() && (e.getClickCount() == 2))
+ {
+ if (e.getSource() == availableList)
+ {
+ if (availableList.getSelectedValue() != null)
+ {
+ add1Clicked();
+ }
+ }
+ else if (e.getSource() == selectedList1)
+ {
+ if (selectedList1.getSelectedValue() != null)
+ {
+ remove1Clicked();
+ }
+ }
+ else if (e.getSource() == selectedList2)
+ {
+ if (selectedList1.getSelectedValue() != null)
+ {
+ remove2Clicked();
+ }
+ }
+ }
+ }
+ };
+
+
+ availableListModel = new SortableListModel<T>();
+ availableListModel.addListDataListener(listDataListener);
+ availableList = new JList();
+ availableList.setModel(availableListModel);
+ availableList.setVisibleRowCount(15);
+ availableList.addMouseListener(doubleClickListener);
+
+ selectedListModel1 = new SortableListModel<T>();
+ selectedListModel1.addListDataListener(listDataListener);
+ selectedList1 = new JList();
+ selectedList1.setModel(selectedListModel1);
+ selectedList1.setVisibleRowCount(7);
+ selectedList1.addMouseListener(doubleClickListener);
+
+ selectedListModel2 = new SortableListModel<T>();
+ selectedListModel2.addListDataListener(listDataListener);
+ selectedList2 = new JList();
+ selectedList2.setModel(selectedListModel2);
+ selectedList2.setVisibleRowCount(7);
+ selectedList2.addMouseListener(doubleClickListener);
+
+ gbc.weighty = 1.0;
+ gbc.weightx = 1.0;
+ gbc.gridheight = 7;
+ if ((displayOptions &= DISPLAY_ADD_ALL) != 0)
+ {
+ gbc.gridheight += 2;
+ }
+ if ((displayOptions &= DISPLAY_REMOVE_ALL) != 0)
+ {
+ gbc.gridheight += 2;
+ }
+ int listGridY = gbc.gridy;
+ gbc.gridx = 0;
+ gbc.insets.top = 5;
+ availableScroll = Utilities.createScrollPane(availableList);
+ gbc.fill = GridBagConstraints.BOTH;
+ add(availableScroll, gbc);
+
+ gbc.gridx = 1;
+ gbc.gridheight = 1;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add1 = Utilities.createButton(INFO_CTRL_PANEL_ADDREMOVE_ADD_BUTTON.get());
+ add1.setOpaque(false);
+ add1.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ add1Clicked();
+ }
+ });
+ gbc.insets = new Insets(5, 5, 0, 5);
+ add(add1, gbc);
+
+ if ((displayOptions &= DISPLAY_ADD_ALL) != 0)
+ {
+ addAll1 = Utilities.createButton(
+ INFO_CTRL_PANEL_ADDREMOVE_ADD_ALL_BUTTON.get());
+ addAll1.setOpaque(false);
+ addAll1.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ moveAll(availableListModel, selectedListModel1);
+ }
+ });
+ gbc.gridy ++;
+ add(addAll1, gbc);
+ }
+
+ remove1 = Utilities.createButton(
+ INFO_CTRL_PANEL_ADDREMOVE_REMOVE_BUTTON.get());
+ remove1.setOpaque(false);
+ remove1.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent ev)
+ {
+ remove1Clicked();
+ }
+ });
+ gbc.gridy ++;
+ gbc.insets.top = 10;
+ add(remove1, gbc);
+
+ if ((displayOptions &= DISPLAY_REMOVE_ALL) != 0)
+ {
+ removeAll1 = Utilities.createButton(
+ INFO_CTRL_PANEL_ADDREMOVE_REMOVE_ALL_BUTTON.get());
+ removeAll1.setOpaque(false);
+ removeAll1.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ moveAll(selectedListModel1, availableListModel);
+ }
+ });
+ gbc.gridy ++;
+ gbc.insets.top = 5;
+ add(removeAll1, gbc);
+ }
+
+
+ gbc.weighty = 1.0;
+ gbc.insets = new Insets(0, 0, 0, 0);
+ gbc.gridy ++;
+ gbc.gridheight = 1;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ add(Box.createVerticalGlue(), gbc);
+
+ gbc.gridy += 2;
+ gbc.gridx = 1;
+ gbc.gridheight = 1;
+ gbc.weightx = 0.0;
+ gbc.weighty = 0.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add2 = Utilities.createButton(INFO_CTRL_PANEL_ADDREMOVE_ADD_BUTTON.get());
+ add2.setOpaque(false);
+ add2.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ add2Clicked();
+ }
+ });
+ gbc.insets = new Insets(5, 5, 0, 5);
+ add(add2, gbc);
+
+ if ((displayOptions &= DISPLAY_ADD_ALL) != 0)
+ {
+ addAll2 = Utilities.createButton(
+ INFO_CTRL_PANEL_ADDREMOVE_ADD_ALL_BUTTON.get());
+ addAll2.setOpaque(false);
+ addAll2.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ moveAll(availableListModel, selectedListModel2);
+ }
+ });
+ gbc.gridy ++;
+ add(addAll2, gbc);
+ }
+
+ remove2 = Utilities.createButton(
+ INFO_CTRL_PANEL_ADDREMOVE_REMOVE_BUTTON.get());
+ remove2.setOpaque(false);
+ remove2.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ remove2Clicked();
+ }
+ });
+ gbc.gridy ++;
+ gbc.insets.top = 10;
+ add(remove2, gbc);
+
+ if ((displayOptions &= DISPLAY_REMOVE_ALL) != 0)
+ {
+ removeAll2 = Utilities.createButton(
+ INFO_CTRL_PANEL_ADDREMOVE_REMOVE_ALL_BUTTON.get());
+ removeAll2.setOpaque(false);
+ removeAll2.addActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+ moveAll(selectedListModel2, availableListModel);
+ }
+ });
+ gbc.gridy ++;
+ gbc.insets.top = 5;
+ add(removeAll2, gbc);
+ }
+
+
+ gbc.weighty = 1.0;
+ gbc.insets = new Insets(0, 0, 0, 0);
+ gbc.gridy ++;
+ gbc.gridheight = 1;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ add(Box.createVerticalGlue(), gbc);
+
+ gbc.weightx = 1.0;
+ gbc.insets = new Insets(5, 0, 0, 0);
+ gbc.gridheight = 3;
+ if ((displayOptions &= DISPLAY_ADD_ALL) != 0)
+ {
+ gbc.gridheight ++;
+ }
+ if ((displayOptions &= DISPLAY_REMOVE_ALL) != 0)
+ {
+ gbc.gridheight ++;
+ }
+ gbc.gridy = listGridY;
+ gbc.gridx = 2;
+ gbc.fill = GridBagConstraints.BOTH;
+ selectedScroll1 = Utilities.createScrollPane(selectedList1);
+ gbc.weighty = 1.0;
+ add(selectedScroll1, gbc);
+
+ gbc.gridy += gbc.gridheight;
+ gbc.gridheight = 1;
+ gbc.weighty = 0.0;
+ gbc.insets.top = 10;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ selectedLabel2 = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_SELECTED_LABEL.get());
+ add(selectedLabel2, gbc);
+
+ gbc.weightx = 1.0;
+ gbc.insets = new Insets(5, 0, 0, 0);
+ gbc.gridheight = 3;
+ if ((displayOptions &= DISPLAY_ADD_ALL) != 0)
+ {
+ gbc.gridheight ++;
+ }
+ if ((displayOptions &= DISPLAY_REMOVE_ALL) != 0)
+ {
+ gbc.gridheight ++;
+ }
+ gbc.gridy ++;
+ gbc.fill = GridBagConstraints.BOTH;
+ selectedScroll2 = Utilities.createScrollPane(selectedList2);
+ gbc.weighty = 1.0;
+ add(selectedScroll2, gbc);
+
+
+ selectedList1.getSelectionModel().setSelectionMode(
+ ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ ListSelectionListener listener = new ListSelectionListener()
+ {
+ public void valueChanged(ListSelectionEvent ev)
+ {
+ listSelectionChanged();
+ }
+ };
+ selectedList1.getSelectionModel().addListSelectionListener(listener);
+ selectedList2.getSelectionModel().setSelectionMode(
+ ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ selectedList2.getSelectionModel().addListSelectionListener(listener);
+ availableList.getSelectionModel().setSelectionMode(
+ ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ availableList.getSelectionModel().addListSelectionListener(listener);
+
+ add1.setEnabled(false);
+ remove1.setEnabled(false);
+
+ add2.setEnabled(false);
+ remove2.setEnabled(false);
+
+ // Set preferred size for the scroll panes.
+ Component comp =
+ availableList.getCellRenderer().getListCellRendererComponent(
+ availableList,
+ "The cell that we want to display", 0, true, true);
+ Dimension d = new Dimension(comp.getPreferredSize().width,
+ availableScroll.getPreferredSize().height);
+ availableScroll.setPreferredSize(d);
+ d = new Dimension(comp.getPreferredSize().width,
+ selectedScroll1.getPreferredSize().height);
+ selectedScroll1.setPreferredSize(d);
+ selectedScroll2.setPreferredSize(d);
+ }
+
+ /**
+ * Enables the state of the components in the panel.
+ * @param enable whether to enable the components in the panel or not.
+ */
+ public void setEnabled(boolean enable)
+ {
+ super.setEnabled(enable);
+
+ selectedLabel1.setEnabled(enable);
+ selectedLabel2.setEnabled(enable);
+ availableLabel.setEnabled(enable);
+ availableList.setEnabled(enable);
+ selectedList1.setEnabled(enable);
+ selectedList2.setEnabled(enable);
+ availableScroll.setEnabled(enable);
+ selectedScroll2.setEnabled(enable);
+ selectedScroll2.setEnabled(enable);
+
+ listSelectionChanged();
+ }
+
+ /**
+ * Returns the available label contained in the panel.
+ * @return the available label contained in the panel.
+ */
+ public JLabel getAvailableLabel()
+ {
+ return availableLabel;
+ }
+
+ /**
+ * Returns the list of elements in the available list.
+ * @return the list of elements in the available list.
+ */
+ public SortableListModel<T> getAvailableListModel()
+ {
+ return availableListModel;
+ }
+
+ /**
+ * Returns the first selected label contained in the panel.
+ * @return the first selected label contained in the panel.
+ */
+ public JLabel getSelectedLabel1()
+ {
+ return selectedLabel1;
+ }
+
+ /**
+ * Returns the list of elements in the first selected list.
+ * @return the list of elements in the first selected list.
+ */
+ public SortableListModel<T> getSelectedListModel1()
+ {
+ return selectedListModel1;
+ }
+
+ /**
+ * Returns the second selected label contained in the panel.
+ * @return the second selected label contained in the panel.
+ */
+ public JLabel getSelectedLabel2()
+ {
+ return selectedLabel2;
+ }
+
+ /**
+ * Returns the list of elements in the second selected list.
+ * @return the list of elements in the second selected list.
+ */
+ public SortableListModel<T> getSelectedListModel2()
+ {
+ return selectedListModel2;
+ }
+
+ private void listSelectionChanged()
+ {
+ if (ignoreListEvents)
+ {
+ return;
+ }
+ ignoreListEvents = true;
+
+ JList[] lists = {availableList, selectedList1, selectedList2};
+ for (JList list : lists)
+ {
+ for (T element : unmovableItems)
+ {
+ int[] indexes = list.getSelectedIndices();
+ if (indexes != null)
+ {
+ for (int i=0; i<indexes.length; i++)
+ {
+ if (list.getModel().getElementAt(indexes[i]).equals(element))
+ {
+ list.getSelectionModel().removeIndexInterval(indexes[i],
+ indexes[i]);
+ }
+ }
+ }
+ }
+ }
+
+ ignoreListEvents = false;
+ int index = availableList.getSelectedIndex();
+ add1.setEnabled((index != -1) &&
+ (index <availableListModel.getSize()) && isEnabled());
+ add2.setEnabled(add1.isEnabled());
+ index = selectedList1.getSelectedIndex();
+ remove1.setEnabled((index != -1) &&
+ (index <selectedListModel1.getSize()) && isEnabled());
+ index = selectedList2.getSelectedIndex();
+ remove2.setEnabled((index != -1) &&
+ (index <selectedListModel2.getSize()) && isEnabled());
+
+ if (addAll1 != null)
+ {
+ boolean onlyUnmovable =
+ unmovableItems.containsAll(availableListModel.getData());
+ addAll1.setEnabled((availableListModel.getSize() > 0) && isEnabled() &&
+ !onlyUnmovable);
+ addAll2.setEnabled(addAll1.isEnabled());
+ }
+ if (removeAll1 != null)
+ {
+ boolean onlyUnmovable =
+ unmovableItems.containsAll(selectedListModel1.getData());
+ removeAll1.setEnabled((selectedListModel1.getSize() > 0) && isEnabled() &&
+ !onlyUnmovable);
+ }
+ if (removeAll2 != null)
+ {
+ boolean onlyUnmovable =
+ unmovableItems.containsAll(selectedListModel2.getData());
+ removeAll2.setEnabled((selectedListModel2.getSize() > 0) && isEnabled() &&
+ !onlyUnmovable);
+ }
+ }
+
+ /**
+ * Returns the available list.
+ * @return the available list.
+ */
+ public JList getAvailableList()
+ {
+ return availableList;
+ }
+
+ /**
+ * Returns the first selected list.
+ * @return the first selected list.
+ */
+ public JList getSelectedList1()
+ {
+ return selectedList1;
+ }
+
+ /**
+ * Returns the second selected list.
+ * @return the second selected list.
+ */
+ public JList getSelectedList2()
+ {
+ return selectedList2;
+ }
+
+ private void add1Clicked()
+ {
+ Object[] selectedObjects = availableList.getSelectedValues();
+ for (int i=0; i<selectedObjects.length; i++)
+ {
+ T value = DoubleAddRemovePanel.this.theClass.cast(selectedObjects[i]);
+ selectedListModel1.add(value);
+ availableListModel.remove(value);
+ }
+ selectedListModel1.fireContentsChanged(selectedListModel1, 0,
+ selectedListModel1.getSize());
+ availableListModel.fireContentsChanged(availableListModel, 0,
+ availableListModel.getSize());
+ }
+
+ private void add2Clicked()
+ {
+ Object[] selectedObjects = availableList.getSelectedValues();
+ for (int i=0; i<selectedObjects.length; i++)
+ {
+ T value = DoubleAddRemovePanel.this.theClass.cast(selectedObjects[i]);
+ selectedListModel2.add(value);
+ availableListModel.remove(value);
+ }
+ selectedListModel2.fireContentsChanged(selectedListModel2, 0,
+ selectedListModel2.getSize());
+ availableListModel.fireContentsChanged(availableListModel, 0,
+ availableListModel.getSize());
+ }
+
+ private void remove1Clicked()
+ {
+ Object[] selectedObjects = selectedList1.getSelectedValues();
+ for (int i=0; i<selectedObjects.length; i++)
+ {
+ T value = DoubleAddRemovePanel.this.theClass.cast(selectedObjects[i]);
+ availableListModel.add(value);
+ selectedListModel1.remove(value);
+ }
+ selectedListModel1.fireContentsChanged(selectedListModel1, 0,
+ selectedListModel1.getSize());
+ availableListModel.fireContentsChanged(availableListModel, 0,
+ availableListModel.getSize());
+ }
+
+ private void remove2Clicked()
+ {
+ Object[] selectedObjects = selectedList2.getSelectedValues();
+ for (int i=0; i<selectedObjects.length; i++)
+ {
+ T value = DoubleAddRemovePanel.this.theClass.cast(selectedObjects[i]);
+ availableListModel.add(value);
+ selectedListModel2.remove(value);
+ }
+ selectedListModel2.fireContentsChanged(selectedListModel2, 0,
+ selectedListModel2.getSize());
+ availableListModel.fireContentsChanged(availableListModel, 0,
+ availableListModel.getSize());
+ }
+
+ /**
+ * Sets the list of items that cannot be moved from one list to the others.
+ * @param unmovableItems the list of items that cannot be moved from one
+ * list to the others.
+ */
+ public void setUnmovableItems(Collection<T> unmovableItems)
+ {
+ this.unmovableItems.clear();
+ this.unmovableItems.addAll(unmovableItems);
+ }
+
+ private void moveAll(SortableListModel<T> fromModel,
+ SortableListModel<T> toModel)
+ {
+ Collection<T> toKeep = fromModel.getData();
+ toKeep.retainAll(unmovableItems);
+ Collection<T> toMove = fromModel.getData();
+ toMove.removeAll(unmovableItems);
+ toModel.addAll(toMove);
+ fromModel.clear();
+ fromModel.addAll(toKeep);
+ fromModel.fireContentsChanged(selectedListModel1, 0,
+ selectedListModel1.getSize());
+ toModel.fireContentsChanged(availableListModel, 0,
+ availableListModel.getSize());
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/FilterTextField.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
new file mode 100644
index 0000000..c3e0658
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
@@ -0,0 +1,348 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.LinkedHashSet;
+
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.border.Border;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.quicksetup.ui.UIFactory;
+
+/**
+ * A text field with an icon with 'X' shape on the right. When the user clicks
+ * on that icon, the contents of the text field are cleared.
+ *
+ */
+public class FilterTextField extends JTextField
+{
+ private static final long serialVersionUID = -2083433734204435457L;
+ private boolean displayClearIcon;
+ private ImageIcon clearIcon = Utilities.createImageIcon(IconPool.IMAGE_PATH+
+ "/clear-filter.png");
+ private ImageIcon clearIconPressed =
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+
+ "/clear-filter-down.png");
+ private ImageIcon refreshIcon =
+ UIFactory.getImageIcon(UIFactory.IconType.WAIT_TINY);
+
+ private boolean mousePressed;
+ private boolean displayRefreshIcon;
+
+ /**
+ * The time during which the refresh icon is displayed by default.
+ */
+ public static long DEFAULT_REFRESH_ICON_TIME = 750;
+
+ private LinkedHashSet<ActionListener> listeners =
+ new LinkedHashSet<ActionListener>();
+
+ private boolean constructorBorderSet = false;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public FilterTextField()
+ {
+ super(15);
+ Border border = getBorder();
+ if (border != null)
+ {
+ setBorder(BorderFactory.createCompoundBorder(border, new IconBorder()));
+ }
+ else
+ {
+ setBorder(new IconBorder());
+ }
+ constructorBorderSet = true;
+ getDocument().addDocumentListener(new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent e)
+ {
+ insertUpdate(e);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent e)
+ {
+ boolean displayIcon = getText().length() > 0;
+ if (FilterTextField.this.displayClearIcon != displayIcon)
+ {
+ FilterTextField.this.displayClearIcon = displayIcon;
+ repaint();
+ }
+ }
+ public void removeUpdate(DocumentEvent e)
+ {
+ insertUpdate(e);
+ }
+ });
+
+ addMouseListener(new MouseAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void mousePressed(MouseEvent ev)
+ {
+ boolean p = getClearIconRectangle().contains(ev.getPoint());
+ if (p != mousePressed)
+ {
+ mousePressed = p;
+ repaint();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseReleased(MouseEvent ev)
+ {
+ if (mousePressed && getClearIconRectangle().contains(ev.getPoint()))
+ {
+ setText("");
+ notifyListeners();
+ }
+ mousePressed = false;
+ }
+ });
+ }
+
+ /**
+ * Adds an action listener to this text field. When the user clicks on the
+ * 'X' shaped icon the listeners are notified.
+ * @param listener the action listener.
+ */
+ public void addActionListener(ActionListener listener)
+ {
+ listeners.add(listener);
+ }
+
+ /**
+ * Removes an action listener to this text field.
+ * @param listener the action listener.
+ */
+ public void removeActionListener(ActionListener listener)
+ {
+ listeners.remove(listener);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setBorder(Border border)
+ {
+ if (constructorBorderSet)
+ {
+ if (border != null)
+ {
+ border = BorderFactory.createCompoundBorder(border, new IconBorder());
+ }
+ }
+ super.setBorder(border);
+ }
+
+ /**
+ * Displays a refresh icon on the text field (this is used for instance in
+ * the browsers that use this text field to specify a filter: the refresh
+ * icon is displayed to show that the filter is being displayed).
+ * @param display whether to display the refresh icon or not.
+ */
+ public void displayRefreshIcon(boolean display)
+ {
+ if (display != displayRefreshIcon)
+ {
+ displayRefreshIcon = display;
+ repaint();
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the refresh icon is displayed and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the refresh icon is displayed and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isRefreshIconDisplayed()
+ {
+ return displayRefreshIcon;
+ }
+
+ /**
+ * Displays a refresh icon on the text field (this is used for instance in
+ * the browsers that use this text field to specify a filter: the refresh
+ * icon is displayed to show that the filter is being displayed).
+ * @param time the time (in miliseconds) that the icon will be displayed.
+ *
+ */
+ public void displayRefreshIcon(final long time)
+ {
+ displayRefreshIcon = true;
+ repaint();
+ Thread t = new Thread(new Runnable()
+ {
+ public void run()
+ {
+ try
+ {
+ Thread.sleep(time);
+ }
+ catch (Throwable t)
+ {
+ }
+ finally
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ displayRefreshIcon = false;
+ repaint();
+ }
+ });
+ }
+ }
+ });
+ t.start();
+ }
+
+ private static int id = 1;
+ private void notifyListeners()
+ {
+ ActionEvent ev = new ActionEvent(this, id,
+ "CLEAR_FILTER");
+ id ++;
+ for (ActionListener listener : listeners)
+ {
+ listener.actionPerformed(ev);
+ }
+ }
+
+ private Rectangle getClearIconRectangle()
+ {
+ ImageIcon icon = getClearIcon();
+ int margin = getMargin(this, icon);
+ return new Rectangle(getWidth() - margin - icon.getIconWidth(),
+ margin, icon.getIconWidth(), icon.getIconHeight());
+ }
+
+ /**
+ * The border of this filter text field.
+ *
+ */
+ private class IconBorder implements Border
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public Insets getBorderInsets(Component c)
+ {
+ ImageIcon icon = getClearIcon();
+ int rightInsets = 0;
+ if (displayClearIcon)
+ {
+ rightInsets += icon.getIconWidth() + getMargin(c, icon);
+ }
+ if (displayRefreshIcon)
+ {
+ rightInsets += refreshIcon.getIconWidth() + getMargin(c, refreshIcon);
+ }
+ return new Insets(0, 0, 0, rightInsets);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void paintBorder(Component c, Graphics g, int x, int y,
+ int width, int height)
+ {
+ if (displayClearIcon || displayRefreshIcon)
+ {
+ Graphics2D g2d = (Graphics2D) g.create();
+ int leftSpaceOfClearIcon = 0;
+ if (displayClearIcon)
+ {
+ ImageIcon icon = getClearIcon();
+ int margin = (height - icon.getIconHeight()) / 2;
+ icon.paintIcon(c,
+ g2d, x + width - margin - icon.getIconWidth(),
+ y + margin);
+ leftSpaceOfClearIcon = margin + icon.getIconWidth();
+ }
+ if (displayRefreshIcon)
+ {
+ int margin = (height - refreshIcon.getIconHeight()) / 2;
+ refreshIcon.paintIcon(c, g2d, x + width - margin -
+ refreshIcon.getIconWidth() - leftSpaceOfClearIcon, y + margin);
+ }
+ g2d.dispose(); //clean up
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBorderOpaque()
+ {
+ return false;
+ }
+ }
+ private int getMargin(Component c, ImageIcon icon)
+ {
+ int margin = (c.getHeight() - icon.getIconHeight()) / 2;
+ return margin;
+ }
+
+ private ImageIcon getClearIcon()
+ {
+ ImageIcon icon = mousePressed ? clearIconPressed : clearIcon;
+ return icon;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
new file mode 100644
index 0000000..2e5b3c5
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
@@ -0,0 +1,287 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.Box;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JToolTip;
+import javax.swing.Popup;
+import javax.swing.PopupFactory;
+import javax.swing.ToolTipManager;
+
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * A panel containing a label an a help icon. A customized tool tip is used,
+ * the tool tip is also displayed when the user clicks on the help icon.
+ *
+ */
+public class LabelWithHelpIcon extends JPanel
+{
+ private static final long serialVersionUID = 4502977901538910797L;
+ /**
+ * The label with the text.
+ */
+ protected JLabel label = Utilities.createDefaultLabel();
+ /**
+ * The label with the icon.
+ */
+ protected JLabel iconLabel = new JLabel(icon);
+ private static final ImageIcon icon =
+ Utilities.createImageIcon("org/opends/quicksetup/images/help_small.gif");
+ private static final ToolTipManager ttipManager =
+ ToolTipManager.sharedInstance();
+
+ private Popup tipWindow;
+ private boolean isVisible;
+
+ /**
+ * The left inset of the help icon.
+ */
+ protected final int INSET_WITH_ICON= 3;
+
+ /**
+ * The constructor of this panel.
+ * @param text the text of the panel.
+ * @param tooltipIcon the tool tip of the help icon.
+ */
+ public LabelWithHelpIcon(Message text, Message tooltipIcon)
+ {
+ super(new GridBagLayout());
+ setOpaque(false);
+ label.setText(text.toString());
+ label.setForeground(ColorAndFontConstants.foreground);
+ if (tooltipIcon != null)
+ {
+ iconLabel.setToolTipText(tooltipIcon.toString());
+ }
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridwidth = 1;
+ gbc.anchor = GridBagConstraints.WEST;
+ add(label, gbc);
+ gbc.gridx ++;
+ gbc.insets.left = INSET_WITH_ICON;
+ add(iconLabel, gbc);
+ gbc.insets.left = 0;
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ add(Box.createHorizontalGlue(), gbc);
+
+ ttipManager.unregisterComponent(iconLabel);
+
+ iconLabel.addMouseListener(new MouseAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseExited(MouseEvent event)
+ {
+ hideToolTip(event);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mousePressed(MouseEvent event)
+ {
+ if (isVisible)
+ {
+ hideToolTip(event);
+ }
+ else
+ {
+ displayToolTip(event);
+ }
+ }
+ });
+ }
+
+ /**
+ * Sets the text on the label.
+ * @param text the text to be displayed.
+ */
+ public void setText(String text)
+ {
+ label.setText(text);
+ }
+
+ /**
+ * Returns the text displayed on the panel.
+ * @return the text displayed on the panel.
+ */
+ public String getText()
+ {
+ return label.getText();
+ }
+
+ /**
+ * Sets the font to be used in this panel.
+ * @param font the font.
+ */
+ public void setFont(Font font)
+ {
+ // This is call by the constructor of JPanel.
+ if (label != null)
+ {
+ label.setFont(font);
+ }
+ }
+
+ /**
+ * Sets the tool tip to be used in the help icon.
+ * @param tooltip the tool tip text.
+ */
+ public void setHelpTooltip(String tooltip)
+ {
+ iconLabel.setToolTipText(tooltip);
+ }
+
+ /**
+ * Returns the tool tip to be used in the help icon.
+ * @return the tool tip to be used in the help icon.
+ */
+ public String getHelpTooltip()
+ {
+ return iconLabel.getToolTipText();
+ }
+
+ /**
+ * Sets whether the help icon is visible or not.
+ * @param visible whether the help icon is visible or not.
+ */
+ public void setHelpIconVisible(boolean visible)
+ {
+ if (visible)
+ {
+ if (iconLabel.getIcon() != icon)
+ {
+ iconLabel.setIcon(icon);
+ }
+ }
+ else if (iconLabel.getIcon() != null)
+ {
+ iconLabel.setIcon(null);
+ }
+ }
+
+ /**
+ * Sets the foreground color for the text in this panel.
+ * @param color the foreground color for the text in this panel.
+ */
+ public void setForeground(Color color)
+ {
+ super.setForeground(color);
+ if (label != null)
+ {
+ // This is called in the constructor of the object.
+ label.setForeground(color);
+ }
+ }
+
+ /**
+ * Displays a tooltip depending on the MouseEvent received.
+ * @param event the mouse event.
+ */
+ private void displayToolTip(MouseEvent event)
+ {
+ JComponent component = (JComponent)event.getSource();
+ String toolTipText = component.getToolTipText();
+ if (toolTipText != null)
+ {
+ Point preferredLocation = component.getToolTipLocation(event);
+ Rectangle sBounds = component.getGraphicsConfiguration().
+ getBounds();
+
+ JToolTip tip = component.createToolTip();
+ tip.setTipText(toolTipText);
+ Dimension size = tip.getPreferredSize();
+ Point location = new Point();
+
+ Point screenLocation = component.getLocationOnScreen();
+ if(preferredLocation != null)
+ {
+ location.x = screenLocation.x + preferredLocation.x;
+ location.y = screenLocation.y + preferredLocation.y;
+ }
+ else
+ {
+ location.x = screenLocation.x + event.getX();
+ location.y = screenLocation.y + event.getY() + 20;
+ }
+
+ if (location.x < sBounds.x) {
+ location.x = sBounds.x;
+ }
+ else if (location.x - sBounds.x + size.width > sBounds.width) {
+ location.x = sBounds.x + Math.max(0, sBounds.width - size.width);
+ }
+ if (location.y < sBounds.y) {
+ location.y = sBounds.y;
+ }
+ else if (location.y - sBounds.y + size.height > sBounds.height) {
+ location.y = sBounds.y + Math.max(0, sBounds.height - size.height);
+ }
+
+ PopupFactory popupFactory = PopupFactory.getSharedInstance();
+ tipWindow = popupFactory.getPopup(component, tip, location.x, location.y);
+ tipWindow.show();
+ }
+ isVisible = true;
+ }
+
+ /**
+ * Hides the tooltip if we are displaying it.
+ * @param event the mouse event.
+ */
+ private void hideToolTip(MouseEvent event)
+ {
+ if (tipWindow != null)
+ {
+ tipWindow.hide();
+ tipWindow = null;
+ }
+ isVisible = false;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
new file mode 100644
index 0000000..977437f
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
@@ -0,0 +1,222 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.datamodel.ObjectClassValue;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+
+/**
+ * A simple panel used in the LDAP entry viewers to display the object class
+ * values of an entry. It displays the structural and auxiliary object classes.
+ * It does not allow to edit directly the object class value. It is used for
+ * instance in the entry editors (simplified and table views).
+ *
+ */
+public class ObjectClassCellPanel extends JPanel
+{
+ private static final long serialVersionUID = -2362754512894888888L;
+ private JLabel label;
+ private CellEditorButton editButton;
+ private ObjectClassValue value;
+ private JLabel lockLabel = Utilities.createDefaultLabel();
+
+ private ImageIcon lockIcon =
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+"/field-locked.png");
+
+ /**
+ * Default constructor.
+ *
+ */
+ public ObjectClassCellPanel()
+ {
+ super(new GridBagLayout());
+ setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ label = Utilities.createDefaultLabel(
+ INFO_CTRL_PANEL_NO_VALUE_SPECIFIED.get());
+ gbc.weightx = 1.0;
+ add(label, gbc);
+ gbc.gridx ++;
+ editButton = new CellEditorButton(INFO_CTRL_PANEL_EDIT_BUTTON_LABEL.get());
+ editButton.setForeground(ColorAndFontConstants.buttonForeground);
+ editButton.setOpaque(false);
+ gbc.insets.left = 5;
+ gbc.anchor = GridBagConstraints.NORTH;
+ gbc.weightx = 0.0;
+ add(editButton, gbc);
+ gbc.weightx = 0.0;
+ gbc.insets.left = 5;
+ gbc.gridx ++;
+ add(lockLabel, gbc);
+ lockLabel.setVisible(false);
+ }
+
+ /**
+ * Sets the object class value to be displayed in this panel.
+ * @param value the object class value to be displayed in this panel.
+ */
+ public void setValue(ObjectClassValue value)
+ {
+ label.setText(getMessage(value).toString());
+ this.value = value;
+ }
+
+ /**
+ * Returns the object class value displayed in this panel.
+ * @return the object class value displayed in this panel.
+ */
+ public ObjectClassValue getValue()
+ {
+ return value;
+ }
+
+ /**
+ * Updates the visibility of the lock icon.
+ * @param visible whether the lock icon is visible or not.
+ */
+ public void setLockIconVisible(boolean visible)
+ {
+ if (visible)
+ {
+ lockLabel.setIcon(lockIcon);
+ lockLabel.setVisible(true);
+ }
+ else
+ {
+ lockLabel.setIcon(null);
+ lockLabel.setVisible(false);
+ }
+ }
+
+ /**
+ * Explicitly request the focus for the edit button of this panel.
+ *
+ */
+ public void requestFocusForButton()
+ {
+ editButton.requestFocusInWindow();
+ }
+
+
+ /**
+ * Adds an action listener to this panel. The action listener will be
+ * invoked when the user clicks on the 'Edit' button.
+ * @param listener the action listener.
+ */
+ public void addEditActionListener(ActionListener listener)
+ {
+ editButton.addActionListener(listener);
+ }
+
+ /**
+ * Removes an action listener previously added with the method
+ * addEditActionListener.
+ * @param listener the action listener.
+ */
+ public void removeEditActionListener(ActionListener listener)
+ {
+ editButton.removeActionListener(listener);
+ }
+
+ /**
+ * Updates the visibility of the edit button.
+ * @param visible whether the edit button must be visible or not.
+ */
+ public void setEditButtonVisible(boolean visible)
+ {
+ editButton.setVisible(visible);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected boolean processKeyBinding(KeyStroke ks, KeyEvent e,
+ int condition, boolean pressed)
+ {
+ return editButton.processKeyBinding(ks, e, condition, pressed);
+ }
+
+ /**
+ * Returns the message describing the provided object class value.
+ * @param value the object class value.
+ * @return the message describing the provided object class value.
+ */
+ public Message getMessage(ObjectClassValue value)
+ {
+ MessageBuilder sb = new MessageBuilder();
+ if (value != null)
+ {
+ Set<String> aux = new TreeSet<String>();
+ aux.addAll(value.getAuxiliary());
+ aux.remove("top");
+ if (value.getStructural() != null)
+ {
+ sb.append(value.getStructural());
+ }
+ if (aux.size() > 0)
+ {
+ if (sb.length() > 0)
+ {
+ sb.append("<br>");
+ }
+ sb.append(INFO_CTRL_PANEL_OBJECTCLASS_CELL_PANEL_AUXILIARY.get(
+ Utilities.getStringFromCollection(aux, ", ")));
+ }
+ }
+ if (sb.length() > 0)
+ {
+ return Message.raw("<html>"+Utilities.applyFont(sb.toString(),
+ ColorAndFontConstants.defaultFont));
+ }
+ else
+ {
+ return INFO_CTRL_PANEL_NO_VALUE_SPECIFIED.get();
+ }
+ }
+}
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/TitlePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/TitlePanel.java
new file mode 100644
index 0000000..d83a451
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/TitlePanel.java
@@ -0,0 +1,118 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+
+/**
+ * This is a panel containing two labels with different fonts. It is used
+ * for instance in the index panel. The label on the left contains the type
+ * of object and the label on the right, details about the object.
+ *
+ */
+public class TitlePanel extends JPanel
+{
+ private static final long serialVersionUID = -5164867192115208627L;
+ private JLabel lTitle;
+ private JLabel lDetails;
+
+ private Message title;
+ private Message details;
+
+ /**
+ * Constructor of the panel.
+ * @param title the title of the panel.
+ * @param details the details of the panel.
+ */
+ public TitlePanel(Message title, Message details)
+ {
+ super(new GridBagLayout());
+ setOpaque(false);
+ GridBagConstraints gbc = new GridBagConstraints();
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(title);
+ mb.append(" - ");
+ lTitle = Utilities.createTitleLabel(mb.toMessage());
+ lDetails = Utilities.createDefaultLabel(details);
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.SOUTHWEST;
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ add(lTitle, gbc);
+ gbc.gridx ++;
+ add(lDetails, gbc);
+ this.title = title;
+ this.details = details;
+ }
+
+ /**
+ * Sets the title of this panel.
+ * @param title the title of this panel.
+ */
+ public void setTitle(Message title)
+ {
+ lTitle.setText(title+" - ");
+ this.title = title;
+ }
+
+ /**
+ * Sets the details of this panel.
+ * @param details the details of this panel.
+ */
+ public void setDetails(Message details)
+ {
+ lDetails.setText(details.toString());
+ this.details = details;
+ }
+
+ /**
+ * Returns the title of this panel.
+ * @return the title of this panel.
+ */
+ public Message getTitle()
+ {
+ return title;
+ }
+
+ /**
+ * Returns the details of this panel.
+ * @return the details of this panel.
+ */
+ public Message getDetails()
+ {
+ return details;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/TreePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/TreePanel.java
new file mode 100644
index 0000000..ba37923
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/TreePanel.java
@@ -0,0 +1,131 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.components;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+
+import javax.swing.JTree;
+import javax.swing.tree.TreeSelectionModel;
+
+import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.GenericDialog;
+import org.opends.guitools.controlpanel.ui.StatusGenericPanel;
+import org.opends.guitools.controlpanel.ui.renderer.TreeCellRenderer;
+import org.opends.messages.Message;
+
+/**
+ * A basic panel containing a CustomTree.
+ *
+ */
+public class TreePanel extends StatusGenericPanel
+{
+ private static final long serialVersionUID = 5650902943430126109L;
+ private JTree tree;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public TreePanel()
+ {
+ super();
+ createLayout();
+ }
+
+ /**
+ * Creates the layout of the panel (but the contents are not populated here).
+ *
+ */
+ private void createLayout()
+ {
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+
+ tree = new CustomTree();
+ tree.getSelectionModel().setSelectionMode(
+ TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
+ tree.setBackground(ColorAndFontConstants.background);
+ tree.setCellRenderer(new TreeCellRenderer());
+ tree.setShowsRootHandles(true);
+ tree.setScrollsOnExpand(false);
+ add(tree, gbc);
+ }
+
+ /**
+ * Returns the tree contained in the panel.
+ * @return the tree contained in the panel.
+ */
+ public JTree getTree()
+ {
+ return tree;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void okClicked()
+ {
+ // No ok button
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GenericDialog.ButtonType getButtonType()
+ {
+ return GenericDialog.ButtonType.NO_BUTTON;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Message getTitle()
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getPreferredFocusComponent()
+ {
+ return tree;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configurationChanged(ConfigurationChangeEvent ev)
+ {
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/package-info.java
new file mode 100644
index 0000000..2812173
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/components/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Contains some components used in the Control Panel: the MainActionsPane,
+ * the ActionButton, etc.
+ */
+package org.opends.guitools.controlpanel.ui.components;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
new file mode 100644
index 0000000..2c0bafb
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
@@ -0,0 +1,73 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+
+/**
+ * Abstract class with some common methods for all the nodes in the
+ * 'Manage Index' tree.
+ *
+ */
+public abstract class AbstractIndexTreeNode extends DefaultMutableTreeNode
+{
+ private String name;
+ /**
+ * Constructor.
+ * @param name the name of the node.
+ */
+ protected AbstractIndexTreeNode(String name)
+ {
+ super(name);
+ this.name = name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isRoot()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isLeaf()
+ {
+ return true;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
new file mode 100644
index 0000000..8837ad2
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
@@ -0,0 +1,61 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import org.opends.server.api.AttributeSyntax;
+
+/**
+ * Class of the nodes that represent an attribute syntax in the 'Manage Schema'
+ * tree.
+ *
+ */
+public class AttributeSyntaxTreeNode extends SchemaElementTreeNode
+{
+ private static final long serialVersionUID = 2439971368723239776L;
+ private AttributeSyntax syntax;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param syntax the attribute syntax.
+ */
+ public AttributeSyntaxTreeNode(String name, AttributeSyntax syntax)
+ {
+ super(name, syntax);
+ this.syntax = syntax;
+ }
+
+ /**
+ * Returns the attribute syntax represented by this node.
+ * @return the attribute syntax represented by this node.
+ */
+ public AttributeSyntax getAttributeSyntax()
+ {
+ return syntax;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
new file mode 100644
index 0000000..dea8328
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
@@ -0,0 +1,441 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import javax.swing.Icon;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import org.opends.guitools.controlpanel.browser.BasicNodeError;
+import org.opends.server.types.DN;
+import org.opends.server.types.LDAPURL;
+import org.opends.server.types.RDN;
+
+/**
+ * The basic node used to render entries in the 'Manage Entries' tree.
+ *
+ */
+public class BasicNode extends DefaultMutableTreeNode {
+
+ private static final long serialVersionUID = 5441658731908509872L;
+ private String localDn;
+ private String localRdn;
+ private String localRdnWithAttributeName;
+ private LDAPURL remoteUrl;
+ private String remoteRdn;
+ private String remoteRdnWithAttributeName;
+
+ private boolean isLeaf;
+ private boolean refreshNeededOnExpansion = true;
+ private boolean obsolete;
+ private BasicNodeError error;
+
+ private String[] referral;
+ private int numSubOrdinates;
+
+ private String displayName;
+ private Icon icon;
+ private int fontStyle;
+
+ private boolean sizeLimitReached = false;
+
+ private String[] objectClassValues;
+
+ /**
+ * Constructor.
+ * @param dn the DN of the entry.
+ */
+ public BasicNode(String dn) {
+ localDn = dn;
+ localRdn = extractRDN(localDn);
+ localRdnWithAttributeName = extractRDN(localDn, true);
+ isLeaf = true;
+ refreshNeededOnExpansion = true;
+ numSubOrdinates = -1;
+ displayName = "";
+ }
+
+
+ /**
+ * Returns the DN of the local entry.
+ * @return the DN of the local entry.
+ */
+ public String getDN() {
+ return localDn;
+ }
+
+ /**
+ * Returns the RDN value of the local entry.
+ * @return the RDN value of the local entry.
+ */
+ public String getRDN() {
+ return localRdn;
+ }
+
+ /**
+ * Returns the RDN (with the attribute name) of the local entry.
+ * @return the RDN (with the attribute name) of the local entry.
+ */
+ public String getRDNWithAttributeName() {
+ return localRdnWithAttributeName;
+ }
+
+ /**
+ * Returns the URL of the remote entry (if the node does not represent a
+ * referral it will be <CODE>null</CODE>).
+ * @return the URL of the remote entry (if the node does not represent a
+ * referral it will be <CODE>null</CODE>).
+ */
+ public LDAPURL getRemoteUrl() {
+ return remoteUrl;
+ }
+
+ /**
+ * Sets the remote URL of the node.
+ * @param url the remote URL of the node.
+ */
+ public void setRemoteUrl(LDAPURL url) {
+ remoteUrl = url;
+ remoteRdn = extractRDN(remoteUrl.getRawBaseDN());
+ remoteRdnWithAttributeName = extractRDN(remoteUrl.getRawBaseDN(), true);
+ }
+
+ /**
+ * Sets the remote URL of the node.
+ * @param url the remote URL of the node.
+ */
+ public void setRemoteUrl(String url) {
+ try
+ {
+ if (url == null)
+ {
+ remoteUrl = null;
+ }
+ else
+ {
+ remoteUrl = LDAPURL.decode(url, false);
+ }
+ if (remoteUrl == null) {
+ remoteRdn = null;
+ remoteRdnWithAttributeName = null;
+ }
+ else {
+ remoteRdn = extractRDN(remoteUrl.getRawBaseDN());
+ remoteRdnWithAttributeName = extractRDN(remoteUrl.getRawBaseDN(), true);
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalArgumentException(
+ "The provided url: "+url+" is not valid:"+t, t);
+ }
+ }
+
+ /**
+ * Returns the RDN value of the remote entry. If the node does not
+ * represent a referral it will return <CODE>null</CODE>.
+ * @return the RDN value of the remote entry.
+ */
+ public String getRemoteRDN() {
+ return remoteRdn;
+ }
+
+ /**
+ * Returns the RDN value of the remote entry (with the name of the attribute).
+ * If the node does not represent a referral it will return <CODE>null</CODE>.
+ * @return the RDN value of the remote entry (with the name of the attribute).
+ */
+ public String getRemoteRDNWithAttributeName() {
+ return remoteRdnWithAttributeName;
+ }
+
+
+ /**
+ * Sets whether the node is a leaf or not.
+ * @param isLeaf whether the node is a leaf or not.
+ */
+ public void setLeaf(boolean isLeaf) {
+ this.isLeaf = isLeaf;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the node is a leaf and <CODE>false</CODE>
+ * otherwise.
+ * @return <CODE>true</CODE> if the node is a leaf and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isLeaf() {
+ return isLeaf;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the node must be refreshed when it is expanded
+ * and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the node must be refreshed when it is expanded
+ * and <CODE>false</CODE> otherwise.
+ */
+ public boolean isRefreshNeededOnExpansion() {
+ return refreshNeededOnExpansion;
+ }
+
+ /**
+ * Sets whether the node must be refreshed when it is expanded or not.
+ * @param refreshNeededOnExpansion whether the node must be refreshed when it
+ * is expanded or not.
+ */
+ public void setRefreshNeededOnExpansion(boolean refreshNeededOnExpansion) {
+ this.refreshNeededOnExpansion = refreshNeededOnExpansion;
+ }
+
+ /**
+ * Returns whether the node is obsolete (and must be refreshed) or not.
+ * @return <CODE>true</CODE> if the node is obsolete and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean isObsolete() {
+ return obsolete;
+ }
+
+ /**
+ * Sets whether this is node is obsolete (and must be refreshed) or not.
+ * @param obsolete whether this is node is obsolete (and must be refreshed) or
+ * not.
+ */
+ public void setObsolete(boolean obsolete) {
+ this.obsolete = obsolete;
+ }
+
+ /**
+ * Returns the error that occurred when updating the node. Returns
+ * <CODE>null</CODE> if no error occurred.
+ * @return the error that occurred when updating the node. Returns
+ * <CODE>null</CODE> if no error occurred.
+ */
+ public BasicNodeError getError() {
+ return error;
+ }
+
+ /**
+ * Sets the error that occurred when updating the node.
+ * @param error the error.
+ */
+ public void setError(BasicNodeError error) {
+ this.error = error;
+ }
+
+
+ /**
+ * Cached LDAP attributes
+ */
+
+ /**
+ * Returns the number of subordinates of the entry.
+ * @return the number of subordinates of the entry.
+ */
+ public int getNumSubOrdinates() {
+ return numSubOrdinates;
+ }
+
+ /**
+ * Sets the number of subordinates of the entry.
+ * @param number the number of subordinates of the entry.
+ */
+ public void setNumSubOrdinates(int number) {
+ numSubOrdinates = number;
+ }
+
+ /**
+ * Returns the referrals of the entry. Returns <CODE>null</CODE> if this node
+ * is not a referral.
+ * @return the referrals of the entry. Returns <CODE>null</CODE> if this node
+ * is not a referral.
+ */
+ public String[] getReferral() {
+ return referral;
+ }
+
+ /**
+ * Sets the referrals of the entry.
+ * @param referral the referrals of the entry.
+ */
+ public void setReferral(String[] referral) {
+ this.referral = referral;
+ }
+
+
+ /**
+ * Rendering
+ */
+ /**
+ * {@inheritDoc}
+ */
+ public String toString() {
+ return getDisplayName();
+ }
+
+ /**
+ * Returns the label that will be used to display the entry.
+ * @return the label that will be used to display the entry.
+ */
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ /**
+ * Sets the label that will be used to display the entry.
+ * @param name the label that will be used to display the entry.
+ */
+ public void setDisplayName(String name) {
+ displayName = name;
+ }
+
+ /**
+ * Returns the icon associated with this node.
+ * @return the icon associated with this node.
+ */
+ public Icon getIcon() {
+ return icon;
+ }
+
+
+ /**
+ * Sets the icon associated with this node.
+ * @param icon the icon associated with this node.
+ */
+ public void setIcon(Icon icon) {
+ this.icon = icon;
+ }
+
+ /**
+ * Returns the font style to be used to render this node.
+ * @return the font style to be used to render this node.
+ */
+ public int getFontStyle() {
+ return fontStyle;
+ }
+
+ /**
+ * Sets the font style to be used to render this node.
+ * @param style the font style to be used to render this node.
+ */
+ public void setFontStyle(int style) {
+ fontStyle = style;
+ }
+
+
+ /**
+ * Returns the object class values associated with the entry.
+ * @return the object class values associated with the entry.
+ */
+ public String[] getObjectClassValues() {
+ return objectClassValues;
+ }
+
+ /**
+ * Sets the object class values associated with the entry.
+ * @param objectClassValues the object class values associated with the entry.
+ */
+ public void setObjectClassValues(String[] objectClassValues) {
+ this.objectClassValues = objectClassValues;
+ }
+
+ /**
+ * Extracts the RDN value from a DN.
+ * @param dn the DN.
+ * @param showAttributeName whether the result must include the attribute name
+ * or not.
+ * @return the RDN value from the DN.
+ */
+ public static String extractRDN(String dn, boolean showAttributeName) {
+ String result;
+ if (dn == null)
+ {
+ result = null;
+ }
+ else
+ {
+ try
+ {
+ DN dnObj = DN.decode(dn);
+ if (dnObj.getNumComponents() >= 1) {
+ RDN rdn = dnObj.getRDN();
+ if (showAttributeName)
+ {
+ result = rdn.toString();
+ }
+ else
+ {
+ result = rdn.getAttributeValue(0).getStringValue();
+ }
+ }
+ else {
+ result = "";
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new IllegalArgumentException(
+ "The provided argument is not a valid dn: "+t, t);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Extracts the RDN value from the DN. The value does not include the name
+ * of the attribute.
+ * @param dn the DN.
+ * @return the RDN value from the DN.
+ */
+ public static String extractRDN(String dn) {
+ return extractRDN(dn, false);
+ }
+
+
+ /**
+ * Returns <CODE>true</CODE> if the size limit was reached updating this node
+ * (and searching its children) and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the size limit was reached updating this node
+ * (and searching its children) and <CODE>false</CODE> otherwise.
+ */
+ public boolean isSizeLimitReached()
+ {
+ return sizeLimitReached;
+ }
+
+
+ /**
+ * Sets whether the size limit was reached updating this node
+ * (and searching its children).
+ * @param sizeLimitReached whether the size limit was reached updating this
+ * node (and searching its children).
+ */
+ public void setSizeLimitReached(boolean sizeLimitReached)
+ {
+ this.sizeLimitReached = sizeLimitReached;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
new file mode 100644
index 0000000..342ba30
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
@@ -0,0 +1,169 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import javax.swing.tree.TreePath;
+
+import org.opends.server.types.LDAPURL;
+
+/**
+ * Interface used in the LDAP entries browser code to deal with entries.
+ *
+ */
+public interface BrowserNodeInfo {
+
+ /**
+ * URL of the displayed entry.
+ * @return the URL of the displayed entry.
+ */
+ public LDAPURL getURL();
+
+
+ /**
+ * Returns <CODE>true</CODE> if the displayed entry is the top entry of a
+ * suffix and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the displayed entry is the top entry of a
+ * suffix and <CODE>false</CODE> otherwise.
+ */
+ public boolean isSuffix();
+
+
+ /**
+ * Returns <CODE>true</CODE> if the displayed entry is the root node of the
+ * server (the dn="" entry) and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the displayed entry is the root node of the
+ * server (the dn="" entry) and <CODE>false</CODE> otherwise.
+ */
+ public boolean isRootNode();
+
+ /**
+ * Returns <CODE>true</CODE> if the displayed entry is not located on the
+ * current server. An entry is declared 'remote' when the host/port of
+ * getURL() is different from the host/port of the DirContext associated to
+ * the browser controller. Returns <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the displayed entry is not located on the
+ * current server. An entry is declared 'remote' when the host/port of
+ * getURL() is different from the host/port of the DirContext associated to
+ * the browser controller. Returns <CODE>false</CODE> otherwise.
+ *
+ */
+ public boolean isRemote();
+
+
+ /**
+ * Returns the value of numsubordinates for the entry.
+ * -1 if the numsubordinates attribute is not defined.
+ * @return the value of numsubordinates for the entry.
+ */
+ public int getNumSubOrdinates();
+
+
+ /**
+ * Returns the referrals attached to the displayed entry.
+ * This is the value of the 'ref' attribute.
+ * Returns <CODE>null</CODE> if the attribute is not present.
+ * @return the referrals attached to the displayed entry.
+ */
+ public String[] getReferral();
+
+
+ /**
+ * Returns the error detected while reading this entry.
+ * @return the error detected while reading this entry.
+ */
+ public int getErrorType();
+
+
+ /**
+ * Returns the exception associated to the error.
+ * Returns <CODE>null</CODE> if getErrorType() == ERROR_NONE.
+ * @return the exception associated to the error.
+ */
+ public Exception getErrorException();
+
+
+ /**
+ * Returns the argument associated to an error/exception.
+ * Always null except when errorType == ERROR_SOLVING_REFERRAL,
+ * errorArg contains the String representing the faulty LDAP URL.
+ * @return the argument associated to an error/exception.
+ */
+ public Object getErrorArg();
+
+ /**
+ * Returns the basic node associated with the node info.
+ * @return the basic node associated with the node info.
+ */
+ public BasicNode getNode();
+
+
+ /**
+ * Returns the TreePath corresponding to the displayed entry.
+ * @return the TreePath corresponding to the displayed entry.
+ */
+ public TreePath getTreePath();
+
+
+ /**
+ * Tells wether the node passed as parameter represents the same node as this
+ * one.
+ * @param node the node.
+ * @return <CODE>true</CODE> if the node passed as parameter represents the
+ * same node as this one and <CODE>false</CODE> otherwise.
+ */
+ public boolean representsSameNode(BrowserNodeInfo node);
+
+ /**
+ * Returns the object class value of the entry that the nodes represents.
+ * @return the object class value of the entry that the nodes represents.
+ */
+ public String[] getObjectClassValues();
+
+ /**
+ * Error types
+ */
+ /**
+ * No error happened.
+ */
+ public static final int ERROR_NONE = 0;
+ /**
+ * And error reading the entry occurred.
+ */
+ public static final int ERROR_READING_ENTRY = 1;
+ /**
+ * An error following referrals occurred.
+ */
+ public static final int ERROR_SOLVING_REFERRAL = 2;
+ /**
+ * An error occurred searching the children of the entry.
+ */
+ public static final int ERROR_SEARCHING_CHILDREN = 3;
+
+
+
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
new file mode 100644
index 0000000..d7461bf
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
@@ -0,0 +1,68 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import org.opends.messages.Message;
+
+/**
+ * The tree node that is used to represent a category. It is used for instance
+ * in the browse index tree to separate categories (index type) from the actual
+ * index nodes.
+ *
+ */
+public class CategoryTreeNode extends DefaultMutableTreeNode
+{
+ private static final long serialVersionUID = -2112887236893130192L;
+
+ /**
+ * Constructor.
+ * @param name the name of the node (the one that be used to display).
+ */
+ public CategoryTreeNode(Message name)
+ {
+ super(name);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isRoot()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isLeaf()
+ {
+ return getChildCount() == 0;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationAttributeTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationAttributeTreeNode.java
new file mode 100644
index 0000000..8c48c89
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationAttributeTreeNode.java
@@ -0,0 +1,61 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import org.opends.server.types.AttributeType;
+
+/**
+ * Class of the nodes that represent a configuration attribute in the 'Manage
+ * Schema' tree.
+ *
+ */
+public class ConfigurationAttributeTreeNode extends SchemaElementTreeNode
+{
+ private static final long serialVersionUID = 428949987639862400L;
+ private AttributeType attr;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param attr the attribute definition.
+ */
+ public ConfigurationAttributeTreeNode(String name, AttributeType attr)
+ {
+ super(name, attr);
+ this.attr = attr;
+ }
+
+ /**
+ * Returns the definition of the attribute represented by this node.
+ * @return the definition of the attribute represented by this node.
+ */
+ public AttributeType getAttribute()
+ {
+ return attr;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java
new file mode 100644
index 0000000..14a3f4d
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java
@@ -0,0 +1,61 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import org.opends.server.types.ObjectClass;
+
+/**
+ * Class of the nodes that represent a configuration object class in the 'Manage
+ * Schema' tree.
+ *
+ */
+public class ConfigurationObjectClassTreeNode extends SchemaElementTreeNode
+{
+ private static final long serialVersionUID = 9121561141135641060L;
+ private ObjectClass oc;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param oc the object class definition.
+ */
+ public ConfigurationObjectClassTreeNode(String name, ObjectClass oc)
+ {
+ super(name, oc);
+ this.oc = oc;
+ }
+
+ /**
+ * Returns the definition of the object class represented by this node.
+ * @return the definition of the object class represented by this node.
+ */
+ public ObjectClass getObjectClass()
+ {
+ return oc;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomAttributeTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomAttributeTreeNode.java
new file mode 100644
index 0000000..8e7afab
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomAttributeTreeNode.java
@@ -0,0 +1,61 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import org.opends.server.types.AttributeType;
+
+/**
+ * Class of the nodes that represent a custom attribute in the 'Manage
+ * Schema' tree.
+ *
+ */
+public class CustomAttributeTreeNode extends SchemaElementTreeNode
+{
+ private static final long serialVersionUID = -9198486156950262507L;
+ private AttributeType attr;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param attr the attribute definition.
+ */
+ public CustomAttributeTreeNode(String name, AttributeType attr)
+ {
+ super(name, attr);
+ this.attr = attr;
+ }
+
+ /**
+ * Returns the definition of the attribute represented by this node.
+ * @return the definition of the attribute represented by this node.
+ */
+ public AttributeType getAttribute()
+ {
+ return attr;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java
new file mode 100644
index 0000000..61bbd42
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java
@@ -0,0 +1,61 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import org.opends.server.types.ObjectClass;
+
+/**
+ * Class of the nodes that represent a custom object class in the 'Manage
+ * Schema' tree.
+ *
+ */
+public class CustomObjectClassTreeNode extends SchemaElementTreeNode
+{
+ private static final long serialVersionUID = -3525236184507876077L;
+ private ObjectClass oc;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param oc the object class definition.
+ */
+ public CustomObjectClassTreeNode(String name, ObjectClass oc)
+ {
+ super(name, oc);
+ this.oc = oc;
+ }
+
+ /**
+ * Returns the definition of the object class represented by this node.
+ * @return the definition of the object class represented by this node.
+ */
+ public ObjectClass getObjectClass()
+ {
+ return oc;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
new file mode 100644
index 0000000..f3a6b47
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
@@ -0,0 +1,126 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import java.awt.Component;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+
+/**
+ * An implementation of Transferable used in the LDAP entry browser to use
+ * drag and drop. Currently drag and drop is used for instance to drag a
+ * number of entries from a browser and drop them in the list of members of
+ * a group.
+ *
+ */
+
+public class DndBrowserNodes implements Transferable {
+ /**
+ * The data flavor managed by this transferable.
+ */
+ final public static DataFlavor INFO_FLAVOR =
+ new DataFlavor(BrowserNodeInfo.class, "Browse Node Information");
+
+ static DataFlavor[] FLAVORS = {INFO_FLAVOR };
+
+ private BrowserNodeInfo[] nodes;
+
+ private Component parent; // The component that contains the nodes
+
+ /**
+ * Transferable implementation
+ * ============================================
+ */
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isDataFlavorSupported(DataFlavor df) {
+ return df.equals(INFO_FLAVOR);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object getTransferData(DataFlavor df)
+ throws UnsupportedFlavorException, IOException {
+ if (df.equals(INFO_FLAVOR)) {
+ return this;
+ }
+ else throw new UnsupportedFlavorException(df);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public DataFlavor[] getTransferDataFlavors() {
+ return FLAVORS;
+ }
+
+ /**
+ * Returns the nodes that are being dragged (and dropped).
+ * @return the nodes that are being dragged (and dropped).
+ */
+ public BrowserNodeInfo[] getNodes()
+ {
+ return nodes;
+ }
+
+ /**
+ * Sets the nodes that are being dragged (and dropped).
+ * @param nodes the nodes that are being dragged (and dropped).
+ */
+ public void setNodes(BrowserNodeInfo[] nodes)
+ {
+ this.nodes = nodes;
+ }
+
+ /**
+ * Returns the component that contains the nodes (for instance the tree in
+ * the LDAP browser).
+ * @return the component that contains the nodes (for instance the tree in
+ * the LDAP browser).
+ */
+ public Component getParent()
+ {
+ return parent;
+ }
+
+ /**
+ * Sets the component that contains the nodes (for instance the tree in
+ * the LDAP browser).
+ * @param parent the component that contains the nodes.
+ */
+ public void setParent(Component parent)
+ {
+ this.parent = parent;
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java
new file mode 100644
index 0000000..181dd47
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java
@@ -0,0 +1,60 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+
+/**
+ * A node representing a 'normal' index. It is used in the 'Manage Index' tree.
+ *
+ */
+public class IndexTreeNode extends AbstractIndexTreeNode
+{
+ private static final long serialVersionUID = -3527916032758373700L;
+ private IndexDescriptor index;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param index the index associated with the node.
+ */
+ public IndexTreeNode(String name, IndexDescriptor index)
+ {
+ super(name);
+ this.index = index;
+ }
+
+ /**
+ * Returns the index descriptor associated with the node.
+ * @return the index descriptor associated with the node.
+ */
+ public IndexDescriptor getIndex()
+ {
+ return index;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java
new file mode 100644
index 0000000..af1f31c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java
@@ -0,0 +1,61 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import org.opends.server.api.MatchingRule;
+
+/**
+ * Class of the nodes that represent a matching rule in the 'Manage Schema'
+ * tree.
+ *
+ */
+public class MatchingRuleTreeNode extends SchemaElementTreeNode
+{
+ private static final long serialVersionUID = 75800988643731136L;
+ private MatchingRule rule;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param rule the matching rule associated with the node.
+ */
+ public MatchingRuleTreeNode(String name, MatchingRule rule)
+ {
+ super(name, rule);
+ this.rule = rule;
+ }
+
+ /**
+ * Returns the matching rule definition represented by this node.
+ * @return the matching rule definition represented by this node.
+ */
+ public MatchingRule getMatchingRule()
+ {
+ return rule;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/RootNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/RootNode.java
new file mode 100644
index 0000000..a98b344
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/RootNode.java
@@ -0,0 +1,48 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+/**
+ * The root node of the tree in the 'Manage Entries...' tree. It represents
+ * the root entry of the directory.
+ *
+ */
+public class RootNode extends SuffixNode {
+
+ private static final long serialVersionUID = 9030738910898224866L;
+
+ /**
+ * Constructor of the node.
+ *
+ */
+ public RootNode() {
+ super("");
+ setLeaf(false);
+ setRefreshNeededOnExpansion(false);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
new file mode 100644
index 0000000..aaf293e
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
@@ -0,0 +1,88 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+
+/**
+ * Abstract class with some common methods for all the nodes in the
+ * 'Manage Schema' tree.
+ *
+ */
+public abstract class SchemaElementTreeNode extends DefaultMutableTreeNode
+{
+ private String name;
+ private Object schemaElement;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param schemaElement the schema element (attribute definition, object class
+ * definition, etc.) associated with the node.
+ */
+ protected SchemaElementTreeNode(String name, Object schemaElement)
+ {
+ super(name);
+ this.name = name;
+ this.schemaElement = schemaElement;
+ }
+
+ /**
+ * Returns the name of the node.
+ * @return the name of the node.
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Returns the schema element associated with the node.
+ * @return the schema element associated with the node.
+ */
+ public Object getSchemaElement()
+ {
+ return schemaElement;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isRoot()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isLeaf()
+ {
+ return true;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardAttributeTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardAttributeTreeNode.java
new file mode 100644
index 0000000..152c7f1
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardAttributeTreeNode.java
@@ -0,0 +1,61 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import org.opends.server.types.AttributeType;
+
+/**
+ * Class of the nodes that represent a standard attribute in the 'Manage
+ * Schema' tree.
+ *
+ */
+public class StandardAttributeTreeNode extends SchemaElementTreeNode
+{
+ private static final long serialVersionUID = -3439217150360205524L;
+ private AttributeType attr;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param attr the attribute definition.
+ */
+ public StandardAttributeTreeNode(String name, AttributeType attr)
+ {
+ super(name, attr);
+ this.attr = attr;
+ }
+
+ /**
+ * Returns the definition of the attribute represented by this node.
+ * @return the definition of the attribute represented by this node.
+ */
+ public AttributeType getAttribute()
+ {
+ return attr;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java
new file mode 100644
index 0000000..2f68403
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java
@@ -0,0 +1,62 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import org.opends.server.types.ObjectClass;
+
+
+/**
+ * Class of the nodes that represent a standard object class in the 'Manage
+ * Schema' tree.
+ *
+ */
+public class StandardObjectClassTreeNode extends SchemaElementTreeNode
+{
+ private static final long serialVersionUID = 3266062905133766539L;
+ private ObjectClass oc;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param oc the object class definition.
+ */
+ public StandardObjectClassTreeNode(String name, ObjectClass oc)
+ {
+ super(name, oc);
+ this.oc = oc;
+ }
+
+ /**
+ * Returns the definition of the object class represented by this node.
+ * @return the definition of the object class represented by this node.
+ */
+ public ObjectClass getObjectClass()
+ {
+ return oc;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java
new file mode 100644
index 0000000..953a97f
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java
@@ -0,0 +1,45 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+/**
+ * Represents a suffix in the tree in the 'Manage Entries...' tree.
+ *
+ */
+public class SuffixNode extends BasicNode {
+
+ private static final long serialVersionUID = -58392395417985255L;
+
+ /**
+ * Constructor of the node.
+ * @param dn the DN of the suffix.
+ */
+ public SuffixNode(String dn) {
+ super(dn);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java
new file mode 100644
index 0000000..209f9fc
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java
@@ -0,0 +1,60 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.nodes;
+
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+
+/**
+ * A node representing a VLV index. It is used in the 'Manage Index' tree.
+ *
+ */
+public class VLVIndexTreeNode extends AbstractIndexTreeNode
+{
+ private static final long serialVersionUID = -4067198828465569689L;
+ private VLVIndexDescriptor index;
+
+ /**
+ * Constructor of the node.
+ * @param name the name of the node.
+ * @param index the VLV index associated with the node.
+ */
+ public VLVIndexTreeNode(String name, VLVIndexDescriptor index)
+ {
+ super(name);
+ this.index = index;
+ }
+
+ /**
+ * Returns the VLV index descriptor associated with the node.
+ * @return the VLV index descriptor associated with the node.
+ */
+ public VLVIndexDescriptor getIndex()
+ {
+ return index;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/package-info.java
new file mode 100644
index 0000000..f588771
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Contains the different nodes that are used in the trees of the Control Panel
+ * (index browser, schema browser, LDAP entries browser...).
+ */
+package org.opends.guitools.controlpanel.ui.nodes;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/package-info.java
new file mode 100644
index 0000000..e5ff372
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Contains the panels and dialogs displayed in the Control Panel.
+ *
+ */
+package org.opends.guitools.controlpanel.ui;
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
new file mode 100644
index 0000000..4b8274c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
@@ -0,0 +1,368 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.AbstractCellEditor;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JPasswordField;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.table.TableCellEditor;
+
+import org.opends.guitools.controlpanel.datamodel.BinaryValue;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ObjectClassValue;
+import org.opends.guitools.controlpanel.ui.BinaryAttributeEditorPanel;
+import org.opends.guitools.controlpanel.ui.ObjectClassEditorPanel;
+import org.opends.guitools.controlpanel.ui.GenericDialog;
+import org.opends.guitools.controlpanel.ui.components.BinaryCellPanel;
+import org.opends.guitools.controlpanel.ui.components.ObjectClassCellPanel;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * The cell editor used in the 'Attribute' View of the entries in the LDAP
+ * entry browser.
+ *
+ */
+public class AttributeCellEditor extends AbstractCellEditor
+implements TableCellEditor
+{
+ private static final long serialVersionUID = 1979354208925355746L;
+
+ private BinaryCellPanel binaryPanel;
+
+ private ObjectClassCellPanel ocPanel;
+
+ private ObjectClassValue ocValue;
+ private byte[] value;
+ private BinaryValue binaryValue;
+
+ private TableCellEditor defaultEditor;
+ private TableCellEditor passwordEditor;
+
+ private GenericDialog editBinaryDlg;
+ private BinaryAttributeEditorPanel editBinaryPanel;
+
+ private GenericDialog editOcDlg;
+ private ObjectClassEditorPanel editOcPanel;
+
+ private JTable table;
+
+ private JTextField textField;
+
+ private JPasswordField passwordField;
+
+ private ControlPanelInfo info;
+
+ private String attrName;
+
+
+ /**
+ * Default constructor.
+ *
+ */
+ public AttributeCellEditor()
+ {
+ textField = Utilities.createTextField();
+ textField.getDocument().addDocumentListener(new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ if (!textField.hasFocus())
+ {
+ textField.requestFocusInWindow();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ changedUpdate(ev);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ changedUpdate(ev);
+ }
+ });
+ passwordField = Utilities.createPasswordField();
+ passwordField.getDocument().addDocumentListener(new DocumentListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void changedUpdate(DocumentEvent ev)
+ {
+ if (!passwordField.hasFocus())
+ {
+ passwordField.requestFocusInWindow();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void insertUpdate(DocumentEvent ev)
+ {
+ changedUpdate(ev);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeUpdate(DocumentEvent ev)
+ {
+ changedUpdate(ev);
+ }
+ });
+ this.defaultEditor = new DefaultCellEditor(textField);
+ this.passwordEditor = new DefaultCellEditor(passwordField);
+ binaryPanel = new BinaryCellPanel();
+ binaryPanel.addEditActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent e)
+ {
+ if (editBinaryDlg == null)
+ {
+ editBinaryPanel = new BinaryAttributeEditorPanel();
+ editBinaryPanel.setInfo(getInfo());
+ editBinaryDlg = new GenericDialog(Utilities.getFrame(table),
+ editBinaryPanel);
+ editBinaryDlg.setModal(true);
+ Utilities.centerGoldenMean(editBinaryDlg,
+ Utilities.getParentDialog(table));
+ }
+ if (binaryValue != null)
+ {
+ editBinaryPanel.setValue(attrName, binaryValue);
+ }
+ else if (value != null)
+ {
+ if (value.length > 0)
+ {
+ editBinaryPanel.setValue(attrName,
+ BinaryValue.createBase64(value));
+ }
+ else
+ {
+ editBinaryPanel.setValue(attrName, null);
+ }
+ }
+ else
+ {
+ editBinaryPanel.setValue(attrName, null);
+ }
+ editBinaryDlg.setVisible(true);
+ if (editBinaryPanel.valueChanged())
+ {
+ BinaryValue changedValue = editBinaryPanel.getBinaryValue();
+ binaryValue = changedValue;
+ value = null;
+ ocValue = null;
+ }
+ fireEditingStopped();
+ }
+ });
+ ocPanel = new ObjectClassCellPanel();
+ ocPanel.addEditActionListener(new ActionListener()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void actionPerformed(ActionEvent ev)
+ {
+
+ if (editOcDlg == null)
+ {
+ editOcPanel = new ObjectClassEditorPanel();
+ editOcPanel.setInfo(getInfo());
+ editOcDlg = new GenericDialog(
+ null,
+ editOcPanel);
+ editOcDlg.setModal(true);
+ Utilities.centerGoldenMean(editOcDlg,
+ Utilities.getParentDialog(table));
+ }
+ if (ocValue != null)
+ {
+ editOcPanel.setValue(ocValue);
+ }
+ editOcDlg.setVisible(true);
+ if (editOcPanel.valueChanged())
+ {
+ binaryValue = null;
+ value = null;
+ ocValue = editOcPanel.getObjectClassValue();
+ fireEditingStopped();
+ }
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getTableCellEditorComponent(JTable table, Object value,
+ boolean isSelected, int row, int column)
+ {
+ this.table = table;
+ if (isPassword(table, row))
+ {
+ this.value = null;
+ this.binaryValue = null;
+ this.ocValue = null;
+ return passwordEditor.getTableCellEditorComponent(table, value,
+ isSelected, row, column);
+ }
+ else if (value instanceof ObjectClassValue)
+ {
+ this.value = null;
+ this.binaryValue = null;
+ this.ocValue = (ObjectClassValue)value;
+ ocPanel.setValue(ocValue);
+ ocPanel.setBorder(CustomCellRenderer.getDefaultFocusBorder(table,
+ value, isSelected, row, column));
+ return ocPanel;
+ }
+ else if ((value instanceof byte[]) || (value instanceof BinaryValue))
+ {
+ attrName = getAttributeName(table, row);
+ boolean isImage = Utilities.hasImageSyntax(attrName,
+ getInfo().getServerDescriptor().getSchema());
+ if (value instanceof byte[])
+ {
+ this.value = (byte[])value;
+ this.binaryValue = null;
+ this.ocValue = null;
+ if (this.value.length > 0)
+ {
+ binaryPanel.setValue(BinaryValue.createBase64(this.value), isImage);
+ }
+ else
+ {
+ binaryPanel.setValue((byte[])null, isImage);
+ }
+ }
+ else
+ {
+ this.value = null;
+ this.ocValue = null;
+ binaryValue = (BinaryValue)value;
+ binaryPanel.setValue(binaryValue, isImage);
+ }
+ binaryPanel.setBorder(CustomCellRenderer.getDefaultFocusBorder(table,
+ value, isSelected, row, column));
+ return binaryPanel;
+ }
+ else
+ {
+ this.value = null;
+ this.binaryValue = null;
+ this.ocValue = null;
+ return defaultEditor.getTableCellEditorComponent(table, value, isSelected,
+ row, column);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object getCellEditorValue()
+ {
+ if (binaryValue != null)
+ {
+ return binaryValue;
+ }
+ else if (value != null)
+ {
+ return value;
+ }
+ else if (ocValue != null)
+ {
+ return ocValue;
+ }
+ else
+ {
+ return defaultEditor.getCellEditorValue();
+ }
+ }
+
+ private boolean isPassword(JTable table, int row)
+ {
+ boolean isPassword = false;
+ Object o = table.getValueAt(row, 0);
+ if (Utilities.hasPasswordSyntax(String.valueOf(o),
+ getInfo().getServerDescriptor().getSchema()))
+ {
+ isPassword = true;
+ }
+ return isPassword;
+ }
+
+ private String getAttributeName(JTable table, int row)
+ {
+ Object o = table.getValueAt(row, 0);
+ String attrName = String.valueOf(o);
+ return attrName;
+ }
+
+ /**
+ * Returns the control panel information.
+ * @return the control panel information.
+ */
+ public ControlPanelInfo getInfo()
+ {
+ return info;
+ }
+
+ /**
+ * Sets the control panel information.
+ * @param info the control panel information.
+ */
+ public void setInfo(ControlPanelInfo info)
+ {
+ this.info = info;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
new file mode 100644
index 0000000..b4f3c3a
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
@@ -0,0 +1,135 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import java.awt.Component;
+import java.io.File;
+import java.text.DateFormat;
+import java.util.Date;
+
+import javax.swing.BorderFactory;
+import javax.swing.JTable;
+import javax.swing.SwingConstants;
+import javax.swing.border.Border;
+import javax.swing.table.DefaultTableCellRenderer;
+
+import org.opends.guitools.controlpanel.datamodel.BackupDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackupTableModel;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+
+/**
+ * Renderer of the table that contains the list of backups (it is used in the
+ * tables of the verify backup and restore panels).
+ *
+ */
+public class BackupTableCellRenderer extends DefaultTableCellRenderer
+{
+ private static final long serialVersionUID = -4645902129785751854L;
+ private DateFormat formatter = DateFormat.getDateInstance(DateFormat.FULL);
+ private final static Border fullBorder = BorderFactory.createCompoundBorder(
+ BorderFactory.createMatteBorder(1, 0, 0, 0,
+ ColorAndFontConstants.gridColor),
+ BorderFactory.createEmptyBorder(4, 4, 4, 4));
+ private final static Border incrementalBorder =
+ BorderFactory.createEmptyBorder(4, 4, 4, 4);
+
+ /**
+ * Default constructor.
+ *
+ */
+ public BackupTableCellRenderer()
+ {
+ setForeground(ColorAndFontConstants.tableForeground);
+ setBackground(ColorAndFontConstants.tableBackground);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column)
+ {
+ String s;
+ boolean isDate = false;
+ boolean isFull = ((BackupTableModel)table.getModel()).get(row).getType()
+ == BackupDescriptor.Type.FULL;
+ if (value instanceof File)
+ {
+ s = "..."+File.separator+((File)value).getName();
+ if (!isFull)
+ {
+ s = " "+s;
+ }
+ }
+ else if (value instanceof Date)
+ {
+ isDate = true;
+ s = formatter.format((Date)value);
+ }
+ else if (value instanceof BackupDescriptor.Type)
+ {
+ if (isFull)
+ {
+ s = "Full";
+ }
+ else
+ {
+ s = "Incremental";
+ }
+ }
+ else if (value instanceof String)
+ {
+ s = (String)value;
+ }
+ else
+ {
+ throw new IllegalArgumentException(
+ "Unknown class for "+value+": "+" row: "+row+ "column: "+column);
+ }
+ super.getTableCellRendererComponent(table, s, isSelected, hasFocus, row,
+ column);
+ if (isFull && (row != 0))
+ {
+ setBorder(fullBorder);
+ }
+ else
+ {
+ setBorder(incrementalBorder);
+ }
+ if (isDate)
+ {
+ setHorizontalAlignment(SwingConstants.RIGHT);
+ }
+ else
+ {
+ setHorizontalAlignment(SwingConstants.LEFT);
+ }
+
+ return this;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
new file mode 100644
index 0000000..635c1ed
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
@@ -0,0 +1,77 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import java.awt.Component;
+
+import javax.swing.JTable;
+
+import org.opends.guitools.controlpanel.datamodel.BaseDNTableModel;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * Class used to render the base DN table cells.
+ */
+public class BaseDNCellRenderer extends CustomCellRenderer
+{
+ private static final long serialVersionUID = -256719167426289735L;
+
+ /**
+ * Default constructor.
+ */
+ public BaseDNCellRenderer()
+ {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column) {
+ String text = (String)value;
+ if (text == BaseDNTableModel.NOT_AVAILABLE)
+ {
+ Utilities.setNotAvailable(this);
+ }
+ else if (text == BaseDNTableModel.NOT_AVAILABLE_AUTHENTICATION_REQUIRED)
+ {
+ Utilities.setNotAvailableBecauseAuthenticationIsRequired(this);
+ }
+ else if (text == BaseDNTableModel.NOT_AVAILABLE_SERVER_DOWN)
+ {
+ Utilities.setNotAvailableBecauseServerIsDown(this);
+ }
+ else
+ {
+ Utilities.setTextValue(this, text);
+ }
+ return super.getTableCellRendererComponent(table, getText(),
+ isSelected, hasFocus, row, column);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
new file mode 100644
index 0000000..6c311ac
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
@@ -0,0 +1,115 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import java.awt.Component;
+import java.awt.Font;
+
+import javax.swing.JTree;
+
+import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
+
+/**
+ * The renderer used to render the nodes in the LDAP entry browser.
+ *
+ */
+public class BrowserCellRenderer extends TreeCellRenderer {
+
+ private static final long serialVersionUID = 6756291700611741513L;
+ Font defaultFont = ColorAndFontConstants.treeFont;
+ Font italicFont = defaultFont.deriveFont(Font.ITALIC);
+ Font boldFont = defaultFont.deriveFont(Font.BOLD);
+ Font italicBoldFont = defaultFont.deriveFont(Font.ITALIC|Font.BOLD);
+ BasicNode inspectedNode;
+
+ /**
+ * Sets which is the inspected node. This method simply marks the selected
+ * node in the tree so that it can have a different rendering. This is
+ * useful for instance when the right panel has a list of entries to which
+ * the menu action apply, to make a difference between the selected node in
+ * the tree (to which the action in the main menu will not apply) and the
+ * selected nodes in the right pane.
+ * @param node the selected node.
+ */
+ public void setInspectedNode(BasicNode node) {
+ inspectedNode = node;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getTreeCellRendererComponent(
+ JTree tree,
+ Object value,
+ boolean isSelected,
+ boolean isExpanded,
+ boolean isLeaf,
+ int row,
+ boolean cellHasFocus)
+ {
+ BasicNode node = (BasicNode)value;
+ super.getTreeCellRendererComponent(tree, node, isSelected,
+ isExpanded, isLeaf,
+ row, cellHasFocus);
+
+ setIcon(node.getIcon());
+ setText(node.getDisplayName());
+
+ Font newFont = defaultFont;
+ int style = node.getFontStyle();
+ if (node == inspectedNode) {
+ style |= Font.BOLD;
+ }
+ if ((style & Font.ITALIC & Font.BOLD) != 0) {
+ newFont = italicBoldFont;
+ }
+ else if ((style & Font.ITALIC) != 0) {
+ newFont = italicFont;
+ }
+ else if ((style & Font.BOLD) != 0) {
+ newFont = boldFont;
+ }
+ else {
+ newFont = defaultFont;
+ }
+ setFont(newFont);
+ return this;
+ }
+
+
+ /**
+ * Returns the row height for the provided browser controller.
+ * @param controller the browser controller.
+ * @return the row height for the provided browser controller.
+ */
+ public static int calculateRowHeight(BrowserController controller) {
+ return 16;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
new file mode 100644
index 0000000..4dace8d
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
@@ -0,0 +1,167 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import java.awt.Component;
+import java.awt.Rectangle;
+import java.awt.event.MouseEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JTable;
+import javax.swing.border.Border;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableCellRenderer;
+
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.components.LabelWithHelpIcon;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.messages.Message;
+
+/**
+ * Class used to render the tables.
+ */
+public class CustomCellRenderer extends LabelWithHelpIcon
+implements TableCellRenderer
+{
+ private static final long serialVersionUID = -8604332267021523835L;
+ /**
+ * The border of the first column.
+ */
+ protected final static Border column0Border =
+ BorderFactory.createCompoundBorder(
+ BorderFactory.createMatteBorder(0, 1, 0, 0,
+ ColorAndFontConstants.gridColor),
+ BorderFactory.createEmptyBorder(4, 4, 4, 4));
+ /**
+ * The default border.
+ */
+ public final static Border defaultBorder =
+ BorderFactory.createEmptyBorder(4, 4, 4, 4);
+ private static Border defaultFocusBorder;
+
+ /**
+ * Default constructor.
+ */
+ public CustomCellRenderer()
+ {
+ super(Message.EMPTY, null);
+ setHelpIconVisible(false);
+ setFont(ColorAndFontConstants.tableFont);
+ setOpaque(true);
+ setBackground(ColorAndFontConstants.treeBackground);
+ setForeground(ColorAndFontConstants.treeForeground);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column) {
+ if (value instanceof String)
+ {
+ String s = (String)value;
+ if (s.indexOf("<html>") == 0)
+ {
+ value = "<html>"+
+ Utilities.applyFont(s.substring(6), ColorAndFontConstants.tableFont);
+ }
+ setText((String)value);
+ }
+ else
+ {
+ setText(String.valueOf(value));
+ }
+
+ if (hasFocus)
+ {
+ setBorder(getDefaultFocusBorder(table, value, isSelected, row, column));
+ }
+ else if (column == 0)
+ {
+ setBorder(column0Border);
+ }
+ else
+ {
+ setBorder(defaultBorder);
+ }
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getToolTipText(MouseEvent ev)
+ {
+ Rectangle r = new Rectangle();
+ r.x = label.getPreferredSize().width + INSET_WITH_ICON;
+ r.y = 0;
+ r.width = iconLabel.getPreferredSize().width;
+ r.height = iconLabel.getPreferredSize().height;
+
+ if (r.contains(ev.getPoint()))
+ {
+ return getHelpTooltip();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Returns the border to be used for a given cell in a table.
+ * @param table the table.
+ * @param value the value to be rendered.
+ * @param isSelected whether the row is selected or not.
+ * @param row the row number of the cell.
+ * @param column the column number of the cell.
+ * @return the border to be used for a given cell in a table.
+ */
+ public static Border getDefaultFocusBorder(JTable table, Object value,
+ boolean isSelected, int row, int column)
+ {
+ if (defaultFocusBorder == null)
+ {
+ DefaultTableCellRenderer renderer = new DefaultTableCellRenderer();
+ JComponent comp = (JComponent)
+ renderer.getTableCellRendererComponent(table, value, isSelected,
+ true, row, column);
+ Border border = comp.getBorder();
+ if (border != null)
+ {
+ defaultFocusBorder = border;
+ }
+ else
+ {
+ defaultFocusBorder = defaultBorder;
+ }
+ }
+ return defaultFocusBorder;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
new file mode 100644
index 0000000..44fea6b
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
@@ -0,0 +1,157 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Font;
+
+import javax.swing.JComboBox;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.ListCellRenderer;
+import javax.swing.border.EmptyBorder;
+
+import org.opends.guitools.controlpanel.datamodel.CategorizedComboBoxElement;
+import org.opends.guitools.controlpanel.ui.StatusGenericPanel;
+
+/**
+ * A renderer used in the Control Panel that deals with
+ * CategorizedComboBoxElement elements. It can be used to render JList and
+ * JComboBoxes.
+ *
+ */
+public class CustomListCellRenderer implements ListCellRenderer
+{
+ private ListCellRenderer defaultRenderer;
+
+ /**
+ * The separator used to render a non-selectable separator in the combo box.
+ */
+ protected Component separator;
+
+ /**
+ * The default font.
+ */
+ protected Font defaultFont;
+
+ /**
+ * The category font.
+ */
+ protected Font categoryFont;
+
+ /**
+ * Constructor of a renderer to be used with a combo box.
+ * @param combo the combo box containing the elements to be rendered.
+ */
+ public CustomListCellRenderer(JComboBox combo)
+ {
+ this(combo.getRenderer());
+ }
+
+ /**
+ * Constructor of a renderer to be used with a list.
+ * @param list the list to be rendered.
+ */
+ public CustomListCellRenderer(JList list)
+ {
+ this(list.getCellRenderer());
+ }
+
+ private CustomListCellRenderer(ListCellRenderer defaultRenderer)
+ {
+ this.defaultRenderer = defaultRenderer;
+ JSeparator sep = new JSeparator();
+ separator = new JPanel(new BorderLayout());
+ ((JPanel)separator).setOpaque(false);
+ ((JPanel)separator).add(sep, BorderLayout.CENTER);
+ ((JPanel)separator).setBorder(new EmptyBorder(5, 3, 5, 3));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus)
+ {
+ Component comp;
+ if (StatusGenericPanel.COMBO_SEPARATOR.equals(value))
+ {
+ return separator;
+ }
+ else if (value instanceof CategorizedComboBoxElement)
+ {
+ CategorizedComboBoxElement element = (CategorizedComboBoxElement)value;
+ String name = getStringValue(element);
+ boolean isRegular =
+ element.getType() == CategorizedComboBoxElement.Type.REGULAR;
+ if (isRegular)
+ {
+ name = " "+name;
+ }
+ comp = defaultRenderer.getListCellRendererComponent(list, name, index,
+ isSelected && isRegular, cellHasFocus);
+ if (defaultFont == null)
+ {
+ defaultFont = comp.getFont();
+ categoryFont = defaultFont.deriveFont(Font.BOLD | Font.ITALIC);
+ }
+ if (element.getType() == CategorizedComboBoxElement.Type.REGULAR)
+ {
+ comp.setFont(defaultFont);
+ }
+ else
+ {
+ comp.setFont(categoryFont);
+ }
+ }
+ else
+ {
+ comp = defaultRenderer.getListCellRendererComponent(list, value, index,
+ isSelected, cellHasFocus);
+ if (defaultFont == null)
+ {
+ defaultFont = comp.getFont();
+ categoryFont = defaultFont.deriveFont(Font.BOLD | Font.ITALIC);
+ }
+ comp.setFont(defaultFont);
+ }
+ return comp;
+ }
+
+ /**
+ * Returns the String value for a given CategorizedComboBoxElement.
+ * @param desc the combo box element.
+ * @return the String value for a given CategorizedComboBoxElement.
+ */
+ protected String getStringValue(CategorizedComboBoxElement desc)
+ {
+ return String.valueOf(desc.getValue());
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
new file mode 100644
index 0000000..4c96431
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
@@ -0,0 +1,86 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import java.awt.Component;
+
+import javax.swing.JList;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * The renderer to be used to render AbstractIndexDescriptor objects in a list.
+ * It marks the indexes that require to be rebuilt with a '*' character.
+ *
+ */
+public class IndexCellRenderer extends CustomListCellRenderer
+{
+ private ControlPanelInfo info;
+
+ /**
+ * Constructor of the index cell renderer.
+ * @param list the list whose contents will be rendered.
+ * @param info the control panel information.
+ */
+ public IndexCellRenderer(JList list, ControlPanelInfo info)
+ {
+ super(list);
+ this.info = info;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus)
+ {
+ boolean mustReindex = false;
+ if (value instanceof AbstractIndexDescriptor)
+ {
+ mustReindex = info.mustReindex((AbstractIndexDescriptor)value);
+ }
+ if (value instanceof IndexDescriptor)
+ {
+ String name = ((IndexDescriptor)value).getName();
+ value = mustReindex ? name + " (*)" : name;
+
+ } else if (value instanceof VLVIndexDescriptor)
+ {
+ String name =
+ Utilities.getVLVNameInCellRenderer((VLVIndexDescriptor)value);
+ value = mustReindex ? name + " (*)" : name;
+ }
+ Component comp = super.getListCellRendererComponent(list, value, index,
+ isSelected, cellHasFocus);
+ return comp;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java
new file mode 100644
index 0000000..b5ba989
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java
@@ -0,0 +1,77 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import javax.swing.JComboBox;
+
+import org.opends.guitools.controlpanel.datamodel.CategorizedComboBoxElement;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+/**
+ * The renderer to be used to render CategorizedComboBoxElement objects whose
+ * values are AbstraceIndexDescriptor objects. It can be used with combo
+ * boxes.
+ *
+ */
+public class IndexComboBoxCellRenderer extends CustomListCellRenderer
+{
+ /**
+ * Constructor of the index renderer.
+ * @param combo the combo whose contents will be rendered.
+ */
+ public IndexComboBoxCellRenderer(JComboBox combo)
+ {
+ super(combo);
+ }
+
+ /**
+ * Returns the String value for a given CategorizedComboBoxElement.
+ * @param desc the combo box element.
+ * @return the String value for a given CategorizedComboBoxElement.
+ */
+ protected String getStringValue(CategorizedComboBoxElement desc)
+ {
+ String v;
+ Object value = desc.getValue();
+ if (value instanceof IndexDescriptor)
+ {
+ v = ((IndexDescriptor)value).getName();
+ }
+ else if (value instanceof VLVIndexDescriptor)
+ {
+ v = Utilities.getVLVNameInCellRenderer((VLVIndexDescriptor)value);
+ }
+ else
+ {
+ v = super.getStringValue(desc);
+ }
+ return v;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
new file mode 100644
index 0000000..a2e319b
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
@@ -0,0 +1,286 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.datamodel.BinaryValue;
+import org.opends.guitools.controlpanel.datamodel.ObjectClassValue;
+import org.opends.guitools.controlpanel.ui.components.BinaryCellPanel;
+import org.opends.guitools.controlpanel.ui.components.ObjectClassCellPanel;
+import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.server.types.Schema;
+
+/**
+ * The renderer used by the table in the 'Attribute View' of the LDAP entry
+ * browser.
+ *
+ */
+public class LDAPEntryTableCellRenderer extends SelectableTableCellRenderer
+{
+ private static final long serialVersionUID = 3590456676685339618L;
+ private BinaryCellPanel binaryPanel;
+ private ObjectClassCellPanel ocPanel;
+ private JLabel lockLabel = new JLabel();
+ private ImageIcon lockIcon =
+ Utilities.createImageIcon(IconPool.IMAGE_PATH+"/field-locked.png");
+ private Schema schema;
+ private Collection<String> requiredAttrs = new ArrayList<String>();
+
+ /**
+ * Constructor of the cell renderer.
+ *
+ */
+ public LDAPEntryTableCellRenderer()
+ {
+ binaryPanel = new BinaryCellPanel();
+ binaryPanel.setOpaque(true);
+ ocPanel = new ObjectClassCellPanel();
+ ocPanel.setOpaque(true);
+ GridBagConstraints gbc = new GridBagConstraints();
+ add(lockLabel, gbc);
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column) {
+ if (isRequired(table, row, column))
+ {
+ Utilities.setRequiredIcon(label);
+ }
+ else
+ {
+ label.setIcon(null);
+ }
+ if (isPassword(table, row, column))
+ {
+ return getStringValue(table, Utilities.OBFUSCATED_VALUE, isSelected,
+ hasFocus, row, column);
+ }
+ else if (value instanceof ObjectClassValue)
+ {
+ if (!table.isCellEditable(row, column))
+ {
+ ocPanel.setLockIconVisible(true);
+ ocPanel.setEditButtonVisible(false);
+ }
+ else
+ {
+ ocPanel.setLockIconVisible(false);
+ ocPanel.setEditButtonVisible(true);
+ }
+ ocPanel.setValue((ObjectClassValue)value);
+ if (hasFocus)
+ {
+ ocPanel.setBorder(getDefaultFocusBorder(table, value, isSelected,
+ row, column));
+ }
+ else
+ {
+ ocPanel.setBorder(defaultBorder);
+ }
+ updateComponent(ocPanel, table, row, column, isSelected);
+ return ocPanel;
+ }
+ else if ((value instanceof byte[]) || (value instanceof BinaryValue))
+ {
+ if (value instanceof byte[])
+ {
+ if (((byte[])value).length > 0)
+ {
+ binaryPanel.setValue((byte[])value, isImage(table, row, column));
+ }
+ else
+ {
+ binaryPanel.setValue((byte[])null, isImage(table, row, column));
+ }
+ }
+ else
+ {
+ binaryPanel.setValue((BinaryValue)value, isImage(table, row, column));
+ }
+ if (!table.isCellEditable(row, column))
+ {
+ binaryPanel.setLockIconVisible(true);
+ binaryPanel.setEditButtonText(INFO_CTRL_PANEL_VIEW_BUTTON_LABEL.get());
+ }
+ else
+ {
+ binaryPanel.setLockIconVisible(false);
+ binaryPanel.setEditButtonText(INFO_CTRL_PANEL_EDIT_BUTTON_LABEL.get());
+ }
+ if (hasFocus)
+ {
+ binaryPanel.setBorder(getDefaultFocusBorder(table, value, isSelected,
+ row, column));
+ }
+ else
+ {
+ binaryPanel.setBorder(defaultBorder);
+ }
+ updateComponent(binaryPanel, table, row, column, isSelected);
+ return binaryPanel;
+ }
+ else
+ {
+ return getStringValue(table, value, isSelected, hasFocus, row, column);
+ }
+ }
+
+ /**
+ * Returns the String representation for a given byte array.
+ * @param value the byte array.
+ * @return the String representation for a given byte array.
+ */
+ public String getString(byte[] value)
+ {
+ return binaryPanel.getString(value, false).toString();
+ }
+
+ /**
+ * Returns the String representation for a given BinaryValue object.
+ * @param value the BinaryValue object.
+ * @return the String representation for the provided BinaryValue object.
+ */
+ public String getString(BinaryValue value)
+ {
+ return binaryPanel.getMessage(value, false).toString();
+ }
+
+ /**
+ * Returns the String representation for a given ObjectClassValue object.
+ * @param value the ObjectClassValue object.
+ * @return the String representation for the provided ObjectClassValue object.
+ */
+ public String getString(ObjectClassValue value)
+ {
+ return ocPanel.getMessage(value).toString();
+ }
+
+ private Component getStringValue(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column)
+ {
+ super.getTableCellRendererComponent(table, value, isSelected,
+ hasFocus, row, column);
+ if (table.isCellEditable(row, column) && !isSelected)
+ {
+ lockLabel.setIcon(null);
+ }
+ else
+ {
+ if ((column == 1) && !table.isCellEditable(row, column))
+ {
+ lockLabel.setIcon(lockIcon);
+ }
+ else
+ {
+ lockLabel.setIcon(null);
+ }
+ }
+ return this;
+ }
+
+ private boolean isPassword(JTable table, int row, int col)
+ {
+ boolean isPassword = false;
+ if (col == 1)
+ {
+ Object o = table.getValueAt(row, 0);
+ if (Utilities.hasPasswordSyntax((String)o, getSchema()))
+ {
+ isPassword = true;
+ }
+ }
+ return isPassword;
+ }
+
+ private boolean isImage(JTable table, int row, int col)
+ {
+ boolean isImage = false;
+ if (col == 1)
+ {
+ Object o = table.getValueAt(row, 0);
+ isImage = Utilities.hasImageSyntax((String)o, schema);
+ }
+ return isImage;
+ }
+
+ /**
+ * Returns the schema.
+ * @return the schema.
+ */
+ public Schema getSchema()
+ {
+ return schema;
+ }
+
+ /**
+ * Sets the schema.
+ * @param schema the schema.
+ */
+ public void setSchema(Schema schema)
+ {
+ this.schema = schema;
+ }
+
+ /**
+ * Sets the list of required attributes for the entry that is being rendered
+ * using this renderer.
+ * @param requiredAttrs the required attribute names.
+ */
+ public void setRequiredAttrs(Collection<String> requiredAttrs)
+ {
+ this.requiredAttrs.clear();
+ this.requiredAttrs.addAll(requiredAttrs);
+ }
+
+ private boolean isRequired(JTable table, int row, int col)
+ {
+ boolean isRequired = false;
+ if (col == 0)
+ {
+ Object o = table.getValueAt(row, 0);
+ isRequired = requiredAttrs.contains(
+ Utilities.getAttributeNameWithoutOptions((String)o).toLowerCase());
+ }
+ return isRequired;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
new file mode 100644
index 0000000..0a9a5ca
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
@@ -0,0 +1,109 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+
+import javax.swing.JComboBox;
+import javax.swing.JList;
+
+import org.opends.server.api.AttributeSyntax;
+import org.opends.server.api.MatchingRule;
+import org.opends.server.types.AttributeUsage;
+import org.opends.server.types.CommonSchemaElements;
+import org.opends.server.types.ObjectClassType;
+
+/**
+ * The cell renderer to be used to render schema elements in a combo box.
+ *
+ */
+public class SchemaElementComboBoxCellRenderer extends CustomListCellRenderer
+{
+ /**
+ * Constructor of the cell renderer.
+ * @param combo the combo box containing the elements to be rendered.
+ */
+ public SchemaElementComboBoxCellRenderer(JComboBox combo)
+ {
+ super(combo);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus)
+ {
+ if (value instanceof AttributeSyntax)
+ {
+ value = ((AttributeSyntax)value).getSyntaxName();
+ if (value == null)
+ {
+ value = ((AttributeSyntax)value).getOID();
+ }
+ }
+ else if (value instanceof CommonSchemaElements)
+ {
+ value = ((CommonSchemaElements)value).getNameOrOID();
+ }
+ else if (value instanceof MatchingRule)
+ {
+ value = ((MatchingRule)value).getNameOrOID();
+ }
+ else if (value instanceof AttributeUsage)
+ {
+ boolean isOperational = ((AttributeUsage)value).isOperational();
+ if (isOperational)
+ {
+ value = INFO_CTRL_PANEL_ATTRIBUTE_USAGE_OPERATIONAL.get(
+ value.toString());
+ }
+ }
+ else if (value instanceof ObjectClassType)
+ {
+ switch ((ObjectClassType)value)
+ {
+ case AUXILIARY:
+ value = INFO_CTRL_PANEL_OBJECTCLASS_AUXILIARY_LABEL.get().toString();
+ break;
+ case STRUCTURAL:
+ value = INFO_CTRL_PANEL_OBJECTCLASS_STRUCTURAL_LABEL.get().toString();
+ break;
+ case ABSTRACT:
+ value = INFO_CTRL_PANEL_OBJECTCLASS_ABSTRACT_LABEL.get().toString();
+ break;
+ }
+ }
+ Component comp = super.getListCellRendererComponent(list, value, index,
+ isSelected, cellHasFocus);
+
+ return comp;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
new file mode 100644
index 0000000..baa7e25
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
@@ -0,0 +1,179 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+
+import javax.swing.JTable;
+
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+
+/**
+ * A table cell renderer that updates the rendering of the cells when the user
+ * moves the mouse over the table. This is done to provide a visual hint that
+ * the table can be selected.
+ *
+ */
+public class SelectableTableCellRenderer extends CustomCellRenderer
+{
+ private static final long serialVersionUID = 6855042914121526677L;
+ private boolean hasMouseOver;
+ private boolean isBeingPressed;
+ private int lastRowMouseOver;
+
+ private static final Color pressedBackground =
+ ColorAndFontConstants.pressedBackground;
+
+ private static final Color pressedForeground =
+ ColorAndFontConstants.pressedForeground;
+
+ private static final Color mouseOverBackground =
+ ColorAndFontConstants.mouseOverBackground;
+
+ private static final Color mouseOverForeground =
+ ColorAndFontConstants.mouseOverForeground;
+
+ /**
+ * Sets the table that will be rendered by this renderer.
+ * @param table the table to be rendered.
+ */
+ public void setTable(final JTable table)
+ {
+ MouseAdapter mouseListener = new MouseAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void mousePressed(MouseEvent ev)
+ {
+ isBeingPressed = true;
+ table.repaint();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseReleased(MouseEvent ev)
+ {
+ isBeingPressed = false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseExited(MouseEvent ev)
+ {
+ hasMouseOver = false;
+ lastRowMouseOver = -1;
+ table.repaint();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseEntered(MouseEvent ev)
+ {
+ if (ev.getSource() == table)
+ {
+ hasMouseOver = true;
+ lastRowMouseOver = table.rowAtPoint(ev.getPoint());
+ }
+ else
+ {
+ mouseExited(ev);
+ }
+ }
+ };
+ MouseMotionAdapter mouseMotionAdapter = new MouseMotionAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseMoved(MouseEvent ev)
+ {
+ lastRowMouseOver = table.rowAtPoint(ev.getPoint());
+ table.repaint();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void mouseDragged(MouseEvent ev)
+ {
+ lastRowMouseOver = -1;
+ table.repaint();
+ }
+ };
+ table.addMouseListener(mouseListener);
+ table.addMouseMotionListener(mouseMotionAdapter);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column)
+ {
+ super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row,
+ column);
+ updateComponent(this, table, row, column, isSelected);
+ return this;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void updateComponent(Component comp, JTable table, int row,
+ int column, boolean isSelected)
+ {
+ if (table.isCellEditable(row, column) && !isSelected)
+ {
+ comp.setBackground(ColorAndFontConstants.treeBackground);
+ comp.setForeground(ColorAndFontConstants.treeForeground);
+ }
+ else if (isBeingPressed && hasMouseOver && (row == lastRowMouseOver))
+ {
+ comp.setBackground(pressedBackground);
+ comp.setForeground(pressedForeground);
+ }
+ else if ((hasMouseOver && (row == lastRowMouseOver)) || isSelected)
+ {
+ comp.setBackground(mouseOverBackground);
+ comp.setForeground(mouseOverForeground);
+ }
+ else
+ {
+ comp.setBackground(ColorAndFontConstants.treeBackground);
+ comp.setForeground(ColorAndFontConstants.treeForeground);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
new file mode 100644
index 0000000..6f07d2e
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
@@ -0,0 +1,104 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import java.awt.Color;
+import java.awt.Component;
+
+import javax.swing.BorderFactory;
+import javax.swing.JTree;
+import javax.swing.border.Border;
+import javax.swing.tree.DefaultTreeCellRenderer;
+
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+
+/**
+ * An extension of the DefaultTreeCellRenderer that uses a customized border,
+ * foreground and background.
+ *
+ */
+public class TreeCellRenderer extends DefaultTreeCellRenderer
+{
+ private static final long serialVersionUID = 4045260951231311206L;
+
+ /**
+ * Background when the cell is not selected.
+ */
+ public static final Color nonselectionBackground =
+ ColorAndFontConstants.background;
+ private static final Color nonselectionForeground =
+ ColorAndFontConstants.foreground;
+
+ /**
+ * Background when the cell is selected.
+ */
+ public static final Color selectionBackground =
+ ColorAndFontConstants.mouseOverBackground;
+
+ private static final Color selectionForeground =
+ ColorAndFontConstants.mouseOverForeground;
+
+
+ private Border rootBorder = BorderFactory.createEmptyBorder(0, 5, 0, 0);
+ private Border normalBorder = BorderFactory.createEmptyBorder(0, 0, 0, 0);
+
+ /**
+ * Constructor of the renderer.
+ *
+ */
+ public TreeCellRenderer()
+ {
+ backgroundNonSelectionColor = nonselectionBackground;
+ backgroundSelectionColor = selectionBackground;
+ textNonSelectionColor = nonselectionForeground;
+ textSelectionColor = selectionForeground;
+ setFont(ColorAndFontConstants.treeFont);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getTreeCellRendererComponent(JTree tree, Object value,
+ boolean isSelected, boolean isExpanded, boolean isLeaf, int row,
+ boolean hasFocus)
+ {
+ super.getTreeCellRendererComponent(tree, value, isSelected, isExpanded,
+ isLeaf, row, hasFocus);
+ setIcon(null);
+
+ if ((row == 0) && (tree.isRootVisible()))
+ {
+ setBorder(rootBorder);
+ }
+ else
+ {
+ setBorder(normalBorder);
+ }
+ return this;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
new file mode 100644
index 0000000..da86337
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
@@ -0,0 +1,81 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.ui.renderer;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Component;
+
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
+
+import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
+
+/**
+ * Class used to render elements of the class VLVSortOrder.
+ *
+ */
+public class VLVSortOrderRenderer implements ListCellRenderer
+{
+ private ListCellRenderer defaultRenderer;
+
+ /**
+ * Constructor of the renderer.
+ * @param list the list whose elements must be rendered.
+ */
+ public VLVSortOrderRenderer(JList list)
+ {
+ this.defaultRenderer = list.getCellRenderer();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus)
+ {
+ if (value instanceof VLVSortOrder)
+ {
+ VLVSortOrder v = (VLVSortOrder)value;
+ if (v.isAscending())
+ {
+ value = INFO_CTRL_PANEL_VLV_ASCENDING_VLV_INDEX.get(
+ v.getAttributeName()).toString();
+ }
+ else
+ {
+ value = INFO_CTRL_PANEL_VLV_DESCENDING_VLV_INDEX.get(
+ v.getAttributeName()).toString();
+ }
+ }
+ Component comp = defaultRenderer.getListCellRendererComponent(
+ list, value, index, isSelected, cellHasFocus);
+
+ return comp;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/package-info.java
new file mode 100644
index 0000000..b0a96e4
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Contains some of the list, combo box and table renderers and editors used in
+ * the Control Panel: index renderers, schema renderers, LDAP entry renderers...
+ */
+package org.opends.guitools.controlpanel.ui.renderer;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
new file mode 100644
index 0000000..461b363
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
@@ -0,0 +1,126 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.opends.guitools.controlpanel.event.PrintStreamListener;
+
+/**
+ * This class is used to notify the ProgressUpdateListeners of events
+ * that are written to the standard streams.
+ */
+public class ApplicationPrintStream extends PrintStream
+{
+ private ArrayList<PrintStreamListener> listeners =
+ new ArrayList<PrintStreamListener>();
+ private static final Logger LOG =
+ Logger.getLogger(ApplicationPrintStream.class.getName());
+
+ private boolean notifyListeners = true;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public ApplicationPrintStream()
+ {
+ super(new ByteArrayOutputStream(), true);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void println(String msg)
+ {
+ notifyListenersNewLine(msg);
+ LOG.log(Level.INFO, msg);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void write(byte[] b, int off, int len)
+ {
+ if (b == null)
+ {
+ throw new NullPointerException("b is null");
+ }
+
+ if (off + len > b.length)
+ {
+ throw new IndexOutOfBoundsException(
+ "len + off are bigger than the length of the byte array");
+ }
+ println(new String(b, off, len));
+ }
+
+ /**
+ * Adds a print stream listener.
+ * @param listener the listener.
+ */
+ public void addListener(PrintStreamListener listener)
+ {
+ listeners.add(listener);
+ }
+
+ /**
+ * Removes a print stream listener.
+ * @param listener the listener.
+ */
+ public void removeListener(PrintStreamListener listener)
+ {
+ listeners.remove(listener);
+ }
+
+ private void notifyListenersNewLine(String msg)
+ {
+ if (notifyListeners)
+ {
+ for (PrintStreamListener listener : listeners)
+ {
+ listener.newLine(msg);
+ }
+ }
+ }
+
+ /**
+ * Sets whether the listeners must be notified or not.
+ * @param notifyListeners whether the listeners must be notified or not.
+ */
+ public void setNotifyListeners(boolean notifyListeners)
+ {
+ this.notifyListeners = notifyListeners;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTask.java
new file mode 100644
index 0000000..bb019f5
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTask.java
@@ -0,0 +1,112 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+/**
+ * This class provides a mechanism for running a task in the background using a
+ * separate thread and providing the caller with notification when it has
+ * completed.
+ * @param <T> type of object returned by this process
+ */
+public abstract class BackgroundTask<T>
+{
+ private BackgroundTaskThread<T> taskThread;
+ /**
+ * Creates a new thread and begins running the task in the background. When
+ * the task has completed, the {@code backgroundTaskCompleted} method will be
+ * invoked.
+ */
+ public final void startBackgroundTask()
+ {
+ taskThread = new BackgroundTaskThread<T>(this);
+ taskThread.start();
+ }
+
+ /**
+ * Interrupts the thread that is running background.
+ *
+ */
+ public final void interrupt()
+ {
+ if (taskThread != null)
+ {
+ taskThread.interrupt();
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the thread running in the background is
+ * interrupted and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the thread running in the background is
+ * interrupted and <CODE>false</CODE> otherwise.
+ */
+ public boolean isInterrupted()
+ {
+ if (taskThread != null)
+ {
+ return taskThread.isInterrupted();
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Performs all processing associated with the task.
+ *
+ * @return An {@code Object} with information about the processing performed
+ * for this task, or {@code null} if no return value is needed.
+ *
+ * @throws Throwable throwable that will be passed through the method
+ * backgroundTaskCompleted.
+ */
+ public abstract T processBackgroundTask() throws Throwable;
+
+
+
+ /**
+ * This method will be invoked to indicate that the background task has
+ * completed. If processing completed successfully, then the
+ * {@code Throwable} argument will be {@code null} and the {@code returnValue}
+ * argument will contain the value returned by the
+ * {@code processBackgroundTask} method. If an exception or error was thrown,
+ * then the {@code throwable} argument will not be {@code null}.
+ *
+ * @param returnValue The value returned by the
+ * {@code processBackgroundTask} method when processing
+ * completed, or {@code null} if no value was returned or
+ * an exception was encountered during processing.
+ * @param throwable A {@code Throwable} instance (e.g., an exception) that
+ * was raised during processing, or {@code null} if all
+ * processing completed successfully.
+ */
+ public abstract void backgroundTaskCompleted(T returnValue,
+ Throwable throwable);
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
new file mode 100644
index 0000000..6df6c12
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
@@ -0,0 +1,93 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import javax.swing.SwingUtilities;
+
+/**
+* This class defines a thread that will be used to actually perform the
+* processing for a background task.
+* @param <T> type of object returned by the background task fed to this
+* object
+*/
+class BackgroundTaskThread<T>
+ extends Thread
+{
+ // The background task that is to be processed.
+ private final BackgroundTask<T> backgroundTask;
+
+
+
+ /**
+ * Creates a new background task thread that will be used to process the
+ * provided task.
+ *
+ * @param backgroundTask The task to be processed.
+ */
+ public BackgroundTaskThread(BackgroundTask<T> backgroundTask)
+ {
+ this.backgroundTask = backgroundTask;
+ }
+
+ /**
+ * Performs the processing associated with the background task.
+ */
+ public void run()
+ {
+ try
+ {
+ final T returnValue = backgroundTask.processBackgroundTask();
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ backgroundTask.backgroundTaskCompleted(returnValue, null);
+ }
+ });
+ }
+ catch (final Throwable t)
+ {
+ if (!isInterrupted())
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ backgroundTask.backgroundTaskCompleted(null, t);
+ }
+ });
+ }
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
new file mode 100644
index 0000000..3b00d79
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -0,0 +1,583 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.net.InetAddress;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapName;
+
+import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerDescriptor;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
+import org.opends.guitools.controlpanel.task.OnlineUpdateException;
+import org.opends.server.admin.client.ManagementContext;
+import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
+import org.opends.server.admin.client.ldap.LDAPManagementContext;
+import org.opends.server.admin.std.client.*;
+import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
+import org.opends.server.types.DN;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * A class that reads the configuration and monitoring information using a
+ * DirContext through LDAP.
+ *
+ */
+public class ConfigFromDirContext extends ConfigReader
+{
+ private static final Logger LOG =
+ Logger.getLogger(ConfigFromDirContext.class.getName());
+
+ /**
+ * Reads configuration and monitoring information using the provided
+ * connection.
+ * @param ctx the connection to be used to read the information.
+ */
+ public void readConfiguration(InitialLdapContext ctx)
+ {
+ exceptions.clear();
+
+ try
+ {
+ // Get the Directory Server configuration handler and use it.
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+
+ listeners.clear();
+ try
+ {
+ AdministrationConnectorCfgClient adminConnector =
+ root.getAdministrationConnector();
+ this.adminConnector = getConnectionHandler(adminConnector);
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ String[] connectionHandlers = root.listConnectionHandlers();
+ for (int i=0; i<connectionHandlers.length; i++)
+ {
+ try
+ {
+ ConnectionHandlerCfgClient connectionHandler =
+ root.getConnectionHandler(connectionHandlers[i]);
+ listeners.add(getConnectionHandler(connectionHandler,
+ connectionHandlers[i]));
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ }
+ isSchemaEnabled = root.getGlobalConfiguration().isCheckSchema();
+
+ backends.clear();
+ String[] backendNames = root.listBackends();
+ for (int i=0; i<backendNames.length; i++)
+ {
+ try
+ {
+ BackendCfgClient backend = root.getBackend(backendNames[i]);
+ SortedSet<BaseDNDescriptor> baseDNs = new TreeSet<BaseDNDescriptor>();
+ for (DN dn : backend.getBaseDN())
+ {
+ BaseDNDescriptor baseDN =
+ new BaseDNDescriptor(BaseDNDescriptor.Type.NOT_REPLICATED, dn,
+ null, -1, -1, -1);
+ baseDNs.add(baseDN);
+ }
+ SortedSet<IndexDescriptor> indexes = new TreeSet<IndexDescriptor>();
+ SortedSet<VLVIndexDescriptor> vlvIndexes =
+ new TreeSet<VLVIndexDescriptor>();
+ BackendDescriptor.Type type;
+ if (backend instanceof LocalDBBackendCfgClient)
+ {
+ type = BackendDescriptor.Type.LOCAL_DB;
+ LocalDBBackendCfgClient db = (LocalDBBackendCfgClient)backend;
+ String[] indexNames = db.listLocalDBIndexes();
+ try
+ {
+ for (int j=0; j<indexNames.length; j++)
+ {
+ LocalDBIndexCfgClient index = db.getLocalDBIndex(indexNames[j]);
+ indexes.add(new IndexDescriptor(
+ index.getAttribute().getNameOrOID(), index.getAttribute(),
+ null, index.getIndexType(), index.getIndexEntryLimit()));
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ indexes.add(
+ new IndexDescriptor("dn2id", null, null,
+ new TreeSet<IndexType>(), -1));
+ indexes.add(
+ new IndexDescriptor("id2children", null, null,
+ new TreeSet<IndexType>(), -1));
+ indexes.add(
+ new IndexDescriptor("id2subtree", null, null,
+ new TreeSet<IndexType>(), -1));
+
+ String[] vlvIndexNames = db.listLocalDBVLVIndexes();
+ try
+ {
+ for (int j=0; j<vlvIndexNames.length; j++)
+ {
+ LocalDBVLVIndexCfgClient index =
+ db.getLocalDBVLVIndex(vlvIndexNames[j]);
+ String s = index.getSortOrder();
+ List<VLVSortOrder> sortOrder = getVLVSortOrder(s);
+ vlvIndexes.add(new VLVIndexDescriptor(index.getName(), null,
+ index.getBaseDN(), index.getScope(), index.getFilter(),
+ sortOrder, index.getMaxBlockSize()));
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ }
+ else if (backend instanceof LDIFBackendCfgClient)
+ {
+ type = BackendDescriptor.Type.LDIF;
+ }
+ else if (backend instanceof MemoryBackendCfgClient)
+ {
+ type = BackendDescriptor.Type.MEMORY;
+ }
+ else if (backend instanceof BackupBackendCfgClient)
+ {
+ type = BackendDescriptor.Type.BACKUP;
+ }
+ else if (backend instanceof MonitorBackendCfgClient)
+ {
+ type = BackendDescriptor.Type.MONITOR;
+ }
+ else if (backend instanceof TaskBackendCfgClient)
+ {
+ type = BackendDescriptor.Type.TASK;
+ }
+ else
+ {
+ type = BackendDescriptor.Type.OTHER;
+ }
+ BackendDescriptor desc = new BackendDescriptor(backend.getBackendId(),
+ baseDNs, indexes, vlvIndexes, -1, backend.isEnabled(), type);
+ for (AbstractIndexDescriptor index: indexes)
+ {
+ index.setBackend(desc);
+ }
+ for (AbstractIndexDescriptor index: vlvIndexes)
+ {
+ index.setBackend(desc);
+ }
+ for (BaseDNDescriptor baseDN : baseDNs)
+ {
+ baseDN.setBackend(desc);
+ }
+ backends.add(desc);
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ }
+
+ boolean isReplicationSecure = false;
+ try
+ {
+ CryptoManagerCfgClient cryptoManager = root.getCryptoManager();
+ isReplicationSecure = cryptoManager.isSSLEncryption();
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+
+
+ replicationPort = -1;
+ ReplicationSynchronizationProviderCfgClient sync = null;
+ try
+ {
+ sync = (ReplicationSynchronizationProviderCfgClient)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+ }
+ catch (OpenDsException oe)
+ {
+ // Ignore this one
+ }
+ if (sync != null)
+ {
+ try
+ {
+ if (sync.isEnabled() && sync.hasReplicationServer())
+ {
+ ReplicationServerCfgClient replicationServer =
+ sync.getReplicationServer();
+ if (replicationServer != null)
+ {
+ replicationPort = replicationServer.getReplicationPort();
+ ConnectionHandlerDescriptor.Protocol protocol =
+ isReplicationSecure ?
+ ConnectionHandlerDescriptor.Protocol.REPLICATION_SECURE :
+ ConnectionHandlerDescriptor.Protocol.REPLICATION;
+ ConnectionHandlerDescriptor connHandler =
+ new ConnectionHandlerDescriptor(
+ new HashSet<InetAddress>(),
+ replicationPort,
+ protocol,
+ ConnectionHandlerDescriptor.State.ENABLED,
+ "Multimaster Synchronization");
+ listeners.add(connHandler);
+ }
+ }
+ String[] domains = sync.listReplicationDomains();
+ if (domains != null)
+ {
+ for (int i=0; i<domains.length; i++)
+ {
+ ReplicationDomainCfgClient domain =
+ sync.getReplicationDomain(domains[i]);
+ DN dn = domain.getBaseDN();
+ for (BackendDescriptor backend : backends)
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ if (baseDN.getDn().equals(dn))
+ {
+ baseDN.setType(BaseDNDescriptor.Type.REPLICATED);
+ baseDN.setReplicaID(domain.getServerId());
+ }
+ }
+ }
+ }
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ }
+
+
+ try
+ {
+ RootDNCfgClient rootDN = root.getRootDN();
+ String[] rootUsers = rootDN.listRootDNUsers();
+ administrativeUsers.clear();
+ if (rootUsers != null)
+ {
+ for (int i=0; i < rootUsers.length; i++)
+ {
+ RootDNUserCfgClient rootUser = rootDN.getRootDNUser(rootUsers[i]);
+ administrativeUsers.addAll(rootUser.getAlternateBindDN());
+ }
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+
+ updateMonitorInformation(ctx);
+
+ try
+ {
+ readSchema();
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ }
+ catch (final Throwable t)
+ {
+ OnlineUpdateException ex = new OnlineUpdateException(
+ ERR_READING_CONFIG_LDAP.get(t.toString()), t);
+ exceptions.add(ex);
+ }
+ }
+
+ private void updateMonitorInformation(InitialLdapContext ctx)
+ {
+ // Read monitoring information: since it is computed, it is faster
+ // to get everything in just one request.
+ SearchControls ctls = new SearchControls();
+ ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ ctls.setReturningAttributes(
+ new String[] {
+ "approx-older-change-not-synchronized-millis", "missing-changes",
+ "base-dn", "server-id", "javaVersion", "currentConnections",
+ "ds-backend-id", "ds-backend-entry-count", "ds-base-dn-entry-count"
+ });
+ String filter = "(objectclass=*)";
+
+
+ try
+ {
+ LdapName jndiName = new LdapName("cn=monitor");
+
+ NamingEnumeration monitorEntries = ctx.search(jndiName, filter, ctls);
+
+ javaVersion = null;
+ numberConnections = -1;
+
+ while (monitorEntries.hasMore())
+ {
+ SearchResult sr = (SearchResult)monitorEntries.next();
+
+ if (javaVersion == null)
+ {
+ javaVersion = ConnectionUtils.getFirstValue(sr, "javaVersion");
+ }
+
+ if (numberConnections == -1)
+ {
+ String v = ConnectionUtils.getFirstValue(sr, "currentConnections");
+ if (v != null)
+ {
+ numberConnections = Integer.parseInt(v);
+ }
+ }
+
+ String dn = ConnectionUtils.getFirstValue(sr, "base-dn");
+ String replicaId = ConnectionUtils.getFirstValue(sr, "server-id");
+
+ if ((dn != null) && (replicaId != null))
+ {
+ for (BackendDescriptor backend : backends)
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ if (Utilities.areDnsEqual(baseDN.getDn().toString(), dn) &&
+ String.valueOf(baseDN.getReplicaID()).equals(replicaId))
+ {
+ try
+ {
+ baseDN.setAgeOfOldestMissingChange(
+ new Long(ConnectionUtils.getFirstValue(sr,
+ "approx-older-change-not-synchronized-millis")));
+ }
+ catch (Throwable t)
+ {
+ }
+ try
+ {
+ baseDN.setMissingChanges(new Integer(
+ ConnectionUtils.getFirstValue(sr, "missing-changes")));
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ String backendID = ConnectionUtils.getFirstValue(sr,
+ "ds-backend-id");
+ String entryCount = ConnectionUtils.getFirstValue(sr,
+ "ds-backend-entry-count");
+ Set<String> baseDnEntries = ConnectionUtils.getValues(sr,
+ "ds-base-dn-entry-count");
+ if ((backendID != null) && ((entryCount != null) ||
+ (baseDnEntries != null)))
+ {
+ for (BackendDescriptor backend : backends)
+ {
+ if (backend.getBackendID().equalsIgnoreCase(backendID))
+ {
+ if (entryCount != null)
+ {
+ backend.setEntries(Integer.parseInt(entryCount));
+ }
+ if (baseDnEntries != null)
+ {
+ for (String s : baseDnEntries)
+ {
+ int index = s.indexOf(" ");
+ if (index != -1)
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ dn = s.substring(index +1);
+
+ if (Utilities.areDnsEqual(dn,
+ baseDN.getDn().toString()))
+ {
+ try
+ {
+ baseDN.setEntries(
+ Integer.parseInt(s.substring(0, index)));
+ }
+ catch (Throwable t)
+ {
+ /* Ignore */
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ catch (NamingException ne)
+ {
+ OnlineUpdateException ex = new OnlineUpdateException(
+ ERR_READING_CONFIG_LDAP.get(ne.getMessage().toString()), ne);
+ exceptions.add(ex);
+ }
+
+
+ for (OpenDsException oe : exceptions)
+ {
+ LOG.log(Level.WARNING, "Error reading configuration: "+oe, oe);
+ }
+ }
+
+ private ConnectionHandlerDescriptor getConnectionHandler(
+ ConnectionHandlerCfgClient connHandler, String name)
+ throws OpenDsException
+ {
+ SortedSet<InetAddress> addresses = new TreeSet<InetAddress>();
+ int port;
+
+ ConnectionHandlerDescriptor.Protocol protocol;
+
+ ConnectionHandlerDescriptor.State state = connHandler.isEnabled() ?
+ ConnectionHandlerDescriptor.State.ENABLED :
+ ConnectionHandlerDescriptor.State.DISABLED;
+
+ if (connHandler instanceof LDAPConnectionHandlerCfgClient)
+ {
+ LDAPConnectionHandlerCfgClient ldap =
+ (LDAPConnectionHandlerCfgClient)connHandler;
+ if (ldap.isUseSSL())
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.LDAPS;
+ }
+ else if (ldap.isAllowStartTLS())
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.LDAP_STARTTLS;
+ }
+ else
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.LDAP;
+ }
+ SortedSet<InetAddress> v = ldap.getListenAddress();
+ if (v == null)
+ {
+ addresses.addAll(v);
+ }
+ port = ldap.getListenPort();
+ }
+ else if (connHandler instanceof JMXConnectionHandlerCfgClient)
+ {
+ JMXConnectionHandlerCfgClient jmx =
+ (JMXConnectionHandlerCfgClient)connHandler;
+ if (jmx.isUseSSL())
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.JMXS;
+ }
+ else
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.JMX;
+ }
+ port = jmx.getListenPort();
+ }
+ else if (connHandler instanceof LDIFConnectionHandlerCfgClient)
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.LDIF;
+ port = -1;
+ }
+ else if (connHandler instanceof SNMPConnectionHandlerCfgClient)
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.SNMP;
+ SNMPConnectionHandlerCfgClient snmp =
+ (SNMPConnectionHandlerCfgClient)connHandler;
+ port = snmp.getListenPort();
+ }
+ else
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.OTHER;
+ port = -1;
+ }
+ return new ConnectionHandlerDescriptor(addresses, port, protocol, state,
+ name);
+ }
+
+ private ConnectionHandlerDescriptor getConnectionHandler(
+ AdministrationConnectorCfgClient adminConnector) throws OpenDsException
+ {
+ SortedSet<InetAddress> addresses = new TreeSet<InetAddress>();
+
+ ConnectionHandlerDescriptor.Protocol protocol =
+ ConnectionHandlerDescriptor.Protocol.ADMINISTRATION_CONNECTOR;
+
+ ConnectionHandlerDescriptor.State state =
+ ConnectionHandlerDescriptor.State.ENABLED;
+
+
+ SortedSet<InetAddress> v = adminConnector.getListenAddress();
+ if (v == null)
+ {
+ addresses.addAll(v);
+ }
+ int port = adminConnector.getListenPort();
+
+ return new ConnectionHandlerDescriptor(addresses, port, protocol, state,
+ INFO_CTRL_PANEL_CONN_HANDLER_ADMINISTRATION.get().toString());
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
new file mode 100644
index 0000000..9bedbcf
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -0,0 +1,464 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.net.InetAddress;
+import java.util.HashSet;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.opends.guitools.controlpanel.datamodel.AbstractIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerDescriptor;
+import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.server.admin.server.ServerManagementContext;
+import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
+import org.opends.server.admin.std.server.AdministrationConnectorCfg;
+import org.opends.server.admin.std.server.BackendCfg;
+import org.opends.server.admin.std.server.BackupBackendCfg;
+import org.opends.server.admin.std.server.ConnectionHandlerCfg;
+import org.opends.server.admin.std.server.CryptoManagerCfg;
+import org.opends.server.admin.std.server.JMXConnectionHandlerCfg;
+import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
+import org.opends.server.admin.std.server.LDIFBackendCfg;
+import org.opends.server.admin.std.server.LDIFConnectionHandlerCfg;
+import org.opends.server.admin.std.server.LocalDBBackendCfg;
+import org.opends.server.admin.std.server.LocalDBIndexCfg;
+import org.opends.server.admin.std.server.LocalDBVLVIndexCfg;
+import org.opends.server.admin.std.server.MemoryBackendCfg;
+import org.opends.server.admin.std.server.MonitorBackendCfg;
+import org.opends.server.admin.std.server.ReplicationDomainCfg;
+import org.opends.server.admin.std.server.ReplicationServerCfg;
+import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
+import org.opends.server.admin.std.server.RootCfg;
+import org.opends.server.admin.std.server.RootDNCfg;
+import org.opends.server.admin.std.server.RootDNUserCfg;
+import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
+import org.opends.server.admin.std.server.TaskBackendCfg;
+import org.opends.server.config.ConfigException;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.DN;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * A class that reads the configuration information from the files.
+ *
+ */
+public class ConfigFromFile extends ConfigReader
+{
+ private static final Logger LOG =
+ Logger.getLogger(ConfigFromFile.class.getName());
+
+ /**
+ * Creates a new instance of this config file handler. No initialization
+ * should be performed here, as all of that work should be done in the
+ * <CODE>initializeConfigHandler</CODE> method.
+ */
+ public ConfigFromFile()
+ {
+ super();
+ }
+
+ /**
+ * Reads configuration information from the configuration files.
+ */
+ public void readConfiguration()
+ {
+ exceptions.clear();
+
+ try
+ {
+ DirectoryServer.getInstance().initializeConfiguration();
+ // Get the Directory Server configuration handler and use it.ad
+ RootCfg root =
+ ServerManagementContext.getInstance().getRootConfiguration();
+ listeners.clear();
+ try
+ {
+ AdministrationConnectorCfg adminConnector =
+ root.getAdministrationConnector();
+ this.adminConnector = getConnectionHandler(adminConnector);
+ }
+ catch (ConfigException ce)
+ {
+ exceptions.add(ce);
+ }
+ String[] connectionHandlers = root.listConnectionHandlers();
+ for (int i=0; i<connectionHandlers.length; i++)
+ {
+ try
+ {
+ ConnectionHandlerCfg connectionHandler =
+ root.getConnectionHandler(connectionHandlers[i]);
+ listeners.add(getConnectionHandler(connectionHandler,
+ connectionHandlers[i]));
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ }
+ isSchemaEnabled = root.getGlobalConfiguration().isCheckSchema();
+
+ backends.clear();
+ String[] backendNames = root.listBackends();
+ for (int i=0; i<backendNames.length; i++)
+ {
+ try
+ {
+ BackendCfg backend = root.getBackend(backendNames[i]);
+ SortedSet<BaseDNDescriptor> baseDNs = new TreeSet<BaseDNDescriptor>();
+ for (DN dn : backend.getBaseDN())
+ {
+ BaseDNDescriptor baseDN =
+ new BaseDNDescriptor(BaseDNDescriptor.Type.NOT_REPLICATED, dn,
+ null, -1, -1, -1);
+ baseDNs.add(baseDN);
+ }
+ SortedSet<IndexDescriptor> indexes = new TreeSet<IndexDescriptor>();
+ SortedSet<VLVIndexDescriptor> vlvIndexes =
+ new TreeSet<VLVIndexDescriptor>();
+ BackendDescriptor.Type type;
+ if (backend instanceof LocalDBBackendCfg)
+ {
+ type = BackendDescriptor.Type.LOCAL_DB;
+ LocalDBBackendCfg db = (LocalDBBackendCfg)backend;
+ String[] indexNames = db.listLocalDBIndexes();
+ try
+ {
+ for (int j=0; j<indexNames.length; j++)
+ {
+ LocalDBIndexCfg index = db.getLocalDBIndex(indexNames[j]);
+ indexes.add(new IndexDescriptor(
+ index.getAttribute().getNameOrOID(), index.getAttribute(),
+ null, index.getIndexType(), index.getIndexEntryLimit()));
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ indexes.add(new IndexDescriptor("dn2id", null, null,
+ new TreeSet<IndexType>(), -1));
+ indexes.add(new IndexDescriptor("id2children", null, null,
+ new TreeSet<IndexType>(), -1));
+ indexes.add(new IndexDescriptor("id2subtree", null, null,
+ new TreeSet<IndexType>(), -1));
+
+ String[] vlvIndexNames = db.listLocalDBVLVIndexes();
+ try
+ {
+ for (int j=0; j<vlvIndexNames.length; j++)
+ {
+ LocalDBVLVIndexCfg index =
+ db.getLocalDBVLVIndex(vlvIndexNames[j]);
+ String s = index.getSortOrder();
+ List<VLVSortOrder> sortOrder = getVLVSortOrder(s);
+ vlvIndexes.add(new VLVIndexDescriptor(index.getName(), null,
+ index.getBaseDN(), index.getScope(), index.getFilter(),
+ sortOrder, index.getMaxBlockSize()));
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ }
+ else if (backend instanceof LDIFBackendCfg)
+ {
+ type = BackendDescriptor.Type.LDIF;
+ }
+ else if (backend instanceof MemoryBackendCfg)
+ {
+ type = BackendDescriptor.Type.MEMORY;
+ }
+ else if (backend instanceof BackupBackendCfg)
+ {
+ type = BackendDescriptor.Type.BACKUP;
+ }
+ else if (backend instanceof MonitorBackendCfg)
+ {
+ type = BackendDescriptor.Type.MONITOR;
+ }
+ else if (backend instanceof TaskBackendCfg)
+ {
+ type = BackendDescriptor.Type.TASK;
+ }
+ else
+ {
+ type = BackendDescriptor.Type.OTHER;
+ }
+ BackendDescriptor desc = new BackendDescriptor(
+ backend.getBackendId(), baseDNs, indexes, vlvIndexes, -1,
+ backend.isEnabled(), type);
+ for (AbstractIndexDescriptor index: indexes)
+ {
+ index.setBackend(desc);
+ }
+ for (AbstractIndexDescriptor index: vlvIndexes)
+ {
+ index.setBackend(desc);
+ }
+
+ backends.add(desc);
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ }
+
+ boolean isReplicationSecure = false;
+ try
+ {
+ CryptoManagerCfg cryptoManager = root.getCryptoManager();
+ isReplicationSecure = cryptoManager.isSSLEncryption();
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+
+
+ replicationPort = -1;
+ ReplicationSynchronizationProviderCfg sync = null;
+ try
+ {
+ sync = (ReplicationSynchronizationProviderCfg)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+ }
+ catch (OpenDsException oe)
+ {
+ // Ignore this one
+ }
+ if (sync != null)
+ {
+ try
+ {
+ if (sync.isEnabled() && sync.hasReplicationServer())
+ {
+ ReplicationServerCfg replicationServer =
+ sync.getReplicationServer();
+ if (replicationServer != null)
+ {
+ replicationPort = replicationServer.getReplicationPort();
+ ConnectionHandlerDescriptor.Protocol protocol =
+ isReplicationSecure ?
+ ConnectionHandlerDescriptor.Protocol.REPLICATION_SECURE :
+ ConnectionHandlerDescriptor.Protocol.REPLICATION;
+ ConnectionHandlerDescriptor connHandler =
+ new ConnectionHandlerDescriptor(
+ new HashSet<InetAddress>(),
+ replicationPort,
+ protocol,
+ ConnectionHandlerDescriptor.State.ENABLED,
+ "Multimaster Synchronization");
+ listeners.add(connHandler);
+ }
+ }
+ String[] domains = sync.listReplicationDomains();
+ if (domains != null)
+ {
+ for (int i=0; i<domains.length; i++)
+ {
+ ReplicationDomainCfg domain =
+ sync.getReplicationDomain(domains[i]);
+ DN dn = domain.getBaseDN();
+ for (BackendDescriptor backend : backends)
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ if (baseDN.getDn().equals(dn))
+ {
+ baseDN.setType(BaseDNDescriptor.Type.REPLICATED);
+ }
+ }
+ }
+ }
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ }
+
+
+ try
+ {
+ RootDNCfg rootDN = root.getRootDN();
+ String[] rootUsers = rootDN.listRootDNUsers();
+ administrativeUsers.clear();
+ if (rootUsers != null)
+ {
+ for (int i=0; i < rootUsers.length; i++)
+ {
+ RootDNUserCfg rootUser = rootDN.getRootDNUser(rootUsers[i]);
+ administrativeUsers.addAll(rootUser.getAlternateBindDN());
+ }
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+
+ try
+ {
+ readSchema();
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ exceptions.add(oe);
+ }
+ catch (final Throwable t)
+ {
+ LOG.log(Level.WARNING, "Error reading configuration: "+t, t);
+ OfflineUpdateException ex = new OfflineUpdateException(
+ ERR_READING_CONFIG_LDAP.get(t.getMessage().toString()), t);
+ exceptions.add(ex);
+ }
+
+ if (exceptions.size() > 0)
+ {
+ if (environmentSettingException != null)
+ {
+ exceptions.add(0, environmentSettingException);
+ }
+ }
+
+ for (OpenDsException oe : exceptions)
+ {
+ LOG.log(Level.WARNING, "Error reading configuration: "+oe, oe);
+ }
+ }
+
+ private ConnectionHandlerDescriptor getConnectionHandler(
+ ConnectionHandlerCfg connHandler, String name) throws OpenDsException
+ {
+ SortedSet<InetAddress> addresses = new TreeSet<InetAddress>();
+ int port;
+
+ ConnectionHandlerDescriptor.Protocol protocol;
+
+ ConnectionHandlerDescriptor.State state = connHandler.isEnabled() ?
+ ConnectionHandlerDescriptor.State.ENABLED :
+ ConnectionHandlerDescriptor.State.DISABLED;
+
+ if (connHandler instanceof LDAPConnectionHandlerCfg)
+ {
+ LDAPConnectionHandlerCfg ldap = (LDAPConnectionHandlerCfg)connHandler;
+ if (ldap.isUseSSL())
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.LDAPS;
+ }
+ else if (ldap.isAllowStartTLS())
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.LDAP_STARTTLS;
+ }
+ else
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.LDAP;
+ }
+ SortedSet<InetAddress> v = ldap.getListenAddress();
+ if (v == null)
+ {
+ addresses.addAll(v);
+ }
+ port = ldap.getListenPort();
+ }
+ else if (connHandler instanceof JMXConnectionHandlerCfg)
+ {
+ JMXConnectionHandlerCfg jmx = (JMXConnectionHandlerCfg)connHandler;
+ if (jmx.isUseSSL())
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.JMXS;
+ }
+ else
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.JMX;
+ }
+ port = jmx.getListenPort();
+ }
+ else if (connHandler instanceof LDIFConnectionHandlerCfg)
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.LDIF;
+ port = -1;
+ }
+ else if (connHandler instanceof SNMPConnectionHandlerCfg)
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.SNMP;
+ SNMPConnectionHandlerCfg snmp = (SNMPConnectionHandlerCfg)connHandler;
+ port = snmp.getListenPort();
+ }
+ else
+ {
+ protocol = ConnectionHandlerDescriptor.Protocol.OTHER;
+ port = -1;
+ }
+ return new ConnectionHandlerDescriptor(addresses, port, protocol, state,
+ name);
+ }
+
+ private ConnectionHandlerDescriptor getConnectionHandler(
+ AdministrationConnectorCfg adminConnector) throws OpenDsException
+ {
+ SortedSet<InetAddress> addresses = new TreeSet<InetAddress>();
+
+ ConnectionHandlerDescriptor.Protocol protocol =
+ ConnectionHandlerDescriptor.Protocol.ADMINISTRATION_CONNECTOR;
+
+ ConnectionHandlerDescriptor.State state =
+ ConnectionHandlerDescriptor.State.ENABLED;
+
+
+ SortedSet<InetAddress> v = adminConnector.getListenAddress();
+ if (v == null)
+ {
+ addresses.addAll(v);
+ }
+ int port = adminConnector.getListenPort();
+
+ return new ConnectionHandlerDescriptor(addresses, port, protocol, state,
+ INFO_CTRL_PANEL_CONN_HANDLER_ADMINISTRATION.get().toString());
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java
new file mode 100644
index 0000000..341a480
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java
@@ -0,0 +1,314 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerDescriptor;
+import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
+import org.opends.guitools.controlpanel.task.OfflineUpdateException;
+import org.opends.server.config.ConfigException;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryEnvironmentConfig;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.Schema;
+
+/**
+ * An abstract class providing some common interface for the class that read
+ * the configuration (and if the server is running, the monitoring information).
+ *
+ */
+public abstract class ConfigReader
+{
+ /**
+ * The class used to read the configuration from a file.
+ */
+ public static String configClassName;
+ /**
+ * The configuration file full path (-INSTANCE_ROOT-/config/config.ldif).
+ */
+ public static String configFile;
+ /**
+ * The error that occurred when setting the environment (null if no error
+ * occurred).
+ */
+ protected static OpenDsException environmentSettingException;
+ static
+ {
+ // This allows testing of configuration components when the OpenDS.jar
+ // in the classpath does not necessarily point to the server's
+ // This is done here since both implementations of ConfigReader require it.
+ String installRoot = System.getProperty("org.opends.quicksetup.Root");
+ if (installRoot == null) {
+ installRoot = Utilities.getServerRootDirectory().getAbsolutePath();
+ }
+ String instanceRoot =
+ Utilities.getInstanceRootDirectory(installRoot).getAbsolutePath();
+ configFile = instanceRoot + File.separator + "config" + File.separator +
+ "config.ldif";
+ configClassName = ReadOnlyConfigFileHandler.class.getName();
+ try
+ {
+ DirectoryEnvironmentConfig env = DirectoryServer.getEnvironmentConfig();
+ env.setServerRoot(new File(installRoot));
+ DirectoryServer.bootstrapClient();
+ DirectoryServer.initializeJMX();
+ DirectoryServer instance = DirectoryServer.getInstance();
+ instance.initializeConfiguration(configClassName, configFile);
+ instance.initializeSchema();
+ }
+ catch (Throwable t)
+ {
+ environmentSettingException = new OfflineUpdateException(
+ ERR_CTRL_PANEL_SETTING_ENVIRONMENT.get(t.getMessage().toString()), t);
+ }
+ }
+
+ /**
+ * The exceptions that occurred reading the configuration.
+ */
+ protected ArrayList<OpenDsException> exceptions =
+ new ArrayList<OpenDsException>();
+
+ /**
+ * Whether the configuration has already been read or not.
+ */
+ protected boolean configRead = false;
+
+ /**
+ * The set of connection listeners.
+ */
+ protected HashSet<ConnectionHandlerDescriptor> listeners =
+ new HashSet<ConnectionHandlerDescriptor>();
+
+ /**
+ * The administration connector.
+ */
+ protected ConnectionHandlerDescriptor adminConnector;
+
+ /**
+ * The set of backend descriptors.
+ */
+ protected HashSet<BackendDescriptor> backends =
+ new HashSet<BackendDescriptor>();
+
+ /**
+ * The set of administrative users.
+ */
+ protected HashSet<DN> administrativeUsers = new HashSet<DN>();
+
+ /**
+ * The replication serve port (-1 if the replication server port is not
+ * defined).
+ */
+ protected int replicationPort = -1;
+
+ /**
+ * The java version used to run the server.
+ */
+ protected String javaVersion;
+
+ /**
+ * The number of connections opened on the server.
+ */
+ protected int numberConnections;
+
+ /**
+ * Whether the schema checking is enabled or not.
+ */
+ protected boolean isSchemaEnabled;
+
+ /**
+ * The schema used by the server.
+ */
+ protected Schema schema;
+
+ /**
+ * Returns the Administrative User DNs found in the config.ldif.
+ * @return the Administrative User DNs found in the config.ldif.
+ */
+ public Set<DN> getAdministrativeUsers()
+ {
+ return Collections.unmodifiableSet(administrativeUsers);
+ }
+
+ /**
+ * Returns the backend descriptors found in the config.ldif.
+ * @return the backend descriptors found in the config.ldif.
+ */
+ public Set<BackendDescriptor> getBackends()
+ {
+ return Collections.unmodifiableSet(backends);
+ }
+
+ /**
+ * Returns the listener descriptors found in the config.ldif.
+ * @return the listeners descriptors found in the config.ldif.
+ */
+ public Set<ConnectionHandlerDescriptor> getConnectionHandlers()
+ {
+ return Collections.unmodifiableSet(listeners);
+ }
+
+ /**
+ * Returns the admin connector.
+ * @return the admin connector.
+ */
+ public ConnectionHandlerDescriptor getAdminConnector()
+ {
+ return adminConnector;
+ }
+
+ /**
+ * Returns the list of exceptions that were encountered reading the
+ * configuration.
+ * @return the list of exceptions that were encountered reading the
+ * configuration.
+ */
+ public List<OpenDsException> getExceptions()
+ {
+ return Collections.unmodifiableList(exceptions);
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the configuration has been read at least once
+ * and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the configuration has been read at least once
+ * and <CODE>false</CODE> otherwise.
+ */
+ public boolean isConfigRead()
+ {
+ return configRead;
+ }
+
+ /**
+ * Returns the replication server port. -1 if no replication server port is
+ * defined.
+ * @return the replication server port. -1 if no replication server port is
+ * defined.
+ */
+ public int getReplicationPort()
+ {
+ return replicationPort;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the schema check is enabled and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the schema check is enabled and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isSchemaEnabled()
+ {
+ return isSchemaEnabled;
+ }
+
+ /**
+ * Returns the java version used to run the server. <CODE>null</CODE> if no
+ * java version is used (because the server is down).
+ * @return the java version used to run the server. <CODE>null</CODE> if no
+ * java version is used (because the server is down).
+ */
+ public String getJavaVersion()
+ {
+ return javaVersion;
+ }
+
+ /**
+ * Returns the number of open connections on the server. -1 if the server
+ * is down.
+ * @return the number of open connections on the server.
+ */
+ public int getOpenConnections()
+ {
+ return numberConnections;
+ }
+
+ /**
+ * Returns the schema of the server.
+ * @return the schema of the server.
+ */
+ public Schema getSchema()
+ {
+ return schema;
+ }
+
+ /**
+ * Reads the schema from the files.
+ * @throws ConfigException if an error occurs reading the schema.
+ * @throws InitializationException if an error occurs trying to find out
+ * the schema files.
+ */
+ protected void readSchema() throws ConfigException, InitializationException
+ {
+ SchemaLoader loader = new SchemaLoader();
+ loader.readSchema();
+ schema = loader.getSchema().duplicate();
+ }
+
+ /**
+ * Method that transforms the VLV sort order value as it is defined in the
+ * schema to a list of VLVSortOrder objects.
+ * @param s the string in the configuration.
+ * @return a list of VLVSortOrder objects.
+ */
+ protected List<VLVSortOrder> getVLVSortOrder(String s)
+ {
+ ArrayList<VLVSortOrder> sortOrder = new ArrayList<VLVSortOrder>();
+ if (s != null)
+ {
+ String[] attrNames = s.split(" ");
+ for (int i=0; i<attrNames.length; i++)
+ {
+ if (attrNames[i].startsWith("+"))
+ {
+ sortOrder.add(new VLVSortOrder(attrNames[i].substring(1), true));
+ }
+ else if (attrNames[i].startsWith("-"))
+ {
+ sortOrder.add(new VLVSortOrder(attrNames[i].substring(1), false));
+ }
+ else
+ {
+ sortOrder.add(new VLVSortOrder(attrNames[i], true));
+ }
+ }
+ }
+ return sortOrder;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java
new file mode 100644
index 0000000..d25b999
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java
@@ -0,0 +1,113 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+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.Date;
+import java.text.DateFormat;
+
+/**
+ * Utilities for setting up Control Panel application log.
+ */
+public class ControlPanelLog
+{
+ private static String[] packages = {
+ "org.opends"
+ };
+ static private File logFile = null;
+
+ /**
+ * Creates a new file handler for writing log messages to the file indicated
+ * by <code>file</code>.
+ * @param file log file to which log messages will be written
+ * @throws IOException if something goes wrong
+ */
+ static public void initLogFileHandler(File file) throws IOException {
+ if (!isInitialized())
+ {
+ logFile = file;
+ FileHandler fileHandler = new FileHandler(logFile.getCanonicalPath());
+ fileHandler.setFormatter(new SimpleFormatter());
+ for (String packageName : packages)
+ {
+ Logger logger = Logger.getLogger(packageName);
+ logger.setUseParentHandlers(false); // disable logging to console
+ logger.addHandler(fileHandler);
+ }
+ Logger logger = Logger.getLogger(packages[0]);
+ logger.log(Level.INFO, getInitialLogRecord());
+ }
+ }
+
+ /**
+ * Writes messages under a given package in the file handler defined when
+ * calling initLogFileHandler. Note that initLogFileHandler should be called
+ * before calling this method.
+ * @param packageName the package name.
+ * @throws IOException if something goes wrong
+ */
+ static public void initPackage(String packageName) throws IOException {
+ FileHandler fileHandler = new FileHandler(logFile.getCanonicalPath());
+ fileHandler.setFormatter(new SimpleFormatter());
+ Logger logger = Logger.getLogger(packageName);
+ logger.setUseParentHandlers(false); // disable logging to console
+ logger.addHandler(fileHandler);
+ logger.log(Level.INFO, getInitialLogRecord());
+ }
+
+ /**
+ * Gets the name of the log file.
+ * @return File representing the log file
+ */
+ static public File getLogFile() {
+ return logFile;
+ }
+
+ /**
+ * Indicates whether or not the log file has been initialized.
+ * @return true when the log file has been initialized
+ */
+ static public boolean isInitialized() {
+ return logFile != null;
+ }
+
+ static private String getInitialLogRecord() {
+ StringBuilder sb = new StringBuilder()
+ .append("Status application launched " +
+ DateFormat.getDateTimeInstance(DateFormat.LONG,
+ DateFormat.LONG).
+ format(new Date()));
+ return sb.toString();
+ }
+
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/LDAPEntryReader.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
new file mode 100644
index 0000000..18df400
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
@@ -0,0 +1,206 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.InitialLdapContext;
+
+import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
+import org.opends.guitools.controlpanel.event.EntryReadErrorEvent;
+import org.opends.guitools.controlpanel.event.EntryReadEvent;
+import org.opends.guitools.controlpanel.event.EntryReadListener;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.Schema;
+
+/**
+ * A class that reads an entry on the background. This is used in the LDAP
+ * entries browser. When the entry is read it notifies to the EntryReadListener
+ * objects that have been registered.
+ *
+ */
+public class LDAPEntryReader extends BackgroundTask<CustomSearchResult>
+{
+ private String dn;
+ private InitialLdapContext ctx;
+ private Schema schema;
+ private Set<EntryReadListener> listeners = new HashSet<EntryReadListener>();
+ private boolean isOver;
+
+ /**
+ * Constructor of the entry reader.
+ * @param dn the DN of the entry.
+ * @param ctx the connection to the server.
+ * @param schema the schema of the server.
+ */
+ public LDAPEntryReader(String dn, InitialLdapContext ctx, Schema schema)
+ {
+ this.dn = dn;
+ this.ctx = ctx;
+ this.schema = schema;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public CustomSearchResult processBackgroundTask() throws Throwable
+ {
+ isOver = false;
+ try
+ {
+ SearchControls controls = new SearchControls();
+ controls.setCountLimit(1);
+ Set<String> operational = getAllOperationalAttributes();
+
+ String[] attrs = new String[operational.size()+1];
+ Iterator<String> it = operational.iterator();
+ int i = 0;
+ while (it.hasNext())
+ {
+ attrs[i] = it.next();
+ i++;
+ }
+ attrs[attrs.length - 1] = "*";
+ controls.setReturningAttributes(attrs);
+ controls.setSearchScope(SearchControls.OBJECT_SCOPE);
+ final String filter = "(|(objectclass=*)(objectclass=ldapsubentry))";
+
+ NamingEnumeration en = ctx.search(Utilities.getJNDIName(dn), filter,
+ controls);
+
+ SearchResult sr = (SearchResult)en.next();
+
+ return new CustomSearchResult(sr, dn);
+ }
+ finally
+ {
+ if (isInterrupted())
+ {
+ isOver = true;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void backgroundTaskCompleted(CustomSearchResult sr,
+ Throwable throwable)
+ {
+ if (!isInterrupted())
+ {
+ if (throwable == null)
+ {
+ notifyListeners(sr);
+ }
+ else
+ {
+ notifyListeners(throwable);
+ }
+ }
+ isOver = true;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the read process is over and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the read process is over and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isOver()
+ {
+ return isOver;
+ }
+
+ /**
+ * Notifies listeners that a new entry was read.
+ * @param sr the new entry in form of CustomSearchResult.
+ */
+ private void notifyListeners(CustomSearchResult sr)
+ {
+ EntryReadEvent ev = new EntryReadEvent(this, sr);
+ for (EntryReadListener listener : listeners)
+ {
+ listener.entryRead(ev);
+ }
+ }
+
+ /**
+ * Notifies the listeners that an error occurred reading an entry.
+ * @param t the error that occurred reading an entry.
+ */
+ private void notifyListeners(Throwable t)
+ {
+ EntryReadErrorEvent ev = new EntryReadErrorEvent(this, dn, t);
+ for (EntryReadListener listener : listeners)
+ {
+ listener.entryReadError(ev);
+ }
+ }
+
+ /**
+ * Adds an EntryReadListener.
+ * @param listener the listener.
+ */
+ public void addEntryReadListener(EntryReadListener listener)
+ {
+ listeners.add(listener);
+ }
+
+ /**
+ * Removes an EntryReadListener.
+ * @param listener the listener.
+ */
+ public void removeEntryReadListener(EntryReadListener listener)
+ {
+ listeners.remove(listener);
+ }
+
+ private Set<String> getAllOperationalAttributes()
+ {
+ HashSet<String> attrs = new HashSet<String>();
+ // Do a best effort if schema could not be retrieved when creating
+ // this object.
+ if (schema != null)
+ {
+ for (AttributeType attr : schema.getAttributeTypes().values())
+ {
+ if (attr.isOperational())
+ {
+ attrs.add(attr.getNameOrOID());
+ }
+ }
+ }
+ return attrs;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java
new file mode 100644
index 0000000..77b5aad
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/NumSubordinateHacker.java
@@ -0,0 +1,158 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.opends.server.types.DN;
+import org.opends.server.types.LDAPURL;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * Class used to handle the case where numsubordinates does not work between
+ * databases.
+ *
+ */
+public class NumSubordinateHacker {
+ String serverHost;
+ int serverPort;
+ ArrayList<DN> unreliableEntryList;
+ boolean isUnreliableEntryListEmpty;
+
+ /**
+ * Default constructor.
+ *
+ */
+ public NumSubordinateHacker() {
+ serverHost = "not-initialized";
+ serverPort = -1;
+ unreliableEntryList = new ArrayList<DN>();
+ }
+
+ /**
+ * Tells wether the list of unreliable contains children of
+ * the entry with LDAPUrl parentUrl.
+ * @param parentUrl the LDAPURL of the parent.
+ * @return <CODE>true</CODE> if the list of unreliable entries contains a
+ * children of the parentUrl. Returns <CODE>false</CODE> otherwise.
+ */
+ public boolean containsChildrenOf(LDAPURL parentUrl) {
+ boolean containsChildren = false;
+
+ if (!isUnreliableEntryListEmpty) {
+ boolean isInServer = serverHost.equals(parentUrl.getHost()) &&
+ (serverPort == parentUrl.getPort());
+
+ if (isInServer) {
+ for (DN dn : unreliableEntryList)
+ {
+ try
+ {
+ if (dn.equals(DN.decode(parentUrl.getRawBaseDN())))
+ {
+ containsChildren = true;
+ break;
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ throw new IllegalStateException("Error decoding DN of url: "+
+ parentUrl);
+ }
+ }
+ }
+ }
+ return containsChildren;
+ }
+
+ /**
+ * Tells wether the list of unreliable contains the entry with LDAPURL
+ * url.
+ * It assumes that we previously called containsChildrenOf (there's no check
+ * of the host/port).
+ * @param url the LDAPURL of the parent.
+ * @return <CODE>true</CODE> if the url correspond to an unreliable
+ * entry and <CODE>false</CODE> otherwise.
+ */
+ public boolean contains(LDAPURL url) {
+ boolean contains = false;
+ if (!isUnreliableEntryListEmpty) {
+ boolean isInServer = serverHost.equals(url.getHost()) &&
+ (serverPort == url.getPort());
+
+ if (isInServer) {
+ for (DN dn : unreliableEntryList)
+ {
+ try
+ {
+ if (dn.equals(DN.decode(url.getRawBaseDN())))
+ {
+ contains = true;
+ break;
+ }
+ }
+ catch (OpenDsException oe)
+ {
+ throw new IllegalStateException("Error decoding DN of url: "+
+ url);
+ }
+ }
+ }
+ }
+ return contains;
+ }
+
+ /**
+ * This method construct a list with the entries the entries that are parents
+ * of the suffix entries. This list is needed to overpass the fact that
+ * numsubordinates does not work between databases.
+ * @param allSuffixes a collection with all the suffixes.
+ * @param rootSuffixes a collection with the root suffixes.
+ * @param serverHost the name of the host where the server is installed.
+ * @param serverPort the LDAP(s) port of the server.
+ */
+ public void update(Collection<DN> allSuffixes,
+ Collection<DN> rootSuffixes,
+ String serverHost,
+ int serverPort)
+ {
+ allSuffixes.removeAll(rootSuffixes);
+ Collection<DN> subSuffixes = allSuffixes;
+ synchronized (unreliableEntryList) {
+ unreliableEntryList.clear();
+
+ for (DN subSuffixDN : subSuffixes) {
+ unreliableEntryList.add(subSuffixDN.getParent());
+ }
+ isUnreliableEntryListEmpty = unreliableEntryList.isEmpty();
+ }
+ this.serverHost = serverHost;
+ this.serverPort = serverPort;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ProcessReader.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ProcessReader.java
new file mode 100644
index 0000000..fedc08f
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ProcessReader.java
@@ -0,0 +1,132 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+
+/**
+ * Class used to write the output and error of a given process in a printstream.
+ *
+ */
+public class ProcessReader
+{
+ private BufferedReader reader;
+ private Thread readerThread;
+ private Throwable lastException;
+ private boolean interrupt;
+ private boolean done;
+
+ /**
+ * The constructor.
+ * @param process process whose output/error we want to write to the print
+ * stream.
+ * @param printStream the print stream.
+ * @param isError whether we must write the error (or the output) must be
+ * written to the stream.
+ */
+ public ProcessReader(Process process, final PrintStream printStream,
+ boolean isError)
+ {
+ InputStream is;
+ if (isError)
+ {
+ is = process.getErrorStream();
+ }
+ else
+ {
+ is = process.getInputStream();
+ }
+ reader = new BufferedReader(new InputStreamReader(is));
+
+ readerThread = new Thread(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ String line;
+ try
+ {
+ while (!interrupt && (null != (line = reader.readLine())))
+ {
+ printStream.println(line);
+ }
+ }
+ catch (Throwable t)
+ {
+ lastException = t;
+ }
+ done = true;
+ }
+ });
+ }
+
+ /**
+ * Starts reading the output (or error) of the process.
+ *
+ */
+ public void startReading()
+ {
+ readerThread.start();
+ }
+
+ /**
+ * Interrupts the reading of the output (or error) of the process. The method
+ * does not return until the reading is over.
+ *
+ */
+ public void interrupt()
+ {
+ interrupt = true;
+ while (!done)
+ {
+ try
+ {
+ readerThread.interrupt();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+
+ /**
+ * Returns the last exception that occurred reading the output (or the error)
+ * of the process.
+ * @return the last exception that occurred reading the output (or the error)
+ * of the process.
+ */
+ public Throwable getLastException()
+ {
+ return lastException;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
new file mode 100644
index 0000000..8990627
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
@@ -0,0 +1,549 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import static org.opends.messages.ConfigMessages.*;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.opends.messages.Message;
+import org.opends.server.admin.Configuration;
+import org.opends.server.api.ConfigHandler;
+import org.opends.server.config.ConfigEntry;
+import org.opends.server.config.ConfigException;
+import org.opends.server.core.AddOperation;
+import org.opends.server.core.DeleteOperation;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ModifyDNOperation;
+import org.opends.server.core.ModifyOperation;
+import org.opends.server.core.SearchOperation;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.BackupConfig;
+import org.opends.server.types.BackupDirectory;
+import org.opends.server.types.CanceledOperationException;
+import org.opends.server.types.ConditionResult;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.IndexType;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.LDIFExportConfig;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.LDIFImportResult;
+import org.opends.server.types.RestoreConfig;
+import org.opends.server.util.LDIFException;
+import org.opends.server.util.LDIFReader;
+
+/**
+ * A class used to read the configuration from a file. This config file
+ * handler does not allow to modify the configuration, only to read it.
+ *
+ */
+
+public class ReadOnlyConfigFileHandler extends ConfigHandler
+{
+//The mapping that holds all of the configuration entries that have been read
+ // from the LDIF file.
+ private HashMap<DN,ConfigEntry> configEntries = new HashMap<DN,ConfigEntry>();
+
+//The reference to the configuration root entry.
+ private ConfigEntry configRootEntry;
+
+ // The server root
+ private String serverRoot;
+
+ // The instance root
+ private String instanceRoot;
+
+ private final Set<String> emptyStringSet = new HashSet<String>();
+
+ private DN[] baseDNs;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void finalizeConfigHandler()
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigEntry getConfigEntry(DN entryDN) throws ConfigException
+ {
+ return configEntries.get(entryDN);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigEntry getConfigRootEntry() throws ConfigException
+ {
+ return configRootEntry;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getServerRoot()
+ {
+ return serverRoot;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getInstanceRoot()
+ {
+ return instanceRoot;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public synchronized void initializeConfigHandler(String configFile,
+ boolean checkSchema)
+ throws InitializationException
+ {
+ File f = new File(configFile);
+ // We will use the LDIF reader to read the configuration file. Create an
+ // LDIF import configuration to do this and then get the reader.
+ LDIFReader reader = null;
+ try
+ {
+ try
+ {
+ LDIFImportConfig importConfig =
+ new LDIFImportConfig(f.getAbsolutePath());
+
+ reader = new LDIFReader(importConfig);
+ }
+ catch (Throwable t)
+ {
+ Message message = ERR_CONFIG_FILE_CANNOT_OPEN_FOR_READ.get(
+ f.getAbsolutePath(), String.valueOf(t));
+ throw new InitializationException(message, t);
+ }
+
+ if (! f.exists())
+ {
+ Message message =
+ ERR_CONFIG_FILE_DOES_NOT_EXIST.get(f.getAbsolutePath());
+ throw new InitializationException(message);
+ }
+
+ configEntries.clear();
+
+ // Read the first entry from the configuration file.
+ Entry entry;
+ try
+ {
+ entry = reader.readEntry(checkSchema);
+ if (entry == null)
+ {
+ Message message = ERR_CONFIG_FILE_EMPTY.get(f.getAbsolutePath());
+ throw new InitializationException(message);
+ }
+ configRootEntry = new ConfigEntry(entry, null);
+
+ baseDNs = new DN[] { configRootEntry.getDN() };
+
+ configEntries.put(entry.getDN(), configRootEntry);
+ // Iterate through the rest of the configuration file and process the
+ // remaining entries.
+ while (entry != null)
+ {
+ // Read the next entry from the configuration.
+ entry = reader.readEntry(checkSchema);
+ if (entry != null)
+ {
+ DN entryDN = entry.getDN();
+ DN parentDN = entryDN.getParent();
+ ConfigEntry parentEntry = null;
+ if (parentDN != null)
+ {
+ parentEntry = configEntries.get(parentDN);
+ }
+ if (parentEntry == null)
+ {
+ if (parentDN == null)
+ {
+ Message message = ERR_CONFIG_FILE_UNKNOWN_PARENT.get(
+ entryDN.toString(),
+ reader.getLastEntryLineNumber(),
+ f.getAbsolutePath());
+ throw new InitializationException(message);
+ }
+ else
+ {
+ Message message =
+ ERR_CONFIG_FILE_NO_PARENT.get(entryDN.toString(),
+ reader.getLastEntryLineNumber(),
+ f.getAbsolutePath(), parentDN.toString());
+ throw new InitializationException(message);
+ }
+ }
+ else
+ {
+ ConfigEntry configEntry = new ConfigEntry(entry, parentEntry);
+ parentEntry.addChild(configEntry);
+ configEntries.put(entryDN, configEntry);
+ }
+ }
+ }
+ }
+ catch (InitializationException ie)
+ {
+ throw ie;
+ }
+ catch (LDIFException le)
+ {
+ Message message = ERR_CONFIG_FILE_INVALID_LDIF_ENTRY.get(
+ le.getLineNumber(), f.getAbsolutePath(),
+ String.valueOf(le));
+ throw new InitializationException(message, le);
+ }
+ catch (Throwable t)
+ {
+ Message message = ERR_CONFIG_FILE_READ_ERROR.get(f.getAbsolutePath(),
+ String.valueOf(t));
+ throw new InitializationException(message, t);
+ }
+
+
+ // Determine the appropriate server root.
+ File rootFile = DirectoryServer.getEnvironmentConfig().getServerRoot();
+ serverRoot = rootFile.getAbsolutePath();
+
+ File instanceRootFile =
+ DirectoryServer.getEnvironmentConfig().
+ getInstanceRootFromServerRoot(rootFile);
+ instanceRoot = instanceRootFile.getAbsolutePath();
+ }
+ catch (InitializationException ie)
+ {
+ throw ie;
+ }
+ catch (Throwable t)
+ {
+
+ }
+ finally
+ {
+ try
+ {
+ if (reader != null)
+ {
+ reader.close();
+ }
+ }
+ catch (Throwable t)
+ {
+ // Ignore
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void writeSuccessfulStartupConfig()
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void writeUpdatedConfig() throws DirectoryException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addEntry(Entry arg0, AddOperation arg1)
+ throws DirectoryException, CanceledOperationException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void configureBackend(Configuration arg0) throws ConfigException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void createBackup(BackupConfig arg0) throws DirectoryException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void deleteEntry(DN arg0, DeleteOperation arg1)
+ throws DirectoryException, CanceledOperationException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void exportLDIF(LDIFExportConfig arg0) throws DirectoryException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void finalizeBackend()
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public DN[] getBaseDNs()
+ {
+ return baseDNs;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Entry getEntry(DN entryDN)
+ throws DirectoryException
+ {
+ ConfigEntry configEntry = configEntries.get(entryDN);
+ if (configEntry == null)
+ {
+ return null;
+ }
+ else
+ {
+ return configEntry.getEntry();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getEntryCount()
+ {
+ return configEntries.size();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getSupportedControls()
+ {
+ return emptyStringSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getSupportedFeatures()
+ {
+ return emptyStringSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConditionResult hasSubordinates(DN entryDN) throws DirectoryException
+ {
+ ConfigEntry baseEntry = configEntries.get(entryDN);
+ if(baseEntry == null)
+ {
+ return ConditionResult.UNDEFINED;
+ }
+ else if(baseEntry.hasChildren())
+ {
+ return ConditionResult.TRUE;
+ }
+ else
+ {
+ return ConditionResult.FALSE;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public LDIFImportResult importLDIF(LDIFImportConfig arg0)
+ throws DirectoryException
+ {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void initializeBackend()
+ throws ConfigException, InitializationException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isIndexed(AttributeType arg0, IndexType arg1)
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isLocal()
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long numSubordinates(DN entryDN, boolean subtree)
+ throws DirectoryException
+ {
+ ConfigEntry baseEntry = configEntries.get(entryDN);
+ if (baseEntry == null)
+ {
+ return -1;
+ }
+
+ if(!subtree)
+ {
+ return baseEntry.getChildren().size();
+ }
+ else
+ {
+ long count = 0;
+ for(ConfigEntry child : baseEntry.getChildren().values())
+ {
+ count += numSubordinates(child.getDN(), true);
+ count ++;
+ }
+ return count;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void preloadEntryCache() throws UnsupportedOperationException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeBackup(BackupDirectory arg0, String arg1)
+ throws DirectoryException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void renameEntry(DN arg0, Entry arg1, ModifyDNOperation arg2)
+ throws DirectoryException, CanceledOperationException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void replaceEntry(Entry arg0, Entry arg1, ModifyOperation arg2)
+ throws DirectoryException, CanceledOperationException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void restoreBackup(RestoreConfig arg0) throws DirectoryException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void search(SearchOperation arg0)
+ throws DirectoryException, CanceledOperationException
+ {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean supportsBackup()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean supportsBackup(BackupConfig arg0, StringBuilder arg1)
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean supportsLDIFExport()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean supportsLDIFImport()
+ {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean supportsRestore()
+ {
+ return false;
+ }
+}
+
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java
new file mode 100644
index 0000000..7f9dd88
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java
@@ -0,0 +1,189 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import static org.opends.messages.ConfigMessages.*;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.opends.messages.Message;
+import org.opends.server.config.ConfigConstants;
+import org.opends.server.config.ConfigException;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.SchemaConfigManager;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.Schema;
+
+/**
+ * Class used to retrieve the schema from the schema files.
+ *
+ */
+public class SchemaLoader
+{
+ private Schema schema;
+
+ /**
+ * Constructor.
+ *
+ */
+ public SchemaLoader()
+ {
+ schema = DirectoryServer.getSchema().duplicate();
+ }
+
+ private static String getSchemaDirectoryPath()
+ {
+ File schemaDir =
+ DirectoryServer.getEnvironmentConfig().getSchemaDirectory();
+ if (schemaDir != null) {
+ return schemaDir.getAbsolutePath();
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Reads the schema.
+ * @throws ConfigException if an error occurs reading the schema.
+ * @throws InitializationException if an error occurs trying to find out
+ * the schema files.
+ */
+ public void readSchema() throws ConfigException, InitializationException
+ {
+ String schemaDirPath= getSchemaDirectoryPath();
+ File schemaDir = new File(schemaDirPath);
+ String[] attrsToKeep = {
+ ConfigConstants.ATTR_ATTRIBUTE_TYPES_LC,
+ ConfigConstants.ATTR_OBJECTCLASSES_LC,
+ ConfigConstants.ATTR_NAME_FORMS_LC,
+ ConfigConstants.ATTR_DIT_CONTENT_RULES_LC,
+ ConfigConstants.ATTR_DIT_STRUCTURE_RULES_LC,
+ ConfigConstants.ATTR_MATCHING_RULE_USE_LC};
+ String[] ocsToKeep = {"top"};
+ for (ObjectClass oc : schema.getObjectClasses().values())
+ {
+ String name = oc.getNameOrOID().toLowerCase();
+ boolean found = false;
+ for (int i=0; i<ocsToKeep.length; i++)
+ {
+ if (ocsToKeep[i].equals(name))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ schema.deregisterObjectClass(oc);
+ }
+ }
+ for (AttributeType attr : schema.getAttributeTypes().values())
+ {
+ String name = attr.getNameOrOID().toLowerCase();
+ boolean found = false;
+ for (int i=0; i<attrsToKeep.length; i++)
+ {
+ if (attrsToKeep[i].equals(name))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ schema.deregisterAttributeType(attr);
+ }
+ }
+ String[] fileNames = null;
+ try
+ {
+ if (schemaDirPath == null || ! schemaDir.exists())
+ {
+ Message message = ERR_CONFIG_SCHEMA_NO_SCHEMA_DIR.get(schemaDirPath);
+ throw new InitializationException(message);
+ }
+ else if (! schemaDir.isDirectory())
+ {
+ Message message =
+ ERR_CONFIG_SCHEMA_DIR_NOT_DIRECTORY.get(schemaDirPath);
+ throw new InitializationException(message);
+ }
+
+ File[] schemaDirFiles = schemaDir.listFiles();
+ ArrayList<String> fileList = new ArrayList<String>(schemaDirFiles.length);
+ for (File f : schemaDirFiles)
+ {
+ if (f.isFile())
+ {
+ fileList.add(f.getName());
+ }
+ }
+
+ fileNames = new String[fileList.size()];
+ fileList.toArray(fileNames);
+ Arrays.sort(fileNames);
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ }
+ /*
+ catch (InitializationException ie)
+ {
+ throw ie;
+ }
+ catch (Exception e)
+ {
+ Message message = ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES.get(
+ schemaDirPath, getExceptionMessage(e));
+ throw new InitializationException(message, e);
+ }
+ */
+
+// Iterate through the schema files and read them as an LDIF file containing
+// a single entry. Then get the attributeTypes and objectClasses attributes
+// from that entry and parse them to initialize the server schema.
+ for (String schemaFile : fileNames)
+ {
+ SchemaConfigManager.loadSchemaFile(schema, schemaFile);
+ }
+ }
+
+ /**
+ * Returns the schema that was read.
+ * @return the schema that was read.
+ */
+ public Schema getSchema()
+ {
+ return schema;
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
new file mode 100644
index 0000000..fd58eb5
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -0,0 +1,2161 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.guitools.controlpanel.util;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.naming.CompositeName;
+import javax.naming.InvalidNameException;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.directory.SearchControls;
+import javax.naming.ldap.BasicControl;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapName;
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPasswordField;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.EtchedBorder;
+import javax.swing.border.TitledBorder;
+import javax.swing.table.JTableHeader;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
+
+import org.opends.admin.ads.SubtreeDeleteControl;
+import org.opends.guitools.controlpanel.ControlPanel;
+import org.opends.guitools.controlpanel.browser.IconPool;
+import org.opends.guitools.controlpanel.datamodel.ConfigReadException;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.SortableTableModel;
+import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
+import org.opends.guitools.controlpanel.event.TextComponentFocusListener;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
+import org.opends.guitools.controlpanel.ui.components.LabelWithHelpIcon;
+import org.opends.messages.Message;
+import org.opends.quicksetup.ui.UIFactory;
+import org.opends.quicksetup.util.Utils;
+import org.opends.server.api.AttributeSyntax;
+import org.opends.server.api.ConfigHandler;
+import org.opends.server.api.MatchingRule;
+import org.opends.server.config.ConfigEntry;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.LockFileManager;
+import org.opends.server.schema.SchemaConstants;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.DN;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.types.RDN;
+import org.opends.server.types.Schema;
+import org.opends.server.types.SchemaFileElement;
+import org.opends.server.util.ServerConstants;
+import org.opends.server.util.StaticUtils;
+
+/**
+ * An static class that provides miscellaneous functions.
+ *
+ */
+public class Utilities
+{
+ private static File rootDirectory;
+ private static File instanceRootDirectory;
+
+ /**
+ * The string to be used to display an obfuscated value (for instance password
+ * value).
+ */
+ public final static String OBFUSCATED_VALUE = "********";
+
+ private static String[] attrsToObfuscate =
+ {ServerConstants.ATTR_USER_PASSWORD};
+
+ private static ImageIcon warningIcon;
+
+ private static ImageIcon requiredIcon;
+
+ /**
+ * Returns <CODE>true</CODE> if we are running Mac OS and <CODE>false</CODE>
+ * otherwise.
+ * @return <CODE>true</CODE> if we are running Mac OS and <CODE>false</CODE>
+ * otherwise.
+ */
+ public static boolean isMacOS()
+ {
+ String os = System.getProperty("os.name").toLowerCase();
+ return os.indexOf("mac") != -1;
+ }
+
+ /**
+ * Creates a combo box.
+ * @return a combo box.
+ */
+ public static JComboBox createComboBox()
+ {
+ JComboBox combo = new JComboBox();
+ if (isMacOS())
+ {
+ combo.setOpaque(false);
+ }
+ return combo;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if an attribute value must be obfuscated because
+ * it contains sensitive information (like passwords) and <CODE>false</CODE>
+ * otherwise.
+ * @param attrName the attribute name.
+ * @param schema the schema of the server.
+ * @return <CODE>true</CODE> if an attribute value must be obfuscated because
+ * it contains sensitive information (like passwords) and <CODE>false</CODE>
+ * otherwise.
+ */
+ public static boolean mustObfuscate(String attrName, Schema schema)
+ {
+ boolean toObfuscate = false;
+ if (schema == null)
+ {
+ for (String attr : attrsToObfuscate)
+ {
+ if (attr.equalsIgnoreCase(attrName))
+ {
+ toObfuscate = true;
+ break;
+ }
+ }
+ }
+ else
+ {
+ toObfuscate = hasPasswordSyntax(attrName, schema);
+ }
+ return toObfuscate;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if we are running Windows and <CODE>false</CODE>
+ * otherwise.
+ * @return <CODE>true</CODE> if we are running Windows and <CODE>false</CODE>
+ * otherwise.
+ */
+ public static boolean isWindows()
+ {
+ String os = System.getProperty("os.name").toLowerCase();
+ return os.indexOf("windows") != -1;
+ }
+
+ /**
+ * Derives a color by adding the specified offsets to the base color's
+ * hue, saturation, and brightness values. The resulting hue, saturation,
+ * and brightness values will be contrained to be between 0 and 1.
+ * @param base the color to which the HSV offsets will be added
+ * @param dH the offset for hue
+ * @param dS the offset for saturation
+ * @param dB the offset for brightness
+ * @return Color with modified HSV values
+ */
+ public static Color deriveColorHSB(Color base, float dH, float dS, float dB)
+ {
+ float hsb[] = Color.RGBtoHSB(
+ base.getRed(), base.getGreen(), base.getBlue(), null);
+
+ hsb[0] += dH;
+ hsb[1] += dS;
+ hsb[2] += dB;
+ return Color.getHSBColor(
+ hsb[0] < 0? 0 : (hsb[0] > 1? 1 : hsb[0]),
+ hsb[1] < 0? 0 : (hsb[1] > 1? 1 : hsb[1]),
+ hsb[2] < 0? 0 : (hsb[2] > 1? 1 : hsb[2]));
+
+ }
+
+ /**
+ * Displays an error dialog that contains a set of error messages.
+ * @param parentComponent the parent component relative to which the dialog
+ * will be displayed.
+ * @param errors the set of error messages that the dialog must display.
+ */
+ public static void displayErrorDialog(Component parentComponent,
+ Collection<Message> errors)
+ {
+ /*
+ ErrorPanel panel = new ErrorPanel("Error", errors);
+ GenericDialog dlg = new GenericDialog(null, panel);
+ dlg.setModal(true);
+ Utilities.centerGoldenMean(dlg, Utilities.getParentDialog(this));
+ dlg.setVisible(true);
+ */
+ ArrayList<String> stringErrors = new ArrayList<String>();
+ for (Message err : errors)
+ {
+ stringErrors.add(err.toString());
+ }
+ String msg = getStringFromCollection(stringErrors, "<br>");
+ String plainText = msg.replaceAll("<br>", ServerConstants.EOL);
+ String wrappedText = StaticUtils.wrapText(plainText, 70);
+ wrappedText = wrappedText.replaceAll(ServerConstants.EOL, "<br>");
+ JOptionPane.showMessageDialog(
+ parentComponent, "<html>"+wrappedText,
+ INFO_CTRL_PANEL_ERROR_DIALOG_TITLE.get().toString(),
+ JOptionPane.ERROR_MESSAGE);
+ }
+
+ /**
+ * Displays a confirmation dialog. Returns <CODE>true</CODE> if the user
+ * accepts the message and <CODE>false</CODE> otherwise.
+ * @param parentComponent the parent component relative to which the dialog
+ * will be displayed.
+ * @param title the title of the dialog.
+ * @param msg the message to be displayed.
+ * @return <CODE>true</CODE> if the user accepts the message and
+ * <CODE>false</CODE> otherwise.
+ *
+ */
+ public static boolean displayConfirmationDialog(Component parentComponent,
+ Message title, Message msg)
+ {
+ String plainText = msg.toString().replaceAll("<br>", ServerConstants.EOL);
+ String wrappedText = StaticUtils.wrapText(plainText, 70);
+ wrappedText = wrappedText.replaceAll(ServerConstants.EOL, "<br>");
+ return JOptionPane.YES_OPTION == JOptionPane.showOptionDialog(
+ parentComponent, "<html>"+wrappedText,
+ title.toString(),
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE,
+ null, // don't use a custom Icon
+ null, // the titles of buttons
+ null); // default button title
+ }
+
+
+ /**
+ * Creates a JEditorPane that displays a message.
+ * @param text the message of the editor pane in HTML format.
+ * @param font the font to be used in the message.
+ * @return a JEditorPane that displays a message.
+ */
+ public static JEditorPane makeHtmlPane(String text, Font font)
+ {
+ JEditorPane pane = new JEditorPane();
+ pane.setContentType("text/html");
+ if (text != null)
+ {
+ pane.setText(applyFont(text, font));
+ }
+ pane.setEditable(false);
+ pane.setBorder(new EmptyBorder(0, 0, 0, 0));
+ pane.setOpaque(false);
+ pane.setFocusCycleRoot(false);
+ return pane;
+ }
+
+ /**
+ * Returns the HTML style representation for the given font.
+ * @param font the font for which we want to get an HTML style representation.
+ * @return the HTML style representation for the given font.
+ */
+ private static String getFontStyle(Font font)
+ {
+ StringBuilder buf = new StringBuilder();
+
+ buf.append("font-family:" + font.getName()).append(
+ ";font-size:" + font.getSize() + "pt");
+
+ if (font.isItalic())
+ {
+ buf.append(";font-style:italic");
+ }
+
+ if (font.isBold())
+ {
+ buf.append(";font-weight:bold;");
+ }
+
+ return buf.toString();
+ }
+
+ /**
+ * Creates a titled border.
+ * @param msg the message to be displayed in the titled border.
+ * @return the created titled border.
+ */
+ public static Border makeTitledBorder(Message msg)
+ {
+ TitledBorder border = new TitledBorder(new EtchedBorder(),
+ " "+msg+" ");
+ border.setTitleFont(ColorAndFontConstants.titleFont);
+ border.setTitleColor(ColorAndFontConstants.foreground);
+ return border;
+ }
+
+ /**
+ * Returns a JScrollPane that contains the provided component. The scroll
+ * pane will not contain any border.
+ * @param comp the component contained in the scroll pane.
+ * @return a JScrollPane that contains the provided component. The scroll
+ * pane will not contain any border.
+ */
+ public static JScrollPane createBorderLessScrollBar(Component comp)
+ {
+ JScrollPane scroll = new JScrollPane(comp);
+ scroll.setBorder(new EmptyBorder(0, 0, 0, 0));
+ scroll.setViewportBorder(new EmptyBorder(0, 0, 0, 0));
+ scroll.setOpaque(false);
+ scroll.getViewport().setOpaque(false);
+ scroll.getViewport().setBackground(ColorAndFontConstants.background);
+ scroll.setBackground(ColorAndFontConstants.background);
+ return scroll;
+ }
+
+ /**
+ * Returns a JScrollPane that contains the provided component.
+ * @param comp the component contained in the scroll pane.
+ * @return a JScrollPane that contains the provided component.
+ */
+ public static JScrollPane createScrollPane(Component comp)
+ {
+ JScrollPane scroll = new JScrollPane(comp);
+ scroll.getViewport().setOpaque(false);
+ scroll.setOpaque(false);
+ scroll.getViewport().setBackground(ColorAndFontConstants.background);
+ scroll.setBackground(ColorAndFontConstants.background);
+ return scroll;
+ }
+
+ /**
+ * Creates a button.
+ * @param text the message to be displayed by the button.
+ * @return the created button.
+ */
+ public static JButton createButton(Message text)
+ {
+ JButton button = new JButton(text.toString());
+ button.setOpaque(false);
+ button.setForeground(ColorAndFontConstants.buttonForeground);
+ return button;
+ }
+
+ /**
+ * Creates a radio button.
+ * @param text the message to be displayed by the radio button.
+ * @return the created radio button.
+ */
+ public static JRadioButton createRadioButton(Message text)
+ {
+ JRadioButton button = new JRadioButton(text.toString());
+ button.setOpaque(false);
+ button.setForeground(ColorAndFontConstants.buttonForeground);
+ return button;
+ }
+
+ /**
+ * Creates a check box.
+ * @param text the message to be displayed by the check box.
+ * @return the created check box.
+ */
+ public static JCheckBox createCheckBox(Message text)
+ {
+ JCheckBox cb = new JCheckBox(text.toString());
+ cb.setOpaque(false);
+ cb.setForeground(ColorAndFontConstants.buttonForeground);
+ return cb;
+ }
+
+ /**
+ * Creates a menu item with the provided text.
+ * @param msg the text.
+ * @return a menu item with the provided text.
+ */
+ public static JMenuItem createMenuItem(Message msg)
+ {
+ return new JMenuItem(msg.toString());
+ }
+
+ /**
+ * Creates a menu with the provided text.
+ * @param msg the text.
+ * @param description the accessible description.
+ * @return a menu with the provided text.
+ */
+ public static JMenu createMenu(Message msg, Message description)
+ {
+ JMenu menu = new JMenu(msg.toString());
+ menu.getAccessibleContext().setAccessibleDescription(
+ description.toString());
+ return menu;
+ }
+
+ /**
+ * Creates a label of type 'primary' (with bigger font than usual) with no
+ * text.
+ * @return the label of type 'primary' (with bigger font than usual) with no
+ * text.
+ */
+ public static JLabel createPrimaryLabel()
+ {
+ return createPrimaryLabel(Message.EMPTY);
+ }
+
+ /**
+ * Creates a label of type 'primary' (with bigger font than usual).
+ * @param text the message to be displayed by the label.
+ * @return the label of type 'primary' (with bigger font than usual).
+ */
+ public static JLabel createPrimaryLabel(Message text)
+ {
+ JLabel label = new JLabel(text.toString());
+ label.setFont(ColorAndFontConstants.primaryFont);
+ label.setForeground(ColorAndFontConstants.foreground);
+ return label;
+ }
+
+ /**
+ * Creates a label of type 'inline help' (with smaller font).
+ * @param text the message to be displayed by the label.
+ * @return the label of type 'inline help' (with smaller font).
+ */
+ public static JLabel createInlineHelpLabel(Message text)
+ {
+ JLabel label = new JLabel(text.toString());
+ label.setFont(ColorAndFontConstants.inlineHelpFont);
+ label.setForeground(ColorAndFontConstants.foreground);
+ return label;
+ }
+
+ /**
+ * Creates a label of type 'title' (with bigger font).
+ * @param text the message to be displayed by the label.
+ * @return the label of type 'title' (with bigger font).
+ */
+ public static JLabel createTitleLabel(Message text)
+ {
+ JLabel label = new JLabel(text.toString());
+ label.setFont(ColorAndFontConstants.titleFont);
+ label.setForeground(ColorAndFontConstants.foreground);
+ return label;
+ }
+
+ /**
+ * Creates a label (with default font) with no text.
+ * @return the label (with default font) with no text.
+ */
+ public static JLabel createDefaultLabel()
+ {
+ return createDefaultLabel(Message.EMPTY);
+ }
+
+ /**
+ * Creates a label (with default font).
+ * @param text the message to be displayed by the label.
+ * @return the label (with default font).
+ */
+ public static JLabel createDefaultLabel(Message text)
+ {
+ JLabel label = new JLabel(text.toString());
+ label.setFont(ColorAndFontConstants.defaultFont);
+ label.setForeground(ColorAndFontConstants.foreground);
+ return label;
+ }
+
+ /**
+ * Returns a table created with the provided model and renderers.
+ * @param tableModel the table model.
+ * @param renderer the cell renderer.
+ * @return a table created with the provided model and renderers.
+ */
+ public static JTable createSortableTable(final SortableTableModel tableModel,
+ TableCellRenderer renderer)
+ {
+ final JTable table = new JTable(tableModel);
+ table.setShowGrid(true);
+ table.setAutoResizeMode(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);
+ boolean isMacOS = Utilities.isMacOS();
+ table.setGridColor(ColorAndFontConstants.gridColor);
+ if (isMacOS)
+ {
+ table.getTableHeader().setBorder(
+ BorderFactory.createMatteBorder(1, 1, 0, 0,
+ ColorAndFontConstants.gridColor));
+ }
+ if (Utilities.isWindows())
+ {
+ table.getTableHeader().setBorder(
+ BorderFactory.createMatteBorder(1, 1, 0, 1,
+ ColorAndFontConstants.gridColor));
+ }
+
+ for (int i=0; i<tableModel.getColumnCount(); i++)
+ {
+ TableColumn col = table.getColumn(table.getColumnName(i));
+ col.setCellRenderer(renderer);
+ }
+ MouseAdapter listMouseListener = new MouseAdapter() {
+ public void mouseClicked(MouseEvent e) {
+ TableColumnModel columnModel = table.getColumnModel();
+ int viewColumn = columnModel.getColumnIndexAtX(e.getX());
+ int sortedBy = table.convertColumnIndexToModel(viewColumn);
+ if (e.getClickCount() == 1 && sortedBy != -1) {
+ tableModel.setSortAscending(!tableModel.isSortAscending());
+ tableModel.setSortColumn(sortedBy);
+ tableModel.forceResort();
+ updateTableSizes(table);
+ }
+ }
+ };
+ table.getTableHeader().addMouseListener(listMouseListener);
+ return table;
+ }
+
+ /**
+ * Creates a text area with borders similar to the ones of a text field.
+ * @param text the text of the text area.
+ * @param rows the rows of the text area.
+ * @param cols the columns of the text area.
+ * @return a text area with borders similar to the ones of a text field.
+ */
+ public static JTextArea createTextAreaWithBorder(Message text, int rows,
+ int cols)
+ {
+ JTextArea ta = createTextArea(text, rows, cols);
+ if (ColorAndFontConstants.textAreaBorder != null)
+ {
+ setBorder(ta, ColorAndFontConstants.textAreaBorder);
+ }
+ return ta;
+ }
+
+ /**
+ * Creates a non-editable text area.
+ * @param text the text of the text area.
+ * @param rows the rows of the text area.
+ * @param cols the columns of the text area.
+ * @return a non-editable text area.
+ */
+ public static JTextArea createNonEditableTextArea(Message text, int rows,
+ int cols)
+ {
+ JTextArea ta = createTextArea(text, rows, cols);
+ ta.setEditable(false);
+ ta.setOpaque(false);
+ ta.setForeground(ColorAndFontConstants.foreground);
+ return ta;
+ }
+
+ /**
+ * Creates a text area.
+ * @param text the text of the text area.
+ * @param rows the rows of the text area.
+ * @param cols the columns of the text area.
+ * @return a text area.
+ */
+ public static JTextArea createTextArea(Message text, int rows,
+ int cols)
+ {
+ JTextArea ta = new JTextArea(text.toString(), rows, cols);
+ ta.setFont(ColorAndFontConstants.defaultFont);
+ return ta;
+ }
+
+ /**
+ * Creates a text field.
+ * @param text the text of the text field.
+ * @param cols the columns of the text field.
+ * @return the created text field.
+ */
+ public static JTextField createTextField(String text, int cols)
+ {
+ JTextField tf = createTextField();
+ tf.setText(text);
+ tf.setColumns(cols);
+ return tf;
+ }
+
+ /**
+ * Creates a short text field.
+ * @return the created text field.
+ */
+ public static JTextField createShortTextField()
+ {
+ JTextField tf = createTextField();
+ tf.setColumns(10);
+ return tf;
+ }
+
+ /**
+ * Creates a medium sized text field.
+ * @return the created text field.
+ */
+ public static JTextField createMediumTextField()
+ {
+ JTextField tf = createTextField();
+ tf.setColumns(20);
+ return tf;
+ }
+
+ /**
+ * Creates a long text field.
+ * @return the created text field.
+ */
+ public static JTextField createLongTextField()
+ {
+ JTextField tf = createTextField();
+ tf.setColumns(30);
+ return tf;
+ }
+
+
+ /**
+ * Creates a text field with the default size.
+ * @return the created text field.
+ */
+ public static JTextField createTextField()
+ {
+ JTextField tf = new JTextField();
+ tf.addFocusListener(new TextComponentFocusListener(tf));
+ tf.setFont(ColorAndFontConstants.defaultFont);
+ return tf;
+ }
+
+ /**
+ * Creates a pasword text field.
+ * @return the created password text field.
+ */
+ public static JPasswordField createPasswordField()
+ {
+ JPasswordField pf = new JPasswordField();
+ pf.addFocusListener(new TextComponentFocusListener(pf));
+ pf.setFont(ColorAndFontConstants.defaultFont);
+ return pf;
+ }
+
+ /**
+ * Creates a pasword text field.
+ * @param cols the columns of the password text field.
+ * @return the created password text field.
+ */
+ public static JPasswordField createPasswordField(int cols)
+ {
+ JPasswordField pf = createPasswordField();
+ pf.setColumns(cols);
+ return pf;
+ }
+
+
+ /**
+ * Sets the border in a given component. If the component already has a
+ * border, creates a compound border.
+ * @param comp the component.
+ * @param border the border to be set.
+ */
+ public static void setBorder(JComponent comp, Border border)
+ {
+ if (comp.getBorder() == null)
+ {
+ comp.setBorder(border);
+ }
+ else
+ {
+ comp.setBorder(BorderFactory.createCompoundBorder(comp.getBorder(),
+ border));
+ }
+ }
+
+ /**
+ * Checks the size of the table and of the scroll bar where it is contained,
+ * and depending on it updates the auto resize mode.
+ * @param scroll the scroll pane containing the table.
+ * @param table the table.
+ */
+ public static void updateScrollMode(JScrollPane scroll, JTable table)
+ {
+ int width1 = table.getPreferredScrollableViewportSize().width;
+ int width2 = scroll.getViewport().getWidth();
+
+ if (width1 > width2)
+ {
+ table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+ }
+ else
+ {
+ table.setAutoResizeMode(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);
+ }
+ }
+
+ /**
+ * Updates the size of the table rows according to the size of the
+ * rendered component.
+ * @param table the table to handle.
+ */
+ public static void updateTableSizes(JTable table)
+ {
+ updateTableSizes(table, -1);
+ }
+
+ /**
+ * Updates the size of the table rows according to the size of the
+ * rendered component.
+ * @param table the table to handle.
+ * @param rows the maximum rows to be displayed (-1 for unlimited)
+ */
+ public static void updateTableSizes(JTable table, int rows)
+ {
+ updateTableColumnWidth(table);
+ updateTableRowHeight(table, rows);
+ }
+
+
+ /**
+ * Updates the height of the table rows according to the size of the
+ * rendered component.
+ * @param table the table to handle.
+ */
+ private static void updateTableRowHeight(JTable table, int rows)
+ {
+ int headerMaxHeight = 5;
+ int margin = table.getIntercellSpacing().height;
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ JTableHeader header = table.getTableHeader();
+ if (header.isVisible())
+ {
+ for (int col=0; col<table.getColumnCount(); col++)
+ {
+ TableColumn tcol = table.getColumnModel().getColumn(col);
+ TableCellRenderer renderer = tcol.getHeaderRenderer();
+ if (renderer == null)
+ {
+ renderer = table.getTableHeader().getDefaultRenderer();
+ }
+ Component comp = renderer.getTableCellRendererComponent(table,
+ table.getModel().getColumnName(col), false, false, 0, col);
+ int colHeight = comp.getPreferredSize().height + (2 * margin);
+ if (colHeight > screenSize.height)
+ {
+ // There are some issues on Mac OS and sometimes the preferred size
+ // is too big.
+ colHeight = 0;
+ }
+ headerMaxHeight = Math.max(headerMaxHeight, colHeight);
+ }
+
+ header.setPreferredSize(new Dimension(
+ header.getPreferredSize().width,
+ headerMaxHeight));
+ }
+ int maxRow = 0;
+ for (int row=0; row<table.getRowCount(); row++)
+ {
+ int rowMaxHeight = table.getRowHeight();
+ for (int col=0; col<table.getColumnCount(); col++)
+ {
+ TableCellRenderer renderer = table.getCellRenderer(row, col);
+ Component comp = renderer.getTableCellRendererComponent(table,
+ table.getModel().getValueAt(row, col), false, false, row, col);
+ int colHeight = comp.getPreferredSize().height;
+ if (colHeight > screenSize.height)
+ {
+ colHeight = 0;
+ }
+ rowMaxHeight = Math.max(rowMaxHeight, colHeight);
+ }
+ table.setRowHeight(row, rowMaxHeight);
+ maxRow = Math.max(maxRow, rowMaxHeight);
+ }
+ Dimension d1;
+ if (rows == -1)
+ {
+ d1 = table.getPreferredSize();
+ }
+ else
+ {
+ d1 = new Dimension(table.getPreferredSize().width, rows * maxRow);
+ }
+ table.setPreferredScrollableViewportSize(d1);
+ }
+
+ /**
+ * Updates the height of the table columns according to the size of the
+ * rendered component.
+ * @param table the table to handle.
+ */
+ private static void updateTableColumnWidth(JTable table)
+ {
+ int margin = table.getIntercellSpacing().width;
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ for (int col=0; col<table.getColumnCount(); col++)
+ {
+ int colMaxWidth = 8;
+ TableColumn tcol = table.getColumnModel().getColumn(col);
+ TableCellRenderer renderer = tcol.getHeaderRenderer();
+
+ if (renderer == null)
+ {
+ renderer = table.getTableHeader().getDefaultRenderer();
+ }
+
+ Component comp = renderer.getTableCellRendererComponent(table,
+ table.getModel().getColumnName(col), false, false, 0, col);
+ colMaxWidth = comp.getPreferredSize().width + 8;
+
+ if (colMaxWidth > screenSize.width)
+ {
+ colMaxWidth = 8;
+ }
+
+ for (int row=0; row<table.getRowCount(); row++)
+ {
+ renderer = table.getCellRenderer(row, col);
+ comp = table.prepareRenderer(renderer, row, col);
+ int colWidth = comp.getPreferredSize().width + (2 * margin);
+ colMaxWidth = Math.max(colMaxWidth, colWidth);
+ }
+ tcol.setPreferredWidth(colMaxWidth);
+ }
+ }
+
+ /**
+ * Returns a String that contains the html passed as parameter with a span
+ * applied. The span style corresponds to the Font specified as parameter.
+ * The goal of this method is to be able to specify a font for an HTML string.
+ *
+ * @param html the original html text.
+ * @param font the font to be used to generate the new HTML.
+ * @return a string that represents the original HTML with the font specified
+ * as parameter.
+ */
+ public static String applyFont(String html, Font font)
+ {
+ StringBuilder buf = new StringBuilder();
+
+ buf.append("<span style=\"").append(getFontStyle(font)).append("\">")
+ .append(html).append("</span>");
+
+ return buf.toString();
+ }
+
+
+ /**
+ * Returns an ImageIcon or <CODE>null</CODE> if the path was invalid.
+ * @param path the path of the image.
+ * @return an ImageIcon or <CODE>null</CODE> if the path was invalid.
+ */
+ public static ImageIcon createImageIcon(String path) {
+ java.net.URL imgURL = ControlPanel.class.getClassLoader().getResource(path);
+ if (imgURL != null) {
+ return new ImageIcon(imgURL);
+ } else {
+ System.err.println("Couldn't find file: " + path);
+ return null;
+ }
+ }
+
+ /**
+ * Creates an image icon using an array of bytes that contain the image and
+ * specifying the maximum height of the image.
+ * @param bytes the byte array.
+ * @param maxHeight the maximum height of the image.
+ * @param description the description of the image.
+ * @param useFast whether a fast algorithm must be used to transform the image
+ * or an algorithm with a better result.
+ * @return an image icon using an array of bytes that contain the image and
+ * specifying the maximum height of the image.
+ */
+ public static ImageIcon createImageIcon(byte[] bytes, int maxHeight,
+ Message description, boolean useFast)
+ {
+ ImageIcon icon = new ImageIcon(bytes, description.toString());
+ if ((maxHeight > icon.getIconHeight()) || (icon.getIconHeight() <= 0))
+ {
+ return icon;
+ }
+ else
+ {
+ int newHeight = maxHeight;
+ int newWidth = (newHeight * icon.getIconWidth()) / icon.getIconHeight();
+ int algo = useFast ? Image.SCALE_FAST : Image.SCALE_SMOOTH;
+ Image scaledImage = icon.getImage().getScaledInstance(newWidth, newHeight,
+ algo);
+ return new ImageIcon(scaledImage);
+ }
+ }
+
+ /**
+ * Updates the preferredsize of an editor pane.
+ * @param pane the panel to be updated.
+ * @param nCols the number of columns that the panel must have.
+ * @param plainText the text to be displayed (plain text).
+ * @param font the font to be used.
+ * @param applyBackground whether an error/warning background must be applied
+ * to the text or not.
+ */
+ public static void updatePreferredSize(JEditorPane pane, int nCols,
+ String plainText, Font font, boolean applyBackground)
+ {
+ String wrappedText = StaticUtils.wrapText(plainText, nCols);
+ wrappedText = wrappedText.replaceAll(ServerConstants.EOL, "<br>");
+ if (applyBackground)
+ {
+ wrappedText = UIFactory.applyErrorBackgroundToHtml(
+ Utilities.applyFont(wrappedText, font));
+ }
+ JEditorPane pane2 = makeHtmlPane(wrappedText, font);
+ pane.setPreferredSize(pane2.getPreferredSize());
+ }
+
+ /**
+ * Center the component location based on its preferred size. The code
+ * considers the particular case of 2 screens and puts the component on the
+ * center of the left screen
+ *
+ * @param comp the component to be centered.
+ */
+ public static void centerOnScreen(Component comp)
+ {
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+
+ int width = comp.getPreferredSize().width;
+ int height = comp.getPreferredSize().height;
+
+ boolean multipleScreen = screenSize.width / screenSize.height >= 2;
+
+ if (multipleScreen)
+ {
+ comp.setLocation((screenSize.width / 4) - (width / 2),
+ (screenSize.height - height) / 2);
+ } else
+ {
+ comp.setLocation((screenSize.width - width) / 2,
+ (screenSize.height - height) / 2);
+ }
+ }
+
+ /**
+ * Center the component location of the ref component.
+ *
+ * @param comp the component to be centered.
+ * @param ref the component to be used as reference.
+ *
+ */
+ public static void centerGoldenMean(Window comp, Component ref)
+ {
+ comp.setLocationRelativeTo(ref);
+ // Apply the golden mean
+ if ((ref != null) && ref.isVisible())
+ {
+ int refY = ref.getY();
+ int refHeight = ref.getHeight();
+ int compHeight = comp.getPreferredSize().height;
+
+ int newY = refY + (int) ((refHeight * 0.3819) - (compHeight * 0.5));
+ // Check that the new window will be fully visible
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ if ((newY > 0) && (screenSize.height > newY + compHeight))
+ {
+ comp.setLocation(comp.getX(), newY);
+ }
+ }
+ }
+
+ /**
+ * Returns the parent frame of a component. <CODE>null</CODE> if this
+ * component is not contained in any frame.
+ * @param comp the component.
+ * @return the parent frame of a component. <CODE>null</CODE> if this
+ * component is not contained in any frame.
+ */
+ public static JFrame getFrame(Component comp)
+ {
+ Component parent = comp;
+ while ((parent != null) && !(parent instanceof JFrame))
+ {
+ parent = parent.getParent();
+ }
+ if (parent != null)
+ {
+ return (JFrame)parent;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Returns the parent dialog of a component. <CODE>null</CODE> if this
+ * component is not contained in any dialog.
+ * @param comp the component.
+ * @return the parent dialog of a component. <CODE>null</CODE> if this
+ * component is not contained in any dialog.
+ */
+ public static Window getParentDialog(Component comp)
+ {
+ Component parent = comp;
+ while (parent != null)
+ {
+ if ((parent instanceof JDialog) || (parent instanceof JFrame))
+ {
+ return (Window)parent;
+ }
+ parent = parent.getParent();
+ }
+ return null;
+ }
+
+ /**
+ * Unescapes UTF-8 text and generates a String from it.
+ * @param v the string in UTF-8 format.
+ * @return the string with unescaped characters.
+ */
+ public static String unescapeUtf8(String v)
+ {
+ try
+ {
+ byte[] stringBytes = v.getBytes("UTF-8");
+ byte[] decodedBytes = new byte[stringBytes.length];
+ int pos = 0;
+ for (int i = 0; i < stringBytes.length; i++)
+ {
+ if ((stringBytes[i] == '\\') && (i + 2 < stringBytes.length) &&
+ StaticUtils.isHexDigit(stringBytes[i+1]) &&
+ StaticUtils.isHexDigit(stringBytes[i+2]))
+ {
+ // Convert hex-encoded UTF-8 to 16-bit chars.
+ byte b;
+
+ byte escapedByte1 = stringBytes[++i];
+ switch (escapedByte1)
+ {
+ case '0':
+ b = (byte) 0x00;
+ break;
+ case '1':
+ b = (byte) 0x10;
+ break;
+ case '2':
+ b = (byte) 0x20;
+ break;
+ case '3':
+ b = (byte) 0x30;
+ break;
+ case '4':
+ b = (byte) 0x40;
+ break;
+ case '5':
+ b = (byte) 0x50;
+ break;
+ case '6':
+ b = (byte) 0x60;
+ break;
+ case '7':
+ b = (byte) 0x70;
+ break;
+ case '8':
+ b = (byte) 0x80;
+ break;
+ case '9':
+ b = (byte) 0x90;
+ break;
+ case 'a':
+ case 'A':
+ b = (byte) 0xA0;
+ break;
+ case 'b':
+ case 'B':
+ b = (byte) 0xB0;
+ break;
+ case 'c':
+ case 'C':
+ b = (byte) 0xC0;
+ break;
+ case 'd':
+ case 'D':
+ b = (byte) 0xD0;
+ break;
+ case 'e':
+ case 'E':
+ b = (byte) 0xE0;
+ break;
+ case 'f':
+ case 'F':
+ b = (byte) 0xF0;
+ break;
+ default:
+ throw new IllegalStateException("Unexpected byte: "+escapedByte1);
+ }
+
+ byte escapedByte2 = stringBytes[++i];
+ switch (escapedByte2)
+ {
+ case '0':
+ break;
+ case '1':
+ b |= 0x01;
+ break;
+ case '2':
+ b |= 0x02;
+ break;
+ case '3':
+ b |= 0x03;
+ break;
+ case '4':
+ b |= 0x04;
+ break;
+ case '5':
+ b |= 0x05;
+ break;
+ case '6':
+ b |= 0x06;
+ break;
+ case '7':
+ b |= 0x07;
+ break;
+ case '8':
+ b |= 0x08;
+ break;
+ case '9':
+ b |= 0x09;
+ break;
+ case 'a':
+ case 'A':
+ b |= 0x0A;
+ break;
+ case 'b':
+ case 'B':
+ b |= 0x0B;
+ break;
+ case 'c':
+ case 'C':
+ b |= 0x0C;
+ break;
+ case 'd':
+ case 'D':
+ b |= 0x0D;
+ break;
+ case 'e':
+ case 'E':
+ b |= 0x0E;
+ break;
+ case 'f':
+ case 'F':
+ b |= 0x0F;
+ break;
+ default:
+ throw new IllegalStateException("Unexpected byte: "+escapedByte2);
+ }
+
+ decodedBytes[pos++] = b;
+ }
+ else {
+ decodedBytes[pos++] = stringBytes[i];
+ }
+ }
+ return new String(decodedBytes, 0, pos, "UTF-8");
+ }
+ catch (UnsupportedEncodingException uee)
+ {
+// This is a bug, UTF-8 should be supported always by the JVM
+ throw new IllegalStateException("UTF-8 encoding not supported", uee);
+ }
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the the provided strings represent the same
+ * DN and <CODE>false</CODE> otherwise.
+ * @param dn1 the first dn to compare.
+ * @param dn2 the second dn to compare.
+ * @return <CODE>true</CODE> if the the provided strings represent the same
+ * DN and <CODE>false</CODE> otherwise.
+ */
+ public static boolean areDnsEqual(String dn1, String dn2)
+ {
+ boolean areDnsEqual = false;
+ try
+ {
+ LdapName name1 = new LdapName(dn1);
+ LdapName name2 = new LdapName(dn2);
+ areDnsEqual = name1.equals(name2);
+ } catch (Exception ex)
+ {
+ }
+
+ return areDnsEqual;
+ }
+
+
+ /**
+ * Gets the RDN string for a given attribute name and value.
+ * @param attrName the attribute name.
+ * @param attrValue the attribute value.
+ * @return the RDN string for the attribute name and value.
+ */
+ public static String getRDNString(String attrName, String attrValue)
+ {
+ AttributeType attrType = DirectoryServer.getDefaultAttributeType(attrName);
+ AttributeValue value = new AttributeValue(attrType, attrValue);
+ RDN rdn = new RDN(attrType, attrName, value);
+ return rdn.toString();
+ }
+
+ /**
+ * Returns the attribute name with no options (or subtypes).
+ * @param attrName the complete attribute name.
+ * @return the attribute name with no options (or subtypes).
+ */
+
+ public static String getAttributeNameWithoutOptions(String attrName)
+ {
+ int index = attrName.indexOf(";");
+ if (index != -1)
+ {
+ attrName = attrName.substring(0, index);
+ }
+ return attrName;
+ }
+
+ /**
+ * This is a helper method that gets a String representation of the elements
+ * in the Collection. The String will display the different elements separated
+ * by the separator String.
+ *
+ * @param col
+ * the collection containing the String.
+ * @param separator
+ * the separator String to be used.
+ * @return the String representation for the collection.
+ */
+ public static String getStringFromCollection(Collection<String> col,
+ String separator)
+ {
+ StringBuilder msg = new StringBuilder();
+ for (String m : col)
+ {
+
+ if (msg.length() > 0)
+ {
+ msg.append(separator);
+ }
+ msg.append(m);
+ }
+ return msg.toString();
+ }
+
+ /**
+ * Commodity method to get the Name object representing a dn.
+ * It is preferable to use Name objects when doing JNDI operations to avoid
+ * problems with the '/' character.
+ * @param dn the DN as a String.
+ * @return a Name object representing the DN.
+ * @throws InvalidNameException if the provided DN value is not valid.
+ *
+ */
+ public static Name getJNDIName(String dn) throws InvalidNameException
+ {
+ Name name = new CompositeName();
+ if ((dn != null) && (dn.length() > 0)) {
+ name.add(dn);
+ }
+
+ return name;
+ }
+
+ /**
+ * Returns a String representing an LDIF file from a set of lines.
+ * @param lines the lines of the LDIF file.
+ * @return a String representing an LDIF file from a set of lines.
+ */
+ public static String makeLdif(String... lines)
+ {
+ StringBuilder buffer = new StringBuilder();
+ for (String line : lines) {
+ buffer.append(line).append(ServerConstants.EOL);
+ }
+ // Append an extra line so we can append LDIF Strings.
+ buffer.append(ServerConstants.EOL);
+ return buffer.toString();
+ }
+
+
+ /**
+ * Returns the HTML representation of the 'Done' string.
+ * @param progressFont the font to be used.
+ * @return the HTML representation of the 'Done' string.
+ */
+ public static String getProgressDone(Font progressFont)
+ {
+ return applyFont(INFO_CTRL_PANEL_PROGRESS_DONE.get().toString(),
+ progressFont.deriveFont(Font.BOLD));
+ }
+
+ /**
+ * Returns the HTML representation of a message to which some points have
+ * been appended.
+ * @param plainText the plain text.
+ * @param progressFont the font to be used.
+ * @return the HTML representation of a message to which some points have
+ * been appended.
+ */
+ public static String getProgressWithPoints(Message plainText,
+ Font progressFont)
+ {
+ return applyFont(plainText.toString(), progressFont)+
+ applyFont(" ..... ",
+ progressFont.deriveFont(Font.BOLD));
+ }
+
+ /**
+ * Returns the HTML representation of an error for a given text.
+ * @param title the title.
+ * @param titleFont the font for the title.
+ * @param details the details.
+ * @param detailsFont the font to be used for the details.
+ * @return the HTML representation of an error for the given text.
+ */
+ public static String getFormattedError(Message title, Font titleFont,
+ Message details, Font detailsFont)
+ {
+ StringBuilder buf = new StringBuilder();
+ String space = " ";
+ buf.append(UIFactory.getIconHtml(UIFactory.IconType.ERROR_LARGE) + space
+ + space + applyFont(title.toString(), titleFont));
+ if (details != null)
+ {
+ buf.append("<br><br>")
+ .append(applyFont(details.toString(), detailsFont));
+ }
+ return "<form>"+UIFactory.applyErrorBackgroundToHtml(buf.toString())+
+ "</form>";
+ }
+
+ /**
+ * Returns the HTML representation of a success for a given text.
+ * @param title the title.
+ * @param titleFont the font for the title.
+ * @param details the details.
+ * @param detailsFont the font to be used for the details.
+ * @return the HTML representation of a success for the given text.
+ */
+ public static String getFormattedSuccess(Message title, Font titleFont,
+ Message details, Font detailsFont)
+ {
+ StringBuilder buf = new StringBuilder();
+ String space = " ";
+ buf.append(UIFactory.getIconHtml(UIFactory.IconType.INFORMATION_LARGE) +
+ space + space + applyFont(title.toString(), titleFont));
+ if (details != null)
+ {
+ buf.append("<br><br>")
+ .append(applyFont(details.toString(), detailsFont));
+ }
+ return "<form>"+UIFactory.applyErrorBackgroundToHtml(buf.toString())+
+ "</form>";
+ }
+
+ /**
+ * Returns the HTML representation of a confirmation for a given text.
+ * @param title the title.
+ * @param titleFont the font for the title.
+ * @param details the details.
+ * @param detailsFont the font to be used for the details.
+ * @return the HTML representation of a confirmation for the given text.
+ */
+ public static String getFormattedConfirmation(Message title, Font titleFont,
+ Message details, Font detailsFont)
+ {
+ StringBuilder buf = new StringBuilder();
+ String space = " ";
+ buf.append(UIFactory.getIconHtml(UIFactory.IconType.WARNING_LARGE) + space
+ + space + applyFont(title.toString(), titleFont));
+ if (details != null)
+ {
+ buf.append("<br><br>")
+ .append(applyFont(details.toString(), detailsFont));
+ }
+ return "<form>"+buf.toString()+"</form>";
+ }
+
+ /**
+ * Sets the not available text to a label and associates a help icon and
+ * a tooltip explaining that the data is not available because the server is
+ * down.
+ * @param l the label.
+ */
+ public static void setNotAvailableBecauseServerIsDown(LabelWithHelpIcon l)
+ {
+ l.setText(INFO_CTRL_PANEL_NOT_AVAILABLE_LONG_LABEL.get().toString());
+ l.setHelpIconVisible(true);
+ l.setHelpTooltip(INFO_NOT_AVAILABLE_SERVER_DOWN_TOOLTIP.get().toString());
+ }
+
+ /**
+ * Sets the not available text to a label and associates a help icon and
+ * a tooltip explaining that the data is not available because authentication
+ * is required.
+ * @param l the label.
+ */
+ public static void setNotAvailableBecauseAuthenticationIsRequired(
+ LabelWithHelpIcon l)
+ {
+ l.setText(INFO_CTRL_PANEL_NOT_AVAILABLE_LONG_LABEL.get().toString());
+ l.setHelpIconVisible(true);
+ l.setHelpTooltip(
+ INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_TOOLTIP.get()
+ .toString());
+ }
+
+ /**
+ * Updates a label by setting a warning icon and a text.
+ * @param l the label to be updated.
+ * @param text the text to be set on the label.
+ */
+ public static void setWarningLabel(JLabel l, Message text)
+ {
+ l.setText(text.toString());
+ if (warningIcon == null)
+ {
+ warningIcon =
+ createImageIcon("org/opends/quicksetup/images/warning_medium.gif");
+ }
+ l.setIcon(warningIcon);
+ l.setToolTipText(text.toString());
+ l.setHorizontalTextPosition(SwingConstants.RIGHT);
+ }
+
+ /**
+ * Sets the not available text to a label with no icon nor tooltip.
+ * @param l the label.
+ */
+ public static void setNotAvailable(LabelWithHelpIcon l)
+ {
+ l.setText(INFO_CTRL_PANEL_NOT_AVAILABLE_LONG_LABEL.get().toString());
+ l.setHelpIconVisible(false);
+ l.setHelpTooltip(null);
+ }
+
+ /**
+ * Sets the a text to a label with no icon nor tooltip.
+ * @param l the label.
+ * @param text the text.
+ */
+ public static void setTextValue(LabelWithHelpIcon l, String text)
+ {
+ l.setText(text);
+ l.setHelpIconVisible(false);
+ l.setHelpTooltip(null);
+ }
+
+ /**
+ * Returns the server root directory (the path where the server is installed).
+ * @return the server root directory (the path where the server is installed).
+ */
+ public static File getServerRootDirectory()
+ {
+ if (rootDirectory == null)
+ {
+ // This allows testing of configuration components when the OpenDS.jar
+ // in the classpath does not necessarily point to the server's
+ String installRoot = System.getProperty("org.opends.quicksetup.Root");
+
+ if (installRoot == null) {
+ installRoot = getInstallPathFromClasspath();
+ }
+ rootDirectory = new File(installRoot);
+ }
+ return rootDirectory;
+ }
+
+ /**
+ * Returns the instance root directory (the path where the instance is
+ * installed).
+ * @param installPath The installRoot path.
+ * @return the instance root directory (the path where the instance is
+ * installed).
+ */
+ public static File getInstanceRootDirectory(String installPath)
+ {
+ if (instanceRootDirectory == null)
+ {
+ String instancePathFileName = installPath + File.separator +
+ "instance.loc";
+
+ File f = new File(instancePathFileName);
+ // look for <installPath>/instance.loc
+ if (! f.exists())
+ {
+ instanceRootDirectory = new File(installPath);
+ return instanceRootDirectory;
+ }
+
+ BufferedReader reader;
+ try
+ {
+ reader = new BufferedReader(new FileReader(instancePathFileName));
+ }
+ catch (Exception e)
+ {
+ instanceRootDirectory = new File(installPath);
+ return instanceRootDirectory;
+ }
+
+
+ // Read the first line and close the file.
+ String line;
+ try
+ {
+ line = reader.readLine();
+ File instanceLoc = new File (line);
+ if (instanceLoc.isAbsolute())
+ {
+ instanceRootDirectory = instanceLoc ;
+ return instanceRootDirectory;
+ }
+ else
+ {
+ instanceRootDirectory =
+ new File(installPath + File.separator + instanceLoc.getPath());
+ return instanceRootDirectory;
+ }
+ }
+ catch (Exception e)
+ {
+ instanceRootDirectory = new File(installPath);
+ return instanceRootDirectory;
+ }
+ finally
+ {
+ try
+ {
+ reader.close();
+ } catch (Exception e) {}
+ }
+ }
+ return instanceRootDirectory;
+ }
+
+ /**
+ * Returns the path of the installation of the directory server. Note that
+ * this method assumes that this code is being run locally.
+ * @return the path of the installation of the directory server.
+ */
+ public static String getInstallPathFromClasspath()
+ {
+ String installPath = null;
+
+ /* Get the install path from the Class Path */
+ String sep = System.getProperty("path.separator");
+ String[] classPaths = System.getProperty("java.class.path").split(sep);
+ String path = null;
+ for (int i = 0; i < classPaths.length && (path == null); i++)
+ {
+ for (int j = 0; j < org.opends.quicksetup.Installation.
+ OPEN_DS_JAR_RELATIVE_PATHS.length &&
+ (path == null); j++)
+ {
+ String normPath = classPaths[i].replace(File.separatorChar, '/');
+ if (normPath.endsWith(
+ org.opends.quicksetup.Installation.OPEN_DS_JAR_RELATIVE_PATHS[j]))
+ {
+ path = classPaths[i];
+ }
+ }
+ }
+ if (path != null) {
+ File f = new File(path).getAbsoluteFile();
+ File librariesDir = f.getParentFile();
+
+ /*
+ * Do a best effort to avoid having a relative representation (for
+ * instance to avoid having ../../../).
+ */
+ try
+ {
+ installPath = librariesDir.getParentFile().getCanonicalPath();
+ }
+ catch (IOException ioe)
+ {
+ // Best effort
+ installPath = librariesDir.getParent();
+ }
+ }
+ return installPath;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the server located in the provided path
+ * is running and <CODE>false</CODE> otherwise.
+ * @param serverRootDirectory the path where the server is installed.
+ * @return <CODE>true</CODE> if the server located in the provided path
+ * is running and <CODE>false</CODE> otherwise.
+ */
+ public static boolean isServerRunning(File serverRootDirectory)
+ {
+ boolean isServerRunning;
+ String lockFileName = ServerConstants.SERVER_LOCK_FILE_NAME +
+ ServerConstants.LOCK_FILE_SUFFIX;
+ String lockPathRelative =
+ org.opends.quicksetup.Installation.LOCKS_PATH_RELATIVE;
+ File locksPath = new File(serverRootDirectory, lockPathRelative);
+ String lockFile = new File(locksPath, lockFileName).getAbsolutePath();
+ StringBuilder failureReason = new StringBuilder();
+ try {
+ if (LockFileManager.acquireExclusiveLock(lockFile,
+ failureReason)) {
+ LockFileManager.releaseLock(lockFile,
+ failureReason);
+ isServerRunning = false;
+ } else {
+ isServerRunning = true;
+ }
+ }
+ catch (Throwable t) {
+ // Assume that if we cannot acquire the lock file the
+ // server is running.
+ isServerRunning = true;
+ }
+ return isServerRunning;
+ }
+
+ private static final String VALID_SCHEMA_SYNTAX =
+ "abcdefghijklmnopqrstuvwxyz0123456789-";
+
+ /**
+ * Returns <CODE>true</CODE> if the provided string can be used as objectclass
+ * name and <CODE>false</CODE> otherwise.
+ * @param s the string to be analyzed.
+ * @return <CODE>true</CODE> if the provided string can be used as objectclass
+ * name and <CODE>false</CODE> otherwise.
+ */
+ public static boolean isValidObjectclassName(String s)
+ {
+ boolean isValid;
+ if ((s == null) || (s.length() == 0))
+ {
+ isValid = false;
+ } else {
+ isValid = true;
+ StringCharacterIterator iter =
+ new StringCharacterIterator(s, 0);
+ for (char c = iter.first();
+ (c != CharacterIterator.DONE) && isValid;
+ c = iter.next()) {
+ if (VALID_SCHEMA_SYNTAX.indexOf(Character.toLowerCase(c)) == -1)
+ {
+ isValid = false;
+ }
+ }
+ }
+ return isValid;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided string can be used as attribute
+ * name and <CODE>false</CODE> otherwise.
+ * @param s the string to be analyzed.
+ * @return <CODE>true</CODE> if the provided string can be used as attribute
+ * name and <CODE>false</CODE> otherwise.
+ */
+ public static boolean isValidAttributeName(String s)
+ {
+ return isValidObjectclassName(s);
+ }
+
+ /**
+ * Returns the representation of the VLV index as it must be used in the
+ * command-line.
+ * @param index the VLV index.
+ * @return the representation of the VLV index as it must be used in the
+ * command-line.
+ */
+ public static String getVLVNameInCommandLine(VLVIndexDescriptor index)
+ {
+ return "vlv."+index.getName();
+ }
+
+ /**
+ * Returns a string representing the VLV index in a cell.
+ * @param index the VLV index to be represented.
+ * @return the string representing the VLV index in a cell.
+ */
+ public static String getVLVNameInCellRenderer(VLVIndexDescriptor index)
+ {
+ return INFO_CTRL_PANEL_VLV_INDEX_CELL.get(index.getName()).toString();
+ }
+
+ private final static String[] standardSchemaFileNames =
+ {
+ "00-core.ldif", "01-pwpolicy.ldif", "03-changelog.ldif", "03-uddiv3.ldif"
+ };
+
+ private final static String[] configurationSchemaFileNames =
+ {
+ "02-config.ldif"
+ };
+
+ /**
+ * Returns <CODE>true</CODE> if the provided schema element is part of the
+ * standard and <CODE>false</CODE> otherwise.
+ * @param fileElement the schema element.
+ * @return <CODE>true</CODE> if the provided schema element is part of the
+ * standard and <CODE>false</CODE> otherwise.
+ */
+ public static boolean isStandard(SchemaFileElement fileElement)
+ {
+ boolean isStandard = false;
+ String fileName = fileElement.getSchemaFile();
+ if (fileName != null)
+ {
+ for (String name : standardSchemaFileNames)
+ {
+ isStandard = fileName.equals(name);
+ if (isStandard)
+ {
+ break;
+ }
+ }
+ if (!isStandard)
+ {
+ isStandard = fileName.indexOf("-rfc") != -1;
+ }
+ }
+ return isStandard;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided schema element is part of the
+ * configuration and <CODE>false</CODE> otherwise.
+ * @param fileElement the schema element.
+ * @return <CODE>true</CODE> if the provided schema element is part of the
+ * configuration and <CODE>false</CODE> otherwise.
+ */
+ public static boolean isConfiguration(SchemaFileElement fileElement)
+ {
+ boolean isConfiguration = false;
+ String fileName = fileElement.getSchemaFile();
+ if (fileName != null)
+ {
+ for (String name : configurationSchemaFileNames)
+ {
+ isConfiguration = fileName.equals(name);
+ if (isConfiguration)
+ {
+ break;
+ }
+ }
+ }
+ return isConfiguration;
+ }
+
+ /**
+ * Returns the string representation of an attribute syntax.
+ * @param syntax the attribute syntax.
+ * @return the string representation of an attribute syntax.
+ */
+ public static String getSyntaxText(AttributeSyntax syntax)
+ {
+ String returnValue;
+ String syntaxName = syntax.getSyntaxName();
+ String syntaxOID = syntax.getOID();
+ if (syntaxName == null)
+ {
+ returnValue = syntaxOID;
+ }
+ else
+ {
+ returnValue = syntaxName+" - "+syntaxOID;
+ }
+ return returnValue;
+ }
+
+ private final static String[] binarySyntaxOIDs =
+ {
+ SchemaConstants.SYNTAX_BINARY_OID,
+ SchemaConstants.SYNTAX_JPEG_OID,
+ SchemaConstants.SYNTAX_CERTIFICATE_OID,
+ SchemaConstants.SYNTAX_OCTET_STRING_OID
+ };
+
+ /**
+ * Returns <CODE>true</CODE> if the provided attribute has image syntax and
+ * <CODE>false</CODE> otherwise.
+ * @param attrName the name of the attribute.
+ * @param schema the schema.
+ * @return <CODE>true</CODE> if the provided attribute has image syntax and
+ * <CODE>false</CODE> otherwise.
+ */
+ public static boolean hasImageSyntax(String attrName, Schema schema)
+ {
+ boolean hasImageSyntax = false;
+ attrName = Utilities.getAttributeNameWithoutOptions(attrName).toLowerCase();
+ if (attrName.equals("photo"))
+ {
+ hasImageSyntax = true;
+ }
+ // Check all the attributes that we consider binaries.
+ if (!hasImageSyntax && (schema != null))
+ {
+ AttributeType attr = schema.getAttributeType(attrName);
+ if (attr != null)
+ {
+ String syntaxOID = attr.getSyntaxOID();
+ hasImageSyntax = SchemaConstants.SYNTAX_JPEG_OID.equals(syntaxOID);
+ }
+ }
+ return hasImageSyntax;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the provided attribute has binary syntax and
+ * <CODE>false</CODE> otherwise.
+ * @param attrName the name of the attribute.
+ * @param schema the schema.
+ * @return <CODE>true</CODE> if the provided attribute has binary syntax and
+ * <CODE>false</CODE> otherwise.
+ */
+ public static boolean hasBinarySyntax(String attrName, Schema schema)
+ {
+ boolean hasBinarySyntax = attrName.toLowerCase().indexOf(";binary") != -1;
+ // Check all the attributes that we consider binaries.
+ if (!hasBinarySyntax && (schema != null))
+ {
+ attrName =
+ Utilities.getAttributeNameWithoutOptions(attrName).toLowerCase();
+ AttributeType attr = schema.getAttributeType(attrName);
+ if (attr != null)
+ {
+ String syntaxOID = attr.getSyntaxOID();
+ for (String oid : binarySyntaxOIDs)
+ {
+ if (oid.equals(syntaxOID))
+ {
+ hasBinarySyntax = true;
+ break;
+ }
+ }
+ }
+ }
+ return hasBinarySyntax;
+ }
+
+ private final static String[] passwordSyntaxOIDs =
+ {
+ SchemaConstants.SYNTAX_USER_PASSWORD_OID
+ };
+
+ /**
+ * Returns <CODE>true</CODE> if the provided attribute has password syntax and
+ * <CODE>false</CODE> otherwise.
+ * @param attrName the name of the attribute.
+ * @param schema the schema.
+ * @return <CODE>true</CODE> if the provided attribute has password syntax and
+ * <CODE>false</CODE> otherwise.
+ */
+ public static boolean hasPasswordSyntax(String attrName, Schema schema)
+ {
+ boolean hasPasswordSyntax = false;
+ // Check all the attributes that we consider binaries.
+ if (schema != null)
+ {
+ attrName =
+ Utilities.getAttributeNameWithoutOptions(attrName).toLowerCase();
+ AttributeType attr = schema.getAttributeType(attrName);
+ if (attr != null)
+ {
+ String syntaxOID = attr.getSyntaxOID();
+ for (String oid : passwordSyntaxOIDs)
+ {
+ if (oid.equals(syntaxOID))
+ {
+ hasPasswordSyntax = true;
+ break;
+ }
+ }
+ }
+ }
+ return hasPasswordSyntax;
+ }
+
+ /**
+ * Returns the string representation of a matching rule.
+ * @param matchingRule the matching rule.
+ * @return the string representation of a matching rule.
+ */
+ public static String getMatchingRuleText(MatchingRule matchingRule)
+ {
+ String returnValue;
+ String name = matchingRule.getName();
+ String oid = matchingRule.getOID();
+ if (name == null)
+ {
+ returnValue = oid;
+ }
+ else
+ {
+ returnValue = name+" - "+oid;
+ }
+ return returnValue;
+ }
+
+ /**
+ * Returns the InitialLdapContext to connect to the administration connector
+ * of the server using the information in the ControlCenterInfo object (which
+ * provides the host and administration connector port to be used) and some
+ * LDAP credentials.
+ * It also tests that the provided credentials have enough rights to read the
+ * configuration.
+ * @param controlInfo the object which provides the connection parameters.
+ * @param bindDN the base DN to be used to bind.
+ * @param pwd the password to be used to bind.
+ * @return the InitialLdapContext connected to the server.
+ * @throws NamingException if there was a problem connecting to the server
+ * or the provided credentials do not have enough rights.
+ * @throws ConfigReadException if there is an error reading the configuration.
+ */
+ public static InitialLdapContext getAdminDirContext(
+ ControlPanelInfo controlInfo, String bindDN, String pwd)
+ throws NamingException, ConfigReadException
+ {
+ InitialLdapContext ctx;
+ String usedUrl = controlInfo.getAdminConnectorURL();
+ if (usedUrl == null)
+ {
+ throw new ConfigReadException(
+ ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
+ }
+ ctx = Utils.createLdapsContext(usedUrl,
+ bindDN, pwd, Utils.getDefaultLDAPTimeout(), null,
+ controlInfo.getTrustManager());
+
+ /*
+ * Search for the config to check that it is the directory manager.
+ */
+ SearchControls searchControls = new SearchControls();
+ searchControls.setCountLimit(1);
+ searchControls.setSearchScope(
+ SearchControls. OBJECT_SCOPE);
+ searchControls.setReturningAttributes(
+ new String[] {"dn"});
+ ctx.search("cn=config", "objectclass=*", searchControls);
+ return ctx;
+ }
+
+
+ /**
+ * Returns the InitialLdapContext to connect to the server using the
+ * information in the ControlCenterInfo object (which provides the host, port
+ * and protocol to be used) and some LDAP credentials. It also tests that
+ * the provided credentials have enough rights to read the configuration.
+ * @param controlInfo the object which provides the connection parameters.
+ * @param bindDN the base DN to be used to bind.
+ * @param pwd the password to be used to bind.
+ * @return the InitialLdapContext connected to the server.
+ * @throws NamingException if there was a problem connecting to the server
+ * or the provided credentials do not have enough rights.
+ * @throws ConfigReadException if there is an error reading the configuration.
+ */
+ public static InitialLdapContext getUserDataDirContext(
+ ControlPanelInfo controlInfo,
+ String bindDN, String pwd) throws NamingException, ConfigReadException
+ {
+ InitialLdapContext ctx;
+ String usedUrl;
+ if (controlInfo.connectUsingStartTLS())
+ {
+ usedUrl = controlInfo.getStartTLSURL();
+ if (usedUrl == null)
+ {
+ throw new ConfigReadException(
+ ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
+ }
+ ctx = Utils.createStartTLSContext(usedUrl,
+ bindDN, pwd, Utils.getDefaultLDAPTimeout(), null,
+ controlInfo.getTrustManager(), null);
+ }
+ else if (controlInfo.connectUsingLDAPS())
+ {
+ usedUrl = controlInfo.getLDAPSURL();
+ if (usedUrl == null)
+ {
+ throw new ConfigReadException(
+ ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
+ }
+ ctx = Utils.createLdapsContext(usedUrl,
+ bindDN, pwd, Utils.getDefaultLDAPTimeout(), null,
+ controlInfo.getTrustManager());
+ }
+ else
+ {
+ usedUrl = controlInfo.getLDAPURL();
+ if (usedUrl == null)
+ {
+ throw new ConfigReadException(
+ ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
+ }
+ ctx = Utils.createLdapContext(usedUrl,
+ bindDN, pwd, Utils.getDefaultLDAPTimeout(), null);
+ }
+
+ /*
+ * Search for the config to check that it is the directory manager.
+ */
+ SearchControls searchControls = new SearchControls();
+ searchControls.setCountLimit(1);
+ searchControls.setSearchScope(
+ SearchControls. OBJECT_SCOPE);
+ searchControls.setReturningAttributes(
+ new String[] {"dn"});
+ ctx.search("cn=config", "objectclass=*", searchControls);
+ return ctx;
+ }
+
+ /**
+ * Ping the specified InitialLdapContext.
+ * This method sends a search request on the root entry of the DIT
+ * and forward the corresponding exception (if any).
+ * @param ctx the InitialLdapContext to be "pinged".
+ * @throws NamingException if the ping could not be performed.
+ */
+ public static void pingDirContext(InitialLdapContext ctx)
+ throws NamingException {
+ SearchControls sc = new SearchControls(
+ SearchControls.OBJECT_SCOPE,
+ 0, // count limit
+ 0, // time limit
+ new String[0], // No attributes
+ false, // Don't return bound object
+ false // Don't dereference link
+ );
+ ctx.search("", "objectClass=*", sc);
+ }
+
+ /**
+ * Deletes a configuration subtree using the provided configuration handler.
+ * @param confHandler the configuration handler to be used to delete the
+ * subtree.
+ * @param dn the DN of the subtree to be deleted.
+ * @throws OpenDsException if an error occurs.
+ */
+ public static void deleteConfigSubtree(ConfigHandler confHandler, DN dn)
+ throws OpenDsException
+ {
+ ConfigEntry confEntry = confHandler.getConfigEntry(dn);
+ if (confEntry != null)
+ {
+ // Copy the values to avoid problems with this recursive method.
+ ArrayList<DN> childDNs = new ArrayList<DN>();
+ childDNs.addAll(confEntry.getChildren().keySet());
+ for (DN childDN : childDNs)
+ {
+ deleteConfigSubtree(confHandler, childDN);
+ }
+ confHandler.deleteEntry(dn, null);
+ }
+ }
+
+ /**
+ * The OID of the delete subtree control.
+ */
+ public static final String SUBTREE_CTRL_OID =
+ (new SubtreeDeleteControl()).getID();
+
+ /**
+ * Deletes a subtree using the provided connection.
+ * @param ctx the connection to be used to delete the subtree.
+ * @param dnToRemove the DN of the subtree to be deleted.
+ * @throws NamingException if an error occurs deleting the subtree.
+ */
+ public static void deleteSubtree(InitialLdapContext ctx, DN dnToRemove)
+ throws NamingException
+ {
+ Control[] oldCtls = null;
+ try
+ {
+ oldCtls = ctx.getRequestControls();
+ Control[] ctls = {new BasicControl(SUBTREE_CTRL_OID)};
+ ctx.setRequestControls(ctls);
+ ctx.destroySubcontext(Utilities.getJNDIName(dnToRemove.toString()));
+ }
+ finally
+ {
+ if (oldCtls != null)
+ {
+ ctx.setRequestControls(oldCtls);
+ }
+ }
+ }
+
+ /**
+ * Sets the required icon to the provided label.
+ * @param label the label to be updated.
+ */
+ public static void setRequiredIcon(JLabel label)
+ {
+ if (requiredIcon == null)
+ {
+ requiredIcon =
+ createImageIcon(IconPool.IMAGE_PATH+"/required.gif");
+ }
+ label.setIcon(requiredIcon);
+ label.setHorizontalTextPosition(SwingConstants.LEADING);
+ }
+}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/package-info.java
new file mode 100644
index 0000000..8c8cb2c
--- /dev/null
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/package-info.java
@@ -0,0 +1,33 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Contains some utilities used in the Control Panel.
+ */
+package org.opends.guitools.controlpanel.util;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/DisableReplicationUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/DisableReplicationUserData.java
deleted file mode 100644
index 6f3a146..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/DisableReplicationUserData.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-/**
- * This class is used to store the information provided by the user to
- * disable replication. It is required because when we are in interactive
- * mode the ReplicationCliArgumentParser is not enough.
- *
- */
-class DisableReplicationUserData extends ReplicationUserData
-{
- private String hostName;
- private int port;
- private boolean useStartTLS;
- private boolean useSSL;
- private String bindDn;
- private String bindPwd;
-
- /**
- * Returns the host name of the server.
- * @return the host name of the server.
- */
- String getHostName()
- {
- return hostName;
- }
-
- /**
- * Sets the host name of the server.
- * @param hostName the host name of the server.
- */
- void setHostName(String hostName)
- {
- this.hostName = hostName;
- }
-
- /**
- * Returns the port of the server.
- * @return the port of the server.
- */
- int getPort()
- {
- return port;
- }
-
- /**
- * Sets the port of the server.
- * @param port the port of the server.
- */
- void setPort(int port)
- {
- this.port = port;
- }
- /**
- * Returns <CODE>true</CODE> if we must use SSL to connect to the server and
- * <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use SSL to connect to the server and
- * <CODE>false</CODE> otherwise.
- */
- boolean useSSL()
- {
- return useSSL;
- }
-
- /**
- * Sets whether we must use SSL to connect to the server or not.
- * @param useSSL whether we must use SSL to connect to the server or not.
- */
- void setUseSSL(boolean useSSL)
- {
- this.useSSL = useSSL;
- }
-
- /**
- * Returns <CODE>true</CODE> if we must use StartTLS to connect to the server
- * and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use StartTLS to connect to the server
- * and <CODE>false</CODE> otherwise.
- */
- boolean useStartTLS()
- {
- return useStartTLS;
- }
-
- /**
- * Sets whether we must use StartTLS to connect to the server or not.
- * @param useStartTLS whether we must use SSL to connect to the server or not.
- */
- void setUseStartTLS(boolean useStartTLS)
- {
- this.useStartTLS = useStartTLS;
- }
-
- /**
- * Returns the bind DN to be used to connect to the server if no Administrator
- * has been defined.
- * @return the bind DN to be used to connect to the server if no Administrator
- * has been defined.
- */
- public String getBindDn()
- {
- return bindDn;
- }
-
- /**
- * Sets the bind DN to be used to connect to the server if no Administrator
- * has been defined.
- * @param bindDn the bind DN to be used.
- */
- public void setBindDn(String bindDn)
- {
- this.bindDn = bindDn;
- }
-
- /**
- * Returns the password to be used to connect to the server if no
- * Administrator has been defined.
- * @return the password to be used to connect to the server if no
- * Administrator has been defined.
- */
- public String getBindPwd()
- {
- return bindPwd;
- }
-
- /**
- * Sets the password to be used to connect to the server if no Administrator
- * has been defined.
- * @param bindPwd the password to be used.
- */
- public void setBindPwd(String bindPwd)
- {
- this.bindPwd = bindPwd;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/EnableReplicationUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/EnableReplicationUserData.java
deleted file mode 100644
index ff92097..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/EnableReplicationUserData.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-/**
- * This class is used to store the information provided by the user to enable
- * replication. It is required because when we are in interactive mode the
- * ReplicationCliArgumentParser is not enough.
- *
- */
-class EnableReplicationUserData extends ReplicationUserData
-{
- private String hostName1;
- private int port1;
- private String bindDn1;
- private String pwd1;
- private boolean useStartTLS1;
- private boolean useSSL1;
- private int replicationPort1;
- private boolean secureReplication1;
- private String hostName2;
- private int port2;
- private String pwd2;
- private String bindDn2;
- private boolean useStartTLS2;
- private boolean useSSL2;
- private int replicationPort2;
- private boolean secureReplication2;
- private boolean replicateSchema = true;
-
- /**
- * Returns the host name of the first server.
- * @return the host name of the first server.
- */
- String getHostName1()
- {
- return hostName1;
- }
-
- /**
- * Sets the host name of the first server.
- * @param hostName1 the host name of the first server.
- */
- void setHostName1(String hostName1)
- {
- this.hostName1 = hostName1;
- }
-
- /**
- * Returns the port of the first server.
- * @return the port of the first server.
- */
- int getPort1()
- {
- return port1;
- }
-
- /**
- * Sets the port of the first server.
- * @param port1 the port of the first server.
- */
- void setPort1(int port1)
- {
- this.port1 = port1;
- }
-
- /**
- * Returns the password for the first server.
- * @return the password for the first server.
- */
- String getPwd1()
- {
- return pwd1;
- }
-
- /**
- * Sets the password for the first server.
- * @param pwd1 the password for the first server.
- */
- void setPwd1(String pwd1)
- {
- this.pwd1 = pwd1;
- }
-
- /**
- * Returns <CODE>true</CODE> if we must use SSL to connect to the first
- * server and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use SSL to connect to the first
- * server and <CODE>false</CODE> otherwise.
- */
- boolean useSSL1()
- {
- return useSSL1;
- }
-
- /**
- * Sets whether we must use SSL to connect to the first server or not.
- * @param useSSL1 whether we must use SSL to connect to the first server or
- * not.
- */
- void setUseSSL1(boolean useSSL1)
- {
- this.useSSL1 = useSSL1;
- }
-
- /**
- * Returns <CODE>true</CODE> if we must use StartTLS to connect to the first
- * server and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use StartTLS to connect to the first
- * server and <CODE>false</CODE> otherwise.
- */
- boolean useStartTLS1()
- {
- return useStartTLS1;
- }
-
- /**
- * Sets whether we must use StartTLS to connect to the first server or not.
- * @param useStartTLS1 whether we must use SSL to connect to the first server
- * or not.
- */
- void setUseStartTLS1(boolean useStartTLS1)
- {
- this.useStartTLS1 = useStartTLS1;
- }
-
-
- /**
- * Returns the host name of the second server.
- * @return the host name of the second server.
- */
- String getHostName2()
- {
- return hostName2;
- }
-
- /**
- * Sets the host name of the second server.
- * @param host2Name the host name of the second server.
- */
- void setHostName2(String host2Name)
- {
- this.hostName2 = host2Name;
- }
-
- /**
- * Returns the port of the second server.
- * @return the port of the second server.
- */
- int getPort2()
- {
- return port2;
- }
-
- /**
- * Sets the port of the second server.
- * @param port2 the port of the second server.
- */
- void setPort2(int port2)
- {
- this.port2 = port2;
- }
-
- /**
- * Returns the password for the second server.
- * @return the password for the second server.
- */
- String getPwd2()
- {
- return pwd2;
- }
-
- /**
- * Sets the password for the second server.
- * @param pwd2 the password for the second server.
- */
- void setPwd2(String pwd2)
- {
- this.pwd2 = pwd2;
- }
-
- /**
- * Returns <CODE>true</CODE> if we must use SSL to connect to the second
- * server and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use SSL to connect to the second
- * server and <CODE>false</CODE> otherwise.
- */
- boolean useSSL2()
- {
- return useSSL2;
- }
-
- /**
- * Sets whether we must use SSL to connect to the second server or not.
- * @param useSSL2 whether we must use SSL to connect to the second server or
- * not.
- */
- void setUseSSL2(boolean useSSL2)
- {
- this.useSSL2 = useSSL2;
- }
-
- /**
- * Returns <CODE>true</CODE> if we must use StartTLS to connect to the second
- * server and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use StartTLS to connect to the second
- * server and <CODE>false</CODE> otherwise.
- */
- boolean useStartTLS2()
- {
- return useStartTLS2;
- }
-
- /**
- * Sets whether we must use StartTLS to connect to the second server or not.
- * @param useStartTLS2 whether we must use SSL to connect to the second server
- * or not.
- */
- void setUseStartTLS2(boolean useStartTLS2)
- {
- this.useStartTLS2 = useStartTLS2;
- }
-
- /**
- * Returns the dn to be used to bind to the first server.
- * @return the dn to be used to bind to the first server.
- */
- String getBindDn1()
- {
- return bindDn1;
- }
-
- /**
- * Sets the dn to be used to bind to the first server.
- * @param bindDn1 the dn to be used to bind to the first server.
- */
- void setBindDn1(String bindDn1)
- {
- this.bindDn1 = bindDn1;
- }
-
- /**
- * Returns the dn to be used to bind to the second server.
- * @return the dn to be used to bind to the second server.
- */
- String getBindDn2()
- {
- return bindDn2;
- }
-
- /**
- * Sets the dn to be used to bind to the second server.
- * @param bindDn2 the dn to be used to bind to the second server.
- */
- void setBindDn2(String bindDn2)
- {
- this.bindDn2 = bindDn2;
- }
-
- /**
- * Returns the replication port to be used on the first server if it is not
- * defined yet.
- * @return the replication port to be used on the first server if it is not
- * defined yet.
- */
- int getReplicationPort1()
- {
- return replicationPort1;
- }
-
- /**
- * Sets the replication port to be used on the first server if it is not
- * defined yet.
- * @param replicationPort1 the replication port to be used on the first server
- * if it is not defined yet.
- */
- void setReplicationPort1(int replicationPort1)
- {
- this.replicationPort1 = replicationPort1;
- }
-
- /**
- * Returns the replication port to be used on the second server if it is not
- * defined yet.
- * @return the replication port to be used on the second server if it is not
- * defined yet.
- */
- int getReplicationPort2()
- {
- return replicationPort2;
- }
-
- /**
- * Sets the replication port to be used on the second server if it is not
- * defined yet.
- * @param replicationPort2 the replication port to be used on the second
- * server if it is not defined yet.
- */
- void setReplicationPort2(int replicationPort2)
- {
- this.replicationPort2 = replicationPort2;
- }
-
- /**
- * Returns <CODE>true</CODE> if the user asked to replicate schema and <CODE>
- * false</CODE> otherwise.
- * @return <CODE>true</CODE> if the user asked to replicate schema and <CODE>
- * false</CODE> otherwise.
- */
- public boolean replicateSchema()
- {
- return replicateSchema;
- }
-
- /**
- * Sets whether to replicate schema or not.
- * @param replicateSchema whether to replicate schema or not.
- */
- public void setReplicateSchema(boolean replicateSchema)
- {
- this.replicateSchema = replicateSchema;
- }
-
- /**
- * Returns <CODE>true</CODE> if the user asked to have secure replication
- * communication with the first server and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if the user asked to have secure replication
- * communication with the first server and <CODE>false</CODE> otherwise.
- */
- public boolean isSecureReplication1()
- {
- return secureReplication1;
- }
-
- /**
- * Sets whether to have secure replication communication with the first server
- * or not.
- * @param secureReplication1 whether to have secure replication communication
- * with the first server or not.
- */
- public void setSecureReplication1(boolean secureReplication1)
- {
- this.secureReplication1 = secureReplication1;
- }
-
- /**
- * Returns <CODE>true</CODE> if the user asked to have secure replication
- * communication with the second server and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if the user asked to have secure replication
- * communication with the second server and <CODE>false</CODE> otherwise.
- */
- public boolean isSecureReplication2()
- {
- return secureReplication2;
- }
-
- /**
- * Sets whether to have secure replication communication with the second
- * server or not.
- * @param secureReplication2 whether to have secure replication communication
- * with the second server or not.
- */
- public void setSecureReplication2(boolean secureReplication2)
- {
- this.secureReplication2 = secureReplication2;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/InitializeAllReplicationUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/InitializeAllReplicationUserData.java
deleted file mode 100644
index a597782..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/InitializeAllReplicationUserData.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-/**
- * This class is used to store the information provided by the user to
- * initialize a complete replication topology. It is required because when we
- * are in interactive mode the ReplicationCliArgumentParser is not enough.
- *
- */
-class InitializeAllReplicationUserData extends MonoServerReplicationUserData
-{
-}
-
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/InitializeReplicationUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/InitializeReplicationUserData.java
deleted file mode 100644
index 25e0165..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/InitializeReplicationUserData.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-/**
- * This class is used to store the information provided by the user to
- * initialize replication. It is required because when we are in interactive
- * mode the ReplicationCliArgumentParser is not enough.
- *
- */
-class InitializeReplicationUserData extends ReplicationUserData
-{
- private String hostNameSource;
- private int portSource;
- private boolean useStartTLSSource;
- private boolean useSSLSource;
- private String hostNameDestination;
- private int portDestination;
- private boolean useStartTLSDestination;
- private boolean useSSLDestination;
-
- /**
- * Returns the host name of the source server.
- * @return the host name of the source server.
- */
- String getHostNameSource()
- {
- return hostNameSource;
- }
-
- /**
- * Sets the host name of the source server.
- * @param hostNameSource the host name of the source server.
- */
- void setHostNameSource(String hostNameSource)
- {
- this.hostNameSource = hostNameSource;
- }
-
- /**
- * Returns the port of the source server.
- * @return the port of the source server.
- */
- int getPortSource()
- {
- return portSource;
- }
-
- /**
- * Sets the port of the source server.
- * @param portSource the port of the source server.
- */
- void setPortSource(int portSource)
- {
- this.portSource = portSource;
- }
- /**
- * Returns <CODE>true</CODE> if we must use SSL to connect to the source
- * server and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use SSL to connect to the source
- * server and <CODE>false</CODE> otherwise.
- */
- boolean useSSLSource()
- {
- return useSSLSource;
- }
-
- /**
- * Sets whether we must use SSL to connect to the source server or not.
- * @param useSSLSource whether we must use SSL to connect to the source server
- * or not.
- */
- void setUseSSLSource(boolean useSSLSource)
- {
- this.useSSLSource = useSSLSource;
- }
-
- /**
- * Returns <CODE>true</CODE> if we must use StartTLS to connect to the source
- * server and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use StartTLS to connect to the source
- * server and <CODE>false</CODE> otherwise.
- */
- boolean useStartTLSSource()
- {
- return useStartTLSSource;
- }
-
- /**
- * Sets whether we must use StartTLS to connect to the source server or not.
- * @param useStartTLSSource whether we must use SSL to connect to the source
- * server or not.
- */
- void setUseStartTLSSource(boolean useStartTLSSource)
- {
- this.useStartTLSSource = useStartTLSSource;
- }
-
-
- /**
- * Returns the host name of the destination server.
- * @return the host name of the destination server.
- */
- String getHostNameDestination()
- {
- return hostNameDestination;
- }
-
- /**
- * Sets the host name of the destination server.
- * @param hostNameDestination the host name of the destination server.
- */
- void setHostNameDestination(String hostNameDestination)
- {
- this.hostNameDestination = hostNameDestination;
- }
-
- /**
- * Returns the port of the destination server.
- * @return the port of the destination server.
- */
- int getPortDestination()
- {
- return portDestination;
- }
-
- /**
- * Sets the port of the destination server.
- * @param portDestination the port of the destination server.
- */
- void setPortDestination(int portDestination)
- {
- this.portDestination = portDestination;
- }
-
- /**
- * Returns <CODE>true</CODE> if we must use SSL to connect to the destination
- * server and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use SSL to connect to the destination
- * server and <CODE>false</CODE> otherwise.
- */
- boolean useSSLDestination()
- {
- return useSSLDestination;
- }
-
- /**
- * Sets whether we must use SSL to connect to the destination server or not.
- * @param useSSLDestination whether we must use SSL to connect to the
- * destination server or not.
- */
- void setUseSSLDestination(boolean useSSLDestination)
- {
- this.useSSLDestination = useSSLDestination;
- }
-
- /**
- * Returns <CODE>true</CODE> if we must use StartTLS to connect to the
- * destination server and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use StartTLS to connect to the
- * destination server and <CODE>false</CODE> otherwise.
- */
- boolean useStartTLSDestination()
- {
- return useStartTLSDestination;
- }
-
- /**
- * Sets whether we must use StartTLS to connect to the destination server or
- * not.
- * @param useStartTLSDestination whether we must use SSL to connect to the
- * destination server or not.
- */
- void setUseStartTLSDestination(boolean useStartTLSDestination)
- {
- this.useStartTLSDestination = useStartTLSDestination;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/MonoServerReplicationUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/MonoServerReplicationUserData.java
deleted file mode 100644
index 3158a04..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/MonoServerReplicationUserData.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-/**
- * This is an abstract class used for code refactorization.
- *
- */
-abstract class MonoServerReplicationUserData extends ReplicationUserData
-{
- private String hostName;
- private int port;
- private boolean useStartTLS;
- private boolean useSSL;
-
- /**
- * Returns the host name of the server.
- * @return the host name of the server.
- */
- String getHostName()
- {
- return hostName;
- }
-
- /**
- * Sets the host name of the server.
- * @param hostName the host name of the server.
- */
- void setHostName(String hostName)
- {
- this.hostName = hostName;
- }
-
- /**
- * Returns the port of the server.
- * @return the port of the server.
- */
- int getPort()
- {
- return port;
- }
-
- /**
- * Sets the port of the server.
- * @param port the port of the server.
- */
- void setPort(int port)
- {
- this.port = port;
- }
- /**
- * Returns <CODE>true</CODE> if we must use SSL to connect to the server and
- * <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use SSL to connect to the server and
- * <CODE>false</CODE> otherwise.
- */
- boolean useSSL()
- {
- return useSSL;
- }
-
- /**
- * Sets whether we must use SSL to connect to the server or not.
- * @param useSSL whether we must use SSL to connect to the server or not.
- */
- void setUseSSL(boolean useSSL)
- {
- this.useSSL = useSSL;
- }
-
- /**
- * Returns <CODE>true</CODE> if we must use StartTLS to connect to the server
- * and <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we must use StartTLS to connect to the server
- * and <CODE>false</CODE> otherwise.
- */
- boolean useStartTLS()
- {
- return useStartTLS;
- }
-
- /**
- * Sets whether we must use StartTLS to connect to the server or not.
- * @param useStartTLS whether we must use SSL to connect to the server or not.
- */
- void setUseStartTLS(boolean useStartTLS)
- {
- this.useStartTLS = useStartTLS;
- }
-}
-
-
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PostExternalInitializationUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PostExternalInitializationUserData.java
deleted file mode 100644
index ca00b44..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PostExternalInitializationUserData.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-/**
- * This class is used to store the information provided by the user to
- * perform the operations required after doing an initialization using
- * import-ldif of the binary copy. It is required because when we
- * are in interactive mode the ReplicationCliArgumentParser is not enough.
- *
- */
-class PostExternalInitializationUserData extends MonoServerReplicationUserData
-{
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PreExternalInitializationUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PreExternalInitializationUserData.java
deleted file mode 100644
index a6b7830..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/PreExternalInitializationUserData.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-/**
- * This class is used to store the information provided by the user to
- * perform the operations required before doing an initialization using
- * import-ldif of the binary copy. It is required because when we
- * are in interactive mode the ReplicationCliArgumentParser is not enough.
- *
- */
-class PreExternalInitializationUserData extends MonoServerReplicationUserData
-{
- private boolean localOnly;
-
- /**
- * Whether the operation must be applied only on the local server or not.
- * @return <CODE>true</CODE> if the operation must be applied only on the
- * local server and <CODE>false</CODE> otherwise.
- */
- public boolean isLocalOnly()
- {
- return localOnly;
- }
-
- /**
- * Sets whether the operation must be applied only on the local server or not.
- * @param onlyLocal whether the operation must be applied only on the local
- * server or not.
- */
- public void setLocalOnly(boolean onlyLocal)
- {
- this.localOnly = onlyLocal;
- }
-
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
deleted file mode 100644
index 216fc6b..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliArgumentParser.java
+++ /dev/null
@@ -1,2227 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2007-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
-
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.LinkedList;
-
-import org.opends.messages.Message;
-import org.opends.messages.MessageBuilder;
-import org.opends.quicksetup.Constants;
-import org.opends.quicksetup.UserData;
-import org.opends.quicksetup.util.Utils;
-import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
-import org.opends.server.admin.client.cli.SecureConnectionCliParser;
-import org.opends.server.util.args.Argument;
-import org.opends.server.util.args.ArgumentException;
-import org.opends.server.util.args.BooleanArgument;
-import org.opends.server.util.args.FileBasedArgument;
-import org.opends.server.util.args.IntegerArgument;
-import org.opends.server.util.args.StringArgument;
-import org.opends.server.util.args.SubCommand;
-
-/**
- * This class is used to parse the arguments passed to the replication CLI.
- * It also checks the compatibility between the values and that all the
- * required information has been provided. However it does not do any
- * verification that require connection to any server.
- */
-public class ReplicationCliArgumentParser extends SecureConnectionCliParser
-{
- private SubCommand enableReplicationSubCmd;
- private SubCommand disableReplicationSubCmd;
- private SubCommand initializeReplicationSubCmd;
- private SubCommand initializeAllReplicationSubCmd;
- private SubCommand postExternalInitializationSubCmd;
- private SubCommand preExternalInitializationSubCmd;
- private SubCommand statusReplicationSubCmd;
-
- private BooleanArgument noPromptArg;
-
- private String defaultLocalHostValue;
-
- /**
- * The 'hostName' argument for the first server.
- */
- private StringArgument hostName1Arg = null;
-
- /**
- * The 'port' argument for the first server.
- */
- private IntegerArgument port1Arg = null;
-
- /**
- * The 'binDN' argument for the first server.
- */
- private StringArgument bindDn1Arg = null;
-
- /**
- * The 'bindPasswordFile' argument for the first server.
- */
- private FileBasedArgument bindPasswordFile1Arg = null;
-
- /**
- * The 'bindPassword' argument for the first server.
- */
- private StringArgument bindPassword1Arg = null;
-
- /**
- * The 'useSSLArg' argument for the first server.
- */
- private BooleanArgument useSSL1Arg = null;
-
- /**
- * The 'useStartTLS1Arg' argument for the first server.
- */
- private BooleanArgument useStartTLS1Arg = null;
-
- /**
- * The 'replicationPort' argument for the first server.
- */
- private IntegerArgument replicationPort1Arg = null;
-
- /**
- * The 'secureReplication' argument for the first server.
- */
- private BooleanArgument secureReplication1Arg = null;
-
- /**
- * The 'hostName' argument for the second server.
- */
- private StringArgument hostName2Arg = null;
-
- /**
- * The 'port' argument for the second server.
- */
- private IntegerArgument port2Arg = null;
-
- /**
- * The 'binDN' argument for the second server.
- */
- private StringArgument bindDn2Arg = null;
-
- /**
- * The 'bindPasswordFile' argument for the second server.
- */
- private FileBasedArgument bindPasswordFile2Arg = null;
-
- /**
- * The 'bindPassword' argument for the second server.
- */
- private StringArgument bindPassword2Arg = null;
-
- /**
- * The 'useSSLArg' argument for the second server.
- */
- private BooleanArgument useSSL2Arg = null;
-
- /**
- * The 'useStartTLS2Arg' argument for the second server.
- */
- private BooleanArgument useStartTLS2Arg = null;
-
- /**
- * The 'replicationPort' argument for the second server.
- */
- private IntegerArgument replicationPort2Arg = null;
-
- /**
- * The 'secureReplication' argument for the second server.
- */
- private BooleanArgument secureReplication2Arg = null;
-
- /**
- * The 'skipPortCheckArg' argument to not check replication ports.
- */
- private BooleanArgument skipPortCheckArg;
-
- /**
- * The 'noSchemaReplication' argument to not replicate schema.
- */
- private BooleanArgument noSchemaReplicationArg;
-
- /**
- * The 'useSecondServerAsSchemaSource' argument to not replicate schema.
- */
- private BooleanArgument useSecondServerAsSchemaSourceArg;
-
- /**
- * The 'hostName' argument for the source server.
- */
- private StringArgument hostNameSourceArg = null;
-
- /**
- * The 'port' argument for the source server.
- */
- private IntegerArgument portSourceArg = null;
-
- /**
- * The 'useSSLArg' for the source server.
- */
- private BooleanArgument useSSLSourceArg = null;
-
- /**
- * The 'useStartTLSSourceArg' for the source server.
- */
- private BooleanArgument useStartTLSSourceArg = null;
-
- /**
- * The 'hostName' argument for the destination server.
- */
- private StringArgument hostNameDestinationArg = null;
-
- /**
- * The 'port' argument for the destination server.
- */
- private IntegerArgument portDestinationArg = null;
-
- /**
- * The 'useSSLArg' argument for the destination server.
- */
- private BooleanArgument useSSLDestinationArg = null;
-
- /**
- * The 'useStartTLSDestinationArg' argument for the destination server.
- */
- private BooleanArgument useStartTLSDestinationArg = null;
-
- /**
- * The 'suffixes' global argument.
- */
- private StringArgument baseDNsArg = null;
-
- /**
- * The argument that specifies if the external initialization will be
- * performed only on this server.
- */
- private BooleanArgument externalInitializationLocalOnlyArg;
-
- /**
- * The 'quiet' argument.
- */
- private BooleanArgument quietArg;
-
- /**
- * The 'scriptFriendly' argument.
- */
- private BooleanArgument scriptFriendlyArg;
-
- /**
- * The text of the enable replication subcommand.
- */
- public static final String ENABLE_REPLICATION_SUBCMD_NAME = "enable";
-
- /**
- * The text of the disable replication subcommand.
- */
- public static final String DISABLE_REPLICATION_SUBCMD_NAME = "disable";
-
- /**
- * The text of the initialize replication subcommand.
- */
- public static final String INITIALIZE_REPLICATION_SUBCMD_NAME = "initialize";
-
- /**
- * The text of the initialize all replication subcommand.
- */
- public static final String INITIALIZE_ALL_REPLICATION_SUBCMD_NAME =
- "initialize-all";
-
- /**
- * The text of the pre external initialization subcommand.
- */
- public static final String PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME =
- "pre-external-initialization";
-
- /**
- * The text of the initialize all replication subcommand.
- */
- public static final String POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME =
- "post-external-initialization";
-
- /**
- * The text of the status replication subcommand.
- */
- public static final String STATUS_REPLICATION_SUBCMD_NAME = "status";
-
- /**
- * Creates a new instance of this argument parser with no arguments.
- *
- * @param mainClassName
- * The fully-qualified name of the Java class that should
- * be invoked to launch the program with which this
- * argument parser is associated.
- */
- public ReplicationCliArgumentParser(String mainClassName)
- {
- super(mainClassName,
- INFO_REPLICATION_TOOL_DESCRIPTION.get(ENABLE_REPLICATION_SUBCMD_NAME,
- INITIALIZE_REPLICATION_SUBCMD_NAME),
- false);
- }
-
- /**
- * Initialize the parser with the Global options and subcommands.
- *
- * @param outStream
- * The output stream to use for standard output, or <CODE>null</CODE>
- * if standard output is not needed.
- * @throws ArgumentException
- * If there is a problem with any of the parameters used
- * to create this argument.
- */
- public void initializeParser(OutputStream outStream)
- throws ArgumentException
- {
- initializeGlobalArguments(outStream);
- createEnableReplicationSubCommand();
- createDisableReplicationSubCommand();
- createInitializeReplicationSubCommand();
- createInitializeAllReplicationSubCommand();
- createPreExternalInitializationSubCommand();
- createPostExternalInitializationSubCommand();
- createStatusReplicationSubCommand();
- }
-
- /**
- * Checks all the options parameters and updates the provided MessageBuilder
- * with the errors that where encountered.
- *
- * This method assumes that the method parseArguments for the parser has
- * already been called.
- * @param buf the MessageBuilder object where we add the error messages
- * describing the errors encountered.
- */
- public void validateOptions(MessageBuilder buf)
- {
- validateGlobalOptions(buf);
- validateSubcommandOptions(buf);
- }
-
- /**
- * {@inheritDoc}
- */
- public int validateGlobalOptions(MessageBuilder buf)
- {
- int returnValue;
- super.validateGlobalOptions(buf);
- ArrayList<Message> errors = new ArrayList<Message>();
- if (secureArgsList.bindPasswordArg.isPresent() &&
- secureArgsList.bindPasswordFileArg.isPresent()) {
- Message message = ERR_TOOL_CONFLICTING_ARGS.get(
- secureArgsList.bindPasswordArg.getLongIdentifier(),
- secureArgsList.bindPasswordFileArg.getLongIdentifier());
- errors.add(message);
- }
-
- if (!isInteractive())
- {
- // Check that we have the required data
- if (!baseDNsArg.isPresent() && !isStatusReplicationSubcommand())
- {
- errors.add(ERR_REPLICATION_NO_BASE_DN_PROVIDED.get());
- }
- if (getBindPasswordAdmin() == null)
- {
- errors.add(ERR_REPLICATION_NO_ADMINISTRATOR_PASSWORD_PROVIDED.get(
- "--"+secureArgsList.bindPasswordArg.getLongIdentifier(),
- "--"+secureArgsList.bindPasswordFileArg.getLongIdentifier()));
- }
- }
-
- if (baseDNsArg.isPresent())
- {
- LinkedList<String> baseDNs = baseDNsArg.getValues();
- for (String dn : baseDNs)
- {
- if (!Utils.isDn(dn))
- {
- errors.add(ERR_REPLICATION_NOT_A_VALID_BASEDN.get(dn));
- }
- }
- }
- if (errors.size() > 0)
- {
- for (Message error : errors)
- {
- addMessage(buf, error);
- }
- }
-
- if (buf.length() > 0)
- {
- returnValue = ReplicationCliReturnCode.CONFLICTING_ARGS.getReturnCode();
- }
- else
- {
- returnValue = ReplicationCliReturnCode.SUCCESSFUL_NOP.getReturnCode();
- }
- return returnValue;
- }
-
- /**
- * Initialize Global option.
- *
- * @param outStream
- * The output stream used for the usage.
- * @throws ArgumentException
- * If there is a problem with any of the parameters used
- * to create this argument.
- */
- private void initializeGlobalArguments(OutputStream outStream)
- throws ArgumentException
- {
- ArrayList<Argument> defaultArgs =
- new ArrayList<Argument>(createGlobalArguments(outStream));
-
- Argument[] argsToRemove = {
- secureArgsList.hostNameArg,
- secureArgsList.portArg,
- secureArgsList.bindDnArg,
- secureArgsList.bindPasswordFileArg,
- secureArgsList.bindPasswordArg,
- secureArgsList.useSSLArg,
- secureArgsList.useStartTLSArg
- };
-
- for (int i=0; i<argsToRemove.length; i++)
- {
- defaultArgs.remove(argsToRemove[i]);
- }
- defaultArgs.remove(noPropertiesFileArg);
- defaultArgs.remove(propertiesFileArg);
- // Remove it from the default location and redefine it.
- defaultArgs.remove(secureArgsList.adminUidArg);
-
- int index = 0;
-
- baseDNsArg = new StringArgument("baseDNs", OPTION_SHORT_BASEDN,
- OPTION_LONG_BASEDN, false, true, true, INFO_BASEDN_PLACEHOLDER.get(),
- null,
- null, INFO_DESCRIPTION_REPLICATION_BASEDNS.get());
- baseDNsArg.setPropertyName(OPTION_LONG_BASEDN);
- defaultArgs.add(index++, baseDNsArg);
-
- secureArgsList.adminUidArg = new StringArgument("adminUID", 'I',
- "adminUID", false, false, true, INFO_ADMINUID_PLACEHOLDER.get(),
- Constants.GLOBAL_ADMIN_UID, null,
- INFO_DESCRIPTION_REPLICATION_ADMIN_UID.get(
- ENABLE_REPLICATION_SUBCMD_NAME));
- secureArgsList.adminUidArg.setPropertyName("adminUID");
- secureArgsList.adminUidArg.setHidden(false);
- defaultArgs.add(index++, secureArgsList.adminUidArg);
-
- secureArgsList.bindPasswordArg = new StringArgument("adminPassword",
- OPTION_SHORT_BINDPWD, "adminPassword", false, false, true,
- INFO_BINDPWD_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_REPLICATION_ADMIN_BINDPASSWORD.get());
- defaultArgs.add(index++, secureArgsList.bindPasswordArg);
-
- secureArgsList.bindPasswordFileArg = new FileBasedArgument(
- "adminPasswordFile",
- OPTION_SHORT_BINDPWD_FILE, "adminPasswordFile", false, false,
- INFO_BINDPWD_FILE_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_REPLICATION_ADMIN_BINDPASSWORDFILE.get());
- defaultArgs.add(index++, secureArgsList.bindPasswordFileArg);
-
- defaultArgs.remove(verboseArg);
- noPromptArg = new BooleanArgument(
- OPTION_LONG_NO_PROMPT,
- OPTION_SHORT_NO_PROMPT,
- OPTION_LONG_NO_PROMPT,
- INFO_DESCRIPTION_NO_PROMPT.get());
- defaultArgs.add(index++, noPromptArg);
-
- for (int i=0; i<index; i++)
- {
- Argument arg = defaultArgs.get(i);
- arg.setPropertyName(arg.getLongIdentifier());
- }
-
- quietArg = new BooleanArgument(
- OPTION_LONG_QUIET,
- OPTION_SHORT_QUIET,
- OPTION_LONG_QUIET,
- INFO_REPLICATION_DESCRIPTION_QUIET.get());
- quietArg.setPropertyName(OPTION_LONG_QUIET);
- defaultArgs.add(quietArg);
-
- StringArgument propertiesFileArgument = new StringArgument(
- "propertiesFilePath", null, OPTION_LONG_PROP_FILE_PATH, false, false,
- true, INFO_PROP_FILE_PATH_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_PROP_FILE_PATH.get());
- defaultArgs.add(propertiesFileArgument);
- setFilePropertiesArgument(propertiesFileArgument);
-
- BooleanArgument noPropertiesFileArgument = new BooleanArgument(
- "noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
- INFO_DESCRIPTION_NO_PROP_FILE.get());
- defaultArgs.add(noPropertiesFileArgument);
- setNoPropertiesFileArgument(noPropertiesFileArgument);
-
- initializeGlobalArguments(defaultArgs);
- }
-
- /**
- * Creates the enable replication subcommand and all the specific options
- * for the subcommand.
- */
- private void createEnableReplicationSubCommand()
- throws ArgumentException
- {
-
- hostName1Arg = new StringArgument("host1", OPTION_SHORT_HOST,
- "host1", false, false, true, INFO_HOST_PLACEHOLDER.get(),
- getDefaultHostValue(),
- null, INFO_DESCRIPTION_ENABLE_REPLICATION_HOST1.get());
-
- port1Arg = new IntegerArgument("port1", OPTION_SHORT_PORT, "port1",
- false, false, true, INFO_PORT_PLACEHOLDER.get(), 389, null,
- INFO_DESCRIPTION_ENABLE_REPLICATION_SERVER_PORT1.get());
-
- bindDn1Arg = new StringArgument("bindDN1", OPTION_SHORT_BINDDN,
- "bindDN1", false, false, true, INFO_BINDDN_PLACEHOLDER.get(),
- "cn=Directory Manager", null,
- INFO_DESCRIPTION_ENABLE_REPLICATION_BINDDN1.get());
-
- bindPassword1Arg = new StringArgument("bindPassword1",
- null, "bindPassword1", false, false, true,
- INFO_BINDPWD_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_ENABLE_REPLICATION_BINDPASSWORD1.get());
-
- bindPasswordFile1Arg = new FileBasedArgument("bindPasswordFile1",
- null, "bindPasswordFile1", false, false,
- INFO_BINDPWD_FILE_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_ENABLE_REPLICATION_BINDPASSWORDFILE1.get());
-
- useSSL1Arg = new BooleanArgument("useSSL1", OPTION_SHORT_USE_SSL,
- "useSSL1", INFO_DESCRIPTION_ENABLE_REPLICATION_USE_SSL1.get());
-
- useStartTLS1Arg = new BooleanArgument("startTLS1", OPTION_SHORT_START_TLS,
- "startTLS1",
- INFO_DESCRIPTION_ENABLE_REPLICATION_STARTTLS1.get());
-
- replicationPort1Arg = new IntegerArgument("replicationPort1", 'r',
- "replicationPort1", false, false, true, INFO_PORT_PLACEHOLDER.get(),
- 8989, null,
- INFO_DESCRIPTION_ENABLE_REPLICATION_PORT1.get());
-
- secureReplication1Arg = new BooleanArgument("secureReplication1", null,
- "secureReplication1",
- INFO_DESCRIPTION_ENABLE_SECURE_REPLICATION1.get());
-
- hostName2Arg = new StringArgument("host2", 'O',
- "host2", false, false, true, INFO_HOST_PLACEHOLDER.get(),
- getDefaultHostValue(),
- null, INFO_DESCRIPTION_ENABLE_REPLICATION_HOST2.get());
-
- port2Arg = new IntegerArgument("port2", null, "port2",
- false, false, true, INFO_PORT_PLACEHOLDER.get(), 389, null,
- INFO_DESCRIPTION_ENABLE_REPLICATION_SERVER_PORT2.get());
-
- bindDn2Arg = new StringArgument("bindDN2", null,
- "bindDN2", false, false, true, INFO_BINDDN_PLACEHOLDER.get(),
- "cn=Directory Manager", null,
- INFO_DESCRIPTION_ENABLE_REPLICATION_BINDDN2.get());
-
- bindPassword2Arg = new StringArgument("bindPassword2",
- null, "bindPassword2", false, false, true,
- INFO_BINDPWD_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_ENABLE_REPLICATION_BINDPASSWORD2.get());
-
- bindPasswordFile2Arg = new FileBasedArgument("bindPasswordFile2",
- 'F', "bindPasswordFile2", false, false,
- INFO_BINDPWD_FILE_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_ENABLE_REPLICATION_BINDPASSWORDFILE2.get());
-
- useSSL2Arg = new BooleanArgument("useSSL2", 'z',
- "useSSL2", INFO_DESCRIPTION_ENABLE_REPLICATION_USE_SSL2.get());
-
- useStartTLS2Arg = new BooleanArgument("startTLS2", null,
- "startTLS2",
- INFO_DESCRIPTION_ENABLE_REPLICATION_STARTTLS2.get());
-
- replicationPort2Arg = new IntegerArgument("replicationPort2", 'R',
- "replicationPort2", false, false, true, INFO_PORT_PLACEHOLDER.get(),
- 8989, null,
- INFO_DESCRIPTION_ENABLE_REPLICATION_PORT2.get());
-
- secureReplication2Arg = new BooleanArgument("secureReplication2", null,
- "secureReplication2",
- INFO_DESCRIPTION_ENABLE_SECURE_REPLICATION2.get());
-
- skipPortCheckArg = new BooleanArgument(
- "skipportcheck", 'S', "skipPortCheck",
- INFO_DESCRIPTION_ENABLE_REPLICATION_SKIPPORT.get());
-
- noSchemaReplicationArg = new BooleanArgument(
- "noschemareplication", null, "noSchemaReplication",
- INFO_DESCRIPTION_ENABLE_REPLICATION_NO_SCHEMA_REPLICATION.get());
-
- useSecondServerAsSchemaSourceArg = new BooleanArgument(
- "usesecondserverasschemasource", null, "useSecondServerAsSchemaSource",
- INFO_DESCRIPTION_ENABLE_REPLICATION_USE_SECOND_AS_SCHEMA_SOURCE.get(
- "--"+noSchemaReplicationArg.getLongIdentifier()));
-
- enableReplicationSubCmd = new SubCommand(this,
- ENABLE_REPLICATION_SUBCMD_NAME,
- INFO_DESCRIPTION_SUBCMD_ENABLE_REPLICATION.get());
-
- Argument[] argsToAdd = {
- hostName1Arg, port1Arg, bindDn1Arg, bindPassword1Arg,
- bindPasswordFile1Arg, useStartTLS1Arg, useSSL1Arg, replicationPort1Arg,
- secureReplication1Arg,
- hostName2Arg, port2Arg, bindDn2Arg, bindPassword2Arg,
- bindPasswordFile2Arg, useStartTLS2Arg, useSSL2Arg, replicationPort2Arg,
- secureReplication2Arg,
- skipPortCheckArg, noSchemaReplicationArg,
- useSecondServerAsSchemaSourceArg
- };
- for (int i=0; i<argsToAdd.length; i++)
- {
- argsToAdd[i].setPropertyName(argsToAdd[i].getLongIdentifier());
- enableReplicationSubCmd.addArgument(argsToAdd[i]);
- }
- }
-
- /**
- * Creates the disable replication subcommand and all the specific options
- * for the subcommand. Note: this method assumes that
- * initializeGlobalArguments has already been called and that hostNameArg,
- * portArg, startTLSArg and useSSLArg have been created.
- */
- private void createDisableReplicationSubCommand()
- throws ArgumentException
- {
- disableReplicationSubCmd = new SubCommand(this,
- DISABLE_REPLICATION_SUBCMD_NAME,
- INFO_DESCRIPTION_SUBCMD_DISABLE_REPLICATION.get());
- secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
- secureArgsList.bindDnArg = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
- OPTION_LONG_BINDDN, false, false, true, INFO_BINDDN_PLACEHOLDER.get(),
- "cn=Directory Manager", OPTION_LONG_BINDDN,
- INFO_DESCRIPTION_DISABLE_REPLICATION_BINDDN.get());
- Argument[] argsToAdd = { secureArgsList.hostNameArg,
- secureArgsList.portArg, secureArgsList.useSSLArg,
- secureArgsList.useStartTLSArg, secureArgsList.bindDnArg };
- for (int i=0; i<argsToAdd.length; i++)
- {
- disableReplicationSubCmd.addArgument(argsToAdd[i]);
- }
- }
-
- /**
- * Creates the initialize replication subcommand and all the specific options
- * for the subcommand.
- */
- private void createInitializeReplicationSubCommand()
- throws ArgumentException
- {
- hostNameSourceArg = new StringArgument("hostSource", OPTION_SHORT_HOST,
- "hostSource", false, false, true, INFO_HOST_PLACEHOLDER.get(),
- getDefaultHostValue(), null,
- INFO_DESCRIPTION_INITIALIZE_REPLICATION_HOST_SOURCE.get());
-
- portSourceArg = new IntegerArgument("portSource", OPTION_SHORT_PORT,
- "portSource", false, false, true, INFO_PORT_PLACEHOLDER.get(), 389,
- null,
- INFO_DESCRIPTION_INITIALIZE_REPLICATION_SERVER_PORT_SOURCE.get());
-
- useSSLSourceArg = new BooleanArgument("useSSLSource", OPTION_SHORT_USE_SSL,
- "useSSLSource",
- INFO_DESCRIPTION_INITIALIZE_REPLICATION_USE_SSL_SOURCE.get());
-
- useStartTLSSourceArg = new BooleanArgument("startTLSSource",
- OPTION_SHORT_START_TLS, "startTLSSource",
- INFO_DESCRIPTION_INITIALIZE_REPLICATION_STARTTLS_SOURCE.get());
-
- hostNameDestinationArg = new StringArgument("hostDestination", 'O',
- "hostDestination", false, false, true, INFO_HOST_PLACEHOLDER.get(),
- getDefaultHostValue(), null,
- INFO_DESCRIPTION_INITIALIZE_REPLICATION_HOST_DESTINATION.get());
-
- portDestinationArg = new IntegerArgument("portDestination", null,
- "portDestination", false, false, true, INFO_PORT_PLACEHOLDER.get(), 389,
- null,
- INFO_DESCRIPTION_INITIALIZE_REPLICATION_SERVER_PORT_DESTINATION.get());
-
- useSSLDestinationArg = new BooleanArgument("useSSLDestination", 'z',
- "useSSLDestination",
- INFO_DESCRIPTION_INITIALIZE_REPLICATION_USE_SSL_DESTINATION.get());
-
- useStartTLSDestinationArg = new BooleanArgument("startTLSDestination", null,
- "startTLSDestination",
- INFO_DESCRIPTION_INITIALIZE_REPLICATION_STARTTLS_DESTINATION.get());
-
- initializeReplicationSubCmd = new SubCommand(this,
- INITIALIZE_REPLICATION_SUBCMD_NAME,
- INFO_DESCRIPTION_SUBCMD_INITIALIZE_REPLICATION.get(
- INITIALIZE_ALL_REPLICATION_SUBCMD_NAME));
-
- Argument[] argsToAdd = {
- hostNameSourceArg, portSourceArg, useSSLSourceArg, useStartTLSSourceArg,
- hostNameDestinationArg, portDestinationArg, useSSLDestinationArg,
- useStartTLSDestinationArg
- };
- for (int i=0; i<argsToAdd.length; i++)
- {
- argsToAdd[i].setPropertyName(argsToAdd[i].getLongIdentifier());
- initializeReplicationSubCmd.addArgument(argsToAdd[i]);
- }
- }
-
- /**
- * Creates the initialize all replication subcommand and all the specific
- * options for the subcommand. Note: this method assumes that
- * initializeGlobalArguments has already been called and that hostNameArg,
- * portArg, startTLSArg and useSSLArg have been created.
- */
- private void createInitializeAllReplicationSubCommand()
- throws ArgumentException
- {
- initializeAllReplicationSubCmd = new SubCommand(this,
- INITIALIZE_ALL_REPLICATION_SUBCMD_NAME,
- INFO_DESCRIPTION_SUBCMD_INITIALIZE_ALL_REPLICATION.get(
- INITIALIZE_REPLICATION_SUBCMD_NAME));
- secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
- Argument[] argsToAdd = { secureArgsList.hostNameArg,
- secureArgsList.portArg, secureArgsList.useSSLArg,
- secureArgsList.useStartTLSArg };
- for (int i=0; i<argsToAdd.length; i++)
- {
- initializeAllReplicationSubCmd.addArgument(argsToAdd[i]);
- }
- }
-
- /**
- * Creates the subcommand that the user must launch before doing an external
- * initialization of the topology ( and all the specific
- * options for the subcommand. Note: this method assumes that
- * initializeGlobalArguments has already been called and that hostNameArg,
- * portArg, startTLSArg and useSSLArg have been created.
- */
- private void createPreExternalInitializationSubCommand()
- throws ArgumentException
- {
- preExternalInitializationSubCmd = new SubCommand(this,
- PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME,
- INFO_DESCRIPTION_SUBCMD_PRE_EXTERNAL_INITIALIZATION.get(
- POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME));
- secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
- externalInitializationLocalOnlyArg = new BooleanArgument(
- "local-only",
- 'l',
- "local-only",
- INFO_DESCRIPTION_EXTERNAL_INITIALIZATION_LOCAL.get());
- externalInitializationLocalOnlyArg.setPropertyName(
- externalInitializationLocalOnlyArg.getLongIdentifier());
- Argument[] argsToAdd = { secureArgsList.hostNameArg,
- secureArgsList.portArg, secureArgsList.useSSLArg,
- secureArgsList.useStartTLSArg,
- externalInitializationLocalOnlyArg};
-
- for (int i=0; i<argsToAdd.length; i++)
- {
- preExternalInitializationSubCmd.addArgument(argsToAdd[i]);
- }
- }
-
- /**
- * Creates the subcommand that the user must launch after doing an external
- * initialization of the topology ( and all the specific
- * options for the subcommand. Note: this method assumes that
- * initializeGlobalArguments has already been called and that hostNameArg,
- * portArg, startTLSArg and useSSLArg have been created.
- */
- private void createPostExternalInitializationSubCommand()
- throws ArgumentException
- {
- postExternalInitializationSubCmd = new SubCommand(this,
- POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME,
- INFO_DESCRIPTION_SUBCMD_POST_EXTERNAL_INITIALIZATION.get(
- PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME));
- secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
- externalInitializationLocalOnlyArg.setPropertyName(
- externalInitializationLocalOnlyArg.getLongIdentifier());
- Argument[] argsToAdd = { secureArgsList.hostNameArg,
- secureArgsList.portArg, secureArgsList.useSSLArg,
- secureArgsList.useStartTLSArg};
- for (int i=0; i<argsToAdd.length; i++)
- {
- postExternalInitializationSubCmd.addArgument(argsToAdd[i]);
- }
- }
-
- /**
- * Creates the status replication subcommand and all the specific options
- * for the subcommand. Note: this method assumes that
- * initializeGlobalArguments has already been called and that hostNameArg,
- * portArg, startTLSArg and useSSLArg have been created.
- */
- private void createStatusReplicationSubCommand() throws ArgumentException
- {
- statusReplicationSubCmd = new SubCommand(this,
- STATUS_REPLICATION_SUBCMD_NAME,
- INFO_DESCRIPTION_SUBCMD_STATUS_REPLICATION.get());
- scriptFriendlyArg = new BooleanArgument(
- "script-friendly",
- 's',
- "script-friendly",
- INFO_DESCRIPTION_SCRIPT_FRIENDLY.get());
- scriptFriendlyArg.setPropertyName(scriptFriendlyArg.getLongIdentifier());
- secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
- Argument[] argsToAdd = { secureArgsList.hostNameArg,
- secureArgsList.portArg, secureArgsList.useSSLArg,
- secureArgsList.useStartTLSArg, scriptFriendlyArg };
- for (int i=0; i<argsToAdd.length; i++)
- {
- statusReplicationSubCmd.addArgument(argsToAdd[i]);
- }
- }
-
- /**
- * Tells whether the user specified to have an interactive operation or not.
- * This method must be called after calling parseArguments.
- * @return <CODE>true</CODE> if the user specified to have an interactive
- * operation and <CODE>false</CODE> otherwise.
- */
- public boolean isInteractive()
- {
- return !noPromptArg.isPresent();
- }
-
- /**
- * Tells whether the user specified to have a quite operation or not.
- * This method must be called after calling parseArguments.
- * @return <CODE>true</CODE> if the user specified to have a quite operation
- * and <CODE>false</CODE> otherwise.
- */
- public boolean isQuiet()
- {
- return quietArg.isPresent();
- }
-
- /**
- * Tells whether the user specified to have a script-friendly output or not.
- * This method must be called after calling parseArguments.
- * @return <CODE>true</CODE> if the user specified to have a script-friendly
- * output and <CODE>false</CODE> otherwise.
- */
- public boolean isScriptFriendly()
- {
- return scriptFriendlyArg.isPresent();
- }
-
- /**
- * Get the password which has to be used for the command to connect to the
- * first server without prompting the user in the enable replication
- * subcommand. If no password was specified return null.
- *
- * @return the password which has to be used for the command to connect to the
- * first server without prompting the user in the enable replication
- * subcommand. If no password was specified return null.
- */
- public String getBindPassword1()
- {
- return getBindPassword(bindPassword1Arg, bindPasswordFile1Arg);
- }
-
- /**
- * Get the password which has to be used for the command to connect to the
- * second server without prompting the user in the enable replication
- * subcommand. If no password was specified return null.
- *
- * @return the password which has to be used for the command to connect to the
- * second server without prompting the user in the enable replication
- * subcommand. If no password was specified return null.
- */
- public String getBindPassword2()
- {
- return getBindPassword(bindPassword2Arg, bindPasswordFile2Arg);
- }
-
- /**
- * Get the global administrator password which has to be used for the command
- * to connect to the server(s) without prompting the user. If no password was
- * specified, return null.
- *
- * @return the global administrator password which has to be used for the
- * command to connect to the server(s) without prompting the user. If no
- * password was specified, return null.
- */
- public String getBindPasswordAdmin()
- {
- return getBindPassword(secureArgsList.bindPasswordArg,
- secureArgsList.bindPasswordFileArg);
- }
-
- /**
- * Get the password of the first server which has to be used in the
- * enable replication subcommand.
- *
- * @param dn
- * The user DN for which to password could be asked.
- * @param out
- * The input stream to used if we have to prompt to the
- * user.
- * @param err
- * The error stream to used if we have to prompt to the
- * user.
- * @return the password of the first server which has to be used n the
- * enable replication subcommand.
- */
- public String getBindPassword1(
- String dn, OutputStream out, OutputStream err)
- {
- return getBindPassword(dn, out, err, bindPassword1Arg,
- bindPasswordFile1Arg);
- }
-
- /**
- * Get the password of the second server which has to be used in the
- * enable replication subcommand.
- *
- * @param dn
- * The user DN for which to password could be asked.
- * @param out
- * The input stream to used if we have to prompt to the
- * user.
- * @param err
- * The error stream to used if we have to prompt to the
- * user.
- * @return the password of the second server which has to be used in the
- * enable replication subcommand.
- */
- public String getBindPassword2(
- String dn, OutputStream out, OutputStream err)
- {
- return getBindPassword(dn, out, err, bindPassword2Arg,
- bindPasswordFile2Arg);
- }
-
- /**
- * Get the password of the global administrator which has to be used for the
- * command.
- *
- * @param dn
- * The user DN for which to password could be asked.
- * @param out
- * The input stream to used if we have to prompt to the
- * user.
- * @param err
- * The error stream to used if we have to prompt to the
- * user.
- * @return the password of the global administrator which has to be used for
- * the command.
- */
- public String getBindPasswordAdmin(
- String dn, OutputStream out, OutputStream err)
- {
- return getBindPassword(dn, out, err, secureArgsList.bindPasswordArg,
- secureArgsList.bindPasswordFileArg);
- }
-
- /**
- * Indicate if the SSL mode is required for the first server in the enable
- * replication subcommand.
- *
- * @return <CODE>true</CODE> if SSL mode is required for the first server in
- * the enable replication subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useSSL1()
- {
- return useSSL1Arg.isPresent();
- }
-
- /**
- * Indicate if the startTLS mode is required for the first server in the
- * enable replication subcommand.
- *
- * @return <CODE>true</CODE> if startTLS mode is required for the first server
- * in the enable replication subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useStartTLS1()
- {
- return useStartTLS1Arg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the second server in the enable
- * replication subcommand.
- *
- * @return <CODE>true</CODE> if SSL mode is required for the second server in
- * the enable replication subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useSSL2()
- {
- return useSSL2Arg.isPresent();
- }
-
- /**
- * Indicate if the startTLS mode is required for the second server in the
- * enable replication subcommand.
- *
- * @return <CODE>true</CODE> if startTLS mode is required for the second
- * server in the enable replication subcommand and <CODE>false</CODE>
- * otherwise.
- */
- public boolean useStartTLS2()
- {
- return useStartTLS2Arg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the source server in the
- * initialize replication subcommand.
- *
- * @return <CODE>true</CODE> if SSL mode is required for the source server
- * in the initialize replication subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useSSLSource()
- {
- return useSSLSourceArg.isPresent();
- }
-
- /**
- * Indicate if the StartTLS mode is required for the source server in the
- * initialize replication subcommand.
- *
- * @return <CODE>true</CODE> if StartTLS mode is required for the source
- * server in the initialize replication subcommand and <CODE>false</CODE>
- * otherwise.
- */
- public boolean useStartTLSSource()
- {
- return useStartTLSSourceArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the destinaton server in the
- * initialize replication subcommand.
- *
- * @return <CODE>true</CODE> if SSL mode is required for the destination
- * server in the initialize replication subcommand and <CODE>false</CODE>
- * otherwise.
- */
- public boolean useSSLDestination()
- {
- return useSSLDestinationArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the destination server in the
- * initialize replication subcommand.
- *
- * @return <CODE>true</CODE> if StartTLS mode is required for the destination
- * server in the initialize replication subcommand and <CODE>false</CODE>
- * otherwise.
- */
- public boolean useStartTLSDestination()
- {
- return useStartTLSDestinationArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the server in the disable
- * replication subcommand.
- *
- * @return <CODE>true</CODE> if SSL mode is required for the server in the
- * disable replication subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useSSLToDisable()
- {
- return secureArgsList.useSSLArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the server in the disable
- * replication subcommand.
- *
- * @return <CODE>true</CODE> if StartTLS mode is required for the server in
- * the disable replication subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useStartTLSToDisable()
- {
- return secureArgsList.useStartTLSArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the server in the initialize all
- * replication subcommand.
- *
- * @return <CODE>true</CODE> if SSL mode is required for the server in the
- * initialize all replication subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useSSLToInitializeAll()
- {
- return secureArgsList.useSSLArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the server in the initialize all
- * replication subcommand.
- *
- * @return <CODE>true</CODE> if StartTLS mode is required for the server in
- * the initialize all replication subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useStartTLSToInitializeAll()
- {
- return secureArgsList.useStartTLSArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the server in the pre external
- * initialization subcommand.
- *
- * @return <CODE>true</CODE> if SSL mode is required for the server in the
- * pre external initialization subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useSSLToPreExternalInitialization()
- {
- return secureArgsList.useSSLArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the server in the pre external
- * initialization subcommand.
- *
- * @return <CODE>true</CODE> if StartTLS mode is required for the server in
- * the pre external initialization subcommand and <CODE>false</CODE>
- * otherwise.
- */
- public boolean useStartTLSToPreExternalInitialization()
- {
- return secureArgsList.useStartTLSArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the server in the post external
- * initialization subcommand.
- *
- * @return <CODE>true</CODE> if SSL mode is required for the server in the
- * post external initialization subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useSSLToPostExternalInitialization()
- {
- return secureArgsList.useSSLArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the server in the post external
- * initialization subcommand.
- *
- * @return <CODE>true</CODE> if StartTLS mode is required for the server in
- * the post external initialization subcommand and <CODE>false</CODE>
- * otherwise.
- */
- public boolean useStartTLSToPostExternalInitialization()
- {
- return secureArgsList.useStartTLSArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the server in the status
- * replication subcommand.
- *
- * @return <CODE>true</CODE> if SSL mode is required for the server in the
- * status replication subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useSSLToStatus()
- {
- return secureArgsList.useSSLArg.isPresent();
- }
-
- /**
- * Indicate if the SSL mode is required for the server in the status
- * replication subcommand.
- *
- * @return <CODE>true</CODE> if StartTLS mode is required for the server in
- * the status replication subcommand and <CODE>false</CODE> otherwise.
- */
- public boolean useStartTLSToStatus()
- {
- return secureArgsList.useStartTLSArg.isPresent();
- }
-
- /**
- * Returns the Administrator UID explicitly provided in the command-line.
- * @return the Administrator UID explicitly provided in the command-line.
- */
- public String getAdministratorUID()
- {
- return getValue(secureArgsList.adminUidArg);
- }
-
- /**
- * Returns the default Administrator UID value.
- * @return the default Administrator UID value.
- */
- public String getDefaultAdministratorUID()
- {
- return getDefaultValue(secureArgsList.adminUidArg);
- }
-
- /**
- * Returns the first host name explicitly provided in the enable replication
- * subcommand.
- * @return the first host name explicitly provided in the enable replication
- * subcommand.
- */
- public String getHostName1()
- {
- return getValue(hostName1Arg);
- }
-
- /**
- * Returns the first host name default value in the enable replication
- * subcommand.
- * @return the first host name default value in the enable replication
- * subcommand.
- */
- public String getDefaultHostName1()
- {
- return getDefaultValue(hostName1Arg);
- }
-
- /**
- * Returns the first server port explicitly provided in the enable replication
- * subcommand.
- * @return the first server port explicitly provided in the enable replication
- * subcommand. Returns -1 if no port was explicitly provided.
- */
- public int getPort1()
- {
- return getValue(port1Arg);
- }
-
- /**
- * Returns the first server port default value in the enable replication
- * subcommand.
- * @return the first server port default value in the enable replication
- * subcommand.
- */
- public int getDefaultPort1()
- {
- return getDefaultValue(port1Arg);
- }
-
- /**
- * Returns the first server bind dn explicitly provided in the enable
- * replication subcommand.
- * @return the first server bind dn explicitly provided in the enable
- * replication subcommand.
- */
- public String getBindDn1()
- {
- return getValue(bindDn1Arg);
- }
-
- /**
- * Returns the first server bind dn default value in the enable replication
- * subcommand.
- * @return the first server bind dn default value in the enable replication
- * subcommand.
- */
- public String getDefaultBindDn1()
- {
- return getDefaultValue(bindDn1Arg);
- }
-
- /**
- * Returns the first server replication port explicitly provided in the enable
- * replication subcommand.
- * @return the first server replication port explicitly provided in the enable
- * replication subcommand. Returns -1 if no port was explicitly provided.
- */
- public int getReplicationPort1()
- {
- return getValue(replicationPort1Arg);
- }
-
- /**
- * Returns the first server replication port default value in the enable
- * replication subcommand.
- * @return the first server replication port default value in the enable
- * replication subcommand.
- */
- public int getDefaultReplicationPort1()
- {
- return getDefaultValue(replicationPort1Arg);
- }
-
- /**
- * Returns whether the user asked to have replication communication with the
- * first server or not.
- * @return <CODE>true</CODE> the user asked to have replication communication
- * with the first server and <CODE>false</CODE> otherwise.
- */
- public boolean isSecureReplication1()
- {
- return secureReplication1Arg.isPresent();
- }
-
- /**
- * Returns the second host name explicitly provided in the enable replication
- * subcommand.
- * @return the second host name explicitly provided in the enable replication
- * subcommand.
- */
- public String getHostName2()
- {
- return getValue(hostName2Arg);
- }
-
- /**
- * Returns the second host name default value in the enable replication
- * subcommand.
- * @return the second host name default value in the enable replication
- * subcommand.
- */
- public String getDefaultHostName2()
- {
- return getDefaultValue(hostName2Arg);
- }
-
- /**
- * Returns the second server port explicitly provided in the enable
- * replication subcommand.
- * @return the second server port explicitly provided in the enable
- * replication subcommand. Returns -1 if no port was explicitly provided.
- */
- public int getPort2()
- {
- return getValue(port2Arg);
- }
-
- /**
- * Returns the second server port default value in the enable replication
- * subcommand.
- * @return the second server port default value in the enable replication
- * subcommand.
- */
- public int getDefaultPort2()
- {
- return getDefaultValue(port2Arg);
- }
-
- /**
- * Returns the second server bind dn explicitly provided in the enable
- * replication subcommand.
- * @return the second server bind dn explicitly provided in the enable
- * replication subcommand.
- */
- public String getBindDn2()
- {
- return getValue(bindDn2Arg);
- }
-
- /**
- * Returns the second server bind dn default value in the enable replication
- * subcommand.
- * @return the second server bind dn default value in the enable replication
- * subcommand.
- */
- public String getDefaultBindDn2()
- {
- return getDefaultValue(bindDn2Arg);
- }
-
- /**
- * Returns the second server replication port explicitly provided in the
- * enable replication subcommand.
- * @return the second server replication port explicitly provided in the
- * enable replication subcommand. Returns -1 if no port was explicitly
- * provided.
- */
- public int getReplicationPort2()
- {
- return getValue(replicationPort2Arg);
- }
-
- /**
- * Returns the second server replication port default value in the enable
- * replication subcommand.
- * @return the second server replication port default value in the enable
- * replication subcommand.
- */
- public int getDefaultReplicationPort2()
- {
- return getDefaultValue(replicationPort2Arg);
- }
-
- /**
- * Returns whether the user asked to have replication communication with the
- * second server or not.
- * @return <CODE>true</CODE> the user asked to have replication communication
- * with the second server and <CODE>false</CODE> otherwise.
- */
- public boolean isSecureReplication2()
- {
- return secureReplication2Arg.isPresent();
- }
-
- /**
- * Returns whether the user asked to skip the replication port checks (if the
- * ports are free) or not.
- * @return <CODE>true</CODE> the user asked to skip the replication port
- * checks (if the ports are free) and <CODE>false</CODE> otherwise.
- */
- public boolean skipReplicationPortCheck()
- {
- return skipPortCheckArg.isPresent();
- }
-
- /**
- * Returns whether the user asked to not replicate the schema between servers.
- * @return <CODE>true</CODE> if the user asked to not replicate schema and
- * <CODE>false</CODE> otherwise.
- */
- public boolean noSchemaReplication()
- {
- return noSchemaReplicationArg.isPresent();
- }
-
- /**
- * Returns whether the user asked to use the second server to initialize the
- * schema of the first server.
- * @return <CODE>true</CODE> if the user asked to use the second server to
- * initialize the schema of the first server and <CODE>false</CODE> otherwise.
- */
- public boolean useSecondServerAsSchemaSource()
- {
- return useSecondServerAsSchemaSourceArg.isPresent();
- }
-
- /**
- * Returns the host name explicitly provided in the disable replication
- * subcommand.
- * @return the host name explicitly provided in the disable replication
- * subcommand.
- */
- public String getHostNameToDisable()
- {
- return getValue(secureArgsList.hostNameArg);
- }
-
- /**
- * Returns the host name default value in the disable replication
- * subcommand.
- * @return the host name default value in the disable replication
- * subcommand.
- */
- public String getDefaultHostNameToDisable()
- {
- return getDefaultValue(secureArgsList.hostNameArg);
- }
-
- /**
- * Returns the server bind dn explicitly provided in the disable replication
- * subcommand.
- * @return the server bind dn explicitly provided in the disable replication
- * subcommand.
- */
- public String getBindDNToDisable()
- {
- return getValue(secureArgsList.bindDnArg);
- }
-
- /**
- * Returns the server bind dn default value in the disable replication
- * subcommand.
- * @return the server bind dn default value in the enable replication
- * subcommand.
- */
- public String getDefaultBindDnToDisable()
- {
- return getDefaultValue(secureArgsList.bindDnArg);
- }
-
- /**
- * Returns the host name explicitly provided in the status replication
- * subcommand.
- * @return the host name explicitly provided in the status replication
- * subcommand.
- */
- public String getHostNameToStatus()
- {
- return getValue(secureArgsList.hostNameArg);
- }
-
- /**
- * Returns the host name default value in the status replication subcommand.
- * @return the host name default value in the status replication subcommand.
- */
- public String getDefaultHostNameToStatus()
- {
- return getDefaultValue(secureArgsList.hostNameArg);
- }
-
- /**
- * Returns the host name explicitly provided in the initialize all replication
- * subcommand.
- * @return the host name explicitly provided in the initialize all replication
- * subcommand.
- */
- public String getHostNameToInitializeAll()
- {
- return getValue(secureArgsList.hostNameArg);
- }
-
- /**
- * Returns the host name default value in the initialize all replication
- * subcommand.
- * @return the host name default value in the initialize all replication
- * subcommand.
- */
- public String getDefaultHostNameToInitializeAll()
- {
- return getDefaultValue(secureArgsList.hostNameArg);
- }
-
- /**
- * Returns the host name explicitly provided in the pre external
- * initialization subcommand.
- * @return the host name explicitly provided in the pre external
- * initialization subcommand.
- */
- public String getHostNameToPreExternalInitialization()
- {
- return getValue(secureArgsList.hostNameArg);
- }
-
- /**
- * Returns the host name default value in the pre external initialization
- * subcommand.
- * @return the host name default value in the pre external initialization
- * subcommand.
- */
- public String getDefaultHostNameToPreExternalInitialization()
- {
- return getDefaultValue(secureArgsList.hostNameArg);
- }
-
- /**
- * Returns the host name explicitly provided in the post external
- * initialization subcommand.
- * @return the host name explicitly provided in the post external
- * initialization subcommand.
- */
- public String getHostNameToPostExternalInitialization()
- {
- return getValue(secureArgsList.hostNameArg);
- }
-
- /**
- * Returns the host name default value in the post external initialization
- * subcommand.
- * @return the host name default value in the post external initialization
- * subcommand.
- */
- public String getDefaultHostNameToPostExternalInitialization()
- {
- return getDefaultValue(secureArgsList.hostNameArg);
- }
-
- /**
- * Returns the source host name explicitly provided in the initialize
- * replication subcommand.
- * @return the source host name explicitly provided in the initialize
- * replication subcommand.
- */
- public String getHostNameSource()
- {
- return getValue(hostNameSourceArg);
- }
-
- /**
- * Returns the first host name default value in the initialize replication
- * subcommand.
- * @return the first host name default value in the initialize replication
- * subcommand.
- */
- public String getDefaultHostNameSource()
- {
- return getDefaultValue(hostNameSourceArg);
- }
-
- /**
- * Returns the destination host name explicitly provided in the initialize
- * replication subcommand.
- * @return the destination host name explicitly provided in the initialize
- * replication subcommand.
- */
- public String getHostNameDestination()
- {
- return getValue(hostNameDestinationArg);
- }
-
- /**
- * Returns the destination host name default value in the initialize
- * replication subcommand.
- * @return the destination host name default value in the initialize
- * replication subcommand.
- */
- public String getDefaultHostNameDestination()
- {
- return getDefaultValue(hostNameDestinationArg);
- }
-
- /**
- * Returns the source server port explicitly provided in the initialize
- * replication subcommand.
- * @return the source server port explicitly provided in the initialize
- * replication subcommand. Returns -1 if no port was explicitly provided.
- */
- public int getPortSource()
- {
- return getValue(portSourceArg);
- }
-
- /**
- * Returns the source server port default value in the initialize replication
- * subcommand.
- * @return the source server port default value in the initialize replication
- * subcommand.
- */
- public int getDefaultPortSource()
- {
- return getDefaultValue(portSourceArg);
- }
-
- /**
- * Returns the destination server port explicitly provided in the initialize
- * replication subcommand.
- * @return the destination server port explicitly provided in the initialize
- * replication subcommand. Returns -1 if no port was explicitly provided.
- */
- public int getPortDestination()
- {
- return getValue(portDestinationArg);
- }
-
- /**
- * Returns the destination server port default value in the initialize
- * replication subcommand.
- * @return the destination server port default value in the initialize
- * replication subcommand.
- */
- public int getDefaultPortDestination()
- {
- return getDefaultValue(portDestinationArg);
- }
-
- /**
- * Returns the server port explicitly provided in the disable replication
- * subcommand.
- * @return the server port explicitly provided in the disable replication
- * subcommand. Returns -1 if no port was explicitly provided.
- */
- public int getPortToDisable()
- {
- return getValue(secureArgsList.portArg);
- }
-
- /**
- * Returns the server port default value in the disable replication
- * subcommand.
- * @return the server port default value in the disable replication
- * subcommand.
- */
- public int getDefaultPortToDisable()
- {
- return getDefaultValue(secureArgsList.portArg);
- }
-
- /**
- * Returns the server port explicitly provided in the initialize all
- * replication subcommand.
- * @return the server port explicitly provided in the initialize all
- * replication subcommand. Returns -1 if no port was explicitly provided.
- */
- public int getPortToInitializeAll()
- {
- return getValue(secureArgsList.portArg);
- }
-
- /**
- * Returns the server port default value in the initialize all replication
- * subcommand.
- * @return the server port default value in the initialize all replication
- * subcommand.
- */
- public int getDefaultPortToInitializeAll()
- {
- return getDefaultValue(secureArgsList.portArg);
- }
-
- /**
- * Returns the server port explicitly provided in the pre external
- * initialization subcommand.
- * @return the server port explicitly provided in the pre external
- * initialization subcommand. Returns -1 if no port was explicitly provided.
- */
- public int getPortToPreExternalInitialization()
- {
- return getValue(secureArgsList.portArg);
- }
-
- /**
- * Returns the server port default value in the pre external initialization
- * subcommand.
- * @return the server port default value in the pre external initialization
- * subcommand.
- */
- public int getDefaultPortToPreExternalInitialization()
- {
- return getDefaultValue(secureArgsList.portArg);
- }
-
- /**
- * Returns the server port explicitly provided in the post external
- * initialization subcommand.
- * @return the server port explicitly provided in the post external
- * initialization subcommand. Returns -1 if no port was explicitly provided.
- */
- public int getPortToPostExternalInitialization()
- {
- return getValue(secureArgsList.portArg);
- }
-
- /**
- * Returns the server port default value in the post external initialization
- * subcommand.
- * @return the server port default value in the post external initialization
- * subcommand.
- */
- public int getDefaultPortToPostExternalInitialization()
- {
- return getDefaultValue(secureArgsList.portArg);
- }
-
- /**
- * Returns the server port explicitly provided in the status replication
- * subcommand.
- * @return the server port explicitly provided in the status replication
- * subcommand. Returns -1 if no port was explicitly provided.
- */
- public int getPortToStatus()
- {
- return getValue(secureArgsList.portArg);
- }
-
- /**
- * Returns the server port default value in the status replication subcommand.
- * @return the server port default value in the status replication subcommand.
- */
- public int getDefaultPortToStatus()
- {
- return getDefaultValue(secureArgsList.portArg);
- }
-
- /**
- * Returns the list of base DNs provided by the user.
- * @return the list of base DNs provided by the user.
- */
- public LinkedList<String> getBaseDNs()
- {
- return baseDNsArg.getValues();
- }
-
- /**
- * Returns the value of the provided argument only if the user provided it
- * explicitly.
- * @param arg the StringArgument to be handled.
- * @return the value of the provided argument only if the user provided it
- * explicitly.
- */
- private String getValue(StringArgument arg)
- {
- String v = null;
- if (arg.isPresent())
- {
- v = arg.getValue();
- }
- return v;
- }
-
- /**
- * Returns the default value of the provided argument.
- * @param arg the StringArgument to be handled.
- * @return the default value of the provided argument.
- */
- private String getDefaultValue(StringArgument arg)
- {
- return arg.getDefaultValue();
- }
-
- /**
- * Returns the value of the provided argument only if the user provided it
- * explicitly.
- * @param arg the StringArgument to be handled.
- * @return the value of the provided argument only if the user provided it
- * explicitly.
- */
- private int getValue(IntegerArgument arg)
- {
- int v = -1;
- if (arg.isPresent())
- {
- try
- {
- v = arg.getIntValue();
- }
- catch (ArgumentException ae)
- {
- // This is a bug
- throw new IllegalStateException(
- "There was an argument exception calling "+
- "ReplicationCliParser.getValue(). This appears to be a bug "+
- "because this method should be called after calling "+
- "parseArguments which should result in an error.", ae);
- }
- }
- return v;
- }
-
- /**
- * Returns the default value of the provided argument.
- * @param arg the StringArgument to be handled.
- * @return the default value of the provided argument.
- */
- private int getDefaultValue(IntegerArgument arg)
- {
- int returnValue = -1;
- String defaultValue = arg.getDefaultValue();
- if (defaultValue != null)
- {
- returnValue = Integer.parseInt(arg.getDefaultValue());
- }
- return returnValue;
- }
-
- /**
- * Checks the subcommand options and updates the provided MessageBuilder
- * with the errors that were encountered with the subcommand options.
- *
- * This method assumes that the method parseArguments for the parser has
- * already been called.
- * @param buf the MessageBuilder object where we add the error messages
- * describing the errors encountered.
- */
- public void validateSubcommandOptions(MessageBuilder buf)
- {
- if (isEnableReplicationSubcommand())
- {
- validateEnableReplicationOptions(buf);
- }
- else if (isDisableReplicationSubcommand())
- {
- validateDisableReplicationOptions(buf);
- }
- else if (isStatusReplicationSubcommand())
- {
- validateStatusReplicationOptions(buf);
- }
- else if (isInitializeReplicationSubcommand())
- {
- validateInitializeReplicationOptions(buf);
- }
- else if (isInitializeAllReplicationSubcommand())
- {
- validateInitializeAllReplicationOptions(buf);
- }
- else if (isPreExternalInitializationSubcommand())
- {
- validatePreExternalInitializationOptions(buf);
- }
- else if (isPostExternalInitializationSubcommand())
- {
- validatePostExternalInitializationOptions(buf);
- }
-
- else
- {
- // This can occur if the user did not provide any subcommand. We assume
- // that the error informing of this will be generated in
- // validateGlobalOptions.
- }
- }
-
- /**
- * Returns whether the user provided subcommand is the enable replication
- * or not.
- * @return <CODE>true</CODE> if the user provided subcommand is the
- * enable replication and <CODE>false</CODE> otherwise.
- */
- public boolean isEnableReplicationSubcommand()
- {
- return isSubcommand(ENABLE_REPLICATION_SUBCMD_NAME);
- }
-
- /**
- * Returns whether the user provided subcommand is the disable replication
- * or not.
- * @return <CODE>true</CODE> if the user provided subcommand is the
- * disable replication and <CODE>false</CODE> otherwise.
- */
- public boolean isDisableReplicationSubcommand()
- {
- return isSubcommand(DISABLE_REPLICATION_SUBCMD_NAME);
- }
-
- /**
- * Returns whether the user provided subcommand is the status replication
- * or not.
- * @return <CODE>true</CODE> if the user provided subcommand is the
- * status replication and <CODE>false</CODE> otherwise.
- */
- public boolean isStatusReplicationSubcommand()
- {
- return isSubcommand(STATUS_REPLICATION_SUBCMD_NAME);
- }
-
- /**
- * Returns whether the user provided subcommand is the initialize all
- * replication or not.
- * @return <CODE>true</CODE> if the user provided subcommand is the
- * initialize all replication and <CODE>false</CODE> otherwise.
- */
- public boolean isInitializeAllReplicationSubcommand()
- {
- return isSubcommand(INITIALIZE_ALL_REPLICATION_SUBCMD_NAME);
- }
-
- /**
- * Returns whether the user provided subcommand is the pre external
- * initialization or not.
- * @return <CODE>true</CODE> if the user provided subcommand is the
- * pre external initialization and <CODE>false</CODE> otherwise.
- */
- public boolean isPreExternalInitializationSubcommand()
- {
- return isSubcommand(PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME);
- }
-
- /**
- * Returns whether the user provided subcommand is the post external
- * initialization or not.
- * @return <CODE>true</CODE> if the user provided subcommand is the
- * post external initialization and <CODE>false</CODE> otherwise.
- */
- public boolean isPostExternalInitializationSubcommand()
- {
- return isSubcommand(POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME);
- }
-
- /**
- * Returns whether the user provided subcommand is the initialize replication
- * or not.
- * @return <CODE>true</CODE> if the user provided subcommand is the
- * initialize replication and <CODE>false</CODE> otherwise.
- */
- public boolean isInitializeReplicationSubcommand()
- {
- return isSubcommand(INITIALIZE_REPLICATION_SUBCMD_NAME);
- }
-
- /**
- * Tells whether the user specified to apply the pre (or post) external
- * initialization operations only on the local server.
- * @return <CODE>true</CODE> if the user specified to apply the pre (or post)
- * external initialization operations only on the local server and
- * <CODE>false</CODE> otherwise.
- */
- public boolean isExternalInitializationLocalOnly()
- {
- return externalInitializationLocalOnlyArg.isPresent();
- }
-
- /**
- * Returns whether the command-line subcommand has the name provided
- * or not.
- * @param name the name of the subcommand.
- * @return <CODE>true</CODE> if command-line subcommand has the name provided
- * and <CODE>false</CODE> otherwise.
- */
- private boolean isSubcommand(String name)
- {
- boolean isSubcommand = false;
- SubCommand subCommand = getSubCommand();
- if (subCommand != null)
- {
- isSubcommand = subCommand.getName().equalsIgnoreCase(name);
- }
- return isSubcommand;
- }
-
- /**
- * Checks the enable replication subcommand options and updates the provided
- * MessageBuilder with the errors that were encountered with the subcommand
- * options.
- *
- * This method assumes that the method parseArguments for the parser has
- * already been called.
- * @param buf the MessageBuilder object where we add the error messages
- * describing the errors encountered.
- */
- private void validateEnableReplicationOptions(MessageBuilder buf)
- {
- Argument[][] conflictingPairs =
- {
- {bindPassword1Arg, bindPasswordFile1Arg},
- {useStartTLS1Arg, useSSL1Arg},
- {bindPassword2Arg, bindPasswordFile2Arg},
- {useStartTLS2Arg, useSSL2Arg},
- {noSchemaReplicationArg, useSecondServerAsSchemaSourceArg}
- };
-
- for (int i=0; i< conflictingPairs.length; i++)
- {
- Argument arg1 = conflictingPairs[i][0];
- Argument arg2 = conflictingPairs[i][1];
- if (arg1.isPresent() && arg2.isPresent())
- {
- Message message = ERR_TOOL_CONFLICTING_ARGS.get(
- arg1.getLongIdentifier(), arg2.getLongIdentifier());
- addMessage(buf, message);
- }
- }
-
- if (hostName1Arg.getValue().equalsIgnoreCase(hostName2Arg.getValue()) &&
- !isInteractive())
- {
- if (port1Arg.getValue() == port2Arg.getValue())
- {
- Message message = ERR_REPLICATION_ENABLE_SAME_SERVER_PORT.get(
- hostName1Arg.getValue(), port1Arg.getValue());
- addMessage(buf, message);
- }
- }
- }
-
- /**
- * Checks the disable replication subcommand options and updates the provided
- * MessageBuilder with the errors that were encountered with the subcommand
- * options.
- *
- * This method assumes that the method parseArguments for the parser has
- * already been called.
- * @param buf the MessageBuilder object where we add the error messages
- * describing the errors encountered.
- */
- private void validateDisableReplicationOptions(MessageBuilder buf)
- {
- Argument[][] conflictingPairs =
- {
- {secureArgsList.useStartTLSArg, secureArgsList.useSSLArg},
- {secureArgsList.adminUidArg, secureArgsList.bindDnArg}
- };
-
- for (int i=0; i< conflictingPairs.length; i++)
- {
- Argument arg1 = conflictingPairs[i][0];
- Argument arg2 = conflictingPairs[i][1];
- if (arg1.isPresent() && arg2.isPresent())
- {
- Message message = ERR_TOOL_CONFLICTING_ARGS.get(
- arg1.getLongIdentifier(), arg2.getLongIdentifier());
- addMessage(buf, message);
- }
- }
- }
-
- /**
- * Checks the initialize all replication subcommand options and updates the
- * provided MessageBuilder with the errors that were encountered with the
- * subcommand options.
- *
- * This method assumes that the method parseArguments for the parser has
- * already been called.
- * @param buf the MessageBuilder object where we add the error messages
- * describing the errors encountered.
- */
- private void validateInitializeAllReplicationOptions(MessageBuilder buf)
- {
- Argument[][] conflictingPairs =
- {
- {secureArgsList.useStartTLSArg, secureArgsList.useSSLArg}
- };
-
- for (int i=0; i< conflictingPairs.length; i++)
- {
- Argument arg1 = conflictingPairs[i][0];
- Argument arg2 = conflictingPairs[i][1];
- if (arg1.isPresent() && arg2.isPresent())
- {
- Message message = ERR_TOOL_CONFLICTING_ARGS.get(
- arg1.getLongIdentifier(), arg2.getLongIdentifier());
- addMessage(buf, message);
- }
- }
- }
-
- /**
- * Checks the pre external initialization subcommand options and updates the
- * provided MessageBuilder with the errors that were encountered with the
- * subcommand options.
- *
- * This method assumes that the method parseArguments for the parser has
- * already been called.
- * @param buf the MessageBuilder object where we add the error messages
- * describing the errors encountered.
- */
- private void validatePreExternalInitializationOptions(MessageBuilder buf)
- {
- validateInitializeAllReplicationOptions(buf);
- }
-
- /**
- * Checks the post external initialization subcommand options and updates the
- * provided MessageBuilder with the errors that were encountered with the
- * subcommand options.
- *
- * This method assumes that the method parseArguments for the parser has
- * already been called.
- * @param buf the MessageBuilder object where we add the error messages
- * describing the errors encountered.
- */
- private void validatePostExternalInitializationOptions(MessageBuilder buf)
- {
- validateInitializeAllReplicationOptions(buf);
- }
-
- /**
- * Checks the status replication subcommand options and updates the provided
- * MessageBuilder with the errors that were encountered with the subcommand
- * options.
- *
- * This method assumes that the method parseArguments for the parser has
- * already been called.
- * @param buf the MessageBuilder object where we add the error messages
- * describing the errors encountered.
- */
- private void validateStatusReplicationOptions(MessageBuilder buf)
- {
- Argument[][] conflictingPairs =
- {
- {secureArgsList.useStartTLSArg, secureArgsList.useSSLArg}
- };
-
- for (int i=0; i< conflictingPairs.length; i++)
- {
- Argument arg1 = conflictingPairs[i][0];
- Argument arg2 = conflictingPairs[i][1];
- if (arg1.isPresent() && arg2.isPresent())
- {
- Message message = ERR_TOOL_CONFLICTING_ARGS.get(
- arg1.getLongIdentifier(), arg2.getLongIdentifier());
- addMessage(buf, message);
- }
- }
-
- if (quietArg.isPresent())
- {
- Message message = ERR_REPLICATION_STATUS_QUIET.get(
- STATUS_REPLICATION_SUBCMD_NAME, "--"+quietArg.getLongIdentifier());
- addMessage(buf, message);
- }
- }
-
- /**
- * Checks the initialize replication subcommand options and updates the
- * provided MessageBuilder with the errors that were encountered with the
- * subcommand options.
- *
- * This method assumes that the method parseArguments for the parser has
- * already been called.
- * @param buf the MessageBuilder object where we add the error messages
- * describing the errors encountered.
- */
- private void validateInitializeReplicationOptions(MessageBuilder buf)
- {
- // The startTLS and useSSL arguments are already validated in
- // SecureConnectionCliParser.validateGlobalOptions.
- if (hostNameSourceArg.getValue().equalsIgnoreCase(
- hostNameDestinationArg.getValue()) && !isInteractive())
- {
- if (portSourceArg.getValue() == portDestinationArg.getValue())
- {
- Message message = ERR_REPLICATION_INITIALIZE_SAME_SERVER_PORT.get(
- hostNameSourceArg.getValue(), portSourceArg.getValue());
- addMessage(buf, message);
- }
- }
- }
-
- /**
- * Adds a message to the provided MessageBuilder.
- * @param buf the MessageBuilder.
- * @param message the message to be added.
- */
- private void addMessage(MessageBuilder buf, Message message)
- {
- if (buf.length() > 0)
- {
- buf.append(EOL);
- }
- buf.append(message);
- }
-
- /**
- * Returns the default value to be used for the host.
- * @return the default value to be used for the host.
- */
- private String getDefaultHostValue()
- {
- if (defaultLocalHostValue == null)
- {
- defaultLocalHostValue = UserData.getDefaultHostName();
- if (defaultLocalHostValue == null)
- {
- defaultLocalHostValue = "localhost";
- }
- }
- return defaultLocalHostValue;
- }
-
- /**
- * Returns the SecureConnectionCliArgs object containing the arguments
- * of this parser.
- * @return the SecureConnectionCliArgs object containing the arguments
- * of this parser.
- */
- SecureConnectionCliArgs getSecureArgsList()
- {
- return secureArgsList;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliException.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliException.java
deleted file mode 100644
index d6207ba..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliException.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-import org.opends.messages.Message;
-import org.opends.server.types.OpenDsException;
-
-/**
- * The exception that is thrown during the replication command-line execution.
- *
- */
-public class ReplicationCliException extends OpenDsException {
- private static final long serialVersionUID = -8085682356609610678L;
- private ReplicationCliReturnCode errorCode;
-
- /**
- * The constructor for the exception.
- * @param message the localized message.
- * @param errorCode the error code associated with this exception.
- * @param cause the cause that generated this exception.
- */
- ReplicationCliException(Message message, ReplicationCliReturnCode errorCode,
- Throwable cause)
- {
- super(message, cause);
- this.errorCode = errorCode;
- }
-
- /**
- * Returns the error code associated with this exception.
- * @return the error code associated with this exception.
- */
- public ReplicationCliReturnCode getErrorCode()
- {
- return errorCode;
- }
-}
-
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
deleted file mode 100644
index a81d4aa..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
+++ /dev/null
@@ -1,7660 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2007-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-import static org.opends.guitools.replicationcli.ReplicationCliReturnCode.*;
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.messages.QuickSetupMessages.*;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.quicksetup.util.Utils.getFirstValue;
-import static org.opends.quicksetup.util.Utils.getThrowableMsg;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.naming.NameAlreadyBoundException;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import javax.naming.ldap.InitialLdapContext;
-import javax.net.ssl.TrustManager;
-
-import org.opends.admin.ads.ADSContext;
-import org.opends.admin.ads.ADSContextException;
-import org.opends.admin.ads.ReplicaDescriptor;
-import org.opends.admin.ads.ServerDescriptor;
-import org.opends.admin.ads.SuffixDescriptor;
-import org.opends.admin.ads.TopologyCache;
-import org.opends.admin.ads.TopologyCacheException;
-import org.opends.admin.ads.TopologyCacheFilter;
-import org.opends.admin.ads.ADSContext.ADSPropertySyntax;
-import org.opends.admin.ads.ADSContext.AdministratorProperty;
-import org.opends.admin.ads.util.ApplicationTrustManager;
-import org.opends.admin.ads.util.ConnectionUtils;
-import org.opends.admin.ads.util.PreferredConnection;
-import org.opends.admin.ads.util.ServerLoader;
-import org.opends.messages.Message;
-import org.opends.messages.MessageBuilder;
-import org.opends.quicksetup.ApplicationException;
-import org.opends.quicksetup.Constants;
-import org.opends.quicksetup.QuickSetupLog;
-import org.opends.quicksetup.ReturnCode;
-import org.opends.quicksetup.event.ProgressUpdateEvent;
-import org.opends.quicksetup.event.ProgressUpdateListener;
-import org.opends.quicksetup.installer.Installer;
-import org.opends.quicksetup.installer.InstallerHelper;
-import org.opends.quicksetup.installer.PeerNotFoundException;
-import org.opends.quicksetup.installer.offline.OfflineInstaller;
-import org.opends.quicksetup.util.PlainTextProgressMessageFormatter;
-import org.opends.quicksetup.util.Utils;
-import org.opends.server.admin.AttributeTypePropertyDefinition;
-import org.opends.server.admin.ClassLoaderProvider;
-import org.opends.server.admin.ClassPropertyDefinition;
-import org.opends.server.admin.DefaultBehaviorException;
-import org.opends.server.admin.ManagedObjectNotFoundException;
-import org.opends.server.admin.client.ManagementContext;
-import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.*;
-import org.opends.server.admin.std.meta.*;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.tools.ClientException;
-import org.opends.server.tools.ToolConstants;
-import org.opends.server.types.DN;
-import org.opends.server.types.InitializationException;
-import org.opends.server.types.NullOutputStream;
-import org.opends.server.types.OpenDsException;
-import org.opends.server.util.SetupUtils;
-import org.opends.server.util.args.ArgumentException;
-import org.opends.server.util.cli.CLIException;
-import org.opends.server.util.cli.ConsoleApplication;
-import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
-import org.opends.server.util.cli.MenuBuilder;
-import org.opends.server.util.cli.MenuResult;
-import org.opends.server.util.table.TableBuilder;
-import org.opends.server.util.table.TextTablePrinter;
-
-/**
- * This class provides a tool that can be used to enable and disable replication
- * and also to initialize the contents of a replicated suffix with the contents
- * of another suffix. It also allows to display the replicated status of the
- * different base DNs of the servers that are registered in the ADS.
- */
-public class ReplicationCliMain extends ConsoleApplication
-{
- /**
- * The fully-qualified name of this class.
- */
- private static final String CLASS_NAME = ReplicationCliMain.class.getName();
-
- /** Prefix for log files. */
- static public final String LOG_FILE_PREFIX = "opends-replication-";
-
- /** Suffix for log files. */
- static public final String LOG_FILE_SUFFIX = ".log";
-
- private boolean forceNonInteractive;
-
- private static final Logger LOG =
- Logger.getLogger(ReplicationCliMain.class.getName());
-
- /**
- * The enumeration containing the different options we display when we ask
- * the user to provide the subcommand interactively.
- */
- private enum SubcommandChoice
- {
- /**
- * Enable replication.
- */
- ENABLE(INFO_REPLICATION_ENABLE_MENU_PROMPT.get()),
- /**
- * Disable replication.
- */
- DISABLE(INFO_REPLICATION_DISABLE_MENU_PROMPT.get()),
- /**
- * Initialize replication.
- */
- INITIALIZE(INFO_REPLICATION_INITIALIZE_MENU_PROMPT.get()),
- /**
- * Initialize All.
- */
- INITIALIZE_ALL(INFO_REPLICATION_INITIALIZE_ALL_MENU_PROMPT.get()),
- /**
- * Pre external initialization.
- */
- PRE_EXTERNAL_INITIALIZATION(
- INFO_REPLICATION_PRE_EXTERNAL_INITIALIZATION_MENU_PROMPT.get()),
- /**
- * Post external initialization.
- */
- POST_EXTERNAL_INITIALIZATION(
- INFO_REPLICATION_POST_EXTERNAL_INITIALIZATION_MENU_PROMPT.get()),
- /**
- * Replication status.
- */
- STATUS(INFO_REPLICATION_STATUS_MENU_PROMPT.get()),
- /**
- * Cancel operation.
- */
- CANCEL(null);
- private Message prompt;
- private SubcommandChoice(Message prompt)
- {
- this.prompt = prompt;
- }
- Message getPrompt()
- {
- return prompt;
- }
- };
-
- // The argument parser to be used.
- private ReplicationCliArgumentParser argParser;
- private LDAPConnectionConsoleInteraction ci = null;
- // The message formatter
- PlainTextProgressMessageFormatter formatter =
- new PlainTextProgressMessageFormatter();
-
- /**
- * Constructor for the ReplicationCliMain object.
- *
- * @param out the print stream to use for standard output.
- * @param err the print stream to use for standard error.
- * @param in the input stream to use for standard input.
- */
- public ReplicationCliMain(PrintStream out, PrintStream err, InputStream in)
- {
- super(in, out, err);
- }
-
- /**
- * The main method for the replication tool.
- *
- * @param args the command-line arguments provided to this program.
- */
-
- public static void main(String[] args)
- {
- int retCode = mainCLI(args, true, System.out, System.err, System.in);
-
- System.exit(retCode);
- }
-
- /**
- * Parses the provided command-line arguments and uses that information to
- * run the replication tool.
- *
- * @param args the command-line arguments provided to this program.
- *
- * @return The error code.
- */
-
- public static int mainCLI(String[] args)
- {
- return mainCLI(args, true, System.out, System.err, System.in);
- }
-
- /**
- * Parses the provided command-line arguments and uses that information to
- * run the replication tool.
- *
- * @param args The command-line arguments provided to this
- * program.
- * @param initializeServer Indicates whether to initialize the server.
- * @param outStream The output stream to use for standard output, or
- * <CODE>null</CODE> if standard output is not
- * needed.
- * @param errStream The output stream to use for standard error, or
- * <CODE>null</CODE> if standard error is not
- * needed.
- * @param inStream The input stream to use for standard input.
- * @return The error code.
- */
-
- public static int mainCLI(String[] args, boolean initializeServer,
- OutputStream outStream, OutputStream errStream, InputStream inStream)
- {
- PrintStream out;
- if (outStream == null)
- {
- out = NullOutputStream.printStream();
- }
- else
- {
- out = new PrintStream(outStream);
- }
-
- PrintStream err;
- if (errStream == null)
- {
- err = NullOutputStream.printStream();
- }
- else
- {
- err = new PrintStream(errStream);
- }
-
- try {
- QuickSetupLog.initLogFileHandler(
- File.createTempFile(LOG_FILE_PREFIX, LOG_FILE_SUFFIX),
- "org.opends.guitools.replicationcli");
- QuickSetupLog.disableConsoleLogging();
- } catch (Throwable t) {
- System.err.println("Unable to initialize log");
- t.printStackTrace();
- }
-
- ReplicationCliMain replicationCli = new ReplicationCliMain(out, err,
- inStream);
- return replicationCli.execute(args, initializeServer);
- }
-
- /**
- * Parses the provided command-line arguments and uses that information to
- * run the replication tool.
- *
- * @param args the command-line arguments provided to this program.
- * @param initializeServer Indicates whether to initialize the server.
- *
- * @return The error code.
- */
- public int execute(String[] args, boolean initializeServer)
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- // Create the command-line argument parser for use with this
- // program.
- try
- {
- argParser = new ReplicationCliArgumentParser(CLASS_NAME);
- argParser.initializeParser(getOutputStream());
- }
- catch (ArgumentException ae)
- {
- Message message =
- ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
- println(message);
- LOG.log(Level.SEVERE, "Complete error stack:", ae);
- returnValue = CANNOT_INITIALIZE_ARGS;
- }
-
- if (returnValue == SUCCESSFUL_NOP)
- {
- // Parse the command-line arguments provided to this program.
- try
- {
- argParser.parseArguments(args);
- }
- catch (ArgumentException ae)
- {
- Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
-
- println(message);
- println();
- println(Message.raw(argParser.getUsage()));
- LOG.log(Level.SEVERE, "Complete error stack:", ae);
- returnValue = ERROR_USER_DATA;
- }
- }
-
- if (!argParser.usageOrVersionDisplayed())
- {
- if (returnValue == SUCCESSFUL_NOP)
- {
- /* Check that the provided parameters are compatible.
- */
- MessageBuilder buf = new MessageBuilder();
- argParser.validateOptions(buf);
- if (buf.length() > 0)
- {
- println(buf.toMessage());
- println(Message.raw(argParser.getUsage()));
- returnValue = ERROR_USER_DATA;
- }
- }
- if (initializeServer)
- {
- DirectoryServer.bootstrapClient();
-
- // Bootstrap definition classes.
- try
- {
- ClassLoaderProvider.getInstance().enable();
- // Switch off class name validation in client.
- ClassPropertyDefinition.setAllowClassValidation(false);
-
- // Switch off attribute type name validation in client.
- AttributeTypePropertyDefinition.setCheckSchema(false);
- }
- catch (InitializationException ie)
- {
- println(ie.getMessageObject());
- returnValue = ERROR_INITIALIZING_ADMINISTRATION_FRAMEWORK;
- }
- }
-
- if (returnValue == SUCCESSFUL_NOP)
- {
- ci = new LDAPConnectionConsoleInteraction(this,
- argParser.getSecureArgsList());
- ci.setDisplayLdapIfSecureParameters(
- !argParser.isInitializeAllReplicationSubcommand() &&
- !argParser.isPreExternalInitializationSubcommand() ||
- !argParser.isPostExternalInitializationSubcommand());
- }
- if (returnValue == SUCCESSFUL_NOP)
- {
- boolean subcommandLaunched = true;
- if (argParser.isEnableReplicationSubcommand())
- {
- returnValue = enableReplication();
- }
- else if (argParser.isDisableReplicationSubcommand())
- {
- returnValue = disableReplication();
- }
- else if (argParser.isInitializeReplicationSubcommand())
- {
- returnValue = initializeReplication();
- }
- else if (argParser.isInitializeAllReplicationSubcommand())
- {
- returnValue = initializeAllReplication();
- }
- else if (argParser.isPreExternalInitializationSubcommand())
- {
- returnValue = preExternalInitialization();
- }
- else if (argParser.isPostExternalInitializationSubcommand())
- {
- returnValue = postExternalInitialization();
- }
- else if (argParser.isStatusReplicationSubcommand())
- {
- returnValue = statusReplication();
- }
- else
- {
- if (argParser.isInteractive())
- {
- String subCommand = null;
- switch (promptForSubcommand())
- {
- case ENABLE:
- subCommand =
- ReplicationCliArgumentParser.ENABLE_REPLICATION_SUBCMD_NAME;
- break;
-
- case DISABLE:
- subCommand =
- ReplicationCliArgumentParser.DISABLE_REPLICATION_SUBCMD_NAME;
- break;
-
- case INITIALIZE:
- subCommand =
- ReplicationCliArgumentParser.INITIALIZE_REPLICATION_SUBCMD_NAME;
- break;
-
- case INITIALIZE_ALL:
- subCommand =
- ReplicationCliArgumentParser.
- INITIALIZE_ALL_REPLICATION_SUBCMD_NAME;
- break;
-
- case PRE_EXTERNAL_INITIALIZATION:
- subCommand = ReplicationCliArgumentParser.
- PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME;
- break;
-
- case POST_EXTERNAL_INITIALIZATION:
- subCommand = ReplicationCliArgumentParser.
- POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME;
- break;
-
- case STATUS:
- subCommand =
- ReplicationCliArgumentParser.STATUS_REPLICATION_SUBCMD_NAME;
- break;
-
- default:
- // User cancelled
- returnValue = USER_CANCELLED;
- }
-
- if (subCommand != null)
- {
- String[] newArgs = new String[args.length + 1];
- newArgs[0] = subCommand;
- for (int i=0; i<args.length ; i++)
- {
- newArgs[i+1] = args[i];
- }
- // The server (if requested) has already been initialized.
- return execute(newArgs, false);
- }
- }
- else
- {
- println(ERR_REPLICATION_VALID_SUBCOMMAND_NOT_FOUND.get(
- "--"+ToolConstants.OPTION_LONG_NO_PROMPT));
- println(Message.raw(argParser.getUsage()));
- returnValue = ERROR_USER_DATA;
- subcommandLaunched = false;
- }
- }
-
- // Display the log file only if the operation is successful (when there
- // is a critical error this is already displayed).
- if (subcommandLaunched && (returnValue == SUCCESSFUL_NOP))
- {
- File logFile = QuickSetupLog.getLogFile();
- if (logFile != null)
- {
- println();
- println(INFO_GENERAL_SEE_FOR_DETAILS.get(logFile.getPath()));
- println();
- }
- }
- }
- }
- return returnValue.getReturnCode();
- }
-
- /**
- * Based on the data provided in the command-line it enables replication
- * between two servers.
- * @return the error code if the operation failed and 0 if it was successful.
- */
- private ReplicationCliReturnCode enableReplication()
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- EnableReplicationUserData uData = new EnableReplicationUserData();
- if (argParser.isInteractive())
- {
- try
- {
- if (promptIfRequired(uData))
- {
- returnValue = enableReplication(uData);
- }
- else
- {
- returnValue = USER_CANCELLED;
- }
- }
- catch (ReplicationCliException rce)
- {
- returnValue = rce.getErrorCode();
- println();
- println(getCriticalExceptionMessage(rce));
- }
- }
- else
- {
- initializeWithArgParser(uData);
- returnValue = enableReplication(uData);
- }
- return returnValue;
- }
-
- /**
- * Based on the data provided in the command-line it disables replication
- * in the server.
- * @return the error code if the operation failed and SUCCESSFUL if it was
- * successful.
- */
- private ReplicationCliReturnCode disableReplication()
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- DisableReplicationUserData uData = new DisableReplicationUserData();
- if (argParser.isInteractive())
- {
- try
- {
- if (promptIfRequired(uData))
- {
- returnValue = disableReplication(uData);
- }
- else
- {
- returnValue = USER_CANCELLED;
- }
- }
- catch (ReplicationCliException rce)
- {
- returnValue = rce.getErrorCode();
- println();
- println(getCriticalExceptionMessage(rce));
- }
- }
- else
- {
- initializeWithArgParser(uData);
- returnValue = disableReplication(uData);
- }
- return returnValue;
- }
-
- /**
- * Based on the data provided in the command-line initialize the contents
- * of the whole replication topology.
- * @return the error code if the operation failed and SUCCESSFUL if it was
- * successful.
- */
- private ReplicationCliReturnCode initializeAllReplication()
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- InitializeAllReplicationUserData uData =
- new InitializeAllReplicationUserData();
- if (argParser.isInteractive())
- {
- if (promptIfRequired(uData))
- {
- returnValue = initializeAllReplication(uData);
- }
- else
- {
- returnValue = USER_CANCELLED;
- }
- }
- else
- {
- initializeWithArgParser(uData);
- returnValue = initializeAllReplication(uData);
- }
- return returnValue;
- }
-
- /**
- * Based on the data provided in the command-line execute the pre external
- * initialization operation.
- * @return the error code if the operation failed and SUCCESSFUL if it was
- * successful.
- */
- private ReplicationCliReturnCode preExternalInitialization()
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- PreExternalInitializationUserData uData =
- new PreExternalInitializationUserData();
- if (argParser.isInteractive())
- {
- if (promptIfRequired(uData))
- {
- returnValue = preExternalInitialization(uData);
- }
- else
- {
- returnValue = USER_CANCELLED;
- }
- }
- else
- {
- initializeWithArgParser(uData);
- returnValue = preExternalInitialization(uData);
- }
- return returnValue;
- }
-
- /**
- * Based on the data provided in the command-line execute the post external
- * initialization operation.
- * @return the error code if the operation failed and SUCCESSFUL if it was
- * successful.
- */
- private ReplicationCliReturnCode postExternalInitialization()
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- PostExternalInitializationUserData uData =
- new PostExternalInitializationUserData();
- if (argParser.isInteractive())
- {
- if (promptIfRequired(uData))
- {
- returnValue = postExternalInitialization(uData);
- }
- else
- {
- returnValue = USER_CANCELLED;
- }
- }
- else
- {
- initializeWithArgParser(uData);
- returnValue = postExternalInitialization(uData);
- }
- return returnValue;
- }
-
- /**
- * Based on the data provided in the command-line it displays replication
- * status.
- * @return the error code if the operation failed and SUCCESSFUL if it was
- * successful.
- */
- private ReplicationCliReturnCode statusReplication()
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- StatusReplicationUserData uData = new StatusReplicationUserData();
- if (argParser.isInteractive())
- {
- try
- {
- if (promptIfRequired(uData))
- {
- returnValue = statusReplication(uData);
- }
- else
- {
- returnValue = USER_CANCELLED;
- }
- }
- catch (ReplicationCliException rce)
- {
- returnValue = rce.getErrorCode();
- println();
- println(getCriticalExceptionMessage(rce));
- }
- }
- else
- {
- initializeWithArgParser(uData);
- returnValue = statusReplication(uData);
- }
- return returnValue;
- }
-
- /**
- * Based on the data provided in the command-line it initializes replication
- * between two servers.
- * @return the error code if the operation failed and SUCCESSFUL if it was
- * successful.
- */
- private ReplicationCliReturnCode initializeReplication()
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- InitializeReplicationUserData uData = new InitializeReplicationUserData();
- if (argParser.isInteractive())
- {
- if (promptIfRequired(uData))
- {
- returnValue = initializeReplication(uData);
- }
- else
- {
- returnValue = USER_CANCELLED;
- }
- }
- else
- {
- initializeWithArgParser(uData);
- returnValue = initializeReplication(uData);
- }
- return returnValue;
- }
-
- /**
- * Updates the contents of the provided EnableReplicationUserData object
- * with the information provided in the command-line. If some information
- * is missing, ask the user to provide valid data.
- * We assume that if this method is called we are in interactive mode.
- * @param uData the object to be updated.
- * @return <CODE>true</CODE> if the object was successfully updated and
- * <CODE>false</CODE> if the user cancelled the operation.
- * @throws ReplicationCliException if a critical error occurs reading the
- * ADS.
- */
- private boolean promptIfRequired(EnableReplicationUserData uData)
- throws ReplicationCliException
- {
- boolean cancelled = false;
-
- boolean administratorDefined = false;
-
- ci.setUseAdminOrBindDn(true);
-
- String adminPwd = argParser.getBindPasswordAdmin();
- String adminUid = argParser.getAdministratorUID();
-
- /*
- * Try to connect to the first server.
- */
- String host1 = argParser.getHostName1();
- int port1 = argParser.getPort1();
- boolean useSSL1 = argParser.useSSL1();
- boolean useStartTLS1 = argParser.useStartTLS1();
- String bindDn1 = argParser.getBindDn1();
- String pwd1 = argParser.getBindPassword1();
-
- String pwd = null;
- if (pwd1 != null)
- {
- pwd = pwd1;
- }
- else if (bindDn1 != null)
- {
- pwd = null;
- }
- else
- {
- pwd = adminPwd;
- }
-
- initializeGlobalArguments(host1, port1, useSSL1, useStartTLS1, adminUid,
- bindDn1, pwd);
- InitialLdapContext ctx1 = null;
-
- while ((ctx1 == null) && !cancelled)
- {
- try
- {
- ci.setHeadingMessage(
- INFO_REPLICATION_ENABLE_HOST1_CONNECTION_PARAMETERS.get());
- ci.run();
- useSSL1 = ci.useSSL();
- useStartTLS1 = ci.useStartTLS();
- host1 = ci.getHostName();
- port1 = ci.getPortNumber();
- if (ci.getProvidedAdminUID() != null)
- {
- adminUid = ci.getProvidedAdminUID();
- if (ci.getProvidedBindDN() == null)
- {
- // If the explicit bind DN is not null, the password corresponds
- // to that bind DN. We are in the case where the user provides
- // bind DN on first server and admin UID globally.
- adminPwd = ci.getBindPassword();
- }
- }
- bindDn1 = ci.getBindDN();
- pwd1 = ci.getBindPassword();
-
- ctx1 = createInitialLdapContextInteracting(ci);
-
- if (ctx1 == null)
- {
- cancelled = true;
- }
- }
- catch (ClientException ce)
- {
- LOG.log(Level.WARNING, "Client exception "+ce);
- println();
- println(ce.getMessageObject());
- println();
- resetConnectionArguments();
- }
- catch (ArgumentException ae)
- {
- LOG.log(Level.WARNING, "Argument exception "+ae);
- println();
- println(ae.getMessageObject());
- println();
- cancelled = true;
- }
- }
-
- if (!cancelled)
- {
- uData.setHostName1(host1);
- uData.setPort1(port1);
- uData.setBindDn1(bindDn1);
- uData.setPwd1(pwd1);
- uData.setUseSSL1(useSSL1);
- uData.setUseStartTLS1(useStartTLS1);
- }
- int replicationPort1 = -1;
- boolean secureReplication1 = argParser.isSecureReplication1();
- if (ctx1 != null)
- {
- // Try to get the replication port for server 1 only if it is required.
- if (!hasReplicationPort(ctx1))
- {
- boolean tryWithDefault = argParser.getReplicationPort1() != -1;
- while (replicationPort1 == -1)
- {
- if (tryWithDefault)
- {
- replicationPort1 = argParser.getReplicationPort1();
- tryWithDefault = false;
- }
- else
- {
- replicationPort1 = askPort(
- INFO_REPLICATION_ENABLE_REPLICATIONPORT1_PROMPT.get(),
- argParser.getDefaultReplicationPort1());
- println();
- }
- if (!argParser.skipReplicationPortCheck() && isLocalHost(host1))
- {
- if (!SetupUtils.canUseAsPort(replicationPort1))
- {
- println();
- println(getCannotBindToPortError(replicationPort1));
- println();
- replicationPort1 = -1;
- }
- }
- else
- {
- // This is something that we must do in any case... this test is
- // already included when we call SetupUtils.canUseAsPort
- if (replicationPort1 == port1)
- {
- println();
- println(
- ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
- host1, String.valueOf(replicationPort1)));
- println();
- replicationPort1 = -1;
- }
- }
- }
- if (!secureReplication1)
- {
- try
- {
- secureReplication1 =
- askConfirmation(INFO_REPLICATION_ENABLE_SECURE1_PROMPT.get(
- String.valueOf(replicationPort1)), false, LOG);
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- println();
- }
- }
- // If the server contains an ADS. Try to load it and only load it: if
- // there are issues with the ADS they will be encountered in the
- // enableReplication(EnableReplicationUserData) method. Here we have
- // to load the ADS to ask the user to accept the certificates and
- // eventually admin authentication data.
- InitialLdapContext[] aux = new InitialLdapContext[] {ctx1};
- cancelled = !loadADSAndAcceptCertificates(aux, uData, true);
- ctx1 = aux[0];
- if (!cancelled)
- {
- administratorDefined |= hasAdministrator(ctx1);
- if (uData.getAdminPwd() != null)
- {
- adminPwd = uData.getAdminPwd();
- }
- }
- }
- uData.setReplicationPort1(replicationPort1);
- uData.setSecureReplication1(secureReplication1);
-
- /*
- * Prompt for information on the second server.
- */
- String host2 = null;
- int port2 = -1;
- String bindDn2 = null;
- String pwd2 = null;
- boolean useSSL2 = false;
- boolean useStartTLS2 = false;
- ci.resetHeadingDisplayed();
- if (!cancelled)
- {
- host2 = argParser.getHostName2();
- port2 = argParser.getPort2();
- useSSL2 = argParser.useSSL2();
- useStartTLS2 = argParser.useStartTLS2();
- bindDn2 = argParser.getBindDn2();
- pwd2 = argParser.getBindPassword2();
- if (pwd2 != null)
- {
- pwd = pwd2;
- }
- else if (bindDn2 != null)
- {
- pwd = null;
- }
- else
- {
- pwd = adminPwd;
- }
-
- initializeGlobalArguments(host2, port2, useSSL2, useStartTLS2, adminUid,
- bindDn2, pwd);
- }
- InitialLdapContext ctx2 = null;
-
- while ((ctx2 == null) && !cancelled)
- {
- try
- {
- ci.setHeadingMessage(
- INFO_REPLICATION_ENABLE_HOST2_CONNECTION_PARAMETERS.get());
- ci.run();
- useSSL2 = ci.useSSL();
- useStartTLS2 = ci.useStartTLS();
- host2 = ci.getHostName();
- port2 = ci.getPortNumber();
- if (ci.getProvidedAdminUID() != null)
- {
- adminUid = ci.getProvidedAdminUID();
- if (ci.getProvidedBindDN() == null)
- {
- // If the explicit bind DN is not null, the password corresponds
- // to that bind DN. We are in the case where the user provides
- // bind DN on first server and admin UID globally.
- adminPwd = ci.getBindPassword();
- }
- }
- bindDn2 = ci.getBindDN();
- pwd2 = ci.getBindPassword();
-
- boolean error = false;
- if (host1.equalsIgnoreCase(host2))
- {
- if (port1 == port2)
- {
- port2 = -1;
- Message message = ERR_REPLICATION_ENABLE_SAME_SERVER_PORT.get(
- host1, String.valueOf(port1));
- println();
- println(message);
- println();
- error = true;
- }
- }
-
- if (!error)
- {
- ctx2 = createInitialLdapContextInteracting(ci);
-
- if (ctx2 == null)
- {
- cancelled = true;
- }
- }
- }
- catch (ClientException ce)
- {
- LOG.log(Level.WARNING, "Client exception "+ce);
- println();
- println(ce.getMessageObject());
- println();
- resetConnectionArguments();
- }
- catch (ArgumentException ae)
- {
- LOG.log(Level.WARNING, "Argument exception "+ae);
- println();
- println(ae.getMessageObject());
- println();
- cancelled = true;
- }
- }
-
- if (!cancelled)
- {
- uData.setHostName2(host2);
- uData.setPort2(port2);
- uData.setBindDn2(bindDn2);
- uData.setPwd2(pwd2);
- uData.setUseSSL2(useSSL2);
- uData.setUseStartTLS2(useStartTLS2);
- }
-
- int replicationPort2 = -1;
- boolean secureReplication2 = argParser.isSecureReplication2();
- if (ctx2 != null)
- {
- if (!hasReplicationPort(ctx2))
- {
- boolean tryWithDefault = argParser.getReplicationPort2() != -1;
- while (replicationPort2 == -1)
- {
- if (tryWithDefault)
- {
- replicationPort2 = argParser.getReplicationPort2();
- tryWithDefault = false;
- }
- else
- {
- replicationPort2 = askPort(
- INFO_REPLICATION_ENABLE_REPLICATIONPORT2_PROMPT.get(),
- argParser.getDefaultReplicationPort2());
- println();
- }
- if (!argParser.skipReplicationPortCheck() && isLocalHost(host2))
- {
- if (!SetupUtils.canUseAsPort(replicationPort2))
- {
- println();
- println(getCannotBindToPortError(replicationPort2));
- println();
- replicationPort2 = -1;
- }
- }
- else
- {
- // This is something that we must do in any case... this test is
- // already included when we call SetupUtils.canUseAsPort
- if (replicationPort2 == port2)
- {
- println();
- println(
- ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
- host2, String.valueOf(replicationPort2)));
- replicationPort2 = -1;
- }
- }
- if (host1.equalsIgnoreCase(host2))
- {
- if ((replicationPort1 > 0) &&
- (replicationPort1 == replicationPort2))
- {
- println();
- println(ERR_REPLICATION_SAME_REPLICATION_PORT.get(
- String.valueOf(replicationPort2), host1));
- println();
- replicationPort2 = -1;
- }
- }
- }
- if (!secureReplication2)
- {
- try
- {
- secureReplication2 =
- askConfirmation(INFO_REPLICATION_ENABLE_SECURE2_PROMPT.get(
- String.valueOf(replicationPort2)), false, LOG);
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- println();
- }
- }
- // If the server contains an ADS. Try to load it and only load it: if
- // there are issues with the ADS they will be encountered in the
- // enableReplication(EnableReplicationUserData) method. Here we have
- // to load the ADS to ask the user to accept the certificates.
- InitialLdapContext[] aux = new InitialLdapContext[] {ctx2};
- cancelled = !loadADSAndAcceptCertificates(aux, uData, false);
- ctx2 = aux[0];
- if (!cancelled)
- {
- administratorDefined |= hasAdministrator(ctx2);
- }
- }
- uData.setReplicationPort2(replicationPort2);
- uData.setSecureReplication2(secureReplication2);
-
- // If the adminUid and adminPwd are not set in the EnableReplicationUserData
- // object, that means that there are no administrators and that they
- // must be created. The adminUId and adminPwd are updated inside
- // loadADSAndAcceptCertificates.
- boolean promptedForAdmin = false;
-
- // There is a case where we haven't had need for the administrator
- // credentials even if the administrators are defined: where all the servers
- // can be accessed with another user (for instance if all the server have
- // defined cn=directory manager and all the entries have the same password).
- if (!cancelled && (uData.getAdminUid() == null) && !administratorDefined)
- {
- if (adminUid == null)
- {
- println(INFO_REPLICATION_ENABLE_ADMINISTRATOR_MUST_BE_CREATED.get());
- promptedForAdmin = true;
- adminUid= askForAdministratorUID(
- argParser.getDefaultAdministratorUID());
- println();
- }
- uData.setAdminUid(adminUid);
- }
-
- if (uData.getAdminPwd() == null)
- {
- uData.setAdminPwd(adminPwd);
- }
- if (!cancelled && (uData.getAdminPwd() == null) && !administratorDefined)
- {
- adminPwd = null;
- while (adminPwd == null)
- {
- if (!promptedForAdmin)
- {
- println();
- println(INFO_REPLICATION_ENABLE_ADMINISTRATOR_MUST_BE_CREATED.get());
- println();
- }
- while (adminPwd == null)
- {
- adminPwd = askForAdministratorPwd();
- println();
- }
- String adminPwdConfirm = null;
- while (adminPwdConfirm == null)
- {
- adminPwdConfirm =
- readPassword(INFO_ADMINISTRATOR_PWD_CONFIRM_PROMPT.get(), LOG);
- println();
- }
- if (!adminPwd.equals(adminPwdConfirm))
- {
- println();
- println(ERR_ADMINISTRATOR_PWD_DO_NOT_MATCH.get());
- println();
- adminPwd = null;
- }
- }
- uData.setAdminPwd(adminPwd);
- }
-
- if (!cancelled)
- {
- LinkedList<String> suffixes = argParser.getBaseDNs();
- checkSuffixesForEnableReplication(suffixes, ctx1, ctx2, true);
- cancelled = suffixes.isEmpty();
-
- uData.setBaseDNs(suffixes);
- }
-
- if (ctx1 != null)
- {
- try
- {
- ctx1.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- if (ctx2 != null)
- {
- try
- {
- ctx2.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- uData.setReplicateSchema(!argParser.noSchemaReplication());
-
- return !cancelled;
- }
-
- /**
- * Updates the contents of the provided DisableReplicationUserData object
- * with the information provided in the command-line. If some information
- * is missing, ask the user to provide valid data.
- * We assume that if this method is called we are in interactive mode.
- * @param uData the object to be updated.
- * @return <CODE>true</CODE> if the object was successfully updated and
- * <CODE>false</CODE> if the user cancelled the operation.
- * @throws ReplicationCliException if there is a critical error reading the
- * ADS.
- */
- private boolean promptIfRequired(DisableReplicationUserData uData)
- throws ReplicationCliException
- {
- boolean cancelled = false;
-
- String adminPwd = argParser.getBindPasswordAdmin();
- String adminUid = argParser.getAdministratorUID();
- String bindDn = argParser.getBindDNToDisable();
-
- // This is done because we want to ask explicitly for this
-
- String host = argParser.getHostNameToDisable();
- int port = argParser.getPortToDisable();
- boolean useSSL = argParser.useSSLToDisable();
- boolean useStartTLS = argParser.useStartTLSToDisable();
-
- /*
- * Try to connect to the server.
- */
- InitialLdapContext ctx = null;
-
- while ((ctx == null) && !cancelled)
- {
- try
- {
- ci.setUseAdminOrBindDn(true);
- ci.run();
- useSSL = ci.useSSL();
- useStartTLS = ci.useStartTLS();
- host = ci.getHostName();
- port = ci.getPortNumber();
- bindDn = ci.getProvidedBindDN();
- adminUid = ci.getProvidedAdminUID();
- adminPwd = ci.getBindPassword();
-
- ctx = createInitialLdapContextInteracting(ci);
-
- if (ctx == null)
- {
- cancelled = true;
- }
- }
- catch (ClientException ce)
- {
- LOG.log(Level.WARNING, "Client exception "+ce);
- println();
- println(ce.getMessageObject());
- println();
- resetConnectionArguments();
- }
- catch (ArgumentException ae)
- {
- LOG.log(Level.WARNING, "Argument exception "+ae);
- println();
- println(ae.getMessageObject());
- println();
- cancelled = true;
- }
- }
-
- if (!cancelled)
- {
- uData.setHostName(host);
- uData.setPort(port);
- uData.setUseSSL(useSSL);
- uData.setUseStartTLS(useStartTLS);
- uData.setAdminUid(adminUid);
- uData.setBindDn(bindDn);
- uData.setAdminPwd(adminPwd);
- }
- if ((ctx != null) && (adminUid != null))
- {
- // If the server contains an ADS, try to load it and only load it: if
- // there are issues with the ADS they will be encountered in the
- // disableReplication(DisableReplicationUserData) method. Here we have
- // to load the ADS to ask the user to accept the certificates and
- // eventually admin authentication data.
- InitialLdapContext[] aux = new InitialLdapContext[] {ctx};
- cancelled = !loadADSAndAcceptCertificates(aux, uData, false);
- ctx = aux[0];
- }
-
- if (!cancelled)
- {
- LinkedList<String> suffixes = argParser.getBaseDNs();
- checkSuffixesForDisableReplication(suffixes, ctx, true);
- cancelled = suffixes.isEmpty();
-
- uData.setBaseDNs(suffixes);
- }
-
- if (!cancelled)
- {
- // Ask for confirmation to disable.
- boolean disableADS = false;
- boolean disableSchema = false;
- for (String dn : uData.getBaseDNs())
- {
- if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn))
- {
- disableADS = true;
- }
- else if (Utils.areDnsEqual(Constants.SCHEMA_DN, dn))
- {
- disableSchema = true;
- }
- }
- if (disableADS)
- {
- println();
- try
- {
- cancelled = !askConfirmation(INFO_REPLICATION_CONFIRM_DISABLE_ADS.get(
- ADSContext.getAdministrationSuffixDN()), true, LOG);
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- println();
- }
- if (disableSchema)
- {
- println();
- try
- {
- cancelled = !askConfirmation(
- INFO_REPLICATION_CONFIRM_DISABLE_SCHEMA.get(), true, LOG);
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- println();
- }
- if (!disableSchema && !disableADS)
- {
- println();
- try
- {
- if (disableAllBaseDns(ctx, uData))
- {
- cancelled = !askConfirmation(
- INFO_REPLICATION_CONFIRM_DISABLE_LAST_SUFFIXES.get(), true,
- LOG);
- }
- else
- {
- cancelled = !askConfirmation(
- INFO_REPLICATION_CONFIRM_DISABLE_GENERIC.get(), true, LOG);
- }
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- println();
- }
- }
-
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- return !cancelled;
- }
-
- /**
- * Updates the contents of the provided InitializeAllReplicationUserData
- * object with the information provided in the command-line. If some
- * information is missing, ask the user to provide valid data.
- * We assume that if this method is called we are in interactive mode.
- * @param uData the object to be updated.
- * @return <CODE>true</CODE> if the object was successfully updated and
- * <CODE>false</CODE> if the user cancelled the operation.
- */
- private boolean promptIfRequired(InitializeAllReplicationUserData uData)
- {
- boolean cancelled = false;
-
- String adminPwd = argParser.getBindPasswordAdmin();
- String adminUid = argParser.getAdministratorUID();
-
- String host = argParser.getHostNameToInitializeAll();
- int port = argParser.getPortToInitializeAll();
- boolean useSSL = argParser.useSSLToInitializeAll();
- boolean useStartTLS = argParser.useStartTLSToInitializeAll();
-
- /*
- * Try to connect to the server.
- */
- InitialLdapContext ctx = null;
-
- while ((ctx == null) && !cancelled)
- {
- try
- {
- ci.setHeadingMessage(
- INFO_REPLICATION_INITIALIZE_SOURCE_CONNECTION_PARAMETERS.get());
- ci.run();
- useSSL = ci.useSSL();
- useStartTLS = ci.useStartTLS();
- host = ci.getHostName();
- port = ci.getPortNumber();
- adminUid = ci.getAdministratorUID();
- adminPwd = ci.getBindPassword();
-
- ctx = createInitialLdapContextInteracting(ci);
-
- if (ctx == null)
- {
- cancelled = true;
- }
- }
- catch (ClientException ce)
- {
- LOG.log(Level.WARNING, "Client exception "+ce);
- println();
- println(ce.getMessageObject());
- println();
- resetConnectionArguments();
- }
- catch (ArgumentException ae)
- {
- LOG.log(Level.WARNING, "Argument exception "+ae);
- println();
- println(ae.getMessageObject());
- println();
- cancelled = true;
- }
- }
- if (!cancelled)
- {
- uData.setHostName(host);
- uData.setPort(port);
- uData.setUseSSL(useSSL);
- uData.setUseStartTLS(useStartTLS);
- uData.setAdminUid(adminUid);
- uData.setAdminPwd(adminPwd);
- }
-
- if (!cancelled)
- {
- LinkedList<String> suffixes = argParser.getBaseDNs();
- checkSuffixesForInitializeReplication(suffixes, ctx, true);
- cancelled = suffixes.isEmpty();
-
- uData.setBaseDNs(suffixes);
- }
-
- if (!cancelled)
- {
- // Ask for confirmation to initialize.
- boolean initializeADS = false;
- for (String dn : uData.getBaseDNs())
- {
- if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn))
- {
- initializeADS = true;
- }
- }
- String hostPortSource = ConnectionUtils.getHostPort(ctx);
- if (initializeADS)
- {
- println();
- try
- {
- cancelled = !askConfirmation(
- INFO_REPLICATION_CONFIRM_INITIALIZE_ALL_ADS.get(
- ADSContext.getAdministrationSuffixDN(), hostPortSource), true,
- LOG);
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- println();
- }
- else
- {
- println();
- try
- {
- cancelled = !askConfirmation(
- INFO_REPLICATION_CONFIRM_INITIALIZE_ALL_GENERIC.get(
- hostPortSource), true, LOG);
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- println();
- }
- }
-
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- return !cancelled;
- }
-
- /**
- * Updates the contents of the provided PreExternalInitializationUserData
- * object with the information provided in the command-line. If some
- * information is missing, ask the user to provide valid data.
- * We assume that if this method is called we are in interactive mode.
- * @param uData the object to be updated.
- * @return <CODE>true</CODE> if the object was successfully updated and
- * <CODE>false</CODE> if the user cancelled the operation.
- */
- private boolean promptIfRequired(PreExternalInitializationUserData uData)
- {
- boolean cancelled = false;
-
- String adminPwd = argParser.getBindPasswordAdmin();
- String adminUid = argParser.getAdministratorUID();
-
- String host = argParser.getHostNameToInitializeAll();
- int port = argParser.getPortToInitializeAll();
- boolean useSSL = argParser.useSSLToInitializeAll();
- boolean useStartTLS = argParser.useStartTLSToInitializeAll();
-
- /*
- * Try to connect to the server.
- */
- InitialLdapContext ctx = null;
-
- while ((ctx == null) && !cancelled)
- {
- try
- {
- ci.run();
- useSSL = ci.useSSL();
- useStartTLS = ci.useStartTLS();
- host = ci.getHostName();
- port = ci.getPortNumber();
- adminUid = ci.getAdministratorUID();
- adminPwd = ci.getBindPassword();
-
- ctx = createInitialLdapContextInteracting(ci);
-
- if (ctx == null)
- {
- cancelled = true;
- }
- }
- catch (ClientException ce)
- {
- LOG.log(Level.WARNING, "Client exception "+ce);
- println();
- println(ce.getMessageObject());
- println();
- resetConnectionArguments();
- }
- catch (ArgumentException ae)
- {
- LOG.log(Level.WARNING, "Argument exception "+ae);
- println();
- println(ae.getMessageObject());
- println();
- cancelled = true;
- }
- }
- if (!cancelled)
- {
- boolean localOnly = false;
- if (!argParser.isExternalInitializationLocalOnly())
- {
- println();
- try
- {
- localOnly = askConfirmation(
- INFO_REPLICATION_PRE_EXTERNAL_INITIALIZATION_LOCAL_PROMPT.get(
- ConnectionUtils.getHostPort(ctx)), false, LOG);
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- }
- else
- {
- localOnly = true;
- }
- uData.setLocalOnly(localOnly);
-
- uData.setHostName(host);
- uData.setPort(port);
- uData.setUseSSL(useSSL);
- uData.setUseStartTLS(useStartTLS);
- uData.setAdminUid(adminUid);
- uData.setAdminPwd(adminPwd);
- }
-
- if (!cancelled)
- {
- LinkedList<String> suffixes = argParser.getBaseDNs();
- checkSuffixesForInitializeReplication(suffixes, ctx, true);
- cancelled = suffixes.isEmpty();
-
- uData.setBaseDNs(suffixes);
- }
-
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- return !cancelled;
- }
-
- /**
- * Updates the contents of the provided PostExternalInitializationUserData
- * object with the information provided in the command-line. If some
- * information is missing, ask the user to provide valid data.
- * We assume that if this method is called we are in interactive mode.
- * @param uData the object to be updated.
- * @return <CODE>true</CODE> if the object was successfully updated and
- * <CODE>false</CODE> if the user cancelled the operation.
- */
- private boolean promptIfRequired(PostExternalInitializationUserData uData)
- {
- boolean cancelled = false;
-
- String adminPwd = argParser.getBindPasswordAdmin();
- String adminUid = argParser.getAdministratorUID();
-
- String host = argParser.getHostNameToInitializeAll();
- int port = argParser.getPortToInitializeAll();
- boolean useSSL = argParser.useSSLToInitializeAll();
- boolean useStartTLS = argParser.useStartTLSToInitializeAll();
-
- /*
- * Try to connect to the server.
- */
- InitialLdapContext ctx = null;
-
- while ((ctx == null) && !cancelled)
- {
- try
- {
- ci.run();
- useSSL = ci.useSSL();
- useStartTLS = ci.useStartTLS();
- host = ci.getHostName();
- port = ci.getPortNumber();
- adminUid = ci.getAdministratorUID();
- adminPwd = ci.getBindPassword();
-
- ctx = createInitialLdapContextInteracting(ci);
-
- if (ctx == null)
- {
- cancelled = true;
- }
- }
- catch (ClientException ce)
- {
- LOG.log(Level.WARNING, "Client exception "+ce);
- println();
- println(ce.getMessageObject());
- println();
- resetConnectionArguments();
- }
- catch (ArgumentException ae)
- {
- LOG.log(Level.WARNING, "Argument exception "+ae);
- println();
- println(ae.getMessageObject());
- println();
- cancelled = true;
- }
- }
- if (!cancelled)
- {
- uData.setHostName(host);
- uData.setPort(port);
- uData.setUseSSL(useSSL);
- uData.setUseStartTLS(useStartTLS);
- uData.setAdminUid(adminUid);
- uData.setAdminPwd(adminPwd);
- }
-
- if (!cancelled)
- {
- LinkedList<String> suffixes = argParser.getBaseDNs();
- checkSuffixesForInitializeReplication(suffixes, ctx, true);
- cancelled = suffixes.isEmpty();
-
- uData.setBaseDNs(suffixes);
- }
-
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- return !cancelled;
- }
-
- /**
- * Updates the contents of the provided StatusReplicationUserData object
- * with the information provided in the command-line. If some information
- * is missing, ask the user to provide valid data.
- * We assume that if this method is called we are in interactive mode.
- * @param uData the object to be updated.
- * @return <CODE>true</CODE> if the object was successfully updated and
- * <CODE>false</CODE> if the user cancelled the operation.
- * @throws ReplicationCliException if a critical error occurs reading the
- * ADS.
- */
- private boolean promptIfRequired(StatusReplicationUserData uData)
- throws ReplicationCliException
- {
- boolean cancelled = false;
-
- String adminPwd = argParser.getBindPasswordAdmin();
- String adminUid = argParser.getAdministratorUID();
-
- String host = argParser.getHostNameToStatus();
- int port = argParser.getPortToStatus();
- boolean useSSL = argParser.useSSLToStatus();
- boolean useStartTLS = argParser.useStartTLSToStatus();
-
- /*
- * Try to connect to the server.
- */
- InitialLdapContext ctx = null;
-
- while ((ctx == null) && !cancelled)
- {
- try
- {
- ci.run();
- useSSL = ci.useSSL();
- useStartTLS = ci.useStartTLS();
- host = ci.getHostName();
- port = ci.getPortNumber();
- adminUid = ci.getAdministratorUID();
- adminPwd = ci.getBindPassword();
-
- ctx = createInitialLdapContextInteracting(ci);
-
- if (ctx == null)
- {
- cancelled = true;
- }
- }
- catch (ClientException ce)
- {
- LOG.log(Level.WARNING, "Client exception "+ce);
- println();
- println(ce.getMessageObject());
- println();
- resetConnectionArguments();
- }
- catch (ArgumentException ae)
- {
- LOG.log(Level.WARNING, "Argument exception "+ae);
- println();
- println(ae.getMessageObject());
- println();
- cancelled = true;
- }
- }
- if (!cancelled)
- {
- uData.setHostName(host);
- uData.setPort(port);
- uData.setUseSSL(useSSL);
- uData.setUseStartTLS(useStartTLS);
- uData.setAdminUid(adminUid);
- uData.setAdminPwd(adminPwd);
- uData.setScriptFriendly(argParser.isScriptFriendly());
- }
- if (ctx != null)
- {
- // If the server contains an ADS, try to load it and only load it: if
- // there are issues with the ADS they will be encountered in the
- // statusReplication(StatusReplicationUserData) method. Here we have
- // to load the ADS to ask the user to accept the certificates and
- // eventually admin authentication data.
- InitialLdapContext[] aux = new InitialLdapContext[] {ctx};
- cancelled = !loadADSAndAcceptCertificates(aux, uData, false);
- ctx = aux[0];
- }
-
- if (!cancelled)
- {
- LinkedList<String> suffixes = argParser.getBaseDNs();
- uData.setBaseDNs(suffixes);
- }
-
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- return !cancelled;
- }
-
- /**
- * Updates the contents of the provided InitializeReplicationUserData object
- * with the information provided in the command-line. If some information
- * is missing, ask the user to provide valid data.
- * We assume that if this method is called we are in interactive mode.
- * @param uData the object to be updated.
- * @return <CODE>true</CODE> if the object was successfully updated and
- * <CODE>false</CODE> if the user cancelled the operation.
- */
- private boolean promptIfRequired(InitializeReplicationUserData uData)
- {
- boolean cancelled = false;
-
- String adminPwd = argParser.getBindPasswordAdmin();
- String adminUid = argParser.getAdministratorUID();
-
- String hostSource = argParser.getHostNameSource();
- int portSource = argParser.getPortSource();
- boolean useSSLSource = argParser.useSSLSource();
- boolean useStartTLSSource = argParser.useStartTLSSource();
-
- initializeGlobalArguments(hostSource, portSource, useSSLSource,
- useStartTLSSource, adminUid, null, adminPwd);
- /*
- * Try to connect to the source server.
- */
- InitialLdapContext ctxSource = null;
-
- while ((ctxSource == null) && !cancelled)
- {
- try
- {
- ci.setHeadingMessage(
- INFO_REPLICATION_INITIALIZE_SOURCE_CONNECTION_PARAMETERS.get());
- ci.run();
- useSSLSource = ci.useSSL();
- useStartTLSSource = ci.useStartTLS();
- hostSource = ci.getHostName();
- portSource = ci.getPortNumber();
- adminUid = ci.getAdministratorUID();
- adminPwd = ci.getBindPassword();
-
- ctxSource = createInitialLdapContextInteracting(ci);
-
- if (ctxSource == null)
- {
- cancelled = true;
- }
- }
- catch (ClientException ce)
- {
- LOG.log(Level.WARNING, "Client exception "+ce);
- println();
- println(ce.getMessageObject());
- println();
- resetConnectionArguments();
- }
- catch (ArgumentException ae)
- {
- LOG.log(Level.WARNING, "Argument exception "+ae);
- println();
- println(ae.getMessageObject());
- println();
- cancelled = true;
- }
- }
- if (!cancelled)
- {
- uData.setHostNameSource(hostSource);
- uData.setPortSource(portSource);
- uData.setUseSSLSource(useSSLSource);
- uData.setUseStartTLSSource(useStartTLSSource);
- uData.setAdminUid(adminUid);
- uData.setAdminPwd(adminPwd);
- }
-
- /* Prompt for destination server credentials */
- String hostDestination = argParser.getHostNameDestination();
- int portDestination = argParser.getPortDestination();
- boolean useSSLDestination = argParser.useSSLDestination();
- boolean useStartTLSDestination = argParser.useStartTLSDestination();
-
- initializeGlobalArguments(hostDestination, portDestination,
- useSSLDestination, useStartTLSDestination, adminUid, null, adminPwd);
- /*
- * Try to connect to the destination server.
- */
- InitialLdapContext ctxDestination = null;
-
- ci.resetHeadingDisplayed();
- while ((ctxDestination == null) && !cancelled)
- {
- try
- {
- ci.setHeadingMessage(
- INFO_REPLICATION_INITIALIZE_DESTINATION_CONNECTION_PARAMETERS.get());
- ci.run();
- useSSLDestination = ci.useSSL();
- useStartTLSDestination = ci.useStartTLS();
- hostDestination = ci.getHostName();
- portDestination = ci.getPortNumber();
-
- ctxDestination = createInitialLdapContextInteracting(ci);
-
- if (ctxDestination == null)
- {
- cancelled = true;
- }
- }
- catch (ClientException ce)
- {
- LOG.log(Level.WARNING, "Client exception "+ce);
- println();
- println(ce.getMessageObject());
- println();
- resetConnectionArguments();
- }
- catch (ArgumentException ae)
- {
- LOG.log(Level.WARNING, "Argument exception "+ae);
- println();
- println(ae.getMessageObject());
- println();
- cancelled = true;
- }
- } if (!cancelled)
- {
- uData.setHostNameDestination(hostDestination);
- uData.setPortDestination(portDestination);
- uData.setUseSSLDestination(useSSLDestination);
- uData.setUseStartTLSDestination(useStartTLSDestination);
- }
-
- if (!cancelled)
- {
- LinkedList<String> suffixes = argParser.getBaseDNs();
- checkSuffixesForInitializeReplication(suffixes, ctxSource, ctxDestination,
- true);
- cancelled = suffixes.isEmpty();
-
- uData.setBaseDNs(suffixes);
- }
-
- if (!cancelled)
- {
- // Ask for confirmation to initialize.
- boolean initializeADS = false;
- for (String dn : uData.getBaseDNs())
- {
- if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn))
- {
- initializeADS = true;
- break;
- }
- }
- String hostPortSource = ConnectionUtils.getHostPort(ctxSource);
- String hostPortDestination = ConnectionUtils.getHostPort(ctxDestination);
-
- if (initializeADS)
- {
- println();
- try
- {
- cancelled = !askConfirmation(
- INFO_REPLICATION_CONFIRM_INITIALIZE_ADS.get(
- ADSContext.getAdministrationSuffixDN(), hostPortDestination,
- hostPortSource), true, LOG);
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- println();
- }
- else
- {
- println();
- try
- {
- cancelled = !askConfirmation(
- INFO_REPLICATION_CONFIRM_INITIALIZE_GENERIC.get(
- hostPortDestination, hostPortSource), true, LOG);
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- println();
- }
- }
-
- if (ctxSource != null)
- {
- try
- {
- ctxSource.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- if (ctxDestination != null)
- {
- try
- {
- ctxDestination.close();
- }
- catch (Throwable t)
- {
- }
- }
- return !cancelled;
- }
-
- /**
- * Commodity method that simply checks if a provided value is null or not,
- * if it is not <CODE>null</CODE> returns it and if it is <CODE>null</CODE>
- * returns the provided default value.
- * @param v the value to analyze.
- * @param defaultValue the default value.
- * @return if the provided value is not <CODE>null</CODE> returns it and if it
- * is <CODE>null</CODE> returns the provided default value.
- */
- private String getValue(String v, String defaultValue)
- {
- if (v != null)
- {
- return v;
- }
- else
- {
- return defaultValue;
- }
- }
-
- /**
- * Commodity method that simply checks if a provided value is -1 or not,
- * if it is not -1 returns it and if it is -1 returns the provided default
- * value.
- * @param v the value to analyze.
- * @param defaultValue the default value.
- * @return if the provided value is not -1 returns it and if it is -1 returns
- * the provided default value.
- */
- private int getValue(int v, int defaultValue)
- {
- if (v != -1)
- {
- return v;
- }
- else
- {
- return defaultValue;
- }
- }
-
- /**
- * Returns the trust manager to be used by this application.
- * @return the trust manager to be used by this application.
- */
- private ApplicationTrustManager getTrustManager()
- {
- ApplicationTrustManager trust;
- if (isInteractive())
- {
- TrustManager t = ci.getTrustManager();
- if (t == null)
- {
- trust = null;
- }
- else if (t instanceof ApplicationTrustManager)
- {
- trust = (ApplicationTrustManager)t;
- }
- else
- {
- trust = new ApplicationTrustManager(ci.getKeyStore());
- }
- }
- else
- {
- trust = argParser.getTrustManager();
- }
- return trust;
- }
-
- /**
- * Initializes the contents of the provided enable replication user data
- * object with what was provided in the command-line without prompting to the
- * user.
- * @param uData the enable replication user data object to be initialized.
- */
- private void initializeWithArgParser(EnableReplicationUserData uData)
- {
- uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
- String adminUid = getValue(argParser.getAdministratorUID(),
- argParser.getDefaultAdministratorUID());
- uData.setAdminUid(adminUid);
- String adminPwd = argParser.getBindPasswordAdmin();
- uData.setAdminPwd(adminPwd);
-
- String host1Name = getValue(argParser.getHostName1(),
- argParser.getDefaultHostName1());
- uData.setHostName1(host1Name);
- int port1 = getValue(argParser.getPort1(),
- argParser.getDefaultPort1());
- uData.setPort1(port1);
- uData.setUseSSL1(argParser.useSSL1());
- uData.setUseStartTLS1(argParser.useStartTLS1());
- String pwd1 = argParser.getBindPassword1();
- if (pwd1 == null)
- {
- uData.setBindDn1(ADSContext.getAdministratorDN(adminUid));
- uData.setPwd1(adminPwd);
- }
- else
- {
- // Best-effort: try to use admin, if it does not work, use bind DN.
- try
- {
- InitialLdapContext ctx = createAdministrativeContext(
- uData.getHostName1(), uData.getPort1(), uData.useSSL1(),
- uData.useStartTLS1(), ADSContext.getAdministratorDN(adminUid),
- adminPwd, getTrustManager());
- uData.setBindDn1(ADSContext.getAdministratorDN(adminUid));
- uData.setPwd1(adminPwd);
- ctx.close();
- }
- catch (Throwable t)
- {
- String bindDn = getValue(argParser.getBindDn1(),
- argParser.getDefaultBindDn1());
- uData.setBindDn1(bindDn);
- uData.setPwd1(pwd1);
- }
- }
- int replicationPort1 = getValue(argParser.getReplicationPort1(),
- argParser.getDefaultReplicationPort1());
- uData.setReplicationPort1(replicationPort1);
- uData.setSecureReplication1(argParser.isSecureReplication1());
-
- String host2Name = getValue(argParser.getHostName2(),
- argParser.getDefaultHostName2());
- uData.setHostName2(host2Name);
- int port2 = getValue(argParser.getPort2(),
- argParser.getDefaultPort2());
- uData.setPort2(port2);
- uData.setUseSSL2(argParser.useSSL2());
- uData.setUseStartTLS2(argParser.useStartTLS2());
- String pwd2 = argParser.getBindPassword2();
- if (pwd2 == null)
- {
- uData.setBindDn2(ADSContext.getAdministratorDN(adminUid));
- uData.setPwd2(adminPwd);
- }
- else
- {
- // Best-effort: try to use admin, if it does not work, use bind DN.
- try
- {
- InitialLdapContext ctx = createAdministrativeContext(
- uData.getHostName2(), uData.getPort2(), uData.useSSL2(),
- uData.useStartTLS2(), ADSContext.getAdministratorDN(adminUid),
- adminPwd, getTrustManager());
- uData.setBindDn2(ADSContext.getAdministratorDN(adminUid));
- uData.setPwd2(adminPwd);
- ctx.close();
- }
- catch (Throwable t)
- {
- String bindDn = getValue(argParser.getBindDn2(),
- argParser.getDefaultBindDn2());
- uData.setBindDn2(bindDn);
- uData.setPwd2(pwd2);
- }
- }
- int replicationPort2 = getValue(argParser.getReplicationPort2(),
- argParser.getDefaultReplicationPort2());
- uData.setReplicationPort2(replicationPort2);
- uData.setSecureReplication2(argParser.isSecureReplication2());
- uData.setReplicateSchema(!argParser.noSchemaReplication());
- }
-
- /**
- * Initializes the contents of the provided initialize replication user data
- * object with what was provided in the command-line without prompting to the
- * user.
- * @param uData the initialize replication user data object to be initialized.
- */
- private void initializeWithArgParser(InitializeReplicationUserData uData)
- {
- uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
- String adminUid = getValue(argParser.getAdministratorUID(),
- argParser.getDefaultAdministratorUID());
- uData.setAdminUid(adminUid);
- String adminPwd = argParser.getBindPasswordAdmin();
- uData.setAdminPwd(adminPwd);
-
- String hostNameSource = getValue(argParser.getHostNameSource(),
- argParser.getDefaultHostNameSource());
- uData.setHostNameSource(hostNameSource);
- int portSource = getValue(argParser.getPortSource(),
- argParser.getDefaultPortSource());
- uData.setPortSource(portSource);
- uData.setUseSSLSource(argParser.useSSLSource());
- uData.setUseStartTLSSource(argParser.useStartTLSSource());
-
- String hostNameDestination = getValue(
- argParser.getHostNameDestination(),
- argParser.getDefaultHostNameDestination());
- uData.setHostNameDestination(hostNameDestination);
- int portDestination = getValue(argParser.getPortDestination(),
- argParser.getDefaultPortDestination());
- uData.setPortDestination(portDestination);
- uData.setUseSSLDestination(argParser.useSSLDestination());
- uData.setUseStartTLSDestination(argParser.useStartTLSDestination());
- }
-
- /**
- * Initializes the contents of the provided disable replication user data
- * object with what was provided in the command-line without prompting to the
- * user.
- * @param uData the disable replication user data object to be initialized.
- */
- private void initializeWithArgParser(DisableReplicationUserData uData)
- {
- uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
- String adminUid = argParser.getAdministratorUID();
- String bindDn = argParser.getBindDN();
- if ((bindDn == null) && (adminUid == null))
- {
- adminUid = argParser.getDefaultAdministratorUID();
- }
- uData.setAdminUid(adminUid);
- uData.setBindDn(bindDn);
- String adminPwd = argParser.getBindPasswordAdmin();
- uData.setAdminPwd(adminPwd);
-
- String hostName = getValue(argParser.getHostNameToDisable(),
- argParser.getDefaultHostNameToDisable());
- uData.setHostName(hostName);
- int port = getValue(argParser.getPortToDisable(),
- argParser.getDefaultPortToDisable());
- uData.setPort(port);
- uData.setUseSSL(argParser.useSSLToDisable());
- uData.setUseStartTLS(argParser.useStartTLSToDisable());
- }
-
- /**
- * Initializes the contents of the provided initialize all replication user
- * data object with what was provided in the command-line without prompting to
- * the user.
- * @param uData the initialize all replication user data object to be
- * initialized.
- */
- private void initializeWithArgParser(InitializeAllReplicationUserData uData)
- {
- uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
- String adminUid = getValue(argParser.getAdministratorUID(),
- argParser.getDefaultAdministratorUID());
- uData.setAdminUid(adminUid);
- String adminPwd = argParser.getBindPasswordAdmin();
- uData.setAdminPwd(adminPwd);
-
- String hostName = getValue(argParser.getHostNameToInitializeAll(),
- argParser.getDefaultHostNameToInitializeAll());
- uData.setHostName(hostName);
- int port = getValue(argParser.getPortToInitializeAll(),
- argParser.getDefaultPortToInitializeAll());
- uData.setPort(port);
- uData.setUseSSL(argParser.useSSLToInitializeAll());
- uData.setUseStartTLS(argParser.useStartTLSToInitializeAll());
- }
-
- /**
- * Initializes the contents of the provided pre external replication user
- * data object with what was provided in the command-line without prompting to
- * the user.
- * @param uData the pre external replication user data object to be
- * initialized.
- */
- private void initializeWithArgParser(PreExternalInitializationUserData uData)
- {
- uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
- String adminUid = getValue(argParser.getAdministratorUID(),
- argParser.getDefaultAdministratorUID());
- uData.setAdminUid(adminUid);
- String adminPwd = argParser.getBindPasswordAdmin();
- uData.setAdminPwd(adminPwd);
-
- String hostName = getValue(argParser.getHostNameToInitializeAll(),
- argParser.getDefaultHostNameToInitializeAll());
- uData.setHostName(hostName);
- int port = getValue(argParser.getPortToInitializeAll(),
- argParser.getDefaultPortToInitializeAll());
- uData.setPort(port);
- uData.setUseSSL(argParser.useSSLToInitializeAll());
- uData.setUseStartTLS(argParser.useStartTLSToInitializeAll());
- uData.setLocalOnly(argParser.isExternalInitializationLocalOnly());
- }
-
- /**
- * Initializes the contents of the provided post external replication user
- * data object with what was provided in the command-line without prompting to
- * the user.
- * @param uData the pre external replication user data object to be
- * initialized.
- */
- private void initializeWithArgParser(PostExternalInitializationUserData uData)
- {
- uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
- String adminUid = getValue(argParser.getAdministratorUID(),
- argParser.getDefaultAdministratorUID());
- uData.setAdminUid(adminUid);
- String adminPwd = argParser.getBindPasswordAdmin();
- uData.setAdminPwd(adminPwd);
-
- String hostName = getValue(argParser.getHostNameToInitializeAll(),
- argParser.getDefaultHostNameToInitializeAll());
- uData.setHostName(hostName);
- int port = getValue(argParser.getPortToInitializeAll(),
- argParser.getDefaultPortToInitializeAll());
- uData.setPort(port);
- uData.setUseSSL(argParser.useSSLToInitializeAll());
- uData.setUseStartTLS(argParser.useStartTLSToInitializeAll());
- }
-
-
- /**
- * Initializes the contents of the provided status replication user data
- * object with what was provided in the command-line without prompting to the
- * user.
- * @param uData the disable replication user data object to be initialized.
- */
- private void initializeWithArgParser(StatusReplicationUserData uData)
- {
- uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
- String adminUid = getValue(argParser.getAdministratorUID(),
- argParser.getDefaultAdministratorUID());
- uData.setAdminUid(adminUid);
- String adminPwd = argParser.getBindPasswordAdmin();
- uData.setAdminPwd(adminPwd);
-
- String hostName = getValue(argParser.getHostNameToStatus(),
- argParser.getDefaultHostNameToStatus());
- uData.setHostName(hostName);
- int port = getValue(argParser.getPortToStatus(),
- argParser.getDefaultPortToStatus());
- uData.setPort(port);
- uData.setUseSSL(argParser.useSSLToStatus());
- uData.setUseStartTLS(argParser.useStartTLSToStatus());
-
- uData.setScriptFriendly(argParser.isScriptFriendly());
- }
-
- /**
- * Tells whether the server to which the LdapContext is connected has a
- * replication port or not.
- * @param ctx the InitialLdapContext to be used.
- * @return <CODE>true</CODE> if the replication port for the server could
- * be found and <CODE>false</CODE> otherwise.
- */
- private boolean hasReplicationPort(InitialLdapContext ctx)
- {
- return getReplicationPort(ctx) != -1;
- }
-
- /**
- * Returns the replication port of server to which the LdapContext is
- * connected and -1 if the replication port could not be found.
- * @param ctx the InitialLdapContext to be used.
- * @return the replication port of server to which the LdapContext is
- * connected and -1 if the replication port could not be found.
- */
- private int getReplicationPort(InitialLdapContext ctx)
- {
- int replicationPort = -1;
- try
- {
- ManagementContext mCtx = LDAPManagementContext.createFromContext(
- JNDIDirContextAdaptor.adapt(ctx));
- RootCfgClient root = mCtx.getRootConfiguration();
-
- ReplicationSynchronizationProviderCfgClient sync = null;
- sync = (ReplicationSynchronizationProviderCfgClient)
- root.getSynchronizationProvider("Multimaster Synchronization");
- if (sync.hasReplicationServer())
- {
- ReplicationServerCfgClient replicationServer =
- sync.getReplicationServer();
- replicationPort = replicationServer.getReplicationPort();
- }
- }
- catch (Throwable t)
- {
- LOG.log(Level.WARNING,
- "Unexpected error retrieving the replication port: "+t, t);
- }
- return replicationPort;
- }
-
- /**
- * Loads the ADS with the provided context. If there are certificates to
- * be accepted we prompt them to the user. If there are errors loading the
- * servers we display them to the user and we ask for confirmation. If the
- * provided ctx is not using Global Administrator credentials, we prompt the
- * user to provide them and update the provide ReplicationUserData
- * accordingly.
- * @param ctx the Ldap context to be used in an array: note the context
- * may be modified with the new credentials provided by the user.
- * @param uData the ReplicationUserData to be udpated.
- * @param isFirstOrSourceServer whether this is the first server in the
- * enable replication subcommand or the source server in the initialize server
- * subcommand.
- * @throws ReplicationCliException if a critical error occurred.
- * @return <CODE>true</CODE> if everything went fine and the user accepted
- * all the certificates and confirmed everything. Returns <CODE>false</CODE>
- * if the user did not accept a certificate or any of the confirmation
- * messages.
- */
- private boolean loadADSAndAcceptCertificates(InitialLdapContext[] ctx,
- ReplicationUserData uData, boolean isFirstOrSourceServer)
- throws ReplicationCliException
- {
- boolean cancelled = false;
- boolean triedWithUserProvidedAdmin = false;
- String host = ConnectionUtils.getHostName(ctx[0]);
- int port = ConnectionUtils.getPort(ctx[0]);
- boolean isSSL = ConnectionUtils.isSSL(ctx[0]);
- boolean isStartTLS = ConnectionUtils.isStartTLS(ctx[0]);
- if (getTrustManager() == null)
- {
- // This is required when the user did connect to the server using SSL or
- // Start TLS. In this case LDAPConnectionInteraction.run does not
- // initialize the keystore and the trust manager is null.
- forceTrustManagerInitialization();
- }
- try
- {
- ADSContext adsContext = new ADSContext(ctx[0]);
- if (adsContext.hasAdminData())
- {
- boolean reloadTopology = true;
- LinkedList<Message> exceptionMsgs = new LinkedList<Message>();
- while (reloadTopology && !cancelled)
- {
- // We must recreate the cache because the trust manager in the
- // LDAPConnectionConsoleInteraction object might have changed.
-
- TopologyCache cache = new TopologyCache(adsContext,
- getTrustManager());
- cache.getFilter().setSearchMonitoringInformation(false);
- cache.getFilter().setSearchBaseDNInformation(false);
- cache.setPreferredConnections(getPreferredConnections(ctx[0]));
- cache.reloadTopology();
-
- reloadTopology = false;
- exceptionMsgs.clear();
-
- /* Analyze if we had any exception while loading servers. For the
- * moment only throw the exception found if the user did not provide
- * the Administrator DN and this caused a problem authenticating in
- * one server or if there is a certificate problem.
- */
- Set<TopologyCacheException> exceptions =
- new HashSet<TopologyCacheException>();
- Set<ServerDescriptor> servers = cache.getServers();
- for (ServerDescriptor server : servers)
- {
- TopologyCacheException e = server.getLastException();
- if (e != null)
- {
- exceptions.add(e);
- }
- }
- /* Check the exceptions and see if we throw them or not. */
- boolean notGlobalAdministratorError = false;
- for (TopologyCacheException e : exceptions)
- {
- if (notGlobalAdministratorError)
- {
- break;
- }
- switch (e.getType())
- {
- case NOT_GLOBAL_ADMINISTRATOR:
- notGlobalAdministratorError = true;
- boolean connected = false;
-
- String adminUid = uData.getAdminUid();
- String adminPwd = uData.getAdminPwd();
-
- boolean errorDisplayed = false;
- while (!connected)
- {
- if ((!triedWithUserProvidedAdmin) && (adminPwd == null))
- {
- adminUid = getValue(argParser.getAdministratorUID(),
- argParser.getDefaultAdministratorUID());
- adminPwd = argParser.getBindPasswordAdmin();
- triedWithUserProvidedAdmin = true;
- }
- if (adminPwd == null)
- {
- if (!errorDisplayed)
- {
- println();
- println(
- INFO_NOT_GLOBAL_ADMINISTRATOR_PROVIDED.get());
- errorDisplayed = true;
- }
- adminUid = askForAdministratorUID(
- argParser.getDefaultAdministratorUID());
- println();
- adminPwd = askForAdministratorPwd();
- println();
- }
- try
- {
- ctx[0].close();
- }
- catch (Throwable t)
- {
- }
- try
- {
- ctx[0] = createAdministrativeContext(host, port, isSSL,
- isStartTLS, ADSContext.getAdministratorDN(adminUid),
- adminPwd, getTrustManager());
- adsContext = new ADSContext(ctx[0]);
- cache = new TopologyCache(adsContext, getTrustManager());
- cache.getFilter().setSearchMonitoringInformation(false);
- cache.getFilter().setSearchBaseDNInformation(false);
- cache.setPreferredConnections(
- getPreferredConnections(ctx[0]));
- connected = true;
- }
- catch (Throwable t)
- {
- println();
- println(
- ERR_ERROR_CONNECTING_TO_SERVER_PROMPT_AGAIN.get(
- host+":"+port, t.getMessage()));
- LOG.log(Level.WARNING, "Complete error stack:", t);
- println();
- }
- }
- uData.setAdminUid(adminUid);
- uData.setAdminPwd(adminPwd);
- if (uData instanceof EnableReplicationUserData)
- {
- EnableReplicationUserData enableData =
- (EnableReplicationUserData)uData;
- if (isFirstOrSourceServer)
- {
- enableData.setBindDn1(
- ADSContext.getAdministratorDN(adminUid));
- enableData.setPwd1(adminPwd);
- }
- else
- {
- enableData.setBindDn2(
- ADSContext.getAdministratorDN(adminUid));
- enableData.setPwd2(adminPwd);
- }
- }
- reloadTopology = true;
- break;
- case GENERIC_CREATING_CONNECTION:
- if ((e.getCause() != null) &&
- Utils.isCertificateException(e.getCause()))
- {
- reloadTopology = true;
- cancelled = !ci.promptForCertificateConfirmation(e.getCause(),
- e.getTrustManager(), e.getLdapUrl(), true, LOG);
- }
- else
- {
- exceptionMsgs.add(Utils.getMessage(e));
- }
- break;
- default:
- exceptionMsgs.add(Utils.getMessage(e));
- }
- }
- }
- if ((exceptionMsgs.size() > 0) && !cancelled)
- {
- if (uData instanceof StatusReplicationUserData)
- {
- println(
- ERR_REPLICATION_STATUS_READING_REGISTERED_SERVERS.get(
- Utils.getMessageFromCollection(exceptionMsgs,
- Constants.LINE_SEPARATOR).toString()));
- println();
- }
- else
- {
- try
- {
- cancelled = !askConfirmation(
- ERR_REPLICATION_READING_REGISTERED_SERVERS_CONFIRM_UPDATE_REMOTE.
- get(Utils.getMessageFromCollection(exceptionMsgs,
- Constants.LINE_SEPARATOR).toString()), true, LOG);
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- cancelled = true;
- }
- }
- }
- }
- }
- catch (ADSContextException ace)
- {
- LOG.log(Level.SEVERE, "Complete error stack:", ace);
- throw new ReplicationCliException(
- ERR_REPLICATION_READING_ADS.get(ace.getMessage()),
- ERROR_READING_ADS, ace);
- }
- catch (TopologyCacheException tce)
- {
- LOG.log(Level.SEVERE, "Complete error stack:", tce);
- throw new ReplicationCliException(
- ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
- ERROR_READING_TOPOLOGY_CACHE, tce);
- }
- return !cancelled;
- }
-
- /**
- * Tells whether there is a Global Administrator defined in the server
- * to which the InitialLdapContext is connected.
- * @param ctx the InitialLdapContext.
- * @return <CODE>true</CODE> if we could find an administrator and
- * <CODE>false</CODE> otherwise.
- */
- private boolean hasAdministrator(InitialLdapContext ctx)
- {
- boolean isAdminDefined = false;
- try
- {
- ADSContext adsContext = new ADSContext(ctx);
- if (adsContext.hasAdminData())
- {
- Set administrators = adsContext.readAdministratorRegistry();
- isAdminDefined = administrators.size() > 0;
- }
- }
- catch (Throwable t)
- {
- LOG.log(Level.WARNING,
- "Unexpected error retrieving the ADS data: "+t, t);
- }
- return isAdminDefined;
- }
-
- /**
- * Tells whether there is a Global Administrator corresponding to the provided
- * ReplicationUserData defined in the server to which the InitialLdapContext
- * is connected.
- * @param ctx the InitialLdapContext.
- * @param uData the user data
- * @return <CODE>true</CODE> if we could find an administrator and
- * <CODE>false</CODE> otherwise.
- */
- private boolean hasAdministrator(InitialLdapContext ctx,
- ReplicationUserData uData)
- {
- boolean isAdminDefined = false;
- String adminUid = uData.getAdminUid();
- try
- {
- ADSContext adsContext = new ADSContext(ctx);
- Set<Map<AdministratorProperty, Object>> administrators =
- adsContext.readAdministratorRegistry();
- for (Map<AdministratorProperty, Object> admin : administrators)
- {
- String uid = (String)admin.get(AdministratorProperty.UID);
- if (uid != null)
- {
- // If the administrator UID is null it means that we are just
- // checking for the existence of an administrator
- isAdminDefined = uid.equalsIgnoreCase(adminUid) || (adminUid == null);
- if (isAdminDefined)
- {
- break;
- }
- }
- }
- }
- catch (Throwable t)
- {
- LOG.log(Level.WARNING,
- "Unexpected error retrieving the ADS data: "+t, t);
- }
- return isAdminDefined;
- }
-
- /**
- * Helper type for the <CODE>getCommonSuffixes</CODE> method.
- */
- private enum SuffixRelationType
- {
- NOT_REPLICATED, FULLY_REPLICATED, REPLICATED, NOT_FULLY_REPLICATED, ALL
- }
-
- /**
- * Returns a Collection containing a list of suffixes that are defined in
- * two servers at the same time (depending on the value of the argument
- * replicated this list contains only the suffixes that are replicated
- * between the servers or the list of suffixes that are not replicated
- * between the servers).
- * @param ctx1 the connection to the first server.
- * @param ctx2 the connection to the second server.
- * @param type whether to return a list with the suffixes that are
- * replicated, fully replicated (replicas have exactly the same list of
- * replication servers), not replicated or all the common suffixes.
- * @return a Collection containing a list of suffixes that are replicated
- * (or those that can be replicated) in two servers.
- */
- private Collection<String> getCommonSuffixes(
- InitialLdapContext ctx1, InitialLdapContext ctx2, SuffixRelationType type)
- {
- LinkedList<String> suffixes = new LinkedList<String>();
- try
- {
- TopologyCacheFilter filter = new TopologyCacheFilter();
- filter.setSearchMonitoringInformation(false);
- ServerDescriptor server1 =
- ServerDescriptor.createStandalone(ctx1, filter);
- ServerDescriptor server2 =
- ServerDescriptor.createStandalone(ctx2, filter);
- Set<ReplicaDescriptor> replicas1 = server1.getReplicas();
- Set<ReplicaDescriptor> replicas2 = server2.getReplicas();
-
- for (ReplicaDescriptor rep1 : replicas1)
- {
- for (ReplicaDescriptor rep2 : replicas2)
- {
-
- switch (type)
- {
- case NOT_REPLICATED:
- if (!areReplicated(rep1, rep2) &&
- Utils.areDnsEqual(rep1.getSuffix().getDN(),
- rep2.getSuffix().getDN()))
- {
- suffixes.add(rep1.getSuffix().getDN());
- }
- break;
- case FULLY_REPLICATED:
- if (areFullyReplicated(rep1, rep2))
- {
- suffixes.add(rep1.getSuffix().getDN());
- }
- break;
- case REPLICATED:
- if (areReplicated(rep1, rep2))
- {
- suffixes.add(rep1.getSuffix().getDN());
- }
- break;
- case NOT_FULLY_REPLICATED:
- if (!areFullyReplicated(rep1, rep2) &&
- Utils.areDnsEqual(rep1.getSuffix().getDN(),
- rep2.getSuffix().getDN()))
- {
- suffixes.add(rep1.getSuffix().getDN());
- }
- break;
- case ALL:
- if (Utils.areDnsEqual(rep1.getSuffix().getDN(),
- rep2.getSuffix().getDN()))
- {
- suffixes.add(rep1.getSuffix().getDN());
- }
- break;
- default:
- throw new IllegalStateException("Unknown type: "+type);
- }
- }
- }
- }
- catch (Throwable t)
- {
- LOG.log(Level.WARNING,
- "Unexpected error retrieving the server configuration: "+t, t);
- }
- return suffixes;
- }
-
- /**
- * Tells whether the two provided replicas are fully replicated or not. The
- * code in fact checks that both replicas have the same DN that they are
- * replicated if both servers are replication servers and that both replicas
- * make reference to the other replication server.
- * @param rep1 the first replica.
- * @param rep2 the second replica.
- * @return <CODE>true</CODE> if we can assure that the two replicas are
- * replicated using the replication server and replication port information
- * and <CODE>false</CODE> otherwise.
- */
- private boolean areFullyReplicated(ReplicaDescriptor rep1,
- ReplicaDescriptor rep2)
- {
- boolean areFullyReplicated = false;
- if (Utils.areDnsEqual(rep1.getSuffix().getDN(), rep2.getSuffix().getDN()) &&
- rep1.isReplicated() && rep2.isReplicated() &&
- rep1.getServer().isReplicationServer() &&
- rep2.getServer().isReplicationServer())
- {
- Set<String> servers1 = rep1.getReplicationServers();
- Set<String> servers2 = rep2.getReplicationServers();
- String server1 = rep1.getServer().getReplicationServerHostPort();
- String server2 = rep2.getServer().getReplicationServerHostPort();
- areFullyReplicated = servers1.contains(server2) &&
- servers2.contains(server1);
- }
- return areFullyReplicated;
- }
-
- /**
- * Tells whether the two provided replicas are replicated or not. The
- * code in fact checks that both replicas have the same DN and that they
- * have at least one common replication server referenced.
- * @param rep1 the first replica.
- * @param rep2 the second replica.
- * @return <CODE>true</CODE> if we can assure that the two replicas are
- * replicated and <CODE>false</CODE> otherwise.
- */
- private boolean areReplicated(ReplicaDescriptor rep1, ReplicaDescriptor rep2)
- {
- boolean areReplicated = false;
- if (Utils.areDnsEqual(rep1.getSuffix().getDN(), rep2.getSuffix().getDN()) &&
- rep1.isReplicated() && rep2.isReplicated())
- {
- Set<String> servers1 = rep1.getReplicationServers();
- Set<String> servers2 = rep2.getReplicationServers();
- servers1.retainAll(servers2);
- areReplicated = !servers1.isEmpty();
- }
- return areReplicated;
- }
-
- /**
- * Returns a Collection containing a list of replicas in a server.
- * @param ctx the connection to the server.
- * @return a Collection containing a list of replicas in a server.
- */
- private Collection<ReplicaDescriptor> getReplicas(InitialLdapContext ctx)
- {
- LinkedList<ReplicaDescriptor> suffixes =
- new LinkedList<ReplicaDescriptor>();
- TopologyCacheFilter filter = new TopologyCacheFilter();
- filter.setSearchMonitoringInformation(false);
- try
- {
- ServerDescriptor server = ServerDescriptor.createStandalone(ctx, filter);
- suffixes.addAll(server.getReplicas());
- }
- catch (Throwable t)
- {
- LOG.log(Level.WARNING,
- "Unexpected error retrieving the server configuration: "+t, t);
- }
- return suffixes;
- }
-
- /**
- * Enables the replication between two servers using the parameters in the
- * provided EnableReplicationUserData. This method does not prompt to the
- * user for information if something is missing.
- * @param uData the EnableReplicationUserData object.
- * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
- * successful and the replication could be enabled and an error code
- * otherwise.
- */
- private ReplicationCliReturnCode enableReplication(
- EnableReplicationUserData uData)
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- InitialLdapContext ctx1 = null;
- InitialLdapContext ctx2 = null;
-
- String host1 = uData.getHostName1();
- String host2 = uData.getHostName2();
- int port1 = uData.getPort1();
- int port2 = uData.getPort2();
-
- LinkedList<Message> errorMessages = new LinkedList<Message>();
-
- printlnProgress();
- printProgress(
- formatter.getFormattedWithPoints(INFO_REPLICATION_CONNECTING.get()));
- try
- {
- ctx1 = createAdministrativeContext(host1, port1, uData.useSSL1(),
- uData.useStartTLS1(), uData.getBindDn1(), uData.getPwd1(),
- getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = host1+":"+port1;
- errorMessages.add(getMessageForException(ne, hostPort));
-
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
- try
- {
- ctx2 = createAdministrativeContext(host2, port2, uData.useSSL2(),
- uData.useStartTLS2(), uData.getBindDn2(), uData.getPwd2(),
- getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = host2+":"+port2;
- errorMessages.add(getMessageForException(ne, hostPort));
-
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
-
- if (errorMessages.size() > 0)
- {
- returnValue = ERROR_CONNECTING;
- }
-
- if (errorMessages.isEmpty())
- {
- // This done is for the message informing that we are connecting.
- printProgress(formatter.getFormattedDone());
- printlnProgress();
-
-// If we are not in interactive mode do some checks...
- if (!argParser.isInteractive())
- {
- boolean hasReplicationPort1 = hasReplicationPort(ctx1);
- boolean hasReplicationPort2 = hasReplicationPort(ctx2);
- int replPort1 = uData.getReplicationPort1();
- int replPort2 = uData.getReplicationPort2();
-
- if (!hasReplicationPort1)
- {
- if (!argParser.skipReplicationPortCheck() &&
- isLocalHost(host1) &&
- !SetupUtils.canUseAsPort(replPort1))
- {
- errorMessages.add(getCannotBindToPortError(replPort1));
- }
- }
- if (!hasReplicationPort2)
- {
- if (!argParser.skipReplicationPortCheck() &&
- isLocalHost(host2) &&
- !SetupUtils.canUseAsPort(replPort2))
- {
- errorMessages.add(getCannotBindToPortError(replPort2));
- }
- }
- if (!hasReplicationPort1 && !hasReplicationPort2 &&
- (replPort1 == replPort2) &&
- (host1.equalsIgnoreCase(host2)))
- {
- errorMessages.add(ERR_REPLICATION_SAME_REPLICATION_PORT.get(
- String.valueOf(replPort1), host1));
- }
-
- if (argParser.skipReplicationPortCheck())
- {
- // This is something that we must do in any case... this test is
- // already included when we call SetupUtils.canUseAsPort
- if (replPort1 == port1)
- {
- errorMessages.add(
- ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
- host1, String.valueOf(replPort1)));
- }
-
- if (replPort2 == port2)
- {
- errorMessages.add(
- ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
- host2, String.valueOf(replPort2)));
- }
- }
- }
- if (errorMessages.size() > 0)
- {
- returnValue = ERROR_USER_DATA;
- }
- }
-
- if (errorMessages.isEmpty())
- {
- LinkedList<String> suffixes = uData.getBaseDNs();
- checkSuffixesForEnableReplication(suffixes, ctx1, ctx2, false);
- if (!suffixes.isEmpty())
- {
- uData.setBaseDNs(suffixes);
- try
- {
- updateConfiguration(ctx1, ctx2, uData);
- returnValue = SUCCESSFUL;
- }
- catch (ReplicationCliException rce)
- {
- returnValue = rce.getErrorCode();
- println();
- println(getCriticalExceptionMessage(rce));
- LOG.log(Level.SEVERE, "Complete error stack:", rce);
- }
- }
- else
- {
- // The error messages are already displayed in the method
- // checkSuffixesForEnableReplication.
- returnValue = REPLICATION_CANNOT_BE_ENABLED_ON_BASEDN;
- }
- }
-
- for (Message msg : errorMessages)
- {
- println();
- println(msg);
- }
-
- if (returnValue == SUCCESSFUL)
- {
- long time1 = Utils.getServerClock(ctx1);
- long time2 = Utils.getServerClock(ctx2);
- if ((time1 != -1) && (time2 != -1))
- {
- if (Math.abs(time1 - time2) >
- (Installer.WARNING_CLOCK_DIFFERENCE_THRESOLD_MINUTES * 60 * 1000))
- {
- println(INFO_WARNING_SERVERS_CLOCK_DIFFERENCE.get(
- ConnectionUtils.getHostPort(ctx1),
- ConnectionUtils.getHostPort(ctx2),
- String.valueOf(
- Installer.WARNING_CLOCK_DIFFERENCE_THRESOLD_MINUTES)));
- }
- }
- printlnProgress();
- printProgress(INFO_REPLICATION_POST_ENABLE_INFO.get("dsreplication",
- ReplicationCliArgumentParser.INITIALIZE_REPLICATION_SUBCMD_NAME));
- printlnProgress();
- }
-
- if (ctx1 != null)
- {
- try
- {
- ctx1.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- if (ctx2 != null)
- {
- try
- {
- ctx2.close();
- }
- catch (Throwable t)
- {
- }
- }
- return returnValue;
- }
-
- /**
- * Disbles the replication in the server for the provided suffixes using the
- * data in the DisableReplicationUserData object. This method does not prompt
- * to the user for information if something is missing.
- * @param uData the DisableReplicationUserData object.
- * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
- * successful and an error code otherwise.
- */
- private ReplicationCliReturnCode disableReplication(
- DisableReplicationUserData uData)
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- InitialLdapContext ctx = null;
- printProgress(
- formatter.getFormattedWithPoints(INFO_REPLICATION_CONNECTING.get()));
- String bindDn = uData.getAdminUid() == null ? uData.getBindDn() :
- ADSContext.getAdministratorDN(uData.getAdminUid());
- try
- {
- ctx = createAdministrativeContext(uData.getHostName(), uData.getPort(),
- uData.useSSL(), uData.useStartTLS(), bindDn, uData.getAdminPwd(),
- getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = uData.getHostName()+":"+uData.getPort();
- println();
- println(getMessageForException(ne, hostPort));
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
-
- if (ctx != null)
- {
- // This done is for the message informing that we are connecting.
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- LinkedList<String> suffixes = uData.getBaseDNs();
- checkSuffixesForDisableReplication(suffixes, ctx, false);
- if (!suffixes.isEmpty())
- {
- uData.setBaseDNs(suffixes);
- try
- {
- updateConfiguration(ctx, uData);
- returnValue = SUCCESSFUL;
- }
- catch (ReplicationCliException rce)
- {
- returnValue = rce.getErrorCode();
- println();
- println(getCriticalExceptionMessage(rce));
- LOG.log(Level.SEVERE, "Complete error stack:", rce);
- }
- }
- else
- {
- returnValue = REPLICATION_CANNOT_BE_DISABLED_ON_BASEDN;
- }
- }
- else
- {
- returnValue = ERROR_CONNECTING;
- }
-
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
- return returnValue;
- }
-
- /**
- * Displays the replication status of the baseDNs specified in the
- * StatusReplicationUserData object. This method does not prompt
- * to the user for information if something is missing.
- * @param uData the StatusReplicationUserData object.
- * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
- * successful and an error code otherwise.
- */
- private ReplicationCliReturnCode statusReplication(
- StatusReplicationUserData uData)
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- InitialLdapContext ctx = null;
- try
- {
- ctx = createAdministrativeContext(uData.getHostName(), uData.getPort(),
- uData.useSSL(), uData.useStartTLS(),
- ADSContext.getAdministratorDN(uData.getAdminUid()),
- uData.getAdminPwd(), getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = uData.getHostName()+":"+uData.getPort();
- println();
- println(getMessageForException(ne, hostPort));
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
-
- if (ctx != null)
- {
- uData.setBaseDNs(uData.getBaseDNs());
- try
- {
- displayStatus(ctx, uData);
- returnValue = SUCCESSFUL;
- }
- catch (ReplicationCliException rce)
- {
- returnValue = rce.getErrorCode();
- println();
- println(getCriticalExceptionMessage(rce));
- LOG.log(Level.SEVERE, "Complete error stack:", rce);
- }
- }
- else
- {
- returnValue = ERROR_CONNECTING;
- }
-
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
- return returnValue;
- }
-
- /**
- * Initializes the contents of one server with the contents of the other
- * using the parameters in the provided InitializeReplicationUserData.
- * This method does not prompt to the user for information if something is
- * missing.
- * @param uData the InitializeReplicationUserData object.
- * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
- * successful and an error code otherwise.
- */
- private ReplicationCliReturnCode initializeReplication(
- InitializeReplicationUserData uData)
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- InitialLdapContext ctxSource = null;
- InitialLdapContext ctxDestination = null;
- try
- {
- ctxSource = createAdministrativeContext(uData.getHostNameSource(),
- uData.getPortSource(), uData.useSSLSource(),
- uData.useStartTLSSource(),
- ADSContext.getAdministratorDN(uData.getAdminUid()),
- uData.getAdminPwd(), getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = uData.getHostNameSource()+":"+uData.getPortSource();
- println();
- println(getMessageForException(ne, hostPort));
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
- try
- {
- ctxDestination = createAdministrativeContext(
- uData.getHostNameDestination(),
- uData.getPortDestination(), uData.useSSLDestination(),
- uData.useStartTLSDestination(),
- ADSContext.getAdministratorDN(uData.getAdminUid()),
- uData.getAdminPwd(), getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = uData.getHostNameDestination()+":"+
- uData.getPortDestination();
- println();
- println(getMessageForException(ne, hostPort));
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
- if ((ctxSource != null) && (ctxDestination != null))
- {
- LinkedList<String> baseDNs = uData.getBaseDNs();
- checkSuffixesForInitializeReplication(baseDNs, ctxSource, ctxDestination,
- false);
- if (!baseDNs.isEmpty())
- {
- for (String baseDN : baseDNs)
- {
- try
- {
- printlnProgress();
- Message msg = formatter.getFormattedProgress(
- INFO_PROGRESS_INITIALIZING_SUFFIX.get(baseDN,
- ConnectionUtils.getHostPort(ctxSource)));
- printProgress(msg);
- printlnProgress();
- initializeSuffix(baseDN, ctxSource, ctxDestination, true);
- }
- catch (ReplicationCliException rce)
- {
- println();
- println(getCriticalExceptionMessage(rce));
- returnValue = rce.getErrorCode();
- LOG.log(Level.SEVERE, "Complete error stack:", rce);
- }
- }
- }
- else
- {
- returnValue = REPLICATION_CANNOT_BE_INITIALIZED_ON_BASEDN;
- }
- }
- else
- {
- returnValue = ERROR_CONNECTING;
- }
-
- if (ctxSource != null)
- {
- try
- {
- ctxSource.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- if (ctxDestination != null)
- {
- try
- {
- ctxDestination.close();
- }
- catch (Throwable t)
- {
- }
- }
- return returnValue;
- }
-
- /**
- * Initializes the contents of a whole topology with the contents of the other
- * using the parameters in the provided InitializeAllReplicationUserData.
- * This method does not prompt to the user for information if something is
- * missing.
- * @param uData the InitializeAllReplicationUserData object.
- * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
- * successful and an error code otherwise.
- */
- private ReplicationCliReturnCode initializeAllReplication(
- InitializeAllReplicationUserData uData)
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- InitialLdapContext ctx = null;
- try
- {
- ctx = createAdministrativeContext(uData.getHostName(), uData.getPort(),
- uData.useSSL(), uData.useStartTLS(),
- ADSContext.getAdministratorDN(uData.getAdminUid()),
- uData.getAdminPwd(), getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = uData.getHostName()+":"+uData.getPort();
- println();
- println(getMessageForException(ne, hostPort));
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
- if (ctx != null)
- {
- LinkedList<String> baseDNs = uData.getBaseDNs();
- checkSuffixesForInitializeReplication(baseDNs, ctx, false);
- if (!baseDNs.isEmpty())
- {
- for (String baseDN : baseDNs)
- {
- try
- {
- printlnProgress();
- Message msg = formatter.getFormattedProgress(
- INFO_PROGRESS_INITIALIZING_SUFFIX.get(baseDN,
- ConnectionUtils.getHostPort(ctx)));
- printProgress(msg);
- println();
- initializeAllSuffix(baseDN, ctx, true);
- }
- catch (ReplicationCliException rce)
- {
- println();
- println(getCriticalExceptionMessage(rce));
- returnValue = rce.getErrorCode();
- LOG.log(Level.SEVERE, "Complete error stack:", rce);
- }
- }
- }
- else
- {
- returnValue = REPLICATION_CANNOT_BE_INITIALIZED_ON_BASEDN;
- }
- }
- else
- {
- returnValue = ERROR_CONNECTING;
- }
-
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- return returnValue;
- }
-
- /**
- * Performs the operation that must be made before initializing the topology
- * using the import-ldif command or the binary copy. The operation uses
- * the parameters in the provided InitializeAllReplicationUserData.
- * This method does not prompt to the user for information if something is
- * missing.
- * @param uData the PreExternalInitializationUserData object.
- * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
- * successful and an error code otherwise.
- */
- private ReplicationCliReturnCode preExternalInitialization(
- PreExternalInitializationUserData uData)
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- InitialLdapContext ctx = null;
- try
- {
- ctx = createAdministrativeContext(uData.getHostName(), uData.getPort(),
- uData.useSSL(), uData.useStartTLS(),
- ADSContext.getAdministratorDN(uData.getAdminUid()),
- uData.getAdminPwd(), getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = uData.getHostName()+":"+uData.getPort();
- println();
- println(getMessageForException(ne, hostPort));
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
- if (ctx != null)
- {
- LinkedList<String> baseDNs = uData.getBaseDNs();
- checkSuffixesForInitializeReplication(baseDNs, ctx, false);
- if (!baseDNs.isEmpty())
- {
- for (String baseDN : baseDNs)
- {
- try
- {
- printlnProgress();
- Message msg = formatter.getFormattedWithPoints(
- INFO_PROGRESS_PRE_EXTERNAL_INITIALIZATION.get(baseDN));
- printProgress(msg);
- preExternalInitialization(baseDN, ctx, uData.isLocalOnly(), false);
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- }
- catch (ReplicationCliException rce)
- {
- println();
- println(getCriticalExceptionMessage(rce));
- returnValue = rce.getErrorCode();
- LOG.log(Level.SEVERE, "Complete error stack:", rce);
- }
- }
- if (uData.isLocalOnly())
- {
- printlnProgress();
- printProgress(
- INFO_PROGRESS_PRE_INITIALIZATION_LOCAL_FINISHED_PROCEDURE.get(
- ConnectionUtils.getHostPort(ctx),
- ReplicationCliArgumentParser.
- POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME));
- printlnProgress();
- }
- else
- {
- printlnProgress();
- printProgress(
- INFO_PROGRESS_PRE_INITIALIZATION_FINISHED_PROCEDURE.get(
- ReplicationCliArgumentParser.
- POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME));
- printlnProgress();
- }
- }
- else
- {
- returnValue = REPLICATION_CANNOT_BE_INITIALIZED_ON_BASEDN;
- }
- }
- else
- {
- returnValue = ERROR_CONNECTING;
- }
-
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- return returnValue;
- }
-
- /**
- * Performs the operation that must be made after initializing the topology
- * using the import-ldif command or the binary copy. The operation uses
- * the parameters in the provided InitializeAllReplicationUserData.
- * This method does not prompt to the user for information if something is
- * missing.
- * @param uData the PostExternalInitializationUserData object.
- * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
- * successful and an error code otherwise.
- */
- private ReplicationCliReturnCode postExternalInitialization(
- PostExternalInitializationUserData uData)
- {
- ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
- InitialLdapContext ctx = null;
- try
- {
- ctx = createAdministrativeContext(uData.getHostName(), uData.getPort(),
- uData.useSSL(), uData.useStartTLS(),
- ADSContext.getAdministratorDN(uData.getAdminUid()),
- uData.getAdminPwd(), getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = uData.getHostName()+":"+uData.getPort();
- println();
- println(getMessageForException(ne, hostPort));
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
- if (ctx != null)
- {
- LinkedList<String> baseDNs = uData.getBaseDNs();
- checkSuffixesForInitializeReplication(baseDNs, ctx, false);
- if (!baseDNs.isEmpty())
- {
- for (String baseDN : baseDNs)
- {
- try
- {
- printlnProgress();
- Message msg = formatter.getFormattedWithPoints(
- INFO_PROGRESS_POST_EXTERNAL_INITIALIZATION.get(baseDN));
- printProgress(msg);
- postExternalInitialization(baseDN, ctx, false);
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- }
- catch (ReplicationCliException rce)
- {
- println();
- println(getCriticalExceptionMessage(rce));
- returnValue = rce.getErrorCode();
- LOG.log(Level.SEVERE, "Complete error stack:", rce);
- }
- }
- printlnProgress();
- printProgress(
- INFO_PROGRESS_POST_INITIALIZATION_FINISHED_PROCEDURE.get());
- printlnProgress();
- }
- else
- {
- returnValue = REPLICATION_CANNOT_BE_INITIALIZED_ON_BASEDN;
- }
- }
- else
- {
- returnValue = ERROR_CONNECTING;
- }
-
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
-
- return returnValue;
- }
-
-
- /**
- * Checks that replication can actually be enabled in the provided baseDNs
- * for the two servers.
- * @param suffixes the suffixes provided by the user. This Collection is
- * updated by removing the base DNs that cannot be enabled and with the
- * base DNs that the user provided interactively.
- * @param ctx1 connection to the first server.
- * @param ctx2 connection to the second server.
- * @param interactive whether to ask the user to provide interactively
- * base DNs if none of the provided base DNs can be enabled.
- */
- private void checkSuffixesForEnableReplication(Collection<String> suffixes,
- InitialLdapContext ctx1, InitialLdapContext ctx2,
- boolean interactive)
- {
- TreeSet<String> availableSuffixes =
- new TreeSet<String>(getCommonSuffixes(ctx1, ctx2,
- SuffixRelationType.NOT_FULLY_REPLICATED));
- TreeSet<String> alreadyReplicatedSuffixes =
- new TreeSet<String>(getCommonSuffixes(ctx1, ctx2,
- SuffixRelationType.FULLY_REPLICATED));
-
- if (availableSuffixes.size() == 0)
- {
- println();
- println(
- ERR_NO_SUFFIXES_AVAILABLE_TO_ENABLE_REPLICATION.get());
-
- LinkedList<String> userProvidedSuffixes = argParser.getBaseDNs();
- TreeSet<String> userProvidedReplicatedSuffixes = new TreeSet<String>();
-
- for (String s1 : userProvidedSuffixes)
- {
- for (String s2 : alreadyReplicatedSuffixes)
- {
- if (Utils.areDnsEqual(s1, s2))
- {
- userProvidedReplicatedSuffixes.add(s1);
- }
- }
- }
- if (userProvidedReplicatedSuffixes.size() > 0)
- {
- println();
- println(
- INFO_ALREADY_REPLICATED_SUFFIXES.get(
- Utils.getStringFromCollection(userProvidedReplicatedSuffixes,
- Constants.LINE_SEPARATOR)));
- }
- suffixes.clear();
- }
- else
- {
- // Verify that the provided suffixes are configured in the servers.
- TreeSet<String> notFound = new TreeSet<String>();
- TreeSet<String> alreadyReplicated = new TreeSet<String>();
- for (String dn : suffixes)
- {
- boolean found = false;
- for (String dn1 : availableSuffixes)
- {
- if (Utils.areDnsEqual(dn, dn1))
- {
- found = true;
- break;
- }
- }
- if (!found)
- {
- boolean isReplicated = false;
- for (String s : alreadyReplicatedSuffixes)
- {
- if (Utils.areDnsEqual(s, dn))
- {
- isReplicated = true;
- break;
- }
- }
- if (isReplicated)
- {
- alreadyReplicated.add(dn);
- }
- else
- {
- notFound.add(dn);
- }
- }
- }
- suffixes.removeAll(notFound);
- suffixes.removeAll(alreadyReplicated);
- if (notFound.size() > 0)
- {
- println();
- println(ERR_REPLICATION_ENABLE_SUFFIXES_NOT_FOUND.get(
- Utils.getStringFromCollection(notFound,
- Constants.LINE_SEPARATOR)));
- }
- if (alreadyReplicated.size() > 0)
- {
- println();
- println(INFO_ALREADY_REPLICATED_SUFFIXES.get(
- Utils.getStringFromCollection(alreadyReplicated,
- Constants.LINE_SEPARATOR)));
- }
- if (interactive)
- {
- boolean confirmationLimitReached = false;
- while (suffixes.isEmpty())
- {
- boolean noSchemaOrAds = false;
- for (String s: availableSuffixes)
- {
- if (!Utils.areDnsEqual(s, ADSContext.getAdministrationSuffixDN()) &&
- !Utils.areDnsEqual(s, Constants.SCHEMA_DN) &&
- !Utils.areDnsEqual(s, Constants.REPLICATION_CHANGES_DN))
- {
- noSchemaOrAds = true;
- }
- }
- if (!noSchemaOrAds)
- {
- // In interactive mode we do not propose to manage the
- // administration suffix.
- println();
- println(
- ERR_NO_SUFFIXES_AVAILABLE_TO_ENABLE_REPLICATION.get());
- break;
- }
- else
- {
- println();
- println(ERR_NO_SUFFIXES_SELECTED_TO_REPLICATE.get());
- for (String dn : availableSuffixes)
- {
- if (!Utils.areDnsEqual(dn,
- ADSContext.getAdministrationSuffixDN()) &&
- !Utils.areDnsEqual(dn, Constants.SCHEMA_DN) &&
- !Utils.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN))
- {
- try
- {
- if (askConfirmation(
- INFO_REPLICATION_ENABLE_SUFFIX_PROMPT.get(dn), true, LOG))
- {
- suffixes.add(dn);
- }
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- confirmationLimitReached = true;
- break;
- }
- }
- }
- }
- if (confirmationLimitReached)
- {
- suffixes.clear();
- break;
- }
- }
- }
- }
- }
-
- /**
- * Checks that replication can actually be disabled in the provided baseDNs
- * for the server.
- * @param suffixes the suffixes provided by the user. This Collection is
- * updated by removing the base DNs that cannot be disabled and with the
- * base DNs that the user provided interactively.
- * @param ctx connection to the server.
- * @param interactive whether to ask the user to provide interactively
- * base DNs if none of the provided base DNs can be disabled.
- */
- private void checkSuffixesForDisableReplication(Collection<String> suffixes,
- InitialLdapContext ctx, boolean interactive)
- {
- TreeSet<String> availableSuffixes = new TreeSet<String>();
- TreeSet<String> notReplicatedSuffixes = new TreeSet<String>();
-
- Collection<ReplicaDescriptor> replicas = getReplicas(ctx);
- for (ReplicaDescriptor rep : replicas)
- {
- String dn = rep.getSuffix().getDN();
- if (rep.isReplicated())
- {
- availableSuffixes.add(dn);
- }
- else
- {
- notReplicatedSuffixes.add(dn);
- }
- }
- if (availableSuffixes.size() == 0)
- {
- println();
- println(ERR_NO_SUFFIXES_AVAILABLE_TO_DISABLE_REPLICATION.get());
- LinkedList<String> userProvidedSuffixes = argParser.getBaseDNs();
- TreeSet<String> userProvidedNotReplicatedSuffixes =
- new TreeSet<String>();
- for (String s1 : userProvidedSuffixes)
- {
- for (String s2 : notReplicatedSuffixes)
- {
- if (Utils.areDnsEqual(s1, s2))
- {
- userProvidedNotReplicatedSuffixes.add(s1);
- }
- }
- }
- if (userProvidedNotReplicatedSuffixes.size() > 0)
- {
- println();
- println(INFO_ALREADY_NOT_REPLICATED_SUFFIXES.get(
- Utils.getStringFromCollection(
- userProvidedNotReplicatedSuffixes,
- Constants.LINE_SEPARATOR)));
- }
- suffixes.clear();
- }
- else
- {
- // Verify that the provided suffixes are configured in the servers.
- TreeSet<String> notFound = new TreeSet<String>();
- TreeSet<String> alreadyNotReplicated = new TreeSet<String>();
- for (String dn : suffixes)
- {
- boolean found = false;
- for (String dn1 : availableSuffixes)
- {
- if (Utils.areDnsEqual(dn, dn1))
- {
- found = true;
- break;
- }
- }
- if (!found)
- {
- boolean notReplicated = false;
- for (String s : notReplicatedSuffixes)
- {
- if (Utils.areDnsEqual(s, dn))
- {
- notReplicated = true;
- break;
- }
- }
- if (notReplicated)
- {
- alreadyNotReplicated.add(dn);
- }
- else
- {
- notFound.add(dn);
- }
- }
- }
- suffixes.removeAll(notFound);
- suffixes.removeAll(alreadyNotReplicated);
- if (notFound.size() > 0)
- {
- println();
- println(ERR_REPLICATION_DISABLE_SUFFIXES_NOT_FOUND.get(
- Utils.getStringFromCollection(notFound,
- Constants.LINE_SEPARATOR)));
- }
- if (alreadyNotReplicated.size() > 0)
- {
- println();
- println(INFO_ALREADY_NOT_REPLICATED_SUFFIXES.get(
- Utils.getStringFromCollection(alreadyNotReplicated,
- Constants.LINE_SEPARATOR)));
- }
- if (interactive)
- {
- boolean confirmationLimitReached = false;
- while (suffixes.isEmpty())
- {
- boolean noSchemaOrAds = false;
- for (String s: availableSuffixes)
- {
- if (!Utils.areDnsEqual(s, ADSContext.getAdministrationSuffixDN()) &&
- !Utils.areDnsEqual(s, Constants.SCHEMA_DN) &&
- !Utils.areDnsEqual(s, Constants.REPLICATION_CHANGES_DN))
- {
- noSchemaOrAds = true;
- }
- }
- if (!noSchemaOrAds)
- {
- // In interactive mode we do not propose to manage the
- // administration suffix.
- println();
- println(ERR_NO_SUFFIXES_AVAILABLE_TO_DISABLE_REPLICATION.get());
- break;
- }
- else
- {
- println();
- println(ERR_NO_SUFFIXES_SELECTED_TO_DISABLE.get());
- for (String dn : availableSuffixes)
- {
- if (!Utils.areDnsEqual(dn,
- ADSContext.getAdministrationSuffixDN()) &&
- !Utils.areDnsEqual(dn, Constants.SCHEMA_DN) &&
- !Utils.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN))
- {
- try
- {
- if (askConfirmation(
- INFO_REPLICATION_DISABLE_SUFFIX_PROMPT.get(dn), true,LOG))
- {
- suffixes.add(dn);
- }
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- confirmationLimitReached = true;
- break;
- }
- }
- }
- }
- if (confirmationLimitReached)
- {
- suffixes.clear();
- break;
- }
- }
- }
- }
- }
-
- /**
- * Checks that replication can actually be initialized in the provided baseDNs
- * for the server.
- * @param suffixes the suffixes provided by the user. This Collection is
- * updated by removing the base DNs that cannot be initialized and with the
- * base DNs that the user provided interactively.
- * @param ctx connection to the server.
- * @param interactive whether to ask the user to provide interactively
- * base DNs if none of the provided base DNs can be initialized.
- */
- private void checkSuffixesForInitializeReplication(
- Collection<String> suffixes, InitialLdapContext ctx, boolean interactive)
- {
- TreeSet<String> availableSuffixes = new TreeSet<String>();
- TreeSet<String> notReplicatedSuffixes = new TreeSet<String>();
-
- Collection<ReplicaDescriptor> replicas = getReplicas(ctx);
- for (ReplicaDescriptor rep : replicas)
- {
- String dn = rep.getSuffix().getDN();
- if (rep.isReplicated())
- {
- availableSuffixes.add(dn);
- }
- else
- {
- notReplicatedSuffixes.add(dn);
- }
- }
- if (availableSuffixes.size() == 0)
- {
- println();
- if (argParser.isInitializeAllReplicationSubcommand())
- {
- println(ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_ALL_REPLICATION.get());
- }
- else
- {
- println(
- ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_LOCAL_REPLICATION.get());
- }
- LinkedList<String> userProvidedSuffixes = argParser.getBaseDNs();
- TreeSet<String> userProvidedNotReplicatedSuffixes =
- new TreeSet<String>();
- for (String s1 : userProvidedSuffixes)
- {
- for (String s2 : notReplicatedSuffixes)
- {
- if (Utils.areDnsEqual(s1, s2))
- {
- userProvidedNotReplicatedSuffixes.add(s1);
- }
- }
- }
- if (userProvidedNotReplicatedSuffixes.size() > 0)
- {
- println();
- println(INFO_ALREADY_NOT_REPLICATED_SUFFIXES.get(
- Utils.getStringFromCollection(
- userProvidedNotReplicatedSuffixes,
- Constants.LINE_SEPARATOR)));
- }
- suffixes.clear();
- }
- else
- {
- // Verify that the provided suffixes are configured in the servers.
- TreeSet<String> notFound = new TreeSet<String>();
- TreeSet<String> alreadyNotReplicated = new TreeSet<String>();
- for (String dn : suffixes)
- {
- boolean found = false;
- for (String dn1 : availableSuffixes)
- {
- if (Utils.areDnsEqual(dn, dn1))
- {
- found = true;
- break;
- }
- }
- if (!found)
- {
- boolean notReplicated = false;
- for (String s : notReplicatedSuffixes)
- {
- if (Utils.areDnsEqual(s, dn))
- {
- notReplicated = true;
- break;
- }
- }
- if (notReplicated)
- {
- alreadyNotReplicated.add(dn);
- }
- else
- {
- notFound.add(dn);
- }
- }
- }
- suffixes.removeAll(notFound);
- suffixes.removeAll(alreadyNotReplicated);
- if (notFound.size() > 0)
- {
- println();
- println(ERR_REPLICATION_INITIALIZE_LOCAL_SUFFIXES_NOT_FOUND.get(
- Utils.getStringFromCollection(notFound,
- Constants.LINE_SEPARATOR)));
- }
- if (alreadyNotReplicated.size() > 0)
- {
- println();
- println(INFO_ALREADY_NOT_REPLICATED_SUFFIXES.get(
- Utils.getStringFromCollection(alreadyNotReplicated,
- Constants.LINE_SEPARATOR)));
- }
- if (interactive)
- {
- boolean confirmationLimitReached = false;
- while (suffixes.isEmpty())
- {
- boolean noSchemaOrAds = false;
- for (String s: availableSuffixes)
- {
- if (!Utils.areDnsEqual(s, ADSContext.getAdministrationSuffixDN()) &&
- !Utils.areDnsEqual(s, Constants.SCHEMA_DN) &&
- !Utils.areDnsEqual(s, Constants.REPLICATION_CHANGES_DN))
- {
- noSchemaOrAds = true;
- }
- }
- if (!noSchemaOrAds)
- {
- // In interactive mode we do not propose to manage the
- // administration suffix.
- println();
- if (argParser.isInitializeAllReplicationSubcommand())
- {
- println(
- ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_ALL_REPLICATION.get());
- }
- else
- {
- println(
- ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_LOCAL_REPLICATION.get());
- }
- break;
- }
- else
- {
- println();
- if (argParser.isInitializeAllReplicationSubcommand())
- {
- println(ERR_NO_SUFFIXES_SELECTED_TO_INITIALIZE_ALL.get());
- }
- else if (argParser.isPreExternalInitializationSubcommand())
- {
- println(
- ERR_NO_SUFFIXES_SELECTED_TO_PRE_EXTERNAL_INITIALIZATION.get());
- }
- else if (argParser.isPostExternalInitializationSubcommand())
- {
- println(
- ERR_NO_SUFFIXES_SELECTED_TO_POST_EXTERNAL_INITIALIZATION.get());
- }
- for (String dn : availableSuffixes)
- {
- if (!Utils.areDnsEqual(dn,
- ADSContext.getAdministrationSuffixDN()) &&
- !Utils.areDnsEqual(dn, Constants.SCHEMA_DN) &&
- !Utils.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN))
- {
- boolean addSuffix;
- try
- {
- if (argParser.isPreExternalInitializationSubcommand())
- {
- addSuffix = askConfirmation(
- INFO_REPLICATION_PRE_EXTERNAL_INITIALIZATION_SUFFIX_PROMPT.
- get(dn), true, LOG);
- }
- else if (argParser.isPostExternalInitializationSubcommand())
- {
- addSuffix = askConfirmation(
- INFO_REPLICATION_POST_EXTERNAL_INITIALIZATION_SUFFIX_PROMPT.
- get(dn), true, LOG);
- }
- else
- {
- addSuffix = askConfirmation(
- INFO_REPLICATION_INITIALIZE_ALL_SUFFIX_PROMPT.get(dn),
- true, LOG);
- }
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- confirmationLimitReached = true;
- break;
- }
- if (addSuffix)
- {
- suffixes.add(dn);
- }
- }
- }
- }
- if (confirmationLimitReached)
- {
- suffixes.clear();
- break;
- }
- }
- }
- }
- }
-
-
- /**
- * Checks that we can initialize the provided baseDNs between the two servers.
- * @param suffixes the suffixes provided by the user. This Collection is
- * updated by removing the base DNs that cannot be enabled and with the
- * base DNs that the user provided interactively.
- * @param ctxSource connection to the source server.
- * @param ctxDestination connection to the destination server.
- * @param interactive whether to ask the user to provide interactively
- * base DNs if none of the provided base DNs can be initialized.
- */
- private void checkSuffixesForInitializeReplication(
- Collection<String> suffixes, InitialLdapContext ctxSource,
- InitialLdapContext ctxDestination, boolean interactive)
- {
- TreeSet<String> availableSuffixes = new TreeSet<String>(
- getCommonSuffixes(ctxSource, ctxDestination,
- SuffixRelationType.REPLICATED));
- if (availableSuffixes.size() == 0)
- {
- println();
- println(ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_REPLICATION.get());
- suffixes.clear();
- }
- else
- {
- // Verify that the provided suffixes are configured in the servers.
- LinkedList<String> notFound = new LinkedList<String>();
- for (String dn : suffixes)
- {
- boolean found = false;
- for (String dn1 : availableSuffixes)
- {
- if (Utils.areDnsEqual(dn, dn1))
- {
- found = true;
- break;
- }
- }
- if (!found)
- {
- notFound.add(dn);
- }
- }
- suffixes.removeAll(notFound);
- if (notFound.size() > 0)
- {
- println();
- println(ERR_SUFFIXES_CANNOT_BE_INITIALIZED.get(
- Utils.getStringFromCollection(notFound,
- Constants.LINE_SEPARATOR)));
- }
- if (interactive)
- {
- boolean confirmationLimitReached = false;
- while (suffixes.isEmpty())
- {
- boolean noSchemaOrAds = false;
- for (String s: availableSuffixes)
- {
- if (!Utils.areDnsEqual(s, ADSContext.getAdministrationSuffixDN()) &&
- !Utils.areDnsEqual(s, Constants.SCHEMA_DN) &&
- !Utils.areDnsEqual(s, Constants.REPLICATION_CHANGES_DN))
- {
- noSchemaOrAds = true;
- }
- }
- if (!noSchemaOrAds)
- {
- // In interactive mode we do not propose to manage the
- // administration suffix.
- println();
- println(ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_REPLICATION.get());
- break;
- }
- else
- {
- println();
- println(ERR_NO_SUFFIXES_SELECTED_TO_INITIALIZE.get());
-
- for (String dn : availableSuffixes)
- {
- if (!Utils.areDnsEqual(dn,
- ADSContext.getAdministrationSuffixDN()) &&
- !Utils.areDnsEqual(dn, Constants.SCHEMA_DN) &&
- !Utils.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN))
- {
- try
- {
- if (askConfirmation(
- INFO_REPLICATION_INITIALIZE_SUFFIX_PROMPT.get(dn), true,
- LOG))
- {
- suffixes.add(dn);
- }
- }
- catch (CLIException ce)
- {
- println(ce.getMessageObject());
- confirmationLimitReached = true;
- break;
- }
- }
- }
- }
- if (confirmationLimitReached)
- {
- suffixes.clear();
- break;
- }
- }
- }
- }
- }
-
- /**
- * Updates the configuration in the two servers (and in other servers if
- * they are referenced) to enable replication.
- * @param ctx1 the connection to the first server.
- * @param ctx2 the connection to the second server.
- * @param uData the EnableReplicationUserData object containing the required
- * parameters to update the configuration.
- * @throws ReplicationCliException if there is an error.
- */
- private void updateConfiguration(InitialLdapContext ctx1,
- InitialLdapContext ctx2, EnableReplicationUserData uData)
- throws ReplicationCliException
- {
- LinkedHashSet<String> twoReplServers = new LinkedHashSet<String>();
- LinkedHashSet<String> allRepServers = new LinkedHashSet<String>();
- HashMap<String, LinkedHashSet<String>> hmRepServers =
- new HashMap<String, LinkedHashSet<String>>();
- Set<Integer> usedReplicationServerIds = new HashSet<Integer>();
- HashMap<String, Set<Integer>> hmUsedReplicationDomainIds =
- new HashMap<String, Set<Integer>>();
-
- ServerDescriptor server1;
- TopologyCacheFilter filter = new TopologyCacheFilter();
- filter.setSearchMonitoringInformation(false);
- filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN());
- for (String dn : uData.getBaseDNs())
- {
- filter.addBaseDNToSearch(dn);
- }
- try
- {
- server1 = ServerDescriptor.createStandalone(ctx1, filter);
- }
- catch (NamingException ne)
- {
- throw new ReplicationCliException(
- getMessageForException(ne, ConnectionUtils.getHostPort(ctx1)),
- ERROR_READING_CONFIGURATION, ne);
- }
- ServerDescriptor server2;
- try
- {
- server2 = ServerDescriptor.createStandalone(ctx2, filter);
- }
- catch (NamingException ne)
- {
- throw new ReplicationCliException(
- getMessageForException(ne, ConnectionUtils.getHostPort(ctx2)),
- ERROR_READING_CONFIGURATION, ne);
- }
-
- ADSContext adsCtx1 = new ADSContext(ctx1);
- ADSContext adsCtx2 = new ADSContext(ctx2);
-
- if (!argParser.isInteractive())
- {
- // Inform the user of the potential errors that we found in the already
- // registered servers.
- LinkedHashSet<Message> messages = new LinkedHashSet<Message>();
- try
- {
- LinkedHashSet<PreferredConnection> cnx =
- new LinkedHashSet<PreferredConnection>();
- cnx.addAll(getPreferredConnections(ctx1));
- cnx.addAll(getPreferredConnections(ctx2));
- if (adsCtx1.hasAdminData())
- {
- TopologyCache cache = new TopologyCache(adsCtx1, getTrustManager());
- cache.setPreferredConnections(cnx);
- cache.getFilter().setSearchMonitoringInformation(false);
- for (String dn : uData.getBaseDNs())
- {
- cache.getFilter().addBaseDNToSearch(dn);
- }
- cache.reloadTopology();
- messages.addAll(getErrorMessages(cache));
- }
-
- if (adsCtx2.hasAdminData())
- {
- TopologyCache cache = new TopologyCache(adsCtx2, getTrustManager());
- cache.setPreferredConnections(cnx);
- cache.getFilter().setSearchMonitoringInformation(false);
- for (String dn : uData.getBaseDNs())
- {
- cache.getFilter().addBaseDNToSearch(dn);
- }
- cache.reloadTopology();
- messages.addAll(getErrorMessages(cache));
- }
- }
- catch (TopologyCacheException tce)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
- ERROR_READING_TOPOLOGY_CACHE, tce);
- }
- catch (ADSContextException adce)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_READING_ADS.get(adce.getMessage()),
- ERROR_READING_ADS, adce);
- }
- if (!messages.isEmpty())
- {
- println(ERR_REPLICATION_READING_REGISTERED_SERVERS_WARNING.get(
- Utils.getMessageFromCollection(messages,
- Constants.LINE_SEPARATOR).toString()));
- }
- }
-
- // These are used to identify which server we use to initialize
- // the contents of the other server (if any).
- InitialLdapContext ctxSource = null;
- InitialLdapContext ctxDestination = null;
- ADSContext adsCtxSource = null;
-
- boolean adsAlreadyReplicated = false;
-
- printProgress(formatter.getFormattedWithPoints(
- INFO_REPLICATION_ENABLE_UPDATING_ADS_CONTENTS.get()));
- try
- {
- if (adsCtx1.hasAdminData() && adsCtx2.hasAdminData())
- {
- Set<Map<ADSContext.ServerProperty, Object>> registry1 =
- adsCtx1.readServerRegistry();
- Set<Map<ADSContext.ServerProperty, Object>> registry2 =
- adsCtx2.readServerRegistry();
- if (registry2.size() <= 1)
- {
- // Only the server itself registered.
- if (!hasAdministrator(adsCtx1.getDirContext(), uData))
- {
- adsCtx1.createAdministrator(getAdministratorProperties(uData));
- }
- if (registry2.size() == 0)
- {
- server2.updateAdsPropertiesWithServerProperties();
- registerServer(adsCtx1, server2.getAdsProperties());
- }
- else
- {
- registerServer(adsCtx1, registry2.iterator().next());
- }
-
- ctxSource = ctx1;
- ctxDestination = ctx2;
- adsCtxSource = adsCtx1;
- }
- else if (registry1.size() <= 1)
- {
- // Only the server itself registered.
- if (!hasAdministrator(adsCtx2.getDirContext(), uData))
- {
- adsCtx2.createAdministrator(getAdministratorProperties(uData));
- }
- if (registry1.size() == 0)
- {
- server1.updateAdsPropertiesWithServerProperties();
- registerServer(adsCtx2, server1.getAdsProperties());
- }
- else
- {
- registerServer(adsCtx2, registry1.iterator().next());
- }
-
- ctxSource = ctx2;
- ctxDestination = ctx1;
- adsCtxSource = adsCtx2;
- }
- else if (!areEqual(registry1, registry2))
- {
- // TO COMPLETE: we may want to merge the ADS but for the moment
- // just say this is not supported.
- throw new ReplicationCliException(
- ERR_REPLICATION_ADS_MERGE_NOT_SUPPORTED.get(
- ConnectionUtils.getHostPort(ctx1),
- ConnectionUtils.getHostPort(ctx2)),
- REPLICATION_ADS_MERGE_NOT_SUPPORTED, null);
- }
- else
- {
- // They are already replicated: nothing to do in terms of ADS
- // initialization or ADS update data
- adsAlreadyReplicated = true;
- }
- }
- else if (!adsCtx1.hasAdminData() && adsCtx2.hasAdminData())
- {
-// adsCtx1.createAdministrationSuffix(null);
- if (!hasAdministrator(adsCtx2.getDirContext(), uData))
- {
- adsCtx2.createAdministrator(getAdministratorProperties(uData));
- }
- server1.updateAdsPropertiesWithServerProperties();
- registerServer(adsCtx2, server1.getAdsProperties());
-
- ctxSource = ctx2;
- ctxDestination = ctx1;
- adsCtxSource = adsCtx2;
- }
- else if (adsCtx1.hasAdminData() && !adsCtx2.hasAdminData())
- {
-// adsCtx2.createAdministrationSuffix(null);
- if (!hasAdministrator(adsCtx1.getDirContext(), uData))
- {
- adsCtx1.createAdministrator(getAdministratorProperties(uData));
- }
- server2.updateAdsPropertiesWithServerProperties();
- registerServer(adsCtx1, server2.getAdsProperties());
-
- ctxSource = ctx1;
- ctxDestination = ctx2;
- adsCtxSource = adsCtx1;
- }
- else
- {
- adsCtx1.createAdminData(null);
- if (!hasAdministrator(ctx1, uData))
- {
- // This could occur if the user created an administrator without
- // registering any server.
- adsCtx1.createAdministrator(getAdministratorProperties(uData));
- }
- server1.updateAdsPropertiesWithServerProperties();
- adsCtx1.registerServer(server1.getAdsProperties());
- server2.updateAdsPropertiesWithServerProperties();
- adsCtx1.registerServer(server2.getAdsProperties());
-// adsCtx2.createAdministrationSuffix(null);
-
- ctxSource = ctx1;
- ctxDestination = ctx2;
- adsCtxSource = adsCtx1;
- }
- }
- catch (ADSContextException adce)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_UPDATING_ADS.get(adce.getReason()),
- ERROR_UPDATING_ADS, adce);
- }
- if (!adsAlreadyReplicated)
- {
- try
- {
- ServerDescriptor.seedAdsTrustStore(ctxDestination,
- adsCtxSource.getTrustedCertificates());
- }
- catch (Throwable t)
- {
- LOG.log(Level.SEVERE, "Error seeding truststores: "+t, t);
- throw new ReplicationCliException(
- ERR_REPLICATION_ENABLE_SEEDING_TRUSTSTORE.get(t.toString()),
- ERROR_SEEDING_TRUSTORE, t);
- }
- }
- printProgress(formatter.getFormattedDone());
- printlnProgress();
-
- LinkedList<String> baseDNs = uData.getBaseDNs();
- if (!adsAlreadyReplicated)
- {
- boolean found = false;
- for (String dn : baseDNs)
- {
- if (Utils.areDnsEqual(dn, ADSContext.getAdministrationSuffixDN()))
- {
- found = true;
- break;
- }
- }
- if (!found)
- {
- baseDNs.add(ADSContext.getAdministrationSuffixDN());
- uData.setBaseDNs(baseDNs);
- }
- }
-
- if (uData.replicateSchema())
- {
- baseDNs = uData.getBaseDNs();
- baseDNs.add(Constants.SCHEMA_DN);
- uData.setBaseDNs(baseDNs);
- }
- TopologyCache cache1 = null;
- TopologyCache cache2 = null;
- try
- {
- LinkedHashSet<PreferredConnection> cnx =
- new LinkedHashSet<PreferredConnection>();
- cnx.addAll(getPreferredConnections(ctx1));
- cnx.addAll(getPreferredConnections(ctx2));
- if (adsCtx1.hasAdminData())
- {
- cache1 = new TopologyCache(adsCtx1, getTrustManager());
- cache1.setPreferredConnections(cnx);
- cache1.getFilter().setSearchMonitoringInformation(false);
- for (String dn : uData.getBaseDNs())
- {
- cache1.getFilter().addBaseDNToSearch(dn);
- }
- cache1.reloadTopology();
- usedReplicationServerIds.addAll(getReplicationServerIds(cache1));
- }
-
- if (adsCtx2.hasAdminData())
- {
- cache2 = new TopologyCache(adsCtx2, getTrustManager());
- cache2.setPreferredConnections(cnx);
- cache2.getFilter().setSearchMonitoringInformation(false);
- for (String dn : uData.getBaseDNs())
- {
- cache2.getFilter().addBaseDNToSearch(dn);
- }
- cache2.reloadTopology();
- usedReplicationServerIds.addAll(getReplicationServerIds(cache2));
- }
- }
- catch (ADSContextException adce)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_READING_ADS.get(adce.getMessage()),
- ERROR_READING_ADS, adce);
- }
- catch (TopologyCacheException tce)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
- ERROR_READING_TOPOLOGY_CACHE, tce);
- }
-
- if (server1.isReplicationServer())
- {
- twoReplServers.add(server1.getReplicationServerHostPort());
- usedReplicationServerIds.add(server1.getReplicationServerId());
- }
- else
- {
- twoReplServers.add(
- ConnectionUtils.getHostName(ctx1)+":"+uData.getReplicationPort1());
- }
- if (server2.isReplicationServer())
- {
- twoReplServers.add(server2.getReplicationServerHostPort());
- usedReplicationServerIds.add(server2.getReplicationServerId());
- }
- else
- {
- twoReplServers.add(
- ConnectionUtils.getHostName(ctx2)+":"+uData.getReplicationPort2());
- }
-
- for (String baseDN : uData.getBaseDNs())
- {
- LinkedHashSet<String> repServersForBaseDN = new LinkedHashSet<String>();
- repServersForBaseDN.addAll(getReplicationServers(baseDN, cache1,
- server1));
- repServersForBaseDN.addAll(getReplicationServers(baseDN, cache2,
- server2));
- repServersForBaseDN.addAll(twoReplServers);
- hmRepServers.put(baseDN, repServersForBaseDN);
-
- Set<Integer> ids = new HashSet<Integer>();
- ids.addAll(getReplicationDomainIds(baseDN, server1));
- ids.addAll(getReplicationDomainIds(baseDN, server2));
- if (cache1 != null)
- {
- for (ServerDescriptor server : cache1.getServers())
- {
- ids.addAll(getReplicationDomainIds(baseDN, server));
- }
- }
- if (cache2 != null)
- {
- for (ServerDescriptor server : cache2.getServers())
- {
- ids.addAll(getReplicationDomainIds(baseDN, server));
- }
- }
- hmUsedReplicationDomainIds.put(baseDN, ids);
- }
- for (LinkedHashSet<String> v : hmRepServers.values())
- {
- allRepServers.addAll(v);
- }
-
- Set<String> alreadyConfiguredReplicationServers = new HashSet<String>();
- if (!server1.isReplicationServer())
- {
- try
- {
- configureAsReplicationServer(ctx1, uData.getReplicationPort1(),
- uData.isSecureReplication1(), allRepServers,
- usedReplicationServerIds);
- }
- catch (OpenDsException ode)
- {
- throw new ReplicationCliException(
- getMessageForReplicationServerException(ode,
- ConnectionUtils.getHostPort(ctx1)),
- ERROR_CONFIGURING_REPLICATIONSERVER, ode);
- }
- }
- else
- {
- try
- {
- updateReplicationServer(ctx1, allRepServers);
- }
- catch (OpenDsException ode)
- {
- throw new ReplicationCliException(
- getMessageForReplicationServerException(ode,
- ConnectionUtils.getHostPort(ctx1)),
- ERROR_CONFIGURING_REPLICATIONSERVER, ode);
- }
- }
- alreadyConfiguredReplicationServers.add(server1.getId());
- if (!server2.isReplicationServer())
- {
- try
- {
- configureAsReplicationServer(ctx2, uData.getReplicationPort2(),
- uData.isSecureReplication2(), allRepServers,
- usedReplicationServerIds);
- }
- catch (OpenDsException ode)
- {
- throw new ReplicationCliException(
- getMessageForReplicationServerException(ode,
- ConnectionUtils.getHostPort(ctx1)),
- ERROR_CONFIGURING_REPLICATIONSERVER, ode);
- }
- }
- else
- {
- try
- {
- updateReplicationServer(ctx2, allRepServers);
- }
- catch (OpenDsException ode)
- {
- throw new ReplicationCliException(
- getMessageForReplicationServerException(ode,
- ConnectionUtils.getHostPort(ctx1)),
- ERROR_CONFIGURING_REPLICATIONSERVER, ode);
- }
- }
- alreadyConfiguredReplicationServers.add(server2.getId());
-
- for (String baseDN : uData.getBaseDNs())
- {
- LinkedHashSet<String> repServers = hmRepServers.get(baseDN);
- Set<Integer> usedIds = hmUsedReplicationDomainIds.get(baseDN);
- Set<String> alreadyConfiguredServers = new HashSet<String>();
-
- try
- {
- configureToReplicateBaseDN(ctx1, baseDN, repServers, usedIds);
- }
- catch (OpenDsException ode)
- {
- Message msg = getMessageForEnableException(ode,
- ConnectionUtils.getHostPort(ctx1), baseDN);
- throw new ReplicationCliException(msg,
- ERROR_ENABLING_REPLICATION_ON_BASEDN, ode);
- }
- alreadyConfiguredServers.add(server1.getId());
- try
- {
- configureToReplicateBaseDN(ctx2, baseDN, repServers, usedIds);
- }
- catch (OpenDsException ode)
- {
- Message msg = getMessageForEnableException(ode,
- ConnectionUtils.getHostPort(ctx2), baseDN);
- throw new ReplicationCliException(msg,
- ERROR_ENABLING_REPLICATION_ON_BASEDN, ode);
- }
- alreadyConfiguredServers.add(server2.getId());
-
- if (cache1 != null)
- {
- configureToReplicateBaseDN(baseDN, repServers, usedIds, cache1, server1,
- alreadyConfiguredServers, allRepServers,
- alreadyConfiguredReplicationServers);
- }
- if (cache2 != null)
- {
- configureToReplicateBaseDN(baseDN, repServers, usedIds, cache2, server2,
- alreadyConfiguredServers, allRepServers,
- alreadyConfiguredReplicationServers);
- }
- }
-
- // Now that replication is configured in all servers, simply try to
- // initialize the contents of one ADS with the other (in the case where
- // already both servers were replicating the same ADS there is nothing to be
- // done).
- if ((ctxSource != null) && (ctxDestination != null))
- {
- printProgress(formatter.getFormattedWithPoints(
- INFO_ENABLE_REPLICATION_INITIALIZING_ADS.get(
- ConnectionUtils.getHostPort(ctxDestination),
- ConnectionUtils.getHostPort(ctxSource))));
-
- initializeSuffix(ADSContext.getAdministrationSuffixDN(), ctxSource,
- ctxDestination, false);
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- }
-
- // If we must initialize the schema do so.
- if (mustInitializeSchema(server1, server2))
- {
- if (argParser.useSecondServerAsSchemaSource())
- {
- ctxSource = ctx2;
- ctxDestination = ctx1;
- }
- else
- {
- ctxSource = ctx1;
- ctxDestination = ctx2;
- }
- printProgress(formatter.getFormattedWithPoints(
- INFO_ENABLE_REPLICATION_INITIALIZING_SCHEMA.get(
- ConnectionUtils.getHostPort(ctxDestination),
- ConnectionUtils.getHostPort(ctxSource))));
- initializeSuffix(Constants.SCHEMA_DN, ctxSource,
- ctxDestination, false);
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- }
- }
-
- /**
- * Updates the configuration in the server (and in other servers if
- * they are referenced) to disable replication.
- * @param ctx the connection to the server.
- * @param uData the DisableReplicationUserData object containing the required
- * parameters to update the configuration.
- * @throws ReplicationCliException if there is an error.
- */
- private void updateConfiguration(InitialLdapContext ctx,
- DisableReplicationUserData uData) throws ReplicationCliException
- {
- ServerDescriptor server;
- TopologyCacheFilter filter = new TopologyCacheFilter();
- filter.setSearchMonitoringInformation(false);
- filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN());
- for (String dn : uData.getBaseDNs())
- {
- filter.addBaseDNToSearch(dn);
- }
- try
- {
- server = ServerDescriptor.createStandalone(ctx, filter);
- }
- catch (NamingException ne)
- {
- throw new ReplicationCliException(
- getMessageForException(ne, ConnectionUtils.getHostPort(ctx)),
- ERROR_READING_CONFIGURATION, ne);
- }
-
- ADSContext adsCtx = new ADSContext(ctx);
-
- TopologyCache cache = null;
- // Only try to update remote server if the user provided a Global
- // Administrator to authenticate.
- boolean tryToUpdateRemote = uData.getAdminUid() != null;
- try
- {
- if (adsCtx.hasAdminData() && tryToUpdateRemote)
- {
- cache = new TopologyCache(adsCtx, getTrustManager());
- cache.setPreferredConnections(getPreferredConnections(ctx));
- cache.getFilter().setSearchMonitoringInformation(false);
- for (String dn : uData.getBaseDNs())
- {
- cache.getFilter().addBaseDNToSearch(dn);
- }
- cache.reloadTopology();
- }
- }
- catch (ADSContextException adce)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_READING_ADS.get(adce.getMessage()),
- ERROR_READING_ADS, adce);
- }
- catch (TopologyCacheException tce)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
- ERROR_READING_TOPOLOGY_CACHE, tce);
- }
- if (!argParser.isInteractive())
- {
- // Inform the user of the potential errors that we found.
- LinkedHashSet<Message> messages = new LinkedHashSet<Message>();
- if (cache != null)
- {
- messages.addAll(getErrorMessages(cache));
- }
- if (!messages.isEmpty())
- {
- println(
- ERR_REPLICATION_READING_REGISTERED_SERVERS_WARNING.get(
- Utils.getMessageFromCollection(messages,
- Constants.LINE_SEPARATOR).toString()));
- }
- }
-
- /**
- * Try to figure out if we must explicitly disable replication on
- * cn=admin data and cn=schema.
- */
- boolean forceDisableSchema = false;
- boolean forceDisableADS = false;
- boolean schemaReplicated = false;
- boolean adsReplicated = false;
- boolean disableAllBaseDns = disableAllBaseDns(ctx, uData);
-
- Collection<ReplicaDescriptor> replicas = getReplicas(ctx);
- for (ReplicaDescriptor rep : replicas)
- {
- String dn = rep.getSuffix().getDN();
- if (rep.isReplicated())
- {
- if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn))
- {
- adsReplicated = true;
- }
- else if (Utils.areDnsEqual(Constants.SCHEMA_DN, dn))
- {
- schemaReplicated = true;
- }
- }
- }
-
- if (disableAllBaseDns)
- {
- // Unregister the server from the ADS
- server.updateAdsPropertiesWithServerProperties();
- try
- {
- adsCtx.unregisterServer(server.getAdsProperties());
- try
- {
- // To be sure that the change gets propagated
- Thread.sleep(2000);
- }
- catch (Throwable t)
- {
- }
- }
- catch (ADSContextException adce)
- {
- LOG.log(Level.INFO, "Error unregistering server: "+
- server.getAdsProperties(), adce);
- println();
- println(
- ERR_REPLICATION_UPDATING_ADS.get(adce.getMessage()));
- println();
- }
- }
-
- if (disableAllBaseDns)
- {
- forceDisableSchema = schemaReplicated;
- forceDisableADS = adsReplicated;
- for (String dn : uData.getBaseDNs())
- {
- if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn))
- {
- // The user already asked this to be explicitly disabled
- forceDisableADS = false;
- }
- else if (Utils.areDnsEqual(Constants.SCHEMA_DN, dn))
- {
- // The user already asked this to be explicitly disabled
- forceDisableSchema = false;
- }
- }
- }
- Set<String> suffixesToDisable = new HashSet<String>(uData.getBaseDNs());
- if (forceDisableSchema)
- {
- suffixesToDisable.add(Constants.SCHEMA_DN);
- }
- if (forceDisableADS)
- {
- suffixesToDisable.add(ADSContext.getAdministrationSuffixDN());
- }
-
- String replicationServerHostPort = server.getReplicationServerHostPort();
- for (String baseDN : suffixesToDisable)
- {
- try
- {
- deleteReplicationDomain(ctx, baseDN);
- }
- catch (OpenDsException ode)
- {
- Message msg = getMessageForDisableException(ode,
- ConnectionUtils.getHostPort(ctx), baseDN);
- throw new ReplicationCliException(msg,
- ERROR_DISABLING_REPLICATION_ON_BASEDN, ode);
- }
- }
-
- if ((replicationServerHostPort != null) && (cache != null))
- {
- Set<ServerDescriptor> serversToUpdate =
- new LinkedHashSet<ServerDescriptor>();
- for (String baseDN : suffixesToDisable)
- {
- SuffixDescriptor suffix = getSuffix(baseDN, cache, server);
- if (suffix != null)
- {
- for (ReplicaDescriptor replica : suffix.getReplicas())
- {
- serversToUpdate.add(replica.getServer());
- }
- }
- }
- String bindDn = ConnectionUtils.getBindDN(ctx);
- String pwd = ConnectionUtils.getBindPassword(ctx);
- for (ServerDescriptor s : serversToUpdate)
- {
- removeReferencesInServer(s, replicationServerHostPort, bindDn, pwd,
- suffixesToDisable, disableAllBaseDns, getPreferredConnections(ctx));
- }
-
- if (disableAllBaseDns)
- {
- // Disable replication server
- disableReplicationServer(ctx);
- // Wait to be sure that changes are taken into account and reset the
- // contents of the ADS.
- try
- {
- Thread.sleep(2000);
- }
- catch (Throwable t)
- {
- }
- for (ServerDescriptor s: serversToUpdate)
- {
- try
- {
- adsCtx.unregisterServer(s.getAdsProperties());
- }
- catch (ADSContextException adce)
- {
- LOG.log(Level.INFO, "Error unregistering server: "+
- s.getAdsProperties(), adce);
- println();
- println(
- ERR_REPLICATION_UPDATING_ADS.get(adce.getMessage()));
- println();
- }
- }
- }
- }
- }
-
- /**
- * Displays the replication status of the different base DNs in the servers
- * registered in the ADS.
- * @param ctx the connection to the server.
- * @param uData the StatusReplicationUserData object containing the required
- * parameters to update the configuration.
- * @throws ReplicationCliException if there is an error.
- */
- private void displayStatus(InitialLdapContext ctx,
- StatusReplicationUserData uData) throws ReplicationCliException
- {
- ADSContext adsCtx = new ADSContext(ctx);
-
- TopologyCache cache = null;
- try
- {
- cache = new TopologyCache(adsCtx, getTrustManager());
- cache.setPreferredConnections(getPreferredConnections(ctx));
- for (String dn : uData.getBaseDNs())
- {
- cache.getFilter().addBaseDNToSearch(dn);
- }
- cache.reloadTopology();
- }
- catch (TopologyCacheException tce)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
- ERROR_READING_TOPOLOGY_CACHE, tce);
- }
- if (!argParser.isInteractive())
- {
- // Inform the user of the potential errors that we found.
- LinkedHashSet<Message> messages = new LinkedHashSet<Message>();
- if (cache != null)
- {
- messages.addAll(getErrorMessages(cache));
- }
- if (!messages.isEmpty())
- {
- Message msg =
- ERR_REPLICATION_STATUS_READING_REGISTERED_SERVERS.get(
- Utils.getMessageFromCollection(messages,
- Constants.LINE_SEPARATOR).toString());
- println(msg);
- }
- }
-
- LinkedList<String> userBaseDNs = uData.getBaseDNs();
- LinkedList<Set<ReplicaDescriptor>> replicaLists =
- new LinkedList<Set<ReplicaDescriptor>>();
-
- boolean oneReplicated = false;
- for (SuffixDescriptor suffix : cache.getSuffixes())
- {
- String dn = suffix.getDN();
-
- // If no base DNs where specified display all the base DNs but the schema
- // and cn=admin data.
- boolean found = userBaseDNs.isEmpty() &&
- !Utils.areDnsEqual(dn, ADSContext.getAdministrationSuffixDN()) &&
- !Utils.areDnsEqual(dn, Constants.SCHEMA_DN) &&
- !Utils.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN);
- for (String baseDN : userBaseDNs)
- {
- found = Utils.areDnsEqual(baseDN, dn);
- if (found)
- {
- break;
- }
- }
- if (found)
- {
- boolean replicated = false;
- for (ReplicaDescriptor replica : suffix.getReplicas())
- {
- if (replica.isReplicated())
- {
- replicated = true;
- break;
- }
- }
- if (replicated)
- {
- oneReplicated = true;
- replicaLists.add(suffix.getReplicas());
- }
- else
- {
- // Check if there are already some non replicated base DNs.
- found = false;
- for (Set<ReplicaDescriptor> replicas : replicaLists)
- {
- ReplicaDescriptor replica = replicas.iterator().next();
- if (!replica.isReplicated() &&
- Utils.areDnsEqual(dn, replica.getSuffix().getDN()))
- {
- replicas.addAll(suffix.getReplicas());
- found = true;
- break;
- }
- }
- if (!found)
- {
- replicaLists.add(suffix.getReplicas());
- }
- }
- }
- }
-
- if (replicaLists.isEmpty())
- {
- printProgress(INFO_REPLICATION_STATUS_NO_BASEDNS.get());
- printlnProgress();
- }
- else
- {
- LinkedList<Set<ReplicaDescriptor>> orderedReplicaLists =
- new LinkedList<Set<ReplicaDescriptor>>();
- for (Set<ReplicaDescriptor> replicas1 : replicaLists)
- {
- String dn1 = replicas1.iterator().next().getSuffix().getDN();
- boolean inserted = false;
- for (int i=0; i<orderedReplicaLists.size() && !inserted; i++)
- {
- String dn2 =
- orderedReplicaLists.get(i).iterator().next().getSuffix().getDN();
- if (dn1.compareTo(dn2) < 0)
- {
- orderedReplicaLists.add(i, replicas1);
- inserted = true;
- }
- }
- if (!inserted)
- {
- orderedReplicaLists.add(replicas1);
- }
- }
- for (Set<ReplicaDescriptor> replicas : orderedReplicaLists)
- {
- printlnProgress();
- displayStatus(replicas, uData.isScriptFriendly(),
- getPreferredConnections(ctx));
- }
- if (oneReplicated && !uData.isScriptFriendly())
- {
- printlnProgress();
- printProgress(INFO_REPLICATION_STATUS_REPLICATED_LEGEND.get());
- printlnProgress();
- }
- }
- }
-
- /**
- * Displays the replication status of the replicas provided. The code assumes
- * that all the replicas have the same baseDN and that if they are replicated
- * all the replicas are replicated with each other.
- * @param replicas the list of replicas that we are trying to display.
- * @param cnx the preferred connections used to connect to the server.
- * @param scriptFriendly wheter to display it on script-friendly mode or not.
- */
- private void displayStatus(Set<ReplicaDescriptor> replicas,
- boolean scriptFriendly, LinkedHashSet<PreferredConnection> cnx)
- {
-
- boolean isReplicated = false;
- Set<ReplicaDescriptor> orderedReplicas =
- new LinkedHashSet<ReplicaDescriptor>();
- Set<String> hostPorts = new TreeSet<String>();
- for (ReplicaDescriptor replica : replicas)
- {
- if (replica.isReplicated())
- {
- isReplicated = true;
- }
- hostPorts.add(getHostPort(replica.getServer(), cnx));
- }
- for (String hostPort : hostPorts)
- {
- for (ReplicaDescriptor replica : replicas)
- {
- if (getHostPort(replica.getServer(), cnx).equals(hostPort))
- {
- orderedReplicas.add(replica);
- }
- }
- }
- final int SERVERPORT = 0;
- final int NUMBER_ENTRIES = 1;
- final int MISSING_CHANGES = 2;
- final int AGE_OF_OLDEST_MISSING_CHANGE = 3;
- final int REPLICATION_PORT = 4;
- final int SECURE = 5;
- Message[] headers;
- if (scriptFriendly)
- {
- if (isReplicated)
- {
- headers = new Message[] {
- INFO_REPLICATION_STATUS_LABEL_SERVERPORT.get(),
- INFO_REPLICATION_STATUS_LABEL_NUMBER_ENTRIES.get(),
- INFO_REPLICATION_STATUS_LABEL_MISSING_CHANGES.get(),
- INFO_REPLICATION_STATUS_LABEL_AGE_OF_OLDEST_MISSING_CHANGE.get(),
- INFO_REPLICATION_STATUS_LABEL_REPLICATION_PORT.get(),
- INFO_REPLICATION_STATUS_LABEL_SECURE.get()
- };
- }
- else
- {
- headers = new Message[] {
- INFO_REPLICATION_STATUS_LABEL_SERVERPORT.get(),
- INFO_REPLICATION_STATUS_LABEL_NUMBER_ENTRIES.get()
- };
- }
- }
- else
- {
- if (isReplicated)
- {
- headers = new Message[] {
- INFO_REPLICATION_STATUS_HEADER_SERVERPORT.get(),
- INFO_REPLICATION_STATUS_HEADER_NUMBER_ENTRIES.get(),
- INFO_REPLICATION_STATUS_HEADER_MISSING_CHANGES.get(),
- INFO_REPLICATION_STATUS_HEADER_AGE_OF_OLDEST_MISSING_CHANGE.get(),
- INFO_REPLICATION_STATUS_HEADER_REPLICATION_PORT.get(),
- INFO_REPLICATION_STATUS_HEADER_SECURE.get()
- };
- }
- else
- {
- headers = new Message[] {
- INFO_REPLICATION_STATUS_HEADER_SERVERPORT.get(),
- INFO_REPLICATION_STATUS_HEADER_NUMBER_ENTRIES.get()
- };
- }
- }
- Message[][] values = new Message[orderedReplicas.size()][headers.length];
-
- int i = 0;
- for (ReplicaDescriptor replica : orderedReplicas)
- {
- Message v;
- for (int j=0; j<headers.length; j++)
- {
- switch (j)
- {
- case SERVERPORT:
- v = Message.raw(getHostPort(replica.getServer(), cnx));
- break;
- case NUMBER_ENTRIES:
- int nEntries = replica.getEntries();
- if (nEntries >= 0)
- {
- v = Message.raw(String.valueOf(nEntries));
- }
- else
- {
- v = INFO_NOT_AVAILABLE_SHORT_LABEL.get();
- }
- break;
- case MISSING_CHANGES:
- int missingChanges = replica.getMissingChanges();
- if (missingChanges >= 0)
- {
- v = Message.raw(String.valueOf(missingChanges));
- }
- else
- {
- v = INFO_NOT_AVAILABLE_SHORT_LABEL.get();
- }
- break;
- case AGE_OF_OLDEST_MISSING_CHANGE:
- long ageOfOldestMissingChange = replica.getAgeOfOldestMissingChange();
- if (ageOfOldestMissingChange > 0)
- {
- Date date = new Date(ageOfOldestMissingChange);
- v = Message.raw(date.toString());
- }
- else
- {
- v = INFO_NOT_AVAILABLE_SHORT_LABEL.get();
- }
- break;
- case REPLICATION_PORT:
- int replicationPort = replica.getServer().getReplicationServerPort();
- if (replicationPort >= 0)
- {
- v = Message.raw(String.valueOf(replicationPort));
- }
- else
- {
- v = INFO_NOT_AVAILABLE_SHORT_LABEL.get();
- }
- break;
- case SECURE:
- if (replica.getServer().isReplicationSecure())
- {
- v = INFO_REPLICATION_STATUS_SECURITY_ENABLED.get();
- }
- else
- {
- v = INFO_REPLICATION_STATUS_SECURITY_DISABLED.get();
- }
- break;
- default:
- throw new IllegalStateException("Unknown index: "+j);
- }
- values[i][j] = v;
- }
- i++;
- }
-
- String dn = replicas.iterator().next().getSuffix().getDN();
- if (scriptFriendly)
- {
- Message[] labels = {
- INFO_REPLICATION_STATUS_BASEDN.get(),
- INFO_REPLICATION_STATUS_IS_REPLICATED.get()
- };
- Message[] vs = {
- Message.raw(dn),
- isReplicated ? INFO_BASEDN_REPLICATED_LABEL.get() :
- INFO_BASEDN_NOT_REPLICATED_LABEL.get()
- };
- for (i=0; i<labels.length; i++)
- {
- printProgress(Message.raw(labels[i]+" "+vs[i]));
- printlnProgress();
- }
-
- for (i=0; i<values.length; i++)
- {
- printProgress(Message.raw("-"));
- printlnProgress();
- for (int j=0; j<values[i].length; j++)
- {
- printProgress(Message.raw(headers[j]+" "+values[i][j]));
- printlnProgress();
- }
- }
- }
- else
- {
- Message msg;
- if (isReplicated)
- {
- msg = INFO_REPLICATION_STATUS_REPLICATED.get(dn);
- }
- else
- {
- msg = INFO_REPLICATION_STATUS_NOT_REPLICATED.get(dn);
- }
- printProgressMessageNoWrap(msg);
- printlnProgress();
- int length = msg.length();
- StringBuffer buf = new StringBuffer();
- for (i=0; i<length; i++)
- {
- buf.append("=");
- }
- printProgressMessageNoWrap(Message.raw(buf.toString()));
- printlnProgress();
-
- TableBuilder table = new TableBuilder();
- for (i=0; i< headers.length; i++)
- {
- table.appendHeading(headers[i]);
- }
- for (i=0; i<values.length; i++)
- {
- table.startRow();
- for (int j=0; j<headers.length; j++)
- {
- table.appendCell(values[i][j]);
- }
- }
- TextTablePrinter printer = new TextTablePrinter(getOutputStream());
- printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
- table.print(printer);
- }
- }
-
- /**
- * Retrieves all the replication servers for a given baseDN. The
- * ServerDescriptor is used to identify the server where the suffix is
- * defined and it cannot be null. The TopologyCache is used to retrieve
- * replication servers defined in other replicas but not in the one we
- * get in the ServerDescriptor.
- * @param baseDN the base DN.
- * @param cache the TopologyCache (might be null).
- * @param server the ServerDescriptor.
- * @return a Set containing the replication servers currently being used
- * to replicate the baseDN defined in the server described by the
- * ServerDescriptor.
- */
- private LinkedHashSet<String> getReplicationServers(String baseDN,
- TopologyCache cache, ServerDescriptor server)
- {
- LinkedHashSet<String> servers = new LinkedHashSet<String>();
- for (ReplicaDescriptor replica : server.getReplicas())
- {
- if (Utils.areDnsEqual(replica.getSuffix().getDN(), baseDN))
- {
- servers.addAll(replica.getReplicationServers());
- break;
- }
- }
- if (cache != null)
- {
- Set<SuffixDescriptor> suffixes = cache.getSuffixes();
- for (SuffixDescriptor suffix : suffixes)
- {
- if (Utils.areDnsEqual(suffix.getDN(), baseDN))
- {
- Set<String> s = suffix.getReplicationServers();
- // Test that at least we share one of the replication servers.
- // If we do: we are dealing with the same replication topology
- // (we must consider the case of disjoint replication topologies
- // replicating the same base DN).
- HashSet<String> copy = new HashSet<String>(s);
- copy.retainAll(servers);
- if (!copy.isEmpty())
- {
- servers.addAll(s);
- break;
- }
- }
- }
- }
- return servers;
- }
-
- /**
- * Retrieves the suffix in the TopologyCache for a given baseDN. The
- * ServerDescriptor is used to identify the server where the suffix is
- * defined.
- * @param baseDN the base DN.
- * @param cache the TopologyCache.
- * @param server the ServerDescriptor.
- * @return the suffix in the TopologyCache for a given baseDN.
- */
- private SuffixDescriptor getSuffix(String baseDN, TopologyCache cache,
- ServerDescriptor server)
- {
- SuffixDescriptor returnValue = null;
- Set<String> servers = new LinkedHashSet<String>();
- for (ReplicaDescriptor replica : server.getReplicas())
- {
- if (Utils.areDnsEqual(replica.getSuffix().getDN(), baseDN))
- {
- servers.addAll(replica.getReplicationServers());
- break;
- }
- }
-
- Set<SuffixDescriptor> suffixes = cache.getSuffixes();
- for (SuffixDescriptor suffix : suffixes)
- {
- if (Utils.areDnsEqual(suffix.getDN(), baseDN))
- {
- Set<String> s = suffix.getReplicationServers();
- // Test that at least we share one of the replication servers.
- // If we do: we are dealing with the same replication topology
- // (we must consider the case of disjoint replication topologies
- // replicating the same base DN).
- HashSet<String> copy = new HashSet<String>(s);
- copy.retainAll(servers);
- if (!copy.isEmpty())
- {
- returnValue = suffix;
- break;
- }
- }
- }
- return returnValue;
- }
-
- /**
- * Retrieves all the replication domain IDs for a given baseDN in the
- * ServerDescriptor.
- * @param baseDN the base DN.
- * @param server the ServerDescriptor.
- * @return a Set containing the replication domain IDs for a given baseDN in
- * the ServerDescriptor.
- */
- private Set<Integer> getReplicationDomainIds(String baseDN,
- ServerDescriptor server)
- {
- Set<Integer> ids = new HashSet<Integer>();
- for (ReplicaDescriptor replica : server.getReplicas())
- {
- if ((replica.isReplicated()) &&
- Utils.areDnsEqual(replica.getSuffix().getDN(), baseDN))
- {
- ids.add(replica.getReplicationId());
- break;
- }
- }
- return ids;
- }
-
- /**
- * Configures the server to which the provided InitialLdapContext is connected
- * as a replication server. The replication server listens in the provided
- * port.
- * @param ctx the context connected to the server that we want to configure.
- * @param replicationPort the replication port of the replication server.
- * @param useSecureReplication whether to have encrypted communication with
- * the replication port or not.
- * @param replicationServers the list of replication servers to which the
- * replication server will communicate with.
- * @param usedReplicationServerIds the set of replication server IDs that
- * are already in use. The set will be updated with the replication ID
- * that will be used by the newly configured replication server.
- * @throws OpenDsException if there is an error updating the configuration.
- */
- private void configureAsReplicationServer(InitialLdapContext ctx,
- int replicationPort, boolean useSecureReplication,
- LinkedHashSet<String> replicationServers,
- Set<Integer> usedReplicationServerIds) throws OpenDsException
- {
- printProgress(formatter.getFormattedWithPoints(
- INFO_REPLICATION_ENABLE_CONFIGURING_REPLICATION_SERVER.get(
- ConnectionUtils.getHostPort(ctx))));
-
- ManagementContext mCtx = LDAPManagementContext.createFromContext(
- JNDIDirContextAdaptor.adapt(ctx));
- RootCfgClient root = mCtx.getRootConfiguration();
-
- /*
- * Configure Synchronization plugin.
- */
- ReplicationSynchronizationProviderCfgClient sync = null;
- try
- {
- sync = (ReplicationSynchronizationProviderCfgClient)
- root.getSynchronizationProvider("Multimaster Synchronization");
- }
- catch (ManagedObjectNotFoundException monfe)
- {
- LOG.log(Level.INFO, "Synchronization server does not exist in "+
- ConnectionUtils.getHostPort(ctx));
- }
- if (sync == null)
- {
- ReplicationSynchronizationProviderCfgDefn provider =
- ReplicationSynchronizationProviderCfgDefn.getInstance();
- sync = root.createSynchronizationProvider(provider,
- "Multimaster Synchronization",
- new ArrayList<DefaultBehaviorException>());
- sync.setJavaClass(
- org.opends.server.replication.plugin.MultimasterReplication.class.
- getName());
- sync.setEnabled(Boolean.TRUE);
- }
- else
- {
- if (!sync.isEnabled())
- {
- sync.setEnabled(Boolean.TRUE);
- }
- }
- sync.commit();
-
- /*
- * Configure the replication server.
- */
- ReplicationServerCfgClient replicationServer = null;
-
- boolean mustCommit = false;
-
- if (!sync.hasReplicationServer())
- {
- CryptoManagerCfgClient crypto = root.getCryptoManager();
- if (useSecureReplication != crypto.isSSLEncryption())
- {
- crypto.setSSLEncryption(useSecureReplication);
- crypto.commit();
- }
- int id = InstallerHelper.getReplicationId(usedReplicationServerIds);
- usedReplicationServerIds.add(id);
- replicationServer = sync.createReplicationServer(
- ReplicationServerCfgDefn.getInstance(),
- new ArrayList<DefaultBehaviorException>());
- replicationServer.setReplicationServerId(id);
- replicationServer.setReplicationPort(replicationPort);
- replicationServer.setReplicationServer(replicationServers);
- mustCommit = true;
- }
- else
- {
- replicationServer = sync.getReplicationServer();
- usedReplicationServerIds.add(
- replicationServer.getReplicationServerId());
- Set<String> servers = replicationServer.getReplicationServer();
- if (servers == null)
- {
- replicationServer.setReplicationServer(replicationServers);
- mustCommit = true;
- }
- else if (!areReplicationServersEqual(servers, replicationServers))
- {
- replicationServers.addAll(servers);
- replicationServer.setReplicationServer(
- mergeReplicationServers(replicationServers, servers));
- mustCommit = true;
- }
- }
- if (mustCommit)
- {
- replicationServer.commit();
- }
-
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- }
-
- /**
- * Updates the configuration of the replication server with the list of
- * replication servers provided.
- * @param ctx the context connected to the server that we want to update.
- * @param replicationServers the list of replication servers to which the
- * replication server will communicate with.
- * @throws OpenDsException if there is an error updating the configuration.
- */
- private void updateReplicationServer(InitialLdapContext ctx,
- LinkedHashSet<String> replicationServers) throws OpenDsException
- {
- printProgress(formatter.getFormattedWithPoints(
- INFO_REPLICATION_ENABLE_UPDATING_REPLICATION_SERVER.get(
- ConnectionUtils.getHostPort(ctx))));
-
- ManagementContext mCtx = LDAPManagementContext.createFromContext(
- JNDIDirContextAdaptor.adapt(ctx));
- RootCfgClient root = mCtx.getRootConfiguration();
-
- ReplicationSynchronizationProviderCfgClient sync =
- (ReplicationSynchronizationProviderCfgClient)
- root.getSynchronizationProvider("Multimaster Synchronization");
- boolean mustCommit = false;
- ReplicationServerCfgClient replicationServer = sync.getReplicationServer();
- Set<String> servers = replicationServer.getReplicationServer();
- if (servers == null)
- {
- replicationServer.setReplicationServer(replicationServers);
- mustCommit = true;
- }
- else if (!areReplicationServersEqual(servers, replicationServers))
- {
- replicationServers.addAll(servers);
- replicationServer.setReplicationServer(
- mergeReplicationServers(replicationServers, servers));
- mustCommit = true;
- }
- if (mustCommit)
- {
- replicationServer.commit();
- }
-
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- }
-
- /**
- * Returns a Set containing all the replication server ids found in the
- * servers of a given TopologyCache object.
- * @param cache the TopologyCache object to use.
- * @return a Set containing all the replication server ids found in a given
- * TopologyCache object.
- */
- private Set<Integer> getReplicationServerIds(TopologyCache cache)
- {
- Set<Integer> ids = new HashSet<Integer>();
- for (ServerDescriptor server : cache.getServers())
- {
- if (server.isReplicationServer())
- {
- ids.add(server.getReplicationServerId());
- }
- }
- return ids;
- }
-
- /**
- * Configures a replication domain for a given base DN in the server to which
- * the provided InitialLdapContext is connected.
- * @param ctx the context connected to the server that we want to configure.
- * @param baseDN the base DN of the replication domain to configure.
- * @param replicationServers the list of replication servers to which the
- * replication domain will communicate with.
- * @param usedReplicationDomainIds the set of replication domain IDs that
- * are already in use. The set will be updated with the replication ID
- * that will be used by the newly configured replication server.
- * @throws OpenDsException if there is an error updating the configuration.
- */
- private void configureToReplicateBaseDN(InitialLdapContext ctx,
- String baseDN,
- LinkedHashSet<String> replicationServers,
- Set<Integer> usedReplicationDomainIds) throws OpenDsException
- {
- boolean userSpecifiedAdminBaseDN = false;
- LinkedList<String> l = argParser.getBaseDNs();
- if (l != null)
- {
- for (String dn : l)
- {
- if (Utils.areDnsEqual(dn, ADSContext.getAdministrationSuffixDN()))
- {
- userSpecifiedAdminBaseDN = true;
- break;
- }
- }
- }
- if (!userSpecifiedAdminBaseDN && Utils.areDnsEqual(baseDN,
- ADSContext.getAdministrationSuffixDN()))
- {
- printProgress(formatter.getFormattedWithPoints(
- INFO_REPLICATION_ENABLE_CONFIGURING_ADS.get(
- ConnectionUtils.getHostPort(ctx))));
- }
- else
- {
- printProgress(formatter.getFormattedWithPoints(
- INFO_REPLICATION_ENABLE_CONFIGURING_BASEDN.get(baseDN,
- ConnectionUtils.getHostPort(ctx))));
- }
- ManagementContext mCtx = LDAPManagementContext.createFromContext(
- JNDIDirContextAdaptor.adapt(ctx));
- RootCfgClient root = mCtx.getRootConfiguration();
-
- ReplicationSynchronizationProviderCfgClient sync =
- (ReplicationSynchronizationProviderCfgClient)
- root.getSynchronizationProvider("Multimaster Synchronization");
-
- String[] domainNames = sync.listReplicationDomains();
- if (domainNames == null)
- {
- domainNames = new String[]{};
- }
- ReplicationDomainCfgClient[] domains =
- new ReplicationDomainCfgClient[domainNames.length];
- for (int i=0; i<domains.length; i++)
- {
- domains[i] = sync.getReplicationDomain(domainNames[i]);
- }
- ReplicationDomainCfgClient domain = null;
- String domainName = null;
- for (int i=0; i<domains.length && (domain == null); i++)
- {
- if (Utils.areDnsEqual(baseDN, domains[i].getBaseDN().toString()))
- {
- domain = domains[i];
- domainName = domainNames[i];
- }
- }
- boolean mustCommit = false;
- if (domain == null)
- {
- int domainId = InstallerHelper.getReplicationId(usedReplicationDomainIds);
- usedReplicationDomainIds.add(domainId);
- domainName = InstallerHelper.getDomainName(domainNames, domainId, baseDN);
- domain = sync.createReplicationDomain(
- ReplicationDomainCfgDefn.getInstance(), domainName,
- new ArrayList<DefaultBehaviorException>());
- domain.setServerId(domainId);
- domain.setBaseDN(DN.decode(baseDN));
- domain.setReplicationServer(replicationServers);
- mustCommit = true;
- }
- else
- {
- Set<String> servers = domain.getReplicationServer();
- if (servers == null)
- {
- domain.setReplicationServer(servers);
- mustCommit = true;
- }
- else if (!areReplicationServersEqual(servers, replicationServers))
- {
- domain.setReplicationServer(mergeReplicationServers(replicationServers,
- servers));
- mustCommit = true;
- }
- }
-
- if (mustCommit)
- {
- domain.commit();
- }
-
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- }
-
- /**
- * Configures the baseDN to replicate in all the Replicas found in a Topology
- * Cache that are replicated with the Replica of the same base DN in the
- * provided ServerDescriptor object.
- * @param baseDN the base DN to replicate.
- * @param repServers the replication servers to be defined in the domain.
- * @param usedIds the replication domain Ids already used. This Set is
- * updated with the new domains that are used.
- * @param cache the TopologyCache used to retrieve the different defined
- * replicas.
- * @param server the ServerDescriptor that is used to identify the
- * replication topology that we are interested at (we only update the replicas
- * that are already replicated with this server).
- * @param alreadyConfiguredServers the list of already configured servers. If
- * a server is in this list no updates are performed to the domain.
- * @param alreadyConfiguredReplicationServers the list of already configured
- * servers. If a server is in this list no updates are performed to the
- * replication server.
- * @throws ReplicationCliException if something goes wrong.
- */
- private void configureToReplicateBaseDN(String baseDN,
- LinkedHashSet<String> repServers, Set<Integer> usedIds,
- TopologyCache cache, ServerDescriptor server,
- Set<String> alreadyConfiguredServers, LinkedHashSet<String> allRepServers,
- Set<String> alreadyConfiguredReplicationServers)
- throws ReplicationCliException
- {
- SuffixDescriptor suffix = getSuffix(baseDN, cache, server);
- if (suffix != null)
- {
- for (ReplicaDescriptor replica: suffix.getReplicas())
- {
- ServerDescriptor s = replica.getServer();
- if (!alreadyConfiguredServers.contains(s.getId()))
- {
- String dn = ConnectionUtils.getBindDN(
- cache.getAdsContext().getDirContext());
- String pwd = ConnectionUtils.getBindPassword(
- cache.getAdsContext().getDirContext());
- TopologyCacheFilter filter = new TopologyCacheFilter();
- filter.setSearchMonitoringInformation(false);
- filter.setSearchBaseDNInformation(false);
- ServerLoader loader = new ServerLoader(s.getAdsProperties(),
- dn, pwd, getTrustManager(), cache.getPreferredConnections(),
- filter);
- InitialLdapContext ctx = null;
- try
- {
- ctx = loader.createContext();
- configureToReplicateBaseDN(ctx, baseDN, repServers, usedIds);
- if (!alreadyConfiguredReplicationServers.contains(s.getId()))
- {
- updateReplicationServer(ctx, allRepServers);
- alreadyConfiguredReplicationServers.add(s.getId());
- }
- }
- catch (NamingException ne)
- {
- String hostPort = getHostPort(server,
- cache.getPreferredConnections());
- Message msg = getMessageForException(ne, hostPort);
- throw new ReplicationCliException(msg, ERROR_CONNECTING, ne);
- }
- catch (OpenDsException ode)
- {
- String hostPort = getHostPort(server,
- cache.getPreferredConnections());
- Message msg = getMessageForEnableException(ode, hostPort, baseDN);
- throw new ReplicationCliException(msg,
- ERROR_ENABLING_REPLICATION_ON_BASEDN, ode);
- }
- finally
- {
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
- }
- alreadyConfiguredServers.add(s.getId());
- }
- }
- }
- }
-
- /**
- * Returns the Map of properties to be used to update the ADS.
- * This map uses the data provided by the user.
- * @return the Map of properties to be used to update the ADS.
- * This map uses the data provided by the user
- */
- private Map<ADSContext.AdministratorProperty, Object>
- getAdministratorProperties(ReplicationUserData uData)
- {
- Map<ADSContext.AdministratorProperty, Object> adminProperties =
- new HashMap<ADSContext.AdministratorProperty, Object>();
- adminProperties.put(ADSContext.AdministratorProperty.UID,
- uData.getAdminUid());
- adminProperties.put(ADSContext.AdministratorProperty.PASSWORD,
- uData.getAdminPwd());
- adminProperties.put(ADSContext.AdministratorProperty.DESCRIPTION,
- INFO_GLOBAL_ADMINISTRATOR_DESCRIPTION.get().toString());
- return adminProperties;
- }
-
- private void initializeSuffix(String baseDN, InitialLdapContext ctxSource,
- InitialLdapContext ctxDestination, boolean displayProgress)
- throws ReplicationCliException
- {
- int replicationId = -1;
- try
- {
- TopologyCacheFilter filter = new TopologyCacheFilter();
- filter.setSearchMonitoringInformation(false);
- filter.addBaseDNToSearch(baseDN);
- ServerDescriptor source = ServerDescriptor.createStandalone(ctxSource,
- filter);
- for (ReplicaDescriptor replica : source.getReplicas())
- {
- if (Utils.areDnsEqual(replica.getSuffix().getDN(), baseDN))
- {
- replicationId = replica.getReplicationId();
- break;
- }
- }
- }
- catch (NamingException ne)
- {
- String hostPort = ConnectionUtils.getHostPort(ctxSource);
- Message msg = getMessageForException(ne, hostPort);
- throw new ReplicationCliException(msg, ERROR_READING_CONFIGURATION, ne);
- }
-
- if (replicationId == -1)
- {
- throw new ReplicationCliException(
- ERR_INITIALIZING_REPLICATIONID_NOT_FOUND.get(
- ConnectionUtils.getHostPort(ctxSource), baseDN),
- REPLICATIONID_NOT_FOUND, null);
- }
-
- OfflineInstaller installer = new OfflineInstaller();
- installer.setProgressMessageFormatter(formatter);
- installer.addProgressUpdateListener(new ProgressUpdateListener()
- {
- public void progressUpdate(ProgressUpdateEvent ev)
- {
- Message newLogDetails = ev.getNewLogs();
- if ((newLogDetails != null) &&
- !newLogDetails.toString().trim().equals(""))
- {
- printProgress(newLogDetails);
- printlnProgress();
- }
- }
- });
- int nTries = 5;
- boolean initDone = false;
- while (!initDone)
- {
- try
- {
- installer.initializeSuffix(ctxDestination, replicationId, baseDN,
- displayProgress, ConnectionUtils.getHostPort(ctxSource));
- initDone = true;
- }
- catch (PeerNotFoundException pnfe)
- {
- LOG.log(Level.INFO, "Peer could not be found");
- if (nTries == 1)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_INITIALIZING_TRIES_COMPLETED.get(
- pnfe.getMessageObject().toString()),
- INITIALIZING_TRIES_COMPLETED, pnfe);
- }
- try
- {
- Thread.sleep((5 - nTries) * 3000);
- }
- catch (Throwable t)
- {
- }
- }
- catch (ApplicationException ae)
- {
- throw new ReplicationCliException(ae.getMessageObject(),
- ERROR_INITIALIZING_BASEDN_GENERIC, ae);
- }
- nTries--;
- }
- }
-
- private void initializeAllSuffix(String baseDN, InitialLdapContext ctx,
- boolean displayProgress) throws ReplicationCliException
- {
- int nTries = 5;
- boolean initDone = false;
- while (!initDone)
- {
- try
- {
- initializeAllSuffixTry(baseDN, ctx, displayProgress);
- postPreExternalInitialization(baseDN, ctx, false, displayProgress,
- false);
- initDone = true;
- }
- catch (PeerNotFoundException pnfe)
- {
- LOG.log(Level.INFO, "Peer could not be found");
- if (nTries == 1)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_INITIALIZING_TRIES_COMPLETED.get(
- pnfe.getMessageObject().toString()),
- INITIALIZING_TRIES_COMPLETED, pnfe);
- }
- try
- {
- Thread.sleep((5 - nTries) * 3000);
- }
- catch (Throwable t)
- {
- }
- }
- catch (ApplicationException ae)
- {
- throw new ReplicationCliException(ae.getMessageObject(),
- ERROR_INITIALIZING_BASEDN_GENERIC, ae);
- }
- nTries--;
- }
- }
-
- /**
- * Launches the pre external initialization operation using the provided
- * connection on a given base DN.
- * @param baseDN the base DN that we want to reset.
- * @param ctx the connection to the server.
- * @param localOnly whether the resetting internal operations must only apply
- * to the server to which we are connected.
- * @param displayProgress whether to display operation progress or not.
- * @throws ReplicationCliException if there is an error performing the
- * operation.
- */
- private void preExternalInitialization(String baseDN, InitialLdapContext ctx,
- boolean localOnly, boolean displayProgress) throws ReplicationCliException
- {
- postPreExternalInitialization(baseDN, ctx, localOnly, displayProgress,
- true);
- }
-
- /**
- * Launches the post external initialization operation using the provided
- * connection on a given base DN required for replication to work.
- * @param baseDN the base DN that we want to reset.
- * @param ctx the connection to the server.
- * @param displayProgress whether to display operation progress or not.
- * @throws ReplicationCliException if there is an error performing the
- * operation.
- */
- private void postExternalInitialization(String baseDN, InitialLdapContext ctx,
- boolean displayProgress) throws ReplicationCliException
- {
- postPreExternalInitialization(baseDN, ctx, false, displayProgress, false);
- }
-
- /**
- * Launches the pre or post external initialization operation using the
- * provided connection on a given base DN.
- * @param baseDN the base DN that we want to reset.
- * @param ctx the connection to the server.
- * @param localOnly whether the resetting internal operations must only apply
- * to the server to which we are connected.
- * @param displayProgress whether to display operation progress or not.
- * @param isPre whether this is the pre operation or the post operation.
- * @throws ReplicationCliException if there is an error performing the
- * operation.
- */
- private void postPreExternalInitialization(String baseDN,
- InitialLdapContext ctx, boolean localOnly, boolean displayProgress,
- boolean isPre) throws ReplicationCliException
- {
- boolean taskCreated = false;
- int i = 1;
- boolean isOver = false;
- String dn = null;
- BasicAttributes attrs = new BasicAttributes();
- Attribute oc = new BasicAttribute("objectclass");
- oc.add("top");
- oc.add("ds-task");
- oc.add("ds-task-reset-generation-id");
- attrs.put(oc);
- attrs.put("ds-task-class-name",
- "org.opends.server.tasks.SetGenerationIdTask");
- if (isPre)
- {
- if (!localOnly)
- {
- attrs.put("ds-task-reset-generation-id-new-value", "-1");
- }
- else
- {
- try
- {
- attrs.put("ds-task-reset-generation-id-new-value",
- String.valueOf(getReplicationDomainId(ctx, baseDN)));
- }
- catch (NamingException ne)
- {
- LOG.log(Level.SEVERE, "Error get replication domain id for base DN "+
- baseDN+" on server "+ConnectionUtils.getHostPort(ctx), ne);
-
- throw new ReplicationCliException(getThrowableMsg(
- ERR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION.get(), ne),
- ERROR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION, ne);
- }
- }
- }
- attrs.put("ds-task-reset-generation-id-domain-base-dn", baseDN);
- while (!taskCreated)
- {
- String id = "dsreplication-reset-generation-id-"+i;
- dn = "ds-task-id="+id+",cn=Scheduled Tasks,cn=Tasks";
- attrs.put("ds-task-id", id);
- try
- {
- DirContext dirCtx = ctx.createSubcontext(dn, attrs);
- taskCreated = true;
- LOG.log(Level.INFO, "created task entry: "+attrs);
- dirCtx.close();
- }
- catch (NameAlreadyBoundException x)
- {
- }
- catch (NamingException ne)
- {
- LOG.log(Level.SEVERE, "Error creating task "+attrs, ne);
- Message msg = isPre ?
- ERR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION.get():
- ERR_LAUNCHING_POST_EXTERNAL_INITIALIZATION.get();
- ReplicationCliReturnCode code = isPre?
- ERROR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION:
- ERROR_LAUNCHING_POST_EXTERNAL_INITIALIZATION;
- throw new ReplicationCliException(
- getThrowableMsg(msg, ne), code, ne);
- }
- i++;
- }
- // Wait until it is over
- SearchControls searchControls = new SearchControls();
- searchControls.setCountLimit(1);
- searchControls.setSearchScope(
- SearchControls. OBJECT_SCOPE);
- String filter = "objectclass=*";
- searchControls.setReturningAttributes(
- new String[] {
- "ds-task-log-message",
- "ds-task-state"
- });
- String lastLogMsg = null;
- while (!isOver)
- {
- try
- {
- Thread.sleep(500);
- }
- catch (Throwable t)
- {
- }
- try
- {
- NamingEnumeration res = ctx.search(dn, filter, searchControls);
- SearchResult sr = (SearchResult)res.next();
- String logMsg = getFirstValue(sr, "ds-task-log-message");
- if (logMsg != null)
- {
- if (!logMsg.equals(lastLogMsg))
- {
- LOG.log(Level.INFO, logMsg);
- lastLogMsg = logMsg;
- }
- }
- InstallerHelper helper = new InstallerHelper();
- String state = getFirstValue(sr, "ds-task-state");
-
- if (helper.isDone(state) || helper.isStoppedByError(state))
- {
- isOver = true;
- Message errorMsg;
- String server = ConnectionUtils.getHostPort(ctx);
- if (lastLogMsg == null)
- {
- errorMsg = isPre ?
- INFO_ERROR_DURING_PRE_EXTERNAL_INITIALIZATION_NO_LOG.get(
- state, server) :
- INFO_ERROR_DURING_POST_EXTERNAL_INITIALIZATION_NO_LOG.get(
- state, server);
- }
- else
- {
- errorMsg = isPre ?
- INFO_ERROR_DURING_PRE_EXTERNAL_INITIALIZATION_LOG.get(
- lastLogMsg, state, server) :
- INFO_ERROR_DURING_POST_EXTERNAL_INITIALIZATION_LOG.get(
- lastLogMsg, state, server);
- }
-
- if (helper.isCompletedWithErrors(state))
- {
- LOG.log(Level.WARNING, "Completed with error: "+errorMsg);
- println(errorMsg);
- }
- else if (!helper.isSuccessful(state) ||
- helper.isStoppedByError(state))
- {
- LOG.log(Level.WARNING, "Error: "+errorMsg);
- ReplicationCliReturnCode code = isPre?
- ERROR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION:
- ERROR_LAUNCHING_POST_EXTERNAL_INITIALIZATION;
- throw new ReplicationCliException(errorMsg, code, null);
- }
- }
- }
- catch (NameNotFoundException x)
- {
- isOver = true;
- }
- catch (NamingException ne)
- {
- Message msg = isPre ?
- ERR_POOLING_PRE_EXTERNAL_INITIALIZATION.get():
- ERR_POOLING_POST_EXTERNAL_INITIALIZATION.get();
- throw new ReplicationCliException(
- getThrowableMsg(msg, ne), ERROR_CONNECTING, ne);
- }
- }
- }
-
- /**
- * Initializes a suffix with the contents of a replica that has a given
- * replication id.
- * @param ctx the connection to the server whose suffix we want to initialize.
- * @param baseDN the dn of the suffix.
- * @param displayProgress whether we want to display progress or not.
- * @throws ApplicationException if an unexpected error occurs.
- * @throws PeerNotFoundException if the replication mechanism cannot find
- * a peer.
- */
- public void initializeAllSuffixTry(String baseDN, InitialLdapContext ctx,
- boolean displayProgress)
- throws ApplicationException, PeerNotFoundException
- {
- boolean taskCreated = false;
- int i = 1;
- boolean isOver = false;
- String dn = null;
- String serverDisplay = ConnectionUtils.getHostPort(ctx);
- BasicAttributes attrs = new BasicAttributes();
- Attribute oc = new BasicAttribute("objectclass");
- oc.add("top");
- oc.add("ds-task");
- oc.add("ds-task-initialize-remote-replica");
- attrs.put(oc);
- attrs.put("ds-task-class-name",
- "org.opends.server.tasks.InitializeTargetTask");
- attrs.put("ds-task-initialize-domain-dn", baseDN);
- attrs.put("ds-task-initialize-replica-server-id", "all");
- while (!taskCreated)
- {
- String id = "quicksetup-initialize"+i;
- dn = "ds-task-id="+id+",cn=Scheduled Tasks,cn=Tasks";
- attrs.put("ds-task-id", id);
- try
- {
- DirContext dirCtx = ctx.createSubcontext(dn, attrs);
- taskCreated = true;
- LOG.log(Level.INFO, "created task entry: "+attrs);
- dirCtx.close();
- }
- catch (NameAlreadyBoundException x)
- {
- LOG.log(Level.WARNING, "A task with dn: "+dn+" already existed.");
- }
- catch (NamingException ne)
- {
- LOG.log(Level.SEVERE, "Error creating task "+attrs, ne);
- throw new ApplicationException(
- ReturnCode.APPLICATION_ERROR,
- getThrowableMsg(INFO_ERROR_LAUNCHING_INITIALIZATION.get(
- serverDisplay), ne), ne);
- }
- i++;
- }
- // Wait until it is over
- SearchControls searchControls = new SearchControls();
- searchControls.setCountLimit(1);
- searchControls.setSearchScope(
- SearchControls. OBJECT_SCOPE);
- String filter = "objectclass=*";
- searchControls.setReturningAttributes(
- new String[] {
- "ds-task-unprocessed-entry-count",
- "ds-task-processed-entry-count",
- "ds-task-log-message",
- "ds-task-state"
- });
- Message lastDisplayedMsg = null;
- String lastLogMsg = null;
- long lastTimeMsgDisplayed = -1;
- long lastTimeMsgLogged = -1;
- int totalEntries = 0;
- while (!isOver)
- {
- try
- {
- Thread.sleep(500);
- }
- catch (Throwable t)
- {
- }
- try
- {
- NamingEnumeration res = ctx.search(dn, filter, searchControls);
- SearchResult sr = (SearchResult)res.next();
-
- // Get the number of entries that have been handled and
- // a percentage...
- Message msg;
- String sProcessed = getFirstValue(sr,
- "ds-task-processed-entry-count");
- String sUnprocessed = getFirstValue(sr,
- "ds-task-unprocessed-entry-count");
- int processed = -1;
- int unprocessed = -1;
- if (sProcessed != null)
- {
- processed = Integer.parseInt(sProcessed);
- }
- if (sUnprocessed != null)
- {
- unprocessed = Integer.parseInt(sUnprocessed);
- }
- totalEntries = Math.max(totalEntries, processed+unprocessed);
-
- if ((processed != -1) && (unprocessed != -1))
- {
- if (processed + unprocessed > 0)
- {
- int perc = (100 * processed) / (processed + unprocessed);
- msg = INFO_INITIALIZE_PROGRESS_WITH_PERCENTAGE.get(sProcessed,
- String.valueOf(perc));
- }
- else
- {
- //msg = INFO_NO_ENTRIES_TO_INITIALIZE.get();
- msg = null;
- }
- }
- else if (processed != -1)
- {
- msg = INFO_INITIALIZE_PROGRESS_WITH_PROCESSED.get(sProcessed);
- }
- else if (unprocessed != -1)
- {
- msg = INFO_INITIALIZE_PROGRESS_WITH_UNPROCESSED.get(sUnprocessed);
- }
- else
- {
- msg = lastDisplayedMsg;
- }
-
- if (msg != null)
- {
- long currentTime = System.currentTimeMillis();
- /* Refresh period: to avoid having too many lines in the log */
- long minRefreshPeriod;
- if (totalEntries < 100)
- {
- minRefreshPeriod = 0;
- }
- else if (totalEntries < 1000)
- {
- minRefreshPeriod = 1000;
- }
- else if (totalEntries < 10000)
- {
- minRefreshPeriod = 5000;
- }
- else
- {
- minRefreshPeriod = 10000;
- }
- if (((currentTime - minRefreshPeriod) > lastTimeMsgLogged))
- {
- lastTimeMsgLogged = currentTime;
- LOG.log(Level.INFO, "Progress msg: "+msg);
- }
- if (displayProgress)
- {
- if (((currentTime - minRefreshPeriod) > lastTimeMsgDisplayed) &&
- !msg.equals(lastDisplayedMsg))
- {
- printProgress(msg);
- lastDisplayedMsg = msg;
- printlnProgress();
- lastTimeMsgDisplayed = currentTime;
- }
- }
- }
-
- String logMsg = getFirstValue(sr, "ds-task-log-message");
- if (logMsg != null)
- {
- if (!logMsg.equals(lastLogMsg))
- {
- LOG.log(Level.INFO, logMsg);
- lastLogMsg = logMsg;
- }
- }
- InstallerHelper helper = new InstallerHelper();
- String state = getFirstValue(sr, "ds-task-state");
-
- if (helper.isDone(state) || helper.isStoppedByError(state))
- {
- isOver = true;
- Message errorMsg;
- LOG.log(Level.INFO, "Last task entry: "+sr);
- if (displayProgress && (msg != null) && !msg.equals(lastDisplayedMsg))
- {
- printProgress(msg);
- lastDisplayedMsg = msg;
- printlnProgress();
- }
- if (lastLogMsg == null)
- {
- errorMsg = INFO_ERROR_DURING_INITIALIZATION_NO_LOG.get(
- serverDisplay, state, serverDisplay);
- }
- else
- {
- errorMsg = INFO_ERROR_DURING_INITIALIZATION_LOG.get(
- serverDisplay, lastLogMsg, state, serverDisplay);
- }
-
- if (helper.isCompletedWithErrors(state))
- {
- LOG.log(Level.WARNING, "Processed errorMsg: "+errorMsg);
- if (displayProgress)
- {
- println(errorMsg);
- }
- }
- else if (!helper.isSuccessful(state) ||
- helper.isStoppedByError(state))
- {
- LOG.log(Level.WARNING, "Processed errorMsg: "+errorMsg);
- ApplicationException ae = new ApplicationException(
- ReturnCode.APPLICATION_ERROR, errorMsg,
- null);
- if ((lastLogMsg == null) ||
- helper.isPeersNotFoundError(lastLogMsg))
- {
- LOG.log(Level.WARNING, "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.");
- throw ae;
- }
- }
- else
- {
- if (displayProgress)
- {
- printProgress(INFO_SUFFIX_INITIALIZED_SUCCESSFULLY.get());
- printlnProgress();
- }
- LOG.log(Level.INFO, "Processed msg: "+errorMsg);
- LOG.log(Level.INFO, "Initialization completed successfully.");
- }
- }
- }
- catch (NameNotFoundException x)
- {
- isOver = true;
- LOG.log(Level.INFO, "Initialization entry not found.");
- if (displayProgress)
- {
- printProgress(INFO_SUFFIX_INITIALIZED_SUCCESSFULLY.get());
- printlnProgress();
- }
- }
- catch (NamingException ne)
- {
- throw new ApplicationException(
- ReturnCode.APPLICATION_ERROR,
- getThrowableMsg(INFO_ERROR_POOLING_INITIALIZATION.get(
- serverDisplay), ne), ne);
- }
- }
- }
-
- /**
- * Returns a set of error messages encountered in the provided TopologyCache.
- * @param cache the topology cache.
- * @return a set of error messages encountered in the provided TopologyCache.
- */
- private LinkedHashSet<Message> getErrorMessages(TopologyCache cache)
- {
- Set<TopologyCacheException> exceptions =
- new HashSet<TopologyCacheException>();
- Set<ServerDescriptor> servers = cache.getServers();
- LinkedHashSet<Message> exceptionMsgs = new LinkedHashSet<Message>();
- for (ServerDescriptor server : servers)
- {
- TopologyCacheException e = server.getLastException();
- if (e != null)
- {
- exceptions.add(e);
- }
- }
- /* Check the exceptions and see if we throw them or not. */
- for (TopologyCacheException e : exceptions)
- {
- switch (e.getType())
- {
- case NOT_GLOBAL_ADMINISTRATOR:
- exceptionMsgs.add(INFO_NOT_GLOBAL_ADMINISTRATOR_PROVIDED.get());
-
- break;
- case GENERIC_CREATING_CONNECTION:
- if ((e.getCause() != null) &&
- Utils.isCertificateException(e.getCause()))
- {
- exceptionMsgs.add(
- INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE_SERVER.get(
- e.getHostPort(), e.getCause().getMessage()));
- }
- else
- {
- exceptionMsgs.add(Utils.getMessage(e));
- }
- break;
- default:
- exceptionMsgs.add(Utils.getMessage(e));
- }
- }
- return exceptionMsgs;
- }
-
- /**
- * Removes the references to a replication server in the base DNs of a
- * given server.
- * @param server the server that we want to update.
- * @param replicationServer the replication server whose references we want
- * to remove.
- * @param bindDn the bindDn that must be used to log to the server.
- * @param pwd the password that must be used to log to the server.
- * @param baseDNs the list of base DNs where we want to remove the references
- * to the provided replication server.
- * @param removeFromReplicationServers if references must be removed from
- * the replication servers.
- * @param preferredURLs the preferred LDAP URLs to be used to connect to the
- * server.
- * @throws ReplicationCliException if there is an error updating the
- * configuration.
- */
- private void removeReferencesInServer(ServerDescriptor server,
- String replicationServer, String bindDn, String pwd,
- Collection<String> baseDNs, boolean updateReplicationServers,
- LinkedHashSet<PreferredConnection> cnx)
- throws ReplicationCliException
- {
- TopologyCacheFilter filter = new TopologyCacheFilter();
- filter.setSearchMonitoringInformation(false);
- filter.setSearchBaseDNInformation(false);
- ServerLoader loader = new ServerLoader(server.getAdsProperties(), bindDn,
- pwd, getTrustManager(), cnx, filter);
- InitialLdapContext ctx = null;
- String lastBaseDN = null;
- String hostPort = null;
- try
- {
- ctx = loader.createContext();
- hostPort = ConnectionUtils.getHostPort(ctx);
- ManagementContext mCtx = LDAPManagementContext.createFromContext(
- JNDIDirContextAdaptor.adapt(ctx));
- RootCfgClient root = mCtx.getRootConfiguration();
- ReplicationSynchronizationProviderCfgClient sync = null;
- try
- {
- sync = (ReplicationSynchronizationProviderCfgClient)
- root.getSynchronizationProvider("Multimaster Synchronization");
- }
- catch (ManagedObjectNotFoundException monfe)
- {
- // It does not exist.
- LOG.log(Level.INFO, "No synchronization found on "+ hostPort +".",
- monfe);
- }
- if (sync != null)
- {
- String[] domainNames = sync.listReplicationDomains();
- if (domainNames != null)
- {
- for (int i=0; i<domainNames.length; i++)
- {
- ReplicationDomainCfgClient domain =
- sync.getReplicationDomain(domainNames[i]);
- for (String baseDN : baseDNs)
- {
- lastBaseDN = baseDN;
- if (Utils.areDnsEqual(domain.getBaseDN().toString(),
- baseDN))
- {
- printProgress(formatter.getFormattedWithPoints(
- INFO_REPLICATION_REMOVING_REFERENCES_ON_REMOTE.get(baseDN,
- hostPort)));
- Set<String> replServers = domain.getReplicationServer();
- if (replServers != null)
- {
- String replServer = null;
- for (String o : replServers)
- {
- if (replicationServer.equalsIgnoreCase(o))
- {
- replServer = o;
- break;
- }
- }
- if (replServer != null)
- {
- LOG.log(Level.INFO, "Updating references in domain " +
- domain.getBaseDN()+" on " + hostPort + ".");
- replServers.remove(replServer);
- if (replServers.size() > 0)
- {
- domain.setReplicationServer(replServers);
- domain.commit();
- }
- else
- {
- sync.removeReplicationDomain(domainNames[i]);
- sync.commit();
- }
- }
- }
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- }
- }
- }
- }
- if (updateReplicationServers && sync.hasReplicationServer())
- {
- ReplicationServerCfgClient rServerObj = sync.getReplicationServer();
- Set<String> replServers = rServerObj.getReplicationServer();
- if (replServers != null)
- {
- String replServer = null;
- for (String o : replServers)
- {
- if (replicationServer.equalsIgnoreCase(o))
- {
- replServer = o;
- break;
- }
- }
- if (replServer != null)
- {
- replServers.remove(replServer);
- if (replServers.size() > 0)
- {
- rServerObj.setReplicationServer(replServers);
- rServerObj.commit();
- }
- else
- {
- sync.removeReplicationServer();
- sync.commit();
- }
- }
- }
- }
- }
- }
- catch (NamingException ne)
- {
- hostPort = getHostPort(server, cnx);
- Message msg = getMessageForException(ne, hostPort);
- throw new ReplicationCliException(msg, ERROR_CONNECTING, ne);
- }
- catch (OpenDsException ode)
- {
- if (lastBaseDN != null)
- {
- Message msg = getMessageForDisableException(ode, hostPort, lastBaseDN);
- throw new ReplicationCliException(msg,
- ERROR_DISABLING_REPLICATION_REMOVE_REFERENCE_ON_BASEDN, ode);
- }
- else
- {
- Message msg = ERR_REPLICATION_ERROR_READING_CONFIGURATION.get(hostPort,
- ode.getMessage());
- throw new ReplicationCliException(msg, ERROR_CONNECTING, ode);
- }
- }
- finally
- {
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
- }
- }
-
- /**
- * Deletes a replication domain in a server for a given base DN (disable
- * replication of the base DN).
- * @param ctx the connection to the server.
- * @param baseDN the base DN of the replication domain that we want to
- * delete.
- * @throws ReplicationCliException if there is an error updating the
- * configuration of the server.
- */
- private void deleteReplicationDomain(InitialLdapContext ctx,
- String baseDN) throws ReplicationCliException
- {
- String hostPort = ConnectionUtils.getHostPort(ctx);
- try
- {
- ManagementContext mCtx = LDAPManagementContext.createFromContext(
- JNDIDirContextAdaptor.adapt(ctx));
- RootCfgClient root = mCtx.getRootConfiguration();
- ReplicationSynchronizationProviderCfgClient sync = null;
- try
- {
- sync = (ReplicationSynchronizationProviderCfgClient)
- root.getSynchronizationProvider("Multimaster Synchronization");
- }
- catch (ManagedObjectNotFoundException monfe)
- {
- // It does not exist.
- LOG.log(Level.INFO, "No synchronization found on "+ hostPort +".",
- monfe);
- }
- if (sync != null)
- {
- String[] domainNames = sync.listReplicationDomains();
- if (domainNames != null)
- {
- for (int i=0; i<domainNames.length; i++)
- {
- ReplicationDomainCfgClient domain =
- sync.getReplicationDomain(domainNames[i]);
- if (Utils.areDnsEqual(domain.getBaseDN().toString(), baseDN))
- {
- printProgress(formatter.getFormattedWithPoints(
- INFO_REPLICATION_DISABLING_BASEDN.get(baseDN,
- hostPort)));
- sync.removeReplicationDomain(domainNames[i]);
- sync.commit();
-
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- }
- }
- }
- }
- }
- catch (OpenDsException ode)
- {
- Message msg = getMessageForDisableException(ode, hostPort, baseDN);
- throw new ReplicationCliException(msg,
- ERROR_DISABLING_REPLICATION_REMOVE_REFERENCE_ON_BASEDN, ode);
- }
- }
-
- /**
- * Disables the replication server for a given server.
- * @param ctx the connection to the server.
- * @throws ReplicationCliException if there is an error updating the
- * configuration of the server.
- */
- private void disableReplicationServer(InitialLdapContext ctx)
- throws ReplicationCliException
- {
- String hostPort = ConnectionUtils.getHostPort(ctx);
- try
- {
- ManagementContext mCtx = LDAPManagementContext.createFromContext(
- JNDIDirContextAdaptor.adapt(ctx));
- RootCfgClient root = mCtx.getRootConfiguration();
- ReplicationSynchronizationProviderCfgClient sync = null;
- ReplicationServerCfgClient replicationServer = null;
- try
- {
- sync = (ReplicationSynchronizationProviderCfgClient)
- root.getSynchronizationProvider("Multimaster Synchronization");
- if (sync.hasReplicationServer())
- {
- replicationServer = sync.getReplicationServer();
- }
- }
- catch (ManagedObjectNotFoundException monfe)
- {
- // It does not exist.
- LOG.log(Level.INFO, "No synchronization found on "+ hostPort +".",
- monfe);
- }
- if (replicationServer != null)
- {
-
- String s = String.valueOf(replicationServer.getReplicationPort());
- printProgress(formatter.getFormattedWithPoints(
- INFO_REPLICATION_DISABLING_REPLICATION_SERVER.get(s,
- hostPort)));
-
- sync.removeReplicationServer();
- sync.commit();
- printProgress(formatter.getFormattedDone());
- printlnProgress();
- }
- }
- catch (OpenDsException ode)
- {
- throw new ReplicationCliException(
- ERR_REPLICATION_DISABLING_REPLICATIONSERVER.get(hostPort),
- ERROR_DISABLING_REPLICATION_SERVER,
- ode);
- }
- }
-
- /**
- * Returns a message object for the given NamingException.
- * @param ne the NamingException.
- * @param hostPort the hostPort representation of the server we were
- * contacting when the NamingException occurred.
- * @return a message object for the given NamingException.
- */
- private Message getMessageForException(NamingException ne, String hostPort)
- {
- Message msg;
- if (Utils.isCertificateException(ne))
- {
- msg = INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE_SERVER.get(
- hostPort, ne.toString(true));
- }
- else
- {
- msg = INFO_CANNOT_CONNECT_TO_REMOTE_GENERIC.get(
- hostPort, ne.toString(true));
- }
- return msg;
- }
-
- /**
- * Returns a message for a given OpenDsException (we assume that was an
- * exception generated updating the configuration of the server) that
- * occurred when we were configuring the replication server.
- * @param ode the OpenDsException.
- * @param hostPort the hostPort representation of the server we were
- * contacting when the OpenDsException occurred.
- * @return a message for a given OpenDsException (we assume that was an
- * exception generated updating the configuration of the server) that
- * occurred when we were configuring the replication server.
- */
- private Message getMessageForReplicationServerException(OpenDsException ode,
- String hostPort)
- {
- return ERR_REPLICATION_CONFIGURING_REPLICATIONSERVER.get(hostPort);
- }
-
- /**
- * Returns a message for a given OpenDsException (we assume that was an
- * exception generated updating the configuration of the server) that
- * occurred when we were configuring some replication domain (creating
- * the replication domain or updating the list of replication servers of
- * the replication domain).
- * @param ode the OpenDsException.
- * @param hostPort the hostPort representation of the server we were
- * contacting when the OpenDsException occurred.
- * @return a message for a given OpenDsException (we assume that was an
- * exception generated updating the configuration of the server) that
- * occurred when we were configuring some replication domain (creating
- * the replication domain or updating the list of replication servers of
- * the replication domain).
- */
- private Message getMessageForEnableException(OpenDsException ode,
- String hostPort, String baseDN)
- {
- return ERR_REPLICATION_CONFIGURING_BASEDN.get(baseDN, hostPort);
- }
-
- /**
- * Returns a message for a given OpenDsException (we assume that was an
- * exception generated updating the configuration of the server) that
- * occurred when we were configuring some replication domain (deleting
- * the replication domain or updating the list of replication servers of
- * the replication domain).
- * @param ode the OpenDsException.
- * @param hostPort the hostPort representation of the server we were
- * contacting when the OpenDsException occurred.
- * @return a message for a given OpenDsException (we assume that was an
- * exception generated updating the configuration of the server) that
- * occurred when we were configuring some replication domain (deleting
- * the replication domain or updating the list of replication servers of
- * the replication domain).
- */
- private Message getMessageForDisableException(OpenDsException ode,
- String hostPort, String baseDN)
- {
- return ERR_REPLICATION_CONFIGURING_BASEDN.get(baseDN, hostPort);
- }
-
- /**
- * Returns a message informing the user that the provided port cannot be used.
- * @param port the port that cannot be used.
- * @return a message informing the user that the provided port cannot be used.
- */
- private Message getCannotBindToPortError(int port)
- {
- Message message;
- if (SetupUtils.isPriviledgedPort(port))
- {
- message = ERR_INSTALLDS_CANNOT_BIND_TO_PRIVILEGED_PORT.get(port);
- }
- else
- {
- message = ERR_INSTALLDS_CANNOT_BIND_TO_PORT.get(port);
- }
- return message;
- }
-
- /**
- * Convenience method used to know if one Set of replication servers equals
- * another set of replication servers.
- * @param s1 the first set of replication servers.
- * @param s2 the second set of replication servers.
- * @return <CODE>true</CODE> if the two sets represent the same replication
- * servers and <CODE>false</CODE> otherwise.
- */
- private boolean areReplicationServersEqual(Set<String> s1, Set<String> s2)
- {
- Set<String> c1 = new HashSet<String>();
- for (String s : s1)
- {
- c1.add(s.toLowerCase());
- }
- Set<String> c2 = new HashSet<String>();
- for (String s : s2)
- {
- c2.add(s.toLowerCase());
- }
- return c1.equals(c2);
- }
-
- /**
- * Convenience method used to merge two Sets of replication servers.
- * @param s1 the first set of replication servers.
- * @param s2 the second set of replication servers.
- * @return a Set of replication servers containing all the replication servers
- * specified in the provided Sets.
- */
- private Set<String> mergeReplicationServers(Set<String> s1, Set<String> s2)
- {
- Set<String> c1 = new HashSet<String>();
- for (String s : s1)
- {
- c1.add(s.toLowerCase());
- }
- for (String s : s2)
- {
- c1.add(s.toLowerCase());
- }
- return c1;
- }
-
- /**
- * Returns the message that must be displayed to the user for a given
- * exception. This is assumed to be a critical exception that stops all
- * the processing.
- * @param rce the ReplicationCliException.
- * @return a message to be displayed to the user.
- */
- private Message getCriticalExceptionMessage(ReplicationCliException rce)
- {
- MessageBuilder mb = new MessageBuilder();
- mb.append(rce.getMessageObject());
- File logFile = QuickSetupLog.getLogFile();
- if (logFile != null)
- {
- mb.append(Constants.LINE_SEPARATOR);
- mb.append(INFO_GENERAL_SEE_FOR_DETAILS.get(logFile.getPath()));
- }
- // Check if the cause has already been included in the message
- Throwable c = rce.getCause();
- if (c != null)
- {
- String s;
- if (c instanceof NamingException)
- {
- s = ((NamingException)c).toString(true);
- }
- else
- {
- s = c.toString();
- }
- if (mb.toString().indexOf(s) == -1)
- {
- mb.append(Constants.LINE_SEPARATOR);
- mb.append(INFO_REPLICATION_CRITICAL_ERROR_DETAILS.get(s));
- }
- }
- return mb.toMessage();
- }
-
- /**
- * Basic method to know if the host is local or not. This is only used to
- * know if we can perform a port check or not.
- * @param host the host to analyze.
- * @return <CODE>true</CODE> if it is the local host and <CODE>false</CODE>
- * otherwise.
- */
- private boolean isLocalHost(String host)
- {
- boolean isLocalHost = false;
- if (!"localhost".equalsIgnoreCase(host))
- {
- try
- {
- InetAddress localAddress = InetAddress.getLocalHost();
- InetAddress[] addresses = InetAddress.getAllByName(host);
- for (int i=0; i<addresses.length && !isLocalHost; i++)
- {
- isLocalHost = localAddress.equals(addresses[i]);
- }
- }
- catch (Throwable t)
- {
- LOG.log(Level.WARNING, "Failing checking host names: "+t, t);
- }
- }
- else
- {
- isLocalHost = true;
- }
- return isLocalHost;
- }
-
- private boolean mustInitializeSchema(ServerDescriptor server1,
- ServerDescriptor server2)
- {
- boolean mustInitializeSchema = false;
- if (!argParser.noSchemaReplication())
- {
- String id1 = server1.getSchemaReplicationID();
- String id2 = server2.getSchemaReplicationID();
- if (id1 != null)
- {
- mustInitializeSchema = id1.equals(id2);
- }
- else
- {
- mustInitializeSchema = true;
- }
- }
- return mustInitializeSchema;
- }
-
- /**
- * This method registers a server in a given ADSContext. If the server was
- * already registered it unregisters it and registers again (some properties
- * might have changed).
- * @param adsContext the ADS Context to be used.
- * @param server the server to be registered.
- * @throws ADSContextException if an error occurs during the registration or
- * unregistration of the server.
- */
- private void registerServer(ADSContext adsContext,
- Map<ADSContext.ServerProperty, Object> serverProperties)
- throws ADSContextException
- {
- try
- {
- adsContext.registerServer(serverProperties);
- }
- catch (ADSContextException ade)
- {
- if (ade.getError() ==
- ADSContextException.ErrorType.ALREADY_REGISTERED)
- {
- LOG.log(Level.WARNING, "The server was already registered: "+
- serverProperties);
- adsContext.unregisterServer(serverProperties);
- adsContext.registerServer(serverProperties);
- }
- else
- {
- throw ade;
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isAdvancedMode() {
- return false;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isInteractive() {
- if (forceNonInteractive)
- {
- return false;
- }
- else
- {
- return argParser.isInteractive();
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isMenuDrivenMode() {
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isQuiet()
- {
- return argParser.isQuiet();
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isScriptFriendly() {
- return argParser.isScriptFriendly();
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isVerbose() {
- return true;
- }
-
- /**
- * Commodity method used to repeatidly ask the user to provide a port value.
- * @param prompt the prompt message.
- * @param defaultValue the default value of the port to be proposed to the
- * user.
- * @return the port value provided by the user.
- */
- private int askPort(Message prompt, int defaultValue)
- {
- int port = -1;
- while (port == -1)
- {
- try
- {
- port = readPort(prompt, defaultValue);
- }
- catch (CLIException ce)
- {
- port = -1;
- LOG.log(Level.WARNING, "Error reading input: "+ce, ce);
- }
- }
- return port;
- }
-
- /**
- * Prompts the user to give the Global Administrator UID.
- * @param defaultValue the default value that will be proposed in the prompt
- * message.
- * @return the Global Administrator UID as provided by the user.
- */
- private String askForAdministratorUID(String defaultValue)
- {
- String s = defaultValue;
- try
- {
- s = readInput(INFO_ADMINISTRATOR_UID_PROMPT.get(), defaultValue);
- }
- catch (CLIException ce)
- {
- LOG.log(Level.WARNING, "Error reading input: "+ce, ce);
- }
- return s;
- }
-
- /**
- * Prompts the user to give the Global Administrator password.
- * @return the Global Administrator password as provided by the user.
- */
- private String askForAdministratorPwd()
- {
- String pwd = readPassword(INFO_ADMINISTRATOR_PWD_PROMPT.get(), LOG);
- return pwd;
- }
-
- /**
- * Prints a message to the output with no wrapping if we are not in quiet
- * mode.
- * @param msg the message to be displayed.
- */
- private void printProgressMessageNoWrap(Message msg)
- {
- if (!isQuiet())
- {
- getOutputStream().print(msg.toString());
- }
- }
-
- /**
- * Resets the connection parameters for the LDAPConsoleInteraction object.
- * The reset does not apply to the certificate parameters. This is called
- * in order the LDAPConnectionConsoleInteraction object to ask for all this
- * connection parameters next time we call
- * LDAPConnectionConsoleInteraction.run().
- */
- private void resetConnectionArguments()
- {
- argParser.getSecureArgsList().hostNameArg.clearValues();
- argParser.getSecureArgsList().hostNameArg.setPresent(false);
- argParser.getSecureArgsList().portArg.clearValues();
- argParser.getSecureArgsList().portArg.setPresent(false);
- // This is done to be able to call IntegerArgument.getIntValue()
- argParser.getSecureArgsList().portArg.addValue(
- argParser.getSecureArgsList().portArg.getDefaultValue());
- argParser.getSecureArgsList().bindDnArg.clearValues();
- argParser.getSecureArgsList().bindDnArg.setPresent(false);
- argParser.getSecureArgsList().bindPasswordArg.clearValues();
- argParser.getSecureArgsList().bindPasswordArg.setPresent(false);
- argParser.getSecureArgsList().bindPasswordFileArg.clearValues();
- argParser.getSecureArgsList().bindPasswordFileArg.setPresent(false);
- argParser.getSecureArgsList().adminUidArg.clearValues();
- argParser.getSecureArgsList().adminUidArg.setPresent(false);
- }
-
- /**
- * Initializes the global arguments in the parser with the provided values.
- */
- private void initializeGlobalArguments(String hostName, int port,
- boolean useSSL, boolean useStartTLS, String adminUid, String bindDn,
- String bindPwd)
- {
- resetConnectionArguments();
- if (hostName != null)
- {
- argParser.getSecureArgsList().hostNameArg.addValue(hostName);
- argParser.getSecureArgsList().hostNameArg.setPresent(true);
- }
- // resetConnectionArguments does not clear the values for the port
- argParser.getSecureArgsList().portArg.clearValues();
- if (port != -1)
- {
- argParser.getSecureArgsList().portArg.addValue(String.valueOf(port));
- argParser.getSecureArgsList().portArg.setPresent(true);
- }
- else
- {
- // This is done to be able to call IntegerArgument.getIntValue()
- argParser.getSecureArgsList().portArg.addValue(
- argParser.getSecureArgsList().portArg.getDefaultValue());
- }
- argParser.getSecureArgsList().useSSLArg.setPresent(useSSL);
- argParser.getSecureArgsList().useStartTLSArg.setPresent(useStartTLS);
- if (adminUid != null)
- {
- argParser.getSecureArgsList().adminUidArg.addValue(adminUid);
- argParser.getSecureArgsList().adminUidArg.setPresent(true);
- }
- if (bindDn != null)
- {
- argParser.getSecureArgsList().bindDnArg.addValue(bindDn);
- argParser.getSecureArgsList().bindDnArg.setPresent(true);
- }
- if (bindPwd != null)
- {
- argParser.getSecureArgsList().bindPasswordArg.addValue(bindPwd);
- argParser.getSecureArgsList().bindPasswordArg.setPresent(true);
- }
- }
-
-
- /**
- * Forces the initialization of the trust manager in the
- * LDAPConnectionInteraction object.
- */
- private void forceTrustManagerInitialization()
- {
- forceNonInteractive = true;
- try
- {
- ci.initializeTrustManagerIfRequired();
- }
- catch (ArgumentException ae)
- {
- LOG.log(Level.WARNING, "Error initializing trust store: "+ae, ae);
- }
- forceNonInteractive = false;
- }
-
- /**
- * Returns the replication domain ID for a given baseDN on the server.
- * @param ctx the connection to the server.
- * @param baseDN the baseDN for which we want the replication domain ID.
- * @return the replication domain ID or -1 if the replication domain ID
- * could not be found.
- * @throws NamingException if an error occurred reading the configuration
- * information.
- */
- private int getReplicationDomainId(InitialLdapContext ctx, String baseDN)
- throws NamingException
- {
- int domainId = -1;
- TopologyCacheFilter filter = new TopologyCacheFilter();
- filter.setSearchMonitoringInformation(false);
- filter.addBaseDNToSearch(baseDN);
- ServerDescriptor server = ServerDescriptor.createStandalone(ctx, filter);
- for (ReplicaDescriptor replica : server.getReplicas())
- {
- if (Utils.areDnsEqual(replica.getSuffix().getDN(), baseDN))
- {
- domainId = replica.getReplicationId();
- break;
- }
- }
- return domainId;
- }
-
- /**
- * Method used to compare two server registries.
- * @param registry1 the first registry to compare.
- * @param registry2 the second registry to compare.
- * @return <CODE>true</CODE> if the registries are equal and
- * <CODE>false</CODE> otherwise.
- */
- private boolean areEqual(
- Set<Map<ADSContext.ServerProperty, Object>> registry1,
- Set<Map<ADSContext.ServerProperty, Object>> registry2)
- {
- boolean areEqual = registry1.size() == registry2.size();
- if (areEqual)
- {
- Set<ADSContext.ServerProperty> propertiesToCompare =
- new HashSet<ADSContext.ServerProperty>();
- ADSContext.ServerProperty[] properties =
- ADSContext.ServerProperty.values();
- for (int i=0; i<properties.length; i++)
- {
- if (properties[i].getAttributeSyntax() !=
- ADSPropertySyntax.CERTIFICATE_BINARY)
- {
- propertiesToCompare.add(properties[i]);
- }
- }
- for (Map<ADSContext.ServerProperty, Object> server1 : registry1)
- {
- boolean found = false;
-
- for (Map<ADSContext.ServerProperty, Object> server2 : registry2)
- {
- found = true;
- for (ADSContext.ServerProperty prop : propertiesToCompare)
- {
- Object v1 = server1.get(prop);
- Object v2 = server2.get(prop);
- if (v1 != null)
- {
- found = v1.equals(v2);
- }
- else if (v2 != null)
- {
- found = false;
- }
- if (!found)
- {
- break;
- }
- }
- if (found)
- {
- break;
- }
- }
-
- areEqual = found;
- if (!areEqual)
- {
- break;
- }
- }
- }
- return areEqual;
- }
-
- /**
- * Tells whether we are trying to disable all the replicated suffixes.
- * @param uData the disable replication data provided by the user.
- * @return <CODE>true</CODE> if we want to disable all the replicated suffixes
- * and <CODE>false</CODE> otherwise.
- */
- private boolean disableAllBaseDns(InitialLdapContext ctx,
- DisableReplicationUserData uData)
- {
- boolean returnValue = true;
- Collection<ReplicaDescriptor> replicas = getReplicas(ctx);
- Set<String> replicatedSuffixes = new HashSet<String>();
- for (ReplicaDescriptor rep : replicas)
- {
- String dn = rep.getSuffix().getDN();
- if (rep.isReplicated())
- {
- replicatedSuffixes.add(dn);
- }
- }
-
- for (String dn1 : replicatedSuffixes)
- {
- if (!Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn1) &&
- !Utils.areDnsEqual(Constants.SCHEMA_DN, dn1))
- {
- boolean found = false;
- for (String dn2 : uData.getBaseDNs())
- {
- found = Utils.areDnsEqual(dn1, dn2);
- break;
- }
- if (!found)
- {
- returnValue = false;
- }
- }
- }
- return returnValue;
- }
-
- /**
- * Commodity method that generates a list of preferred connection (of just
- * one) with the information on a given InitialLdapContext.
- * @param ctx the connection we retrieve the inforamtion from.
- * @return a list containing the preferred connection object.
- */
- private LinkedHashSet<PreferredConnection> getPreferredConnections(
- InitialLdapContext ctx)
- {
- PreferredConnection cnx = PreferredConnection.getPreferredConnection(ctx);
- LinkedHashSet<PreferredConnection> returnValue =
- new LinkedHashSet<PreferredConnection>();
- returnValue.add(cnx);
- return returnValue;
- }
-
- /**
- * Returns the host port representation of the server to be used in progress,
- * status and error messages. It takes into account the fact the host and
- * port provided by the user.
- * @param server the ServerDescriptor.
- * @param cnx the preferred connections list.
- * @return the host port string representation of the provided server.
- */
- protected String getHostPort(ServerDescriptor server,
- Collection<PreferredConnection> cnx)
- {
- String hostPort = null;
-
- for (PreferredConnection connection : cnx)
- {
- String url = connection.getLDAPURL();
- if (url.equals(server.getLDAPURL()))
- {
- hostPort = server.getHostPort(false);
- }
- else if (url.equals(server.getLDAPsURL()))
- {
- hostPort = server.getHostPort(true);
- }
- }
- if (hostPort == null)
- {
- hostPort = server.getHostPort(true);
- }
- return hostPort;
- }
-
- /**
- * Prompts the user for the subcommand that should be executed.
- * @return the subcommand choice of the user.
- */
- private SubcommandChoice promptForSubcommand()
- {
- SubcommandChoice returnValue;
- MenuBuilder<SubcommandChoice> builder =
- new MenuBuilder<SubcommandChoice>(this);
- builder.setPrompt(INFO_REPLICATION_SUBCOMMAND_PROMPT.get());
- builder.addCancelOption(false);
- for (SubcommandChoice choice : SubcommandChoice.values())
- {
- if (choice != SubcommandChoice.CANCEL)
- {
- builder.addNumberedOption(choice.getPrompt(),
- MenuResult.success(choice));
- }
- }
- try
- {
- MenuResult<SubcommandChoice> m = builder.toMenu().run();
- if (m.isSuccess())
- {
- returnValue = m.getValue();
- }
- else
- {
- // The user cancelled
- returnValue = SubcommandChoice.CANCEL;
- }
- }
- catch (CLIException ce)
- {
- returnValue = SubcommandChoice.CANCEL;
- LOG.log(Level.WARNING, "Error reading input: "+ce, ce);
- }
- return returnValue;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliReturnCode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliReturnCode.java
deleted file mode 100644
index 7da97f7..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliReturnCode.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2007-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-import static org.opends.messages.AdminToolMessages.*;
-
-import org.opends.messages.Message;
-
-/**
- *
- * The enumeration which defines the return code.
- *
- */
-public enum ReplicationCliReturnCode
-{
- /**
- * successful.
- */
- SUCCESSFUL(0, INFO_REPLICATION_SUCCESSFUL.get()),
-
- /**
- * successful but no operation was performed.
- */
- SUCCESSFUL_NOP(SUCCESSFUL.getReturnCode(),
- INFO_REPLICATION_SUCCESSFUL_NOP.get()),
-
- /**
- * Unable to initialize arguments.
- */
- CANNOT_INITIALIZE_ARGS(1, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Cannot parse arguments because the user provided arguments are not valid
- * or there was an error checking the user data.
- */
- ERROR_USER_DATA(2, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * The user cancelled the operation in interactive mode.
- */
- USER_CANCELLED(3, ERR_REPLICATION_USER_CANCELLED.get()),
-
- /**
- * Unexpected error (potential bug).
- */
- CONFLICTING_ARGS(4, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * The provided base DNs cannot be used to enable replication.
- */
- REPLICATION_CANNOT_BE_ENABLED_ON_BASEDN(5, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * The provided base DNs cannot be used to disable replication.
- */
- REPLICATION_CANNOT_BE_DISABLED_ON_BASEDN(6, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * The provided base DNs cannot be used to initialize the contents of the
- * replicas.
- */
- REPLICATION_CANNOT_BE_INITIALIZED_ON_BASEDN(7,
- ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error connecting with the provided credentials.
- */
- ERROR_CONNECTING(8, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Could not find the replication ID of the domain to be used to initialize
- * the replica.
- */
- REPLICATIONID_NOT_FOUND(9, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * The number of tries we perform to start the initialization are over.
- * We systematically receive a peer not found error.
- */
- INITIALIZING_TRIES_COMPLETED(10, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error enabling replication on a base DN.
- */
- ERROR_ENABLING_REPLICATION_ON_BASEDN(11, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error initializing base DN.
- */
- ERROR_INITIALIZING_BASEDN_GENERIC(12, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error reading configuration.
- */
- ERROR_READING_CONFIGURATION(13, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error updating ADS.
- */
- ERROR_UPDATING_ADS(14, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error reading ADS.
- */
- ERROR_READING_ADS(15, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error reading TopologyCache.
- */
- ERROR_READING_TOPOLOGY_CACHE(16, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error configuring replication server.
- */
- ERROR_CONFIGURING_REPLICATIONSERVER(17, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Unsupported ADS scenario.
- */
- REPLICATION_ADS_MERGE_NOT_SUPPORTED(18, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error disabling replication on base DN.
- */
- ERROR_DISABLING_REPLICATION_ON_BASEDN(19, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error removing replication port reference on base DN.
- */
- ERROR_DISABLING_REPLICATION_REMOVE_REFERENCE_ON_BASEDN(20,
- ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error initializing Administration Framework.
- */
- ERROR_INITIALIZING_ADMINISTRATION_FRAMEWORK(21,
- ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error seeding trustore.
- */
- ERROR_SEEDING_TRUSTORE(22, ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error launching pre external initialization.
- */
- ERROR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION(23,
- ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error launching pre external initialization.
- */
- ERROR_LAUNCHING_POST_EXTERNAL_INITIALIZATION(24,
- ERR_REPLICATION_NO_MESSAGE.get()),
-
- /**
- * Error disabling replication server.
- */
- ERROR_DISABLING_REPLICATION_SERVER(25, ERR_REPLICATION_NO_MESSAGE.get());
-
-
- private Message message;
- private int returnCode;
-
- // Private constructor.
- private ReplicationCliReturnCode(int returnCode, Message message)
- {
- this.returnCode = returnCode;
- this.message = message;
- }
-
- /**
- * Get the corresponding message.
- *
- * @return The corresponding message.
- */
- public Message getMessage()
- {
- return message;
- }
-
- /**
- * Get the corresponding return code value.
- *
- * @return The corresponding return code value.
- */
- public int getReturnCode()
- {
- return returnCode;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationUserData.java
deleted file mode 100644
index d7f219a..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationUserData.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-import java.util.LinkedList;
-
-/**
- * This class is used to store the information provided by the user in the
- * replication command line. It is required because when we are in interactive
- * mode the ReplicationCliArgumentParser is not enough.
- *
- */
-abstract class ReplicationUserData
-{
- private LinkedList<String> baseDNs = new LinkedList<String>();
- private String adminUid;
- private String adminPwd;
-
- /**
- * Returns the Global Administrator password.
- * @return the Global Administrator password.
- */
- String getAdminPwd()
- {
- return adminPwd;
- }
-
- /**
- * Sets the Global Administrator password.
- * @param adminPwd the Global Administrator password.
- */
- void setAdminPwd(String adminPwd)
- {
- this.adminPwd = adminPwd;
- }
-
- /**
- * Returns the Global Administrator UID.
- * @return the Global Administrator UID.
- */
- String getAdminUid()
- {
- return adminUid;
- }
-
- /**
- * Sets the Global Administrator UID.
- * @param adminUid the Global Administrator UID.
- */
- void setAdminUid(String adminUid)
- {
- this.adminUid = adminUid;
- }
-
- /**
- * Returns the Base DNs to replicate.
- * @return the Base DNs to replicate.
- */
- LinkedList<String> getBaseDNs()
- {
- return new LinkedList<String>(baseDNs);
- }
-
- /**
- * Sets the Base DNs to replicate.
- * @param baseDNs the Base DNs to replicate.
- */
- void setBaseDNs(LinkedList<String> baseDNs)
- {
- this.baseDNs.clear();
- this.baseDNs.addAll(baseDNs);
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/StatusReplicationUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/StatusReplicationUserData.java
deleted file mode 100644
index 8c6418e..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/StatusReplicationUserData.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.replicationcli;
-
-/**
- * This class is used to store the information provided by the user to
- * show replication configuration. It is required because when we are in
- * interactive mode the ReplicationCliArgumentParser is not enough.
- *
- */
-class StatusReplicationUserData extends InitializeAllReplicationUserData
-{
- private boolean scriptFriendly;
-
- /**
- * Whether we must display information in a script-friendly mode or not.
- * @return <CODE>true</CODE> if we must display the information in a
- * script-friendly mode and <CODE>false</CODE> otherwise.
- */
- public boolean isScriptFriendly()
- {
- return scriptFriendly;
- }
-
- /**
- * Sets whether we must display information in a script-friendly mode or not.
- * @param scriptFriendly whether we must display information in a
- * script-friendly mode or not.
- */
- public void setScriptFriendly(boolean scriptFriendly)
- {
- this.scriptFriendly = scriptFriendly;
- }
-}
-
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/package-info.java
deleted file mode 100644
index 1b9bb86..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/package-info.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-
-
-/**
- * Defines the classes that are you used by the replication
- * command lines. This includes the command line parsers
- * (ReplicationCliParser), the classes that actually execute the configuration
- * operations (ReplicationCliMain), the enumeration that defines the return
- * codes of the command-line (ReplicationCliReturnCode), a particular exception
- * used only for the package (ReplicationCliException) and the different data
- * models that represent the data provided by the user directly as command-line
- * parameters and also interactively.
- * */
-package org.opends.guitools.replicationcli;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/BaseDNDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/BaseDNDescriptor.java
deleted file mode 100644
index 0ee5b97..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/BaseDNDescriptor.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2007-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import java.io.UnsupportedEncodingException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.opends.quicksetup.util.Utils;
-import org.opends.server.util.StaticUtils;
-
-/**
- * This class is used to represent a Base DN / Replica and is aimed to be
- * used by the classes in the DatabasesTableModel class.
- *
- */
-public class BaseDNDescriptor implements Comparable
-{
- /**
- * An enumeration describing the type of base DN for a given Database.
- */
- public enum Type
- {
- /**
- * The base DN is not replicated.
- */
- NOT_REPLICATED,
- /**
- * The base DN is replicated.
- */
- REPLICATED
- };
-
- private int nEntries;
- private int missingChanges;
- private DatabaseDescriptor db;
- private long ageOfOldestMissingChange;
- private Type type;
- private String baseDn;
- private String unescapedDn;
- private static final Logger LOG =
- Logger.getLogger(BaseDNDescriptor.class.getName());
-
-
- /**
- * Constructor for this class.
- * @param type the type of replication.
- * @param baseDn the base DN associated with the Replication.
- * @param db the database containing this base DN.
- * @param nEntries the number of entries for the base DN.
- * @param ageOfOldestMissingChange the number of missing changes.
- * @param missingChanges the number of missing changes.
- */
- public BaseDNDescriptor(Type type, String baseDn, DatabaseDescriptor db,
- int nEntries, long ageOfOldestMissingChange, int missingChanges)
- {
- this.baseDn = baseDn;
- this.db = db;
- this.type = type;
- this.nEntries = nEntries;
- this.ageOfOldestMissingChange = ageOfOldestMissingChange;
- this.missingChanges = missingChanges;
- try
- {
- this.unescapedDn = unescapeUtf8(baseDn);
- }
- catch (Throwable t)
- {
- this.unescapedDn = baseDn;
- LOG.log(Level.WARNING, "Error unescaping dn: "+baseDn, t);
- }
- }
-
- /**
- * Return the String DN associated with the base DN..
- * @return the String DN associated with the base DN.
- */
- public String getDn()
- {
- return baseDn;
- }
-
- /**
- * Return the String DN associated with the base DN with unescaped UTF-8
- * characters.
- * @return the String DN associated with the base DN with unescaped UTF-8
- * characters.
- */
- public String getUnescapedDn()
- {
- return unescapedDn;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean equals(Object v)
- {
- boolean equals = false;
- if (this != v)
- {
- if (v instanceof BaseDNDescriptor)
- {
- BaseDNDescriptor desc = (BaseDNDescriptor)v;
- equals = (getType() == desc.getType()) &&
- Utils.areDnsEqual(getDn(), desc.getDn()) &&
- (getAgeOfOldestMissingChange() == desc.getAgeOfOldestMissingChange()) &&
- (getMissingChanges() == desc.getMissingChanges()) &&
- getDatabase().getBackendID().equals(
- desc.getDatabase().getBackendID()) &&
- (getEntries() == desc.getEntries());
- }
- }
- else
- {
- equals = true;
- }
- return equals;
- }
-
- /**
- * {@inheritDoc}
- */
- public int hashCode()
- {
- return (getType().toString() + getAgeOfOldestMissingChange() + getDn() +
- getDatabase().getBackendID() + getMissingChanges()).hashCode();
- }
- /**
- * {@inheritDoc}
- */
- public int compareTo(Object o)
- {
- int returnValue = -1;
- if (o instanceof BaseDNDescriptor)
- {
- BaseDNDescriptor desc = (BaseDNDescriptor)o;
- returnValue = desc.getDn().compareTo(getDn());
- }
- return returnValue;
- }
-
- /**
- * Returns the number of entries in the database for this base DN.
- * @return the number of entries in the database for this base DN.
- */
- public int getEntries()
- {
- return nEntries;
- }
-
- /**
- * Returns the number of missing changes in the replication topology for
- * this base DN.
- * @return the number of missing changes in the replication topology for
- * this base DN.
- */
- public int getMissingChanges()
- {
- return missingChanges;
- }
-
- /**
- * Returns the age of the oldest missing change in seconds in the
- * replication topology for this base DN.
- * @return the age of the oldest missing change in seconds in the
- * replication topology for this base DN.
- */
- public long getAgeOfOldestMissingChange()
- {
- return ageOfOldestMissingChange;
- }
-
- /**
- * Returns the type for this base DN.
- * @return the type for this base DN.
- */
- public Type getType()
- {
- return type;
- }
-
- /**
- * Returns the database where this base DN is defined.
- * @return the database where this base DN is defined.
- */
- public DatabaseDescriptor getDatabase()
- {
- return db;
- }
-
- /**
- * Sets the type of this base DN.
- * @param type the new type for this base DN.
- */
- void setType(Type type)
- {
- this.type = type;
- }
-
- /**
- * Sets the database containing this base DN.
- * @param db the database containing this base DN.
- */
- void setDatabase(DatabaseDescriptor db)
- {
- this.db = db;
- }
-
- /**
- * Sets the number of entries for this base DN in this database.
- * @param nEntries the number of entries.
- */
- void setEntries(int nEntries)
- {
- this.nEntries = nEntries;
- }
-
- private String unescapeUtf8(String v) throws UnsupportedEncodingException
- {
- byte[] stringBytes = v.getBytes("UTF-8");
- byte[] decodedBytes = new byte[stringBytes.length];
- int pos = 0;
- for (int i = 0; i < stringBytes.length; i++)
- {
- if ((stringBytes[i] == '\\') && (i + 2 < stringBytes.length) &&
- StaticUtils.isHexDigit(stringBytes[i+1]) &&
- StaticUtils.isHexDigit(stringBytes[i+2]))
- {
- // Convert hex-encoded UTF-8 to 16-bit chars.
- byte b;
-
- byte escapedByte1 = stringBytes[++i];
- switch (escapedByte1)
- {
- case '0':
- b = (byte) 0x00;
- break;
- case '1':
- b = (byte) 0x10;
- break;
- case '2':
- b = (byte) 0x20;
- break;
- case '3':
- b = (byte) 0x30;
- break;
- case '4':
- b = (byte) 0x40;
- break;
- case '5':
- b = (byte) 0x50;
- break;
- case '6':
- b = (byte) 0x60;
- break;
- case '7':
- b = (byte) 0x70;
- break;
- case '8':
- b = (byte) 0x80;
- break;
- case '9':
- b = (byte) 0x90;
- break;
- case 'a':
- case 'A':
- b = (byte) 0xA0;
- break;
- case 'b':
- case 'B':
- b = (byte) 0xB0;
- break;
- case 'c':
- case 'C':
- b = (byte) 0xC0;
- break;
- case 'd':
- case 'D':
- b = (byte) 0xD0;
- break;
- case 'e':
- case 'E':
- b = (byte) 0xE0;
- break;
- case 'f':
- case 'F':
- b = (byte) 0xF0;
- break;
- default:
- throw new IllegalStateException("Unexpected byte: "+escapedByte1);
- }
-
- byte escapedByte2 = stringBytes[++i];
- switch (escapedByte2)
- {
- case '0':
- break;
- case '1':
- b |= 0x01;
- break;
- case '2':
- b |= 0x02;
- break;
- case '3':
- b |= 0x03;
- break;
- case '4':
- b |= 0x04;
- break;
- case '5':
- b |= 0x05;
- break;
- case '6':
- b |= 0x06;
- break;
- case '7':
- b |= 0x07;
- break;
- case '8':
- b |= 0x08;
- break;
- case '9':
- b |= 0x09;
- break;
- case 'a':
- case 'A':
- b |= 0x0A;
- break;
- case 'b':
- case 'B':
- b |= 0x0B;
- break;
- case 'c':
- case 'C':
- b |= 0x0C;
- break;
- case 'd':
- case 'D':
- b |= 0x0D;
- break;
- case 'e':
- case 'E':
- b |= 0x0E;
- break;
- case 'f':
- case 'F':
- b |= 0x0F;
- break;
- default:
- throw new IllegalStateException("Unexpected byte: "+escapedByte2);
- }
-
- decodedBytes[pos++] = b;
- }
- else {
- decodedBytes[pos++] = stringBytes[i];
- }
- }
- return new String(decodedBytes, 0, pos, "UTF-8");
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigException.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigException.java
deleted file mode 100644
index 222c058..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import org.opends.messages.Message;
-import org.opends.server.types.OpenDsException;
-
-/**
- * Exception thrown when there is an error with the configuration (for instance
- * a valid URL for the requested protocol could not be found).
- */
-public class ConfigException extends OpenDsException
-{
- private static final long serialVersionUID = 1266482779183126905L;
-
- /**
- * Constructor for the exception.
- * @param msg the localized message to be used.
- */
- public ConfigException(Message msg)
- {
- super(msg);
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromFile.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromFile.java
deleted file mode 100644
index eb23581..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromFile.java
+++ /dev/null
@@ -1,801 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2007-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.opends.server.admin.DefaultBehaviorProvider;
-import org.opends.server.admin.DefinedDefaultBehaviorProvider;
-import org.opends.server.admin.IPAddressPropertyDefinition;
-import org.opends.server.admin.std.meta.LDAPConnectionHandlerCfgDefn;
-import org.opends.server.core.DirectoryServer;
-import org.opends.admin.ads.ADSContext;
-import org.opends.admin.ads.util.ConnectionUtils;
-import org.opends.messages.Message;
-import org.opends.server.util.LDIFException;
-import org.opends.server.util.LDIFReader;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-import org.opends.server.types.LDIFImportConfig;
-import org.opends.server.types.ObjectClass;
-import org.opends.quicksetup.util.Utils;
-import org.opends.quicksetup.Installation;
-
-import static org.opends.messages.AdminToolMessages.*;
-
-/**
- * This class is used to retrieve configuration information directly from the
- * config.ldif file.
- *
- */
-public class ConfigFromFile
-{
- private final ObjectClass connectionHandlerOc =
- DirectoryServer.getObjectClass("ds-cfg-connection-handler", true);
- private final ObjectClass ldapConnectionHandlerOc =
- DirectoryServer.getObjectClass("ds-cfg-ldap-connection-handler", true);
- private final ObjectClass jmxConnectionHandlerOc =
- DirectoryServer.getObjectClass("ds-cfg-jmx-connection-handler", true);
- private final ObjectClass ldifConnectionHandlerOc =
- DirectoryServer.getObjectClass("ds-cfg-ldif-connection-handler", true);
- private final ObjectClass snmpConnectionHandlerOc =
- DirectoryServer.getObjectClass("ds-cfg-snmp-connection-handler", true);
- private final ObjectClass backendOc =
- DirectoryServer.getObjectClass("ds-cfg-backend", true);
- private final ObjectClass administrativeUserOc =
- DirectoryServer.getObjectClass("ds-cfg-root-dn-user", true);
- private final ObjectClass syncProviderOc =
- DirectoryServer.getObjectClass("ds-cfg-synchronization-provider", true);
- private final ObjectClass replicationConfigOc =
- DirectoryServer.getObjectClass("ds-cfg-replication-domain", true);
- private DN replicationDomainDN;
-
- private HashSet<ListenerDescriptor> listeners =
- new HashSet<ListenerDescriptor>();
- private HashSet<ListenerDescriptor> startTLSListeners =
- new HashSet<ListenerDescriptor>();
- private HashSet<DatabaseDescriptor> databases =
- new HashSet<DatabaseDescriptor>();
- private HashSet<String> administrativeUsers = new HashSet<String>();
- private Message errorMessage;
- private boolean replicationConfigured = false;
- private HashSet<String> replicatedSuffixes = new HashSet<String>();
-
- private static final Logger LOG =
- Logger.getLogger(ConfigFromFile.class.getName());
-
- /**
- * Default constructor.
- *
- */
- public ConfigFromFile()
- {
- }
-
- /**
- * Reads the configuration from the config.ldif file. When calling this
- * method the thread is blocked until all the configuration is read.
- *
- */
- public void readConfiguration()
- {
- errorMessage = null;
- listeners.clear();
- startTLSListeners.clear();
- databases.clear();
- administrativeUsers.clear();
- replicationConfigured = false;
- replicatedSuffixes.clear();
- LDIFReader reader = null;
- try
- {
- Installation installation = Installation.getLocal();
- LDIFImportConfig c = new LDIFImportConfig(
- Utils.getPath(installation.getCurrentConfigurationFile()));
- reader = new LDIFReader(c);
- for (Entry entry = reader.readEntry(false); entry != null;
- entry = reader.readEntry(false))
- {
- updateConfig(entry);
- }
- updateReplication();
- }
- catch (IOException ioe)
- {
- LOG.log(Level.SEVERE, "Error reading config file: "+ioe, ioe);
- errorMessage = Utils.getThrowableMsg(
- ERR_READING_CONFIG_FILE.get(), ioe);
- }
- catch (LDIFException le)
- {
- LOG.log(Level.SEVERE, "Error reading config file: "+le, le);
- errorMessage = Utils.getThrowableMsg(
- ERR_READING_CONFIG_FILE.get(), le);
- }
- catch (Throwable t)
- {
- LOG.log(Level.SEVERE, "Error reading config file: "+t, t);
- // Bug
- t.printStackTrace();
- errorMessage = Utils.getThrowableMsg(
- ERR_READING_CONFIG_FILE.get(), t);
- }
- finally
- {
- if (reader != null)
- {
- try
- {
- reader.close();
- }
- catch (Throwable t)
- {
- }
- }
- }
- }
-
- /**
- * Returns the Administrative User DNs found in the config.ldif.
- * @return the Administrative User DNs found in the config.ldif.
- */
- public HashSet<String> getAdministrativeUsers()
- {
- HashSet<String> copy = new HashSet<String>();
- copy.addAll(administrativeUsers);
- return copy;
- }
-
- /**
- * Returns the database descriptors found in the config.ldif.
- * @return the database descriptors found in the config.ldif.
- */
- public HashSet<DatabaseDescriptor> getDatabases()
- {
- HashSet<DatabaseDescriptor> copy = new HashSet<DatabaseDescriptor>();
- copy.addAll(databases);
- return copy;
- }
-
- /**
- * Returns the listener descriptors found in the config.ldif.
- * @return the listeners descriptors found in the config.ldif.
- */
- public HashSet<ListenerDescriptor> getListeners()
- {
- HashSet<ListenerDescriptor> copy = new HashSet<ListenerDescriptor>();
- copy.addAll(listeners);
- return copy;
- }
-
- /**
- * Returns the error message that we got when retrieving the information
- * from the config.ldif file.
- * @return the error message that we got when retrieving the information
- * from the config.ldif file.
- */
- public Message getErrorMessage()
- {
- return errorMessage;
- }
-
- /**
- * Returns the ldap URL that we can use to connect to the server based in
- * what we found in the config.ldif file.
- * @return the ldap URL that we can use to connect to the server based in
- * what we found in the config.ldif file.
- */
- public String getLDAPURL()
- {
- return getLDAPURL(false);
- }
-
- /**
- * Returns the ldaps URL that we can use to connect to the server based in
- * what we found in the config.ldif file.
- * @return the ldaps URL that we can use to connect to the server based in
- * what we found in the config.ldif file.
- */
- public String getLDAPSURL()
- {
- return getLDAPURL(true);
- }
-
- /**
- * Returns the ldap URL that we can use to connect to the server using Start
- * TLS based in what we found in the config.ldif file.
- * @return the ldap URL that we can use to connect to the server using Start
- * TLS based in what we found in the config.ldif file.
- */
- public String getStartTLSURL()
- {
- String url = null;
- for (ListenerDescriptor desc : startTLSListeners)
- {
- if (desc.getState() == ListenerDescriptor.State.ENABLED)
- {
- int port = -1;
- String host = "localhost";
- try
- {
- String addressPort = desc.getAddressPort();
- int index = addressPort.indexOf(":");
- if (index != -1)
- {
- port = Integer.parseInt(addressPort.substring(index+1));
- if (index > 0)
- {
- host = addressPort.substring(0, index);
- }
- }
- else
- {
- port = Integer.parseInt(addressPort);
- }
- }
- catch (Exception ex)
- {
- // Could not get the port
- }
-
- if (port != -1)
- {
- url = "ldap://"+ConnectionUtils.getHostNameForLdapUrl(host)+":"+port;
- break;
- }
- }
- }
- return url;
- }
-
- /**
- * Retuns the LDAP URL for the specified connection policy.
- * @param policy the connection policy to be used.
- * @return the LDAP URL for the specified connection policy.
- * @throws ConfigException if a valid LDAP URL could not be found.
- */
- public String getURL(ConnectionProtocolPolicy policy) throws ConfigException
- {
- String url;
- String ldapUrl = getLDAPURL();
- String startTlsUrl = getStartTLSURL();
- String ldapsUrl = getLDAPSURL();
- switch (policy)
- {
- case USE_STARTTLS:
- if (startTlsUrl != null)
- {
- url = startTlsUrl;
- }
- else
- {
- throw new ConfigException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_LDAPS:
- if (ldapsUrl != null)
- {
- url = ldapsUrl;
- }
- else
- {
- throw new ConfigException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_LDAP:
- if (ldapUrl != null)
- {
- url = ldapUrl;
- }
- else
- {
- throw new ConfigException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_MOST_SECURE_AVAILABLE:
- if (ldapsUrl != null)
- {
- url = ldapsUrl;
- }
- else if (startTlsUrl != null)
- {
- url = startTlsUrl;
- }
- else if (ldapUrl != null)
- {
- url = ldapUrl;
- }
- else
- {
- throw new ConfigException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_LESS_SECURE_AVAILABLE:
- if (ldapUrl != null)
- {
- url = ldapUrl;
- }
- else if (ldapsUrl != null)
- {
- url = ldapsUrl;
- }
- else
- {
- throw new ConfigException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- default:
- throw new IllegalStateException("Unknown connection policy: "+
- policy);
- }
- return url;
- }
-
- private String getLDAPURL(boolean secure)
- {
- String url = null;
-
- for (ListenerDescriptor desc : getListeners())
- {
- if (desc.getState() == ListenerDescriptor.State.ENABLED)
-
- {
- int port = -1;
- String host = "localhost";
- try
- {
- String addressPort = desc.getAddressPort();
- int index = addressPort.indexOf(":");
- if (index != -1)
- {
- port = Integer.parseInt(addressPort.substring(index+1));
- if (index > 0)
- {
- host = addressPort.substring(0, index);
- }
- }
- else
- {
- port = Integer.parseInt(addressPort);
- }
- }
- catch (Exception ex)
- {
- // Could not get the port
- }
-
- if (port != -1)
- {
- if (!secure &&
- (desc.getProtocol() == ListenerDescriptor.Protocol.LDAP))
- {
- url = "ldap://"+ConnectionUtils.getHostNameForLdapUrl(host)+":"+
- port;
- break;
- }
- if (secure &&
- (desc.getProtocol() == ListenerDescriptor.Protocol.LDAPS))
- {
- url = "ldaps://"+ConnectionUtils.getHostNameForLdapUrl(host)+":"+
- port;
- break;
- }
- }
- }
- }
- return url;
- }
-
- /**
- * Returns the default LDAP address as defined in the configuration.
- * @return the default LDAP address as defined in the configuration.
- */
- static String getDefaultLdapAddress()
- {
- String address = null;
- // Get default value
- LDAPConnectionHandlerCfgDefn connHandler =
- LDAPConnectionHandlerCfgDefn.getInstance();
- IPAddressPropertyDefinition prop =
- connHandler.getListenAddressPropertyDefinition();
- DefaultBehaviorProvider p = prop.getDefaultBehaviorProvider();
- if (p instanceof DefinedDefaultBehaviorProvider)
- {
- Collection<?> defaultValues =
- ((DefinedDefaultBehaviorProvider)p).getDefaultValues();
- if (!defaultValues.isEmpty())
- {
- address = defaultValues.iterator().next().toString();
- }
- }
- return address;
- }
-
- /**
- * An convenience method to know if the provided ID corresponds to a
- * configuration backend or not.
- * @param id the backend ID to analyze
- * @return <CODE>true</CODE> if the the id corresponds to a configuration
- * backend and <CODE>false</CODE> otherwise.
- */
- static boolean isConfigBackend(String id)
- {
- return "tasks".equalsIgnoreCase(id) ||
- "schema".equalsIgnoreCase(id) ||
- "config".equalsIgnoreCase(id) ||
- "monitor".equalsIgnoreCase(id) ||
- "backup".equalsIgnoreCase(id) ||
- ADSContext.getDefaultBackendName().equalsIgnoreCase(id) ||
- "ads-truststore".equalsIgnoreCase(id) ||
- "replicationchanges".equalsIgnoreCase(id);
- }
-
-
- /**
- * Updates the configuration data we expose to the user with the provided
- * entry object.
- * @param entry the entry to analyze.
- */
- private void updateConfig(Entry entry)
- {
- if (entry.hasObjectClass(connectionHandlerOc))
- {
- updateConfigWithConnectionHandler(entry);
- }
- else if (entry.hasObjectClass(backendOc))
- {
- updateConfigWithBackend(entry);
- }
- else if (entry.hasObjectClass(administrativeUserOc))
- {
- updateConfigWithAdministrativeUser(entry);
- }
- else if (entry.hasObjectClass(syncProviderOc))
- {
- updateConfigWithSyncProviderEntry(entry);
- }
- else if (entry.hasObjectClass(replicationConfigOc))
- {
- updateConfigWithReplConfig(entry);
- }
- }
-
- /**
- * Updates the listener configuration data we expose to the user with the
- * provided entry object.
- * @param entry the entry to analyze.
- */
- private void updateConfigWithConnectionHandler(Entry entry)
- {
- String address = getFirstValue(entry, "ds-cfg-listen-address");
- String port = getFirstValue(entry, "ds-cfg-listen-port");
- String addressPort;
-
- boolean isSecure = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-use-ssl"));
-
- ListenerDescriptor.Protocol protocol;
- Message protocolDescription;
-
- ListenerDescriptor.State state;
- if (entry.hasObjectClass(ldapConnectionHandlerOc))
- {
- if (address == null)
- {
- address = getDefaultLdapAddress();
- }
-
- addressPort = address+":"+port;
- if (isSecure)
- {
- protocolDescription = INFO_LDAPS_PROTOCOL_LABEL.get();
- protocol = ListenerDescriptor.Protocol.LDAPS;
- }
- else
- {
- protocolDescription = INFO_LDAP_PROTOCOL_LABEL.get();
- protocol = ListenerDescriptor.Protocol.LDAP;
- }
- boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-enabled"));
- if (enabled)
- {
- state = ListenerDescriptor.State.ENABLED;
- }
- else
- {
- state = ListenerDescriptor.State.DISABLED;
- }
- }
- else if (entry.hasObjectClass(jmxConnectionHandlerOc))
- {
- addressPort = "0.0.0.0:"+port;
- if (isSecure)
- {
- protocolDescription = INFO_JMX_SECURE_PROTOCOL_LABEL.get();
- protocol = ListenerDescriptor.Protocol.JMXS;
- }
- else
- {
- protocolDescription = INFO_JMX_PROTOCOL_LABEL.get();
- protocol = ListenerDescriptor.Protocol.JMX;
- }
- boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-enabled"));
- if (enabled)
- {
- state = ListenerDescriptor.State.ENABLED;
- }
- else
- {
- state = ListenerDescriptor.State.DISABLED;
- }
- }
- else if (entry.hasObjectClass(ldifConnectionHandlerOc))
- {
- addressPort = INFO_UNKNOWN_LABEL.get().toString();
- protocol = ListenerDescriptor.Protocol.LDIF;
- protocolDescription = INFO_LDIF_PROTOCOL_LABEL.get();
- boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-connection-handler-enabled"));
- if (enabled)
- {
- state = ListenerDescriptor.State.ENABLED;
- }
- else
- {
- state = ListenerDescriptor.State.DISABLED;
- }
- }
- else if (entry.hasObjectClass(snmpConnectionHandlerOc))
- {
- addressPort = "0.0.0.0:"+port;
- protocol = ListenerDescriptor.Protocol.SNMP;
- protocolDescription = INFO_SNMP_PROTOCOL_LABEL.get();
- boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-enabled"));
- if (enabled)
- {
- state = ListenerDescriptor.State.ENABLED;
- }
- else
- {
- state = ListenerDescriptor.State.DISABLED;
- }
- }
- else
- {
- addressPort = INFO_UNKNOWN_LABEL.get().toString();
- protocolDescription = null;
- protocol = ListenerDescriptor.Protocol.OTHER;
- /* Try to figure a name from the cn */
- String cn = getFirstValue(entry, "cn");
- if (cn != null)
- {
- int index = cn.toLowerCase().indexOf("connection handler");
- if (index > 0)
- {
- protocolDescription = Message.raw(cn.substring(0, index).trim());
- }
- else
- {
- protocolDescription = Message.raw(cn);
- }
- }
- else
- {
- protocolDescription = INFO_UNDEFINED_PROTOCOL_LABEL.get();
- }
- state = ListenerDescriptor.State.UNKNOWN;
- }
- listeners.add(new ListenerDescriptor(addressPort, protocol,
- protocolDescription, state));
- if (protocol == ListenerDescriptor.Protocol.LDAP)
- {
- String allowStartTLS = getFirstValue(entry, "ds-cfg-allow-start-tls");
- if (allowStartTLS != null)
- {
- if ("true".equalsIgnoreCase(allowStartTLS.trim()))
- {
- startTLSListeners.add(new ListenerDescriptor(addressPort, protocol,
- protocolDescription, state));
- }
- }
- }
- }
-
- /**
- * Updates the database configuration data we expose to the user with the
- * provided entry object.
- * @param entry the entry to analyze.
- */
- private void updateConfigWithBackend(Entry entry)
- {
- String id = getFirstValue(entry, "ds-cfg-backend-id");
- int nEntries = -1; // Unknown
-
- if (!isConfigBackend(id))
- {
- Set<String> baseDns = getValues(entry, "ds-cfg-base-dn");
- TreeSet<BaseDNDescriptor> replicas = new TreeSet<BaseDNDescriptor>();
-
- DatabaseDescriptor db = new DatabaseDescriptor(id, replicas, nEntries);
-
- for (String baseDn : baseDns)
- {
- BaseDNDescriptor rep = getBaseDNDescriptor(entry, baseDn);
- rep.setDatabase(db);
- db.getBaseDns().add(rep);
- }
- databases.add(db);
- }
- }
-
- /**
- * Updates the administrative user configuration data we expose to the user
- * with the provided entry object.
- * @param entry the entry to analyze.
- */
- private void updateConfigWithAdministrativeUser(Entry entry)
- {
- administrativeUsers.addAll(getValues(entry, "ds-cfg-alternate-bind-dn"));
- }
-
- /**
- * Updates the replication configuration data we expose to the user with
- * the provided entry object.
- * @param entry the entry to analyze.
- */
- private void updateConfigWithSyncProviderEntry(Entry entry)
- {
- if ("true".equalsIgnoreCase(getFirstValue(entry,
- "ds-cfg-enabled")))
- {
- replicationConfigured = true;
- }
- else
- {
- replicationConfigured = false;
- }
- }
-
-
- /**
- * Updates the databases suffixes with the list of replicated suffixes
- * found.
- */
- private void updateReplication()
- {
- if (replicationConfigured)
- {
- for (String suffixDn: replicatedSuffixes)
- {
- BaseDNDescriptor replica = null;
- for (DatabaseDescriptor db: databases)
- {
- Set<BaseDNDescriptor> replicas = db.getBaseDns();
- for (BaseDNDescriptor rep: replicas)
- {
- if (Utils.areDnsEqual(rep.getDn(), suffixDn))
- {
- replica = rep;
- break;
- }
- }
- if (replica != null)
- {
- break;
- }
- }
- if (replica != null)
- {
- replica.setType(BaseDNDescriptor.Type.REPLICATED); }
- }
- }
- }
-
- /**
- * Updates the replication configuration data we expose to the user with
- * the provided entry object.
- * @param entry the entry to analyze.
- */
- private void updateConfigWithReplConfig(Entry entry)
- {
- if (replicationDomainDN == null)
- {
- try
- {
- replicationDomainDN = DN.decode(
- "cn=domains,cn=Multimaster Synchronization,"+
- "cn=Synchronization Providers,cn=config");
- }
- catch (Throwable t)
- {
- // Bug
- throw new IllegalStateException("Bug: "+t, t);
- }
- }
- if (entry.getDN().isDescendantOf(replicationDomainDN))
- {
- replicatedSuffixes.addAll(getValues(entry, "ds-cfg-base-dn"));
- }
- }
-
- /*
- * The following 2 methods are convenience methods to retrieve String values
- * from an entry.
- */
- private Set<String> getValues(Entry entry, String attrName)
- {
- Set<String> values = new HashSet<String>();
- List<Attribute> attrs = entry.getAttribute(attrName);
- if ((attrs != null) && attrs.size() > 0)
- {
- Attribute attr = attrs.iterator().next();
- LinkedHashSet<AttributeValue> vs = attr.getValues();
- if ((vs != null) && (vs.size() > 0))
- {
- for (AttributeValue v : vs)
- {
- values.add(v.getStringValue());
- }
- }
- }
- return values;
- }
-
- private String getFirstValue(Entry entry, String attrName)
- {
- String v = null;
- Set<String> values = getValues(entry, attrName);
- if (values.size() > 0)
- {
- v = values.iterator().next();
- }
- return v;
- }
-
- /**
- * Create a non replicated base DN descriptor.
- */
- private BaseDNDescriptor getBaseDNDescriptor(Entry entry, String baseDn)
- {
- return new BaseDNDescriptor(BaseDNDescriptor.Type.NOT_REPLICATED,
- baseDn, null, -1, -1, -1);
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromLDAP.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromLDAP.java
deleted file mode 100644
index 71414ef..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromLDAP.java
+++ /dev/null
@@ -1,1126 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2007-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import javax.naming.ldap.InitialLdapContext;
-import javax.naming.ldap.LdapName;
-import javax.net.ssl.TrustManager;
-
-import org.opends.admin.ads.util.ConnectionUtils;
-import org.opends.quicksetup.util.Utils;
-
-import org.opends.messages.Message;
-import org.opends.messages.QuickSetupMessages;
-import static org.opends.messages.AdminToolMessages.*;
-
-/**
- * This class is used to retrieve configuration and monitoring information using
- * LDAP protocol.
- *
- */
-public class ConfigFromLDAP
-{
- private HashSet<ListenerDescriptor> listeners =
- new HashSet<ListenerDescriptor>();
- private HashSet<DatabaseDescriptor> databases =
- new HashSet<DatabaseDescriptor>();
- private HashSet<String> administrativeUsers = new HashSet<String>();
- private Message errorMessage;
- private boolean replicationConfigured = false;
- private ArrayList<String> replicatedSuffixes = new ArrayList<String>();
- private HashMap<String, Integer> hmMissingChanges =
- new HashMap<String, Integer>();
- private HashMap<String, Long> hmAgeOfOldestMissingChanges =
- new HashMap<String, Long>();
- private static final Logger LOG = Logger.getLogger(
- ConfigFromLDAP.class.getName());
-
- private String dn;
- private String pwd;
- private String lastUrl;
- private ConnectionProtocolPolicy policy;
- private ConfigFromFile offlineConf;
- private TrustManager trustManager;
-
- private InitialLdapContext ctx;
- private String javaVersion;
- private int openConnections = -1;
-
- /**
- * Default constructor.
- *
- */
- public ConfigFromLDAP()
- {
- }
-
- /**
- * Sets the connection information required to contact the server using LDAP.
- * @param offlineConf the ConfigFromFile object used to retrieve the LDAP URL
- * that will be used to connect to the server.
- * @param policy the configuration policy to be used (whether we prefer the
- * most secure, the less secure, a specific method...).
- * @param dn the authentication Distinguished Name to bind.
- * @param pwd the authentication password to bind.
- * @param trustManager the trust manager to be used for the secure
- * connections.
- * @throws ConfigException if a valid URL could not be found with the provided
- * parameters.
- */
- public void setConnectionInfo(ConfigFromFile offlineConf,
- ConnectionProtocolPolicy policy, String dn, String pwd,
- TrustManager trustManager) throws ConfigException
- {
- if (offlineConf == null)
- {
- throw new IllegalArgumentException("offlineConf cannot be null.");
- }
- if (policy == null)
- {
- throw new IllegalArgumentException("policy cannot be null.");
- }
- if (dn == null)
- {
- throw new IllegalArgumentException("dn cannot be null.");
- }
- if (pwd == null)
- {
- throw new IllegalArgumentException("pwd cannot be null.");
- }
- this.trustManager = trustManager;
- this.offlineConf = offlineConf;
- this.policy = policy;
- String ldapUrl = offlineConf.getURL(policy);
-
- if (!Utils.areDnsEqual(dn, this.dn) ||
- !pwd.equals(this.pwd) ||
- (policy != this.policy) ||
- !ldapUrl.equals(lastUrl))
- {
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- ctx = null;
- }
- }
-
- this.lastUrl = ldapUrl;
- this.dn = dn;
- this.pwd = pwd;
- }
-
- /**
- * Method to be called to close properly the connection.
- */
- public void closeConnection()
- {
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
- }
-
- /**
- * Reads the configuration and monitoring information of the server using
- * LDAP.
- * When calling this method the thread is blocked until all the configuration
- * is read.
- *
- * This method assumes that the setConnectionInfo has been called previously.
- *
- */
- public void readConfiguration()
- {
- errorMessage = null;
-
- listeners.clear();
- databases.clear();
- administrativeUsers.clear();
- replicationConfigured = false;
- replicatedSuffixes.clear();
- hmMissingChanges.clear();
- hmAgeOfOldestMissingChanges.clear();
- javaVersion = null;
- openConnections = -1;
-
- try
- {
- InitialLdapContext ctx = getDirContext();
- updateAdministrativeUsers(ctx);
- updateListeners(ctx);
- updateReplication(ctx);
- updateDatabases(ctx);
- javaVersion = getJavaVersion(ctx);
- openConnections = getOpenConnections(ctx);
- }
- catch (NamingException ne)
- {
- String detail;
- if (ne.getMessage() != null)
- {
- detail = ne.getMessage();
- }
- else
- {
- detail = ne.toString();
- }
- if (Utils.isCertificateException(ne))
- {
- errorMessage =
- QuickSetupMessages.INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE.get(
- detail);
- }
- else
- {
- errorMessage = ERR_READING_CONFIG_LDAP.get(detail);
- }
-
- /*
- * Display the information that we find in the off line configuration.
- */
- if (listeners.isEmpty())
- {
- listeners.addAll(offlineConf.getListeners());
- }
- if (databases.isEmpty())
- {
- databases.addAll(offlineConf.getDatabases());
- }
- if (administrativeUsers.isEmpty())
- {
- administrativeUsers.addAll(offlineConf.getAdministrativeUsers());
- }
- }
- catch (Throwable t)
- {
- // Bug: this is not necessarily a bug on our side (see issue 3318).
- // Just log it.
- LOG.log(Level.SEVERE, "Unexpected error reading configuration: "+t, t);
- errorMessage = ERR_READING_CONFIG_LDAP.get(t.toString());
- }
- }
-
-
- /**
- * Returns the Administrative User DNs found using LDAP.
- * @return the Administrative User DNs found using LDAP.
- */
- public HashSet<String> getAdministrativeUsers()
- {
- HashSet<String> copy = new HashSet<String>();
- copy.addAll(administrativeUsers);
- return copy;
- }
-
- /**
- * Returns the database descriptors found in the config.ldif.
- * @return the database descriptors found in the config.ldif.
- */
- public HashSet<DatabaseDescriptor> getDatabases()
- {
- HashSet<DatabaseDescriptor> copy = new HashSet<DatabaseDescriptor>();
- copy.addAll(databases);
- return copy;
- }
-
- /**
- * Returns the listener descriptors found in the config.ldif.
- * @return the listeners descriptors found in the config.ldif.
- */
- public HashSet<ListenerDescriptor> getListeners()
- {
- HashSet<ListenerDescriptor> copy = new HashSet<ListenerDescriptor>();
- copy.addAll(listeners);
- return copy;
- }
-
- /**
- * Return the java version we found using LDAP.
- * @return the java version we found using LDAP.
- */
- public String getJavaVersion()
- {
- return javaVersion;
- }
-
- /**
- * Return the number of open connections we found using LDAP.
- * @return the number of open connections we found using LDAP.
- */
- public int getOpenConnections()
- {
- return openConnections;
- }
-
- /**
- * Returns the error message that we got when retrieving the information
- * using LDAP.
- * @return the error message that we got when retrieving the information
- * using LDAP.
- */
- public Message getErrorMessage()
- {
- return errorMessage;
- }
-
- /**
- * Returns the InitialLdapContext object to be used to retrieve configuration
- * and monitoring information.
- * @return the InitialLdapContext object to be used to retrieve configuration
- * and monitoring information.
- * @throws NamingException if we could not get an InitialLdapContext.
- * @throws ConfigException if we could not retrieve a valid LDAP URL in
- * the configuration.
- */
- private InitialLdapContext getDirContext() throws NamingException,
- ConfigException
- {
- if (ctx != null)
- {
- try
- {
- pingDirContext(ctx);
- }
- catch (NamingException ne)
- {
- try
- {
- ctx.close();
- }
- catch(NamingException xx)
- {
- }
- ctx = null;
- }
- }
- if (ctx == null)
- {
- String ldapUrl = offlineConf.getLDAPURL();
- String startTlsUrl = offlineConf.getStartTLSURL();
- String ldapsUrl = offlineConf.getLDAPSURL();
- switch (policy)
- {
- case USE_STARTTLS:
- if (startTlsUrl != null)
- {
- ctx = Utils.createStartTLSContext(startTlsUrl, dn, pwd,
- Utils.getDefaultLDAPTimeout(), null, trustManager, null);
- }
- else
- {
- throw new ConfigException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_LDAPS:
- if (ldapsUrl != null)
- {
- ctx = Utils.createLdapsContext(ldapsUrl, dn, pwd,
- Utils.getDefaultLDAPTimeout(), null, trustManager);
- }
- else
- {
- throw new ConfigException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_LDAP:
- if (ldapUrl != null)
- {
- ctx = Utils.createLdapContext(ldapUrl, dn, pwd,
- Utils.getDefaultLDAPTimeout(), null);
- }
- else
- {
- throw new ConfigException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_MOST_SECURE_AVAILABLE:
- if (ldapsUrl != null)
- {
- ctx = Utils.createLdapsContext(ldapsUrl, dn, pwd,
- Utils.getDefaultLDAPTimeout(), null, trustManager);
- }
- else if (startTlsUrl != null)
- {
- ctx = Utils.createStartTLSContext(startTlsUrl, dn, pwd,
- Utils.getDefaultLDAPTimeout(), null,
- trustManager, null);
- }
- else if (ldapUrl != null)
- {
- ctx = Utils.createLdapContext(ldapUrl, dn, pwd,
- Utils.getDefaultLDAPTimeout(), null);
- }
- else
- {
- throw new ConfigException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_LESS_SECURE_AVAILABLE:
- if (ldapUrl != null)
- {
- ctx = Utils.createLdapContext(ldapUrl, dn, pwd,
- Utils.getDefaultLDAPTimeout(), null);
- }
- else if (ldapsUrl != null)
- {
- ctx = Utils.createLdapsContext(ldapsUrl, dn, pwd,
- Utils.getDefaultLDAPTimeout(), null, trustManager);
- }
- else
- {
- throw new ConfigException(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- default:
- throw new IllegalStateException("Unknown connection policy: "+
- policy);
- }
- }
- return ctx;
- }
-
- /**
- * Ping the specified InitialLdapContext.
- * This method sends a search request on the root entry of the DIT
- * and forward the corresponding exception (if any).
- * @param ctx the InitialLdapContext to be "pinged".
- * @throws NamingException if the ping could not be performed.
- */
- private void pingDirContext(InitialLdapContext ctx) throws NamingException {
- SearchControls sc = new SearchControls(
- SearchControls.OBJECT_SCOPE,
- 0, // count limit
- 0, // time limit
- new String[0], // No attributes
- false, // Don't return bound object
- false // Don't dereference link
- );
- ctx.search("", "objectclass=*", sc);
- }
-
- /**
- * Updates the listener configuration data we expose to the user with the
- * provided InitialLdapContext.
- * @param ctx the InitialLdapContext to use to update the configuration.
- * @throws NamingException if there was an error.
- */
- private void updateListeners(InitialLdapContext ctx) throws NamingException
- {
- SearchControls ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- ctls.setReturningAttributes(
- new String[] {
- "ds-cfg-enabled",
- "ds-cfg-listen-address",
- "ds-cfg-listen-port",
- "ds-cfg-use-ssl",
- "objectclass"
- });
- String filter = "(objectclass=ds-cfg-connection-handler)";
-
- LdapName jndiName = new LdapName("cn=config");
- NamingEnumeration listeners = ctx.search(jndiName, filter, ctls);
-
- while(listeners.hasMore())
- {
- SearchResult sr = (SearchResult)listeners.next();
-
- updateConfigWithConnectionHandler(sr);
-
- }
- }
-
- /**
- * Updates the replication configuration data we expose to the user with
- * the provided InitialLdapContext.
- * @param ctx the InitialLdapContext to use to update the configuration.
- * @throws NamingException if there was an error.
- */
- private void updateReplication(InitialLdapContext ctx)
- throws NamingException
- {
- SearchControls ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
- ctls.setReturningAttributes(
- new String[] {
- "ds-cfg-enabled"
- });
- String filter = "(objectclass=ds-cfg-synchronization-provider)";
-
- LdapName jndiName = new LdapName(
- "cn=Multimaster Synchronization,cn=Synchronization Providers,cn=config");
-
- try
- {
- NamingEnumeration syncProviders = ctx.search(jndiName, filter, ctls);
-
- while(syncProviders.hasMore())
- {
- SearchResult sr = (SearchResult)syncProviders.next();
-
- if ("true".equalsIgnoreCase(getFirstValue(sr,
- "ds-cfg-enabled")))
- {
- replicationConfigured = true;
- }
- }
- }
- catch (NameNotFoundException nse)
- {
- }
-
- ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- ctls.setReturningAttributes(
- new String[] {
- "ds-cfg-base-dn",
- "ds-cfg-server-id"
- });
- filter = "(objectclass=ds-cfg-replication-domain)";
-
- jndiName = new LdapName(
- "cn=Multimaster Synchronization,cn=Synchronization Providers,cn=config");
- ArrayList<String> replicaIds = new ArrayList<String>();
- try
- {
- NamingEnumeration syncProviders = ctx.search(jndiName, filter, ctls);
-
- while(syncProviders.hasMore())
- {
- SearchResult sr = (SearchResult)syncProviders.next();
-
- replicatedSuffixes.add(getFirstValue(sr, "ds-cfg-base-dn"));
- replicaIds.add(getFirstValue(sr, "ds-cfg-server-id"));
- }
- }
- catch (NameNotFoundException nse)
- {
- }
-
- ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
- ctls.setReturningAttributes(
- new String[] {
- "approx-older-change-not-synchronized-millis", "missing-changes",
- "base-dn", "server-id"
- });
- filter = "(missing-changes=*)";
-
- jndiName = new LdapName("cn=monitor");
-
- if (replicatedSuffixes.size() > 0)
- {
- try
- {
- NamingEnumeration monitorEntries = ctx.search(jndiName, filter, ctls);
-
- while(monitorEntries.hasMore())
- {
- SearchResult sr = (SearchResult)monitorEntries.next();
-
- String dn = getFirstValue(sr, "base-dn");
- String replicaId = getFirstValue(sr, "server-id");
-
- for (int i=0; i<replicatedSuffixes.size(); i++)
- {
- String baseDn = replicatedSuffixes.get(i);
- String id = replicaIds.get(i);
- if (Utils.areDnsEqual(dn, baseDn) && id.equals(replicaId))
- {
- try
- {
- hmAgeOfOldestMissingChanges.put(baseDn,
- new Long(getFirstValue(sr,
- "approx-older-change-not-synchronized-millis")));
- }
- catch (Throwable t)
- {
- }
- try
- {
- hmMissingChanges.put(baseDn,
- new Integer(getFirstValue(sr, "missing-changes")));
- }
- catch (Throwable t)
- {
- }
- }
- }
- }
- }
- catch (NameNotFoundException nse)
- {
- }
- }
- }
-
- /**
- * Updates the database configuration data we expose to the user with the
- * provided InitialLdapContext.
- * @param ctx the InitialLdapContext to use to update the configuration.
- * @throws NamingException if there was an error.
- */
- private void updateDatabases(InitialLdapContext ctx) throws NamingException
- {
- SearchControls ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- ctls.setReturningAttributes(
- new String[] {
- "ds-cfg-base-dn",
- "ds-cfg-backend-id"
- });
- String filter = "(objectclass=ds-cfg-backend)";
-
- LdapName jndiName = new LdapName("cn=config");
- NamingEnumeration databases = ctx.search(jndiName, filter, ctls);
-
- while(databases.hasMore())
- {
- SearchResult sr = (SearchResult)databases.next();
-
- updateConfigWithBackend(sr, ctx);
-
- }
- }
-
- /**
- * Updates the administrative user configuration we expose to the user with
- * the provided InitialLdapContext.
- * @param ctx the InitialLdapContext to use to update the configuration.
- * @throws NamingException if there was an error.
- */
- private void updateAdministrativeUsers(InitialLdapContext ctx)
- throws NamingException
- {
- SearchControls ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- ctls.setReturningAttributes(
- new String[] {
- "ds-cfg-alternate-bind-dn"
- });
- String filter = "(objectclass=ds-cfg-root-dn-user)";
-
- LdapName jndiName = new LdapName("cn=config");
- NamingEnumeration users = ctx.search(jndiName, filter, ctls);
-
- while(users.hasMore())
- {
- SearchResult sr = (SearchResult)users.next();
-
- updateConfigWithAdministrativeUser(sr);
-
- }
- }
-
- /**
- * Returns the java version we find using the provided InitialLdapContext.
- * @param ctx the InitialLdapContext to use to update the configuration.
- * @return the java version we find using the provided InitialLdapContext.
- * @throws NamingException if there was an error.
- */
- private String getJavaVersion(InitialLdapContext ctx)
- throws NamingException
- {
- String v = null;
- SearchControls ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
- ctls.setReturningAttributes(
- new String[] {
- "javaVersion"
- });
- String filter = "(objectclass=*)";
-
- LdapName jndiName = new LdapName("cn=System Information,cn=monitor");
- NamingEnumeration listeners = ctx.search(jndiName, filter, ctls);
-
- while(listeners.hasMore())
- {
- SearchResult sr = (SearchResult)listeners.next();
-
- v = getFirstValue(sr, "javaVersion");
-
- }
- return v;
- }
-
- /**
- * Returns the number of open connections we find using the provided
- * InitialLdapContext.
- * @param ctx the InitialLdapContext to use to update the configuration.
- * @return the number of open connections we find using the provided
- * InitialLdapContext.
- * @throws NamingException if there was an error.
- */
- private int getOpenConnections(InitialLdapContext ctx)
- throws NamingException
- {
- int nConnections = -1;
- String v = null;
- SearchControls ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
- ctls.setReturningAttributes(
- new String[] {
- "currentConnections"
- });
- String filter = "(objectclass=*)";
-
- LdapName jndiName = new LdapName("cn=monitor");
- NamingEnumeration listeners = ctx.search(jndiName, filter, ctls);
-
- while(listeners.hasMore())
- {
- SearchResult sr = (SearchResult)listeners.next();
-
- v = getFirstValue(sr, "currentConnections");
- }
- try
- {
- nConnections = Integer.parseInt(v);
- }
- catch (Exception ex)
- {
-
- }
- return nConnections;
-
- }
-
- /**
- * Returns the number of entries in a given backend using the provided
- * InitialLdapContext.
- * @param ctx the InitialLdapContext to use to update the configuration.
- * @param backendID the id of the backend.
- * @return the number of entries in the backend.
- * @throws NamingException if there was an error.
- */
- private int getEntryCount(InitialLdapContext ctx, String backendID)
- throws NamingException
- {
- int nEntries = -1;
- String v = null;
- SearchControls ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
- ctls.setReturningAttributes(
- new String[] {
- "ds-backend-entry-count"
- });
- String filter = "(ds-backend-id="+backendID+")";
-
- LdapName jndiName = new LdapName("cn=monitor");
- NamingEnumeration listeners = ctx.search(jndiName, filter, ctls);
-
- while(listeners.hasMore())
- {
- SearchResult sr = (SearchResult)listeners.next();
-
- v = getFirstValue(sr, "ds-backend-entry-count");
- }
- try
- {
- nEntries = Integer.parseInt(v);
- }
- catch (Exception ex)
- {
-
- }
- return nEntries;
-
- }
-
- /**
- * Create the base DN descriptor. Assumes that the replicatedSuffixes Set
- * and replicationConfigured have already been initialized.
- */
- private BaseDNDescriptor getBaseDNDescriptor(InitialLdapContext ctx,
- String baseDn)
- throws NamingException
- {
- BaseDNDescriptor.Type type;
- int missingChanges = -1;
- long ageOfOldestMissingChange = -1;
- String mapSuffixDn = null;
-
- boolean replicated = false;
- if (replicationConfigured)
- {
- for (String suffixDn: replicatedSuffixes)
- {
- if (Utils.areDnsEqual(baseDn, suffixDn))
- {
- replicated = true;
- mapSuffixDn = suffixDn;
- break;
- }
- }
- }
- if (replicated)
- {
- type = BaseDNDescriptor.Type.REPLICATED;
-
- Integer missing = hmMissingChanges.get(mapSuffixDn);
- Long age = hmAgeOfOldestMissingChanges.get(mapSuffixDn);
-
- if (age != null)
- {
- ageOfOldestMissingChange = age.longValue();
- }
-
- if (missing != null)
- {
- missingChanges = missing.intValue();
- }
- }
- else
- {
- type = BaseDNDescriptor.Type.NOT_REPLICATED;
- }
-
- return new BaseDNDescriptor(type, baseDn, null, -1,
- ageOfOldestMissingChange, missingChanges);
- }
-
- /**
- * Updates the listener configuration data we expose to the user with the
- * provided SearchResult object.
- * @param entry the entry to analyze.
- * @throws NamingException if there was an error.
- */
- private void updateConfigWithConnectionHandler(SearchResult entry)
- throws NamingException
- {
- String address = getFirstValue(entry, "ds-cfg-listen-address");
- String port = getFirstValue(entry, "ds-cfg-listen-port");
- String addressPort;
-
- boolean isSecure = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-use-ssl"));
-
- ListenerDescriptor.Protocol protocol;
- Message protocolDescription;
-
- ListenerDescriptor.State state;
- if (hasObjectClass(entry, "ds-cfg-ldap-connection-handler"))
- {
- if (address == null)
- {
- address = ConfigFromFile.getDefaultLdapAddress();
- }
- addressPort = address+":"+port;
- if (isSecure)
- {
- protocolDescription = INFO_LDAPS_PROTOCOL_LABEL.get();
- protocol = ListenerDescriptor.Protocol.LDAPS;
- }
- else
- {
- protocolDescription = INFO_LDAP_PROTOCOL_LABEL.get();
- protocol = ListenerDescriptor.Protocol.LDAP;
- }
- boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-enabled"));
- if (enabled)
- {
- state = ListenerDescriptor.State.ENABLED;
- }
- else
- {
- state = ListenerDescriptor.State.DISABLED;
- }
- }
- else if (hasObjectClass(entry, "ds-cfg-jmx-connection-handler"))
- {
- addressPort = "0.0.0.0:"+port;
- if (isSecure)
- {
- protocolDescription = INFO_JMX_SECURE_PROTOCOL_LABEL.get();
- protocol = ListenerDescriptor.Protocol.JMXS;
- }
- else
- {
- protocolDescription = INFO_JMX_PROTOCOL_LABEL.get();
- protocol = ListenerDescriptor.Protocol.JMX;
- }
- boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-enabled"));
- if (enabled)
- {
- state = ListenerDescriptor.State.ENABLED;
- }
- else
- {
- state = ListenerDescriptor.State.DISABLED;
- }
- }
- else if (hasObjectClass(entry, "ds-cfg-ldif-connection-handler"))
- {
- addressPort = INFO_UNKNOWN_LABEL.get().toString();
- protocol = ListenerDescriptor.Protocol.LDIF;
- protocolDescription = INFO_LDIF_PROTOCOL_LABEL.get();
- boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-connection-handler-enabled"));
- if (enabled)
- {
- state = ListenerDescriptor.State.ENABLED;
- }
- else
- {
- state = ListenerDescriptor.State.DISABLED;
- }
- }
- else if (hasObjectClass(entry, "ds-cfg-snmp-connection-handler"))
- {
- addressPort = "0.0.0.0:"+port;
- protocolDescription = INFO_SNMP_PROTOCOL_LABEL.get();
- protocol = ListenerDescriptor.Protocol.SNMP;
- boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-enabled"));
- if (enabled)
- {
- state = ListenerDescriptor.State.ENABLED;
- }
- else
- {
- state = ListenerDescriptor.State.DISABLED;
- }
- }
- else
- {
- addressPort = INFO_UNKNOWN_LABEL.get().toString();
- protocolDescription = null;
- protocol = ListenerDescriptor.Protocol.OTHER;
- /* Try to figure a name from the cn */
- String cn = getFirstValue(entry, "cn");
- if (cn != null)
- {
- int index = cn.toLowerCase().indexOf("connection handler");
- if (index > 0)
- {
- protocolDescription = Message.raw(cn.substring(0, index).trim());
- }
- else
- {
- protocolDescription = Message.raw(cn);
- }
- }
- else
- {
- protocolDescription = INFO_UNDEFINED_PROTOCOL_LABEL.get();
- }
- state = ListenerDescriptor.State.UNKNOWN;
- }
- listeners.add(new ListenerDescriptor(addressPort, protocol,
- protocolDescription, state));
- }
-
- /**
- * Updates the database configuration data we expose to the user with the
- * provided SearchResult object.
- * @param entry the entry to analyze.
- * @throws NamingException if there was an error.
- */
- private void updateConfigWithBackend(SearchResult entry,
- InitialLdapContext ctx)
- throws NamingException
- {
- String id = getFirstValue(entry, "ds-cfg-backend-id");
-
- if (!isConfigBackend(id))
- {
- Set<String> baseDns = getValues(entry, "ds-cfg-base-dn");
- TreeSet<BaseDNDescriptor> replicas = new TreeSet<BaseDNDescriptor>();
- int nEntries = getEntryCount(ctx, id);
- Set<String> baseDnEntries = getBaseDNEntryCount(ctx, id);
- DatabaseDescriptor db = new DatabaseDescriptor(id, replicas, nEntries);
-
- for (String baseDn : baseDns)
- {
- BaseDNDescriptor rep = getBaseDNDescriptor(ctx, baseDn);
- rep.setDatabase(db);
- nEntries = -1;
- for (String s : baseDnEntries)
- {
- int index = s.indexOf(" ");
- if (index != -1)
- {
- String dn = s.substring(index +1);
- if (Utils.areDnsEqual(baseDn, dn))
- {
- try
- {
- nEntries = Integer.parseInt(s.substring(0, index));
- }
- catch (Throwable t)
- {
- /* Ignore */
- }
- break;
- }
- }
- }
- rep.setEntries(nEntries);
- db.getBaseDns().add(rep);
- }
-
- databases.add(db);
- }
- }
-
- /**
- * Updates the administrative user configuration data we expose to the user
- * with the provided SearchResult object.
- * @param entry the entry to analyze.
- * @throws NamingException if there was an error.
- */
- private void updateConfigWithAdministrativeUser(SearchResult entry)
- throws NamingException
- {
- administrativeUsers.addAll(getValues(entry, "ds-cfg-alternate-bind-dn"));
- }
-
- /*
- * The following 2 methods are convenience methods to retrieve String values
- * from an entry.
- */
- private String getFirstValue(SearchResult entry, String attrName)
- throws NamingException
- {
- return Utils.getFirstValue(entry, attrName);
- }
-
- private Set<String> getValues(SearchResult entry, String attrName)
- throws NamingException
- {
- Set<String> values = new HashSet<String>();
- Attributes attrs = entry.getAttributes();
- if (attrs != null)
- {
- Attribute attr = attrs.get(attrName);
- if (attr != null)
- {
- for (int i=0; i<attr.size(); i++)
- {
- values.add((String)attr.get(i));
- }
- }
- }
- return values;
- }
-
- /**
- * Returns true if the SearchResult object is of a given objectclass.
- * @param entry the SearchResult to analyze.
- * @param ocName the objectclass.
- * @return <CODE>true</CODE> if the SearchResult is of a the objectclass and
- * <CODE>false</CODE> otherwise.
- * @throws NamingException if there was an error.
- */
- private boolean hasObjectClass(SearchResult entry, String ocName)
- throws NamingException
- {
- boolean hasObjectClass = false;
- Attributes attrs = entry.getAttributes();
- if (attrs != null)
- {
- Attribute attr = attrs.get("objectclass");
- if (attr != null)
- {
- for (int i=0; i<attr.size() && !hasObjectClass; i++)
- {
- hasObjectClass = ocName.equalsIgnoreCase((String)attr.get(i));
- }
- }
- }
- return hasObjectClass;
- }
-
-
- private boolean isConfigBackend(String id)
- {
- return ConfigFromFile.isConfigBackend(id);
- }
-
- /**
- * Returns the values of the ds-base-dn-entry count attributes for the given
- * backend monitor entry using the provided InitialLdapContext.
- * @param ctx the InitialLdapContext to use to update the configuration.
- * @param backendID the id of the backend.
- * @return the values of the ds-base-dn-entry count attribute.
- * @throws NamingException if there was an error.
- */
- private static Set<String> getBaseDNEntryCount(InitialLdapContext ctx,
- String backendID) throws NamingException
- {
- LinkedHashSet<String> v = new LinkedHashSet<String>();
- SearchControls ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
- ctls.setReturningAttributes(
- new String[] {
- "ds-base-dn-entry-count"
- });
- String filter = "(ds-backend-id="+backendID+")";
-
- LdapName jndiName = new LdapName("cn=monitor");
- NamingEnumeration listeners = ctx.search(jndiName, filter, ctls);
-
- while(listeners.hasMore())
- {
- SearchResult sr = (SearchResult)listeners.next();
-
- v.addAll(ConnectionUtils.getValues(sr, "ds-base-dn-entry-count"));
- }
- return v;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConnectionProtocolPolicy.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConnectionProtocolPolicy.java
deleted file mode 100644
index 709bbe6..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConnectionProtocolPolicy.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-/** Policy to follow to choose the protocol to be used. */
-public enum ConnectionProtocolPolicy
-{
- /**
- * Force to use Start TLS.
- */
- USE_STARTTLS,
- /**
- * Force to use LDAP.
- */
- USE_LDAP,
- /**
- * Force to use LDAPs.
- */
- USE_LDAPS,
- /**
- * Use the most secure available (LDAPs, StartTLS and finally LDAP).
- */
- USE_MOST_SECURE_AVAILABLE,
- /**
- * Use the less secure available (LDAP, and then LDAPs).
- */
- USE_LESS_SECURE_AVAILABLE;
-
- /**
- * Returns the ConnectionPolicy to be used with the parameters provided
- * by the user.
- * @param useSSL whether the user asked to use SSL or not.
- * @param useStartTLS whether the user asked to use Start TLS or not.
- * @return the ConnectionPolicy to be used with the parameters provided
- * by the user.
- */
- public static ConnectionProtocolPolicy getConnectionPolicy(boolean useSSL,
- boolean useStartTLS)
- {
- ConnectionProtocolPolicy policy;
- if (useStartTLS)
- {
- policy = ConnectionProtocolPolicy.USE_STARTTLS;
- }
- else if (useSSL)
- {
- policy = ConnectionProtocolPolicy.USE_LDAPS;
- }
- else
- {
- policy = ConnectionProtocolPolicy.USE_LESS_SECURE_AVAILABLE;
- }
- return policy;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/DatabaseDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/DatabaseDescriptor.java
deleted file mode 100644
index 2d8c1ac..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/DatabaseDescriptor.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import java.util.SortedSet;
-
-/**
- * This class is used to represent a Database and is aimed to be used by the
- * classes in the DatabasesTableModel class.
- */
-public class DatabaseDescriptor
-{
- private String backendID;
- private SortedSet<BaseDNDescriptor> baseDns;
- private int entries;
-
- /**
- * Constructor for this class.
- * @param backendID the backend ID of the Database.
- * @param baseDns the base DNs associated with the Database.
- * @param entries the number of entries in the Database.
- */
- public DatabaseDescriptor(String backendID,
- SortedSet<BaseDNDescriptor> baseDns,
- int entries)
- {
- this.backendID = backendID;
- this.baseDns = baseDns;
- this.entries = entries;
- }
-
- /**
- * Returns the ID of the Backend.
- * @return the ID of the Backend.
- */
- public String getBackendID()
- {
- return backendID;
- }
-
- /**
- * Returns the Base DN objects associated with the database.
- * @return the Base DN objects associated with the database.
- */
- public SortedSet<BaseDNDescriptor> getBaseDns()
- {
- return baseDns;
- }
-
- /**
- * Return the number of entries in the database.
- * -1 indicates that the number of entries could not be found.
- * @return the number of entries in the database.
- */
- public int getEntries()
- {
- return entries;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean equals(Object v)
- {
- boolean equals = false;
- if (this != v)
- {
- if (v instanceof DatabaseDescriptor)
- {
- DatabaseDescriptor desc = (DatabaseDescriptor)v;
- equals = getBackendID().equals(desc.getBackendID()) &&
- (getEntries() == desc.getEntries());
-
- if (equals)
- {
- equals = desc.getBaseDns().equals(getBaseDns());
- }
- }
- }
- else
- {
- equals = true;
- }
- return equals;
- }
-
- /**
- * {@inheritDoc}
- */
- public int hashCode()
- {
- StringBuilder buf = new StringBuilder();
- for (BaseDNDescriptor rep: getBaseDns())
- {
- buf.append(rep.hashCode()+";");
- }
- buf.append(getBackendID() + getEntries());
-
- return buf.toString().hashCode();
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ListenerDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ListenerDescriptor.java
deleted file mode 100644
index 7a1c0e2..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ListenerDescriptor.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import org.opends.messages.Message;
-
-/**
- * This class is used to represent a Listener and is aimed to be used by the
- * classes in the ListenersTableModel class.
- */
-public class ListenerDescriptor
-{
- /**
- * Enumeration used to represent the state of the listener.
- */
- public enum State
- {
- /**
- * The listener is enabled.
- */
- ENABLED,
- /**
- * The listener is disabled.
- */
- DISABLED,
- /**
- * The state of the listener is unknown.
- */
- UNKNOWN
- };
-
- /**
- * Enumeration used to represent the Protocol of the listener.
- *
- */
- public enum Protocol
- {
- /**
- * LDAP protocol.
- */
- LDAP,
- /**
- * LDAP secure protocol.
- */
- LDAPS,
- /**
- * JMX protocol.
- */
- JMX,
- /**
- * JMX secure protocol.
- */
- JMXS,
- /**
- * LDIF protocol.
- */
- LDIF,
- /**
- * SNMP protocol.
- */
- SNMP,
- /**
- * Other protocol.
- */
- OTHER
- }
-
- private State state;
- private String addressPort;
- private Protocol protocol;
- private Message protocolDescription;
-
- /**
- * Constructor for thid class.
- * @param addressPort the address port reprentation of the listener.
- * @param protocol the protocol of the listener.
- * @param protocolDescription the String used to describe the protocol.
- * @param state the state of the listener.
- */
- public ListenerDescriptor(String addressPort, Protocol protocol,
- Message protocolDescription, State state)
- {
- this.addressPort = addressPort;
- this.protocol = protocol;
- this.protocolDescription = protocolDescription;
- this.state = state;
- }
-
- /**
- * Returns the address port representation of the listener.
- * @return the address port representation of the listener.
- */
- public String getAddressPort()
- {
- return addressPort;
- }
-
- /**
- * Returns the protocol of the listener.
- * @return the protocol of the listener.
- */
- public Protocol getProtocol()
- {
- return protocol;
- }
-
- /**
- * Returns the protocol description of the listener.
- * @return the protocol description of the listener.
- */
- public Message getProtocolDescription()
- {
- return protocolDescription;
- }
-
- /**
- * Returns the state of the listener.
- * @return the state of the listener.
- */
- public State getState()
- {
- return state;
- }
-
- /**
- * {@inheritDoc}
- */
- public int hashCode()
- {
- return (getAddressPort() + getProtocolDescription() +
- getState()).hashCode();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean equals(Object o)
- {
- boolean equals = false;
- if (o == this)
- {
- equals = true;
- }
- else if (o instanceof ListenerDescriptor)
- {
- equals = hashCode() == o.hashCode();
- }
- return equals;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ServerStatusDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ServerStatusDescriptor.java
deleted file mode 100644
index 554e927..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ServerStatusDescriptor.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import org.opends.messages.Message;
-
-import java.io.File;
-import java.util.Set;
-
-/**
- * This is just a class used to provide a data model describing what the
- * StatusPanelDialog will show to the user.
- */
-public class ServerStatusDescriptor
-{
- private ServerStatus status;
- private int openConnections;
- private Set<DatabaseDescriptor> databases;
- private Set<ListenerDescriptor> listeners;
- private Set<String> administrativeUsers;
- private File installPath;
- private String openDSVersion;
- private String javaVersion;
- private Message errorMsg;
- private boolean isAuthenticated;
-
- private static String hostName = "locahost";
- static
- {
- try
- {
- hostName = java.net.InetAddress.getLocalHost().getHostName();
- }
- catch (Throwable t)
- {
- }
- };
-
- /**
- * Enumeration indicating the status of the server.
- *
- */
- public enum ServerStatus
- {
- /**
- * Server Started.
- */
- STARTED,
- /**
- * Server Stopped.
- */
- STOPPED,
- /**
- * Server Starting.
- */
- STARTING,
- /**
- * Server Stopping.
- */
- STOPPING,
- /**
- * Status Unknown.
- */
- UNKNOWN
- }
-
- /**
- * Default constructor.
- */
- public ServerStatusDescriptor()
- {
- }
-
- /**
- * Return the administrative users.
- * @return the administrative users.
- */
- public Set<String> getAdministrativeUsers()
- {
- return administrativeUsers;
- }
-
- /**
- * Set the administrative users.
- * @param administrativeUsers the administrative users to set
- */
- public void setAdministrativeUsers(Set<String> administrativeUsers)
- {
- this.administrativeUsers = administrativeUsers;
- }
-
- /**
- * Return the install path where the server is installed.
- * @return the install path where the server is installed.
- */
- public File getInstallPath()
- {
- return installPath;
- }
-
- /**
- * Sets the install path where the server is installed.
- * @param installPath the install path where the server is installed.
- */
- public void setInstallPath(File installPath)
- {
- this.installPath = installPath;
- }
-
- /**
- * Return the java version used to run the server.
- * @return the java version used to run the server.
- */
- public String getJavaVersion()
- {
- return javaVersion;
- }
-
- /**
- * Set the java version used to run the server.
- * @param javaVersion the java version used to run the server.
- */
- public void setJavaVersion(String javaVersion)
- {
- this.javaVersion = javaVersion;
- }
-
- /**
- * Returns the number of open connection in the server.
- * @return the number of open connection in the server.
- */
- public int getOpenConnections()
- {
- return openConnections;
- }
-
- /**
- * Set the number of open connections.
- * @param openConnections the number of open connections.
- */
- public void setOpenConnections(int openConnections)
- {
- this.openConnections = openConnections;
- }
-
- /**
- * Returns the version of the server.
- * @return the version of the server.
- */
- public String getOpenDSVersion()
- {
- return openDSVersion;
- }
-
- /**
- * Sets the version of the server.
- * @param openDSVersion the version of the server.
- */
- public void setOpenDSVersion(String openDSVersion)
- {
- this.openDSVersion = openDSVersion;
- }
-
- /**
- * Returns the status of the server.
- * @return the status of the server.
- */
- public ServerStatus getStatus()
- {
- return status;
- }
-
- /**
- * Sets the status of the server.
- * @param status the status of the server.
- */
- public void setStatus(ServerStatus status)
- {
- this.status = status;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean equals(Object o)
- {
- boolean equals = false;
- if (this != o)
- {
- if (o instanceof ServerStatusDescriptor)
- {
- ServerStatusDescriptor desc = (ServerStatusDescriptor)o;
- equals = desc.getStatus() == getStatus();
-
- if (equals)
- {
- equals = desc.getOpenConnections() == getOpenConnections();
- }
-
- if (equals)
- {
- equals = desc.getInstallPath().equals(getInstallPath());
- }
-
- if (equals)
- {
- if (desc.getJavaVersion() == null)
- {
- equals = getJavaVersion() == null;
- }
- else
- {
- equals = desc.getJavaVersion().equals(getJavaVersion());
- }
- }
-
- if (equals)
- {
- equals = desc.getOpenDSVersion().equals(getOpenDSVersion());
- }
-
- if (equals)
- {
- equals = desc.getAdministrativeUsers().equals(
- getAdministrativeUsers());
- }
-
- if (equals)
- {
- equals = desc.getListeners().equals(getListeners());
- }
-
- if (equals)
- {
- equals = desc.getDatabases().equals(getDatabases());
- }
-
- if (equals)
- {
- if (desc.getErrorMessage() == null)
- {
- equals = getErrorMessage() == null;
- }
- else
- {
- equals = desc.getErrorMessage().equals(getErrorMessage());
- }
- }
- }
- }
- else
- {
- equals = true;
- }
- return equals;
- }
-
- /**
- * {@inheritDoc}
- */
- public int hashCode()
- {
- return status.hashCode() + openConnections +
- (String.valueOf(
- installPath+openDSVersion+javaVersion+errorMsg+isAuthenticated)).
- hashCode();
- }
-
- /**
- * Returns the error message that we encountered generating this server
- * status descriptor.
- * @return the error message that we encountered generating this server
- * status descriptor.
- */
- public Message getErrorMessage()
- {
- return errorMsg;
- }
-
- /**
- * Sets the error message that we encountered generating this server
- * status descriptor.
- * @param errorMsg the error message that we encountered generating this
- * server status descriptor.
- */
- public void setErrorMessage(Message errorMsg)
- {
- this.errorMsg = errorMsg;
- }
-
- /**
- * Return whether we were authenticated when retrieving the information of
- * this ServerStatusDescriptor.
- * @return <CODE>true</CODE> if we were authenticated when retrieving the
- * information of this ServerStatusDescriptor and <CODE>false</CODE>
- * otherwise.
- */
- public boolean isAuthenticated()
- {
- return isAuthenticated;
- }
-
- /**
- * Sets whether we were authenticated when retrieving the information of
- * this ServerStatusDescriptor.
- * @param isAuthenticated whether we were authenticated when retrieving the
- * information of this ServerStatusDescriptor.
- */
- public void setAuthenticated(boolean isAuthenticated)
- {
- this.isAuthenticated = isAuthenticated;
- }
-
- /**
- * Returns the database descriptors of the server.
- * @return the database descriptors of the server.
- */
- public Set<DatabaseDescriptor> getDatabases()
- {
- return databases;
- }
-
- /**
- * Sets the database descriptors of the server.
- * @param databases the database descriptors to set.
- */
- public void setDatabases(Set<DatabaseDescriptor> databases)
- {
- this.databases = databases;
- }
-
- /**
- * Returns the listener descriptors of the server.
- * @return the listener descriptors of the server.
- */
- public Set<ListenerDescriptor> getListeners()
- {
- return listeners;
- }
-
- /**
- * Sets the listener descriptors of the server.
- * @param listeners the listener descriptors to set.
- */
- public void setListeners(Set<ListenerDescriptor> listeners)
- {
- this.listeners = listeners;
- }
-
- /**
- * Returns the host name of the server.
- * @return the host name of the server.
- */
- public String getHostname()
- {
- return hostName;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ServerStatusPooler.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ServerStatusPooler.java
deleted file mode 100644
index 14b233a78..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ServerStatusPooler.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.opends.admin.ads.util.ApplicationTrustManager;
-import org.opends.guitools.statuspanel.event.ServerStatusChangeEvent;
-import org.opends.guitools.statuspanel.event.ServerStatusChangeListener;
-import org.opends.quicksetup.Installation;
-import org.opends.quicksetup.util.Utils;
-
-
-/**
- * This class just reads the status of the server periodically and generates
- * ServerStatusChangeEvent when the status changes. To receive this events
- * other classes must register using the addServerStatusChangeListener method.
- *
- */
-public class ServerStatusPooler
-{
- private String dn;
- private String pwd;
- private ApplicationTrustManager trustManager;
- private ServerStatusDescriptor lastDescriptor;
- private boolean stopPooling;
- private Thread poolingThread;
- private HashSet<ServerStatusChangeListener> listeners =
- new HashSet<ServerStatusChangeListener>();
- private boolean starting;
- private boolean stopping;
- private ConfigFromFile offLineConf = new ConfigFromFile();
- private ConfigFromLDAP onLineConf = new ConfigFromLDAP();
- private int nTriesWithErrorOnline;
- private ConnectionProtocolPolicy policy;
-
- /* The pooling periods */
- private static final int OFFLINE_POOLING_PERIOD = 6000;
- private static final int ONLINE_POOLING_PERIOD = 4000;
-
- private static final Logger LOG =
- Logger.getLogger(ServerStatusPooler.class.getName());
-
- /**
- * Default constructor.
- * @param policy the configuration policy to be used (whether we prefer the
- * most secure, the less secure, a specific method...).
- */
- public ServerStatusPooler(ConnectionProtocolPolicy policy)
- {
- /* This is required to retrieve the ldap url to be used by the
- * ConfigFromLDAP class.
- */
- offLineConf.readConfiguration();
- this.policy = policy;
- }
-
- /**
- * Starts pooling the server status. This method does not block the thread
- * that called it.
- *
- */
- public void startPooling()
- {
- stopPooling = false;
- poolingThread = new Thread(new Runnable()
- {
- public void run()
- {
- try
- {
- nTriesWithErrorOnline = 0;
- while (!stopPooling)
- {
- long t1 = System.currentTimeMillis();
-
- ServerStatusDescriptor desc = generateDescriptor();
- if (!desc.equals(lastDescriptor))
- {
- lastDescriptor = desc;
- notifyListeners(lastDescriptor);
- }
- long t2 = System.currentTimeMillis();
-
- long poolingPeriod =
- desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED?
- ONLINE_POOLING_PERIOD : OFFLINE_POOLING_PERIOD;
-
- if (t2 - t1 < poolingPeriod)
- {
- try
- {
- Thread.sleep(poolingPeriod - (t2 - t1));
- }
- catch (Exception ex)
- {
- if (!stopPooling)
- {
- /* Should not happen. */
- throw ex;
- }
- }
- }
- }
- }
- catch (Throwable t)
- {
- if (!stopPooling)
- {
- /* This is a bug. */
- t.printStackTrace();
- }
- }
- }
- });
- poolingThread.start();
- }
-
- /**
- * Stop pooling the server status. This method does not block the thread
- * that called it.
- *
- */
- public void stopPooling()
- {
- stopPooling = true;
- try
- {
- onLineConf.closeConnection();
- poolingThread.interrupt();
- }
- catch (Throwable t)
- {
- // do nothing;
- }
- }
-
- /**
- * Returns the last server descriptor found.
- * @return the last server descriptor found.
- */
- public ServerStatusDescriptor getLastDescriptor()
- {
- return lastDescriptor;
- }
-
- /**
- * This method is called to notify that the server is being started.
- */
- public void beginServerStart()
- {
- starting = true;
- }
-
- /**
- * This method is called to notify that the server start operation ended.
- */
- public void endServerStart()
- {
- starting = false;
- }
-
- /**
- * This method is called to notify that the server is being stopped.
- */
- public void beginServerStop()
- {
- stopping = true;
- }
-
- /**
- * This method is called to notify that the server stop operation ended.
- */
- public void endServerStop()
- {
- stopping = false;
- }
-
- /**
- * Adds a ServerStatusChangeListener that will be notified of updates in
- * the server status.
- * @param l the ServerStatusChangeListener to be added.
- */
- public void addServerStatusChangeListener(ServerStatusChangeListener l)
- {
- listeners.add(l);
- }
-
- /**
- * Removes a ServerStatusChangeListener.
- * @param l the ServerStatusChangeListener to be removed.
- */
- public void removeServerStatusChangeListener(ServerStatusChangeListener l)
- {
- listeners.remove(l);
- }
-
- /**
- * Returns <CODE>true</CODE> if this class already has authentication
- * information (setAuthentication method has been called with non-null
- * parameters).
- * @return <CODE>true</CODE> if this class already has authentication
- * information and <CODE>false</CODE> otherwise.
- */
- public boolean isAuthenticated()
- {
- return (dn != null) && (pwd != null);
- }
-
- /**
- * Sets the authentication information to be used by this class to retrieve
- * information using LDAP.
- * @param dn the authentication Distinguished Name to bind.
- * @param pwd the authentication password to bind.
- * @param trustManager the trust manager to be used for the secure
- * connections.
- * @throws ConfigException if a valid URL could not be found with the provided
- * parameters.
- */
- public void setAuthentication(String dn, String pwd,
- ApplicationTrustManager trustManager) throws ConfigException
- {
- this.dn = dn;
- this.pwd = pwd;
- this.trustManager = trustManager;
- if ((poolingThread != null) && poolingThread.isAlive() && !stopPooling)
- {
- /* If we are pooling, stop the pooling update the connection information
- * and restart the pooling. Set the stopPooling boolean to true to
- * indicate to the code in the Thread 't' to ignore the
- * InterruptedExceptions.
- *
- */
- stopPooling = true;
- poolingThread.interrupt();
- try
- {
- poolingThread.join(5000);
- }
- catch (Throwable t)
- {
- /* This should not happen: this thread should not be interrupted. */
- t.printStackTrace();
- }
- poolingThread = null;
- onLineConf.setConnectionInfo(offLineConf, policy, dn, pwd, trustManager);
- startPooling();
- }
- else
- {
- onLineConf.setConnectionInfo(offLineConf, policy, dn, pwd, trustManager);
- }
- }
-
- /**
- * This method notifies the ServerStatusChangeListeners that there was an
- * update in the installation progress.
- * @param desc the ServerStatusDescriptor.
- */
- private void notifyListeners(ServerStatusDescriptor desc)
- {
- ServerStatusChangeEvent ev = new ServerStatusChangeEvent(desc);
- for (ServerStatusChangeListener l : listeners)
- {
- l.statusChanged(ev);
- }
- }
-
- /**
- * Retrieves information of the server. The method used will depend on the
- * status of the server (started or not).
- * @return a ServerStatusDescriptor object describing the status of the
- * server.
- */
- private ServerStatusDescriptor generateDescriptor()
- {
- ServerStatusDescriptor desc = new ServerStatusDescriptor();
-
- desc.setAuthenticated((dn != null) && (pwd != null));
-
- if (starting)
- {
- desc.setStatus(ServerStatusDescriptor.ServerStatus.STARTING);
- }
- else if (stopping)
- {
- desc.setStatus(ServerStatusDescriptor.ServerStatus.STOPPING);
- }
- else if (Installation.getLocal().getStatus().isServerRunning())
- {
- desc.setStatus(ServerStatusDescriptor.ServerStatus.STARTED);
- }
- else
- {
- desc.setStatus(ServerStatusDescriptor.ServerStatus.STOPPED);
- }
-
- desc.setInstallPath(new File(Utils.getInstallPathFromClasspath()));
-
- desc.setOpenDSVersion(
- org.opends.server.util.DynamicConstants.FULL_VERSION_STRING);
-
- if (desc.getStatus() != ServerStatusDescriptor.ServerStatus.STARTED)
- {
- updateDescriptorWithOffLineInfo(desc);
- }
- else
- {
- try
- {
- if ((dn == null) || (pwd == null))
- {
- updateDescriptorWithOffLineInfo(desc);
- }
- else
- {
- updateDescriptorWithOnLineInfo(desc);
- }
- }
- catch (Throwable t)
- {
- // Bug
- t.printStackTrace();
- }
- }
-
- return desc;
- }
-
- /**
- * Updates the ServerStatusDescriptor object using the information in the
- * config.ldif file (we use a ConfigFromFile object to do this).
- * @param desc the ServerStatusDescriptor object to be updated.
- */
- private void updateDescriptorWithOffLineInfo(ServerStatusDescriptor desc)
- {
- /* Read the list of administrative users from CurrentInstallStatus
- * (which reads directly config.ldif. This is the best we can do today
- * when the server is not started.
- */
- offLineConf.readConfiguration();
- desc.setAdministrativeUsers(offLineConf.getAdministrativeUsers());
- desc.setDatabases(offLineConf.getDatabases());
- desc.setListeners(offLineConf.getListeners());
- desc.setErrorMessage(offLineConf.getErrorMessage());
- if ((dn != null) && (pwd != null))
- {
- try
- {
- onLineConf.setConnectionInfo(offLineConf, policy, dn, pwd,
- trustManager);
- }
- catch (ConfigException ce)
- {
- LOG.log(Level.WARNING, "Error retrieving LDAP URL: "+ce, ce);
- }
- }
- desc.setOpenConnections(-1);
- desc.setJavaVersion(null);
- }
-
- /**
- * Updates the ServerStatusDescriptor object using the LDAP protocol (we use a
- * ConfigFromLDAP object to do this).
- * @param desc the ServerStatusDescriptor object to be updated.
- */
- private void updateDescriptorWithOnLineInfo(ServerStatusDescriptor desc)
- {
- onLineConf.readConfiguration();
- desc.setAdministrativeUsers(onLineConf.getAdministrativeUsers());
- desc.setDatabases(onLineConf.getDatabases());
- desc.setListeners(onLineConf.getListeners());
- desc.setErrorMessage(onLineConf.getErrorMessage());
- desc.setJavaVersion(onLineConf.getJavaVersion());
- desc.setOpenConnections(onLineConf.getOpenConnections());
-
- if (desc.getErrorMessage() != null)
- {
- nTriesWithErrorOnline++;
- /* Something happened: if this is the 5th try with the current URL
- * just try to check if the information has changed in the config.ldif
- * file.
- */
- if (nTriesWithErrorOnline >= 5)
- {
- offLineConf.readConfiguration();
- try
- {
- onLineConf.setConnectionInfo(offLineConf, policy, dn, pwd,
- trustManager);
- }
- catch (ConfigException ce)
- {
- desc.setErrorMessage(ce.getMessageObject());
- }
- nTriesWithErrorOnline = 0;
- }
- }
- }
-
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/SplashScreen.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/SplashScreen.java
deleted file mode 100644
index a4b76de..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/SplashScreen.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import javax.swing.SwingUtilities;
-
-/**
- * This class will display a splash screen and in the background it will
- * create The StatusPanel object.
- *
- * This class just extends the org.opends.quicksetup.SplashScreen by
- * overwritting the construct and display methods.
- */
-public class SplashScreen extends org.opends.quicksetup.SplashScreen
-{
- private static final long serialVersionUID = 4472839063380302713L;
-
- private static Object statusPanel;
-
- private static Class<?> statusPanelClass;
-
- /**
- * The main method for this class.
- * It can be called from the event thread and outside the event thread.
- * @param args arguments to be passed to the method QuickSetup.initialize
- */
- public static void main(String[] args)
- {
- SplashScreen screen = new SplashScreen();
- screen.display(args);
- }
-
- /**
- * This methods constructs the StatusPanel object.
- * This method assumes that is being called outside the event thread.
- * @param args arguments to be passed to the method StatusPanel.initialize.
- */
- protected void constructApplication(String[] args)
- {
- try
- {
- statusPanelClass = Class.forName(
- "org.opends.guitools.statuspanel.StatusPanelController");
- statusPanel = statusPanelClass.newInstance();
- statusPanelClass.getMethod("initialize", new Class[]
- { String[].class }).invoke(statusPanel, new Object[]
- { args });
- } catch (Exception e)
- {
- InternalError error =
- new InternalError("Failed to invoke initialize method");
- error.initCause(e);
- throw error;
- }
- }
-
- /**
- * This method displays the StatusPanel dialog.
- * @see org.opends.guitools.statuspanel.StatusPanelController#display()
- * This method assumes that is being called outside the event thread.
- */
- protected void displayApplication()
- {
- try
- {
- SwingUtilities.invokeAndWait(new Runnable()
- {
- public void run()
- {
- try
- {
- statusPanelClass.getMethod("display").invoke(statusPanel);
- } catch (Exception e)
- {
- InternalError error =
- new InternalError("Failed to invoke display method");
- error.initCause(e);
- throw error;
- }
- }
- });
- } catch (Exception ex)
- {
- }
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
deleted file mode 100644
index d8a8faf..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
+++ /dev/null
@@ -1,1315 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2007-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.net.URI;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.net.ssl.TrustManager;
-import javax.swing.table.TableModel;
-
-import org.opends.guitools.statuspanel.ui.DatabasesTableModel;
-import org.opends.guitools.statuspanel.ui.ListenersTableModel;
-import org.opends.quicksetup.Installation;
-import org.opends.quicksetup.QuickSetupLog;
-
-import static org.opends.quicksetup.util.Utils.*;
-
-import org.opends.server.admin.client.ManagementContext;
-import org.opends.server.admin.client.cli.DsFrameworkCliReturnCode;
-import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
-import org.opends.server.core.DirectoryServer;
-
-import org.opends.messages.Message;
-import org.opends.messages.MessageBuilder;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.messages.QuickSetupMessages.*;
-
-import org.opends.server.tools.ClientException;
-import org.opends.server.tools.ToolConstants;
-import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
-import org.opends.server.types.NullOutputStream;
-import org.opends.server.util.StaticUtils;
-import org.opends.server.util.args.ArgumentException;
-import org.opends.server.util.cli.ConsoleApplication;
-import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
-import org.opends.server.util.table.TableBuilder;
-import org.opends.server.util.table.TextTablePrinter;
-
-/**
- * The class used to provide some CLI interface to display status.
- *
- * This class basically is in charge of parsing the data provided by the user
- * in the command line.
- *
- */
-class StatusCli extends ConsoleApplication
-{
-
- private boolean displayMustAuthenticateLegend;
- private boolean displayMustStartLegend;
-
- /** Prefix for log files. */
- static public final String LOG_FILE_PREFIX = "opends-status-";
-
- /** Suffix for log files. */
- static public final String LOG_FILE_SUFFIX = ".log";
-
- private TrustManager interactiveTrustManager;
-
- private boolean useInteractiveTrustManager;
-
- /**
- * The enumeration containing the different return codes that the command-line
- * can have.
- *
- */
- enum ErrorReturnCode
- {
- /**
- * Successful display of the status.
- */
- SUCCESSFUL(0),
- /**
- * We did no have an error but the status was not displayed (displayed
- * version or usage).
- */
- SUCCESSFUL_NOP(0),
- /**
- * Unexpected error (potential bug).
- */
- ERROR_UNEXPECTED(1),
- /**
- * Cannot parse arguments.
- */
- ERROR_PARSING_ARGS(2),
- /**
- * User cancelled (for instance not accepting the certificate proposed) or
- * could not use the provided connection parameters in interactive mode.
- */
- USER_CANCELLED_OR_DATA_ERROR(3),
- /**
- * This occurs for instance when the authentication provided by the user is
- * not valid.
- */
- ERROR_READING_CONFIGURATION_WITH_LDAP(4);
-
- private int returnCode;
- private ErrorReturnCode(int returnCode)
- {
- this.returnCode = returnCode;
- }
-
- /**
- * Get the corresponding return code value.
- *
- * @return The corresponding return code value.
- */
- public int getReturnCode()
- {
- return returnCode;
- }
- };
-
- /**
- * The Logger.
- */
- static private final Logger LOG = Logger.getLogger(StatusCli.class.getName());
-
- // The argument parser
- private StatusCliArgumentParser argParser;
-
- /**
- * Constructor for the StatusCli object.
- *
- * @param out the print stream to use for standard output.
- * @param err the print stream to use for standard error.
- * @param in the input stream to use for standard input.
- */
- public StatusCli(PrintStream out, PrintStream err, InputStream in)
- {
- super(in, out, err);
- }
-
- /**
- * The main method for the status CLI tool.
- *
- * @param args the command-line arguments provided to this program.
- */
-
- public static void main(String[] args)
- {
- int retCode = mainCLI(args, true, System.out, System.err, System.in);
-
- if(retCode != 0)
- {
- System.exit(retCode);
- }
- }
-
- /**
- * Parses the provided command-line arguments and uses that information to
- * run the status tool.
- *
- * @param args the command-line arguments provided to this program.
- *
- * @return The error code.
- */
-
- public static int mainCLI(String[] args)
- {
- return mainCLI(args, true, System.out, System.err, System.in);
- }
-
- /**
- * Parses the provided command-line arguments and uses that information to
- * run the status tool.
- *
- * @param args The command-line arguments provided to this
- * program.
- * @param initializeServer Indicates whether to initialize the server.
- * @param outStream The output stream to use for standard output, or
- * <CODE>null</CODE> if standard output is not
- * needed.
- * @param errStream The output stream to use for standard error, or
- * <CODE>null</CODE> if standard error is not
- * needed.
- * @param inStream The input stream to use for standard input.
- * @return The error code.
- */
-
- public static int mainCLI(String[] args, boolean initializeServer,
- OutputStream outStream, OutputStream errStream, InputStream inStream)
- {
- PrintStream out;
- if (outStream == null)
- {
- out = NullOutputStream.printStream();
- }
- else
- {
- out = new PrintStream(outStream);
- }
-
- PrintStream err;
- if (errStream == null)
- {
- err = NullOutputStream.printStream();
- }
- else
- {
- err = new PrintStream(errStream);
- }
-
- try {
- QuickSetupLog.initLogFileHandler(
- File.createTempFile(LOG_FILE_PREFIX, LOG_FILE_SUFFIX),
- "org.opends.guitools.statuspanel");
- QuickSetupLog.disableConsoleLogging();
- } catch (Throwable t) {
- System.err.println("Unable to initialize log");
- t.printStackTrace();
- }
-
- StatusCli statusCli = new StatusCli(out, err, inStream);
-
- return statusCli.execute(args, initializeServer);
- }
-
- /**
- * Parses the provided command-line arguments and uses that information to
- * run the status CLI.
- *
- * @param args the command-line arguments provided to this program.
- * @param initializeServer Indicates whether to initialize the server.
- *
- * @return the return code (SUCCESSFUL, USER_DATA_ERROR or BUG.
- */
- public int execute(String[] args, boolean initializeServer)
- {
- if (initializeServer)
- {
- DirectoryServer.bootstrapClient();
- }
-
- argParser = new StatusCliArgumentParser(StatusCli.class.getName());
- try
- {
- argParser.initializeGlobalArguments(getOutputStream());
- }
- catch (ArgumentException ae)
- {
- Message message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
- println(message);
- return ErrorReturnCode.ERROR_UNEXPECTED.getReturnCode();
- }
-
- // Validate user provided data
- try
- {
- argParser.parseArguments(args);
- }
- catch (ArgumentException ae)
- {
- Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
- println(message);
- println();
- println(Message.raw(argParser.getUsage()));
-
- return ErrorReturnCode.ERROR_PARSING_ARGS.getReturnCode();
- }
-
- // If we should just display usage or version information,
- // then print it and exit.
- if (argParser.usageOrVersionDisplayed())
- {
- return ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode();
- }
- int v = argParser.validateGlobalOptions(getErrorStream());
-
- if (v != DsFrameworkCliReturnCode.SUCCESSFUL_NOP.getReturnCode())
- {
- println(Message.raw(argParser.getUsage()));
- return v;
- }
- else
- {
- boolean isServerRunning =
- Installation.getLocal().getStatus().isServerRunning();
- /* This is required to retrieve the ldap url to be used by the
- * ConfigFromLDAP class.
- */
- ConfigFromFile offLineConf = new ConfigFromFile();
- offLineConf.readConfiguration();
- boolean authProvided = false;
- try
- {
- if (isServerRunning)
- {
- String bindDn;
- String bindPwd;
- boolean useSSL = argParser.useSSL();
- boolean useStartTLS = argParser.useStartTLS();
- if (argParser.isInteractive())
- {
- ManagementContext ctx = null;
-
- boolean canUseSSL = offLineConf.getLDAPSURL() != null;
- boolean canUseStartTLS = offLineConf.getStartTLSURL() != null;
- // This is done because we do not need to ask the user about these
- // parameters. If we force their presence the class
- // LDAPConnectionConsoleInteraction will not prompt the user for
- // them.
- SecureConnectionCliArgs secureArgsList =
- argParser.getSecureArgsList();
-
- secureArgsList.hostNameArg.setPresent(true);
- secureArgsList.portArg.setPresent(true);
- secureArgsList.hostNameArg.addValue(
- secureArgsList.hostNameArg.getDefaultValue());
- secureArgsList.portArg.addValue(
- secureArgsList.portArg.getDefaultValue());
- // We already know if SSL or StartTLS can be used. If we cannot
- // use them we will not propose them in the connection parameters
- // and if none of them can be used we will just not ask for the
- // protocol to be used.
- if (!canUseSSL)
- {
- if (useSSL)
- {
- throw new ConfigException(
- ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- secureArgsList.useSSLArg.setValueSetByProperty(true);
- }
- if (!canUseStartTLS)
- {
- if (useStartTLS)
- {
- throw new ConfigException(
- ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- secureArgsList.useStartTLSArg.setValueSetByProperty(true);
- }
- LDAPConnectionConsoleInteraction ci =
- new LDAPConnectionConsoleInteraction(
- this, argParser.getSecureArgsList());
- try
- {
- ci.run(canUseSSL, canUseStartTLS);
- bindDn = ci.getBindDN();
- bindPwd = ci.getBindPassword();
- useSSL = ci.useSSL();
- useStartTLS = ci.useStartTLS();
-
- int port = 389;
-
- String ldapUrl = offLineConf.getURL(
- ConnectionProtocolPolicy.getConnectionPolicy(
- useSSL, useStartTLS));
- try
- {
- URI uri = new URI(ldapUrl);
- port = uri.getPort();
- ci.setPortNumber(port);
- }
- catch (Throwable t)
- {
- LOG.log(Level.SEVERE, "Error parsing url: "+ldapUrl);
- }
- LDAPManagementContextFactory factory =
- new LDAPManagementContextFactory();
- ctx = factory.getManagementContext(this, ci);
- interactiveTrustManager = ci.getTrustManager();
- useInteractiveTrustManager = true;
- }
- catch (ConfigException ce)
- {
- LOG.log(Level.WARNING, "Error reading config file: "+ce, ce);
- println();
- println(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- println();
- return
- ErrorReturnCode.USER_CANCELLED_OR_DATA_ERROR.getReturnCode();
- }
- catch (ArgumentException e) {
- println(e.getMessageObject());
- return
- ErrorReturnCode.USER_CANCELLED_OR_DATA_ERROR.getReturnCode();
- }
- catch (ClientException e) {
- println(e.getMessageObject());
- // Display the information in the config file
- ServerStatusDescriptor desc = createServerStatusDescriptor(null,
- null);
- updateDescriptorWithOffLineInfo(desc, offLineConf);
- writeStatus(desc);
- return
- ErrorReturnCode.USER_CANCELLED_OR_DATA_ERROR.getReturnCode();
- }
- finally
- {
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
- }
- }
- else
- {
- bindDn = argParser.getBindDN();
- bindPwd = argParser.getBindPassword();
- }
-
- authProvided = bindPwd != null;
-
- if (bindDn == null)
- {
- bindDn = "";
- }
- if (bindPwd == null)
- {
- bindPwd = "";
- }
-
- if (authProvided)
- {
- ServerStatusDescriptor desc = createServerStatusDescriptor(
- bindDn, bindPwd);
- ConfigFromLDAP onLineConf = new ConfigFromLDAP();
- ConnectionProtocolPolicy policy =
- ConnectionProtocolPolicy.getConnectionPolicy(useSSL, useStartTLS);
- onLineConf.setConnectionInfo(offLineConf, policy, bindDn,
- bindPwd, getTrustManager());
- onLineConf.readConfiguration();
- updateDescriptorWithOnLineInfo(desc, onLineConf);
- writeStatus(desc);
-
- if (desc.getErrorMessage() != null)
- {
- return ErrorReturnCode.ERROR_READING_CONFIGURATION_WITH_LDAP.
- getReturnCode();
- }
- }
- else
- {
- // The user did not provide authentication: just display the
- // information we can get reading the config file.
- ServerStatusDescriptor desc = createServerStatusDescriptor(null,
- null);
- updateDescriptorWithOffLineInfo(desc, offLineConf);
- writeStatus(desc);
- }
- }
- else
- {
- ServerStatusDescriptor desc = createServerStatusDescriptor(null,
- null);
- updateDescriptorWithOffLineInfo(desc, offLineConf);
- writeStatus(desc);
- }
- }
- catch (ConfigException ce)
- {
- println();
- println(ce.getMessageObject());
- return ErrorReturnCode.USER_CANCELLED_OR_DATA_ERROR.getReturnCode();
- }
- }
-
- return ErrorReturnCode.SUCCESSFUL.getReturnCode();
- }
-
- private ServerStatusDescriptor createServerStatusDescriptor(String dn,
- String pwd)
- {
- ServerStatusDescriptor desc = new ServerStatusDescriptor();
- desc.setAuthenticated((dn != null) && (pwd != null));
-
- if (Installation.getLocal().getStatus().isServerRunning())
- {
- desc.setStatus(ServerStatusDescriptor.ServerStatus.STARTED);
- }
- else
- {
- desc.setStatus(ServerStatusDescriptor.ServerStatus.STOPPED);
- }
-
- desc.setInstallPath(new File(getInstallPathFromClasspath()));
-
- desc.setOpenDSVersion(
- org.opends.server.util.DynamicConstants.FULL_VERSION_STRING);
-
- return desc;
- }
-
- /**
- * Updates the ServerStatusDescriptor object using the information in the
- * config.ldif file (we use a ConfigFromFile object to do this).
- * @param desc the ServerStatusDescriptor object to be updated.
- * @param offLineConf the ConfigFromFile object to be used.
- */
- private void updateDescriptorWithOffLineInfo(ServerStatusDescriptor desc,
- ConfigFromFile offLineConf)
- {
- desc.setAdministrativeUsers(offLineConf.getAdministrativeUsers());
- desc.setDatabases(offLineConf.getDatabases());
- desc.setListeners(offLineConf.getListeners());
- desc.setErrorMessage(offLineConf.getErrorMessage());
- desc.setOpenConnections(-1);
- desc.setJavaVersion(null);
- }
-
- /**
- * Updates the ServerStatusDescriptor object using the LDAP protocol (we use a
- * ConfigFromLDAP object to do this).
- * @param desc the ServerStatusDescriptor object to be updated.
- * @param onLineConf the ConfigFromLDAP object to be used.
- */
- private void updateDescriptorWithOnLineInfo(ServerStatusDescriptor desc,
- ConfigFromLDAP onLineConf)
- {
- desc.setAdministrativeUsers(onLineConf.getAdministrativeUsers());
- desc.setDatabases(onLineConf.getDatabases());
- desc.setListeners(onLineConf.getListeners());
- desc.setErrorMessage(onLineConf.getErrorMessage());
- desc.setJavaVersion(onLineConf.getJavaVersion());
- desc.setOpenConnections(onLineConf.getOpenConnections());
- }
-
- private void writeStatus(ServerStatusDescriptor desc)
- {
- Message[] labels =
- {
- INFO_SERVER_STATUS_LABEL.get(),
- INFO_CONNECTIONS_LABEL.get(),
- INFO_HOSTNAME_LABEL.get(),
- INFO_ADMINISTRATIVE_USERS_LABEL.get(),
- INFO_INSTALLATION_PATH_LABEL.get(),
- INFO_OPENDS_VERSION_LABEL.get(),
- INFO_JAVA_VERSION_LABEL.get()
- };
- int labelWidth = 0;
- Message title = INFO_SERVER_STATUS_TITLE.get();
- if (!isScriptFriendly())
- {
- for (int i=0; i<labels.length; i++)
- {
- labelWidth = Math.max(labelWidth, labels[i].length());
- }
- getOutputStream().println();
- getOutputStream().println(centerTitle(title));
- }
- writeStatusContents(desc, labelWidth);
- writeCurrentConnectionContents(desc, labelWidth);
- if (!isScriptFriendly())
- {
- getOutputStream().println();
- }
-
- title = INFO_SERVER_DETAILS_TITLE.get();
- if (!isScriptFriendly())
- {
- getOutputStream().println(centerTitle(title));
- }
- writeHostnameContents(desc, labelWidth);
- writeAdministrativeUserContents(desc, labelWidth);
- writeInstallPathContents(desc, labelWidth);
- writeVersionContents(desc, labelWidth);
- writeJavaVersionContents(desc, labelWidth);
- if (!isScriptFriendly())
- {
- getOutputStream().println();
- }
-
- writeListenerContents(desc);
- if (!isScriptFriendly())
- {
- getOutputStream().println();
- }
-
- writeDatabaseContents(desc);
-
- writeErrorContents(desc);
-
- if (!isScriptFriendly())
- {
- if (displayMustStartLegend)
- {
- getOutputStream().println();
- getOutputStream().println(
- wrapText(INFO_NOT_AVAILABLE_SERVER_DOWN_CLI_LEGEND.get()));
- }
- else if (displayMustAuthenticateLegend)
- {
- getOutputStream().println();
- getOutputStream().println(
- wrapText(
- INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_CLI_LEGEND.get()));
- }
- }
- getOutputStream().println();
- }
-
- /**
- * Writes the status contents displaying with what is specified in the
- * provided ServerStatusDescriptor object.
- * @param desc the ServerStatusDescriptor object.
- */
- private void writeStatusContents(ServerStatusDescriptor desc,
- int maxLabelWidth)
- {
- Message status;
- switch (desc.getStatus())
- {
- case STARTED:
- status = INFO_SERVER_STARTED_LABEL.get();
- break;
-
- case STOPPED:
- status = INFO_SERVER_STOPPED_LABEL.get();
- break;
-
- case STARTING:
- status = INFO_SERVER_STARTING_LABEL.get();
- break;
-
- case STOPPING:
- status = INFO_SERVER_STOPPING_LABEL.get();
- break;
-
- case UNKNOWN:
- status = INFO_SERVER_UNKNOWN_STATUS_LABEL.get();
- break;
-
- default:
- throw new IllegalStateException("Unknown status: "+desc.getStatus());
- }
- writeLabelValue(INFO_SERVER_STATUS_LABEL.get(), status,
- maxLabelWidth);
- }
-
- /**
- * Writes the current connection contents displaying with what is specified
- * in the provided ServerStatusDescriptor object.
- * @param desc the ServerStatusDescriptor object.
- */
- private void writeCurrentConnectionContents(ServerStatusDescriptor desc,
- int maxLabelWidth)
- {
- Message text;
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- int nConn = desc.getOpenConnections();
- if (nConn >= 0)
- {
- text = Message.raw(String.valueOf(nConn));
- }
- else
- {
- if (!desc.isAuthenticated() || (desc.getErrorMessage() != null))
- {
- text = getNotAvailableBecauseAuthenticationIsRequiredText();
- }
- else
- {
- text = getNotAvailableText();
- }
- }
- }
- else
- {
- text = getNotAvailableBecauseServerIsDownText();
- }
-
- writeLabelValue(INFO_CONNECTIONS_LABEL.get(), text, maxLabelWidth);
- }
-
- /**
- * Writes the host name contents.
- * @param desc the ServerStatusDescriptor object.
- * @param maxLabelWidth the maximum label width of the left label.
- */
- private void writeHostnameContents(ServerStatusDescriptor desc,
- int maxLabelWidth)
- {
- writeLabelValue(INFO_HOSTNAME_LABEL.get(),
- Message.raw(desc.getHostname()),
- maxLabelWidth);
- }
- /**
- * Writes the administrative user contents displaying with what is specified
- * in the provided ServerStatusDescriptor object.
- * @param desc the ServerStatusDescriptor object.
- * @param maxLabelWidth the maximum label width of the left label.
- */
- private void writeAdministrativeUserContents(ServerStatusDescriptor desc,
- int maxLabelWidth)
- {
- Set<String> administrators = desc.getAdministrativeUsers();
- Message text;
- if (administrators.size() > 0)
- {
- TreeSet<String> ordered = new TreeSet<String>();
- ordered.addAll(administrators);
-
- String first = ordered.iterator().next();
- writeLabelValue(
- INFO_ADMINISTRATIVE_USERS_LABEL.get(),
- Message.raw(first),
- maxLabelWidth);
-
- Iterator<String> it = ordered.iterator();
- // First one already printed
- it.next();
- while (it.hasNext())
- {
- writeLabelValue(
- INFO_ADMINISTRATIVE_USERS_LABEL.get(),
- Message.raw(it.next()),
- maxLabelWidth);
- }
- }
- else
- {
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- if (!desc.isAuthenticated() || (desc.getErrorMessage() != null))
- {
- text = getNotAvailableBecauseAuthenticationIsRequiredText();
- }
- else
- {
- text = getNotAvailableText();
- }
- }
- else
- {
- text = getNotAvailableText();
- }
- writeLabelValue(INFO_ADMINISTRATIVE_USERS_LABEL.get(), text,
- maxLabelWidth);
- }
- }
-
- /**
- * Writes the install path contents displaying with what is specified in the
- * provided ServerStatusDescriptor object.
- * @param desc the ServerStatusDescriptor object.
- * @param maxLabelWidth the maximum label width of the left label.
- */
- private void writeInstallPathContents(ServerStatusDescriptor desc,
- int maxLabelWidth)
- {
- File path = desc.getInstallPath();
- writeLabelValue(INFO_INSTALLATION_PATH_LABEL.get(),
- Message.raw(path.toString()),
- maxLabelWidth);
- }
-
- /**
- * Updates the server version contents displaying with what is specified in
- * the provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void writeVersionContents(ServerStatusDescriptor desc,
- int maxLabelWidth)
- {
- String openDSVersion = desc.getOpenDSVersion();
- writeLabelValue(INFO_OPENDS_VERSION_LABEL.get(),
- Message.raw(openDSVersion),
- maxLabelWidth);
- }
-
- /**
- * Updates the java version contents displaying with what is specified in
- * the provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- * @param maxLabelWidth the maximum label width of the left label.
- */
- private void writeJavaVersionContents(ServerStatusDescriptor desc,
- int maxLabelWidth)
- {
- Message text;
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- text = Message.raw(desc.getJavaVersion());
- if (text == null)
- {
- if (!desc.isAuthenticated() || (desc.getErrorMessage() != null))
- {
- text = getNotAvailableBecauseAuthenticationIsRequiredText();
- }
- else
- {
- text = getNotAvailableText();
- }
- }
- }
- else
- {
- text = getNotAvailableBecauseServerIsDownText();
- }
- writeLabelValue(INFO_JAVA_VERSION_LABEL.get(), text, maxLabelWidth);
- }
-
- /**
- * Writes the listeners contents displaying with what is specified in
- * the provided ServerStatusDescriptor object.
- * @param desc the ServerStatusDescriptor object.
- */
- private void writeListenerContents(ServerStatusDescriptor desc)
- {
- if (!isScriptFriendly())
- {
- Message title = INFO_LISTENERS_TITLE.get();
- getOutputStream().println(centerTitle(title));
- }
-
- Set<ListenerDescriptor> allListeners = desc.getListeners();
-
- Set<ListenerDescriptor> listeners = new LinkedHashSet<ListenerDescriptor>();
- for (ListenerDescriptor listener: allListeners)
- {
- if (listener.getProtocol() != ListenerDescriptor.Protocol.LDIF)
- {
- listeners.add(listener);
- }
- }
-
- if (listeners.size() == 0)
- {
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- if (!desc.isAuthenticated())
- {
- getOutputStream().println(
- wrapText(
- INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_CLI_LABEL.get()));
- }
- else
- {
- getOutputStream().println(wrapText(INFO_NO_LISTENERS_FOUND.get()));
- }
- }
- else
- {
- getOutputStream().println(wrapText(INFO_NO_LISTENERS_FOUND.get()));
- }
- }
- else
- {
- ListenersTableModel listenersTableModel = new ListenersTableModel();
- listenersTableModel.setData(listeners);
- writeTableModel(listenersTableModel, desc);
- }
- }
-
- /**
- * Writes the databases contents displaying with what is specified in
- * the provided ServerStatusDescriptor object.
- * @param desc the ServerStatusDescriptor object.
- */
- private void writeDatabaseContents(ServerStatusDescriptor desc)
- {
- Message title = INFO_DATABASES_TITLE.get();
- if (!isScriptFriendly())
- {
- getOutputStream().println(centerTitle(title));
- }
-
- Set<DatabaseDescriptor> databases = desc.getDatabases();
-
- if (databases.size() == 0)
- {
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- if (!desc.isAuthenticated())
- {
- getOutputStream().println(
- wrapText(
- INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_CLI_LABEL.get()));
- }
- else
- {
- getOutputStream().println(wrapText(INFO_NO_DBS_FOUND.get()));
- }
- }
- else
- {
- getOutputStream().println(wrapText(INFO_NO_DBS_FOUND.get()));
- }
- }
- else
- {
- DatabasesTableModel databasesTableModel = new DatabasesTableModel(true);
- Set<BaseDNDescriptor> replicas = new HashSet<BaseDNDescriptor>();
- Set<DatabaseDescriptor> dbs = desc.getDatabases();
- for (DatabaseDescriptor db: dbs)
- {
- replicas.addAll(db.getBaseDns());
- }
- databasesTableModel.setData(replicas);
-
- writeDatabasesTableModel(databasesTableModel, desc);
- }
- }
-
- /**
- * Writes the error label contents displaying with what is specified in
- * the provided ServerStatusDescriptor object.
- * @param desc the ServerStatusDescriptor object.
- */
- private void writeErrorContents(ServerStatusDescriptor desc)
- {
- Message errorMsg = desc.getErrorMessage();
- if (errorMsg != null)
- {
- getOutputStream().println();
- getOutputStream().println(wrapText(errorMsg));
- }
- }
-
- /**
- * Returns the not available text explaining that the data is not available
- * because the server is down.
- * @return the text.
- */
- private Message getNotAvailableBecauseServerIsDownText()
- {
- displayMustStartLegend = true;
- return INFO_NOT_AVAILABLE_SERVER_DOWN_CLI_LABEL.get();
- }
-
- /**
- * Returns the not available text explaining that the data is not available
- * because authentication is required.
- * @return the text.
- */
- private Message getNotAvailableBecauseAuthenticationIsRequiredText()
- {
- displayMustAuthenticateLegend = true;
- return INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_CLI_LABEL.get();
- }
-
- /**
- * Returns the not available text explaining that the data is not available.
- * @return the text.
- */
- private Message getNotAvailableText()
- {
- return INFO_NOT_AVAILABLE_LABEL.get();
- }
-
- /**
- * Writes the contents of the provided table model simulating a table layout
- * using text.
- * @param tableModel the TableModel.
- * @param desc the Server Status descriptor.
- */
- private void writeTableModel(TableModel tableModel,
- ServerStatusDescriptor desc)
- {
- if (isScriptFriendly())
- {
- for (int i=0; i<tableModel.getRowCount(); i++)
- {
- getOutputStream().println("-");
- for (int j=0; j<tableModel.getColumnCount(); j++)
- {
- MessageBuilder line = new MessageBuilder();
- line.append(tableModel.getColumnName(j)+": ");
-
- line.append(getCellValue(tableModel.getValueAt(i, j), desc));
-
- getOutputStream().println(wrapText(line.toMessage()));
- }
- }
- }
- else
- {
- TableBuilder table = new TableBuilder();
- for (int i=0; i< tableModel.getColumnCount(); i++)
- {
- table.appendHeading(Message.raw(tableModel.getColumnName(i)));
- }
- for (int i=0; i<tableModel.getRowCount(); i++)
- {
- table.startRow();
- for (int j=0; j<tableModel.getColumnCount(); j++)
- {
- table.appendCell(getCellValue(tableModel.getValueAt(i, j), desc));
- }
- }
- TextTablePrinter printer = new TextTablePrinter(getOutputStream());
- printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
- table.print(printer);
- }
- }
-
-
- private Message getCellValue(Object v, ServerStatusDescriptor desc)
- {
- Message s = null;
- if (v != null)
- {
- if (v instanceof String)
- {
- s = Message.raw((String)v);
- }
- else if (v instanceof Integer)
- {
- int nEntries = ((Integer)v).intValue();
- if (nEntries >= 0)
- {
- s = Message.raw(String.valueOf(nEntries));
- }
- else
- {
- if (!desc.isAuthenticated() || (desc.getErrorMessage() != null))
- {
- s = getNotAvailableBecauseAuthenticationIsRequiredText();
- }
- else
- {
- s = getNotAvailableText();
- }
- }
- }
- else
- {
- throw new IllegalStateException("Unknown object type: "+v);
- }
- }
- else
- {
- s = getNotAvailableText();
- }
- return s;
- }
-
- /**
- * Writes the contents of the provided database table model. Every base DN
- * is written in a block containing pairs of labels and values.
- * @param tableModel the TableModel.
- * @param desc the Server Status descriptor.
- */
- private void writeDatabasesTableModel(DatabasesTableModel tableModel,
- ServerStatusDescriptor desc)
- {
- boolean isRunning =
- desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED;
-
- int labelWidth = 0;
- int labelWidthWithoutReplicated = 0;
- Message[] labels = new Message[tableModel.getColumnCount()];
- for (int i=0; i<tableModel.getColumnCount(); i++)
- {
- Message header;
- if (i == 5)
- {
- header = INFO_AGE_OF_OLDEST_MISSING_CHANGE_COLUMN_CLI.get();
- }
- else
- {
- header = Message.raw(tableModel.getColumnName(i));
- }
- labels[i] = new MessageBuilder(header).append(":").toMessage();
- labelWidth = Math.max(labelWidth, labels[i].length());
- if ((i != 4) && (i != 5))
- {
- labelWidthWithoutReplicated =
- Math.max(labelWidthWithoutReplicated, labels[i].length());
- }
- }
-
- Message replicatedLabel = INFO_BASEDN_REPLICATED_LABEL.get();
- for (int i=0; i<tableModel.getRowCount(); i++)
- {
- if (isScriptFriendly())
- {
- getOutputStream().println("-");
- }
- else if (i > 0)
- {
- getOutputStream().println();
- }
- for (int j=0; j<tableModel.getColumnCount(); j++)
- {
- Message value;
- Object v = tableModel.getValueAt(i, j);
- if (v != null)
- {
- if (v instanceof String)
- {
- value = Message.raw((String)v);
- }
- else if (v instanceof Message)
- {
- value = (Message)v;
- }
- else if (v instanceof Integer)
- {
- int nEntries = ((Integer)v).intValue();
- if (nEntries >= 0)
- {
- value = Message.raw(String.valueOf(nEntries));
- }
- else
- {
- if (!isRunning)
- {
- value = getNotAvailableBecauseServerIsDownText();
- }
- if (!desc.isAuthenticated() || (desc.getErrorMessage() != null))
- {
- value = getNotAvailableBecauseAuthenticationIsRequiredText();
- }
- else
- {
- value = getNotAvailableText();
- }
- }
- }
- else
- {
- throw new IllegalStateException("Unknown object type: "+v);
- }
- }
- else
- {
- value = Message.EMPTY;
- }
-
- if (value.equals(getNotAvailableText()))
- {
- if (!isRunning)
- {
- value = getNotAvailableBecauseServerIsDownText();
- }
- if (!desc.isAuthenticated() || (desc.getErrorMessage() != null))
- {
- value = getNotAvailableBecauseAuthenticationIsRequiredText();
- }
- }
-
- boolean doWrite = true;
- boolean isReplicated =
- replicatedLabel.equals(tableModel.getValueAt(i, 3));
- if ((j == 4) || (j == 5))
- {
- // If the suffix is not replicated we do not have to display these
- // lines.
- doWrite = isReplicated;
- }
- if (doWrite)
- {
- writeLabelValue(labels[j], value,
- isReplicated?labelWidth:labelWidthWithoutReplicated);
- }
- }
- }
- }
-
- private void writeLabelValue(Message label, Message value, int maxLabelWidth)
- {
- MessageBuilder buf = new MessageBuilder();
- buf.append(label);
-
- int extra = maxLabelWidth - label.length();
- for (int i = 0; i<extra; i++)
- {
- buf.append(" ");
- }
- buf.append(" ").append(String.valueOf(value));
- getOutputStream().println(wrapText(buf.toMessage()));
- }
-
- private Message centerTitle(Message text)
- {
- Message centered;
- if (text.length() <= getCommandLineMaxLineWidth() - 8)
- {
- MessageBuilder buf = new MessageBuilder();
- int extra = Math.min(10,
- (getCommandLineMaxLineWidth() - 8 - text.length()) / 2);
- for (int i=0; i<extra; i++)
- {
- buf.append(" ");
- }
- buf.append("--- "+text+" ---");
- centered = buf.toMessage();
- }
- else
- {
- centered = text;
- }
- return centered;
- }
-
- /**
- * Returns the trust manager to be used by this application.
- * @return the trust manager to be used by this application.
- */
- private TrustManager getTrustManager()
- {
- if (useInteractiveTrustManager)
- {
- return interactiveTrustManager;
- }
- else
- {
- return argParser.getTrustManager();
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isAdvancedMode() {
- return false;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isInteractive() {
- return argParser.isInteractive();
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isMenuDrivenMode() {
- return true;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isQuiet() {
- return false;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isScriptFriendly() {
- return argParser.isScriptFriendly();
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isVerbose() {
- return true;
- }
-
-
-
- /**
- * Wraps a message accoring to client tool console width.
- * @param text to wrap
- * @return raw message representing wrapped string
- */
- private Message wrapText(Message text)
- {
- return Message.raw(
- StaticUtils.wrapText(text, getCommandLineMaxLineWidth()));
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCliArgumentParser.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCliArgumentParser.java
deleted file mode 100644
index b3b516e..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCliArgumentParser.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.OPTION_LONG_NO_PROP_FILE;
-import static org.opends.server.tools.ToolConstants.OPTION_LONG_PROP_FILE_PATH;
-
-import java.io.OutputStream;
-import java.util.ArrayList;
-
-import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
-import org.opends.server.admin.client.cli.SecureConnectionCliParser;
-import org.opends.server.tools.ToolConstants;
-import org.opends.server.util.args.Argument;
-import org.opends.server.util.args.ArgumentException;
-import org.opends.server.util.args.BooleanArgument;
-import org.opends.server.util.args.StringArgument;
-
-/**
- * The class that is used to parse the arguments provided in the status command
- * line.
- *
- */
-public class StatusCliArgumentParser extends SecureConnectionCliParser
-{
- private BooleanArgument noPromptArg;
-
- /**
- * The 'scriptFriendly' argument.
- */
- private BooleanArgument scriptFriendlyArg;
-
- /**
- * Creates a new instance of this argument parser with no arguments.
- *
- * @param mainClassName
- * The fully-qualified name of the Java class that should
- * be invoked to launch the program with which this
- * argument parser is associated.
- */
- public StatusCliArgumentParser(String mainClassName)
- {
- super(mainClassName, INFO_STATUS_CLI_USAGE_DESCRIPTION.get(), false);
- }
-
- /**
- * Initialize Global option.
- *
- * @param outStream
- * The output stream used for the usage.
- * @throws ArgumentException
- * If there is a problem with any of the parameters used
- * to create this argument.
- */
- public void initializeGlobalArguments(OutputStream outStream)
- throws ArgumentException
- {
- ArrayList<Argument> defaultArgs =
- new ArrayList<Argument>(createGlobalArguments(outStream));
- defaultArgs.remove(secureArgsList.portArg);
- defaultArgs.remove(secureArgsList.hostNameArg);
- defaultArgs.remove(verboseArg);
- defaultArgs.remove(noPropertiesFileArg);
- defaultArgs.remove(propertiesFileArg);
- noPromptArg = new BooleanArgument(
- ToolConstants.OPTION_LONG_NO_PROMPT,
- ToolConstants.OPTION_SHORT_NO_PROMPT,
- ToolConstants.OPTION_LONG_NO_PROMPT,
- INFO_DESCRIPTION_NO_PROMPT.get());
- defaultArgs.add(0, noPromptArg);
-
- scriptFriendlyArg = new BooleanArgument(
- "script-friendly",
- 's',
- "script-friendly",
- INFO_DESCRIPTION_SCRIPT_FRIENDLY.get());
- defaultArgs.add(1, scriptFriendlyArg);
-
- StringArgument propertiesFileArgument = new StringArgument(
- "propertiesFilePath", null, OPTION_LONG_PROP_FILE_PATH, false, false,
- true, INFO_PROP_FILE_PATH_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_PROP_FILE_PATH.get());
- defaultArgs.add(propertiesFileArgument);
- setFilePropertiesArgument(propertiesFileArgument);
-
- BooleanArgument noPropertiesFileArgument = new BooleanArgument(
- "noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
- INFO_DESCRIPTION_NO_PROP_FILE.get());
- defaultArgs.add(noPropertiesFileArgument);
- setNoPropertiesFileArgument(noPropertiesFileArgument);
-
- initializeGlobalArguments(defaultArgs);
- }
-
- /**
- * Returns the SecureConnectionCliArgs object containing the arguments
- * of this parser.
- * @return the SecureConnectionCliArgs object containing the arguments
- * of this parser.
- */
- SecureConnectionCliArgs getSecureArgsList()
- {
- return secureArgsList;
- }
- /**
- * Tells whether the user specified to have an interactive uninstall or not.
- * This method must be called after calling parseArguments.
- * @return <CODE>true</CODE> if the user specified to have an interactive
- * uninstall and <CODE>false</CODE> otherwise.
- */
- public boolean isInteractive()
- {
- return !noPromptArg.isPresent();
- }
-
- /**
- * Tells whether the user specified to have a script-friendly output or not.
- * This method must be called after calling parseArguments.
- * @return <CODE>true</CODE> if the user specified to have a script-friendly
- * output and <CODE>false</CODE> otherwise.
- */
- public boolean isScriptFriendly()
- {
- return scriptFriendlyArg.isPresent();
- }
-
- /**
- * Returns the first server bind dn explicitly provided in the enable
- * replication subcommand.
- * @return the first server bind dn explicitly provided in the enable
- * replication subcommand. Returns -1 if no port was explicitly provided.
- */
- public String getExplicitBindDn()
- {
- String dn = null;
- if (secureArgsList.bindDnArg.isPresent())
- {
- dn = secureArgsList.bindDnArg.getValue();
- }
- return dn;
- }
-
- /**
- * Returns the first server bind dn default value in the enable replication
- * subcommand.
- * @return the first server bind dn default value in the enable replication
- * subcommand.
- */
- public String getDefaultBindDn()
- {
- return secureArgsList.bindDnArg.getDefaultValue();
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusLog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusLog.java
deleted file mode 100644
index a902d6e..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusLog.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.guitools.statuspanel;
-
-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.Date;
-import java.text.DateFormat;
-
-/**
- * Utilities for setting up Status application log.
- */
-public class StatusLog {
-
- static private File logFile = null;
-
- /**
- * Creates a new file handler for writing log messages to the file indicated
- * by <code>file</code>.
- * @param file log file to which log messages will be written
- * @throws IOException if something goes wrong
- */
- static public void initLogFileHandler(File file) throws IOException {
- if (!isInitialized()) {
- logFile = file;
- FileHandler fileHandler = new FileHandler(logFile.getCanonicalPath());
- fileHandler.setFormatter(new SimpleFormatter());
- Logger logger = Logger.getLogger("org.opends.statuspanel");
- logger.setUseParentHandlers(false); // disable logging to console
- logger.addHandler(fileHandler);
- logger.log(Level.INFO, getInitialLogRecord());
- }
- }
-
- /**
- * Gets the name of the log file.
- * @return File representing the log file
- */
- static public File getLogFile() {
- return logFile;
- }
-
- /**
- * Indicates whether or not the log file has been initialized.
- * @return true when the log file has been initialized
- */
- static public boolean isInitialized() {
- return logFile != null;
- }
-
- static private String getInitialLogRecord() {
- StringBuilder sb = new StringBuilder()
- .append("Status application launched " +
- DateFormat.getDateTimeInstance(DateFormat.LONG,
- DateFormat.LONG).
- format(new Date()));
- return sb.toString();
- }
-
-}
-
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java
deleted file mode 100644
index 5a42fc9..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java
+++ /dev/null
@@ -1,1131 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel;
-
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.swing.SwingUtilities;
-
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.util.SetupUtils;
-
-import org.opends.admin.ads.util.ApplicationTrustManager;
-import org.opends.guitools.statuspanel.event.ServerStatusChangeEvent;
-import org.opends.guitools.statuspanel.event.ServerStatusChangeListener;
-import org.opends.guitools.statuspanel.event.StatusPanelButtonListener;
-import org.opends.guitools.statuspanel.ui.LoginDialog;
-import org.opends.guitools.statuspanel.ui.StatusPanelDialog;
-import org.opends.quicksetup.Installation;
-import org.opends.quicksetup.ui.ProgressDialog;
-import org.opends.quicksetup.ui.UIFactory;
-import org.opends.quicksetup.ui.Utilities;
-import org.opends.quicksetup.util.BackgroundTask;
-import org.opends.quicksetup.util.HtmlProgressMessageFormatter;
-import org.opends.quicksetup.util.UIKeyStore;
-import org.opends.quicksetup.util.Utils;
-
-import org.opends.messages.Message;
-import org.opends.messages.MessageBuilder;
-import org.opends.messages.MessageDescriptor;
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.messages.QuickSetupMessages.*;
-
-/**
- * This is the main class of the status panel.
- *
- * It is in charge of all the logic behind the displaying of the dialogs and
- * the one that initializes everything. This is also the class that ultimately
- * listens to user events (notably button clicks) and executes the associated
- * operations with these user events.
- *
- */
-public class StatusPanelController implements ServerStatusChangeListener,
- StatusPanelButtonListener
-{
- private LoginDialog loginDialog;
- private StatusPanelDialog controlPanelDialog;
- private ProgressDialog progressDialog;
- private ServerStatusPooler serverStatusPooler;
- private HtmlProgressMessageFormatter formatter =
- new HtmlProgressMessageFormatter();
-
- private boolean isStarting;
- private boolean isStopping;
- private boolean isRestarting;
-
- private boolean mustDisplayAuthenticateDialog;
-
- private ServerStatusDescriptor desc;
-
- private Message lastDetail;
- private Message lastSummary;
-
- private Thread progressUpdater;
-
- private ApplicationTrustManager trustManager;
-
-//Update period of the progress dialog.
- private static final int UPDATE_PERIOD = 500;
-
- private static final ConnectionProtocolPolicy CONNECTION_POLICY =
- ConnectionProtocolPolicy.USE_MOST_SECURE_AVAILABLE;
-
- private static final Logger LOG = Logger.getLogger(
- StatusPanelController.class.getName());
-
- /**
- * This method creates the control panel dialogs and to check the current
- * install status. This method must be called outside the event thread because
- * it can perform long operations which can make the user think that the UI is
- * blocked.
- *
- * Note that there is no synchronization code between threads. The
- * synchronization code is not required as all the start/stop/restart actions
- * are launched in the event thread so just using booleans that are updated
- * in the event thread is enough to guarantee that there are no multiple
- * operations launched at the same time.
- *
- * @param args for the moment this parameter is not used but we keep it in
- * order to (in case of need) pass parameters through the command line.
- */
- public void initialize(String[] args)
- {
- DirectoryServer.bootstrapClient();
- initLookAndFeel();
- try
- {
- trustManager = new ApplicationTrustManager(UIKeyStore.getInstance());
- }
- catch (Throwable t)
- {
- LOG.log(Level.WARNING, "Error retrieving UI key store: "+t, t);
- trustManager = new ApplicationTrustManager(null);
- }
-
- /* Call this methods to create the dialogs (the control panel dialog
- * is generated when we call getLoginDialog()). */
- getLoginDialog();
- getProgressDialog();
- serverStatusPooler = new ServerStatusPooler(CONNECTION_POLICY);
- serverStatusPooler.addServerStatusChangeListener(this);
- serverStatusPooler.startPooling();
- desc = serverStatusPooler.getLastDescriptor();
- while (desc == null)
- {
- try
- {
- Thread.sleep(100);
- }
- catch (Exception ex)
- {
- }
- desc = serverStatusPooler.getLastDescriptor();
- }
- }
-
- /**
- * This method displays the required dialog. This method must be called from
- * the event thread.
- */
- public void display()
- {
- getStatusPanelDialog().packAndShow();
- if (!isAuthenticated())
- {
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- authenticateClicked();
- }
- }
- }
-
- /**
- * ServerStatusChangeListener implementation. This method is called when
- * a new ServerStatusDescriptor has been generated by the ServerStatusPooler.
- * @param ev the event we receive.
- */
- public void statusChanged(final ServerStatusChangeEvent ev)
- {
- /* Here we assume that this events are not very frequent (not frequent
- * at least to generate flickering). This is acceptable since the
- * ServerStatusPooler does pooling every second.
- */
- if (SwingUtilities.isEventDispatchThread())
- {
- getStatusPanelDialog().updateContents(ev.getStatusDescriptor());
- }
- else
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- getStatusPanelDialog().updateContents(ev.getStatusDescriptor());
- }
- });
- }
- }
-
- /**
- * Method called when user clicks on Quit button.
- * StatusPanelButtonListener implementation.
- */
- public void quitClicked()
- {
- serverStatusPooler.stopPooling();
- System.exit(0);
- }
-
- /**
- * Method called when user clicks on Start button.
- * StatusPanelButtonListener implementation.
- */
- public void startClicked()
- {
- if (isStarting)
- {
- if (!getProgressDialog().isVisible())
- {
- getProgressDialog().setVisible(true);
- }
- }
- else if (isStopping)
- {
- /* Should not happen */
- Thread.dumpStack();
- }
- else if (isRestarting)
- {
- /* Should not happen */
- Thread.dumpStack();
- }
- else
- {
- isStarting = true;
- lastDetail = null;
- getProgressDialog().setSummary(
- getFormattedSummary(INFO_SUMMARY_STARTING.get()));
- getProgressDialog().setDetails(Message.EMPTY);
- serverStatusPooler.beginServerStart();
- getProgressDialog().setCloseButtonEnabled(false);
- getStatusPanelDialog().setStartButtonEnabled(false);
- getStatusPanelDialog().setStopButtonEnabled(false);
- getStatusPanelDialog().setRestartButtonEnabled(false);
- getStatusPanelDialog().setAuthenticateButtonEnabled(false);
-
- if (!getProgressDialog().isVisible())
- {
- getProgressDialog().pack();
- Utilities.centerOnComponent(getProgressDialog(),
- getStatusPanelDialog());
- getProgressDialog().setVisible(true);
- }
-
- BackgroundTask task = new BackgroundTask()
- {
- public Object processBackgroundTask()
- {
- if (progressUpdater == null)
- {
- runProgressUpdater();
- }
- mustDisplayAuthenticateDialog = startServer() && !isAuthenticated();
- serverStatusPooler.endServerStart();
- return null;
- }
- public void backgroundTaskCompleted(Object value, Throwable t)
- {
- if (t != null)
- {
- // Bug
- t.printStackTrace();
- }
- getStatusPanelDialog().setStartButtonEnabled(true);
- getStatusPanelDialog().setStopButtonEnabled(true);
- getStatusPanelDialog().setRestartButtonEnabled(true);
- getStatusPanelDialog().setAuthenticateButtonEnabled(
- !isAuthenticated());
- getProgressDialog().setCloseButtonEnabled(true);
- isStarting = false;
- }
- };
- task.startBackgroundTask();
- }
- }
-
- /**
- * Method called when user clicks on Stop button.
- * StatusPanelButtonListener implementation.
- */
- public void stopClicked()
- {
- if (isStopping)
- {
- if (!getProgressDialog().isVisible())
- {
- getProgressDialog().setVisible(true);
- }
- }
- else if (isStarting)
- {
- /* Should not happen */
- Thread.dumpStack();
- }
- else if (isRestarting)
- {
- /* Should not happen */
- Thread.dumpStack();
- }
- else
- {
- boolean stopServer = confirmStop();
-
- if (stopServer)
- {
- isStopping = true;
- lastDetail = null;
- getProgressDialog().setSummary(
- getFormattedSummary(INFO_SUMMARY_STOPPING.get()));
- getProgressDialog().setDetails(Message.EMPTY);
- serverStatusPooler.beginServerStop();
- getProgressDialog().setCloseButtonEnabled(false);
- getStatusPanelDialog().setStartButtonEnabled(false);
- getStatusPanelDialog().setStopButtonEnabled(false);
- getStatusPanelDialog().setRestartButtonEnabled(false);
- getStatusPanelDialog().setAuthenticateButtonEnabled(false);
-
- if (!getProgressDialog().isVisible())
- {
- getProgressDialog().pack();
- Utilities.centerOnComponent(getProgressDialog(),
- getStatusPanelDialog());
- getProgressDialog().setVisible(true);
- }
-
- BackgroundTask task = new BackgroundTask()
- {
- public Object processBackgroundTask()
- {
- if (progressUpdater == null)
- {
- runProgressUpdater();
- }
- stopServer();
- serverStatusPooler.endServerStop();
- mustDisplayAuthenticateDialog = false;
- return null;
- }
- public void backgroundTaskCompleted(Object value, Throwable t)
- {
- if (t != null)
- {
- // Bug
- t.printStackTrace();
- }
- getStatusPanelDialog().setStartButtonEnabled(true);
- getStatusPanelDialog().setStopButtonEnabled(true);
- getStatusPanelDialog().setRestartButtonEnabled(true);
- getStatusPanelDialog().setAuthenticateButtonEnabled(false);
- getProgressDialog().setCloseButtonEnabled(true);
- isStopping = false;
- }
- };
- task.startBackgroundTask();
- }
- }
- }
-
- /**
- * Method called when user clicks on Restart button.
- * StatusPanelButtonListener implementation.
- */
- public void restartClicked()
- {
- if (isRestarting)
- {
- if (!getProgressDialog().isVisible())
- {
- getProgressDialog().setVisible(true);
- }
- }
- else if (isStopping)
- {
- /* Should not happen */
- Thread.dumpStack();
- }
- else if (isStarting)
- {
- /* Should not happen */
- Thread.dumpStack();
- }
- else
- {
- boolean restartServer = confirmRestart();
-
- if (restartServer)
- {
- isRestarting = true;
- lastDetail = null;
- getProgressDialog().setSummary(
- getFormattedSummary(INFO_SUMMARY_STOPPING.get()));
- getProgressDialog().setDetails(Message.EMPTY);
- serverStatusPooler.beginServerStop();
- getProgressDialog().setCloseButtonEnabled(false);
- getStatusPanelDialog().setStartButtonEnabled(false);
- getStatusPanelDialog().setStopButtonEnabled(false);
- getStatusPanelDialog().setRestartButtonEnabled(false);
- getStatusPanelDialog().setAuthenticateButtonEnabled(false);
-
- if (!getProgressDialog().isVisible())
- {
- getProgressDialog().pack();
- Utilities.centerOnComponent(getProgressDialog(),
- getStatusPanelDialog());
- getProgressDialog().setVisible(true);
- }
-
- BackgroundTask task = new BackgroundTask()
- {
- public Object processBackgroundTask()
- {
- if (progressUpdater == null)
- {
- runProgressUpdater();
- }
- if (stopServer())
- {
- serverStatusPooler.endServerStop();
- serverStatusPooler.beginServerStart();
- mustDisplayAuthenticateDialog = startServer() &&
- !isAuthenticated();
- serverStatusPooler.endServerStart();
- }
- else
- {
- serverStatusPooler.endServerStop();
- mustDisplayAuthenticateDialog = false;
- }
- return null;
- }
- public void backgroundTaskCompleted(Object value, Throwable t)
- {
- if (t != null)
- {
- // Bug
- t.printStackTrace();
- }
- getStatusPanelDialog().setStartButtonEnabled(true);
- getStatusPanelDialog().setStopButtonEnabled(true);
- getStatusPanelDialog().setRestartButtonEnabled(true);
- getStatusPanelDialog().setAuthenticateButtonEnabled(
- !isAuthenticated());
- getProgressDialog().setCloseButtonEnabled(true);
- isRestarting = false;
- }
- };
- task.startBackgroundTask();
- }
- }
- }
-
- /**
- * Method called when user clicks on Authenticate button.
- * StatusPanelButtonListener implementation.
- */
- public void authenticateClicked()
- {
- getLoginDialog().pack();
- Utilities.centerOnComponent(getLoginDialog(), getStatusPanelDialog());
- getLoginDialog().setVisible(true);
- if (!getLoginDialog().isCancelled())
- {
- try
- {
- serverStatusPooler.setAuthentication(
- getLoginDialog().getDirectoryManagerDn(),
- getLoginDialog().getDirectoryManagerPwd(),
- trustManager);
- }
- catch (ConfigException ce)
- {
- Utilities.displayError(getLoginDialog(), ce.getMessageObject(),
- INFO_ERROR_TITLE.get());
- getLoginDialog().toFront();
- }
- }
- }
-
- /**
- * A method to initialize the look and feel.
- *
- */
- private void initLookAndFeel()
- {
- UIFactory.initialize();
- }
-
- /**
- * Returns the login dialog and creates it if it does not exist.
- * @return the login dialog.
- */
- private LoginDialog getLoginDialog()
- {
- if (loginDialog == null)
- {
- loginDialog = new LoginDialog(getStatusPanelDialog(), trustManager,
- CONNECTION_POLICY);
- loginDialog.setModal(true);
- }
- return loginDialog;
- }
-
- /**
- * Returns the progress dialog and creates it if it does not exist.
- * As we only can run an operation at a time (considering the nature of the
- * operations we provide today) having a single progress dialog is enough.
- * @return the progress dialog.
- */
- private ProgressDialog getProgressDialog()
- {
- if (progressDialog == null)
- {
- progressDialog = new ProgressDialog(getStatusPanelDialog());
- progressDialog.addWindowListener(new WindowAdapter()
- {
- public void windowClosed(WindowEvent ev)
- {
- if (mustDisplayAuthenticateDialog)
- {
- mustDisplayAuthenticateDialog = false;
- authenticateClicked();
- }
- }
- });
- }
- return progressDialog;
- }
-
- /**
- * Returns the status panel dialog and creates it if it does not exist. This
- * is the dialog that displays the status information to the user.
- * @return the status panel dialog.
- */
- private StatusPanelDialog getStatusPanelDialog()
- {
- if (controlPanelDialog == null)
- {
- controlPanelDialog = new StatusPanelDialog();
- controlPanelDialog.addButtonListener(this);
- }
- return controlPanelDialog;
- }
-
- /**
- * This methods starts the server and updates the progress with the start
- * messages.
- * @return <CODE>true</CODE> if the server started successfully and
- * <CODE>false</CODE> otherwise.
- */
- protected boolean startServer()
- {
- boolean started = false;
-
- if (isRestarting)
- {
- updateProgress(
- getFormattedSummary(INFO_SUMMARY_STARTING.get()),
- getTaskSeparator());
- }
- updateProgress(
- getFormattedSummary(INFO_SUMMARY_STARTING.get()),
- getFormattedProgressWithLineBreak(INFO_PROGRESS_STARTING.get()));
-
- ArrayList<String> argList = new ArrayList<String>();
- Installation installation = Installation.getLocal();
- argList.add(Utils.getScriptPath(
- Utils.getPath(installation.getServerStartCommandFile())));
-
- String[] args = new String[argList.size()];
- argList.toArray(args);
- ProcessBuilder pb = new ProcessBuilder(args);
- Map<String, String> env = pb.environment();
- env.remove(SetupUtils.OPENDS_JAVA_ARGS);
- try
- {
- Process process = pb.start();
-
- BufferedReader err =
- new BufferedReader(new InputStreamReader(process.getErrorStream()));
- BufferedReader out =
- new BufferedReader(new InputStreamReader(process.getInputStream()));
-
- /* Create these objects to resend the stop process output to the details
- * area.
- */
- new ProgressReader(err, true, true);
- new ProgressReader(out, false, true);
-
- int returnValue = process.waitFor();
-
- if (returnValue == 0)
- {
- /*
- * There are no exceptions from the readers and they are marked as
- * finished. This means that the server has written in its output the
- * message id informing that it started. So it seems that everything
- * went fine.
- *
- * However we can have issues with the firewalls or do not have rights
- * to connect. Just check if we can connect to the server.
- * Try 5 times with an interval of 1 second between try.
- */
- boolean running = false;
- for (int i=0; i<5 && !running; i++)
- {
- running = Installation.getLocal().getStatus().isServerRunning();
- }
-
- if (!running)
- {
- try
- {
- Thread.sleep(1000);
- }
- catch (Throwable t)
- {
- }
- }
- if (!running)
- {
- updateProgress(getFormattedError(INFO_SUMMARY_START_ERROR.get()),
- getFormattedError(ERR_STARTING_SERVER_GENERIC.get(),
- true));
- }
- else
- {
- updateProgress(
- getFormattedSuccess(INFO_SUMMARY_START_SUCCESS.get()),
- Message.EMPTY);
- started = true;
- }
- }
- else
- {
- Message msg = INFO_ERROR_STARTING_SERVER_CODE
- .get(String.valueOf(returnValue));
-
- /*
- * The return code is not the one expected, assume the server could
- * not be started.
- */
- updateProgress(
- getFormattedError(INFO_SUMMARY_START_ERROR.get()),
- msg);
- }
-
- } catch (IOException ioe)
- {
- Message msg =
- Utils.getThrowableMsg(INFO_ERROR_STARTING_SERVER.get(), ioe);
- updateProgress(
- getFormattedError(INFO_SUMMARY_START_ERROR.get()),
- msg);
- }
- catch (InterruptedException ie)
- {
- Message msg = Utils.getThrowableMsg(INFO_ERROR_STARTING_SERVER.get(), ie);
- updateProgress(
- getFormattedError(INFO_SUMMARY_START_ERROR.get()),
- msg);
- }
-
- return started;
- }
-
- /**
- * This methods stops the server and updates the progress with the stop
- * messages.
- * @return <CODE>true</CODE> if the server stopped successfully and
- * <CODE>false</CODE> otherwise.
- */
- private boolean stopServer()
- {
- boolean stopped = false;
- updateProgress(
- getFormattedSummary(INFO_SUMMARY_STOPPING.get()),
- getFormattedProgressWithLineBreak(INFO_PROGRESS_STOPPING.get()));
-
- ArrayList<String> argList = new ArrayList<String>();
- Installation installation = Installation.getLocal();
- argList.add(Utils.getScriptPath(
- Utils.getPath(installation.getServerStopCommandFile())));
- String[] args = new String[argList.size()];
- argList.toArray(args);
- ProcessBuilder pb = new ProcessBuilder(args);
- Map<String, String> env = pb.environment();
- env.remove(SetupUtils.OPENDS_JAVA_ARGS);
- try
- {
- Process process = pb.start();
-
- BufferedReader err =
- new BufferedReader(new InputStreamReader(process.getErrorStream()));
- BufferedReader out =
- new BufferedReader(new InputStreamReader(process.getInputStream()));
-
- /* Create these objects to resend the stop process output to the details
- * area.
- */
- new ProgressReader(err, true, false);
- new ProgressReader(out, false, false);
-
- int returnValue = process.waitFor();
-
- int clientSideError =
- org.opends.server.protocols.ldap.LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR;
- if ((returnValue == clientSideError) || (returnValue == 0))
- {
- if (Utils.isWindows())
- {
- /*
- * Sometimes the server keeps some locks on the files.
- * TODO: remove this code once stop-ds returns properly when server
- * is stopped.
- */
- int nTries = 10;
- for (int i=0; i<nTries && !stopped; i++)
- {
- stopped = !Installation.getLocal().getStatus()
- .isServerRunning();
- if (!stopped)
- {
- Message msg = new MessageBuilder(
- getFormattedLog(INFO_PROGRESS_SERVER_WAITING_TO_STOP.get()))
- .append(getLineBreak()).toMessage();
- updateProgress(
- getFormattedSummary(INFO_SUMMARY_STOPPING.get()),
- msg);
- try
- {
- Thread.sleep(5000);
- }
- catch (Exception ex)
- {
-
- }
- }
- }
- if (!stopped)
- {
- returnValue = -1;
- }
- }
- }
-
- if (returnValue == clientSideError)
- {
- Message msg = new MessageBuilder(getLineBreak()).append(
- getFormattedLog(INFO_PROGRESS_SERVER_ALREADY_STOPPED.get())).append(
- getLineBreak()).toMessage();
- if (!isRestarting)
- {
- updateProgress(
- getFormattedSuccess(INFO_SUMMARY_STOP_SUCCESS.get()),
- msg);
- }
- else
- {
- updateProgress(
- getFormattedSummary(INFO_SUMMARY_STOP_SUCCESS.get()),
- msg);
- }
- stopped = true;
- }
- else if (returnValue != 0)
- {
- Message msg = INFO_ERROR_STOPPING_SERVER_CODE
- .get(String.valueOf(returnValue));
-
- /*
- * The return code is not the one expected, assume the server could
- * not be stopped.
- */
- updateProgress(
- getFormattedError(INFO_SUMMARY_STOP_ERROR.get()),
- msg);
- }
- else
- {
- Message msg = getFormattedLog(INFO_PROGRESS_SERVER_STOPPED.get());
- if (!isRestarting)
- {
- updateProgress(
- getFormattedSuccess(INFO_SUMMARY_STOP_SUCCESS.get()),
- msg);
- }
- else
- {
- updateProgress(
- getFormattedSummary(INFO_SUMMARY_STOP_SUCCESS.get()),
- msg);
- }
- stopped = true;
- }
-
- } catch (IOException ioe)
- {
- Message msg = Utils.getThrowableMsg(
- INFO_ERROR_STOPPING_SERVER.get(), ioe);
- updateProgress(
- getFormattedError(INFO_SUMMARY_STOP_ERROR.get()),
- msg);
- }
- catch (InterruptedException ie)
- {
- Message msg = Utils.getThrowableMsg(INFO_ERROR_STOPPING_SERVER.get(), ie);
- updateProgress(
- getFormattedError(INFO_SUMMARY_STOP_ERROR.get()),
- msg);
- }
- return stopped;
- }
-
-
- /**
- * Updates the progress variables used to update the progress dialog during
- * start/stop/restart.
- *
- * @param summary the summary for the start/stop/restart operation.
- * @param newDetail the new detail for the start/stop/restart operation.
- */
- private synchronized void updateProgress(final Message summary,
- final Message newDetail)
- {
- if (lastDetail == null)
- {
- lastDetail = newDetail;
- }
- else
- {
- lastDetail = new MessageBuilder(lastDetail)
- .append(newDetail).toMessage();
- }
- lastSummary = summary;
- }
-
- /**
- * This method is used to update the progress dialog.
- *
- * We are receiving notifications from the installer and uninstaller (this
- * class is a ProgressListener). However if we send lots of notifications
- * updating the progress panel every time we get a progress update can result
- * of a lot of flickering. So the idea here is to have a minimal time between
- * 2 updates of the progress dialog (specified by UPDATE_PERIOD).
- */
- private void runProgressUpdater()
- {
- progressUpdater = new Thread()
- {
- public void run()
- {
- try
- {
- Message lastDisplayedSummary = null;
- Message lastDisplayedDetail = null;
- while (true)
- {
- if (lastSummary != null)
- {
- if (lastSummary != lastDisplayedSummary)
- {
- lastDisplayedSummary = lastSummary;
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- getProgressDialog().setSummary(lastSummary);
- }
- });
- }
- }
-
- if (lastDetail != null)
- {
- if (lastDetail != lastDisplayedDetail)
- {
- lastDisplayedDetail = lastDetail;
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- getProgressDialog().setDetails(lastDetail);
- }
- });
- }
- }
-
- try
- {
- Thread.sleep(UPDATE_PERIOD);
- } catch (Exception ex)
- {
- }
- }
- } catch (Throwable t)
- {
- // Bug
- t.printStackTrace();
- }
- }
- };
- progressUpdater.start();
- }
-
- /**
- * Returns the formatted representation of the text that is the summary of the
- * installation process (the one that goes in the UI next to the progress
- * bar).
- * @param text the source text from which we want to get the formatted
- * representation
- * @return the formatted representation of an error for the given text.
- */
- private Message getFormattedSummary(Message text)
- {
- return formatter.getFormattedSummary(text);
- }
-
- /**
- * Returns the formatted representation of a success message for a given text.
- * @param text the source text from which we want to get the formatted
- * representation.
- * @return the formatted representation of an success message for the given
- * text.
- */
- private Message getFormattedSuccess(Message text)
- {
- return formatter.getFormattedSuccess(text);
- }
-
- /**
- * Returns the formatted representation of an error for a given text.
- * @param text the source text from which we want to get the formatted
- * representation
- * @return the formatted representation of an error for the given text.
- */
- private Message getFormattedError(Message text)
- {
- return formatter.getFormattedError(text, false);
- }
-
- /**
- * Returns the formatted representation of an error for a given text.
- * @param text the source text from which we want to get the formatted
- * representation
- * @return the formatted representation of an error for the given text.
- */
- private Message getFormattedError(Message text, boolean applyMargin)
- {
- return formatter.getFormattedError(text, applyMargin);
- }
-
- /**
- * Returns the formatted representation of a log error message for a given
- * text.
- * @param text the source text from which we want to get the formatted
- * representation
- * @return the formatted representation of a log error message for the given
- * text.
- */
- private Message getFormattedLogError(Message text)
- {
- return formatter.getFormattedLogError(text);
- }
-
- /**
- * Returns the formatted representation of a log message for a given text.
- * @param text the source text from which we want to get the formatted
- * representation
- * @return the formatted representation of a log message for the given text.
- */
- private Message getFormattedLog(Message text)
- {
- return formatter.getFormattedLog(text);
- }
-
- /**
- * Returns the line break formatted.
- * @return the line break formatted.
- */
- private Message getLineBreak()
- {
- return formatter.getLineBreak();
- }
-
- /**
- * Returns the task separator formatted.
- * @return the task separator formatted.
- */
- private Message getTaskSeparator()
- {
- return formatter.getTaskSeparator();
- }
-
- /**
- * Returns the formatted representation of a progress message for a given
- * text with a line feed at the end.
- * @param text the source text from which we want to get the formatted
- * representation
- * @return the formatted representation of a progress message for the given
- * text.
- */
- private Message getFormattedProgressWithLineBreak(Message text) {
- return new MessageBuilder(text).append(getLineBreak()).toMessage();
- }
-
- /**
- * This class is used to read the standard error and standard output of the
- * Stop/Start process.
- *
- * When a new log message is found notifies the progress listeners of it. If
- * an error occurs it also notifies the listeners.
- *
- */
- private class ProgressReader
- {
- private boolean isFirstLine;
- private Message errorMsg;
-
- /**
- * The protected constructor.
- * @param reader the BufferedReader of the stop process.
- * @param isError a boolean indicating whether the BufferedReader
- * corresponds to the standard error or to the standard output.
- * @param isStart a boolean indicating whether we are starting or stopping
- * the server.
- */
- public ProgressReader(final BufferedReader reader, final boolean isError,
- final boolean isStart)
- {
- final MessageDescriptor.Arg0 errorTag =
- isError ? INFO_ERROR_READING_ERROROUTPUT :
- INFO_ERROR_READING_OUTPUT;
-
- isFirstLine = true;
-
- Thread t = new Thread(new Runnable()
- {
- public void run()
- {
- try
- {
- String line = reader.readLine();
- while (line != null)
- {
- MessageBuilder buf = new MessageBuilder();
- if (!isFirstLine)
- {
- buf.append(formatter.getLineBreak());
- }
- if (isError)
- {
- buf.append(getFormattedLogError(Message.raw(line)));
- } else
- {
- buf.append(getFormattedLog(Message.raw(line)));
- }
- Message summary = isStart?
- getFormattedSummary(INFO_SUMMARY_STARTING.get()):
- getFormattedSummary(INFO_SUMMARY_STOPPING.get());
- updateProgress(summary, buf.toMessage());
- isFirstLine = false;
-
- line = reader.readLine();
- }
- } catch (IOException ioe)
- {
- errorMsg = Utils.getThrowableMsg(errorTag.get(), ioe);
-
- } catch (Throwable t)
- {
- errorMsg = Utils.getThrowableMsg(errorTag.get(), t);
- }
- }
- });
- t.start();
- }
-
- public Message getErrorMessage()
- {
- return errorMsg;
- }
- }
-
- /**
- * Displays a confirmation dialog asking the user whether to stop the server
- * or not.
- * @return <CODE>true</CODE> if the server confirms that (s)he wants to stop
- * the server and <CODE>false</CODE> otherwise.
- */
- private boolean confirmStop()
- {
- return Utilities.displayConfirmation(getStatusPanelDialog(),
- INFO_CONFIRM_STOP_MESSAGE.get(),
- INFO_CONFIRM_STOP_TITLE.get());
- }
-
- /**
- * Displays a confirmation dialog asking the user whether to restart the
- * server or not.
- * @return <CODE>true</CODE> if the server confirms that (s)he wants to
- * restart the server and <CODE>false</CODE> otherwise.
- */
- private boolean confirmRestart()
- {
- return Utilities.displayConfirmation(getStatusPanelDialog(),
- INFO_CONFIRM_RESTART_MESSAGE.get(),
- INFO_CONFIRM_RESTART_TITLE.get());
- }
-
- /**
- * Returns whether the user provided LDAP authentication or not.
- * @return <CODE>true</CODE> if the server provided LDAP authentication and
- * <CODE>false</CODE> otherwise.
- */
- private boolean isAuthenticated()
- {
- return serverStatusPooler.isAuthenticated();
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelLauncher.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelLauncher.java
deleted file mode 100644
index 1375b89..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelLauncher.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.guitools.statuspanel;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.PrintStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.opends.guitools.statuspanel.StatusCli.ErrorReturnCode;
-import org.opends.messages.Message;
-import org.opends.quicksetup.util.Utils;
-import org.opends.quicksetup.Installation;
-import org.opends.server.util.ServerConstants;
-import org.opends.server.util.StaticUtils;
-import org.opends.server.util.args.ArgumentException;
-import org.opends.server.util.args.ArgumentParser;
-import org.opends.server.util.args.BooleanArgument;
-
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
-
-/**
- * This class is called by the control panel command lines to launch the
- * control panel of the Directory Server.
- *
- */
-public class StatusPanelLauncher
-{
- static private ArgumentParser argParser;
-
- /** Prefix for log files. */
- static public final String LOG_FILE_PREFIX = "opends-status-";
-
- /** Suffix for log files. */
- static public final String LOG_FILE_SUFFIX = ".log";
-
- static private final Logger LOG =
- Logger.getLogger(StatusPanelLauncher.class.getName());
-
- /**
- * The main method which is called by the control panel command lines.
- * @param args the arguments passed by the command lines.
- */
- public static void main(String[] args)
- {
- try {
- StatusLog.initLogFileHandler(
- File.createTempFile(LOG_FILE_PREFIX, LOG_FILE_SUFFIX));
- } catch (Throwable t) {
- System.err.println("Unable to initialize log");
- t.printStackTrace();
- }
-
- argParser = new ArgumentParser(StatusPanelLauncher.class.getName(),
- INFO_STATUS_PANEL_LAUNCHER_USAGE_DESCRIPTION.get(), false);
- BooleanArgument showUsage;
- String scriptName;
- if (Utils.isWindows()) {
- scriptName = Installation.WINDOWS_STATUSPANEL_FILE_NAME;
- } else {
- scriptName = Installation.UNIX_STATUSPANEL_FILE_NAME;
- }
- if (System.getProperty(ServerConstants.PROPERTY_SCRIPT_NAME) == null)
- {
- System.setProperty(ServerConstants.PROPERTY_SCRIPT_NAME, scriptName);
- }
- try
- {
- showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
- argParser.addArgument(showUsage);
- argParser.setUsageArgument(showUsage);
- }
- catch (Throwable t)
- {
- System.err.println("ERROR: "+t);
- t.printStackTrace();
- }
-
-// Validate user provided data
- try
- {
- argParser.parseArguments(args);
- }
- catch (ArgumentException ae)
- {
- Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
- System.err.println(message);
- System.out.println(Message.raw(argParser.getUsage()));
-
- System.exit(ErrorReturnCode.ERROR_PARSING_ARGS.getReturnCode());
- }
- if (!argParser.usageOrVersionDisplayed())
- {
- int exitCode = launchGuiStatusPanel(args);
- if (exitCode != 0)
- {
- String logFileName = null;
- if (StatusLog.getLogFile() != null)
- {
- logFileName = StatusLog.getLogFile().toString();
- }
- if (logFileName != null)
- {
- System.err.println(StaticUtils.wrapText(
- ERR_STATUS_PANEL_LAUNCHER_GUI_LAUNCH_FAILED_DETAILS.get(
- logFileName),
- Utils.getCommandLineMaxLineWidth()));
- }
- else
- {
- System.err.println(StaticUtils.wrapText(
- ERR_STATUS_PANEL_LAUNCHER_GUI_LAUNCH_FAILED.get(),
- Utils.getCommandLineMaxLineWidth()));
- }
- System.exit(exitCode);
- }
- }
- }
-
- /**
- * Launches the graphical status panel. It is launched in a
- * different thread that the main thread because if we have a problem with the
- * graphical system (for instance the DISPLAY environment variable is not
- * correctly set) the native libraries will call exit. However if we launch
- * this from another thread, the thread will just be killed.
- *
- * This code also assumes that if the call to SplashWindow.main worked (and
- * the splash screen was displayed) we will never get out of it (we will call
- * a System.exit() when we close the graphical status dialog).
- *
- * @params String[] args the arguments used to call the SplashWindow main
- * method
- * @return 0 if everything worked fine, or 1 if we could not display properly
- * the SplashWindow.
- */
- private static int launchGuiStatusPanel(final String[] args)
- {
- final int[] returnValue = { -1 };
- Thread t = new Thread(new Runnable()
- {
- public void run()
- {
- try
- {
- // Setup MacOSX native menu bar before AWT is loaded.
- Utils.setMacOSXMenuBar(INFO_STATUSPANEL_DIALOG_TITLE.get());
- SplashScreen.main(args);
- returnValue[0] = 0;
- }
- catch (Throwable t)
- {
- if (StatusLog.isInitialized())
- {
- LOG.log(Level.WARNING, "Error launching GUI: "+t);
- StringBuilder buf = new StringBuilder();
- while (t != null)
- {
- StackTraceElement[] stack = t.getStackTrace();
- for (int i = 0; i < stack.length; i++)
- {
- buf.append(stack[i].toString()+"\n");
- }
-
- t = t.getCause();
- if (t != null)
- {
- buf.append("Root cause:\n");
- }
- }
- LOG.log(Level.WARNING, buf.toString());
- }
- }
- }
- });
- /*
- * This is done to avoid displaying the stack that might occur if there are
- * problems with the display environment.
- */
- PrintStream printStream = System.err;
- System.setErr(new EmptyPrintStream());
- t.start();
- try
- {
- t.join();
- }
- catch (InterruptedException ie)
- {
- /* An error occurred, so the return value will be -1. We got nothing to
- do with this exception. */
- }
- System.setErr(printStream);
- return returnValue[0];
- }
-
- /**
- * This class is used to avoid displaying the error message related to display
- * problems that we might have when trying to display the SplashWindow.
- *
- */
- static class EmptyPrintStream extends PrintStream
- {
- /**
- * Default constructor.
- *
- */
- public EmptyPrintStream()
- {
- super(new ByteArrayOutputStream(), true);
- }
-
- /**
- * {@inheritDoc}
- */
- public void println(String msg)
- {
- }
- }
-}
-
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/ServerStatusChangeEvent.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/ServerStatusChangeEvent.java
deleted file mode 100644
index dbbe756..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/ServerStatusChangeEvent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel.event;
-
-import org.opends.guitools.statuspanel.ServerStatusDescriptor;
-
-/**
- * The event that is generated when there is a change of the server status.
- *
- * In the current implementation this events are generated by the
- * ServerStatusPooler object and are notified to the objects implementing
- * ServerStatusChangeListener (StatusPanelController object).
- *
- */
-public class ServerStatusChangeEvent
-{
- private ServerStatusDescriptor statusDescriptor;
-
- /**
- * Constructor of the ServerStatusChangeEvent.
- * @param statusDescriptor the object describing the current server status
- * and configuration.
- */
- public ServerStatusChangeEvent(ServerStatusDescriptor statusDescriptor)
- {
- this.statusDescriptor = statusDescriptor;
- }
-
- /**
- * Returns the ServerStatusDescriptor object.
- * @return the ServerStatusDescriptor object.
- */
- public ServerStatusDescriptor getStatusDescriptor()
- {
- return statusDescriptor;
- }
-
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/ServerStatusChangeListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/ServerStatusChangeListener.java
deleted file mode 100644
index 6fa4b4c..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/ServerStatusChangeListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel.event;
-
-/**
- * Interface that implement the objects that want to receive notifications of
- * changes in the server status.
- *
- */
-public interface ServerStatusChangeListener
-{
- /**
- * Method called when an change in the server status occurs.
- *
- * @param ev the ServerStatusChangeEvent describing the change that occurred
- * in the server status.
- */
- public void statusChanged(ServerStatusChangeEvent ev);
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/StatusPanelButtonListener.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/StatusPanelButtonListener.java
deleted file mode 100644
index 570bc82..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/StatusPanelButtonListener.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel.event;
-
-/**
- * Interface used to be notified of the button actions that can occur in the
- * StatusPanelDialog.
- *
- * In the current implementation StatusPanelController implements this
- * interface.
- *
- */
-public interface StatusPanelButtonListener
-{
- /**
- * Method called when user clicks on Authenticate button.
- */
- public void authenticateClicked();
- /**
- * Method called when user clicks on Start button.
- */
- public void startClicked();
- /**
- * Method called when user clicks on Restart button.
- */
- public void restartClicked();
- /**
- * Method called when user clicks on Stop button.
- */
- public void stopClicked();
- /**
- * Method called when user clicks on Quit button.
- */
- public void quitClicked();
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/package-info.java
deleted file mode 100644
index 9d91353..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/event/package-info.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-
-
-/**
- * Defines the specific event and listener classes that are you used in the
- * code of the status and status-panel command lines.
- *
- */
-package org.opends.guitools.statuspanel.event;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/package-info.java
deleted file mode 100644
index b899798..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/package-info.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-
-
-/**
- * Defines the main classes that are you used by the status and status-panel
- * command lines. This includes the command line launchers, the classes
- * that are used to retrieve the data, the data models that represent the
- * status data.
- * */
-package org.opends.guitools.statuspanel;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/DatabasesTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/DatabasesTableModel.java
deleted file mode 100644
index 99d05c8..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/DatabasesTableModel.java
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2007-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel.ui;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.swing.table.AbstractTableModel;
-
-import org.opends.guitools.statuspanel.BaseDNDescriptor;
-import org.opends.quicksetup.ui.SortableTableModel;
-
-import org.opends.messages.Message;
-import static org.opends.messages.AdminToolMessages.*;
-
-/**
- * This class is just a table model used to display the information about
- * databases in a table.
- *
- */
-public class DatabasesTableModel extends AbstractTableModel
-implements SortableTableModel, Comparator<BaseDNDescriptor>
-{
- private static final long serialVersionUID = -5650762484071136983L;
- private HashSet<BaseDNDescriptor> data = new HashSet<BaseDNDescriptor>();
- private ArrayList<BaseDNDescriptor> dataArray =
- new ArrayList<BaseDNDescriptor>();
- private final Message[] COLUMN_NAMES = {
- INFO_BASEDN_COLUMN.get(),
- INFO_BACKENDID_COLUMN.get(),
- INFO_NUMBER_ENTRIES_COLUMN.get(),
- INFO_REPLICATED_COLUMN.get(),
- INFO_MISSING_CHANGES_COLUMN.get(),
- INFO_AGE_OF_OLDEST_MISSING_CHANGE_COLUMN.get()
- };
- private int sortColumn = 0;
- private boolean sortAscending = true;
- private boolean displayReplicationInformation;
-
- /**
- * Constructor for this table model.
- * @param displayReplicationInformation whether to display replication
- * monitoring information or not.
- */
- public DatabasesTableModel(boolean displayReplicationInformation)
- {
- this.displayReplicationInformation = displayReplicationInformation;
- }
-
- /**
- * Sets the data for this table model.
- * @param newData the data for this table model.
- */
- public void setData(Set<BaseDNDescriptor> newData)
- {
- if (!newData.equals(data))
- {
- data.clear();
- data.addAll(newData);
- dataArray.clear();
- TreeSet<BaseDNDescriptor> sortedSet =
- new TreeSet<BaseDNDescriptor>(this);
- sortedSet.addAll(data);
- dataArray.addAll(sortedSet);
- fireTableDataChanged();
- }
- }
-
- /**
- * Updates the table model contents and sorts its contents depending on the
- * sort options set by the user.
- */
- public void forceResort()
- {
- dataArray.clear();
- TreeSet<BaseDNDescriptor> sortedSet =
- new TreeSet<BaseDNDescriptor>(this);
- sortedSet.addAll(data);
- dataArray.addAll(sortedSet);
- fireTableDataChanged();
- }
-
- /**
- * Comparable implementation.
- * @param desc1 the first replica descriptor to compare.
- * @param desc2 the second replica descriptor to compare.
- * @return 1 if according to the sorting options set by the user the first
- * database descriptor must be put before the second descriptor, 0 if they
- * are equivalent in terms of sorting and -1 if the second descriptor must
- * be put before the first descriptor.
- */
- public int compare(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
- {
- int result = 0;
- if (sortColumn == 0)
- {
- result = compareDns(desc1, desc2);
-
- if (result == 0)
- {
- result = compareBackendIDs(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareEntries(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareRepl(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareMissingChanges(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareAgeOfOldestMissingChange(desc1, desc2);
- }
- }
-
- if (sortColumn == 1)
- {
- result = compareBackendIDs(desc1, desc2);
-
- if (result == 0)
- {
- result = compareDns(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareEntries(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareRepl(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareMissingChanges(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareAgeOfOldestMissingChange(desc1, desc2);
- }
- }
- else if (sortColumn == 2)
- {
- result = compareEntries(desc1, desc2);
-
- if (result == 0)
- {
- result = compareBackendIDs(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareDns(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareRepl(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareMissingChanges(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareAgeOfOldestMissingChange(desc1, desc2);
- }
- }
- else if (sortColumn == 3)
- {
- result = compareRepl(desc1, desc2);
-
- if (result == 0)
- {
- result = compareBackendIDs(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareDns(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareEntries(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareMissingChanges(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareAgeOfOldestMissingChange(desc1, desc2);
- }
- }
- else if (sortColumn == 4)
- {
- result = compareMissingChanges(desc1, desc2);
-
- if (result == 0)
- {
- result = compareBackendIDs(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareDns(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareEntries(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareRepl(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareAgeOfOldestMissingChange(desc1, desc2);
- }
- }
- else if (sortColumn == 5)
- {
- result = compareAgeOfOldestMissingChange(desc1, desc2);
-
- if (result == 0)
- {
- result = compareBackendIDs(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareDns(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareEntries(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareRepl(desc1, desc2);
- }
-
- if (result == 0)
- {
- result = compareMissingChanges(desc1, desc2);
- }
- }
-
- if (!sortAscending)
- {
- result = -result;
- }
-
- return result;
- }
-
- /**
- * {@inheritDoc}
- */
- public int getColumnCount()
- {
- return displayReplicationInformation ? 6 : 4;
- }
-
- /**
- * {@inheritDoc}
- */
- public int getRowCount()
- {
- return dataArray.size();
- }
-
- /**
- * {@inheritDoc}
- */
- public Object getValueAt(int row, int col)
- {
- Object v;
- BaseDNDescriptor desc = dataArray.get(row);
- if (col == 0)
- {
- v = desc.getUnescapedDn();
- }
- else if (col == 1)
- {
- v = desc.getDatabase().getBackendID();
- }
- else if (col == 2)
- {
- v = getValueForEntries(desc);
- }
- else if (col == 3)
- {
- v = getStringForReplState(desc);
- }
- else if (col == 4)
- {
- v = getValueForMissingChanges(desc);
- }
- else if (col == 5)
- {
- v = getValueForOldestMissingChange(desc);
- }
- else
- {
- throw new IllegalArgumentException("Invalid col number: "+col);
- }
- return v;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getColumnName(int col) {
- return COLUMN_NAMES[col].toString();
- }
-
- /**
- * Returns whether the sort is ascending or descending.
- * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
- * otherwise.
- */
- public boolean isSortAscending()
- {
- return sortAscending;
- }
-
- /**
- * Sets whether to sort ascending of descending.
- * @param sortAscending whether to sort ascending or descending.
- */
- public void setSortAscending(boolean sortAscending)
- {
- this.sortAscending = sortAscending;
- }
-
- /**
- * Returns the column index used to sort.
- * @return the column index used to sort.
- */
- public int getSortColumn()
- {
- return sortColumn;
- }
-
- /**
- * Sets the column index used to sort.
- * @param sortColumn column index used to sort..
- */
- public void setSortColumn(int sortColumn)
- {
- this.sortColumn = sortColumn;
- }
-
- /*
- * Several comparison methods to be able to sort the table model.
- */
- private int compareBackendIDs(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
- {
- return desc1.getDatabase().getBackendID().compareTo(
- desc2.getDatabase().getBackendID());
- }
-
- private int compareEntries(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
- {
- int n1 = desc1.getEntries();
- int n2 = desc2.getEntries();
- return compareIntegers(n1, n2);
- }
-
- private int compareIntegers(int n1, int n2)
- {
- if (n1 == n2)
- {
- return 0;
- }
- if (n1 > n2)
- {
- return 1;
- }
- return -1;
- }
-
- private int compareLongs(long n1, long n2)
- {
- if (n1 == n2)
- {
- return 0;
- }
- if (n1 > n2)
- {
- return 1;
- }
- return -1;
- }
-
- private int compareDns(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
- {
- return desc1.getUnescapedDn().compareTo(desc2.getUnescapedDn());
- }
-
- private int compareRepl(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
- {
- return (String.valueOf(desc1.getType()).compareTo(
- String.valueOf(desc2.getType())));
- }
-
- private int compareMissingChanges(BaseDNDescriptor desc1,
- BaseDNDescriptor desc2)
- {
- return compareIntegers(desc1.getMissingChanges(),
- desc2.getMissingChanges());
- }
-
- private int compareAgeOfOldestMissingChange(BaseDNDescriptor desc1,
- BaseDNDescriptor desc2)
- {
- return compareLongs(desc1.getAgeOfOldestMissingChange(),
- desc2.getAgeOfOldestMissingChange());
- }
-
- /**
- * Returns the Object describing the number of entries of a given Base DN.
- * The Object will be an Integer.
- * @param rep the Base DN object to handle.
- * @return the Object describing the number of entries of a given Base DN.
- */
- private Object getValueForEntries(BaseDNDescriptor rep)
- {
- return rep.getEntries();
- }
-
- /**
- * Returns the Object describing the number of missing changes of a given Base
- * DN. The Object will be a String unless the base DN is
- * replicated and we could not find a valid value (in this case we return
- * an Integer with the invalid value).
- * @param rep the Base DN object to handle.
- * @return the Object describing the number of missing changes of
- * a given Base DN.
- */
- private Object getValueForMissingChanges(BaseDNDescriptor rep)
- {
- Object v;
- if (rep.getType() == BaseDNDescriptor.Type.REPLICATED)
- {
- v = new Integer(rep.getMissingChanges());
- }
- else
- {
- v = INFO_NOT_APPLICABLE_LABEL.get();
- }
- return v;
- }
-
- /**
- * Returns the Object describing the age of oldest missing change of
- * a given Base DN. The Object will be a String unless the base DN is
- * replicated and we could not find a valid value (in this case we return
- * an Integer with the invalid value).
- * @param rep the Base DN object to handle.
- * @return the Object describing the age of oldest missing change of
- * a given Base DN.
- */
- private Object getValueForOldestMissingChange(BaseDNDescriptor rep)
- {
- Object v;
- if (rep.getType() == BaseDNDescriptor.Type.REPLICATED)
- {
- long age = rep.getAgeOfOldestMissingChange();
- if (age > 0)
- {
- Date date = new Date(age);
- v = date.toString();
- }
- else
- {
- // Not available
- v = new Integer(-1);
- }
- }
- else
- {
- v = INFO_NOT_APPLICABLE_LABEL.get();
- }
- return v;
- }
-
- /**
- * Returns the localized String describing the replication state of
- * a given Base DN.
- * @param rep the Base DN object to handle.
- * @return the localized String describing the replication state of
- * a given Base DN.
- */
- private Message getStringForReplState(BaseDNDescriptor rep)
- {
- Message s;
- if (rep.getType() == BaseDNDescriptor.Type.REPLICATED)
- {
- s = INFO_BASEDN_REPLICATED_LABEL.get();
- }
- else
- {
- s = INFO_BASEDN_NOT_REPLICATED_LABEL.get();
- }
- return s;
- }
-
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/ListenersTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/ListenersTableModel.java
deleted file mode 100644
index b8825fb..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/ListenersTableModel.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel.ui;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.swing.table.AbstractTableModel;
-
-import org.opends.guitools.statuspanel.ListenerDescriptor;
-import org.opends.quicksetup.ui.SortableTableModel;
-
-import org.opends.messages.Message;
-import static org.opends.messages.AdminToolMessages.*;
-
-/**
- * This class is just a table model used to display the information about
- * listeners in a table.
- *
- */
-public class ListenersTableModel extends AbstractTableModel
-implements SortableTableModel, Comparator<ListenerDescriptor>
-{
- private static final long serialVersionUID = -1121308303480078376L;
- private HashSet<ListenerDescriptor> data = new HashSet<ListenerDescriptor>();
- private ArrayList<ListenerDescriptor> dataArray =
- new ArrayList<ListenerDescriptor>();
- private final Message[] COLUMN_NAMES = {
- INFO_ADDRESS_PORT_COLUMN.get(),
- INFO_PROTOCOL_COLUMN.get(),
- INFO_STATE_COLUMN.get()
- };
- private int sortColumn = 0;
- private boolean sortAscending = true;
-
- /**
- * Sets the data for this table model.
- * @param newData the data for this table model.
- */
- public void setData(Set<ListenerDescriptor> newData)
- {
- if (!newData.equals(data))
- {
- data.clear();
- data.addAll(newData);
- dataArray.clear();
- TreeSet<ListenerDescriptor> sortedSet =
- new TreeSet<ListenerDescriptor>(this);
- sortedSet.addAll(data);
- dataArray.addAll(sortedSet);
- fireTableDataChanged();
- }
- }
-
- /**
- * Updates the table model contents and sorts its contents depending on the
- * sort options set by the user.
- */
- public void forceResort()
- {
- dataArray.clear();
- TreeSet<ListenerDescriptor> sortedSet =
- new TreeSet<ListenerDescriptor>(this);
- sortedSet.addAll(data);
- dataArray.addAll(sortedSet);
- fireTableDataChanged();
- }
-
- /**
- * Comparable implementation.
- * @param desc1 the first listener descriptor to compare.
- * @param desc2 the second listener descriptor to compare.
- * @return 1 if according to the sorting options set by the user the first
- * listener descriptor must be put before the second descriptor, 0 if they
- * are equivalent in terms of sorting and -1 if the second descriptor must
- * be put before the first descriptor.
- */
- public int compare(ListenerDescriptor desc1, ListenerDescriptor desc2)
- {
- int result = 0;
- if (sortColumn == 0)
- {
- result = desc1.getAddressPort().compareTo(desc2.getAddressPort());
-
- if (result == 0)
- {
- result = desc1.getProtocolDescription().compareTo(
- desc2.getProtocolDescription());
- }
-
- if (result == 0)
- {
- result = desc1.getState().compareTo(desc2.getState());
- }
- }
- else if (sortColumn == 1)
- {
- result = desc1.getProtocolDescription().compareTo(
- desc2.getProtocolDescription());
-
- if (result == 0)
- {
- result = desc1.getAddressPort().compareTo(desc2.getAddressPort());
- }
-
- if (result == 0)
- {
- result = desc1.getState().compareTo(desc2.getState());
- }
- }
- else
- {
- result = desc1.getState().compareTo(desc2.getState());
-
- if (result == 0)
- {
- result = desc1.getAddressPort().compareTo(desc2.getAddressPort());
- }
-
- if (result == 0)
- {
- result = desc1.getProtocolDescription().compareTo(
- desc2.getProtocolDescription());
- }
- }
-
- if (!sortAscending)
- {
- result = -result;
- }
-
- return result;
- }
-
- /**
- * {@inheritDoc}
- */
- public int getColumnCount()
- {
- return 3;
- }
-
- /**
- * {@inheritDoc}
- */
- public int getRowCount()
- {
- return dataArray.size();
- }
-
- /**
- * {@inheritDoc}
- */
- public Object getValueAt(int row, int col)
- {
- Object v;
- ListenerDescriptor desc = dataArray.get(row);
- if (col == 0)
- {
- v = desc.getAddressPort();
- }
- else if (col == 1)
- {
- v = desc.getProtocolDescription().toString();
- }
- else
- {
- switch (desc.getState())
- {
- case ENABLED:
- v = INFO_ENABLED_LABEL.get().toString();
- break;
-
- case DISABLED:
- v = INFO_DISABLED_LABEL.get().toString();
- break;
-
- case UNKNOWN:
- v = INFO_UNKNOWN_LABEL.get().toString();
- break;
-
- default:
- throw new IllegalStateException("Unknown state: "+desc.getState());
- }
- }
- return v;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getColumnName(int col) {
- return COLUMN_NAMES[col].toString();
- }
-
-
- /**
- * Returns whether the sort is ascending or descending.
- * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
- * otherwise.
- */
- public boolean isSortAscending()
- {
- return sortAscending;
- }
-
- /**
- * Sets whether to sort ascending of descending.
- * @param sortAscending whether to sort ascending or descending.
- */
- public void setSortAscending(boolean sortAscending)
- {
- this.sortAscending = sortAscending;
- }
-
- /**
- * Returns the column index used to sort.
- * @return the column index used to sort.
- */
- public int getSortColumn()
- {
- return sortColumn;
- }
-
- /**
- * Sets the column index used to sort.
- * @param sortColumn column index used to sort..
- */
- public void setSortColumn(int sortColumn)
- {
- this.sortColumn = sortColumn;
- }
-
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/LoginDialog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/LoginDialog.java
deleted file mode 100644
index 771ca0a..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/LoginDialog.java
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel.ui;
-
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.net.URI;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.naming.NamingException;
-import javax.naming.directory.SearchControls;
-import javax.naming.ldap.InitialLdapContext;
-import javax.swing.Box;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-import javax.swing.text.JTextComponent;
-
-import org.opends.admin.ads.util.ApplicationTrustManager;
-import org.opends.guitools.statuspanel.ConfigException;
-import org.opends.guitools.statuspanel.ConfigFromFile;
-import org.opends.guitools.statuspanel.ConnectionProtocolPolicy;
-import org.opends.quicksetup.Installation;
-import org.opends.quicksetup.Step;
-import org.opends.quicksetup.UserDataCertificateException;
-import org.opends.quicksetup.event.MinimumSizeComponentListener;
-import org.opends.quicksetup.ui.CertificateDialog;
-import org.opends.quicksetup.ui.UIFactory;
-import org.opends.quicksetup.ui.Utilities;
-import org.opends.quicksetup.util.BackgroundTask;
-import org.opends.quicksetup.util.UIKeyStore;
-import org.opends.quicksetup.util.Utils;
-
-import org.opends.messages.Message;
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.messages.QuickSetupMessages.*;
-
-/**
- * This class is a dialog that appears when the user must provide authentication
- * to connect to the Directory Server in order to be able to display
- * information.
- */
-public class LoginDialog extends JDialog
-{
- private static final long serialVersionUID = 9049606381601152500L;
-
- private JFrame parent;
-
- private JLabel lDn;
- private JLabel lPwd;
-
- private JTextField tfDn;
- private JTextField tfPwd;
-
- private JButton cancelButton;
- private JButton okButton;
-
- private boolean isCancelled = true;
-
- private ConfigFromFile conf;
-
- private ApplicationTrustManager trustManager;
- private ConnectionProtocolPolicy policy;
-
- private String usedUrl;
-
- private static final Logger LOG =
- Logger.getLogger(LoginDialog.class.getName());
-
- /**
- * Constructor of the LoginDialog.
- * @param parent the parent frame for this dialog.
- * @param trustManager the trust manager to be used for the secure
- * connections.
- * @param policy the configuration policy to be used (whether we prefer the
- * most secure, the less secure, a specific method...).
- */
- public LoginDialog(JFrame parent, ApplicationTrustManager trustManager,
- ConnectionProtocolPolicy policy)
- {
- super(parent);
- setTitle(INFO_LOGIN_DIALOG_TITLE.get().toString());
- this.parent = parent;
- getContentPane().add(createPanel());
- if (trustManager == null)
- {
- throw new IllegalArgumentException("The trustmanager cannot be null.");
- }
- this.trustManager = trustManager;
- this.policy = policy;
- /*
- * TODO: find a way to calculate this dynamically. This is done to avoid
- * all the text in a single line.
- */
- setPreferredSize(new Dimension(500, 250));
- addComponentListener(new MinimumSizeComponentListener(this, 500, 250));
- getRootPane().setDefaultButton(okButton);
- }
-
- /**
- * Returns <CODE>true</CODE> if the user clicked on cancel and
- * <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if the user clicked on cancel and
- * <CODE>false</CODE> otherwise.
- */
- public boolean isCancelled()
- {
- return isCancelled;
- }
-
- /**
- * {@inheritDoc}
- *
- */
- public void setVisible(boolean visible)
- {
- cancelButton.setEnabled(true);
- okButton.setEnabled(true);
- if (visible)
- {
- tfPwd.setText("");
- tfPwd.requestFocusInWindow();
- UIFactory.setTextStyle(lDn,
- UIFactory.TextStyle.PRIMARY_FIELD_VALID);
- UIFactory.setTextStyle(lPwd,
- UIFactory.TextStyle.PRIMARY_FIELD_VALID);
- getRootPane().setDefaultButton(okButton);
- }
- super.setVisible(visible);
- }
-
- /**
- * Returns the Directory Manager DN provided by the user.
- * @return the Directory Manager DN provided by the user.
- */
- public String getDirectoryManagerDn()
- {
- return tfDn.getText();
- }
-
- /**
- * Returns the Directory Manager password provided by the user.
- * @return the Directory Manager password provided by the user.
- */
- public String getDirectoryManagerPwd()
- {
- return tfPwd.getText();
- }
-
- /**
- * Creates and returns the panel of the dialog.
- * @return the panel of the dialog.
- */
- private JPanel createPanel()
- {
- JPanel p1 = new JPanel(new GridBagLayout());
- p1.setBackground(UIFactory.CURRENT_STEP_PANEL_BACKGROUND);
- p1.setBorder(UIFactory.DIALOG_PANEL_BORDER);
- GridBagConstraints gbc = new GridBagConstraints();
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- gbc.anchor = GridBagConstraints.NORTHWEST;
- gbc.insets = UIFactory.getCurrentStepPanelInsets();
- p1.add(UIFactory.makeJLabel(UIFactory.IconType.INFORMATION_LARGE, null,
- UIFactory.TextStyle.NO_STYLE), gbc);
- gbc.weightx = 1.0;
- gbc.fill = GridBagConstraints.BOTH;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.insets.left = 0;
- Message msg = INFO_LOGIN_DIALOG_MSG.get();
-
- JTextComponent textPane =
- UIFactory.makeHtmlPane(msg, UIFactory.INSTRUCTIONS_FONT);
- textPane.setOpaque(false);
- textPane.setEditable(false);
- p1.add(textPane, gbc);
-
- JPanel p2 = new JPanel(new GridBagLayout());
- p2.setOpaque(false);
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- gbc.weightx = 0.0;
- gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- gbc.insets.left = 0;
- gbc.anchor = GridBagConstraints.WEST;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- lDn = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- INFO_LOGIN_DN_LABEL.get(),
- UIFactory.TextStyle.PRIMARY_FIELD_VALID);
- p2.add(lDn, gbc);
- gbc.weightx = 1.0;
- gbc.insets.left = UIFactory.LEFT_INSET_PRIMARY_FIELD;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- tfDn = UIFactory.makeJTextField(
- Message.raw(getProposedAdministrativeUserDn()),
- INFO_LOGIN_DN_TOOLTIP.get(),
- UIFactory.DN_FIELD_SIZE, UIFactory.TextStyle.TEXTFIELD);
- p2.add(tfDn, gbc);
-
- gbc.insets.top = 0;
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- gbc.weightx = 0.0;
- gbc.insets.left = 0;
- lPwd = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- INFO_LOGIN_PWD_LABEL.get(),
- UIFactory.TextStyle.PRIMARY_FIELD_VALID);
- p2.add(lPwd, gbc);
- gbc.insets.left = UIFactory.LEFT_INSET_PRIMARY_FIELD;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- JPanel p3 = new JPanel(new GridBagLayout());
- p3.setOpaque(false);
- tfPwd = UIFactory.makeJPasswordField(null,
- INFO_LOGIN_PWD_TOOLTIP.get(),
- UIFactory.PASSWORD_FIELD_SIZE, UIFactory.TextStyle.PASSWORD_FIELD);
- gbc.weightx = 1.0;
- p2.add(p3, gbc);
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 0.2;
- p3.add(tfPwd, gbc);
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 0.8;
- p3.add(Box.createHorizontalGlue(), gbc);
-
-
- gbc.fill = GridBagConstraints.HORIZONTAL;
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- gbc.weightx = 0.0;
- gbc.insets.top = 0;
- p1.add(Box.createHorizontalGlue(), gbc);
- gbc.weightx = 1.0;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- p1.add(p2, gbc);
- gbc.weighty = 1.0;
- gbc.fill = GridBagConstraints.VERTICAL;
- p1.add(Box.createVerticalGlue(), gbc);
-
- JPanel buttonPanel = new JPanel(new GridBagLayout());
- buttonPanel.setOpaque(false);
- gbc.fill = GridBagConstraints.HORIZONTAL;
- gbc.weightx = 1.0;
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.gridwidth = 3;
- buttonPanel.add(Box.createHorizontalGlue(), gbc);
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- gbc.fill = GridBagConstraints.NONE;
- gbc.weightx = 0.0;
- okButton =
- UIFactory.makeJButton(INFO_OK_BUTTON_LABEL.get(),
- INFO_LOGIN_OK_BUTTON_TOOLTIP.get());
- buttonPanel.add(okButton, gbc);
- okButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ev)
- {
- okClicked();
- }
- });
-
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.insets.left = UIFactory.HORIZONTAL_INSET_BETWEEN_BUTTONS;
- cancelButton =
- UIFactory.makeJButton(INFO_CANCEL_BUTTON_LABEL.get(),
- INFO_LOGIN_CANCEL_BUTTON_TOOLTIP.get());
- buttonPanel.add(cancelButton, gbc);
- cancelButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ev)
- {
- cancelClicked();
- }
- });
-
- JPanel p = new JPanel(new GridBagLayout());
- p.setBackground(UIFactory.DEFAULT_BACKGROUND);
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.fill = GridBagConstraints.BOTH;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1.0;
- gbc.weighty = 1.0;
- p.add(p1, gbc);
- gbc.weighty = 0.0;
- gbc.insets = UIFactory.getButtonsPanelInsets();
- p.add(buttonPanel, gbc);
-
- return p;
- }
-
- /**
- * Returns the first administrative user DN found in the configuration file.
- * @return the first administrative user DN found in the configuration file.
- */
- private String getProposedAdministrativeUserDn()
- {
- String dn;
- Set<String> dns = getAdministrativeUserDns();
- if (dns.size() > 0)
- {
- dn = dns.iterator().next();
- }
- else
- {
- dn = null;
- }
- return dn;
- }
-
- /**
- * Method called when user clicks on cancel.
- *
- */
- private void cancelClicked()
- {
- isCancelled = true;
- dispose();
- }
-
- /**
- * Method called when user clicks on OK.
- *
- */
- private void okClicked()
- {
- BackgroundTask worker = new BackgroundTask()
- {
- public Object processBackgroundTask() throws NamingException,
- ConfigException
- {
- Boolean isServerRunning = Boolean.TRUE;
- InitialLdapContext ctx = null;
- try
- {
- String ldapUrl = getConfig().getLDAPURL();
- String startTlsUrl = getConfig().getStartTLSURL();
- String ldapsUrl = getConfig().getLDAPSURL();
- switch (policy)
- {
- case USE_STARTTLS:
- if (startTlsUrl != null)
- {
- usedUrl = startTlsUrl;
- ctx = Utils.createStartTLSContext(startTlsUrl, tfDn.getText(),
- tfPwd.getText(), Utils.getDefaultLDAPTimeout(), null,
- getTrustManager(), null);
- }
- else
- {
- throw new ConfigException(
- ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_LDAPS:
- if (ldapsUrl != null)
- {
- usedUrl = ldapsUrl;
- ctx = Utils.createLdapsContext(ldapsUrl, tfDn.getText(),
- tfPwd.getText(), Utils.getDefaultLDAPTimeout(), null,
- getTrustManager());
- }
- else
- {
- throw new ConfigException(
- ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_LDAP:
- if (ldapUrl != null)
- {
- usedUrl = ldapUrl;
- ctx = Utils.createLdapContext(ldapUrl, tfDn.getText(),
- tfPwd.getText(), Utils.getDefaultLDAPTimeout(), null);
- }
- else
- {
- throw new ConfigException(
- ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_MOST_SECURE_AVAILABLE:
- if (ldapsUrl != null)
- {
- usedUrl = ldapsUrl;
- ctx = Utils.createLdapsContext(ldapsUrl, tfDn.getText(),
- tfPwd.getText(), Utils.getDefaultLDAPTimeout(), null,
- getTrustManager());
- }
- else if (startTlsUrl != null)
- {
- usedUrl = startTlsUrl;
- ctx = Utils.createStartTLSContext(startTlsUrl, tfDn.getText(),
- tfPwd.getText(), Utils.getDefaultLDAPTimeout(), null,
- getTrustManager(), null);
- }
- else if (ldapUrl != null)
- {
- usedUrl = ldapUrl;
- ctx = Utils.createLdapContext(ldapUrl, tfDn.getText(),
- tfPwd.getText(), Utils.getDefaultLDAPTimeout(), null);
- }
- else
- {
- throw new ConfigException(
- ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- case USE_LESS_SECURE_AVAILABLE:
- if (ldapUrl != null)
- {
- usedUrl = ldapUrl;
- ctx = Utils.createLdapContext(ldapUrl, tfDn.getText(),
- tfPwd.getText(), Utils.getDefaultLDAPTimeout(), null);
- }
- else if (ldapsUrl != null)
- {
- usedUrl = ldapsUrl;
- ctx = Utils.createLdapsContext(ldapsUrl, tfDn.getText(),
- tfPwd.getText(), Utils.getDefaultLDAPTimeout(), null,
- getTrustManager());
- }
- else
- {
- throw new ConfigException(
- ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- }
- break;
- default:
- throw new IllegalStateException("Unknown connection policy: "+
- policy);
- }
-
- /*
- * Search for the config to check that it is the directory manager.
- */
- SearchControls searchControls = new SearchControls();
- searchControls.setCountLimit(1);
- searchControls.setSearchScope(
- SearchControls. OBJECT_SCOPE);
- searchControls.setReturningAttributes(
- new String[] {"dn"});
- ctx.search("cn=config", "objectclass=*", searchControls);
-
- } catch (NamingException ne)
- {
- if (isServerRunning())
- {
- throw ne;
- }
- isServerRunning = Boolean.FALSE;
- } catch (ConfigException e)
- {
- throw e;
- } catch (IllegalStateException ise)
- {
- throw ise;
-
- } catch (Throwable t)
- {
- throw new IllegalStateException("Unexpected throwable.", t);
- }
- finally
- {
- if (ctx != null)
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- }
- return isServerRunning;
- }
-
- public void backgroundTaskCompleted(Object returnValue,
- Throwable throwable)
- {
- if (throwable != null)
- {
- LOG.log(Level.INFO, "Error connecting: " + throwable, throwable);
- if (Utils.isCertificateException(throwable))
- {
- ApplicationTrustManager.Cause cause =
- trustManager.getLastRefusedCause();
-
- LOG.log(Level.INFO, "Certificate exception cause: "+cause);
- UserDataCertificateException.Type excType = null;
- if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
- {
- excType = UserDataCertificateException.Type.NOT_TRUSTED;
- }
- else if (cause ==
- ApplicationTrustManager.Cause.HOST_NAME_MISMATCH)
- {
- excType = UserDataCertificateException.Type.HOST_NAME_MISMATCH;
- }
- else
- {
- Message msg = Utils.getThrowableMsg(
- INFO_ERROR_CONNECTING_TO_LOCAL.get(), throwable);
- displayError(msg, INFO_ERROR_TITLE.get());
- }
-
- if (excType != null)
- {
- String h;
- int p;
- try
- {
- URI uri = new URI(usedUrl);
- h = uri.getHost();
- p = uri.getPort();
- }
- catch (Throwable t)
- {
- LOG.log(Level.WARNING,
- "Error parsing ldap url of ldap url.", t);
- h = INFO_NOT_AVAILABLE_LABEL.get().toString();
- p = -1;
- }
- UserDataCertificateException udce =
- new UserDataCertificateException(Step.REPLICATION_OPTIONS,
- INFO_CERTIFICATE_EXCEPTION.get(h, String.valueOf(p)),
- throwable, h, p,
- getTrustManager().getLastRefusedChain(),
- getTrustManager().getLastRefusedAuthType(), excType);
-
- handleCertificateException(udce);
- }
- }
- else if (throwable instanceof NamingException)
- {
- boolean dnInvalid = false;
- boolean pwdInvalid = false;
-
- String dn = tfDn.getText();
- ArrayList<Message> possibleCauses = new ArrayList<Message>();
- if ("".equals(dn.trim()))
- {
- dnInvalid = true;
- possibleCauses.add(INFO_EMPTY_DIRECTORY_MANAGER_DN.get());
- }
- else if (!Utils.isDn(dn))
- {
- dnInvalid = true;
- possibleCauses.add(INFO_NOT_A_DIRECTORY_MANAGER_DN.get());
- }
- else
- {
- boolean found = false;
- Iterator<String> it = getAdministrativeUserDns().iterator();
- while (it.hasNext() && !found)
- {
- found = Utils.areDnsEqual(dn, it.next());
- }
- if (!found)
- {
- dnInvalid = true;
- possibleCauses.add(
- INFO_NOT_A_DIRECTORY_MANAGER_IN_CONFIG.get());
- }
- }
-
- if ("".equals(tfPwd.getText()))
- {
- pwdInvalid = true;
- possibleCauses.add(INFO_EMPTY_PWD.get());
- }
- if (dnInvalid)
- {
- UIFactory.setTextStyle(lDn,
- UIFactory.TextStyle.PRIMARY_FIELD_INVALID);
- }
- else
- {
- UIFactory.setTextStyle(lDn,
- UIFactory.TextStyle.PRIMARY_FIELD_VALID);
- pwdInvalid = true;
- }
- if (pwdInvalid)
- {
- UIFactory.setTextStyle(lPwd,
- UIFactory.TextStyle.PRIMARY_FIELD_INVALID);
- }
- else
- {
- UIFactory.setTextStyle(lPwd,
- UIFactory.TextStyle.PRIMARY_FIELD_VALID);
- }
- if (possibleCauses.size() > 0)
- {
- displayError(
- ERR_CANNOT_CONNECT_TO_LOGIN_WITH_CAUSE.get(
- Utils.getMessageFromCollection(possibleCauses, "\n")),
- INFO_ERROR_TITLE.get());
- }
- else
- {
- // Generic message
- displayError(
- ERR_CANNOT_CONNECT_WITH_ADS_CREDENTIALS_WITHOUT_CAUSE.get(),
- INFO_ERROR_TITLE.get());
- }
- }
- else if (throwable instanceof ConfigException)
- {
- displayError(((ConfigException)throwable).getMessageObject(),
- INFO_ERROR_TITLE.get());
- }
- else
- {
- // This is a bug
- throwable.printStackTrace();
- displayError(
- Utils.getThrowableMsg(INFO_BUG_MSG.get(), throwable),
- INFO_ERROR_TITLE.get());
- }
- cancelButton.setEnabled(true);
- okButton.setEnabled(true);
- } else
- {
- if (Boolean.FALSE.equals(returnValue))
- {
- displayInformationMessage(
- INFO_LOGIN_DIALOG_SERVER_NOT_RUNNING_MSG.get(),
- INFO_LOGIN_DIALOG_SERVER_NOT_RUNNING_TITLE.get());
- }
- UIFactory.setTextStyle(lDn,
- UIFactory.TextStyle.PRIMARY_FIELD_VALID);
- UIFactory.setTextStyle(lPwd,
- UIFactory.TextStyle.PRIMARY_FIELD_VALID);
- isCancelled = false;
- cancelButton.setEnabled(true);
- okButton.setEnabled(true);
- dispose();
- }
- }
- };
- cancelButton.setEnabled(false);
- okButton.setEnabled(false);
- worker.startBackgroundTask();
- }
-
- /**
- * Displays an error message dialog.
- *
- * @param msg
- * the error message.
- * @param title
- * the title for the dialog.
- */
- private void displayError(Message msg, Message title)
- {
- Utilities.displayError(parent, msg, title);
- toFront();
-
- }
-
- /**
- * Displays an information message dialog.
- *
- * @param msg
- * the information message.
- * @param title
- * the title for the dialog.
- */
- private void displayInformationMessage(Message msg, Message title)
- {
- Utilities.displayInformationMessage(parent, msg, title);
- toFront();
- }
-
- /**
- * Returns the administrative user DNs found in the config file.
- * @return the administrative user DNs found in the config file.
- */
- private Set<String> getAdministrativeUserDns()
- {
- return getConfig().getAdministrativeUsers();
- }
-
- /**
- * Returns whether the server is running or not.
- * @return <CODE>true</CODE> if the server is running and <CODE>false</CODE>
- * otherwise.
- */
- private boolean isServerRunning()
- {
- return Installation.getLocal().getStatus().isServerRunning();
- }
-
- /**
- * Returns the ConfigFromFile object that contains the configuration read
- * from the config file.
- * @return the ConfigFromFile object that contains the configuration read
- * from the config file.
- */
- private ConfigFromFile getConfig()
- {
- if (conf == null)
- {
- conf = new ConfigFromFile();
- conf.readConfiguration();
- }
- return conf;
- }
-
- /**
- * Returns the trust manager that can be used to establish secure connections.
- * @return the trust manager that can be used to establish secure connections.
- */
- private ApplicationTrustManager getTrustManager()
- {
- return trustManager;
- }
-
- /**
- * Displays a dialog asking the user to accept a certificate if the user
- * accepts it, we update the trust manager and simulate a click on "OK" to
- * re-check the authentication.
- * This method assumes that we are being called from the event thread.
- */
- private void handleCertificateException(UserDataCertificateException ce)
- {
- CertificateDialog dlg = new CertificateDialog(parent, ce);
- dlg.pack();
- dlg.setVisible(true);
- if (dlg.getUserAnswer() !=
- CertificateDialog.ReturnType.NOT_ACCEPTED)
- {
- X509Certificate[] chain = ce.getChain();
- String authType = ce.getAuthType();
- String host = ce.getHost();
-
- if ((chain != null) && (authType != null) && (host != null))
- {
- LOG.log(Level.INFO, "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()
- {
- public void run()
- {
- okClicked();
- }
- });
- }
- else
- {
- if (chain == null)
- {
- LOG.log(Level.WARNING,
- "The chain is null for the UserDataCertificateException");
- }
- if (authType == null)
- {
- LOG.log(Level.WARNING,
- "The auth type is null for the UserDataCertificateException");
- }
- if (host == null)
- {
- LOG.log(Level.WARNING,
- "The host is null for the UserDataCertificateException");
- }
- }
- }
- if (dlg.getUserAnswer() ==
- CertificateDialog.ReturnType.ACCEPTED_PERMANENTLY)
- {
- X509Certificate[] chain = ce.getChain();
- if (chain != null)
- {
- try
- {
- UIKeyStore.acceptCertificate(chain);
- }
- catch (Throwable t)
- {
- LOG.log(Level.WARNING, "Error accepting certificate: "+t, t);
- }
- }
- }
- }
-
- /**
- * Method written for testing purposes.
- * @param args the arguments to be passed to the test program.
- */
- public static void main(String[] args)
- {
- try
- {
- // UIFactory.initialize();
- LoginDialog dlg = new LoginDialog(new JFrame(),
- new ApplicationTrustManager(null),
- ConnectionProtocolPolicy.USE_MOST_SECURE_AVAILABLE);
- dlg.pack();
- dlg.setVisible(true);
- } catch (Exception ex)
- {
- ex.printStackTrace();
- }
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/StatusPanelDialog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/StatusPanelDialog.java
deleted file mode 100644
index a7ae210..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/StatusPanelDialog.java
+++ /dev/null
@@ -1,1638 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.guitools.statuspanel.ui;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JEditorPane;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JToolTip;
-import javax.swing.Popup;
-import javax.swing.PopupFactory;
-import javax.swing.SwingConstants;
-import javax.swing.ToolTipManager;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.JTableHeader;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
-
-import org.opends.guitools.statuspanel.BaseDNDescriptor;
-import org.opends.guitools.statuspanel.DatabaseDescriptor;
-import org.opends.guitools.statuspanel.ListenerDescriptor;
-import org.opends.guitools.statuspanel.ServerStatusDescriptor;
-import org.opends.guitools.statuspanel.event.StatusPanelButtonListener;
-import org.opends.quicksetup.event.MinimumSizeComponentListener;
-import org.opends.quicksetup.ui.UIFactory;
-import org.opends.quicksetup.ui.Utilities;
-import org.opends.quicksetup.util.HtmlProgressMessageFormatter;
-import org.opends.quicksetup.util.Utils;
-
-import org.opends.messages.Message;
-import static org.opends.messages.AdminToolMessages.*;
-import static org.opends.messages.QuickSetupMessages.*;
-
-/**
- * This panel is used to display basic information about the server status.
- *
- */
-public class StatusPanelDialog extends JFrame
-{
- private static final long serialVersionUID = 6832422469078074151L;
-
- private ServerStatusDescriptor lastDescriptor;
- private ServerStatusDescriptor lastPackDescriptor;
-
- private HashSet<StatusPanelButtonListener> listeners =
- new HashSet<StatusPanelButtonListener>();
-
- private JButton quitButton;
- private JButton authenticateButton;
-
- private JLabel lServerStatus;
- private JLabel lCurrentConnections;
- private JLabel lHostname;
- private JLabel lAdministrativeUsers;
- private JLabel lInstallPath;
- private JLabel lOpenDSVersion;
- private JLabel lJavaVersion;
- private JLabel lDbTableEmpty;
- private JLabel lListenersTableEmpty;
- private JEditorPane lError;
-
- private JButton stopButton;
- private JButton startButton;
- private JButton restartButton;
-
- private HtmlProgressMessageFormatter formatter =
- new HtmlProgressMessageFormatter();
-
- private HashSet<JLabel> subsectionLabels = new HashSet<JLabel>();
-
- private DatabasesTableModel dbTableModelWithReplication;
- private DatabasesTableModel dbTableModelWithoutReplication;
- private JTable dbTableWithReplication;
- private JTable dbTableWithoutReplication;
-
- private ListenersTableModel listenersTableModel;
- private JTable listenersTable;
-
- private InstantaneousToolTipManager toolTipManager;
-
- private final Message NOT_AVAILABLE = INFO_NOT_AVAILABLE_LABEL.get();
-
- /**
- * ProgressDialog constructor.
- */
- public StatusPanelDialog()
- {
- super();
- setTitle(INFO_STATUSPANEL_DIALOG_TITLE.get().toString());
- createLayout();
-
- addWindowListener(new WindowAdapter()
- {
- public void windowClosing(WindowEvent e)
- {
- quitClicked();
- }
- });
- setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
- Utilities.setFrameIcon(this);
- }
-
- /**
- * Packs and displays this dialog.
- *
- */
- public void packAndShow()
- {
- pack();
- int packedMinWidth = (int) getPreferredSize().getWidth();
- int packedMinHeight = (int) getPreferredSize().getHeight();
-
- int minWidth = Math.min(packedMinWidth, getMaximalWidth());
- int minHeight = Math.min(packedMinHeight, getMaximalHeight());
-
- addComponentListener(new MinimumSizeComponentListener(this,
- minWidth, minHeight));
- if ((minWidth != packedMinWidth) || (minHeight != packedMinHeight))
- {
- setPreferredSize(new Dimension(minWidth, minHeight));
- pack();
- }
- Utilities.centerOnScreen(this);
-
- lastPackDescriptor = lastDescriptor;
-
- setVisible(true);
- }
-
- /**
- * Updates the contents displaying with what is specified in the provided
- * ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- public void updateContents(ServerStatusDescriptor desc)
- {
- lastDescriptor = desc;
-
- updateStatusContents(desc);
-
- updateCurrentConnectionContents(desc);
-
- updateHostnameContents(desc);
-
- updateAdministrativeUserContents(desc);
-
- updateInstallPathContents(desc);
-
- updateVersionContents(desc);
-
- updateJavaVersionContents(desc);
-
- updateListenerContents(desc);
-
- updateDatabaseContents(desc);
-
- updateErrorContents(desc);
-
- boolean mustRepack;
- if (lastPackDescriptor == null)
- {
- mustRepack = true;
- }
- else
- {
- boolean lastSmall =
- (lastPackDescriptor.getListeners().size() == 0) &&
- (lastPackDescriptor.getDatabases().size() == 0);
- boolean currentBig =
- (lastDescriptor.getListeners().size() > 0) ||
- (lastDescriptor.getDatabases().size() > 0);
- mustRepack = lastSmall && currentBig;
- }
- if (mustRepack)
- {
- pack();
- int packedMinWidth = (int) getPreferredSize().getWidth();
- int packedMinHeight = (int) getPreferredSize().getHeight();
-
- int minWidth = Math.min(packedMinWidth, getMaximalWidth());
- int minHeight = Math.min(packedMinHeight, getMaximalHeight());
-
- if ((minWidth != packedMinWidth) || (minHeight != packedMinHeight))
- {
- setPreferredSize(new Dimension(minWidth, minHeight));
- pack();
- }
-
- lastPackDescriptor = lastDescriptor;
- }
- }
-
- /**
- * Adds a StatusPanelButtonListener that will be notified of clicks in
- * the control panel dialog.
- * @param l the StatusPanelButtonListener to be added.
- */
- public void addButtonListener(StatusPanelButtonListener l)
- {
- listeners.add(l);
- }
-
- /**
- * Removes a StatusPanelButtonListener.
- * @param l the StatusPanelButtonListener to be removed.
- */
- public void removeButtonListener(StatusPanelButtonListener l)
- {
- listeners.remove(l);
- }
-
- /**
- * Sets the enable state of the authenticate button.
- * @param enable whether to enable or disable the button.
- */
- public void setAuthenticateButtonEnabled(boolean enable)
- {
- authenticateButton.setEnabled(enable);
- }
-
- /**
- * Sets the enable state of the start button.
- * @param enable whether to enable or disable the button.
- */
- public void setStartButtonEnabled(boolean enable)
- {
- startButton.setEnabled(enable);
- }
-
- /**
- * Sets the enable state of the stop button.
- * @param enable whether to enable or disable the button.
- */
- public void setStopButtonEnabled(boolean enable)
- {
- stopButton.setEnabled(enable);
- }
-
- /**
- * Sets the enable state of the restart button.
- * @param enable whether to enable or disable the button.
- */
- public void setRestartButtonEnabled(boolean enable)
- {
- restartButton.setEnabled(enable);
- }
-
- /**
- * Creates the layout of the dialog panel.
- *
- */
- private void createLayout()
- {
- toolTipManager = new InstantaneousToolTipManager();
-
- /* Create input panel. */
- JPanel inputPanel = new JPanel(new GridBagLayout());
- inputPanel.setOpaque(false);
-
- GridBagConstraints gbc = new GridBagConstraints();
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.anchor = GridBagConstraints.NORTHWEST;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1.0;
- gbc.fill = GridBagConstraints.HORIZONTAL;
-
- gbc.insets.bottom = UIFactory.BOTTOM_INSET_PROGRESS_BAR;
- lError = UIFactory.makeHtmlPane(Message.EMPTY, UIFactory.PROGRESS_FONT);
- lError.setOpaque(false);
- lError.setEditable(false);
- inputPanel.add(lError, gbc);
- gbc.insets.bottom = 0;
- gbc.insets.top = UIFactory.TOP_INSET_CONTROL_PANEL_SUBSECTION -
- UIFactory.getCurrentStepPanelInsets().top;
- inputPanel.add(createServerStatusPanel(), gbc);
-
- inputPanel.add(createServerDetailsPanel(), gbc);
-
- inputPanel.add(createListenersPanel(), gbc);
-
- inputPanel.add(createDatabasesPanel(), gbc);
-
- gbc.weighty = 1.0;
- inputPanel.add(Box.createVerticalGlue(), gbc);
-
- /* Create buttons panel */
- JPanel buttonsPanel = new JPanel(new GridBagLayout());
- buttonsPanel.setOpaque(false);
- gbc.fill = GridBagConstraints.HORIZONTAL;
- gbc.anchor = GridBagConstraints.SOUTH;
- gbc.gridwidth = 4;
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.insets.left = UIFactory.getCurrentStepPanelInsets().left;
- buttonsPanel.add(UIFactory.makeJLabel(UIFactory.IconType.OPENDS_SMALL,
- null, UIFactory.TextStyle.NO_STYLE), gbc);
- gbc.weightx = 1.0;
- gbc.gridwidth--;
- gbc.insets.left = 0;
- buttonsPanel.add(Box.createHorizontalGlue(), gbc);
-
- authenticateButton =
- UIFactory.makeJButton(INFO_AUTHENTICATE_BUTTON_LABEL.get(),
- INFO_AUTHENTICATE_STATUS_PANEL_BUTTON_TOOLTIP.get());
- gbc.fill = GridBagConstraints.NONE;
- gbc.weightx = 0.0;
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- buttonsPanel.add(authenticateButton, gbc);
- authenticateButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ev)
- {
- authenticateClicked();
- }
- });
-
- quitButton =
- UIFactory.makeJButton(INFO_QUIT_BUTTON_LABEL.get(),
- INFO_QUIT_STATUS_PANEL_BUTTON_TOOLTIP.get());
- gbc.fill = GridBagConstraints.NONE;
- gbc.weightx = 0.0;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.insets.left = UIFactory.HORIZONTAL_INSET_BETWEEN_BUTTONS;
- buttonsPanel.add(quitButton, gbc);
- quitButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ev)
- {
- quitClicked();
- }
- });
-
- JPanel p = new JPanel(new GridBagLayout());
- p.setBackground(UIFactory.DEFAULT_BACKGROUND);
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.fill = GridBagConstraints.BOTH;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1.0;
- gbc.weighty = 1.0;
- JPanel p1 = new JPanel(new GridBagLayout());
- p1.setBorder(UIFactory.DIALOG_PANEL_BORDER);
- p1.setBackground(UIFactory.CURRENT_STEP_PANEL_BACKGROUND);
- gbc.insets = UIFactory.getCurrentStepPanelInsets();
- p1.add(inputPanel, gbc);
- gbc.insets = UIFactory.getEmptyInsets();
- p.add(new JScrollPane(p1), gbc);
- gbc.weighty = 0.0;
- gbc.insets = UIFactory.getButtonsPanelInsets();
- p.add(buttonsPanel, gbc);
-
- getContentPane().add(p);
-
- /* Update the preferred sizes of labels */
- int maxWidth = 0;
- for (JLabel l : subsectionLabels)
- {
- int width = (int) l.getPreferredSize().getWidth();
-
- if (maxWidth <= width)
- {
- maxWidth = width;
- }
- }
-
- for (JLabel l : subsectionLabels)
- {
- int height = (int) l.getPreferredSize().getHeight();
-
- l.setPreferredSize(new Dimension(maxWidth, height));
- }
- }
-
-
- /**
- * Method called when start button is clicked.
- */
- private void startClicked()
- {
- for (StatusPanelButtonListener l : listeners)
- {
- l.startClicked();
- }
- }
-
- /**
- * Method called when quit button is clicked.
- */
- private void quitClicked()
- {
- for (StatusPanelButtonListener l : listeners)
- {
- l.quitClicked();
- }
- }
-
- /**
- * Method called when authenticate button is clicked.
- */
- private void authenticateClicked()
- {
- for (StatusPanelButtonListener l : listeners)
- {
- l.authenticateClicked();
- }
- }
-
- /**
- * Method called when stop button is clicked.
- */
- private void stopClicked()
- {
- for (StatusPanelButtonListener l : listeners)
- {
- l.stopClicked();
- }
- }
-
- /**
- * Method called when restart button is clicked.
- */
- private void restartClicked()
- {
- for (StatusPanelButtonListener l : listeners)
- {
- l.restartClicked();
- }
- }
-
- /**
- * Method usedto create the subsection title with two decoration icons
- * surrounding the text.
- * @param title the title of the subsection.
- */
- private JPanel createSubsectionTitle(Message title)
- {
- JPanel p = new JPanel(new GridBagLayout());
- p.setOpaque(false);
- GridBagConstraints gbc = new GridBagConstraints();
- gbc.gridwidth = 5;
- gbc.weightx = 0.5;
- p.add(Box.createHorizontalGlue(), gbc);
- gbc.weightx = 0.0;
- gbc.gridwidth--;
- p.add(UIFactory.makeJLabel(UIFactory.IconType.SUBSECTION_LEFT, null,
- UIFactory.TextStyle.NO_STYLE), gbc);
- gbc.weightx = 0.0;
- gbc.gridwidth--;
- gbc.insets.left = UIFactory.HORIZONTAL_INSET_CONTROL_PANEL_SUBSECTION;
- JLabel l = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON, title,
- UIFactory.TextStyle.TITLE);
- l.setHorizontalAlignment(SwingConstants.CENTER);
- subsectionLabels.add(l);
- p.add(l, gbc);
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- p.add(UIFactory.makeJLabel(UIFactory.IconType.SUBSECTION_RIGHT, null,
- UIFactory.TextStyle.NO_STYLE), gbc);
- gbc.weightx = 0.5;
- gbc.insets.left = 0;
- p.add(Box.createHorizontalGlue(), gbc);
-
- return p;
- }
-
- /**
- * Creates the server status subsection panel.
- * @return the server status subsection panel.
- */
- private JPanel createServerStatusPanel()
- {
- JPanel p = new JPanel(new GridBagLayout());
- p.setOpaque(false);
- GridBagConstraints gbc = new GridBagConstraints();
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1.0;
- gbc.insets = UIFactory.getEmptyInsets();
-
- p.add(createSubsectionTitle(INFO_SERVER_STATUS_TITLE.get()), gbc);
-
- JPanel auxPanel = new JPanel(new GridBagLayout());
- auxPanel.setOpaque(false);
- gbc.anchor = GridBagConstraints.WEST;
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- auxPanel.add(UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- INFO_SERVER_STATUS_LABEL.get(),
- UIFactory.TextStyle.PRIMARY_FIELD_VALID),
- gbc);
-
- JPanel statusPanel = new JPanel(new GridBagLayout());
- statusPanel.setOpaque(false);
- gbc.gridwidth = 6;
- gbc.weightx = 0.0;
- lServerStatus = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- NOT_AVAILABLE, UIFactory.TextStyle.READ_ONLY);
- statusPanel.add(lServerStatus, gbc);
- toolTipManager.registerComponent(lServerStatus);
- gbc.gridwidth--;
-
- stopButton = UIFactory.makeJButton(INFO_STOP_BUTTON_LABEL.get(),
- INFO_STOP_BUTTON_TOOLTIP.get());
- stopButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ev)
- {
- stopClicked();
- }
- });
- gbc.insets.left = UIFactory.LEFT_INSET_PRIMARY_FIELD;
- statusPanel.add(stopButton, gbc);
-
- gbc.gridwidth--;
- gbc.insets.left = UIFactory.HORIZONTAL_INSET_BETWEEN_BUTTONS;
- startButton = UIFactory.makeJButton(INFO_START_BUTTON_LABEL.get(),
- INFO_START_BUTTON_TOOLTIP.get());
- statusPanel.add(startButton, gbc);
- startButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ev)
- {
- startClicked();
- }
- });
-
- gbc.gridwidth--;
- restartButton = UIFactory.makeJButton(INFO_RESTART_BUTTON_LABEL.get(),
- INFO_RESTART_BUTTON_TOOLTIP.get());
- restartButton.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ev)
- {
- restartClicked();
- }
- });
- statusPanel.add(restartButton, gbc);
-
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- gbc.weightx = 1.0;
- gbc.insets.left = 0;
- statusPanel.add(Box.createHorizontalGlue(), gbc);
-
- int maxButtonHeight = 0;
- maxButtonHeight = Math.max(maxButtonHeight,
- (int)startButton.getPreferredSize().getHeight());
- maxButtonHeight = Math.max(maxButtonHeight,
- (int)restartButton.getPreferredSize().getHeight());
- maxButtonHeight = Math.max(maxButtonHeight,
- (int)stopButton.getPreferredSize().getHeight());
-
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 0.0;
- statusPanel.add(Box.createVerticalStrut(maxButtonHeight), gbc);
-
- gbc.weightx = 1.0;
- gbc.insets.left = UIFactory.LEFT_INSET_PRIMARY_FIELD;
- auxPanel.add(statusPanel, gbc);
-
- gbc.insets.left = 0;
- gbc.weightx = 0.0;
- gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- auxPanel.add(UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- INFO_CONNECTIONS_LABEL.get(), UIFactory.TextStyle.PRIMARY_FIELD_VALID),
- gbc);
- lCurrentConnections = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- NOT_AVAILABLE, UIFactory.TextStyle.READ_ONLY);
- toolTipManager.registerComponent(lCurrentConnections);
-
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.insets.left = UIFactory.LEFT_INSET_PRIMARY_FIELD;
- auxPanel.add(lCurrentConnections, gbc);
-
- gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- gbc.insets.left = 0;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1.0;
- p.add(auxPanel, gbc);
-
- return p;
- }
-
- /**
- * Creates the server details subsection panel.
- * @return the server details subsection panel.
- */
- private JPanel createServerDetailsPanel()
- {
- JPanel p = new JPanel(new GridBagLayout());
- p.setOpaque(false);
- GridBagConstraints gbc = new GridBagConstraints();
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1.0;
-
- p.add(createSubsectionTitle(INFO_SERVER_DETAILS_TITLE.get()), gbc);
-
- JPanel auxPanel = new JPanel(new GridBagLayout());
- auxPanel.setOpaque(false);
- gbc.anchor = GridBagConstraints.NORTHWEST;
- gbc.weightx = 0.0;
- JLabel[] leftLabels =
- {
- UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- INFO_HOSTNAME_LABEL.get(),
- UIFactory.TextStyle.PRIMARY_FIELD_VALID),
- UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- INFO_ADMINISTRATIVE_USERS_LABEL.get(),
- UIFactory.TextStyle.PRIMARY_FIELD_VALID),
- UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- INFO_INSTALLATION_PATH_LABEL.get(),
- UIFactory.TextStyle.PRIMARY_FIELD_VALID),
- UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- INFO_OPENDS_VERSION_LABEL.get(),
- UIFactory.TextStyle.PRIMARY_FIELD_VALID),
- UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- INFO_JAVA_VERSION_LABEL.get(),
- UIFactory.TextStyle.PRIMARY_FIELD_VALID)
- };
-
- lHostname = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- NOT_AVAILABLE,
- UIFactory.TextStyle.READ_ONLY);
- lAdministrativeUsers = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- NOT_AVAILABLE, UIFactory.TextStyle.READ_ONLY);
- lInstallPath = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- NOT_AVAILABLE, UIFactory.TextStyle.READ_ONLY);
- lOpenDSVersion = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- NOT_AVAILABLE, UIFactory.TextStyle.READ_ONLY);
- lJavaVersion = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- NOT_AVAILABLE, UIFactory.TextStyle.READ_ONLY);
-
- JLabel[] rightLabels =
- {
- lHostname, lAdministrativeUsers, lInstallPath, lOpenDSVersion,
- lJavaVersion
- };
-
-
- for (int i=0; i<leftLabels.length; i++)
- {
- gbc.insets.left = 0;
- if (i != 0)
- {
- gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- }
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- auxPanel.add(leftLabels[i], gbc);
-
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.insets.left = UIFactory.LEFT_INSET_PRIMARY_FIELD;
- auxPanel.add(rightLabels[i], gbc);
- toolTipManager.registerComponent(rightLabels[i]);
- }
-
- gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- gbc.insets.left = 0;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1.0;
- p.add(auxPanel, gbc);
-
- return p;
- }
-
- /**
- * Creates the server listeners subsection panel.
- * @return the server listeners subsection panel.
- */
- private JPanel createListenersPanel()
- {
- JPanel p = new JPanel(new GridBagLayout());
- p.setOpaque(false);
- GridBagConstraints gbc = new GridBagConstraints();
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1.0;
- gbc.fill = GridBagConstraints.HORIZONTAL;
-
- p.add(createSubsectionTitle(INFO_LISTENERS_TITLE.get()), gbc);
-
- listenersTableModel = new ListenersTableModel();
- listenersTable = UIFactory.makeSortableTable(listenersTableModel,
- new ListenersCellRenderer(),
- UIFactory.makeHeaderRenderer());
- listenersTable.setFocusable(false);
-
- gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- p.add(listenersTable.getTableHeader(), gbc);
- int height = (int)
- listenersTable.getTableHeader().getPreferredSize().getHeight();
- listenersTable.setRowHeight(height);
- gbc.insets.top = 0;
- p.add(listenersTable, gbc);
-
- lListenersTableEmpty = UIFactory.makeJLabel(
- UIFactory.IconType.NO_ICON, Message.EMPTY,
- UIFactory.TextStyle.PRIMARY_FIELD_VALID);
- gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- p.add(lListenersTableEmpty, gbc);
- lListenersTableEmpty.setVisible(false);
- toolTipManager.registerComponent(lListenersTableEmpty);
- return p;
- }
-
- /**
- * Creates the server databases subsection panel.
- * @return the server databases subsection panel.
- */
- private JPanel createDatabasesPanel()
- {
- JPanel p = new JPanel(new GridBagLayout());
- p.setOpaque(false);
- GridBagConstraints gbc = new GridBagConstraints();
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1.0;
- gbc.fill = GridBagConstraints.HORIZONTAL;
-
- p.add(createSubsectionTitle(INFO_DATABASES_TITLE.get()), gbc);
-
- dbTableModelWithReplication = new DatabasesTableModel(true);
- dbTableModelWithoutReplication = new DatabasesTableModel(false);
- dbTableWithReplication =
- UIFactory.makeSortableTable(dbTableModelWithReplication,
- new DatabasesCellRenderer(),
- UIFactory.makeHeaderRenderer());
- dbTableWithReplication.setFocusable(false);
- toolTipManager.registerComponent(dbTableWithReplication);
- dbTableWithoutReplication =
- UIFactory.makeSortableTable(dbTableModelWithoutReplication,
- new DatabasesCellRenderer(),
- UIFactory.makeHeaderRenderer());
- dbTableWithoutReplication.setFocusable(false);
- toolTipManager.registerComponent(dbTableWithoutReplication);
-
- gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- p.add(dbTableWithReplication.getTableHeader(), gbc);
- int height = (int)dbTableWithReplication.getTableHeader().
- getPreferredSize().getHeight();
- dbTableWithReplication.setRowHeight(height);
- gbc.insets.top = 0;
- p.add(dbTableWithReplication, gbc);
-
- gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- p.add(dbTableWithoutReplication.getTableHeader(), gbc);
- height = (int)dbTableWithoutReplication.getTableHeader().
- getPreferredSize().getHeight();
- dbTableWithoutReplication.setRowHeight(height);
- gbc.insets.top = 0;
- p.add(dbTableWithoutReplication, gbc);
- dbTableWithoutReplication.setVisible(false);
-
- gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- lDbTableEmpty = UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- Message.EMPTY, UIFactory.TextStyle.PRIMARY_FIELD_VALID);
- p.add(lDbTableEmpty, gbc);
- lDbTableEmpty.setVisible(false);
- toolTipManager.registerComponent(lDbTableEmpty);
- return p;
- }
-
-
- /**
- * Sets the not available text to a label and associates a help icon and
- * a tooltip explaining that the data is not available because the server is
- * down.
- * @param l the label.
- */
- private void setNotAvailableBecauseServerIsDown(JLabel l)
- {
- l.setText(NOT_AVAILABLE.toString());
- l.setIcon(UIFactory.getImageIcon(UIFactory.IconType.HELP_SMALL));
- l.setToolTipText(INFO_NOT_AVAILABLE_SERVER_DOWN_TOOLTIP.get().toString());
- l.setHorizontalTextPosition(SwingConstants.LEFT);
- }
-
- /**
- * Sets the not available text to a label and associates a help icon and
- * a tooltip explaining that the data is not available because authentication
- * is required.
- * @param l the label.
- */
- private void setNotAvailableBecauseAuthenticationIsRequired(JLabel l)
- {
- l.setText(NOT_AVAILABLE.toString());
- l.setIcon(UIFactory.getImageIcon(UIFactory.IconType.HELP_SMALL));
- l.setToolTipText(
- INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_TOOLTIP.get()
- .toString());
- l.setHorizontalTextPosition(SwingConstants.LEFT);
- }
-
- /**
- * Sets the not available text to a label with no icon nor tooltip.
- * @param l the label.
- */
- private void setNotAvailable(JLabel l)
- {
- l.setText(NOT_AVAILABLE.toString());
- l.setIcon(null);
- l.setToolTipText(null);
- }
-
- /**
- * Sets the a text to a label with no icon nor tooltip.
- * @param l the label.
- */
- private void setTextValue(JLabel l, String text)
- {
- l.setText(text);
- l.setIcon(null);
- l.setToolTipText(null);
- }
-
- /**
- * Updates the status contents displaying with what is specified in the
- * provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void updateStatusContents(ServerStatusDescriptor desc)
- {
- Message status;
- switch (desc.getStatus())
- {
- case STARTED:
- status = INFO_SERVER_STARTED_LABEL.get();
- startButton.setVisible(false);
- restartButton.setVisible(true);
- stopButton.setVisible(true);
- break;
-
- case STOPPED:
- status = INFO_SERVER_STOPPED_LABEL.get();
- startButton.setVisible(true);
- restartButton.setVisible(false);
- stopButton.setVisible(false);
- break;
-
- case STARTING:
- status = INFO_SERVER_STARTING_LABEL.get();
- startButton.setVisible(false);
- restartButton.setVisible(false);
- stopButton.setVisible(false);
- break;
-
- case STOPPING:
- status = INFO_SERVER_STOPPING_LABEL.get();
- startButton.setVisible(false);
- restartButton.setVisible(false);
- stopButton.setVisible(false);
- break;
-
- case UNKNOWN:
- status = INFO_SERVER_UNKNOWN_STATUS_LABEL.get();
- startButton.setVisible(false);
- restartButton.setVisible(true);
- stopButton.setVisible(true);
- break;
-
- default:
- throw new IllegalStateException("Unknown status: "+desc.getStatus());
- }
- lServerStatus.setText(status.toString());
-
- /* Enable authenticate button only if the server is started AND we have
- * no authentication (or the authentication we have does not seem to work
- * because we get an error).
- */
- authenticateButton.setVisible(
- (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED) &&
- (!desc.isAuthenticated() || (desc.getErrorMessage() != null)));
- }
-
- /**
- * Updates the current connection contents displaying with what is specified
- * in the provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void updateCurrentConnectionContents(ServerStatusDescriptor desc)
- {
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- int nConn = desc.getOpenConnections();
- if (nConn >= 0)
- {
- setTextValue(lCurrentConnections, String.valueOf(nConn));
- }
- else
- {
- if (!desc.isAuthenticated())
- {
- setNotAvailableBecauseAuthenticationIsRequired(lCurrentConnections);
- }
- else
- {
- setNotAvailable(lCurrentConnections);
- }
- }
- }
- else
- {
- setNotAvailableBecauseServerIsDown(lCurrentConnections);
- }
- }
-
- /**
- * Updates the host name contents displaying with what is specified
- * in the provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void updateHostnameContents(ServerStatusDescriptor desc)
- {
- lHostname.setText(desc.getHostname());
- }
-
- /**
- * Updates the administrative user contents displaying with what is specified
- * in the provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void updateAdministrativeUserContents(ServerStatusDescriptor desc)
- {
- Set<String> administrators = desc.getAdministrativeUsers();
- if (administrators.size() > 0)
- {
- TreeSet<Message> ordered = new TreeSet<Message>();
- for (String name: administrators)
- {
- ordered.add(formatter.getFormattedText(Message.raw(name)));
- }
-
- setTextValue(lAdministrativeUsers,"<html>"+
- UIFactory.applyFontToHtml(
- Utils.getMessageFromCollection(ordered, "<br>").toString(),
- UIFactory.READ_ONLY_FONT));
- }
- else
- {
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- if (!desc.isAuthenticated())
- {
- setNotAvailableBecauseAuthenticationIsRequired(lAdministrativeUsers);
- }
- else
- {
- setNotAvailable(lAdministrativeUsers);
- }
- }
- else
- {
- setNotAvailable(lAdministrativeUsers);
- }
- }
- }
-
- /**
- * Updates the install path contents displaying with what is specified in the
- * provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void updateInstallPathContents(ServerStatusDescriptor desc)
- {
- File path = desc.getInstallPath();
- lInstallPath.setText(path.toString());
- }
-
- /**
- * Updates the server version contents displaying with what is specified in
- * the provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void updateVersionContents(ServerStatusDescriptor desc)
- {
- String openDSVersion = desc.getOpenDSVersion();
- lOpenDSVersion.setText(openDSVersion);
- }
-
- /**
- * Updates the java version contents displaying with what is specified in
- * the provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void updateJavaVersionContents(ServerStatusDescriptor desc)
- {
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- String javaVersion = desc.getJavaVersion();
- if (javaVersion != null)
- {
- setTextValue(lJavaVersion, javaVersion);
-
- }
- else
- {
- if (!desc.isAuthenticated())
- {
- setNotAvailableBecauseAuthenticationIsRequired(lJavaVersion);
- }
- else
- {
- setNotAvailable(lJavaVersion);
- }
- }
- }
- else
- {
- setNotAvailableBecauseServerIsDown(lJavaVersion);
- }
- }
-
- /**
- * Updates the listeners contents displaying with what is specified in
- * the provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void updateListenerContents(ServerStatusDescriptor desc)
- {
- Set<ListenerDescriptor> allListeners = desc.getListeners();
-
- Set<ListenerDescriptor> listeners = new LinkedHashSet<ListenerDescriptor>();
- for (ListenerDescriptor listener: allListeners)
- {
- if (listener.getProtocol() != ListenerDescriptor.Protocol.LDIF)
- {
- listeners.add(listener);
- }
- }
- listenersTableModel.setData(listeners);
-
- if (listenersTableModel.getRowCount() == 0)
- {
- listenersTable.setVisible(false);
- listenersTable.getTableHeader().setVisible(false);
- lListenersTableEmpty.setVisible(true);
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- if (!desc.isAuthenticated())
- {
- setNotAvailableBecauseAuthenticationIsRequired(lListenersTableEmpty);
- }
- else
- {
- setTextValue(lListenersTableEmpty,
- INFO_NO_LISTENERS_FOUND.get().toString());
- }
- }
- else
- {
- setTextValue(lListenersTableEmpty,
- INFO_NO_LISTENERS_FOUND.get().toString());
- }
- }
- else
- {
- listenersTable.setVisible(true);
- listenersTable.getTableHeader().setVisible(true);
- lListenersTableEmpty.setVisible(false);
- }
- }
-
- /**
- * Updates the databases contents displaying with what is specified in
- * the provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void updateDatabaseContents(ServerStatusDescriptor desc)
- {
- Set<BaseDNDescriptor> replicas = new HashSet<BaseDNDescriptor>();
- Set<DatabaseDescriptor> dbs = desc.getDatabases();
-
- for (DatabaseDescriptor db: dbs)
- {
- replicas.addAll(db.getBaseDns());
- }
- dbTableModelWithReplication.setData(replicas);
- dbTableModelWithoutReplication.setData(replicas);
-
- if (dbTableModelWithReplication.getRowCount() == 0)
- {
-
- dbTableWithoutReplication.setVisible(false);
- dbTableWithoutReplication.getTableHeader().setVisible(false);
- dbTableWithReplication.setVisible(false);
- dbTableWithReplication.getTableHeader().setVisible(false);
- lDbTableEmpty.setVisible(true);
- if (desc.getStatus() == ServerStatusDescriptor.ServerStatus.STARTED)
- {
- if (!desc.isAuthenticated())
- {
- setNotAvailableBecauseAuthenticationIsRequired(lDbTableEmpty);
- }
- else
- {
- setTextValue(lDbTableEmpty, INFO_NO_DBS_FOUND.get().toString());
- }
- }
- else
- {
- setTextValue(lDbTableEmpty, INFO_NO_DBS_FOUND.get().toString());
- }
- }
- else
- {
- boolean replicated = false;
- for (BaseDNDescriptor suffix: replicas)
- {
- if (suffix.getType() == BaseDNDescriptor.Type.REPLICATED)
- {
- replicated = true;
- }
- }
-
- updateTableSizes(dbTableWithoutReplication);
- updateTableSizes(dbTableWithReplication);
- dbTableWithoutReplication.setVisible(!replicated);
- dbTableWithoutReplication.getTableHeader().setVisible(!replicated);
- dbTableWithReplication.setVisible(replicated);
- dbTableWithReplication.getTableHeader().setVisible(replicated);
- lDbTableEmpty.setVisible(false);
- }
- }
-
- /**
- * Updates the error label contents displaying with what is specified in
- * the provided ServerStatusDescriptor object.
- * This method must be called from the event thread.
- * @param desc the ServerStatusDescriptor object.
- */
- private void updateErrorContents(ServerStatusDescriptor desc)
- {
- Message errorMsg = desc.getErrorMessage();
- if (errorMsg == null)
- {
- lError.setVisible(false);
- }
- else
- {
-
- lError.setVisible(true);
- lError.setText(formatter.getFormattedError(errorMsg, false).toString());
- }
- }
-
- /**
- * Updates the size of the table rows according to the size of the
- * rendered component.
- * @param table the table to handle.
- */
- private void updateTableSizes(JTable table)
- {
- updateTableColumnWidth(table);
- updateTableRowHeight(table);
-
- /*
- int totalWidth = 0;
- int colMargin = table.getColumnModel().getColumnMargin();
-
- int totalHeight = 0;
-
- TableColumn tcol = table.getColumnModel().getColumn(0);
- TableCellRenderer renderer = tcol.getHeaderRenderer();
- Component comp = renderer.getTableCellRendererComponent(table,
- table.getModel().getColumnName(0), false, false, 0, 0);
- totalHeight = (int)comp.getPreferredSize().getHeight();
- for (int row=0; row<table.getRowCount(); row++)
- {
- totalHeight += table.getRowHeight(row);
- }
-
- for (int col=0; col<table.getColumnCount(); col++)
- {
- tcol = table.getColumnModel().getColumn(col);
- totalWidth += tcol.getPreferredWidth() + colMargin;
- }
-
- table.setPreferredScrollableViewportSize(
- new Dimension(totalWidth, totalHeight));
- */
- }
-
- /**
- * Updates the height of the table rows according to the size of the
- * rendered component.
- * @param table the table to handle.
- */
- private void updateTableRowHeight(JTable table)
- {
- int headerMaxHeight = 0;
-
- for (int col=0; col<table.getColumnCount(); col++)
- {
- TableColumn tcol = table.getColumnModel().getColumn(col);
- TableCellRenderer renderer = tcol.getHeaderRenderer();
- Component comp = renderer.getTableCellRendererComponent(table,
- table.getModel().getColumnName(col), false, false, 0, col);
- int colHeight = (int)comp.getPreferredSize().getHeight();
- headerMaxHeight = Math.max(headerMaxHeight, colHeight);
- }
- JTableHeader header = table.getTableHeader();
- header.setPreferredSize(new Dimension(
- (int)header.getPreferredSize().getWidth(),
- headerMaxHeight));
-
- for (int row=0; row<table.getRowCount(); row++)
- {
- int rowMaxHeight = table.getRowHeight();
- for (int col=0; col<table.getColumnCount(); col++)
- {
- TableCellRenderer renderer = table.getCellRenderer(row, col);
- Component comp = table.prepareRenderer(renderer, row, col);
- int colHeight = (int)comp.getPreferredSize().getHeight();
- rowMaxHeight = Math.max(rowMaxHeight, colHeight);
- }
- table.setRowHeight(row, rowMaxHeight);
- }
- }
-
- /**
- * Updates the height of the table columns according to the size of the
- * rendered component.
- * @param table the table to handle.
- */
- private void updateTableColumnWidth(JTable table)
- {
-
- int margin = table.getIntercellSpacing().width;
- for (int col=0; col<table.getColumnCount(); col++)
- {
- int colMaxWidth;
- TableColumn tcol = table.getColumnModel().getColumn(col);
- TableCellRenderer renderer = tcol.getHeaderRenderer();
- Component comp = renderer.getTableCellRendererComponent(table,
- table.getModel().getColumnName(col), false, false, 0, col);
- colMaxWidth = (int)comp.getPreferredSize().getWidth();
- for (int row=0; row<table.getRowCount(); row++)
- {
- renderer = table.getCellRenderer(row, col);
- comp = table.prepareRenderer(renderer, row, col);
- int colWidth = (int)comp.getPreferredSize().getWidth() + (2 * margin);
- colMaxWidth = Math.max(colMaxWidth, colWidth);
- }
- tcol.setPreferredWidth(colMaxWidth);
- }
- }
-
- private int getMaximalWidth()
- {
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-
- boolean multipleScreen = screenSize.width / screenSize.height >= 2;
-
- if (multipleScreen)
- {
- return Math.min((screenSize.width/2) - 100, 1000);
- }
- else
- {
- return Math.min(screenSize.width - 100, 1000);
- }
- }
-
- /**
- * Returns the maximum height we allow this dialog to have after pack.
- * @return the maximum height we allow this dialog to have after pack.
- */
- private int getMaximalHeight()
- {
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-
- return Math.min(screenSize.height - 100, 800);
- }
- /**
- * Method written for testing purposes.
- * @param args the arguments to be passed to the test program.
- */
- public static void main(String[] args)
- {
- try
- {
- UIFactory.initialize();
- StatusPanelDialog dlg = new StatusPanelDialog();
- dlg.packAndShow();
- } catch (Exception ex)
- {
- ex.printStackTrace();
- }
- }
-
- /**
- * Class used to render the databases table cells.
- */
- class DatabasesCellRenderer extends DefaultTableCellRenderer
- {
- private static final long serialVersionUID = -256719167426289735L;
-
- /**
- * Default constructor.
- */
- public DatabasesCellRenderer()
- {
- super();
- UIFactory.setTextStyle(this, UIFactory.TextStyle.SECONDARY_FIELD_VALID);
- }
-
- /**
- * {@inheritDoc}
- */
- public Component getTableCellRendererComponent(JTable table, Object value,
- boolean isSelected, boolean hasFocus, int row, int column) {
- String text = null;
- if (value instanceof String)
- {
- text = (String)value;
- }
- else if (value instanceof Message)
- {
- text = ((Message)value).toString();
- }
- else if (value instanceof Set)
- {
- LinkedHashSet<String> baseDns = new LinkedHashSet<String>();
- for (Object v : (Set)value)
- {
- baseDns.add((String)v);
- }
- text = "<html>" +
- UIFactory.applyFontToHtml(Utils.getStringFromCollection(
- baseDns, "<br>"),
- UIFactory.SECONDARY_FIELD_VALID_FONT);
- }
- else
- {
- /* Is the number of entries: check if it is available or not */
- if (lastDescriptor.getStatus() ==
- ServerStatusDescriptor.ServerStatus.STARTED)
- {
- int nEntries = (Integer)value;
- if (nEntries >= 0)
- {
- text = String.valueOf(nEntries);
- }
- else
- {
- if (!lastDescriptor.isAuthenticated())
- {
- setNotAvailableBecauseAuthenticationIsRequired(this);
- }
- else
- {
- setNotAvailable(this);
- }
- }
- }
- else
- {
- setNotAvailableBecauseServerIsDown(this);
- }
- }
- if (text != null)
- {
- setTextValue(this, text);
- }
- JComponent comp = (JComponent)
- super.getTableCellRendererComponent(table, getText(), isSelected,
- hasFocus, row, column);
- if (column == 0)
- {
- comp.setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createMatteBorder(0, 1, 0, 0,
- UIFactory.PANEL_BORDER_COLOR),
- BorderFactory.createEmptyBorder(4, 4, 4, 4)));
- }
- else
- {
- comp.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
- }
- return comp;
- }
- }
-
- /**
- * Class used to render the listeners table cells.
- */
- class ListenersCellRenderer extends DefaultTableCellRenderer
- {
- private static final long serialVersionUID = -256719167426289735L;
-
- /**
- * Default constructor.
- */
- public ListenersCellRenderer()
- {
- super();
- UIFactory.setTextStyle(this, UIFactory.TextStyle.SECONDARY_FIELD_VALID);
- }
-
- /**
- * {@inheritDoc}
- */
- public Component getTableCellRendererComponent(JTable table, Object value,
- boolean isSelected, boolean hasFocus, int row, int column) {
-
- setTextValue(this, (String)value);
- JComponent comp = (JComponent)
- super.getTableCellRendererComponent(table, getText(), isSelected,
- hasFocus, row, column);
- if (column == 0)
- {
- comp.setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createMatteBorder(0, 1, 0, 0,
- UIFactory.PANEL_BORDER_COLOR),
- BorderFactory.createEmptyBorder(4, 4, 4, 4)));
- }
- else
- {
- comp.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
- }
- return comp;
- }
- }
-}
-
-/**
- * This class is used to be able to have an instantaneous tooltip displayed
- * in the 'not available' labels. It replaces the default ToolTipManager class.
- *
- */
-class InstantaneousToolTipManager extends MouseAdapter
-implements MouseMotionListener
-{
- private ToolTipManager ttipManager = ToolTipManager.sharedInstance();
- private Popup tipWindow;
- private boolean isVisible;
-
- /**
- * The default constructor.
- */
- public InstantaneousToolTipManager()
- {
- }
-
- /**
- * Register a component that will use this tool tip manager to display tool
- * tips.
- * @param comp the component to be registered.
- */
- public void registerComponent(JComponent comp)
- {
- ttipManager.unregisterComponent(comp);
- comp.removeMouseListener(this);
- comp.addMouseListener(this);
- comp.removeMouseMotionListener(this);
- comp.addMouseMotionListener(this);
- }
-
- /**
- * Unregisters a component. Calling this method makes the component to be
- * registered by the default tool tip manager.
- * @param comp the component to be unregistered.
- */
- public void unregisterComponent(JComponent comp)
- {
- ttipManager.registerComponent(comp);
- comp.removeMouseListener(this);
- comp.removeMouseMotionListener(this);
- }
-
- /**
- * {@inheritDoc}
- */
- public void mouseDragged(MouseEvent event)
- {
- }
-
- /**
- * {@inheritDoc}
- */
- public void mouseEntered(MouseEvent event)
- {
- displayToolTip(event);
- }
-
- /**
- * {@inheritDoc}
- */
- public void mouseExited(MouseEvent event)
- {
- hideToolTip(event);
- }
-
- /**
- * {@inheritDoc}
- */
- public void mouseMoved(MouseEvent event)
- {
- hideToolTip(event);
- displayToolTip(event);
- }
-
- /**
- * {@inheritDoc}
- */
- public void mousePressed(MouseEvent event)
- {
- if (isVisible)
- {
- hideToolTip(event);
- }
- else
- {
- hideToolTip(event);
- displayToolTip(event);
- }
- }
-
- /**
- * Displays a tooltip depending on the MouseEvent received.
- * @param event the mouse event.
- */
- private void displayToolTip(MouseEvent event)
- {
- JComponent component = (JComponent)event.getSource();
- String toolTipText = component.getToolTipText(event);
- if (toolTipText != null)
- {
- Point preferredLocation = component.getToolTipLocation(event);
- Rectangle sBounds = component.getGraphicsConfiguration().
- getBounds();
-
- JToolTip tip = component.createToolTip();
- tip.setTipText(toolTipText);
- Dimension size = tip.getPreferredSize();
- Point location = new Point();
-
- Point screenLocation = component.getLocationOnScreen();
- if(preferredLocation != null)
- {
- location.x = screenLocation.x + preferredLocation.x;
- location.y = screenLocation.y + preferredLocation.y;
- }
- else
- {
- location.x = screenLocation.x + event.getX();
- location.y = screenLocation.y + event.getY() + 20;
- }
-
- if (location.x < sBounds.x) {
- location.x = sBounds.x;
- }
- else if (location.x - sBounds.x + size.width > sBounds.width) {
- location.x = sBounds.x + Math.max(0, sBounds.width - size.width);
- }
- if (location.y < sBounds.y) {
- location.y = sBounds.y;
- }
- else if (location.y - sBounds.y + size.height > sBounds.height) {
- location.y = sBounds.y + Math.max(0, sBounds.height - size.height);
- }
-
- PopupFactory popupFactory = PopupFactory.getSharedInstance();
- tipWindow = popupFactory.getPopup(component, tip, location.x, location.y);
- tipWindow.show();
- }
- isVisible = true;
- }
-
- /**
- * Hides the tooltip if we are displaying it.
- * @param event the mouse event.
- */
- private void hideToolTip(MouseEvent event)
- {
- if (tipWindow != null)
- {
- tipWindow.hide();
- tipWindow = null;
- }
- isVisible = false;
- }
-}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/package-info.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/package-info.java
deleted file mode 100644
index 79e5db3..0000000
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/package-info.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-
-
-/**
- * Defines the classes that are related to AWT and Swing for the code of
- * the status-panel command line. This includes the dialogs that are
- * displayed and the table data models.
- */
-package org.opends.guitools.statuspanel.ui;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index 17bb40a..ffba128 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -35,9 +35,8 @@
import org.opends.admin.ads.TopologyCache;
import org.opends.admin.ads.TopologyCacheException;
import org.opends.admin.ads.util.ApplicationTrustManager;
-import org.opends.guitools.statuspanel.ConfigException;
-import org.opends.guitools.statuspanel.ConfigFromFile;
-import org.opends.guitools.statuspanel.ConnectionProtocolPolicy;
+import org.opends.guitools.controlpanel.datamodel.ConnectionProtocolPolicy;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
@@ -99,7 +98,12 @@
private LDAPConnectionConsoleInteraction ci = null;
- private ConfigFromFile conf;
+ private ControlPanelInfo info;
+
+ // This CLI is always using the administration connector with SSL
+ private final boolean alwaysSSL = true;
+ private boolean useSSL = true;
+ private boolean useStartTLS = false;
/**
* Default constructor.
@@ -242,28 +246,24 @@
userData.setReplicationServer(
referencedHostName+":8989");
}
- userData.setUseSSL(parser.useSSL());
- userData.setUseStartTLS(parser.useStartTLS());
- conf = new ConfigFromFile();
- conf.readConfiguration();
- try
- {
- String ldapUrl = conf.getURL(
- ConnectionProtocolPolicy.getConnectionPolicy(parser.useSSL(),
- parser.useStartTLS()));
- userData.setLocalServerUrl(ldapUrl);
- }
- catch (ConfigException ce)
+ info = ControlPanelInfo.getInstance();
+ info.setTrustManager(userData.getTrustManager());
+ info.regenerateDescriptor();
+ info.setConnectionPolicy(ConnectionProtocolPolicy.USE_ADMIN);
+
+ String adminConnectorUrl = info.getAdminConnectorURL();
+
+ if (adminConnectorUrl == null)
{
LOG.log(Level.WARNING,
- "Error retrieving a valid LDAP URL in conf file: "+ce, ce);
+ "Error retrieving a valid LDAP URL in conf file.");
if (!parser.isInteractive())
{
Message msg = ERR_COULD_NOT_FIND_VALID_LDAPURL.get();
- throw new ApplicationException(ReturnCode.APPLICATION_ERROR, msg,
- ce);
+ throw new ApplicationException(ReturnCode.APPLICATION_ERROR, msg, null);
}
}
+ userData.setLocalServerUrl(adminConnectorUrl);
userData.setReferencedHostName(referencedHostName);
/*
@@ -762,14 +762,9 @@
boolean accepted = true;
String uid = userData.getAdminUID();
String pwd = userData.getAdminPwd();
- boolean useSSL = userData.useSSL();
- boolean useStartTLS = userData.useStartTLS();
boolean couldConnect = false;
- boolean canUseSSL = conf.getLDAPSURL() != null;
- boolean canUseStartTLS = conf.getStartTLSURL() != null;
-
while (!couldConnect && accepted)
{
@@ -808,35 +803,6 @@
secureArgsList.bindPasswordArg.setPresent(false);
}
- // We already know if SSL or StartTLS can be used. If we cannot
- // use them we will not propose them in the connection parameters
- // and if none of them can be used we will just not ask for the
- // protocol to be used.
- if (!canUseSSL)
- {
- if (useSSL)
- {
- println();
- println(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- println();
- secureArgsList.useSSLArg.setPresent(false);
- }
- else
- {
- secureArgsList.useSSLArg.setValueSetByProperty(true);
- }
- }
- if (!canUseStartTLS)
- {
- if (useStartTLS)
- {
- println();
- println(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
- println();
- secureArgsList.useStartTLSArg.setPresent(false);
- }
- secureArgsList.useStartTLSArg.setValueSetByProperty(true);
- }
if (ci == null)
{
ci =
@@ -847,20 +813,24 @@
InitialLdapContext ctx = null;
try
{
- ci.run(canUseSSL, canUseStartTLS);
- useSSL = ci.useSSL();
- useStartTLS = ci.useStartTLS();
+ ci.run(true, false);
userData.setAdminUID(ci.getAdministratorUID());
userData.setAdminPwd(ci.getBindPassword());
- userData.setUseSSL(useSSL);
- userData.setUseStartTLS(useStartTLS);
- String ldapUrl = conf.getURL(
- ConnectionProtocolPolicy.getConnectionPolicy(
- useSSL, useStartTLS));
+ info.setConnectionPolicy(ConnectionProtocolPolicy.USE_ADMIN);
+
+ String adminConnectorUrl = info.getAdminConnectorURL();
+ if (adminConnectorUrl == null)
+ {
+ LOG.log(Level.WARNING,
+ "Error retrieving a valid Administration Connector URL in conf file.");
+ Message msg = ERR_COULD_NOT_FIND_VALID_LDAPURL.get();
+ throw new ApplicationException(ReturnCode.APPLICATION_ERROR, msg,
+ null);
+ }
try
{
- URI uri = new URI(ldapUrl);
+ URI uri = new URI(adminConnectorUrl);
int port = uri.getPort();
secureArgsList.portArg.clearValues();
secureArgsList.portArg.addValue(String.valueOf(port));
@@ -868,16 +838,27 @@
}
catch (Throwable t)
{
- LOG.log(Level.SEVERE, "Error parsing url: "+ldapUrl);
+ LOG.log(Level.SEVERE, "Error parsing url: "+adminConnectorUrl);
}
LDAPManagementContextFactory factory =
- new LDAPManagementContextFactory();
+ new LDAPManagementContextFactory(alwaysSSL);
factory.getManagementContext(this, ci);
updateTrustManager(userData, ci);
- ldapUrl = conf.getURL(
- ConnectionProtocolPolicy.getConnectionPolicy(ci.useSSL(),
- ci.useStartTLS()));
- userData.setLocalServerUrl(ldapUrl);
+
+ info.setConnectionPolicy(ConnectionProtocolPolicy.USE_ADMIN);
+
+ adminConnectorUrl = info.getAdminConnectorURL();
+
+ if (adminConnectorUrl == null)
+ {
+ LOG.log(Level.WARNING,
+ "Error retrieving a valid Administration Connector URL in conf file.");
+ Message msg = ERR_COULD_NOT_FIND_VALID_LDAPURL.get();
+ throw new ApplicationException(ReturnCode.APPLICATION_ERROR, msg,
+ null);
+ }
+
+ userData.setLocalServerUrl(adminConnectorUrl);
couldConnect = true;
}
catch (ArgumentException e) {
@@ -888,15 +869,6 @@
println(e.getMessageObject());
println();
}
- catch (ConfigException ce)
- {
- // This is unexpected
- LOG.log(Level.WARNING,
- "Error retrieving a valid LDAP URL in conf file: "+ce, ce);
- Message msg = ERR_COULD_NOT_FIND_VALID_LDAPURL.get();
- throw new ApplicationException(ReturnCode.APPLICATION_ERROR, msg,
- ce);
- }
finally
{
if (ctx != null)
@@ -1141,28 +1113,25 @@
InitialLdapContext ctx = null;
try
{
- ConfigFromFile conf = new ConfigFromFile();
- conf.readConfiguration();
+ info.setTrustManager(userData.getTrustManager());
String host = "localhost";
int port = 389;
- boolean useSSL = userData.useSSL();
- boolean useStartTLS = userData.useStartTLS();
String adminUid = userData.getAdminUID();
String pwd = userData.getAdminPwd();
String dn = ADSContext.getAdministratorDN(adminUid);
- String ldapUrl = conf.getURL(
- ConnectionProtocolPolicy.getConnectionPolicy(useSSL, useStartTLS));
+ info.setConnectionPolicy(ConnectionProtocolPolicy.USE_ADMIN);
+ String adminConnectorUrl = info.getAdminConnectorURL();
try
{
- URI uri = new URI(ldapUrl);
+ URI uri = new URI(adminConnectorUrl);
host = uri.getHost();
port = uri.getPort();
}
catch (Throwable t)
{
- LOG.log(Level.SEVERE, "Error parsing url: "+ldapUrl);
+ LOG.log(Level.SEVERE, "Error parsing url: "+adminConnectorUrl);
}
ctx = createAdministrativeContext(host, port, useSSL, useStartTLS, dn,
pwd, userData.getTrustManager());
@@ -1186,15 +1155,6 @@
exceptionOccurred = false;
}
- catch (ConfigException ce)
- {
- // This is unexpected, when calling this code this should already been
- // checked.
- LOG.log(Level.WARNING,
- "Error retrieving a valid LDAP URL in conf file: "+ce, ce);
- Message msg = ERR_COULD_NOT_FIND_VALID_LDAPURL.get();
- throw new ApplicationException(ReturnCode.APPLICATION_ERROR, msg, ce);
- }
catch (NamingException ne)
{
LOG.log(Level.WARNING, "Error connecting to server: "+ne, ne);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java
index d1d6fb1..f767cd3 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallUserData.java
@@ -55,8 +55,6 @@
private String localServerUrl;
private HashSet<ServerDescriptor> remoteServers =
new HashSet<ServerDescriptor>();
- private boolean useSSL;
- private boolean useStartTLS;
private String replicationServer;
private String referencedHostName;
@@ -364,43 +362,4 @@
this.remoteServers.addAll(remoteServers);
}
- /**
- * Whether we must use SSL to connect to the local server or not.
- * @return <CODE>true</CODE> if we must use SSL to connect to the local server
- * and <CODE>false</CODE> otherwise.
- */
- public boolean useSSL()
- {
- return useSSL;
- }
-
- /**
- * Sets whether we must use SSL to connect to the local server or not.
- * @param useSSL whether we must use SSL to connect to the local server or
- * not.
- */
- public void setUseSSL(boolean useSSL)
- {
- this.useSSL = useSSL;
- }
-
- /**
- * Whether we must use Start TLS to connect to the local server or not.
- * @return <CODE>true</CODE> if we must use Start TLS to connect to the local
- * server and <CODE>false</CODE> otherwise.
- */
- public boolean useStartTLS()
- {
- return useStartTLS;
- }
-
- /**
- * Sets whether we must use Start TLS to connect to the local server or not.
- * @param useStartTLS whether we must use Start TLS to connect to the local
- * server or not.
- */
- public void setUseStartTLS(boolean useStartTLS)
- {
- this.useStartTLS = useStartTLS;
- }
}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index 9602c2d..428a8e6 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -2161,7 +2161,7 @@
ServerDescriptor.ServerProperty property;
if (isSecure)
{
- property = ServerDescriptor.ServerProperty.LDAPS_PORT;
+ property = ServerDescriptor.ServerProperty.ADMIN_PORT;
}
else
{
@@ -2178,7 +2178,7 @@
ADSContext.ServerProperty adsProperty;
if (isSecure)
{
- adsProperty = ADSContext.ServerProperty.LDAPS_PORT;
+ adsProperty = ADSContext.ServerProperty.ADMIN_PORT;
}
else
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
index 2a75e01..599f5d5 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
@@ -67,6 +67,9 @@
private StringArgument referencedHostNameArg;
+ // This CLI is always using the administration connector with SSL
+ private final boolean alwaysSSL = true;
+
/**
* Creates a new instance of this argument parser with no arguments.
*
@@ -181,7 +184,7 @@
}
ArrayList<Argument> defaultArgs =
- new ArrayList<Argument>(createGlobalArguments(outStream));
+ new ArrayList<Argument>(createGlobalArguments(outStream, alwaysSSL));
int index = defaultArgs.indexOf(secureArgsList.bindDnArg);
if (index != -1)
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
index 52fc01e..d975696 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
@@ -52,7 +52,9 @@
import org.opends.admin.ads.ADSContext;
import org.opends.admin.ads.util.ApplicationTrustManager;
-import org.opends.guitools.statuspanel.ConfigFromFile;
+import org.opends.guitools.controlpanel.datamodel.ConnectionProtocolPolicy;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.util.ConfigFromFile;
import org.opends.quicksetup.ApplicationException;
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.Installation;
@@ -384,35 +386,25 @@
ctx = null;
try
{
+ ControlPanelInfo info = ControlPanelInfo.getInstance();
+ info.setTrustManager(getTrustManager());
+ info.regenerateDescriptor();
ConfigFromFile conf = new ConfigFromFile();
conf.readConfiguration();
- String ldapUrl = conf.getLDAPURL();
- String startTlsUrl = conf.getStartTLSURL();
- String ldapsUrl = conf.getLDAPSURL();
String dn = ADSContext.getAdministratorDN(tfUid.getText());
- if (ldapsUrl != null)
- {
- usedUrl = ldapsUrl;
- ctx = Utils.createLdapsContext(ldapsUrl, dn, tfPwd.getText(),
- Utils.getDefaultLDAPTimeout(), null, getTrustManager());
- }
- else if (startTlsUrl != null)
- {
- usedUrl = startTlsUrl;
- ctx = Utils.createStartTLSContext(startTlsUrl, dn, tfPwd.getText(),
- Utils.getDefaultLDAPTimeout(), null, getTrustManager(), null);
- }
- else if (ldapUrl != null)
- {
- usedUrl = ldapUrl;
- ctx = Utils.createLdapContext(ldapUrl, dn, tfPwd.getText(),
- Utils.getDefaultLDAPTimeout(), null);
- }
- else
+ String pwd = tfPwd.getText();
+ info.setConnectionPolicy(ConnectionProtocolPolicy.USE_ADMIN);
+ usedUrl = info.getAdminConnectorURL();
+ if (usedUrl == null)
{
throw new ApplicationException(ReturnCode.APPLICATION_ERROR,
ERR_COULD_NOT_FIND_VALID_LDAPURL.get(), null);
}
+ ctx =
+ org.opends.guitools.controlpanel.util.Utilities.getAdminDirContext(
+ info, dn, pwd);
+
+
} catch (NamingException ne)
{
if (isServerRunning())
diff --git a/opendj-sdk/opends/src/messages/messages/admin.properties b/opendj-sdk/opends/src/messages/messages/admin.properties
index 3bc5443..53d63c2 100644
--- a/opendj-sdk/opends/src/messages/messages/admin.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin.properties
@@ -310,3 +310,12 @@
disabled because it is referenced by the "%s" property in the %s
SEVERE_ERR_REFINT_UNABLE_TO_EVALUATE_TARGET_CONDITION_134=An error occurred \
while attempting to determine if the %s in entry %s is enabled: %s
+SEVERE_ERR_ADMIN_CERTIFICATE_GENERATION_135=The administration connector \
+self-signed certificate cannot be generated because the following error \
+occurred: %s
+SEVERE_ERR_ADMIN_CERTIFICATE_GENERATION_MISSING_FILES_136=The administration \
+connector self-signed certificate cannot be generated because the following \
+files are missing: %s
+SEVERE_WARN_ADMIN_SET_PERMISSIONS_FAILED_137=Failed to set permissions \
+ on file %s
+
diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
index 502408d..843580e 100644
--- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
@@ -50,11 +50,9 @@
INFO_ADDRESS_PORT_COLUMN=Address:Port
INFO_HOSTNAME_LABEL=Host Name:
INFO_ADMINISTRATIVE_USERS_LABEL=Administrative Users:
-INFO_AGE_OF_OLDEST_MISSING_CHANGE_COLUMN=<html>Age of Oldest<br>Missing \
- Change
-INFO_AGE_OF_OLDEST_MISSING_CHANGE_COLUMN_CLI=Age of Oldest Missing Change
+INFO_AGE_OF_OLDEST_MISSING_CHANGE_COLUMN=Age of Oldest Missing Change
INFO_AUTHENTICATE_BUTTON_LABEL=Authenticate
-INFO_AUTHENTICATE_STATUS_PANEL_BUTTON_TOOLTIP=Authenticate as an \
+INFO_AUTHENTICATE_CONTROL_PANEL_BUTTON_TOOLTIP=Authenticate as an \
administrative user to view all monitoring information
INFO_BACKENDID_COLUMN=Backend ID
INFO_BASEDN_COLUMN=Base DN
@@ -163,20 +161,20 @@
servers:\n%s\nDo you want the uninstaller to try to remove the references to \
this server in a best-effort mode?
MILD_ERR_UNINSTALL_ERROR_UPDATING_REMOTE_FORCE=This server is configured \
- to replicate some of its Base DNs. There was an error retrieving the \
+ to replicate some of its Base DN's. There was an error retrieving the \
references to it in the replicated servers. Note that to be able to remove \
remote references you must provide Global Administrator credentials using the \
%s and %s (or %s) options.%nContinuing uninstall as we are \
on force on error mode.
SEVERE_ERR_UNINSTALL_ERROR_UPDATING_REMOTE_NO_FORCE=This server is configured \
- to replicate some of its Base DNs. There was an error retrieving the \
+ to replicate some of its Base DN's. There was an error retrieving the \
references to it in the replicated servers. Note that to be able to remove \
remote references you must provide Global Administrator credentials using the \
%s and %s (or %s) options.%nCheck that the connection parameters you \
provided are correct.%nIf you want to uninstall the server even when remote \
references cannot be removed, you can use the %s option.
MILD_ERR_UNINSTALL_NOT_UPDATE_REMOTE_PROMPT=This server is configured \
- to replicate some of its Base DNs. There was an error retrieving the \
+ to replicate some of its Base DN's. There was an error retrieving the \
references to it in the replicated servers.%nDo you want to continue?
INFO_CONFIRM_UNINSTALL_SERVER_RUNNING_TITLE=Server is Running
INFO_CONNECTIONS_LABEL=Open Connections:
@@ -213,11 +211,12 @@
INFO_LDIF_PROTOCOL_LABEL=LDIF
INFO_SNMP_PROTOCOL_LABEL=SNMP
INFO_LISTENERS_TITLE=Connection Handlers
+INFO_ADMIN_LISTENER_TITLE=Administration Connector
INFO_LOGIN_CANCEL_BUTTON_TOOLTIP=Close Login Dialog
INFO_LOGIN_DIALOG_MSG=You must provide an Administrative User DN and password \
to retrieve monitoring information.
INFO_LOGIN_DIALOG_SERVER_NOT_RUNNING_MSG=The Directory Server is not running. \
- Click OK to continue to the Status Panel.
+ Click OK to continue.
INFO_LOGIN_DIALOG_SERVER_NOT_RUNNING_TITLE=Directory Server not Running
INFO_LOGIN_DIALOG_TITLE=Authentication Required
INFO_LOGIN_DN_LABEL=Administrative User DN:
@@ -250,7 +249,6 @@
INFO_OPENDS_VERSION_LABEL=OpenDS Version:
INFO_PROGRESS_REMOVING_REFERENCES=Removing references on %s
INFO_PROTOCOL_COLUMN=Protocol
-INFO_QUIT_STATUS_PANEL_BUTTON_TOOLTIP=Quit Status Panel
INFO_REMOVE_BACKUPS_LABEL=Backup Files Contained in bak Directory
INFO_REMOVE_BACKUPS_TOOLTIP=Remove Backup Files Contained in bak Directory
INFO_REMOVE_DATABASES_LABEL=Database Contents
@@ -285,15 +283,14 @@
INFO_STATE_COLUMN=State
INFO_STATUS_CLI_USAGE_DESCRIPTION=This utility can be used to display basic \
server information
-SEVERE_ERR_STATUS_PANEL_LAUNCHER_GUI_LAUNCH_FAILED=Could not launch Status \
+SEVERE_ERR_CONTROL_PANEL_LAUNCHER_GUI_LAUNCH_FAILED=Could not launch Control \
Panel. Check that you have access to the display.
-SEVERE_ERR_STATUS_PANEL_LAUNCHER_GUI_LAUNCH_FAILED_DETAILS=Could not launch \
- Status Panel. Check that you have access to the display. Check file %s for \
+SEVERE_ERR_CONTROL_PANEL_LAUNCHER_GUI_LAUNCH_FAILED_DETAILS=Could not launch \
+ Control Panel. Check that you have access to the display. Check file %s for \
details.
-INFO_STATUS_PANEL_LAUNCHER_USAGE_DESCRIPTION=This utility can be used to \
- display the Status Panel window which displays basic server information and \
- allows to start, stop and restart the server.
-INFO_STATUSPANEL_DIALOG_TITLE=OpenDS Status Panel
+INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION=This utility can be used to \
+ display the Control Panel window which displays basic server information and \
+ allows to do some basic administration tasks on the server.
INFO_STOP_BUTTON_LABEL=Stop
INFO_STOP_BUTTON_TOOLTIP=Stops the Directory Server
INFO_BASEDN_NOT_REPLICATED_LABEL=Disabled
@@ -391,7 +388,7 @@
to use to bind to the server
INFO_DESCRIPTION_ENABLE_REPLICATION_HOST1=Fully qualified directory server \
host name or IP address of the first server whose contents will be replicated
-INFO_DESCRIPTION_ENABLE_REPLICATION_SERVER_PORT1=Directory server port \
+INFO_DESCRIPTION_ENABLE_REPLICATION_SERVER_PORT1=Directory server administration port \
number of the first server whose contents will be replicated
INFO_DESCRIPTION_ENABLE_REPLICATION_BINDDN1=DN to use to \
bind to the first server whose contents will be replicated. If not specified \
@@ -418,7 +415,7 @@
replication is configured on the first server.
INFO_DESCRIPTION_ENABLE_REPLICATION_HOST2=Fully qualified directory server \
host name or IP address of the second server whose contents will be replicated
-INFO_DESCRIPTION_ENABLE_REPLICATION_SERVER_PORT2=Directory server port \
+INFO_DESCRIPTION_ENABLE_REPLICATION_SERVER_PORT2=Directory server administration port \
number of the second server whose contents will be replicated
INFO_DESCRIPTION_ENABLE_REPLICATION_BINDDN2=DN to use to \
bind to the second server whose contents will be replicated. If not \
@@ -453,7 +450,7 @@
communication with the second server
INFO_DESCRIPTION_REPLICATION_BASEDNS=Base DN of \
the data to be replicated, initialized or for which we want to disable \
- replication. Multiple base DNs can be provided by using this option multiple \
+ replication. Multiple base DN's can be provided by using this option multiple \
times
INFO_DESCRIPTION_REPLICATION_ADMIN_UID=User ID of the \
Global Administrator to use to bind to the server. For the '%s' subcommand \
@@ -467,7 +464,7 @@
hostname or IP address of the source server whose contents will be used to \
initialize the destination server
INFO_DESCRIPTION_INITIALIZE_REPLICATION_SERVER_PORT_SOURCE=Directory \
- server port number of the source server whose contents will be used to \
+ server administration port number of the source server whose contents will be used to \
initialize the destination server
INFO_DESCRIPTION_INITIALIZE_REPLICATION_USE_SSL_SOURCE=Use SSL for secure \
communication with the source server
@@ -477,7 +474,7 @@
hostname or IP address of the destination server whose contents will be \
initialized
INFO_DESCRIPTION_INITIALIZE_REPLICATION_SERVER_PORT_DESTINATION=Directory \
- server port number of the destination server whose contents will be initialized
+ server administration port number of the destination server whose contents will be initialized
INFO_DESCRIPTION_INITIALIZE_REPLICATION_USE_SSL_DESTINATION=Use SSL for \
secure communication with the destination server
INFO_DESCRIPTION_INITIALIZE_REPLICATION_STARTTLS_DESTINATION=Use \
@@ -510,14 +507,14 @@
INFO_DESCRIPTION_SUBCMD_PRE_EXTERNAL_INITIALIZATION=This subcommand must be \
called before initializing the contents of all the replicated servers using \
the tool import-ldif or the binary copy method. You must specify the list of \
- Base DNs that will be initialized and you must \
+ Base DN's that will be initialized and you must \
provide the credentials of any of the servers that are being replicated. \
After calling this subcommand, initialize the contents of all the servers in \
the topology, then call the subcommand '%s'.
INFO_DESCRIPTION_SUBCMD_POST_EXTERNAL_INITIALIZATION=This subcommand must be \
called after initializing the contents of all the replicated servers using \
the tool import-ldif or the binary copy method. You \
- must specify the list of Base DNs that have been initialized and you must \
+ must specify the list of Base DN's that have been initialized and you must \
provide the credentials of any of the servers that are being replicated. See \
the usage of the subcommand '%s' for more information.
INFO_DESCRIPTION_SUBCMD_ENABLE_REPLICATION=Updates the configuration of the \
@@ -530,9 +527,9 @@
specified server for the provided Base DN and removes references in the other \
servers with which it is replicating data.
INFO_DESCRIPTION_SUBCMD_STATUS_REPLICATION=Displays a list with the basic \
- replication configuration of the base DNs of the servers defined in the \
- registration information. If no base DNs are specified as parameter the \
- information for all base DNs is displayed.
+ replication configuration of the base DN's of the servers defined in the \
+ registration information. If no base DN's are specified as parameter the \
+ information for all base DN's is displayed.
SEVERE_ERR_REPLICATION_NO_BASE_DN_PROVIDED=You must provide at least one base \
DN in no interactive mode.
SEVERE_ERR_REPLICATION_NO_ADMINISTRATOR_PASSWORD_PROVIDED=You must provide the \
@@ -546,7 +543,7 @@
SEVERE_ERR_REPLICATION_INITIALIZE_SAME_SERVER_PORT=You have to provide two \
different servers as source and destination of the initialization. You have \
provided twice the server %s:%s
-SEVERE_ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL=The server LDAP port \
+SEVERE_ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL=The server administration port \
and the replication port have the same value in host %s. You provided %s \
for both.
SEVERE_ERR_REPLICATION_SAME_REPLICATION_PORT=You have provided the same \
@@ -573,10 +570,10 @@
MILD_ERR_ERROR_CONNECTING_TO_SERVER_PROMPT_AGAIN=Could not connect to the \
Directory Server %s with the provided credentials.%nError details: %s%n%n\
Provide again the required information to connect to the server:
-INFO_REPLICATION_ENABLE_HOST1_CONNECTION_PARAMETERS=>>>> Specify OpenDS LDAP \
+INFO_REPLICATION_ENABLE_HOST1_CONNECTION_PARAMETERS=>>>> Specify OpenDS administration \
connection parameters for the first server
INFO_REPLICATION_ENABLE_HOSTNAME1_PROMPT=Host name of the first server
-INFO_REPLICATION_ENABLE_PORT1_PROMPT=LDAP port of the first server
+INFO_REPLICATION_ENABLE_PORT1_PROMPT=Administration port of the first server
INFO_REPLICATION_ENABLE_PROTOCOL1=How do you want to connect to the first \
server?
INFO_REPLICATION_ENABLE_REPLICATIONPORT1_PROMPT=Replication port for the first \
@@ -585,10 +582,10 @@
communication when connecting to replication port %s on the first server?
INFO_REPLICATION_ENABLE_BINDDN1_PROMPT=Bind DN for the first server
INFO_REPLICATION_ENABLE_PASSWORD1_PROMPT=Password for %s on the first server:
-INFO_REPLICATION_ENABLE_HOST2_CONNECTION_PARAMETERS=>>>> Specify OpenDS LDAP \
+INFO_REPLICATION_ENABLE_HOST2_CONNECTION_PARAMETERS=>>>> Specify OpenDS administration \
connection parameters for the second server
INFO_REPLICATION_ENABLE_HOSTNAME2_PROMPT=Host name of the second server
-INFO_REPLICATION_ENABLE_PORT2_PROMPT=LDAP port of the second server
+INFO_REPLICATION_ENABLE_PORT2_PROMPT=Administration port of the second server
INFO_REPLICATION_ENABLE_PROTOCOL2=How do you want to connect to the second \
server?
INFO_REPLICATION_ENABLE_REPLICATIONPORT2_PROMPT=Replication port for the \
@@ -598,52 +595,52 @@
INFO_REPLICATION_ENABLE_BINDDN2_PROMPT=Bind DN for the second server
INFO_REPLICATION_ENABLE_PASSWORD2_PROMPT=Password for %s on the second server:
INFO_REPLICATION_INITIALIZE_SOURCE_CONNECTION_PARAMETERS=>>>> Specify OpenDS \
- LDAP connection parameters for the source server
+ administration connection parameters for the source server
INFO_REPLICATION_INITIALIZE_DESTINATION_CONNECTION_PARAMETERS=>>>> Specify \
- OpenDS LDAP connection parameters for the destination server
-SEVERE_ERR_NO_SUFFIXES_AVAILABLE_TO_ENABLE_REPLICATION=There are no base DNs \
+ OpenDS administration connection parameters for the destination server
+SEVERE_ERR_NO_SUFFIXES_AVAILABLE_TO_ENABLE_REPLICATION=There are no base DN's \
available to enable replication between the two servers.
-INFO_ALREADY_REPLICATED_SUFFIXES=The following base DNs are already replicated \
+INFO_ALREADY_REPLICATED_SUFFIXES=The following base DN's are already replicated \
between the two servers:%n%s
-INFO_ALREADY_NOT_REPLICATED_SUFFIXES=The following base DNs are not \
+INFO_ALREADY_NOT_REPLICATED_SUFFIXES=The following base DN's are not \
replicated:%n%s
-MILD_ERR_REPLICATION_ENABLE_SUFFIXES_NOT_FOUND=The following base DNs cannot \
+MILD_ERR_REPLICATION_ENABLE_SUFFIXES_NOT_FOUND=The following base DN's cannot \
be replicated between the two servers because they could not be found in at \
least one of the servers:%n%s
MILD_ERR_NO_SUFFIXES_SELECTED_TO_REPLICATE=You must choose at least one base \
DN to be replicated.
INFO_REPLICATION_ENABLE_SUFFIX_PROMPT=Replicate base DN %s?
SEVERE_ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_REPLICATION=There are no base \
- DNs replicated between the two servers.
-MILD_ERR_SUFFIXES_CANNOT_BE_INITIALIZED=The following base DNs cannot be \
+ DN's replicated between the two servers.
+MILD_ERR_SUFFIXES_CANNOT_BE_INITIALIZED=The following base DN's cannot be \
initialized because they are not replicated or they are not configured on \
both servers:%n%s
MILD_ERR_NO_SUFFIXES_SELECTED_TO_INITIALIZE=You must choose at least one \
base DN to be initialized.
INFO_REPLICATION_INITIALIZE_SUFFIX_PROMPT=Initialize base DN %s?
SEVERE_ERR_NO_SUFFIXES_AVAILABLE_TO_DISABLE_REPLICATION=There are no base \
- DNs replicated in the server.
+ DN's replicated in the server.
SEVERE_ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_ALL_REPLICATION=There are no \
- base DNs replicated in the server. The base DNs must be replicated to be \
- able to use their contents to initialize the base DNs on the other servers.
+ base DN's replicated in the server. The base DN's must be replicated to be \
+ able to use their contents to initialize the base DN's on the other servers.
MILD_ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_LOCAL_REPLICATION=There are no \
- base DNs replicated in the server.
-MILD_ERR_REPLICATION_DISABLE_SUFFIXES_NOT_FOUND=The following base DNs could \
+ base DN's replicated in the server.
+MILD_ERR_REPLICATION_DISABLE_SUFFIXES_NOT_FOUND=The following base DN's could \
not be found on the server:%n%s
MILD_ERR_REPLICATION_INITIALIZE_LOCAL_SUFFIXES_NOT_FOUND=The following base \
- DNs could not be found on the server:%n%s
+ DN's could not be found on the server:%n%s
MILD_ERR_NO_SUFFIXES_SELECTED_TO_DISABLE=You must choose at least one \
base DN to be disabled.
MILD_ERR_NO_SUFFIXES_SELECTED_TO_INITIALIZE_ALL=You must choose at least one \
base DN to initialize.
INFO_REPLICATION_PRE_EXTERNAL_INITIALIZATION_LOCAL_PROMPT=Are you going to \
initialize only the contents of server %s (type 'no' if you will initialize \
- contents of all replicated servers for the given Base DNs)?
+ contents of all replicated servers for the given Base DN's)?
MILD_ERR_NO_SUFFIXES_SELECTED_TO_PRE_EXTERNAL_INITIALIZATION=You must specify \
- the base DNs that will be initialized using the import-ldif command or the \
+ the base DN's that will be initialized using the import-ldif command or the \
binary copy.
MILD_ERR_NO_SUFFIXES_SELECTED_TO_POST_EXTERNAL_INITIALIZATION=You must specify \
- the base DNs that have been initialized using the import-ldif command or the \
+ the base DN's that have been initialized using the import-ldif command or the \
binary copy.
INFO_REPLICATION_DISABLE_SUFFIX_PROMPT=Disable replication on base DN %s?
INFO_REPLICATION_INITIALIZE_ALL_SUFFIX_PROMPT=Initialize base DN %s?
@@ -670,10 +667,10 @@
the schema. Disabling schema replication is only recommended in specific \
scenarios. Do you want to continue?
INFO_REPLICATION_CONFIRM_DISABLE_GENERIC=Disabling replication will make the \
- data under the selected base DNs not to be synchronized with other servers \
+ data under the selected base DN's not to be synchronized with other servers \
any more. Do you want to continue?
INFO_REPLICATION_CONFIRM_DISABLE_LAST_SUFFIXES=Disabling replication will make \
- the data under the selected base DNs not to be synchronized with other \
+ the data under the selected base DN's not to be synchronized with other \
servers any more. The replication port on the server will also be disabled. \
Do you want to continue?
INFO_REPLICATION_CONFIRM_INITIALIZE_ADS=You chose to initialize the contents \
@@ -682,7 +679,7 @@
not recommended to configure it directly. Do you want to continue?
INFO_REPLICATION_CONFIRM_INITIALIZE_GENERIC=Initializing the contents of a \
base DN removes all the existing contents of that base DN. Do you want to \
- remove the contents of the selected base DNs on server %s and replace them \
+ remove the contents of the selected base DN's on server %s and replace them \
with the contents of server %s?
INFO_REPLICATION_CONFIRM_INITIALIZE_ALL_ADS=You chose to initialize the contents \
of base DN %s with the contents in server %s. This base DN is used by the \
@@ -690,7 +687,7 @@
recommended to configure it directly. Do you want to continue?
INFO_REPLICATION_CONFIRM_INITIALIZE_ALL_GENERIC=Initializing the contents of a \
base DN removes all the existing contents of that base DN. Do you want to \
- remove the contents of the selected base DNs on the replicated servers and \
+ remove the contents of the selected base DN's on the replicated servers and \
replace them with the contents of server %s?
MILD_ERR_REPLICATION_READING_REGISTERED_SERVERS_WARNING=The following errors \
were encountered reading the configuration of the existing servers:\n%s\nThe \
@@ -738,7 +735,7 @@
server %s
INFO_REPLICATION_DISABLING_REPLICATION_SERVER=Disabling replication port %s of \
server %s
-INFO_REPLICATION_STATUS_NO_BASEDNS=No base DNs found.
+INFO_REPLICATION_STATUS_NO_BASEDNS=No base DN's found.
INFO_REPLICATION_STATUS_BASEDN=Base DN
INFO_REPLICATION_STATUS_IS_REPLICATED=Replication
INFO_REPLICATION_STATUS_REPLICATED=%s - Replication Enabled
@@ -771,15 +768,15 @@
INFO_PROGRESS_POST_EXTERNAL_INITIALIZATION=Updating replication information on \
base DN %s
INFO_PROGRESS_PRE_INITIALIZATION_LOCAL_FINISHED_PROCEDURE=Now you can proceed \
- to the initialization of the contents of the base DNs on server %s. You can \
+ to the initialization of the contents of the base DN's on server %s. You can \
use the command import-ldif or the binary copy to do so.%n%nWhen the \
initialization is completed you must use the subcommand '%s' for replication \
- to work with the new base DNs.
+ to work with the new base DN's.
INFO_PROGRESS_PRE_INITIALIZATION_FINISHED_PROCEDURE=Now you can proceed \
- to the initialization of the contents of the base DNs on all the replicated \
+ to the initialization of the contents of the base DN's on all the replicated \
servers. You can use the command import-ldif or the binary copy to do \
so.%n%nWhen the initialization is completed you must use the subcommand \
- '%s' for replication to work with the new base DNs contents.
+ '%s' for replication to work with the new base DN's contents.
INFO_PROGRESS_POST_INITIALIZATION_FINISHED_PROCEDURE=Post initialization \
procedure completed successfully.
SEVERE_ERR_POOLING_PRE_EXTERNAL_INITIALIZATION=Error reading the progress of \
@@ -812,4 +809,1517 @@
INFO_REPLICATION_STATUS_MENU_PROMPT=Display Replication Status
INFO_REPLICATION_POST_ENABLE_INFO=Replication has been successfully enabled. \
Note that for replication to work you must initialize the contents of the \
- base DNs that are being replicated (use %s %s to do so).
+ base DN's that are being replicated (use %s %s to do so).
+INFO_CONTROL_PANEL_TITLE=OpenDS Control Panel
+INFO_PERSON_ICON_DESCRIPTION=Person object
+INFO_ORGANIZATION_ICON_DESCRIPTION=Organization
+INFO_ORGANIZATIONAL_UNIT_ICON_DESCRIPTION=Organizational unit
+INFO_STATIC_GROUP_ICON_DESCRIPTION=Static group
+INFO_DYNAMIC_GROUP_ICON_DESCRIPTION=Dynamic group
+INFO_VIRTUAL_STATIC_GROUP_ICON_DESCRIPTION=Virtual static group
+INFO_PASSWORD_POLICY_ICON_DESCRIPTION=Password policy
+MILD_ERR_REFERRAL_LIMIT_EXCEEDED=Referral limit (%d) reached.
+INFO_INDEX_MUST_BE_REBUILT_CELL_VALUE=Yes
+INFO_INDEX_MUST_NOT_BE_REBUILT_CELL_VALUE=No
+MILD_ERR_CANNOT_MODIFY_OBJECTCLASS_AND_RENAME=Cannot modify the objectclass \
+ and rename the entry.
+
+INFO_CTRL_PANEL_CATEGORY_DIRECTORY_DATA=Directory Data
+INFO_CTRL_PANEL_ACTION_MANAGE_ENTRIES=Manage Entries
+INFO_CTRL_PANEL_ACTION_NEW_BASEDN=New Base DN...
+INFO_CTRL_PANEL_ACTION_IMPORT_LDIF=Import LDIF...
+INFO_CTRL_PANEL_ACTION_EXPORT_LDIF=Export LDIF...
+INFO_CTRL_PANEL_ACTION_BACKUP=Backup...
+INFO_CTRL_PANEL_ACTION_RESTORE=Restore...
+INFO_CTRL_PANEL_CATEGORY_SCHEMA=Schema
+INFO_CTRL_PANEL_ACTION_MANAGE_SCHEMA=Manage Schema
+INFO_CTRL_PANEL_CATEGORY_INDEXES=Indexes
+INFO_CTRL_PANEL_ACTION_MANAGE_INDEXES=Manage Indexes
+INFO_CTRL_PANEL_ACTION_VERIFY_INDEXES=Verify Indexes...
+INFO_CTRL_PANEL_ACTION_REBUILD_INDEXES=Rebuild Indexes...
+INFO_CTRL_PANEL_CATEGORY_RUNTIME_OPTIONS=Runtime Options
+INFO_CTRL_PANEL_ACTION_JAVA_SETTINGS=Java Settings
+INFO_CTRL_PANEL_ACTION_WINDOWS_SERVICE=Windows Service
+MILD_ERR_CTRL_PANEL_DN_NOT_VALID=The DN is not valid.
+MILD_ERR_CTRL_PANEL_DN_NOT_VALID_WITH_VALUE=Invalid dn value: '%s'.
+MILD_ERR_CTRL_PANEL_PASSWORD_DO_NOT_MATCH=The provided passwords do not match.
+MILD_ERR_CTRL_PANEL_ATTRIBUTE_REQUIRED=You must provide a value for attribute \
+ %s.
+
+INFO_CTRL_PANEL_CONN_HANDLER_LDAP=LDAP
+INFO_CTRL_PANEL_CONN_HANDLER_LDAPS=LDAPS
+INFO_CTRL_PANEL_CONN_HANDLER_LDAP_STARTTLS=LDAP (allows StartTLS)
+INFO_CTRL_PANEL_CONN_HANDLER_JMX=JMX
+INFO_CTRL_PANEL_CONN_HANDLER_JMXS=JMX (secure)
+INFO_CTRL_PANEL_CONN_HANDLER_LDIF=LDIF
+INFO_CTRL_PANEL_CONN_HANDLER_SNMP=SNMP
+INFO_CTRL_PANEL_CONN_HANDLER_REPLICATION=Replication
+INFO_CTRL_PANEL_CONN_HANDLER_REPLICATION_SECURE=Replication (secure)
+INFO_CTRL_PANEL_CONN_HANDLER_ADMINISTRATION=Administration Connector
+INFO_CTRL_PANEL_CONN_HANDLER_OTHER=Other
+
+INFO_CTRL_PANEL_INDEX_SUBSTRING=Substring
+INFO_CTRL_PANEL_INDEX_PRESENCE=Presence
+INFO_CTRL_PANEL_INDEX_EQUALITY=Equality
+INFO_CTRL_PANEL_INDEX_APPROXIMATE=Approximate
+INFO_CTRL_PANEL_INDEX_ORDERING=Ordering
+
+INFO_CTRL_PANEL_INDEXES_HEADER_ATTRIBUTE=Attribute
+INFO_CTRL_PANEL_INDEXES_HEADER_INDEX_TYPES=Index Types
+INFO_CTRL_PANEL_INDEXES_HEADER_ENTRY_LIMIT=Entry Limit
+INFO_CTRL_PANEL_INDEXES_HEADER_REQUIRES_REBUILD=Requires Rebuild
+
+INFO_CTRL_PANEL_VLV_INDEXES_HEADER_NAME=Name
+INFO_CTRL_PANEL_VLV_INDEXES_HEADER_BASE_DN=Base DN
+INFO_CTRL_PANEL_VLV_INDEXES_HEADER_SCOPE=Scope
+INFO_CTRL_PANEL_VLV_INDEXES_HEADER_FILTER=Filter
+INFO_CTRL_PANEL_VLV_INDEXES_HEADER_SORT_ORDER=Sort Order
+INFO_CTRL_PANEL_VLV_INDEXES_HEADER_REQUIRES_REBUILD=Requires Rebuild
+
+INFO_CTRL_PANEL_BINARY_VALUE=- Binary Value -
+INFO_CTRL_PANEL_VALUE_IN_BASE64=- Value in Base64 -
+#
+# Note that the following property contains line breaks in HTML format (<br>)
+#
+INFO_CTRL_PANEL_INCOMPATIBLE_TASKS=The following task is running: %s<br>It \
+ cannot run simultaneously with task %s
+INFO_CTRL_PANEL_ADD_TO_GROUP_TASK_DESCRIPTION=Add entries to groups.
+INFO_CTRL_PANEL_ADDING_TO_GROUP=Updating group '%s'
+
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_MODIFY=Equivalent command line to modify \
+ the entry:
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_RENAME=Equivalent command line to rename \
+ the entry:
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_BASE_DN=Equivalent command line to \
+ delete the base DN:
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_BACKEND=Equivalent command line to \
+ delete the backend:
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_DOMAIN=Equivalent command line to \
+ disable replication on base DN '%s':
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_MODIFY_INDEX=Equivalent command line to \
+ modify the index:
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_MODIFY_VLV_INDEX=Equivalent command line to \
+ modify the VLV index:
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_BASE_DN=Equivalent command line to \
+ update the configuration:
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_ADDITIONAL_INDEXES=Equivalent command \
+ lines to generate default indexes:
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_INDEX=Equivalent command line to \
+ create the index:
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_VLV_INDEX=Equivalent command line to \
+ create the VLV index:
+#
+# Note that the following property contains line breaks in HTML format (<br>)
+#
+INFO_CTRL_PANEL_EQUIVALENT_ACTION_TO_UPDATE_JAVA_PROPERTIES=To update the java \
+ settings from the command line, edit the properties in file:<br><b>%s</b><br>\
+ Then run the following command-line:<br><b>%s</b><br><br>
+INFO_CTRL_PANEL_DELETE_BASE_DN_DESCRIPTION=Delete base DN '%s'.
+INFO_CTRL_PANEL_DELETE_BASE_DNS_DESCRIPTION=Delete base DN's %s.
+INFO_CTRL_PANEL_DELETE_BACKEND_DESCRIPTION=Delete backend '%s'.
+INFO_CTRL_PANEL_DELETE_BACKENDS_DESCRIPTION=Delete backends '%s'.
+INFO_CTRL_PANEL_DELETING_BASE_DN=Deleting base DN '%s'
+INFO_CTRL_PANEL_DELETING_BASE_DNS=Deleting base DN's %s
+INFO_CTRL_PANEL_DELETING_BACKEND=Deleting backend '%s'
+
+INFO_CTRL_PANEL_DELETING_DOMAIN=Disabling replication of base DN '%s'
+
+INFO_CTRL_PANEL_DELETE_ENTRY_TASK_DESCRIPTION=Delete entries.
+
+INFO_CTRL_PANEL_ENTRIES_DELETED=%d entries deleted.
+INFO_CTRL_PANEL_DELETING_ENTRY_SUMMARY=Deleting '%s'...
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_ENTRY=Equivalent command line to \
+ delete entry '%s':
+
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_INDEX=Equivalent command line to \
+ delete the index:
+INFO_CTRL_PANEL_DELETE_INDEX_TASK_DESCRIPTION=Delete indexes in backend '%s'.
+INFO_CTRL_PANEL_DELETE_INDEX_IN_BACKENDS_TASK_DESCRIPTION=Delete indexes in \
+backends '%s'.
+INFO_CTRL_PANEL_DELETING_INDEX=Deleting index '%s'
+INFO_CTRL_PANEL_DELETING_VLV_INDEX=Deleting VLV index '%s'
+
+INFO_CTRL_PANEL_DELETE_SCHEMA_ELEMENT_TASK_DESCRIPTION=Delete schema elements.
+INFO_CTRL_PANEL_DELETING_OBJECTCLASS=Deleting objectclass '%s'
+INFO_CTRL_PANEL_DELETING_ATTRIBUTE=Deleting attribute '%s'
+
+MILD_ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA=Error updating schema. Details: %s
+MILD_ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION=Error updating \
+ configuration. Details: %s
+MILD_ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY=Error checking entry. Details: %s
+
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_SCHEMA_ELEMENT_OFFLINE=This operation \
+ is equivalent to removing the following attribute from the schema definition \
+ entry (cn=schema) in file '%s':
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_SCHEMA_ELEMENT_ONLINE=Equivalent \
+command line to update the schema:
+INFO_CTRL_PANEL_MODIFY_ENTRY_TASK_DESCRIPTION=Modify entry '%s'.
+INFO_CTRL_PANEL_RENAMING_ENTRY=Renaming entry '%s' to '%s'
+INFO_CTRL_PANEL_MODIFYING_ENTRY=Modifying entry '%s'
+
+INFO_CTRL_PANEL_NEW_ENTRY_TASK_DESCRIPTION=New entry '%s'.
+INFO_CTRL_PANEL_CREATING_ENTRY=Creating entry '%s'
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_CREATE_ENTRY=Equivalent command line to \
+ create the entry:
+INFO_CTRL_PANEL_REBUILD_INDEX_TASK_DESCRIPTION=Rebuild indexes in '%s'.
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_REBUILD_INDEX=Equivalent command line to \
+ rebuild indexes in '%s':
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ENABLE_BACKEND=Equivalent command line to \
+ enable the backend '%s':
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DISABLE_BACKEND=Equivalent command line to \
+ disable the backend '%s':
+
+INFO_CTRL_PANEL_ENABLING_BACKEND=Enabling backend '%s'
+INFO_CTRL_PANEL_DISABLING_BACKEND=Disabling backend '%s'
+
+INFO_CTRL_PANEL_RESET_USER_PASSWORD_TASK_DESCRIPTION=Reset password for entry \
+'%s'.
+INFO_CTRL_PANEL_RESETTING_USER_PASSWORD=Updating password of entry '%s'
+
+INFO_CTRL_PANEL_RESTART_SERVER_TASK_DESCRIPTION=Restart Server.
+INFO_CTRL_PANEL_START_SERVER_TASK_DESCRIPTION=Start Server.
+INFO_CTRL_PANEL_STOP_SERVER_TASK_DESCRIPTION=Stop Server.
+
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_STOP_SERVER=Equivalent command line to stop \
+ the server:
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_START_SERVER=Equivalent command line to \
+ start the server:
+INFO_CTRL_PANEL_SERVER_STOPPED=Server Stopped
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ADD_SCHEMA_ELEMENT_OFFLINE=This operation is \
+ equivalent to adding the following attribute to the schema definition entry \
+ (cn=schema) in file '%s':
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ADD_SCHEMA_ENTRY_OFFLINE=This operation is \
+ equivalent to adding the following entry to the file '%s':
+INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ADD_SCHEMA_ELEMENT_ONLINE=Equivalent command \
+ line to update the schema:
+
+MILD_ERR_CTRL_PANEL_BACKEND_NOT_FOUND_SUMMARY=Could not find backend
+MILD_ERR_CTRL_PANEL_BACKEND_NOT_FOUND_DETAILS=The backend '%s' could not be \
+ found. Check main panel for more information.
+
+INFO_CTRL_PANEL_SERVER_NOT_RUNNING_SUMMARY=Server Not Running
+INFO_CTRL_PANEL_SERVER_NOT_RUNNING_DETAILS=To browse data the server must be \
+ running and you must provide authentication.
+
+INFO_CTRL_PANEL_INDICATES_REQUIRED_FIELD_LABEL=Indicates Required Field
+
+INFO_CTRL_PANEL_INDEX_REBUILD_REQUIRED_SUMMARY=Index Rebuild Required
+#
+# Note that the following two properties contain line breaks in HTML format
+# (<br>)
+#
+INFO_CTRL_PANEL_INDEX_REBUILD_REQUIRED_OFFLINE_DETAILS=The index configuration \
+ for '%s' was successfully modified. For the configuration to be taken into \
+ account the database index files must be regenerated. This can be done by \
+ using the 'Rebuild Indexes' tool or re-importing the contents of the backend \
+ '%s'.<br><br> Do you want to rebuild the index now?
+INFO_CTRL_PANEL_INDEX_REBUILD_REQUIRED_ONLINE_DETAILS=The index configuration \
+ for '%s' was successfully modified. For the configuration to be taken into \
+ account the database index files must be regenerated. This can be done by \
+ using the 'Rebuild Indexes' tool or re-importing the contents of the backend \
+ '%s'.<br>During the rebuilding of the indexes the backend '%s' will be \
+ disabled and none of its suffixes will be accessible.<br><br>Do you want to \
+ rebuild the index now?
+
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_SUMMARY=Authentication Required
+
+INFO_CTRL_PANEL_EQUIVALENT_COMMAND_LINE=Equivalent command line:
+
+INFO_CTRL_PANEL_REBUILDING_INDEXES_SUMMARY=Rebuilding indexes in backend '%s'...
+INFO_CTRL_PANEL_REBUILDING_INDEXES_SUCCESSFUL_SUMMARY=Index Rebuilding Complete
+INFO_CTRL_PANEL_REBUILDING_INDEXES_SUCCESSFUL_DETAILS=The indexes where \
+ successfully rebuilt.
+MILD_ERR_CTRL_PANEL_REBUILDING_INDEXES_ERROR_SUMMARY=Error Rebuilding Indexes
+MILD_ERR_CTRL_PANEL_REBUILDING_INDEXES_ERROR_DETAILS= An error occurred \
+ rebuilding index. Error code: %d.
+
+INFO_CTRL_PANEL_DETAILS_THROWABLE=Details: %s
+
+INFO_CTRL_PANEL_STARTING_SERVER_SUMMARY=Starting Server...
+INFO_CTRL_PANEL_STARTING_SERVER_SUCCESSFUL_SUMMARY=Start Complete
+INFO_CTRL_PANEL_STARTING_SERVER_SUCCESSFUL_DETAILS=The server started \
+ successfully
+MILD_ERR_CTRL_PANEL_STARTING_SERVER_ERROR_SUMMARY=Error during server start
+MILD_ERR_CTRL_PANEL_STARTING_SERVER_ERROR_DETAILS=An error starting the \
+ server. Error code: %d
+
+INFO_CTRL_PANEL_RESTARTING_SERVER_SUCCESSFUL_SUMMARY=Restart Complete
+INFO_CTRL_PANEL_RESTARTING_SERVER_SUCCESSFUL_DETAILS=The server restarted \
+ successfully
+MILD_ERR_CTRL_PANEL_RESTARTING_SERVER_ERROR_SUMMARY=Error during server restart
+MILD_ERR_CTRL_PANEL_RESTARTING_SERVER_ERROR_DETAILS=An error restarting the \
+ server. Error code: %d
+
+INFO_CTRL_PANEL_STOPPING_SERVER_SUMMARY=Stopping Server...
+INFO_CTRL_PANEL_STOPPING_SERVER_SUCCESSFUL_SUMMARY=Stop Complete
+INFO_CTRL_PANEL_STOPPING_SERVER_SUCCESSFUL_DETAILS=The server stopped \
+ successfully
+MILD_ERR_CTRL_PANEL_STOPPING_SERVER_ERROR_SUMMARY=Error during Server Stop
+MILD_ERR_CTRL_PANEL_STOPPING_SERVER_ERROR_DETAILS=An error stopping the \
+ server. Error code: %d
+
+INFO_CTRL_PANEL_CLOSE_WINDOW_WHEN_OPERATION_COMPLETES_LABEL=Close window when \
+ operation completes
+INFO_CTRL_PANEL_PLEASE_WAIT_SUMMARY=Please wait...
+INFO_CTRL_PANEL_PROGRESS_DIALOG_DETAILS_LABEL=Details:
+
+INFO_CTRL_PANEL_START_SERVER_PROGRESS_DLG_TITLE=Start Server
+INFO_CTRL_PANEL_STOP_SERVER_PROGRESS_DLG_TITLE=Stop Server
+INFO_CTRL_PANEL_RESTART_SERVER_PROGRESS_DLG_TITLE=Restart Server
+
+INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY=Confirmation Required
+#
+# Note that the following two properties contain line breaks in HTML format
+# (<br>)
+#
+INFO_CTRL_PANEL_CONFIRM_STOP_SERVER_DETAILS=If the server is stopped all the \
+ open connections to the server will be closed and the server will be not \
+ available.<br><br>Do you want to continue?
+INFO_CTRL_PANEL_CONFIRM_RESTART_SERVER_DETAILS=During the restart process all \
+ the open connections to the server will be closed and the server will be not \
+ available.<br><br>Do you want to continue?
+
+INFO_CTRL_PANEL_LOADING_PANEL_SUMMARY=Loading panel...
+INFO_CTRL_PANEL_CHECKING_SUMMARY=Checking...
+INFO_CTRL_PANEL_REFRESHING_LIST_SUMMARY=Refreshing List...
+INFO_CTRL_PANEL_READING_SUMMARY=Reading...
+INFO_CTRL_PANEL_READING_JAVA_SETTINGS_SUMMARY=Reading Java Settings...
+INFO_CTRL_PANEL_VERIFYING_AUTHENTICATION_SUMMARY=Verifying Authentication...
+INFO_CTRL_PANEL_READING_CONFIGURATION_SUMMARY=Reading Configuration...
+
+INFO_CTRL_PANEL_BASE_DN_LABEL=Base DN:
+INFO_CTRL_PANEL_FILTER_LABEL=Filter:
+INFO_CTRL_PANEL_APPLY_BUTTON_LABEL=Apply
+INFO_CTRL_PANEL_CLOSE_BUTTON_LABEL=Close
+INFO_CTRL_PANEL_CANCEL_BUTTON_LABEL=Cancel
+INFO_CTRL_PANEL_OK_BUTTON_LABEL=OK
+INFO_CTRL_PANEL_SAVE_BUTTON_LABEL=Save
+INFO_CTRL_PANEL_DO_NOT_SAVE_BUTTON_LABEL=Do Not Save
+INFO_CTRL_PANEL_INVALID_DN_DETAILS=The value %s is not a valid DN. Details: %s
+INFO_CTRL_PANEL_NO_BASE_DN_SELECTED=No base DN selected.
+INFO_CTRL_PANEL_INVALID_FILTER_DETAILS=The provided filter is not valid. \
+ Details: %s
+INFO_CTRL_PANEL_NO_MATCHES_FOUND_LABEL=No Matches Found
+INFO_CTRL_PANEL_MAXIMUM_CHILDREN_DISPLAYED=Maximum %d Children Displayed. Try \
+ Applying a Filter.
+INFO_CTRL_PANEL_SUBSTRING_SEARCH_INLINE_HELP=Use '*' for substring search.
+
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_TO_BROWSE_SUMMARY=The server is \
+ running. You must provide authentication to browse data.
+INFO_CTRL_PANEL_AUTHENTICATION_SERVER_MUST_RUN_TO_BROWSE_SUMMARY=To browse \
+ data the server must be running and you must provide authentication.
+INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_SUMMARY=An error occurred trying to \
+ connect to the server to read data. Details: %s
+INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_DETAILS=Connection Error
+
+INFO_CTRL_PANEL_ATTRIBUTE_LABEL=Attribute:
+INFO_CTRL_PANEL_ENTRY_LIMIT_LABEL=Entry Limit:
+INFO_CTRL_PANEL_INDEX_TYPE_LABEL=Index Type:
+INFO_CTRL_PANEL_APPROXIMATE_LABEL=Approximate
+INFO_CTRL_PANEL_EQUALITY_LABEL=Equality
+INFO_CTRL_PANEL_ORDERING_LABEL=Ordering
+INFO_CTRL_PANEL_PRESENCE_LABEL=Presence
+INFO_CTRL_PANEL_SUBSTRING_LABEL=Substring
+INFO_CTRL_PANEL_DELETE_INDEX_LABEL=Delete Index...
+INFO_CTRL_PANEL_SAVE_CHANGES_LABEL=Save Changes
+INFO_CTRL_PANEL_NON_CONFIGURABLE_INDEX_LABEL=This is a non-configurable \
+ internal index
+#
+# Note that the following property contains line breaks in HTML format (<br>)
+# and must begin with <html>
+#
+INFO_CTRL_PANEL_INDEX_MODIFIED_LABEL=<html>The index has been modified.<br>\
+ Rebuild of the indexes required (using 'Rebuild Index' or 'Import').
+
+INFO_CTRL_PANEL_CUSTOM_ATTRIBUTES_LABEL=Custom Attributes
+INFO_CTRL_PANEL_STANDARD_ATTRIBUTES_LABEL=Standard Attributes
+
+INFO_CTRL_PANEL_INDEX_DETAILS_LABEL=Index Details
+
+MILD_ERR_CTRL_PANEL_INVALID_ENTRY_LIMIT_LABEL=The entry limit must be an integer \
+ between %d and %d.
+
+MILD_ERR_CTRL_PANEL_NO_INDEX_TYPE_SELECTED=You must select at least one index \
+ type (approximate, equality, ordering, presence or substring).
+
+SEVERE_ERR_CTRL_PANEL_UNEXPECTED_DETAILS=Unexpected error. Details: %s
+MILD_ERR_CTRL_PANEL_ENTRY_ALREADY_EXISTS=Entry '%s' already exists.
+
+INFO_CTRL_PANEL_CREATING_NEW_ENTRY_SUMMARY=Creating new entry...
+INFO_CTRL_PANEL_CREATING_NEW_ENTRY_SUCCESSFUL_SUMMARY=Entry created
+INFO_CTRL_PANEL_CREATING_NEW_ENTRY_SUCCESSFUL_DETAILS=The entry was \
+ successfully created.
+MILD_ERR_CTRL_PANEL_CREATING_NEW_ENTRY_ERROR_SUMMARY=Error creating new entry
+MILD_ERR_CTRL_PANEL_CREATING_NEW_ENTRY_ERROR_DETAILS=An error occurred \
+ creating new entry.
+
+INFO_CTRL_PANEL_NEW_ENTRY_REQUIRES_SERVER_RUNNING=To create an entry the \
+ server must be running and you must provide authentication.
+INFO_CTRL_PANEL_NEW_ENTRY_REQUIRES_AUTHENTICATION=To create an entry you must \
+ provide authentication.
+MILD_ERR_LDIF_REPRESENTATION_REQUIRED=You must provide the LDIF representation \
+ of the entry.
+MILD_ERR_OBJECTCLASS_FOR_ENTRY_REQUIRED=You must provide the objectclass \
+ values of the entry.
+
+INFO_CTRL_PANEL_FILTER_INLINE_HELP_LABEL=For example: (|(cn=*)(sn=*))
+INFO_CTRL_PANEL_SUBTREE_INLINE_HELP_LABEL=For example: dc=subtree,dc=example,\
+dc=com
+INFO_CTRL_PANEL_VLV_INDEX_DETAILS_LABEL=VLV Index Details
+
+INFO_CTRL_PANEL_VLV_INDEX_NAME_LABEL=Name:
+INFO_CTRL_PANEL_VLV_INDEX_BASE_DN_LABEL=Base DN:
+INFO_CTRL_PANEL_VLV_INDEX_FILTER_LABEL=Filter:
+INFO_CTRL_PANEL_VLV_INDEX_SEARCH_SCOPE_LABEL=Search Scope:
+INFO_CTRL_PANEL_VLV_INDEX_SEARCH_FILTER_LABEL=Search Filter:
+INFO_CTRL_PANEL_VLV_INDEX_SORT_ORDER_LABEL=Sort Order:
+INFO_CTRL_PANEL_VLV_INDEX_MAX_BLOCK_SIZE_LABEL=Max Block Size:
+INFO_CTRL_PANEL_VLV_INDEX_BASE_OBJECT_LABEL=Base Object
+INFO_CTRL_PANEL_VLV_INDEX_SINGLE_LEVEL_LABEL=Single Level
+INFO_CTRL_PANEL_VLV_INDEX_SUBORDINATE_SUBTREE_LABEL=Subordinate Subtree
+INFO_CTRL_PANEL_VLV_INDEX_WHOLE_SUBTREE_LABEL=Whole Subtree
+INFO_CTRL_PANEL_VLV_INDEX_ADD_BUTTON_LABEL=Add
+INFO_CTRL_PANEL_VLV_INDEX_REMOVE_BUTTON_LABEL=Remove
+INFO_CTRL_PANEL_VLV_INDEX_MOVE_UP_BUTTON_LABEL=Move Up
+INFO_CTRL_PANEL_VLV_INDEX_MOVE_DOWN_BUTTON_LABEL=Move Down
+
+INFO_CTRL_PANEL_VLV_OTHER_BASE_DN_LABEL=Other:
+INFO_CTRL_PANEL_VLV_ASCENDING_LABEL=(ascending)
+INFO_CTRL_PANEL_VLV_DESCENDING_LABEL=(descending)
+
+MILD_ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_SUMMARY=Could not find schema
+MILD_ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_DETAILS=The schema could not be found. \
+ Check main panel for more information.
+INFO_CTRL_PANEL_VLV_INDEXES_NOT_DEFINED_CONFIRMATION_TITLE=Indexes Not Defined
+#
+# Note that the following property contains line breaks in HTML format (<br>)
+#
+INFO_CTRL_PANEL_VLV_INDEXES_NOT_DEFINED_CONFIRMATION_MSG=In order this VLV \
+ index to be effective the following indexes must be configured in '%s':<br>%s \
+ <br><br>Do you want to continue?
+
+INFO_CTRL_PANEL_VLV_INDEX_EQUALITY_TYPE=equality
+INFO_CTRL_PANEL_VLV_INDEX_SUBSTRING_TYPE=substring
+INFO_CTRL_PANEL_VLV_INDEX_ORDERING_TYPE=ordering
+INFO_CTRL_PANEL_VLV_INDEX_PRESENCE_TYPE=presence
+INFO_CTRL_PANEL_VLV_INDEX_APPROXIMATE_TYPE=approximate
+
+INFO_CTRL_PANEL_MUST_UPDATE_INDEX_DEFINITION_TYPE=You must update the \
+ definition of index '%s' to be of type %s.
+INFO_CTRL_PANEL_MUST_DEFINE_INDEX_TYPE=You must define the index '%s' to be of \
+ type %s.
+INFO_CTRL_PANEL_MUST_DEFINE_INDEX=You must define the index '%s'.
+MILD_ERR_CTRL_PANEL_NO_VLV_INDEX_NAME_PROVIDED=No VLV index name provided.
+MILD_ERR_CTRL_PANEL_VLV_INDEX_ALREADY_DEFINED=There is already a VLV index \
+ '%s' defined in backend '%s'.
+MILD_ERR_CTRL_PANEL_NO_BASE_DN_FOR_VLV_PROVIDED=You must provide a base DN.
+MILD_ERR_CTRL_PANEL_INVALID_BASE_DN_FOR_VLV_PROVIDED=The provided base DN is \
+ not valid. Details: %s
+MILD_ERR_CTRL_PANEL_NO_FILTER_FOR_VLV_PROVIDED=You must provide a filter for \
+ the index.
+MILD_ERR_CTRL_PANEL_INVALID_FILTER_FOR_VLV_PROVIDED=The provided filter is not \
+ valid. Details: %s
+MILD_ERR_CTRL_PANEL_NO_ATTRIBUTE_FOR_VLV_PROVIDED=You must select at least one \
+ attribute for the sort order.
+MILD_ERR_CTRL_PANEL_INVALID_MAX_BLOCK_SIZE_FOR_VLV_PROVIDED=The max block size \
+ must be an integer between %d and %d.
+
+INFO_CTRL_PANEL_ADD_TO_GROUP_TITLE=Add to Group
+INFO_CTRL_PANEL_ADD_TO_GROUP_ENTRIES_LABEL=Entries to be added:
+INFO_CTRL_PANEL_ADD_TO_GROUP_GROUPS_LABEL=Groups:
+INFO_CTRL_PANEL_ADD_GROUPS_BUTTON_LABEL=Add Groups...
+INFO_CTRL_PANEL_CHOOSE_GROUP_TITLE=Choose Groups
+MILD_ERR_CTRL_PANEL_GROUP_COULD_NOT_BE_FOUND=The group '%s' could not be found.
+MILD_ERR_CTRL_PANEL_NOT_A_STATIC_GROUP=The entry '%s' exists but it is not an \
+ static group.
+MILD_ERR_CTRL_PANEL_GROUP_NOT_PROVIDED=You must specify a group.
+
+
+INFO_CTRL_PANEL_ADDING_TO_GROUP_SUMMARY=Adding to Group...
+INFO_CTRL_PANEL_ADDING_TO_GROUP_SUCCESSFUL_SUMMARY=Entries added to groups
+INFO_CTRL_PANEL_ADDING_TO_GROUP_SUCCESSFUL_DETAILS=The entries were \
+ successfully added.
+MILD_ERR_CTRL_PANEL_ADDING_TO_GROUP_ERROR_SUMMARY=Error adding to groups
+MILD_ERR_CTRL_PANEL_ADDING_TO_GROUP_ERROR_DETAILS=An error occurred adding to \
+ groups.
+
+INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_TITLE=Attribute Syntax
+INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_DETAILS=Attribute Syntax Details
+INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_NAME=Name:
+INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_OID=OID:
+INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_DESCRIPTION=Description:
+INFO_CTRL_PANEL_USED_BY_ATTRIBUTES=Used by attributes:
+
+INFO_CTRL_PANEL_BACKEND_INDEXES_TITLE=Backend Indexes
+INFO_CTRL_PANEL_BACKEND_VLV_INDEXES_TITLE=Backend VLV Indexes
+
+INFO_CTRL_PANEL_NO_BACKUPS_FOUND=- No Backups Found -
+
+INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL=Browse...
+INFO_CTRL_PANEL_AVAILABLE_BACKUPS_LABEL=Available Backups:
+INFO_CTRL_PANEL_REFRESH_LIST_BUTTON_LABEL=Refresh List
+INFO_CTRL_PANEL_VERIFY_BACKUP_BUTTON_LABEL=Verify Backup
+MILD_ERR_ERROR_SEARCHING_BACKUPS_SUMMARY=Error searching backups
+
+
+INFO_CTRL_PANEL_BACKUP_PATH_LABEL=Backup Path:
+
+INFO_CTRL_PANEL_BACKUP_TITLE=Run Backup
+INFO_CTRL_PANEL_BACKUP_ALL_BACKENDS_LABEL=All Backends
+INFO_CTRL_PANEL_BACKUP_TYPE_LABEL=Backup Type:
+INFO_CTRL_PANEL_FULL_BACKUP_LABEL=Full Backup
+INFO_CTRL_PANEL_INCREMENTAL_BACKUP_LABEL=Incremental Backup (Specify Parent \
+ Backup Below)
+INFO_CTRL_PANEL_BACKUP_ID_LABEL=Backup ID:
+INFO_CTRL_PANEL_AVAILABLE_PARENT_BACKUPS_LABEL=Available Parent Backups:
+INFO_CTRL_PANEL_BACKUP_OPTIONS_LABEL=Backup Options:
+INFO_CTRL_PANEL_COMPRESS_DATA_LABEL=Compress Data (.gzip)
+INFO_CTRL_PANEL_ENCRYPT_DATA_LABEL=Encrypt Data
+INFO_CTRL_PANEL_GENERATE_MESSAGE_DIGEST_LABEL=Generate Message Digest of \
+ Backup Contents to Use as Checksum
+INFO_CTRL_PANEL_SIGN_MESSAGE_DIGEST_HASH_LABEL=Sign Message Digest Hash
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_BACKUP=The server is running. You \
+ must provide authentication to perform the backup.
+
+MILD_ERR_CTRL_PANEL_NO_BACKENDS_SELECTED=No backends selected.
+MILD_ERR_CTRL_PANEL_NO_BACKENDS_AVAILABLE=No backends available.
+MILD_ERR_CTRL_PANEL_NO_BACKUP_PATH_PROVIDED=No backup path provided.
+MILD_ERR_CTRL_PANEL_BACKUP_PATH_IS_A_FILE=The backup path '%s" exists and is a \
+ file.
+MILD_ERR_CTRL_PANEL_BACKUP_PATH_DOES_NOT_EXIST=The backup path '%s' does not \
+ exist.
+MILD_ERR_CTRL_PANEL_NO_BACKUP_ID_PROVIDED=No backup ID provided.
+MILD_ERR_CTRL_PANEL_BACKUP_PATH_EXISTS=The file '%s' exists. You must provide \
+ a directory to do the new backup.
+MILD_ERR_CTRL_PANEL_NO_PARENT_BACKUP_SELECTED=You have chosen to run an \
+ incremental backup. You must select the parent backup in the list of \
+ available parent backups.
+MILD_ERR_CTRL_PANEL_BACKUP_ID_ALREADY_EXIST=A backup with ID '%s' is already \
+ defined under '%s'.
+INFO_CTRL_PANEL_BACKUP_TASK_DESCRIPTION=Backup contents of '%s' to directory \
+ '%s'.
+INFO_CTRL_PANEL_RUN_BACKUP_SUMMARY=Creating backup of backend '%s'...
+INFO_CTRL_PANEL_RUN_BACKUP_ALL_BACKENDS=Creating backup of all backends...
+INFO_CTRL_PANEL_RUN_BACKUP_SUCCESSFUL_SUMMARY=Backup Complete
+INFO_CTRL_PANEL_RUN_BACKUP_SUCCESSFUL_DETAILS=The backup finished successfully.
+MILD_ERR_CTRL_PANEL_RUN_BACKUP_ERROR_SUMMARY=Error during Backup
+MILD_ERR_CTRL_PANEL_RUN_BACKUP_ERROR_DETAILS=An error occurred during the \
+ backup. Error code: %d.
+
+INFO_CTRL_PANEL_OTHER_BASE_DN_TITLE=Other Base DN
+MILD_ERR_CTRL_PANEL_NO_BASE_DN_PROVIDED=You must provide a base DN.
+MILD_ERR_CTRL_PANEL_INVALID_BASE_DN_PROVIDED=The provided base DN is not \
+ valid. Details: %s
+
+INFO_CTRL_PANEL_NO_VALUE_SPECIFIED=- No Value Specified -
+MILD_ERR_CTRL_PANEL_FILE_NOT_PROVIDED=You have to provide a value for the file.
+MILD_ERR_CTRL_PANEL_FILE_DOES_NOT_EXIST=The file '%s' does not exist.
+MILD_ERR_CTRL_PANEL_PATH_IS_A_DIRECTORY=The path '%s' is a directory. You \
+ must provide a file.
+MILD_ERR_CTRL_PANEL_CANNOT_READ_FILE=Cannot read file '%s'. Check that you \
+ have read rights to it.
+MILD_ERR_CTRL_PANEL_VALUE_IN_BASE_64_REQUIRED=You must provide a value in Base \
+ 64 format.
+MILD_ERR_CTRL_PANEL_ERROR_READING_FILE=An error occurred reading the contents \
+ of the file. Details: %s
+MILD_ERR_CTRL_PANEL_ERROR_DECODING_BASE_64=An error occurred decoding the \
+ provided base 64 string. Details: %s
+INFO_CTRL_PANEL_EDIT_BINARY_ATTRIBUTE_TITLE=Edit binary attribute
+
+INFO_CTRL_PANEL_USE_CONTENTS_OF_FILE=Use contents of file:
+INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE_64=Specify binary contents in base 64 \
+ format:
+INFO_CTRL_PANEL_REFRESH_BUTTON_LABEL=Refresh
+INFO_CTRL_PANEL_IMAGE_PREVIEW_LABEL=Image Preview:
+INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE_64=- Specify the value in Base 64 -
+INFO_CTRL_PANEL_IMAGE_OF_ATTRIBUTE_LABEL=Image of Attribute
+INFO_CTRL_PANEL_PREVIEW_NOT_AVAILABLE_LABEL=Preview not available.
+
+INFO_CTRL_PANEL_VIEW_BINARY_ATTRIBUTE_TITLE=View binary attribute
+INFO_CTRL_PANEL_VALUE_IN_BASE_64_LABEL=Value in base 64 format:
+
+INFO_CTRL_PANEL_MANAGE_ENTRIES_TITLE=Manage Entries
+
+INFO_CTRL_PANEL_NEW_USER_MENU=New User...
+INFO_CTRL_PANEL_NEW_GROUP_MENU=New Group...
+INFO_CTRL_PANEL_NEW_ORGANIZATION_MENU=New Organization...
+INFO_CTRL_PANEL_NEW_ORGANIZATIONAL_UNIT_MENU=New Organizational Unit...
+INFO_CTRL_PANEL_NEW_DOMAIN_MENU=New Domain...
+INFO_CTRL_PANEL_NEW_FROM_LDIF_MENU=New from LDIF...
+INFO_CTRL_PANEL_RESET_USER_PASSWORD_MENU=Reset User Password...
+INFO_CTRL_PANEL_ADD_TO_GROUP_MENU=Add to Group...
+INFO_CTRL_PANEL_COPY_DN_MENU=Copy DN
+INFO_CTRL_PANEL_DELETE_SELECTED_ENTRIES_TITLE=Delete Selected Entries
+INFO_CTRL_PANEL_DELETE_ENTRIES_CONFIRMATION_DETAILS=Do you want to delete the \
+ selected entries (including all the entries below them on the tree)?
+INFO_CTRL_PANEL_FILE_MENU=File
+INFO_CTRL_PANEL_EXIT_MENU=Exit
+INFO_CTRL_PANEL_HELP_MENU=Help
+INFO_CTRL_PANEL_ADMINISTRATION_GUIDE_MENU=Administration Guide
+INFO_CTRL_PANEL_DOCUMENTATION_WIKI_MENU=Documentation Wiki
+INFO_CTRL_PANEL_NEW_BROWSER_WINDOW_MENU=New Window
+INFO_CTRL_PANEL_VIEW_MENU=View
+INFO_CTRL_PANEL_ENTRIES_MENU=Entries
+INFO_CTRL_PANEL_CLOSE_MENU=Close
+INFO_CTRL_PANEL_FILE_MENU_DESCRIPTION=The file menu
+INFO_CTRL_PANEL_VIEW_MENU_DESCRIPTION=The view menu
+INFO_CTRL_PANEL_HELP_MENU_DESCRIPTION=The help menu
+INFO_CTRL_PANEL_ENTRIES_MENU_DESCRIPTION=The entries edition menu
+INFO_CTRL_PANEL_SIMPLIFIED_VIEW_MENU=Simplified View
+INFO_CTRL_PANEL_ATTRIBUTE_VIEW_MENU=Attribute View
+INFO_CTRL_PANEL_LDIF_VIEW_MENU=LDIF View
+INFO_CTRL_PANEL_DELETE_ENTRY_MENU=Delete Entry...
+INFO_CTRL_PANEL_DELETE_ENTRY_BUTTON=Delete Entry...
+INFO_CTRL_PANEL_DELETE_BASE_DN_MENU=Delete Base DN...
+INFO_CTRL_PANEL_DELETE_BACKEND_MENU=Delete Backend...
+
+INFO_CTRL_PANEL_DELETING_ENTRIES_SUMMARY=Deleting entries...
+INFO_CTRL_PANEL_DELETING_ENTRIES_COMPLETE=Entries Deleted
+INFO_CTRL_PANEL_DELETING_ENTRIES_SUCCESSFUL=The entries were successfully \
+ deleted.
+MILD_ERR_CTRL_PANEL_DELETING_ENTRIES_ERROR_SUMMARY=Error deleting entries
+MILD_ERR_CTRL_PANEL_DELETING_ENTRIES_ERROR_DETAILS=An error occurred deleting \
+ entries
+INFO_CTRL_PANEL_INDEXES_CATEGORY_NODE=Indexes
+INFO_CTRL_PANEL_VLV_INDEXES_CATEGORY_NODE=VLV Indexes
+
+INFO_CTRL_PANEL_BACKEND_LABEL=Backend:
+INFO_CTRL_PANEL_NO_BACKENDS_FOUND_LABEL=- No Backends Found -
+INFO_CTRL_PANEL_NO_BASE_DNS_FOUND_LABEL=- No Base DN's Found -
+INFO_CTRL_PANEL_NO_ITEM_SELECTED_LABEL=- No Item Selected -
+INFO_CTRL_PANEL_MULTIPLE_ITEMS_SELECTED_LABEL=- Multiple Items Selected -
+INFO_CTRL_PANEL_NO_ENTRY_SELECTED_LABEL=- No Entry Selected -
+INFO_CTRL_PANEL_MULTIPLE_ENTRIES_SELECTED_LABEL=- Multiple Entries Selected -
+INFO_CTRL_PANEL_NO_SCHEMA_ITEM_SELECTED_LABEL=- No Schema Item Selected -
+INFO_CTRL_PANEL_NEW_INDEX_BUTTON_LABEL=New Index...
+INFO_CTRL_PANEL_NEW_VLV_INDEX_BUTTON_LABEL=New VLV Index...
+INFO_CTRL_PANEL_NEW_INDEX_MENU=New Index...
+INFO_CTRL_PANEL_NEW_VLV_INDEX_MENU=New VLV Index...
+INFO_CTRL_PANEL_DELETE_INDEX_MENU=Delete Index...
+
+
+INFO_CTRL_PANEL_MANAGE_INDEXES_TITLE=Manage Indexes
+MILD_ERR_CTRL_PANEL_NO_BACKENDS_FOUND_TITLE=No Backends Found
+MILD_ERR_CTRL_PANEL_NO_BACKENDS_FOUND_DETAILS=There are no backends defined. \
+ To create and manage indexes, you must create a backend. To create a new \
+ backend you can use the action "New Base DN".
+MILD_ERR_CTRL_PANEL_NO_INDEX_SELECTED=No index selected on the tree.
+INFO_CTRL_PANEL_DELETE_INDEXES_TITLE=Delete Indexes
+INFO_CTRL_PANEL_CONFIRMATION_INDEXES_DELETE_DETAILS=Are you sure you want to \
+ delete the indexes '%s' defined in backend '%s'?
+INFO_CTRL_PANEL_DELETING_INDEXES_SUMMARY=Deleting indexes...
+INFO_CTRL_PANEL_DELETING_INDEXES_COMPLETE=Indexes Deleted
+INFO_CTRL_PANEL_DELETING_INDEXES_SUCCESSFUL=The indexes '%s' in backend '%s' \
+ were successfully deleted.
+MILD_ERR_CTRL_PANEL_DELETING_INDEXES_ERROR_SUMMARY=Error deleting indexes
+MILD_ERR_CTRL_PANEL_DELETING_INDEXES_ERROR_DETAILS=An error occurred deleting \
+ indexes '%s'.
+
+
+INFO_CTRL_PANEL_ATTRIBUTES_CATEGORY_NODE=Attributes
+INFO_CTRL_PANEL_OBJECTCLASSES_CATEGORY_NODE=Object Classes
+INFO_CTRL_PANEL_STANDARD_OBJECTCLASSES_CATEGORY_NODE=Standard
+INFO_CTRL_PANEL_CONFIGURATION_OBJECTCLASSES_CATEGORY_NODE=Server Configuration
+INFO_CTRL_PANEL_CUSTOM_OBJECTCLASSES_CATEGORY_NODE=Custom
+INFO_CTRL_PANEL_STANDARD_ATTRIBUTES_CATEGORY_NODE=Standard
+INFO_CTRL_PANEL_CONFIGURATION_ATTRIBUTES_CATEGORY_NODE=Server Configuration
+INFO_CTRL_PANEL_CUSTOM_ATTRIBUTES_CATEGORY_NODE=Custom
+INFO_CTRL_PANEL_MATCHING_RULES_CATEGORY_NODE=Matching Rules
+INFO_CTRL_PANEL_ATTRIBUTE_SYNTAXES_CATEGORY_NODE=Attribute Syntaxes
+INFO_CTRL_PANEL_NEW_OBJECTCLASS_BUTTON=New Object Class...
+INFO_CTRL_PANEL_NEW_ATTRIBUTE_BUTTON=New Attribute...
+INFO_CTRL_PANEL_NEW_OBJECTCLASS_MENU=New Object Class...
+INFO_CTRL_PANEL_NEW_ATTRIBUTE_MENU=New Attribute...
+INFO_CTRL_PANEL_DELETE_SCHEMA_ELEMENT_MENU=Delete...
+
+INFO_CTRL_PANEL_SCHEMA_ELEMENT_NAME=Name
+INFO_CTRL_PANEL_SCHEMA_ELEMENT_TYPE=Type
+INFO_CTRL_PANEL_PARENT_CLASS=Parent Class
+INFO_CTRL_PANEL_CHILD_CLASS=Child Class
+INFO_CTRL_PANEL_REQUIRED_ATTRIBUTES=Required Attributes
+INFO_CTRL_PANEL_OPTIONAL_ATTRIBUTES=Optional Attributes
+
+INFO_CTRL_PANEL_NO_SCHEMA_ITEM_SELECTED=No Schema Item Selected
+INFO_CTRL_PANEL_CATEGORY_ITEM_SELECTED=Category Item Selected
+INFO_CTRL_PANEL_MULTIPLE_ITEMS_SELECTED=Multiple Schema Items Selected
+
+MILD_ERR_CANNOT_DELETE_PARENT_OBJECTCLASS=ObjectClass '%s' is superior of the \
+ following classes: %s. You must redefine these classes so that they do not \
+ inherit from objectClass '%s' before deleting it.
+MILD_ERR_CANNOT_DELETE_PARENT_ATTRIBUTE=Attribute '%s' is superior of the \
+ following attributes: %s. You must redefine these attributes so that they do \
+ not inherit from attribute '%s' before deleting it.
+MILD_ERR_CANNOT_DELETE_ATTRIBUTE_WITH_DEPENDENCIES=Attribute '%s' is optional \
+ or required by the following objectClasses: %s. You must redefine these \
+ classes so that they do not depend on attribute '%s' before deleting it.
+INFO_CTRL_PANEL_MANAGE_SCHEMA_TITLE=Manage Schema
+INFO_CTRL_PANEL_DELETE_OBJECTCLASSES_TITLE=Delete Objectclasses
+INFO_CTRL_PANEL_DELETE_ATTRIBUTES_TITLE=Delete Attributes
+INFO_CTRL_PANEL_DELETE_OBJECTCLASSES_AND_ATTRIBUTES_TITLE=Delete Objectclasses \
+ and Attributes
+INFO_CTRL_PANEL_CONFIRMATION_DELETE_SCHEMA_ELEMENTS_DETAILS=Are you sure you \
+ want to delete the elements '%s' defined in the schema?
+INFO_CTRL_PANEL_DELETING_SCHEMA_ELEMENTS_SUMMARY=Deleting...
+INFO_CTRL_PANEL_DELETING_SCHEMA_ELEMENTS_COMPLETE=Schema Definitions Deleted
+INFO_CTRL_PANEL_DELETING_SCHEMA_ELEMENTS_SUCCESSFUL=The schema elements '%s' \
+ were successfully deleted
+MILD_ERR_CTRL_PANEL_DELETING_SCHEMA_ELEMENTS_ERROR_SUMMARY=Error deleting \
+ schema elements
+MILD_ERR_CTRL_PANEL_DELETING_SCHEMA_ELEMENTS_ERROR_DETAILS=An error occurred \
+ deleting schema elements. Check details for more information
+
+INFO_CTRL_PANEL_CONFIGURATION_ATTRIBUTE_TITLE=Configuration Attribute
+INFO_CTRL_PANEL_CONFIGURATION_OBJECTCLASS_TITLE=Configuration Object Class
+INFO_CTRL_PANEL_CUSTOM_ATTRIBUTE_TITLE=Custom Attribute
+INFO_CTRL_PANEL_CUSTOM_OBJECTCLASS_TITLE=Custom Object Class
+
+INFO_CTRL_PANEL_DELETE_ATTRIBUTE_BUTTON=Delete Attribute...
+INFO_CTRL_PANEL_DELETE_ATTRIBUTE_TITLE=Delete Attribute
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_ATTRIBUTE_DELETE=The server is \
+ running. You must provide authentication to delete the attribute.
+INFO_CTRL_PANEL_CONFIRMATION_DELETE_ATTRIBUTE_DETAILS=Are you sure you want to \
+ delete the attribute '%s' defined in the schema?
+INFO_CTRL_PANEL_DELETING_ATTRIBUTE_SUMMARY=Deleting attribute '%s'...
+INFO_CTRL_PANEL_DELETING_ATTRIBUTE_COMPLETE=Attribute Deleted
+INFO_CTRL_PANEL_DELETING_ATTRIBUTE_SUCCESSFUL=The attribute '%s' was \
+ successfully deleted
+MILD_ERR_CTRL_PANEL_DELETING_ATTRIBUTE_ERROR_SUMMARY=Error deleting \
+ attribute
+MILD_ERR_CTRL_PANEL_DELETING_ATTRIBUTE_ERROR_DETAILS=An error occurred deleting \
+ attribute '%s'. Check details for more information.
+
+INFO_CTRL_PANEL_DELETE_OBJECTCLASS_BUTTON=Delete Object Class...
+INFO_CTRL_PANEL_DELETE_OBJECTCLASS_TITLE=Delete Object Class
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_OBJECTCLASS_DELETE=The server is \
+ running. You must provide authentication to delete the object class.
+INFO_CTRL_PANEL_CONFIRMATION_DELETE_OBJECTCLASS_DETAILS=Are you sure you want \
+ to delete the object class '%s' defined in the schema?
+INFO_CTRL_PANEL_DELETING_OBJECTCLASS_SUMMARY=Deleting object class '%s'...
+INFO_CTRL_PANEL_DELETING_OBJECTCLASS_COMPLETE=Object class Deleted
+INFO_CTRL_PANEL_DELETING_OBJECTCLASS_SUCCESSFUL=The object class '%s' was \
+ successfully deleted
+MILD_ERR_CTRL_PANEL_DELETING_OBJECTCLASS_ERROR_SUMMARY=Error deleting \
+ object class
+MILD_ERR_CTRL_PANEL_DELETING_OBJECTCLASS_ERROR_DETAILS=An error occurred \
+ deleting object class '%s'. Check details for more information.
+
+INFO_CTRL_PANEL_DELETE_BACKEND_TITLE=Delete Backend
+INFO_CTRL_PANEL_SELECT_BACKENDS_TO_DELETE=Select the Backends to Delete:
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_BACKEND_DELETE=The server is \
+ running. You must provide authentication to delete a backend.
+
+INFO_CTRL_PANEL_DELETING_BACKENDS_SUMMARY=Deleting backends...
+INFO_CTRL_PANEL_DELETING_BACKENDS_COMPLETE=Backends Deleted
+INFO_CTRL_PANEL_DELETING_BACKENDS_SUCCESSFUL=The backends were successfully \
+ deleted.
+MILD_ERR_CTRL_PANEL_DELETING_BACKENDS_ERROR_SUMMARY=Error deleting backends
+MILD_ERR_CTRL_PANEL_DELETING_BACKENDS_ERROR_DETAILS=An error occurred deleting \
+ backends. Check details for more information.
+INFO_CTRL_PANEL_CONFIRMATION_DELETE_BACKENDS_DETAILS=The following backends \
+ will be deleted. All the entries defined on all the base DN's of the backend \
+ and all the index configuration will be deleted.
+INFO_CTRL_PANEL_DO_YOU_WANT_TO_CONTINUE=Do you want to continue?
+
+INFO_CTRL_PANEL_SELECT_ALL_BUTTON=Select All
+INFO_CTRL_PANEL_CLEAR_SELECTION_BUTTON=Clear Selection
+INFO_CTRL_PANEL_CONFIRMATION_DELETE_BASE_DNS_INDIRECT_DETAILS=The following \
+ backends will be deleted and all the configuration lost:
+
+INFO_CTRL_PANEL_DELETE_BASE_DN_TITLE=Delete Base DN
+INFO_CTRL_PANEL_SELECT_BASE_DNS_TO_DELETE=Select the Base DN's to Delete:
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_BASE_DN_DELETE=The server is \
+ running. You must provide authentication to delete a base DN.
+
+INFO_CTRL_PANEL_DELETING_BASE_DNS_SUMMARY=Deleting base DN's...
+INFO_CTRL_PANEL_DELETING_BASE_DNS_COMPLETE=Base DN's Deleted
+INFO_CTRL_PANEL_DELETING_BASE_DNS_SUCCESSFUL=The base DN's were successfully \
+ deleted.
+MILD_ERR_CTRL_PANEL_DELETING_BASE_DNS_ERROR_SUMMARY=Error deleting base DN's
+MILD_ERR_CTRL_PANEL_DELETING_BASE_DNS_ERROR_DETAILS=An error occurred deleting \
+ base DN's. Check details for more information.
+INFO_CTRL_PANEL_CONFIRMATION_DELETE_BASE_DNS_DETAILS=The following base DN's \
+ will be deleted. All the entries defined on the base DN's will be deleted.
+INFO_CTRL_PANEL_ERROR_SEARCHING_ENTRY_TITLE=Error searching entry
+#
+# Note that the following property contains line breaks in HTML format (<br>)
+#
+MILD_ERR_CTRL_PANEL_ERROR_SEARCHING_ENTRY=An error occurred searching entry \
+ '%s'. Details:<br>%s
+
+INFO_CTRL_PANEL_EXPORT_LDIF_TITLE=Export LDIF
+INFO_CTRL_PANEL_EXPORT_TO_FILE_LABEL=Export to File:
+INFO_CTRL_PANEL_EXPORT_OVERWRITE_LABEL=If file exists, overwrite contents of \
+ file instead of appending.
+INFO_CTRL_PANEL_EXPORT_OPTIONS=Export Options:
+INFO_CTRL_PANEL_EXPORT_GENERATE_SIGNED_HASH=Generate a Signed Hash
+INFO_CTRL_PANEL_EXPORT_WRAP_TEXT=Wrap Text at Column
+INFO_CTRL_PANEL_EXCLUDE_OPERATIONAL_ATTRIBUTES=Exclude Operational Attributes
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_EXPORT=The server is \
+ running. You must provide authentication to perform the export.
+
+MILD_ERR_CTRL_PANEL_NO_BACKEND_SELECTED=No backend selected.
+MILD_ERR_CTRL_PANEL_EXPORT_DIRECTORY_PROVIDED=The provided path '%s' exists \
+ and it is a directory.
+MILD_ERR_CTRL_PANEL_INVALID_WRAP_COLUMN=The value of the wrap column must be \
+ between %d and %d.
+#
+# Note that the following property contains line breaks in HTML format (<br>)
+#
+INFO_CTRL_PANEL_CONFIRMATION_EXPORT_LDIF_DETAILS=File '%s' exists and its \
+ contents will be overwritten.<br><br>Do you want to continue?
+INFO_CTRL_PANEL_EXPORTING_LDIF_SUMMARY=Exporting from backend '%s'...
+INFO_CTRL_PANEL_EXPORTING_LDIF_SUCCESSFUL_SUMMARY=Export Complete
+INFO_CTRL_PANEL_EXPORTING_LDIF_SUCCESSFUL_DETAILS=The export finished \
+ successfully.
+MILD_ERR_CTRL_PANEL_EXPORTING_LDIF_ERROR_SUMMARY=Error during Export
+MILD_ERR_CTRL_PANEL_EXPORTING_LDIF_ERROR_DETAILS=An error occurred during the \
+ export. Error code: %d.
+INFO_CTRL_PANEL_EXPORT_TASK_DESCRIPTION=Export of backend '%s' to file '%s'.
+
+INFO_CTRL_PANEL_IMPORT_LDIF_TITLE=Import LDIF
+INFO_CTRL_PANEL_DATA_IN_FILE_COMPRESSED=Data in File is Compressed (.gzip)
+INFO_CTRL_PANEL_IMPORT_TYPE_LABEL=Import Type:
+INFO_CTRL_PANEL_IMPORT_OVERWRITE_LABEL=Overwrite Any Existing Data
+INFO_CTRL_PANEL_IMPORT_APPEND_LABEL=Append to Existing Data
+INFO_CTRL_PANEL_FILE_TO_IMPORT_LABEL=File to Import:
+INFO_CTRL_PANEL_IMPORT_REPLACE_ENTRIES=Replace Entries that have Matching DN's \
+ with Imported Values
+INFO_CTRL_PANEL_SCHEMA_VALIDATION_LABEL=Schema Validation:
+INFO_CTRL_PANEL_REJECT_NOT_SCHEMA_COMPLIANT_LABEL=Reject Entries That are Not \
+ Schema-Compliant
+INFO_CTRL_PANEL_REJECTS_FILE_LABEL=Rejects File:
+INFO_CTRL_PANEL_WRITE_REJECTS_FILE_LABEL=Write Rejected Entries to a File
+INFO_CTRL_PANEL_OVERWRITE_REJECTS_FILE_LABEL=If file exists, overwrite \
+ contents of file instead of appending
+INFO_CTRL_PANEL_SKIPS_FILE_LABEL=Skips File:
+INFO_CTRL_PANEL_WRITE_SKIPS_FILE_LABEL=Write Skipped Entries to a File
+INFO_CTRL_PANEL_OVERWRITE_SKIPS_FILE_LABEL=If file exists, overwrite contents \
+ of file instead of appending
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_IMPORT=The server is \
+ running. You must provide authentication to perform the import.
+MILD_ERR_CTRL_PANEL_REJECTS_FILE_REQUIRED=You must provide a value for the \
+ rejects file.
+MILD_ERR_CTRL_PANEL_REJECTS_AND_SKIPS_MUST_BE_DIFFERENT=The rejects and skips \
+ file must have different values.
+MILD_ERR_CTRL_PANEL_SKIPS_FILE_REQUIRED=You must provide a value for the \
+ skips file.
+#
+# Note that the following property contains line breaks in HTML format (<br>)
+#
+INFO_CTRL_PANEL_CONFIRMATION_IMPORT_LDIF_DETAILS=All the data in backend '%s' \
+ will be overwritten.<br><br>Do you want to continue?
+INFO_CTRL_PANEL_IMPORTING_LDIF_SUMMARY=Importing to backend '%s'...
+INFO_CTRL_PANEL_IMPORTING_LDIF_SUCCESSFUL_SUMMARY=Import Complete
+INFO_CTRL_PANEL_IMPORTING_LDIF_SUCCESSFUL_DETAILS=The import finished \
+ successfully.
+MILD_ERR_CTRL_PANEL_IMPORTING_LDIF_ERROR_SUMMARY=Error during Import
+MILD_ERR_CTRL_PANEL_IMPORTING_LDIF_ERROR_DETAILS=An error occurred during the \
+ import. Error code: %d.
+INFO_CTRL_PANEL_IMPORT_TASK_DESCRIPTION=Import the contents of file '%s' to \
+ backend '%s'.
+INFO_CTRL_PANEL_DATA_INCLUSION_OPTIONS=Data Inclusion Options
+INFO_CTRL_PANEL_DATA_EXCLUSION_OPTIONS=Data Exclusion Options
+INFO_CTRL_PANEL_DNS_TO_INCLUDE=DN's to Include:
+INFO_CTRL_PANEL_DNS_TO_EXCLUDE=DN's to Exclude:
+INFO_CTRL_PANEL_ATTRIBUTES_TO_INCLUDE=Attributes to Include:
+INFO_CTRL_PANEL_ATTRIBUTES_TO_EXCLUDE=Attributes to Exclude:
+INFO_CTRL_PANEL_INCLUSION_FILTER=Inclusion Filter:
+INFO_CTRL_PANEL_EXCLUSION_FILTER=Exclusion Filter:
+INFO_CTRL_PANEL_SEPARATE_DNS_LINE_BREAK=Separate multiple DN's with a line \
+ break
+INFO_CTRL_PANEL_SEPARATE_ATTRIBUTES_COMMA=Separate multiple attributes with a \
+ comma (,)
+MILD_ERR_CTRL_PANEL_NOT_A_DESCENDANT_OF_BASE_DN=The base DN '%s' is not a \
+ descendant of any of the base DNs defined in backend '%s'.
+MILD_ERR_CTRL_PANEL_NOT_VALID_ATTRIBUTE_NAME=The attribute '%s' has not a \
+ valid name.
+MILD_ERR_CTRL_PANEL_INVALID_FILTER_DETAILS_WITH_VALUE=The provided value '%s' \
+ is not a valid filter. Details: %s
+
+INFO_CTRL_PANEL_INDEX_BROWSER_RIGHT_PANEL_TITLE=View Index Properties
+INFO_CTRL_PANEL_SCHEMA_BROWSER_RIGHT_PANEL_TITLE=View Schema Element
+
+INFO_CTRL_PANEL_INDEX_PANEL_TITLE=Index Properties
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_INDEX_EDITING=The server is \
+ running. You must provide authentication to edit the index.
+INFO_CTRL_PANEL_DELETE_INDEX_TITLE=Delete Index
+INFO_CTRL_PANEL_CONFIRMATION_INDEX_DELETE_DETAILS=Are you sure you want to \
+ delete the index '%s' defined in backend '%s'?
+INFO_CTRL_PANEL_DELETING_INDEX_SUMMARY=Deleting index...
+INFO_CTRL_PANEL_DELETING_INDEX_COMPLETE=Index Deleted
+INFO_CTRL_PANEL_DELETING_INDEX_SUCCESSFUL=The index '%s' in backend '%s' \
+ was successfully deleted.
+MILD_ERR_CTRL_PANEL_DELETING_INDEX_ERROR_SUMMARY=Error deleting index
+MILD_ERR_CTRL_PANEL_DELETING_INDEX_ERROR_DETAILS=An error occurred deleting \
+ index '%s'.
+INFO_CTRL_PANEL_MODIFYING_INDEX_TITLE=Modifying Index
+INFO_CTRL_PANEL_MODIFYING_INDEX_SUMMARY=Modifying index %s...
+INFO_CTRL_PANEL_MODIFYING_INDEX_COMPLETE=Index Modified
+INFO_CTRL_PANEL_MODIFYING_INDEX_SUCCESSFUL=The index '%s' in backend '%s' \
+ was successfully modified.
+MILD_ERR_CTRL_PANEL_MODIFYING_INDEX_ERROR_SUMMARY=Error modifying index
+MILD_ERR_CTRL_PANEL_MODIFYING_INDEX_ERROR_DETAILS=An error occurred modifying \
+ index '%s'.
+INFO_CTRL_PANEL_MODIFY_INDEX_TASK_DESCRIPTION=Modify index '%s' in backend '%s'.
+INFO_CTRL_PANEL_MODIFYING_INDEX_PROGRESS=Modifying index '%s'
+
+INFO_CTRL_PANEL_JAVA_PROPERTIES_TITLE=Java Settings
+INFO_CTRL_PANEL_JAVA_HOME_LABEL=Java Home:
+INFO_CTRL_PANEL_USE_OPENDS_JAVA_HOME=Use the value of the environment variable \
+ OPENDS_JAVA_HOME
+INFO_CTRL_PANEL_USE_OPENDS_JAVA_HOME_HELP=If OPENDS_JAVA_HOME is not defined \
+ the value below will be used as fallback.
+INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_HOME=Use the following value:
+INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_HOME_HELP=If the value is not found \
+ launching the command-line the value of OPENDS_JAVA_HOME will be used as \
+ fallback.
+INFO_CTRL_PANEL_JAVA_ARGUMENTS_LABEL=Java Arguments:
+INFO_CTRL_PANEL_USE_OPENDS_JAVA_ARGS=Use the value of the environment variable \
+ OPENDS_JAVA_ARGS
+INFO_CTRL_PANEL_USE_OPENDS_JAVA_ARGS_HELP=If OPENDS_JAVA_ARGS is not defined \
+ the values specified below will be used as fallback.
+INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_ARGS=Use the values specified below
+INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_ARGS_HELP=If the value is not \
+ specified for a command-line the value of OPENDS_JAVA_ARGS will be used as \
+ fallback.
+#
+# Note that the following property must begin with <html>
+#
+INFO_CTRL_PANEL_ONLINE_COMMAND_HELP=<html>(*)The operation is executed on its \
+ own process and could benefit from more memory allocation.
+#
+# Note that the following property must begin with <html>
+#
+INFO_CTRL_PANEL_OFFLINE_COMMAND_HELP=<html>(**)The operation is executed on \
+ the server's process and the command-line does not require many resources.
+MILD_ERR_CTRL_PANEL_READING_JAVA_SETTINGS_DETAILS=An unexpected error occurred \
+ reading the java settings. Details: %s
+MILD_ERR_CTRL_PANEL_ERR_READING_JAVA_SETTINGS_SUMMARY=Error reading java \
+ settings
+INFO_CTRL_PANEL_CHECKING_JAVA_ARGUMENTS_SUMMARY=Checking provided java \
+ arguments...
+MILD_ERR_CTRL_PANEL_JAVA_PATH_DOES_NOT_EXIST=Path '%s' does not exist.
+MILD_ERR_CTRL_PANEL_JAVA_PATH_NOT_A_DIRECTORY=Path '%s' is not a directory. \
+ You must specify the path to the java installation to be used.
+MILD_ERR_CTRL_PANEL_JAVA_BINARY_NOT_FOUND=Could not find binary '%s'. You \
+ must specify the path to the java installation to be used.
+#
+# Note that the following property contains line breaks in HTML format (<br>)
+#
+INFO_CTRL_PANEL_CONFIRM_NOT_WORKING_ARGUMENTS_DETAILS=The following java \
+ arguments could not be used with java binary '%s':<br>%s\
+ <br><br>The command-lines associated with those java arguments may not \
+ work.<br>Do you want to continue?
+MILD_ERR_CTRL_PANEL_ERROR_CHECKING_JAVA_SETTINGS_SUMMARY=Error checking java \
+ settings
+MILD_ERR_CTRL_PANEL_ERROR_CHECKING_JAVA_SETTINGS_DETAILS=An unexpected error \
+ occurred checking the provided java settings. Details: %s
+INFO_CTRL_PANEL_UPDATING_JAVA_SETTINGS_TITLE=Modifying Index
+INFO_CTRL_PANEL_UPDATING_JAVA_SETTINGS_SUMMARY=Updating java settings...
+INFO_CTRL_PANEL_UPDATING_JAVA_SETTINGS_COMPLETE=Java Settings Updated
+INFO_CTRL_PANEL_UPDATING_JAVA_SETTINGS_SUCCESSFUL=The java settings were \
+ successfully updated. When the command-lines are executed the new settings \
+ will be taken into account.
+MILD_ERR_CTRL_PANEL_UPDATING_JAVA_SETTINGS_ERROR_SUMMARY=Error updating java \
+ properties
+MILD_ERR_CTRL_PANEL_UPDATING_JAVA_SETTINGS_ERROR_DETAILS=An error occurred \
+ updating java settings.
+MILD_ERR_CTRL_PANEL_UPDATING_JAVA_SETTINGS_ERROR_CODE=An error occurred \
+ updating java settings. Error code: %d
+INFO_CTRL_PANEL_COMMAND_LINE_NAME_COLUMN=Command-Line Name
+INFO_CTRL_PANEL_JAVA_ARGUMENTS_COLUMN=Java Arguments
+INFO_CTRL_PANEL_SERVER_RUNTIME_CELL=%s (Server Runtime)
+INFO_CTRL_PANEL_ONLINE_COMMAND_LINE_CELL=%s (Online) (**)
+INFO_CTRL_PANEL_OFFLINE_COMMAND_LINE_CELL=%s (Offline) (**)
+INFO_CTRL_PANEL_UPDATE_JAVA_SETTINGS_TASK_DESCRIPTION=Update Java Settings.
+INFO_CTRL_PANEL_EDIT_LDAP_ENTRY_TITLE=Edit LDAP Entry
+INFO_CTRL_PANEL_MODIFYING_ENTRY_CHANGES_TITLE=Save Changes
+INFO_CTRL_PANEL_MODIFYING_ENTRY_SUMMARY=Saving changes of entry '%s'...
+INFO_CTRL_PANEL_MODIFYING_ENTRY_COMPLETE=Entry Updated
+INFO_CTRL_PANEL_MODIFYING_ENTRY_SUCCESSFUL=The entry '%s' was successfully \
+ updated.
+MILD_ERR_CTRL_PANEL_MODIFYING_ENTRY_ERROR_SUMMARY=Error saving changes
+MILD_ERR_CTRL_PANEL_MODIFYING_ENTRY_ERROR_DETAILS=An error occurred saving \
+ changes to entry '%s'.
+MILD_ERR_CTRL_PANEL_INVALID_ENTRY=The entry is not correct. Details: %s
+
+INFO_CTRL_PANEL_UNSAVED_CHANGES_DIALOG_TITLE=Unsaved Changes
+INFO_CTRL_PANEL_UNSAVED_CHANGES_SUMMARY=Unsaved Changes
+INFO_CTRL_PANEL_UNSAVED_INDEX_CHANGES_DETAILS=Save Changes to: '%s'?
+INFO_CTRL_PANEL_UNSAVED_ENTRY_CHANGES_DETAILS=Save Changes to: '%s'?
+INFO_CTRL_PANEL_DELETING_ENTRY_TITLE=Delete Entry
+INFO_CTRL_PANEL_DELETING_SUBTREE_TITLE=Delete Subtree
+INFO_CTRL_PANEL_DELETE_ENTRY_CONFIRMATION_DETAILS=Do you want to delete entry \
+ '%s'?
+INFO_CTRL_PANEL_DELETE_SUBTREE_CONFIRMATION_DETAILS=Do you want to delete \
+ subtree '%s' (including all the entries below it on the tree)?
+INFO_CTRL_PANEL_DELETING_ENTRY_COMPLETE=Entry Deleted
+INFO_CTRL_PANEL_DELETING_ENTRY_SUCCESSFUL=The entry '%s' was successfully \
+ deleted.
+MILD_ERR_CTRL_PANEL_DELETING_ENTRY_ERROR_SUMMARY=Error deleting entry
+MILD_ERR_CTRL_PANEL_DELETING_ENTRY_ERROR_DETAILS=An error occurred deleting \
+ entry '%s'.
+INFO_CTRL_PANEL_DELETING_SUBTREE_SUMMARY=Deleting subtree '%s'...
+INFO_CTRL_PANEL_DELETING_SUBTREE_COMPLETE=Subtree Deleted
+INFO_CTRL_PANEL_DELETING_SUBTREE_SUCCESSFUL=The subtree '%s' was successfully \
+ deleted.
+MILD_ERR_CTRL_PANEL_DELETING_SUBTREE_ERROR_SUMMARY=Error deleting subtree
+MILD_ERR_CTRL_PANEL_DELETING_SUBTREE_ERROR_DETAILS=An error occurred deleting \
+ subtree '%s'.
+INFO_CTRL_PANEL_LDAP_FILTER=LDAP Filter:
+INFO_CTRL_PANEL_USERS_FILTER=Users
+INFO_CTRL_PANEL_GROUPS_FILTER=Groups
+INFO_CTRL_PANEL_OTHER_BASE_DN=Other...
+
+INFO_CTRL_PANEL_NON_EDITABLE_ATTRIBUTES=Non-editable Attributes:
+
+INFO_CTRL_OBJECTCLASS_DESCRIPTOR=Objectclass: %s
+INFO_CTRL_AUXILIARY_OBJECTCLASS_DESCRIPTOR=Auxiliary objectclasses: %s
+
+INFO_CTRL_PANEL_LOGIN_PANEL_TITLE=Authentication Required
+INFO_CTRL_PANEL_BIND_DN_LABEL=Bind DN:
+INFO_CTRL_PANEL_BIND_PASSWORD_LABEL=Password:
+
+#
+# Note that the following two properties contain line breaks in HTML format
+# (<br>)
+#
+INFO_CTRL_PANEL_RUNNING_TASKS_CONFIRMATION_DETAILS=The following tasks are \
+ running:<br>%s<br><br>If you exit the tasks will continue but you will have \
+ to check the error logs to see if they complete successfully.<br><br>Do you \
+ want to continue?
+
+INFO_CTRL_PANEL_MATCHING_RULE_PANEL_TITLE=Matching Rule
+INFO_CTRL_PANEL_MATCHING_RULE_DETAILS=Matching Rule Details
+INFO_CTRL_PANEL_MATCHING_RULE_NAME=Name:
+INFO_CTRL_PANEL_MATCHING_RULE_OID=OID:
+INFO_CTRL_PANEL_MATCHING_RULE_DESCRIPTION=Description:
+INFO_CTRL_PANEL_MATCHING_RULE_SYNTAX=Syntax:
+INFO_CTRL_PANEL_MATCHING_RULE_TYPE=Type:
+INFO_CTRL_PANEL_MATCHING_RULE_USED_BY=Used by Attributes:
+
+INFO_CTRL_PANEL_NO_PARENT_FOR_ATTRIBUTE=- No parent -
+INFO_CTRL_PANEL_NO_MATCHING_RULE_FOR_ATTRIBUTE=- No matching rule -
+INFO_CTRL_PANEL_NEW_ATTRIBUTE_PANEL_TITLE=New Attribute
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_TO_CREATE_ATTRIBUTE_SUMMARY=The server \
+ is running. You must provide authentication to create an attribute in the \
+ schema.
+MILD_ERR_CTRL_PANEL_ATTRIBUTE_NAME_REQUIRED=You must provide a name for the \
+ attribute.
+MILD_ERR_CTRL_PANEL_INVALID_ATTRIBUTE_NAME=The provided name is not valid. \
+ Details: %s
+MILD_ERR_CTRL_PANEL_ATTRIBUTE_NAME_ALREADY_IN_USE=The provided name '%s' \
+ already exists in the schema (defined as %s).
+MILD_ERR_CTRL_PANEL_OID_NOT_VALID=The provided OID is not valid. Details: %s
+MILD_ERR_CTRL_PANEL_OID_ALREADY_IN_USE=The provided OID '%s' \
+ already exists in the schema (defined as %s).
+MILD_ERR_CTRL_PANEL_EMPTY_ALIAS=You have provided an empty alias.
+MILD_ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE=The provided alias '%s' \
+ already exists in the schema (defined as %s).
+INFO_CTRL_PANEL_CREATING_ATTRIBUTE_SUMMARY=Creating attribute '%s'...
+INFO_CTRL_PANEL_CREATING_ATTRIBUTE_COMPLETE=Attribute created in schema
+INFO_CTRL_PANEL_CREATING_ATTRIBUTE_SUCCESSFUL=The attribute '%s' was \
+ successfully created.
+MILD_ERR_CTRL_PANEL_CREATING_ATTRIBUTE_ERROR_SUMMARY=Error creating \
+ attribute
+MILD_ERR_CTRL_PANEL_CREATING_ATTRIBUTE_ERROR_DETAILS=An error occurred \
+ creating attribute '%s'. Check details for more information.
+INFO_CTRL_PANEL_TYPE_ATTRIBUTE=attribute
+INFO_CTRL_PANEL_TYPE_OBJECT_CLASS=object class
+INFO_CTRL_PANEL_TYPE_MATCHING_RULE=matching rule
+INFO_CTRL_PANEL_TYPE_ATTRIBUTE_SYNTAX=syntax
+INFO_CTRL_PANEL_SYNTAX_INLINE_HELP=The syntax defines the type of value of the \
+ attribute
+INFO_CTRL_PANEL_EXTRA_OPTIONS_EXPANDER=Extra Options
+INFO_CTRL_PANEL_ATTRIBUTE_TYPE_OPTIONS_EXPANDER=Attribute Type Options
+INFO_CTRL_PANEL_MATCHING_RULE_OPTIONS_EXPANDER=Matching Rule Options
+INFO_CTRL_PANEL_SEPARATED_WITH_COMMAS_HELP=Separated with commas
+INFO_CTRL_PANEL_SCHEMA_FILE_ATTRIBUTE_HELP=The file (under 'config%sschema') \
+ where the attribute definition will be stored.
+INFO_CTRL_PANEL_MATCHING_RULE_APPROXIMATE_HELP=The matching rule to be used \
+ for approximate requests
+INFO_CTRL_PANEL_MATCHING_RULE_EQUALITY_HELP=The matching rule to be used for \
+ equality requests
+INFO_CTRL_PANEL_MATCHING_RULE_ORDERING_HELP=The matching rule to be used for \
+ ordering requests
+INFO_CTRL_PANEL_MATCHING_RULE_SUBSTRING_HELP=The matching rule to be used for \
+ substring requests
+INFO_CTRL_PANEL_DEFAULT_DEFINED_IN_SYNTAX=- Default defined in syntax (%s) -
+INFO_CTRL_PANEL_NEW_ATTRIBUTE_TASK_DESCRIPTION=Create new attribute '%s' in \
+ schema.
+INFO_CTRL_PANEL_CREATING_ATTRIBUTE_PROGRESS=Creating attribute '%s'
+INFO_CTRL_PANEL_ATTRIBUTE_NAME_LABEL=Name:
+INFO_CTRL_PANEL_ATTRIBUTE_PARENT_LABEL=Parent:
+INFO_CTRL_PANEL_ATTRIBUTE_OID_LABEL=OID:
+INFO_CTRL_PANEL_ATTRIBUTE_ALIASES_LABEL=Aliases:
+INFO_CTRL_PANEL_ATTRIBUTE_ORIGIN_LABEL=Origin:
+INFO_CTRL_PANEL_ATTRIBUTE_FILE_LABEL=File:
+INFO_CTRL_PANEL_ATTRIBUTE_DESCRIPTION_LABEL=Description:
+INFO_CTRL_PANEL_ATTRIBUTE_USAGE_LABEL=Usage:
+INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_LABEL=Parent:
+INFO_CTRL_PANEL_ATTRIBUTE_APPROXIMATE_MATCHING_RULE_LABEL=Approximate \
+ Matching Rule:
+INFO_CTRL_PANEL_ATTRIBUTE_EQUALITY_MATCHING_RULE_LABEL=Equality \
+ Matching Rule:
+INFO_CTRL_PANEL_ATTRIBUTE_ORDERING_MATCHING_RULE_LABEL=Ordering \
+ Matching Rule:
+INFO_CTRL_PANEL_ATTRIBUTE_SUBSTRING_MATCHING_RULE_LABEL=Substring \
+ Matching Rule:
+INFO_CTRL_PANEL_ATTRIBUTE_NON_MODIFIABLE_LABEL=Non Modifiable
+INFO_CTRL_PANEL_ATTRIBUTE_SINGLE_VALUED_LABEL=Single Valued
+INFO_CTRL_PANEL_ATTRIBUTE_MULTI_VALUED_LABEL=Multivalued
+INFO_CTRL_PANEL_ATTRIBUTE_COLLECTIVE_LABEL=Collective
+INFO_CTRL_PANEL_ATTRIBUTE_OBSOLETE_LABEL=Obsolete
+INFO_CTRL_PANEL_ATTRIBUTE_OPERATIONAL_LABEL=Operational
+
+INFO_CTRL_PANEL_NEW_BACKEND_LABEL=New Backend:
+INFO_CTRL_PANEL_NEW_BASE_DN_TITLE=New Base DN
+INFO_CTRL_PANEL_BASE_DN_EXAMPLE=For example: dc=example,dc=com
+INFO_CTRL_PANEL_DIRECTORY_DATA_LABEL=Directory Data:
+INFO_CTRL_PANEL_ONLY_CREATE_BASE_ENTRY_LABEL=Only Create Base Entry
+INFO_CTRL_PANEL_LEAVE_DATABASE_EMPTY_LABEL=Leave Database Empty
+INFO_CTRL_PANEL_IMPORT_FROM_LDIF_LABEL=Import Data From LDIF File
+INFO_CTRL_PANEL_IMPORT_AUTOMATICALLY_GENERATED_LABEL=Import Automatically \
+ Generated Example Data
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_CREATE_BASE_DN=The server is \
+ running. You must provide authentication to create a new base DN.
+INFO_CTRL_PANEL_IMPORT_LDIF_PATH_LABEL=Path:
+INFO_CTRL_PANEL_NUMBER_OF_USER_ENTRIES_LABEL=Number of User Entries:
+MILD_ERR_NEW_BACKEND_NAME_REQUIRED=You must provide a name for the new backend.
+MILD_ERR_BACKEND_ALREADY_EXISTS=There is already an existing backend with \
+ name: %s
+MILD_ERR_NEW_BASE_DN_VALUE_REQUIRED=You must provide a value for the Base DN.
+MILD_ERR_BASE_DN_ALREADY_EXISTS=The base DN '%s' is already defined.
+MILD_ERR_BASE_DN_ANCESTOR_EXISTS=The backend already contains another base DN \
+ that is within the same hierarchical path (%s is an ancestor of the provided \
+ base DN).
+MILD_ERR_BASE_DN_DN_IS_ANCESTOR_OF=The backend already contains another base DN \
+ that is within the same hierarchical path (%s is a descendant of the provided \
+ base DN).
+MILD_ERR_NUMBER_OF_ENTRIES_INVALID=The number of user entries to generate must \
+ be between %d and %d.
+INFO_CTRL_PANEL_CREATING_BASE_DN_SUMMARY=Creating base DN '%s'...
+INFO_CTRL_PANEL_CREATING_BASE_DN_COMPLETE=Base DN Created
+INFO_CTRL_PANEL_CREATING_BASE_DN_SUCCESSFUL=The base DN '%s' was successfully \
+ created.
+MILD_ERR_CTRL_PANEL_CREATING_BASE_DN_ERROR_SUMMARY=Error during creation of \
+ base DN '%s'. Check 'Details' text area for more information.
+MILD_ERR_CTRL_PANEL_CREATING_BASE_DN_ERROR_DETAILS=An error occurred during \
+ the creation of the Base DN. Error code: %d.
+INFO_CTRL_PANEL_NEW_BASE_DN_TASK_DESCRIPTION=Create new base DN '%s' in \
+ backend '%s'.
+INFO_CTRL_PANEL_CREATING_BACKEND_PROGRESS=Creating backend '%s' containing \
+ base DN '%s'
+INFO_CTRL_PANEL_CREATING_BASE_DN_PROGRESS=Creating base DN '%s' in backend \
+ '%s'
+INFO_CTRL_PANEL_CREATING_ADDITIONAL_INDEXES_PROGRESS=Creating default indexes
+
+INFO_CTRL_NEW_ORGANIZATION_PANEL_TITLE=New Organization
+MILD_ERR_CTRL_PANEL_NAME_OF_ORGANIZATION_REQUIRED=You must provide a value for \
+the name of the organization.
+INFO_CTRL_PANEL_NEW_ORGANIZATION_NAME_LABEL=Name:
+INFO_CTRL_PANEL_NEW_ORGANIZATION_DESCRIPTION_LABEL=Description:
+INFO_CTRL_PANEL_NEW_ORGANIZATION_ENTRY_DN_LABEL=Entry DN:
+
+INFO_CTRL_NEW_DOMAIN_PANEL_TITLE=New Domain
+MILD_ERR_CTRL_PANEL_NAME_OF_DOMAIN_REQUIRED=You must provide a value for the \
+ name of the domain.
+
+INFO_CTRL_PANEL_NEW_ENTRY_FROM_LDIF_TITLE=New Entry from LDIF
+INFO_CTRL_PANEL_LDIF_SYNTAX_LABEL=Enter LDIF syntax for the new entry:
+INFO_CTRL_PANEL_CHECK_SYNTAX_BUTTON=Check Syntax
+
+INFO_CTRL_PANEL_NEW_GROUP_PANEL_TITLE=New Group
+MILD_ERR_CTRL_PANEL_NAME_OF_GROUP_REQUIRED=You must provide a value for the \
+ name of the group.
+MILD_ERR_CTRL_PANEL_MEMBER_NOT_FOUND=The entry '%s' could not be found.
+MILD_ERR_CTRL_PANEL_MEMBER_VALUE_NOT_VALID=The provided value as member \
+ '%s' is not valid. Details: %s
+MILD_ERR_CTRL_PANEL_MEMBER_REQUIRED=You must provide a member for the group.
+MILD_ERR_CTRL_PANEL_GROUP_FILTER_REQUIRED=You must provide an LDAP URL with a \
+ filter for the group.
+MILD_ERR_CTRL_PANEL_GROUP_FILTER_NOT_VALID=The provided LDAP URL value is not \
+ valid. Details: %s
+MILD_ERR_CTRL_PANEL_REFERENCE_GROUP_NOT_FOUND=The provided Reference Group \
+ could not be found.
+MILD_ERR_CTRL_PANEL_REFERENCE_GROUP_NOT_DYNAMIC=The provided Reference Group \
+ exists but it is not a dynamic group.
+MILD_ERR_CTRL_PANEL_REFERENCE_GROUP_NOT_VALID=The provided Dynamic Group \
+ Reference DN is not valid. Details: %s
+INFO_CTRL_PANEL_NEW_GROUP_NAME_LABEL=Name:
+INFO_CTRL_PANEL_NEW_GROUP_DESCRIPTION_LABEL=Description:
+INFO_CTRL_PANEL_NEW_GROUP_ENTRY_DN_LABEL=Entry DN:
+INFO_CTRL_PANEL_NEW_GROUP_MEMBERS_LABEL=Members:
+INFO_CTRL_PANEL_STATIC_GROUP_LABEL=Static Group
+INFO_CTRL_PANEL_DYNAMIC_GROUP_LABEL=Dynamic Group
+INFO_CTRL_PANEL_VIRTUAL_STATIC_GROUP_LABEL=Virtual Static Group
+INFO_CTRL_PANEL_GROUP_MEMBER_DNS_LABEL=Member DNs:
+INFO_CTRL_PANEL_GROUP_FILTER_LABEL=LDAP URL:
+INFO_CTRL_PANEL_ADD_MEMBERS_BUTTON=Add Members...
+INFO_CTRL_PANEL_ADD_MEMBERS_LABEL=Add Members
+INFO_CTRL_PANEL_DYNAMIC_GROUP_REFERENCE_LABEL=Dynamic Group Reference DN:
+INFO_CTRL_PANEL_CHOOSE_REFERENCE_GROUP=Choose Reference Group
+
+
+INFO_CTRL_PANEL_NEW_INDEX_TITLE=New Index
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_NEW_INDEX=The server is running. \
+ You must provide authentication to create an index.
+MILD_ERR_INFO_CTRL_ATTRIBUTE_NAME_REQUIRED=No attribute name selected.
+MILD_ERR_INFO_CTRL_PANEL_ENTRY_LIMIT_NOT_VALID=The entry limit must be an \
+ integer between %d and %d.
+MILD_ERR_INFO_ONE_INDEX_TYPE_MUST_BE_SELECTED=You must select at least one \
+ index type (approximate, equality, ordering, presence or substring).
+INFO_CTRL_PANEL_CREATING_NEW_INDEX_SUMMARY=Creating new index '%s'...
+INFO_CTRL_PANEL_CREATING_NEW_INDEX_SUCCESSFUL_SUMMARY=Index created
+INFO_CTRL_PANEL_CREATING_NEW_INDEX_SUCCESSFUL_DETAILS=The new index '%s' was \
+ successfully created.
+MILD_ERR_CTRL_PANEL_CREATING_NEW_INDEX_ERROR_SUMMARY=Error creating index
+MILD_ERR_CTRL_PANEL_CREATING_NEW_INDEX_ERROR_DETAILS=An error occurred \
+ creating index.
+INFO_CTRL_PANEL_NEW_INDEX_TASK_DESCRIPTION=Create new index '%s' in backend \
+ '%s'.
+INFO_CTRL_PANEL_CREATING_NEW_INDEX_PROGRESS=Creating index '%s'
+
+INFO_CTRL_PANEL_NEW_OBJECTCLASS_PANEL_TITLE=New Object Class
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_TO_CREATE_OBJECTCLASS_SUMMARY=The \
+ server is running. You must provide authentication to create an attribute in \
+ the schema.
+MILD_ERR_CTRL_PANEL_OBJECTCLASS_NAME_REQUIRED=You must provide a name for the \
+ object class.
+MILD_ERR_CTRL_PANEL_INVALID_OBJECTCLASS_NAME=The provided name is not valid. \
+ Details: %s
+MILD_ERR_CTRL_PANEL_OBJECTCLASS_NAME_ALREADY_IN_USE=The provided name '%s' \
+ already exists in the schema (defined as %s).
+INFO_CTRL_PANEL_CREATING_OBJECTCLASS_SUMMARY=Creating object class '%s'...
+INFO_CTRL_PANEL_CREATING_OBJECTCLASS_COMPLETE=Object class created in schema
+INFO_CTRL_PANEL_CREATING_OBJECTCLASS_SUCCESSFUL=The object class '%s' was \
+ successfully created.
+MILD_ERR_CTRL_PANEL_CREATING_OBJECTCLASS_ERROR_SUMMARY=Error creating \
+ object class
+MILD_ERR_CTRL_PANEL_CREATING_OBJECTCLASS_ERROR_DETAILS=An error occurred \
+ creating object class '%s'. Check details for more information.
+INFO_CTRL_PANEL_OBJECTCLASS_OBSOLETE_LABEL=Obsolete
+INFO_CTRL_PANEL_OBJECTCLASS_ABSTRACT_LABEL=Abstract
+INFO_CTRL_PANEL_OBJECTCLASS_STRUCTURAL_LABEL=Structural
+INFO_CTRL_PANEL_OBJECTCLASS_AUXILIARY_LABEL=Auxiliary
+INFO_CTRL_PANEL_ADDREMOVE_AVAILABLE_ATTRIBUTES=Available Attributes:
+INFO_CTRL_PANEL_ADDREMOVE_REQUIRED_ATTRIBUTES=Required Attributes:
+INFO_CTRL_PANEL_ADDREMOVE_OPTIONAL_ATTRIBUTES=Optional Attributes:
+INFO_CTRL_PANEL_INHERITED_ATTRIBUTES_HELP=(*) Inherited Attribute
+INFO_CTRL_PANEL_SCHEMA_FILE_OBJECTCLASS_HELP=The file (under 'config%sschema') \
+ where the object class definition will be stored.
+INFO_CTRL_PANEL_NEW_OBJECTCLASS_TASK_DESCRIPTION=Create new object class '%s' \
+ in schema.
+INFO_CTRL_PANEL_CREATING_OBJECTCLASS_PROGRESS=Creating object class '%s'
+INFO_CTRL_PANEL_OBJECTCLASS_NAME_LABEL=Name:
+INFO_CTRL_PANEL_OBJECTCLASS_PARENT_LABEL=Parent:
+INFO_CTRL_PANEL_OBJECTCLASS_OID_LABEL=OID:
+INFO_CTRL_PANEL_OBJECTCLASS_ALIASES_LABEL=Aliases:
+INFO_CTRL_PANEL_OBJECTCLASS_ORIGIN_LABEL=Origin:
+INFO_CTRL_PANEL_OBJECTCLASS_FILE_LABEL=File:
+INFO_CTRL_PANEL_OBJECTCLASS_DESCRIPTION_LABEL=Description:
+INFO_CTRL_PANEL_OBJECTCLASS_TYPE_LABEL=Type:
+INFO_CTRL_PANEL_OBJECTCLASS_ATTRIBUTES_LABEL=Attributes:
+
+INFO_CTRL_PANEL_NEW_OU_NAME_LABEL=Name:
+INFO_CTRL_PANEL_NEW_OU_DESCRIPTION_LABEL=Description:
+INFO_CTRL_PANEL_NEW_OU_ENTRY_DN_LABEL=Entry DN:
+INFO_CTRL_PANEL_NEW_OU_ADDRESS_LABEL=Address:
+INFO_CTRL_PANEL_NEW_OU_TELEPHONE_NUMBER_LABEL=Telephone Number:
+INFO_CTRL_PANEL_NEW_OU_FAX_NUMBER_LABEL=Fax Number:
+INFO_CTRL_PANEL_NEW_OU_PANEL_TITLE=New Organizational Unit
+MILD_ERR_CTRL_PANEL_NAME_OF_OU_REQUIRED=You must provide a value for the Name \
+ of the Organizational Unit.
+
+INFO_CTRL_PANEL_NEW_USER_FIRST_NAME_LABEL=First Name:
+INFO_CTRL_PANEL_NEW_USER_LAST_NAME_LABEL=Last Name:
+INFO_CTRL_PANEL_NEW_USER_COMMON_NAMES_LABEL=Common Name:
+INFO_CTRL_PANEL_NEW_USER_UID_LABEL=User ID:
+INFO_CTRL_PANEL_NEW_USER_PASSWORD_LABEL=Password:
+INFO_CTRL_PANEL_NEW_USER_CONFIRM_PASSWORD_LABEL=Password (Confirm):
+INFO_CTRL_PANEL_NEW_USER_EMAIL_LABEL=E-mail:
+INFO_CTRL_PANEL_NEW_USER_TELEPHONE_NUMBER_LABEL=Telephone Number:
+INFO_CTRL_PANEL_NEW_USER_FAX_NUMBER_LABEL=Fax Number:
+INFO_CTRL_PANEL_NEW_USER_NAMING_ATTRIBUTE_LABEL=Naming Attribute:
+INFO_CTRL_PANEL_NEW_USER_ENTRY_DN_LABEL=Entry DN:
+INFO_CTRL_PANEL_NEW_USER_PANEL_TITLE=New User
+MILD_ERR_CTRL_PANEL_USER_LAST_NAME_REQUIRED=You must provide a value for 'Last \
+ Name\'.
+MILD_ERR_CTRL_PANEL_USER_COMMON_NAME_REQUIRED=You must provide a value for \
+ 'Common Name'.
+MILD_ERR_CTRL_PANEL_USER_NAMING_ATTRIBUTE_REQUIRED=You must provide a value \
+ for the naming attribute '%s'.
+
+INFO_CTRL_PANEL_NEW_VLV_INDEX_TITLE=New VLV Index
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_NEW_VLV=The server is running. \
+ You must provide authentication to create a VLV index.
+INFO_CTRL_PANEL_CREATING_NEW_VLV_INDEX_SUMMARY=Creating new VLV index '%s'...
+INFO_CTRL_PANEL_CREATING_NEW_VLV_INDEX_SUCCESSFUL_SUMMARY=VLV Index created
+INFO_CTRL_PANEL_CREATING_NEW_VLV_INDEX_SUCCESSFUL_DETAILS=The new VLV index \
+ '%s' was successfully created.
+MILD_ERR_CTRL_PANEL_CREATING_NEW_VLV_INDEX_ERROR_SUMMARY=Error creating VLV \
+ index
+MILD_ERR_CTRL_PANEL_CREATING_NEW_VLV_INDEX_ERROR_DETAILS=An error occurred \
+ creating VLV index.
+INFO_CTRL_PANEL_NEW_VLV_INDEX_TASK_DESCRIPTION=Create new VLV index '%s' in \
+ backend '%s'.
+INFO_CTRL_PANEL_CREATING_NEW_VLV_INDEX_PROGRESS=Creating VLV index '%s'
+
+INFO_CTRL_PANEL_EDIT_OBJECTCLASS_TITLE=Edit Object Class
+INFO_CTRL_PANEL_STRUCTURAL_OBJECTCLASS_LABEL=Structural Object Class:
+INFO_CTRL_PANEL_AUXILIARY_OBJECTCLASS_LABEL=Auxiliary Object Classes:
+
+INFO_CTRL_PANEL_INDEXES_LABEL=Indexes:
+INFO_CTRL_PANEL_AVAILABLE_INDEXES_LABEL=Available Indexes:
+INFO_CTRL_PANEL_SELECTED_INDEXES_LABEL=Selected Indexes:
+INFO_CTRL_PANEL_REQUIRES_REBUILD_LEGEND=(*) Requires Rebuild
+INFO_CTRL_PANEL_REBUILD_INDEXES_TITLE=Rebuild Indexes
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_DISABLE_BACKEND=The server is \
+ running. You must provide authentication to disable the backend before \
+ rebuilding the indexes.
+MILD_ERR_CTRL_PANEL_NO_BASE_DNS_DEFINED_LABEL=No Base DN's defined.
+MILD_ERR_CTRL_PANEL_MUST_SELECT_BASE_DN=You must select a Base DN.
+MILD_ERR_CTRL_PANEL_MUST_SELECT_INDEX_TO_REBUILD=You must select at least one \
+ index to be rebuilt.
+#
+# Note that the following property contain line breaks in HTML format (<br>)
+#
+INFO_CTRL_PANEL_CONFIRM_REBUILD_INDEX_DETAILS=During the rebuilding of the \
+ indexes the backend '%s' will be disabled and none of its suffixes will be \
+ accessible.<br><br>Do you want to continue?
+MILD_ERR_CTRL_PANEL_NEW_PASSWORD_REQUIRED=You must provide a value for the new \
+ password.
+INFO_CTRL_PANEL_RESET_USER_PASSWORD_TITLE=Reset User Password
+INFO_CTRL_PANEL_RESET_USER_PASSWORD_DN_LABEL=DN:
+INFO_CTRL_PANEL_RESET_USER_PASSWORD_PWD_LABEL=Password:
+INFO_CTRL_PANEL_RESET_USER_PASSWORD_CONFIRM_LABEL=Password (confirm):
+INFO_CTRL_PANEL_RESET_USER_PASSWORD_NAME_LABEL=Name:
+INFO_CTRL_PANEL_RESETTING_USER_PASSWORD_SUMMARY=Resetting user password...
+INFO_CTRL_PANEL_RESETTING_USER_PASSWORD_SUCCESSFUL_SUMMARY=User Password Updated
+INFO_CTRL_PANEL_RESETTING_USER_PASSWORD_SUCCESSFUL_DETAILS=The user password \
+ was successfully updated.
+MILD_ERR_CTRL_PANEL_RESETTING_USER_PASSWORD_ERROR_SUMMARY=Error updating user \
+ password
+MILD_ERR_CTRL_PANEL_RESETTING_USER_PASSWORD_ERROR_DETAILS=An error occurred \
+ updating user password.
+
+INFO_CTRL_PANEL_RESTORE_PANEL_TITLE=Restore from Backup
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_RESTORE=The server is running. \
+ You must provide authentication to restore from backup.
+INFO_CTRL_PANEL_VERIFY_BACKUP_TITLE=Verify Backup
+INFO_CTRL_PANEL_VERIFYING_BACKUP_SUMMARY=Verifying contents of backup '%s'...
+INFO_CTRL_PANEL_VERIFYING_BACKUP_SUCCESSFUL_SUMMARY=Verify Complete
+INFO_CTRL_PANEL_VERIFYING_BACKUP_SUCCESSFUL_DETAILS=The verification of the \
+ backup finished successfully.
+MILD_ERR_CTRL_PANEL_VERIFYING_BACKUP_ERROR_SUMMARY=Error during Backup \
+ Verification
+MILD_ERR_CTRL_PANEL_VERIFYING_BACKUP_ERROR_DETAILS= An error occurred during \
+ the backup verification. Error code: %d.
+#
+# Note that the following property contain line breaks in HTML format (<br>)
+#
+MILD_ERR_CTRL_PANEL_NO_PARENT_BACKUP_TO_VERIFY=You must provide the parent \
+ directory containing the backup files. Then click on 'Refresh' to update \
+ the list of available backups.<br>Finally select a backup from the list.
+MILD_ERR_CTRL_PANEL_REQUIRED_BACKUP_TO_VERIFY=You must select a backup from \
+ the list of available backups.
+#
+# Note that the following property contains line breaks in HTML format (<br>)
+#
+INFO_CTRL_PANEL_CONFIRM_RESTORE_DETAILS=If you continue with the restore the \
+ contents on the server will be overwritten.<br><br>Do you want to continue?
+INFO_CTRL_PANEL_RESTORING_SUMMARY=Restoring contents of backup '%s'...
+INFO_CTRL_PANEL_RESTORING_SUCCESSFUL_SUMMARY=Restore Complete
+INFO_CTRL_PANEL_RESTORING_SUCCESSFUL_DETAILS=The restore finished successfully
+MILD_ERR_CTRL_PANEL_RESTORING_ERROR_SUMMARY=Error during Restore
+MILD_ERR_CTRL_PANEL_RESTORING_ERROR_DETAILS=An error occurred during the \
+ restore. Error code: %d.
+INFO_CTRL_PANEL_VERIFY_TASK_DESCRIPTION=Verify the contents of backup \
+ '%s' located in directory '%s'.
+INFO_CTRL_PANEL_RESTORE_TASK_DESCRIPTION=Restore the contents of backup '%s' \
+ located in directory '%s'.
+INFO_CTRL_PANEL_CN_FRIENDLY_NAME=Common Name
+INFO_CTRL_PANEL_OBJECTCLASS_FRIENDLY_NAME=Object Class
+INFO_CTRL_PANEL_GIVENNAME_FRIENDLY_NAME=First Name
+INFO_CTRL_PANEL_SN_FRIENDLY_NAME=Last Name
+INFO_CTRL_PANEL_UID_FRIENDLY_NAME=User ID
+INFO_CTRL_PANEL_EMPLOYEENUMBER_FRIENDLY_NAME=Employee Number
+INFO_CTRL_PANEL_USERPASSWORD_FRIENDLY_NAME=User Password
+INFO_CTRL_PANEL_AUTHPASSWORD_FRIENDLY_NAME=Auth Password
+INFO_CTRL_PANEL_MAIL_FRIENDLY_NAME=E-Mail
+INFO_CTRL_PANEL_STREET_FRIENDLY_NAME=Street Address
+INFO_CTRL_PANEL_L_FRIENDLY_NAME=City/Locality
+INFO_CTRL_PANEL_ST_FRIENDLY_NAME=State
+INFO_CTRL_PANEL_POSTALCODE_FRIENDLY_NAME=Postal Code
+INFO_CTRL_PANEL_MOBILE_FRIENDLY_NAME=Mobile Number
+INFO_CTRL_PANEL_HOMEPHONE_FRIENDLY_NAME=Telephone Number
+INFO_CTRL_PANEL_TELEPHONENUMBER_FRIENDLY_NAME=Common Name
+INFO_CTRL_PANEL_PAGER_FRIENDLY_NAME=Pager
+INFO_CTRL_PANEL_FACSIMILETELEPHONENUMBER_FRIENDLY_NAME=Fax Number
+INFO_CTRL_PANEL_DESCRIPTION_FRIENDLY_NAME=Description
+INFO_CTRL_PANEL_POSTALADDRESS_FRIENDLY_NAME=Address
+INFO_CTRL_PANEL_UNIQUEMEMBER_FRIENDLY_NAME=Members of Group
+INFO_CTRL_PANEL_MEMBERURL_FRIENDLY_NAME=LDAP URL
+INFO_CTRL_PANEL_C_FRIENDLY_NAME=Country
+INFO_CTRL_PANEL_DS_TARGET_GROUP_DN_FRIENDLY_NAME=Dynamic Group Reference DN
+INFO_CTRL_PANEL_USERCERTIFICATE_FRIENDLY_NAME=User Certificate
+INFO_CTRL_PANEL_JPEGPHOTO_FRIENDLY_NAME=JPEG Photograph
+INFO_CTRL_PANEL_SUPPORTEDPWDSCHEMES_FRIENDLY_NAME=Supported Password Schemes
+INFO_CTRL_PANEL_SUPPORTEDCONTROLS_FRIENDLY_NAME=Supported Controls
+INFO_CTRL_PANEL_SUPPORTEDLDAPVERSIONS_FRIENDLY_NAME=Supported LDAP Versions
+INFO_CTRL_PANEL_SUPPORTEDEXTENSIONS_FRIENDLY_NAME=Supported Extensions
+INFO_CTRL_PANEL_SUPPORTEDFEATURES_FRIENDLY_NAME=Supported Features
+INFO_CTRL_PANEL_VENDORNAME_FRIENDLY_NAME=Vendor Name
+INFO_CTRL_PANEL_VENDORVERSION_FRIENDLY_NAME=Vendor Version
+INFO_CTRL_PANEL_NAMINGCONTEXTS_FRIENDLY_NAME=Naming Contexts
+INFO_CTRL_PANEL_PRIVATENAMINGCONTEXTS_FRIENDLY_NAME=Private Naming Contexts
+INFO_CTRL_PANEL_NAME_LABEL=Name
+INFO_CTRL_PANEL_SHOW_ATTRS_WITH_VALUES_LABEL=Only Show Attributes with Values
+INFO_CTRL_PANEL_PASSWORD_CONFIRM_LABEL=Password (confirm):
+INFO_CTRL_PANEL_CHOOSE_ENTRIES=Choose Entries
+
+INFO_CTRL_PANEL_CONTENTS_OF_FILE=- Contents of file '%s' -
+
+MILD_ERR_LOADING_IMAGE=Error loading image
+INFO_CTRL_PANEL_THUMBNAIL_DESCRIPTION=Thumbnail
+INFO_CTRL_PANEL_EDIT_BUTTON_LABEL=Edit...
+INFO_CTRL_PANEL_DELETE_BUTTON_LABEL=Delete...
+INFO_CTRL_PANEL_VIEW_BUTTON_LABEL=View...
+
+INFO_CTRL_PANEL_STANDARD_ATTRIBUTE_TITLE=Standard Attribute
+INFO_CTRL_PANEL_ATTRIBUTE_DETAILS=Attribute Details
+INFO_CTRL_PANEL_REQUIRED_BY_LABEL=Required By:
+INFO_CTRL_PANEL_ALLOWED_BY_LABEL=Allowed By:
+
+INFO_CTRL_PANEL_STANDARD_OBJECTCLASS_TITLE=Standard Object Class
+INFO_CTRL_PANEL_OBJECTCLASS_DETAILS=Object Class Details
+INFO_CTRL_PANEL_REQUIRED_ATTRIBUTES_LABEL=Required Attributes:
+INFO_CTRL_PANEL_OPTIONAL_ATTRIBUTES_LABEL=Optional Attributes:
+INFO_CTRL_PANEL_DEFINED_IN_SCHEMA_FILE=Defined in file: %s
+
+INFO_CTRL_PANEL_GENERIC_TITLE=Control Panel - %s
+INFO_CTRL_PANEL_STATUS_PANEL_TITLE=General Status
+MILD_ERR_CTRL_PANEL_ERROR_READING_CONFIGURATION_SUMMARY=Error Reading \
+ Configuration
+INFO_CTRL_PANEL_NOT_AVAILABLE_LONG_LABEL=Not Available
+INFO_CTRL_PANEL_SERVER_STATUS_TITLE_BORDER=Server Status
+INFO_CTRL_PANEL_SERVER_STATUS_LABEL=Server Status:
+INFO_CTRL_PANEL_OPEN_CONNECTIONS_LABEL=Open Connections:
+INFO_CTRL_PANEL_SERVER_DETAILS_TITLE_BORDER=Server Details
+INFO_CTRL_PANEL_HOST_NAME_LABEL=Host Name:
+INFO_CTRL_PANEL_ADMINISTRATIVE_USERS_LABEL=Administrative Users:
+INFO_CTRL_PANEL_INSTALLATION_PATH_LABEL=Installation Path:
+INFO_CTRL_PANEL_OPENDS_VERSION_LABEL=OpenDS Version:
+INFO_CTRL_PANEL_JAVA_VERSION_LABEL=Java Version:
+INFO_CTRL_PANEL_ADMIN_CONNECTOR_LABEL=Administration Connector:
+INFO_CTRL_PANEL_ADMIN_CONNECTOR_DESCRIPTION=Port %d (LDAPS)
+INFO_CTRL_PANEL_CONNECTION_HANDLERS=Connection Handlers
+INFO_CTRL_PANEL_NO_CONNECTION_HANDLER_FOUND=- No Connection Handlers Found -
+INFO_CTRL_PANEL_DATA_SOURCES=Data Sources
+INFO_CTRL_PANEL_NO_DATA_SOURCES_FOUND=- No Data Sources Found -
+
+INFO_CTRL_PANEL_WINDOWS_SERVICE_TITLE=Windows Service Configuration
+INFO_CTRL_PANEL_WINDOWS_SERVICE_PANEL_TEXT=This page indicates whether this \
+ OpenDS instance is configured to run as a Windows Service. To manage \
+ auto-start and other features, run the Windows Service Control Manager of the \
+ operating system.
+INFO_CTRL_PANEL_WINDOWS_SERVICE_INTEGRATION_LABEL=Windows Service Integration:
+INFO_CTRL_PANEL_ENABLE_WINDOWS_SERVICE_BUTTON=Enable
+INFO_CTRL_PANEL_DISABLE_WINDOWS_SERVICE_BUTTON=Disable...
+INFO_CTRL_PANEL_DISABLING_WINDOWS_SERVICE_SUMMARY=Disabling Windows Service...
+INFO_CTRL_PANEL_DISABLING_WINDOWS_SERVICE_SUCCESSFUL_SUMMARY=Windows Service \
+ Disabled
+INFO_CTRL_PANEL_DISABLING_WINDOWS_SERVICE_SUCCESSFUL_DETAILS=The Windows \
+ service was successfully disabled.
+MILD_ERR_CTRL_PANEL_DISABLING_WINDOWS_SERVICE_ERROR_SUMMARY=Error during \
+ Disabling of Windows Service
+MILD_ERR_CTRL_PANEL_DISABLING_WINDOWS_SERVICE_ERROR_DETAILS=An error occurred \
+ during the disabling of the Windows service. Error code: %d.
+INFO_CTRL_PANEL_ENABLING_WINDOWS_SERVICE_SUMMARY=Enabling Windows Service...
+INFO_CTRL_PANEL_ENABLING_WINDOWS_SERVICE_SUCCESSFUL_SUMMARY=Windows Service \
+ Enabled
+INFO_CTRL_PANEL_ENABLING_WINDOWS_SERVICE_SUCCESSFUL_DETAILS=The Windows \
+ service was successfully enabled.
+MILD_ERR_CTRL_PANEL_ENABLING_WINDOWS_SERVICE_ERROR_SUMMARY=Error during \
+ Enabling of Windows Service
+MILD_ERR_CTRL_PANEL_ENABLING_WINDOWS_SERVICE_ERROR_DETAILS=An error occurred \
+ during the enabling of the Windows service. Error code: %d.
+INFO_CTRL_PANEL_ENABLE_WINDOWS_SERVICE_TASK_DESCRIPTION=Enable Windows Service
+INFO_CTRL_PANEL_DISABLE_WINDOWS_SERVICE_TASK_DESCRIPTION=Disable Windows Service
+
+INFO_CTRL_PANEL_DATABASE_INDEXES=Database Indexes
+INFO_CTRL_PANEL_ATTRIBUTE_INDEXES=Attribute Indexes
+INFO_CTRL_PANEL_VLV_INDEXES=VLV Indexes
+INFO_CTRL_PANEL_ACTION_LABEL=Action:
+INFO_CTRL_PANEL_VERIFY_ENTRY_CONTEXT_ARE_INDEXES=Verify Entry Contents are \
+ Properly Indexed
+INFO_CTRL_PANEL_VERIFY_ALL_KEYS=Verify All Index Key Entry ID's are Clean and \
+ Refer to Existing Entries
+INFO_CTRL_PANEL_INDEX_LABEL=Index:
+INFO_CTRL_PANEL_VERIFY_INDEXES_PANEL_TITLE=Verify Indexes
+MILD_ERR_CTRL_PANEL_INDEX_TO_BE_VERIFIED_REQUIRED=You must select at least one \
+ index to be verified.
+MILD_ERR_CTRL_PANEL_NO_INDEXES_FOR_BASEDN=No indexes defined for base DN '%s'.
+MILD_ERR_CTRL_PANEL_INDEX_MUST_BE_SELECTED=You must select an index.
+INFO_CTRL_PANEL_VERIFYING_INDEXES_SUMMARY=Verifying contents of indexes in \
+ '%s'...
+INFO_CTRL_PANEL_VERIFYING_INDEXES_SUCCESSFUL_SUMMARY=Index Verification Complete
+INFO_CTRL_PANEL_VERIFYING_INDEXES_SUCCESSFUL_DETAILS=The indexes where \
+ successfully verified.
+MILD_ERR_CTRL_PANEL_VERIFYING_INDEXES_ERROR_SUMMARY=Error during Index \
+ Verification
+MILD_ERR_CTRL_PANEL_VERIFYING_INDEXES_ERROR_DETAILS=An error occurred during \
+ the index verification. Error code: %d.
+INFO_CTRL_PANEL_VERIFY_INDEX_TASK_DESCRIPTION=Verify indexes in '%s'.
+
+#
+# Note that the following property contains line breaks in HTML format (<br>)
+# and must begin with <html>
+#
+INFO_CTRL_PANEL_INDEX_MODIFIED_MESSAGE=<html>The index has been modified.\
+ <br>Rebuild of the indexes required (using 'Rebuild Index' or 'Import').
+INFO_CTRL_PANEL_VLV_INDEX_PANEL_TITLE=VLV Index Properties
+INFO_CTRL_PANEL_AUTHENTICATION_REQUIRED_FOR_VLV_INDEX_EDITING=The server is \
+ running. You must provide authentication to edit the VLV index.
+INFO_CTRL_PANEL_DELETE_VLV_INDEX_TITLE=Delete VLV Index
+INFO_CTRL_PANEL_CONFIRMATION_VLV_INDEX_DELETE_DETAILS=Are you sure you want to \
+ delete the VLV index '%s' defined in backend '%s'?
+INFO_CTRL_PANEL_DELETING_VLV_INDEX_SUMMARY=Deleting VLV index...
+INFO_CTRL_PANEL_DELETING_VLV_INDEX_COMPLETE=VLV Index Deleted
+INFO_CTRL_PANEL_DELETING_VLV_INDEX_SUCCESSFUL=The VLV index '%s' in backend \
+ '%s' was successfully deleted.
+MILD_ERR_CTRL_PANEL_DELETING_VLV_INDEX_ERROR_SUMMARY=Error deleting VLV index
+MILD_ERR_CTRL_PANEL_DELETING_VLV_INDEX_ERROR_DETAILS=An error occurred VLV \
+ deleting index '%s'.
+INFO_CTRL_PANEL_MODIFYING_VLV_INDEX_TITLE=Modifying VLV Index
+INFO_CTRL_PANEL_MODIFYING_VLV_INDEX_SUMMARY=Modifying VLV index %s...
+INFO_CTRL_PANEL_MODIFYING_VLV_INDEX_COMPLETE=VLV Index Modified
+INFO_CTRL_PANEL_MODIFYING_VLV_INDEX_SUCCESSFUL=The VLV index '%s' in backend \
+ '%s' was successfully modified.
+MILD_ERR_CTRL_PANEL_MODIFYING_VLV_INDEX_ERROR_SUMMARY=Error modifying VLV index
+MILD_ERR_CTRL_PANEL_MODIFYING_VLV_INDEX_ERROR_DETAILS=An error occurred \
+ modifying VLV index '%s'.
+INFO_CTRL_PANEL_MODIFY_VLV_INDEX_TASK_DESCRIPTION=Modify VLV index '%s' in \
+ backend '%s'.
+INFO_CTRL_PANEL_MODIFYING_VLV_INDEX_PROGRESS=Modifying VLV index '%s'
+
+INFO_CTRL_PANEL_AVAILABLE_LABEL=Available:
+INFO_CTRL_PANEL_SELECTED_LABEL=Selected:
+INFO_CTRL_PANEL_ADDREMOVE_ADD_BUTTON=Add >
+INFO_CTRL_PANEL_ADDREMOVE_ADD_ALL_BUTTON=Add All >
+INFO_CTRL_PANEL_ADDREMOVE_REMOVE_BUTTON=< Remove
+INFO_CTRL_PANEL_ADDREMOVE_REMOVE_ALL_BUTTON=< Remove All
+
+INFO_CTRL_PANEL_OBJECTCLASS_CELL_PANEL_AUXILIARY=Auxiliary: %s
+
+INFO_CTRL_PANEL_ATTRIBUTE_USAGE_OPERATIONAL=%s (operational)
+
+INFO_CTRL_PANEL_VLV_ASCENDING_VLV_INDEX=%s (ascending)
+INFO_CTRL_PANEL_VLV_DESCENDING_VLV_INDEX=%s (descending)
+
+SEVERE_ERR_CTRL_PANEL_SETTING_ENVIRONMENT=Error setting environment: %s
+
+INFO_CTRL_PANEL_ERROR_DIALOG_TITLE=Error
+INFO_CTRL_PANEL_PROGRESS_DONE=Done
+INFO_CTRL_PANEL_VLV_INDEX_CELL=%s - VLV Index
+
diff --git a/opendj-sdk/opends/src/messages/messages/core.properties b/opendj-sdk/opends/src/messages/messages/core.properties
index a4fcb1f..cd7f8db 100644
--- a/opendj-sdk/opends/src/messages/messages/core.properties
+++ b/opendj-sdk/opends/src/messages/messages/core.properties
@@ -1774,3 +1774,33 @@
SEVERE_ERR_REGISTER_WORKFLOW_ELEMENT_ALREADY_EXISTS_703=Unable to register \
workflow element %s with the Directory Server because another workflow \
element with the same ID is already registered
+INFO_ERROR_MAX_CONNECTIONS_LIMIT_EXCEEDED_704=Unable to process operation \
+ because the network group has already reached its maximum number of \
+ simultaneous connections
+INFO_ERROR_MAX_CONNECTIONS_FROM_SAME_IP_LIMIT_EXCEEDED_705=Unable to process \
+ operation because the network group has already reached its maximum number \
+ of simultaneous connections from the same client
+INFO_ERROR_MAX_OPERATIONS_PER_CONNECTION_LIMIT_EXCEEDED_706=Unable to process \
+ operation because the network group has already reached its maximum number \
+ of operations on this connection
+INFO_ERROR_MAX_CONCURRENT_OPERATIONS_PER_CONNECTION_LIMIT_EXCEEDED_707=Unable \
+ to process operation because the network group has already reached its \
+ maximum number of concurrent operations on this connection
+INFO_CHANGE_NETWORK_GROUP_708=Connection ConnID=%d moved from network group %s \
+ to %s
+INFO_ERROR_MIN_SEARCH_SUBSTRING_LENGTH_LIMIT_EXCEEDED_709=Unable to process \
+ operation because the search substring length is less than the network \
+ group minimum search substring length
+INFO_ERROR_OPERATION_NOT_ALLOWED_710=Unable to process operation because this \
+ type of operation is not allowed in this network group
+INFO_ERROR_ATTRIBUTE_NOT_ALLOWED_711=Unable to process operation because this \
+ attribute is not allowed in this network group
+INFO_ERROR_SEARCH_SCOPE_NOT_ALLOWED_712=Unable to process operation because \
+ this search scope is not allowed in this network group
+INFO_ERROR_SUBTREE_NOT_ALLOWED_713=Unable to process operation because this \
+ subtree is not allowed in this network group
+SEVERE_ERR_ROOT_WORKFLOW_ELEMENT_NOT_DEFINED_714=The workflow %s cannot \
+process the operation because no root workflow element has been \
+registered with the workflow
+MILD_ERR_ADD_ATTR_IS_INVALID_OPTION_715=Entry %s can not be added because \
+ BER encoding of %s attribute is not supported
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/messages/messages/dsconfig.properties b/opendj-sdk/opends/src/messages/messages/dsconfig.properties
index 5baa7eb..a5524ef 100644
--- a/opendj-sdk/opends/src/messages/messages/dsconfig.properties
+++ b/opendj-sdk/opends/src/messages/messages/dsconfig.properties
@@ -389,7 +389,7 @@
INFO_DSCFG_OPTION_COMPONENT_MENU_LIST_PLURAL_1365=List existing %s
INFO_DSCFG_OPTION_COMPONENT_MENU_LIST_SINGULAR_1366=Show the %s
INFO_DSCFG_PROMPT_HOST_NAME_1367=Directory server hostname or IP address [%s]:
-INFO_DSCFG_PROMPT_PORT_NUMBER_1368=Directory server port number [%d]:
+INFO_DSCFG_PROMPT_PORT_NUMBER_1368=Directory server administration port number [%d]:
INFO_DSCFG_PROMPT_BIND_DN_1369=Administrator user bind DN [%s]:
SEVERE_ERR_DSCFG_BAD_HOST_NAME_1370=The hostname "%s" could not be resolved. Please check you have provided the correct address
SEVERE_ERR_DSCFG_BAD_PORT_NUMBER_1371=Invalid port number "%s". Please enter a valid port number between 1 and 65535
@@ -466,4 +466,7 @@
SEVERE_ERR_DSCFG_EQUIVALENT_COMMAND_LINE_FILE_DIRECTORY_156=The specified \
path %s to write the equivalent command is a directory. You must specify a \
path to a file
-
\ No newline at end of file
+SEVERE_ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT_157=Unable to connect to the \
+ server at %s on port %s. Check this port is an administration port
+SEVERE_ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED_158=Unable to connect to the \
+ server at %s on port %s. In non-interactive mode, you must use the '--trustAll' option
diff --git a/opendj-sdk/opends/src/messages/messages/extension.properties b/opendj-sdk/opends/src/messages/messages/extension.properties
index 6467791..4b5ec4b 100644
--- a/opendj-sdk/opends/src/messages/messages/extension.properties
+++ b/opendj-sdk/opends/src/messages/messages/extension.properties
@@ -1625,4 +1625,6 @@
SEVERE_ERR_SDTUACM_ATTR_UNINDEXED_569=The subject DN to user attribute \
certificate mapper defined in configuration entry %s references attribute \
type %s which is does not have an equality index defined in backend %s
+INFO_LOG_EXTENSION_INFORMATION_570=Loaded extension from file '%s' (build %s, \
+ revision %s)
diff --git a/opendj-sdk/opends/src/messages/messages/plugin.properties b/opendj-sdk/opends/src/messages/messages/plugin.properties
index 4915a76..143d8e9 100644
--- a/opendj-sdk/opends/src/messages/messages/plugin.properties
+++ b/opendj-sdk/opends/src/messages/messages/plugin.properties
@@ -403,3 +403,13 @@
plugin defined in configuration entry %s is configured to operate on \
attribute %s but there is no equality index defined for this attribute \
in backend %s
+SEVERE_ERR_PLUGIN_NETWORKGROUP_INVALID_PLUGIN_TYPE_112=An attempt was made to \
+ register the NetworkGroup plugin to be invoked as a %s plugin. This plugin \
+ type is not allowed for this plugin
+SEVERE_ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE_113=An attempt was made to \
+ register the Change Number Control plugin to be invoked as a %s plugin. This \
+ plugin type is not allowed for this plugin
+SEVERE_ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE_LIST_114=An attempt was \
+ made to register the Change Number Control plugin with the following plugin \
+ types : %s. However this plugin must be configured with all of the following \
+ plugin types : %s
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/messages/messages/protocol.properties b/opendj-sdk/opends/src/messages/messages/protocol.properties
index dce2dbb..d40eefd 100644
--- a/opendj-sdk/opends/src/messages/messages/protocol.properties
+++ b/opendj-sdk/opends/src/messages/messages/protocol.properties
@@ -941,9 +941,9 @@
not allow clients to close a StartTLS session on a client connection while \
leaving the underlying TCP connection active. The TCP connection will be \
closed
-MILD_ERR_LDAP_CONNHANDLER_STARTED_LISTENING_276=Started listening for new \
+NOTICE_LDAP_CONNHANDLER_STARTED_LISTENING_276=Started listening for new \
connections on %s
-MILD_ERR_LDAP_CONNHANDLER_STOPPED_LISTENING_277=Stopped listening for new \
+NOTICE_LDAP_CONNHANDLER_STOPPED_LISTENING_277=Stopped listening for new \
connections on %s
MILD_ERR_LDAP_PAGED_RESULTS_DECODE_NULL_278=Cannot decode the provided ASN.1 \
element as an LDAP paged results control value because the element is null
diff --git a/opendj-sdk/opends/src/messages/messages/quicksetup.properties b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
index 6f2bf99..162b08e 100644
--- a/opendj-sdk/opends/src/messages/messages/quicksetup.properties
+++ b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
@@ -96,6 +96,8 @@
not be found.
INFO_CANNOT_USE_DEFAULT_PORT=Could not use 389. Port in use or user not \
authorized.
+INFO_CANNOT_USE_DEFAULT_ADMIN_CONNECTOR_PORT=Could not use 4444. Port in use \
+ or user not authorized.
INFO_CANNOT_USE_DEFAULT_SECURE_PORT=Could not use 636. Port in use or user \
not authorized.
INFO_CERTIFICATE_CHAIN_COMBO_TOOLTIP=To view the details of a given \
@@ -199,8 +201,8 @@
INFO_CONTACTING_SERVER_LABEL=Contacting server...
INFO_CONTINUE_BUTTON_INSTALL_TOOLTIP=Continue with Setup
INFO_CONTINUE_BUTTON_LABEL=Continue
-INFO_COULD_NOT_LAUNCH_STATUS_PANEL_MSG=An unexpected error occurred launching \
- the Status Panel.
+INFO_COULD_NOT_LAUNCH_CONTROL_PANEL_MSG=An unexpected error occurred launching \
+ the Control Panel.
INFO_CREATE_BASE_ENTRY_LABEL=Only Create Base Entry (%s)
INFO_CREATE_BASE_ENTRY_TOOLTIP=Only create the top entry for the Directory \
Base DN
@@ -809,12 +811,9 @@
INFO_REMOTE_SERVER_HOST_LABEL=Host Name:
INFO_REMOTE_SERVER_HOST_TOOLTIP=The fully qualified name of the host where \
the OpenDS you want to replicate data with is located.
-INFO_REMOTE_SERVER_PORT_IS_SECURE_LABEL=This is a Secure Port
-INFO_REMOTE_SERVER_PORT_IS_SECURE_TOOLTIP=Check this is the provided port is \
- the LDAPS port.
-INFO_REMOTE_SERVER_PORT_LABEL=Port:
-INFO_REMOTE_SERVER_PORT_TOOLTIP=The LDAP port of the OpenDS you want to \
- replicate data with.
+INFO_REMOTE_SERVER_PORT_LABEL=Administration Connector Port:
+INFO_REMOTE_SERVER_PORT_TOOLTIP=The administration connector port of the \
+ OpenDS you want to replicate data with.
INFO_REMOTE_SERVER_PWD_LABEL=Admin Password:
INFO_REMOTE_SERVER_PWD_TOOLTIP=The password of an administrator in the OpenDS \
you want to replicate data with.
@@ -913,6 +912,9 @@
INFO_SERVER_PORT_LABEL=LDAP Listener Port:
INFO_SERVER_PORT_TOOLTIP=Enter the port number that the server will use to \
listen for LDAP requests
+INFO_ADMIN_CONNECTOR_PORT_LABEL=Administration Connector Port:
+INFO_ADMIN_CONNECTOR_PORT_TOOLTIP=Enter the port number that the \
+ administration connector will use.
INFO_SERVER_SECURITY_BUTTON_LABEL=Configure...
INFO_SERVER_SECURITY_BUTTON_TOOLTIP=Click to configure the LDAP Secure \
Access.
@@ -1005,13 +1007,15 @@
%s.<br><br>Visit the <a \
href="https://www.opends.org/wiki/page/QuickReferenceGuide"> OpenDS Quick \
Reference</a> page for an overview of server management and \
- configuration.<br>To see basic server configuration status and to start/stop \
- the server, click Launch Status Panel. Note that you can launch this tool \
- later using %s.<br><INPUT type="submit" value="Launch Status Panel"></INPUT>
+ configuration.<br>To see server configuration status and to perform \
+ some basic administration tasks on the server, click Launch Control Panel. \
+ Note that you can launch this tool later using %s.<br><INPUT type="submit" \
+ value="Launch Control Panel"></INPUT>
INFO_SUMMARY_INSTALL_FINISHED_WITH_ERROR=An error occurred. Check 'Details' \
text area for more information.<br>The server is %s.<br>To see basic server \
- configuration status, click Launch Status Panel. Note that you can launch \
- this tool later using %s.<br><INPUT type="submit" value="Launch Status \
+ configuration status and to perfrom some basic administration tasks on the \
+ server, click Launch Control Panel. Note that you can launch \
+ this tool later using %s.<br><INPUT type="submit" value="Launch Control \
Panel"></INPUT>
INFO_SUMMARY_INSTALL_NOT_STARTED=Starting QuickSetup...
INFO_SUMMARY_REVERT_ABORT=Canceling Reversion...
@@ -1068,13 +1072,13 @@
INFO_SUMMARY_UPGRADE_FINISHED_CANCELED=<b>OpenDS QuickUpgrade Canceled.</b> \
<br>The upgrade operation was canceled and the installation has been restored \
to the state it was in before the upgrade operation.<br><br><INPUT \
- type="submit" value="Launch Status Panel"></INPUT>
+ type="submit" value="Launch Control Panel"></INPUT>
INFO_SUMMARY_UPGRADE_FINISHED_CANCELED_CLI=OpenDS QuickUpgrade Canceled. The \
upgrade operation was canceled and the installation has been restored to the \
state it was in before the upgrade operation.
INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY=<b>OpenDS QuickUpgrade Completed \
Successfully.</b><br>The OpenDS installation at %s has now been upgraded to \
- version %s.<br><br><INPUT type="submit" value="Launch Status Panel"></INPUT>
+ version %s.<br><br><INPUT type="submit" value="Launch Control Panel"></INPUT>
INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY_CLI=OpenDS QuickUpgrade Completed \
Successfully. The OpenDS installation at %s has now been upgraded to version \
%s.
@@ -1083,7 +1087,7 @@
errors and the installation has been restored to the state it was in before \
the upgrade operation. See the 'Details' text for more information on why \
the upgrade operation failed.<br><br><INPUT type="submit" value="Launch \
- Status Panel"></INPUT>
+ Control Panel"></INPUT>
INFO_SUMMARY_UPGRADE_FINISHED_WITH_ERRORS_CLI=OpenDS QuickUpgrade Failed. The \
upgrade operation could not complete successfully due to errors and the \
installation has been restored to the state it was in before the upgrade \
@@ -1091,7 +1095,7 @@
INFO_SUMMARY_UPGRADE_FINISHED_WITH_WARNINGS=<b>OpenDS QuickUpgrade Succeeded \
With Warnings</b><br>The upgrade operation completed successfully but the \
upgrader had problems that require attention. See the 'Details' text for more \
- information on the problems.<br><br><INPUT type="submit" value="Launch Status \
+ information on the problems.<br><br><INPUT type="submit" value="Launch Control \
Panel"></INPUT>
INFO_SUMMARY_UPGRADE_FINISHED_WITH_WARNINGS_CLI=OpenDS QuickUpgrade Succeeded \
With Warnings. The upgrade operation completed successfully but the upgrader \
diff --git a/opendj-sdk/opends/src/messages/messages/replication.properties b/opendj-sdk/opends/src/messages/messages/replication.properties
index fce45c0..d405c94 100644
--- a/opendj-sdk/opends/src/messages/messages/replication.properties
+++ b/opendj-sdk/opends/src/messages/messages/replication.properties
@@ -73,15 +73,15 @@
base dn : %s
MILD_ERR_ERROR_SEARCHING_RUV_15=Error %s when searching for server state %s : \
%s base dn : %s
-NOTICE_SERVER_DISCONNECT_16=%s has disconnected from this replication server
+NOTICE_SERVER_DISCONNECT_16=%s has disconnected from this replication server %s
NOTICE_NO_CHANGELOG_SERVER_LISTENING_17=There is no replication server \
listening on %s
NOTICE_FOUND_CHANGELOGS_WITH_MY_CHANGES_18=Found %d replication server(s) with \
-up to date changes for suffix %s
+up to date changes for suffix %s, in server id %s
NOTICE_NEED_MORE_THAN_ONE_CHANGELOG_SERVER_19=More than one replication \
server should be configured
-SEVERE_ERR_EXCEPTION_STARTING_SESSION_20=Caught Exception during initial \
- communication on domain %s with replication server %s : %s
+SEVERE_ERR_EXCEPTION_SENDING_TOPO_INFO_20=Caught IOException while sending \
+ topology info (for update) on domain %s for %s server %s : %s
MILD_ERR_CANNOT_RECOVER_CHANGES_21=Error when searching old changes from the \
database for base DN %s
NOTICE_COULD_NOT_FIND_CHANGELOG_WITH_MY_CHANGES_22=Could not find a \
@@ -103,8 +103,8 @@
SEVERE_ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH_29=Error during the Replication \
Server database trimming or flush process. The Changelog service is going to \
shutdown
-SEVERE_ERR_CHANGELOG_CONNECTION_ERROR_30=Error during Replication server \
- message processing . Connection from %s is rejected
+SEVERE_ERR_REPLICATION_SERVER_CONNECTION_ERROR_30=Error in Replication Server \
+ handshake processing. Connection from/to %s is aborted
SEVERE_ERR_UNKNOWN_MESSAGE_31=%s has sent an unknown message. Closing the \
connection
SEVERE_ERR_WRITER_UNEXPECTED_EXCEPTION_32=An unexpected error happened \
@@ -154,10 +154,10 @@
as an IP address
NOTICE_READER_NULL_MSG_52=Received a Null Msg from %s
NOTICE_READER_EXCEPTION_53=Exception when reading messages from %s
-SEVERE_ERR_DUPLICATE_SERVER_ID_54=Servers %s and %s have the same ServerId : \
- %d
-SEVERE_ERR_DUPLICATE_REPLICATION_SERVER_ID_55=Replication Servers %s and %s \
- have the same ServerId : %d
+SEVERE_ERR_DUPLICATE_SERVER_ID_54=In Replication server %s: servers %s and %s \
+have the same ServerId : %d
+SEVERE_ERR_DUPLICATE_REPLICATION_SERVER_ID_55=In Replication server %s: \
+replication servers %s and %s have the same ServerId : %d
SEVERE_ERR_BAD_HISTORICAL_56=Entry %s was containing some unknown historical \
information, This may cause some inconsistency for this entry
MILD_ERR_CANNOT_ADD_CONFLICT_ATTRIBUTE_57=A conflict was detected but the \
@@ -172,12 +172,10 @@
SEVERE_ERR_REPLICATION_COULD_NOT_CONNECT_61=The Replication is configured for \
suffix %s but was not able to connect to any Replication Server
NOTICE_NOW_FOUND_SAME_GENERATION_CHANGELOG_62=Replication is up and running \
- for domain %s with replication server %s - data generation is %s
+ for domain %s with replication server id %s %s - local server id is %s - data \
+ generation is %s
NOTICE_DISCONNECTED_FROM_CHANGELOG_63=The connection to Replication Server %s \
- has been dropped by the Replication Server
-SEVERE_ERR_CHANGELOG_ERROR_SENDING_INFO_64=An unexpected error occurred \
- while sending a Server Info message to %s. This connection is going to be \
- closed and reopened
+ %s has been dropped by the Replication Server for %s in local server id %s
SEVERE_ERR_CHANGELOG_ERROR_SENDING_ERROR_65=An unexpected error occurred \
while sending an Error Message to %s. This connection is going to be closed \
and reopened
@@ -203,15 +201,16 @@
searching in %s for the generation ID : %s
SEVERE_ERR_UPDATING_GENERATION_ID_76=An unexpected error %s occurred \
when updating generation ID for the domain : %s
-NOTICE_BAD_GENERATION_ID_77=On suffix %s. server %s presented generation ID=%s \
-when expected generation ID=%s. Consequently, replication is degraded for that server
-NOTICE_RESET_GENERATION_ID_78=The generation ID has been reset for domain %s.\
-Replication is now degraded for this domain
-MILD_ERR_ERROR_MSG_RECEIVED_79=The following error has been received : <%s>
-MILD_ERR_IGNORING_UPDATE_FROM_80=Update <%s> received from server <%s> is \
-ignored due to a bad generation ID of this server
-MILD_ERR_IGNORING_UPDATE_TO_81=In %s, update <%s> will not be sent to server %s\
- with generation ID=%s different from expected generation ID=%s
+NOTICE_BAD_GENERATION_ID_FROM_RS_77=On suffix %s, replication server %s presented \
+ generation ID=%s when expected generation ID=%s
+NOTICE_RESET_GENERATION_ID_78=The generation ID has been resetted for domain %s. \
+ New reference generation id is %s
+MILD_ERR_ERROR_MSG_RECEIVED_79=The following error has been received : %s
+MILD_ERR_IGNORING_UPDATE_FROM_RS_80=In RS %s for dn %s, update %s received from \
+ RS %s is ignored due to a bad generation id of remote RS (local genid: \
+ %s, remote genid: %s)
+MILD_ERR_IGNORING_UPDATE_TO_RS_81=In RS %s for dn %s, update %s will not be sent \
+ to RS %s with generation id %s different from local generation id %s
SEVERE_ERR_INIT_IMPORT_NOT_SUPPORTED_82= Initialization cannot be done because \
import is not supported by the backend %s
SEVERE_ERR_INIT_EXPORT_NOT_SUPPORTED_83= Initialization cannot be done because \
@@ -240,10 +239,11 @@
the replication server backend
SEVERE_ERR_UNKNOWN_DN_95=The base DN %s is not stored by any of the \
Directory Server backend
-NOTICE_NOW_FOUND_BAD_GENERATION_CHANGELOG_96=Replication is up but degraded \
- for domain %s with replication server %s - local data generation is %s \
- - replication server data generation is %s - This may be only temporary \
- or require a full resynchronization
+NOTICE_NOW_FOUND_BAD_GENERATION_CHANGELOG_96=Replication is connected to \
+ replication server, but has a different generation id for domain %s than \
+ replication server %s - local data generation is %s - replication server data \
+ generation is %s - This may be only temporary or requires a full \
+ resynchronization
NOTICE_HEARTBEAT_FAILURE_97=%s is closing the session \
because it could not detect a heartbeat
SEVERE_ERR_REPLICATONBACKEND_IMPORT_LDIF_NOT_SUPPORTED_98=The replication \
@@ -279,3 +279,70 @@
SEVERE_ERR_RESET_GENERATION_CONN_ERR_ID_118=The generation ID could not be \
reset for domain %s because it is NOT connected to the replication. You should \
check in the configuration that the domain is enabled
+SEVERE_ERR_EXCEPTION_STARTING_SESSION_PHASE_119=Caught Exception during initial \
+ communication (phase %s) on domain %s with replication server %s : %s
+NOTICE_NEW_SERVER_WITH_SAME_GROUP_ID_120=Disconnecting from replication server \
+ as a new one with our group id (%s) just arrived in topology. This is for \
+ domain %s and we have server id %s
+SEVERE_ERR_RS_DN_DOES_NOT_MATCH_121=DN sent by remote replication server: %s does \
+ not match local replication server one: %s
+SEVERE_ERR_DS_DN_DOES_NOT_MATCH_122=DN sent by replication server: %s does \
+ not match local directory server one: %s
+SEVERE_ERR_EXCEPTION_FORWARDING_RESET_GEN_ID_123=Caught IOException while \
+ forwarding ResetGenerationIdMsg to peer replication servers for domain %s : %s
+SEVERE_ERR_DS_INVALID_INIT_STATUS_124=Computed invalid initial status: %s in \
+ DS replication domain %s with server id %s
+SEVERE_ERR_RS_INVALID_INIT_STATUS_125=Replication server received invalid \
+ initial status: %s for replication domain %s from server id %s
+SEVERE_ERR_DS_INVALID_REQUESTED_STATUS_126=Received invalid requested status %s \
+ in DS replication domain %s with server id %s
+SEVERE_ERR_RS_CANNOT_CHANGE_STATUS_127=Could not compute new status in RS \
+ replication domain %s for server id %s. Was in %s status and received %s event
+SEVERE_ERR_DS_CANNOT_CHANGE_STATUS_128=Could not compute new status in DS \
+ replication domain %s with server id %s. Was in %s status and received %s event
+SEVERE_ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID_129=Caught IOException \
+ while changing status for domain %s and serverId: %s after reset for \
+ generation id: %s
+SEVERE_ERR_RECEIVED_CHANGE_STATUS_NOT_FROM_DS_130=Received change status \
+ message does not come from a directory server (dn: %s, server id: %s, msg: %s)
+NOTICE_DIRECTORY_SERVER_CHANGED_STATUS_131=Directory server %s for dn %s \
+ changed his status to %s
+SEVERE_ERR_RS_INVALID_NEW_STATUS_132=Received invalid new status %s \
+ in RS for replication domain %s and directory server id %s
+SEVERE_WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID_133=Connected to a \
+ replication server with wrong group id. We have group id %s and replication \
+ server id %s %s has group id %s. This is for domain %s in directory server %s
+SEVERE_ERR_EXCEPTION_SENDING_CS_134=Replication broker with dn %s and server \
+ id %s failed to signal status change because of: %s
+MILD_ERR_IGNORING_UPDATE_FROM_DS_BADGENID_135=In RS %s for dn %s, update %s \
+ received from DS %s is ignored due to a bad generation id of DS (local genid: \
+ %s, remote genid: %s)
+MILD_ERR_IGNORING_UPDATE_TO_DS_BADGENID_136=In RS %s for dn %s, update %s will \
+ not be sent to DS %s with generation id %s different from local generation id %s
+MILD_ERR_IGNORING_UPDATE_FROM_DS_FULLUP_137=In RS %s for dn %s, update %s \
+ received from DS %s is ignored due to DS in full update
+MILD_ERR_IGNORING_UPDATE_TO_DS_FULLUP_138=In RS %s for dn %s, update %s will \
+ not be sent to DS %s in full update
+SEVERE_ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER_139=Caught \
+ IOException while changing status for domain %s and serverId: %s from status \
+analyzer: %s
+NOTICE_BAD_GEN_ID_IN_FULL_UPDATE_140=Replication server %s for dn %s: directory \
+server %s must stay in full update although a generation id reset has been \
+ordered (from %s to %s)
+NOTICE_FULL_UPDATE_ENGAGED_FROM_REMOTE_START_141=Local directory server %s is \
+ starting online full update for importing suffix %s data from remote \
+ directory server %s
+NOTICE_FULL_UPDATE_ENGAGED_FROM_REMOTE_END_142=Local directory server %s has \
+ finished online full update for importing suffix %s data from remote \
+ directory server %s
+NOTICE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START_143=Local directory server %s is \
+ starting online full update for exporting suffix %s data to remote directory \
+ server %s
+NOTICE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END_144=Local directory server %s has \
+ finished online full update for exporting suffix datat %s to remote directory \
+ server %s
+NOTICE_TIMEOUT_WHEN_CROSS_CONNECTION_145=Timed out trying to acquire the domain \
+lock for %s. Connection attempt from replication server %s to local replication \
+server %s will be aborted. Simultanate cross connection attempt ?
+NOTICE_BAD_GENERATION_ID_FROM_DS_146=On suffix %s, directory server %s presented \
+ generation ID=%s when expected generation ID=%s
diff --git a/opendj-sdk/opends/src/messages/messages/servicetag.properties b/opendj-sdk/opends/src/messages/messages/servicetag.properties
new file mode 100644
index 0000000..bcf6d2a
--- /dev/null
+++ b/opendj-sdk/opends/src/messages/messages/servicetag.properties
@@ -0,0 +1,62 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2008 Sun Microsystems, Inc.
+
+
+
+#
+# Global directives
+#
+global.category=SERVICETAG
+
+#
+# Format string definitions
+#
+# Keys must be formatted as follows:
+#
+# [SEVERITY]_[DESCRIPTION]_[ORDINAL]
+#
+# where:
+#
+# SEVERITY is one of:
+# [INFO, MILD_WARN, SEVERE_WARN, MILD_ERR, SEVERE_ERR, FATAL_ERR, DEBUG, NOTICE]
+#
+# DESCRIPTION is an upper case string providing a hint as to the context of
+# the message in upper case with the underscore ('_') character serving as
+# word separator
+#
+# ORDINAL is an integer unique among other ordinals in this file
+#
+SEVERE_WARN_SERVICETAG_ALREADY_EXIST_1=ServiceTag already exists
+SEVERE_WARN_SERVICETAG_DOESNOT_EXIST_2=ServiceTag does not exist
+SEVERE_WARN_REGISTRY_NOT_SUPPORTED_3=Common Registration is not supported
+SEVERE_WARN_PARAMETER_CANNOT_BE_NULL_4=Parameter %s cannot be null or empty
+SEVERE_WARN_SERVICETAG_CANNOT_BE_REGISTERED_5=ServiceTag cannot be registered
+SEVERE_WARN_SERVICETAG_CANNOT_BE_REMOVED_6=ServiceTag cannot be removed
+SEVERE_WARN_NO_SERVICETAG_TO_REMOVE_7=No ServiceTag to remove
+SEVERE_WARN_NO_SERVICETAG_TO_REGISTER_8=No ServiceTag to register
+SEVERE_WARN_BAD_PROPERTIES_9=Properties parameter does not contain %s
+
+
+
+
diff --git a/opendj-sdk/opends/src/messages/messages/task.properties b/opendj-sdk/opends/src/messages/messages/task.properties
index 7ccaf46..ce3b4d6 100644
--- a/opendj-sdk/opends/src/messages/messages/task.properties
+++ b/opendj-sdk/opends/src/messages/messages/task.properties
@@ -191,3 +191,5 @@
task
INFO_IMPORT_ARG_TEMPLATE_FILE_104=Template File
INFO_IMPORT_ARG_RANDOM_SEED_105=Random Seed
+SEVERE_ERR_TASK_LDAP_FAILED_TO_CONNECT_WRONG_PORT_106=Unable to connect to the \
+ server at %s on port %s. Check this port is an administration port
diff --git a/opendj-sdk/opends/src/messages/messages/tools.properties b/opendj-sdk/opends/src/messages/messages/tools.properties
index aede7ce..fa1950a 100644
--- a/opendj-sdk/opends/src/messages/messages/tools.properties
+++ b/opendj-sdk/opends/src/messages/messages/tools.properties
@@ -249,7 +249,8 @@
SEVERE_ERR_LDAPAUTH_CANNOT_SEND_SIMPLE_BIND_136=Cannot send the simple bind \
request: %s
SEVERE_ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE_137=Cannot read the bind \
- response from the server: %s
+ response from the server. The port you are using may require a secured \
+communication (--useSSL). %s
SEVERE_ERR_LDAPAUTH_SERVER_DISCONNECT_138=The Directory Server indicated that \
it was closing the connection to the client (result code %d, message "%s"
SEVERE_ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE_139=The Directory Server \
@@ -654,7 +655,7 @@
SEVERE_ERR_LDIFIMPORT_CANNOT_INITIALIZE_PWPOLICY_373=An error occurred while \
attempting to initialize the password policy components: %s
INFO_STOPDS_DESCRIPTION_HOST_374=Directory server hostname or IP address
-INFO_STOPDS_DESCRIPTION_PORT_375=Directory server port number
+INFO_STOPDS_DESCRIPTION_PORT_375=Directory server administration port number
INFO_STOPDS_DESCRIPTION_USESSL_376=Use SSL for secure communication with the \
server
INFO_STOPDS_DESCRIPTION_USESTARTTLS_377=Use StartTLS for secure communication \
@@ -1617,7 +1618,7 @@
INFO_PWPSTATE_TOOL_DESCRIPTION_1094=This utility can be used to retrieve and \
manipulate the values of password policy state variables
INFO_PWPSTATE_DESCRIPTION_HOST_1095=Directory server hostname or IP address
-INFO_PWPSTATE_DESCRIPTION_PORT_1096=Directory server port number
+INFO_PWPSTATE_DESCRIPTION_PORT_1096=Directory server administration port number
INFO_PWPSTATE_DESCRIPTION_USESSL_1097=Use SSL for secure communication with \
the server
INFO_PWPSTATE_DESCRIPTION_USESTARTTLS_1098=Use StartTLS to secure \
@@ -2369,12 +2370,26 @@
to read the file '%s' containing the list of ignored attributes: %s
INFO_LDIFDIFF_CANNOT_PARSE_STRING_AS_DN_1616=The string '%s' from file '%s' could \
not be parsed as a dn
-INFO_INSTALLDS_DESCRIPTION_USE_JCEKS_1617=Path of a JCEKS containing a \
+INFO_CHANGE_NUMBER_CONTROL_RESULT_1617=The %s operation change number is %s
+INFO_INSTALLDS_PROMPT_ADMINCONNECTORPORT_1618=On which port would you like the \
+ Administration Connector to accept connections?
+INFO_INSTALLDS_DESCRIPTION_ADMINCONNECTORPORT_1619=Port on which the \
+ Administration Connector should listen for communication
+SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_ADMIN_CONNECTOR_PORT_1620=An error occurred \
+ while attempting to update the administration connector port: %s
+SEVERE_ERR_TASKINFO_LDAP_EXCEPTION_SSL_1621=Error connecting to the directory server at %s on %s. \
+Check this port is an administration port
+INFO_DESCRIPTION_ADMIN_PORT_1622=Directory server administration port number
+INFO_INSTALLDS_DESCRIPTION_USE_JCEKS_1623=Path of a JCEKS containing a \
certificate to be used as the server certificate
-INFO_INSTALLDS_CERT_OPTION_JCEKS_1618=Use an existing certificate located on a \
+INFO_INSTALLDS_CERT_OPTION_JCEKS_1624=Use an existing certificate located on a \
JCEKS key store
-INFO_INSTALLDS_PROMPT_JCEKS_PATH_1619=JCEKS Key Store path:
-SEVERE_ERR_CONFIG_KEYMANAGER_CANNOT_CREATE_JCEKS_PROVIDER_1620=Error creating \
+INFO_INSTALLDS_PROMPT_JCEKS_PATH_1625=JCEKS Key Store path:
+SEVERE_ERR_CONFIG_KEYMANAGER_CANNOT_CREATE_JCEKS_PROVIDER_1626=Error creating \
JCEKS Key Provider configuration: %s
-SEVERE_ERR_CONFIG_KEYMANAGER_CANNOT_CREATE_JCEKS_TRUST_MANAGER_1621=Error \
+SEVERE_ERR_CONFIG_KEYMANAGER_CANNOT_CREATE_JCEKS_TRUST_MANAGER_1627=Error \
creating JCEKS Trust Manager configuration: %s
+SEVERE_ERR_STOPDS_CANNOT_CONNECT_SSL_1628=ERROR: Cannot establish a connection to \
+ the Directory Server at %s on port %s. Check this port is an administration port
+SEVERE_ERR_PWPSTATE_CANNOT_CONNECT_SSL_1629=ERROR: Cannot establish a connection to \
+ the Directory Server at %s on port %s. Check this port is an administration port
diff --git a/opendj-sdk/opends/src/messages/messages/utility.properties b/opendj-sdk/opends/src/messages/messages/utility.properties
index 1d3f4bf..a2cc05b 100644
--- a/opendj-sdk/opends/src/messages/messages/utility.properties
+++ b/opendj-sdk/opends/src/messages/messages/utility.properties
@@ -554,4 +554,6 @@
(%d)
SEVERE_ERR_UNEXPECTED_268=Unexpected error. Details: %s
MILD_ERR_TRIES_LIMIT_REACHED_269=Input tries limit reached (%d)
-
\ No newline at end of file
+INFO_ADMIN_CONN_PROMPT_PORT_NUMBER_270=Directory server administration port number [%d]:
+MILD_ERR_LDIF_INVALID_ATTR_OPTION_271=Unable to parse LDIF entry %s starting \
+ at line %d because it has an invalid binary option for attribute %s
diff --git a/opendj-sdk/opends/src/messages/src/org/opends/messages/Category.java b/opendj-sdk/opends/src/messages/src/org/opends/messages/Category.java
index 525b932..d1c059e 100644
--- a/opendj-sdk/opends/src/messages/src/org/opends/messages/Category.java
+++ b/opendj-sdk/opends/src/messages/src/org/opends/messages/Category.java
@@ -157,6 +157,11 @@
RUNTIME_INFORMATION(0x01300000),
/**
+ * The category used for messages associated with the Servicetag registration.
+ */
+ SERVICETAG(0x01400000),
+
+ /**
* The category that will be used for messages associated with
* third-party (including user-defined) modules.
*/
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Installation.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Installation.java
index 0adbbbf..e032348 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Installation.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Installation.java
@@ -208,14 +208,15 @@
public static final String WINDOWS_STOP_FILE_NAME = "stop-ds.bat";
/**
- * The UNIX status panel script file name.
+ * The UNIX control panel script file name.
*/
- public static final String UNIX_STATUSPANEL_FILE_NAME = "status-panel";
+ public static final String UNIX_CONTROLPANEL_FILE_NAME = "control-panel";
/**
- * The Windows status panel batch file name.
+ * The Windows control panel batch file name.
*/
- public static final String WINDOWS_STATUSPANEL_FILE_NAME = "status-panel.bat";
+ public static final String WINDOWS_CONTROLPANEL_FILE_NAME =
+ "control-panel.bat";
/**
* The MacOS X Java application stub name.
@@ -223,9 +224,9 @@
public static final String MAC_JAVA_APP_STUB_NAME = "JavaApplicationStub";
/**
- * The MacOS X status panel application bundle name.
+ * The MacOS X control panel application bundle name.
*/
- public static final String MAC_STATUSPANEL_FILE_NAME = "StatusPanel.app";
+ public static final String MAC_CONTROLPANEL_FILE_NAME = "ControlPanel.app";
/**
* The UNIX status command line script file name.
@@ -903,24 +904,24 @@
}
/**
- * Gets the status panel command file appropriate for the current operating
+ * Gets the control panel command file appropriate for the current operating
* system.
- * @return File object representing the status panel command
+ * @return File object representing the control panel command
*/
- public File getStatusPanelCommandFile() {
- File statusPanelCommandFile;
+ public File getControlPanelCommandFile() {
+ File controlPanelCommandFile;
if (Utils.isWindows()) {
- statusPanelCommandFile = new File(getBinariesDirectory(),
- WINDOWS_STATUSPANEL_FILE_NAME);
+ controlPanelCommandFile = new File(getBinariesDirectory(),
+ WINDOWS_CONTROLPANEL_FILE_NAME);
} else if (Utils.isMacOS()) {
- statusPanelCommandFile = new File(getRootDirectory() +
+ controlPanelCommandFile = new File(getRootDirectory() +
File.separator + MAC_APPLICATIONS_PATH_RELATIVE,
- MAC_STATUSPANEL_FILE_NAME);
+ MAC_CONTROLPANEL_FILE_NAME);
} else {
- statusPanelCommandFile = new File(getBinariesDirectory(),
- UNIX_STATUSPANEL_FILE_NAME);
+ controlPanelCommandFile = new File(getBinariesDirectory(),
+ UNIX_CONTROLPANEL_FILE_NAME);
}
- return statusPanelCommandFile;
+ return controlPanelCommandFile;
}
/**
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
index 9948e3f..0fde0a8 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
@@ -55,6 +55,8 @@
private int serverPort;
+ private int adminConnectorPort;
+
private String directoryManagerDn;
private String directoryManagerPwd;
@@ -117,6 +119,13 @@
setServerPort(defaultPort);
}
+// See what we can propose as port
+ defaultPort = getDefaultAdminConnectorPort();
+ if (defaultPort != -1)
+ {
+ setAdminConnectorPort(defaultPort);
+ }
+
setHostName(getDefaultHostName());
setDirectoryManagerDn(Constants.DIRECTORY_MANAGER_DN);
@@ -195,6 +204,24 @@
}
/**
+ * Sets the admin connector port.
+ * @param adminConnectorPort the new admin connector port.
+ */
+ public void setAdminConnectorPort(int adminConnectorPort)
+ {
+ this.adminConnectorPort = adminConnectorPort;
+ }
+
+ /**
+ * Returns the admin connector port.
+ * @return the admin connector port.
+ */
+ public int getAdminConnectorPort()
+ {
+ return adminConnectorPort;
+ }
+
+ /**
* Sets the server JMX port.
* @param serverJMXPort the new server JMX port.
*/
@@ -560,6 +587,29 @@
}
/**
+ * Provides the administration port that will be proposed to the user in the
+ * second page of the installation wizard. It will check whether we can use
+ * ports of type X444 and if not it will return -1.
+ *
+ * @return the free port of type x444 if it is available and we can use and -1
+ * if not.
+ */
+ static public int getDefaultAdminConnectorPort()
+ {
+ int defaultPort = -1;
+
+ for (int i=0;i<10000 && (defaultPort == -1);i+=1000)
+ {
+ int port = i + 4444;
+ if (Utils.canUseAsPort(port))
+ {
+ defaultPort = port;
+ }
+ }
+ return defaultPort;
+ }
+
+ /**
* Provides the port that will be proposed to the user in the security dialog
* of the installation wizard. It will check whether we can use ports of type
* X636 and if not it will return -1.
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataReplicationOptions.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataReplicationOptions.java
index 26cba46..c836796 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataReplicationOptions.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataReplicationOptions.java
@@ -65,7 +65,7 @@
private AuthenticationData authenticationData = new AuthenticationData();
{
authenticationData.setDn(Constants.DIRECTORY_MANAGER_DN);
- authenticationData.setPort(389);
+ authenticationData.setPort(4444);
};
/**
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 1e793ac..3dd233e 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -27,12 +27,8 @@
package org.opends.quicksetup.installer;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URI;
-import java.security.KeyStoreException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -830,6 +826,8 @@
argList.add(getConfigurationFile());
argList.add("-p");
argList.add(String.valueOf(getUserData().getServerPort()));
+ argList.add("--adminConnectorPort");
+ argList.add(String.valueOf(getUserData().getAdminConnectorPort()));
SecurityOptions sec = getUserData().getSecurityOptions();
// TODO: even if the user does not configure SSL maybe we should choose
@@ -1025,7 +1023,7 @@
certManager.generateSelfSignedCertificate(SELF_SIGNED_CERT_ALIAS,
getSelfSignedCertificateSubjectDN(),
getSelfSignedCertificateValidity());
- exportCertificate(certManager, SELF_SIGNED_CERT_ALIAS,
+ SetupUtils.exportCertificate(certManager, SELF_SIGNED_CERT_ALIAS,
getTemporaryCertificatePath());
trustManager = new CertificateManager(
@@ -1044,7 +1042,7 @@
sec.getKeystorePath(),
CertificateManager.KEY_STORE_TYPE_JKS,
sec.getKeystorePassword());
- exportCertificate(certManager, sec.getAliasToUse(),
+ SetupUtils.exportCertificate(certManager, sec.getAliasToUse(),
getTemporaryCertificatePath());
trustManager = new CertificateManager(
@@ -1062,7 +1060,7 @@
sec.getKeystorePath(),
CertificateManager.KEY_STORE_TYPE_JCEKS,
sec.getKeystorePassword());
- exportCertificate(certManager, sec.getAliasToUse(),
+ SetupUtils.exportCertificate(certManager, sec.getAliasToUse(),
getTemporaryCertificatePath());
trustManager = new CertificateManager(
@@ -1080,7 +1078,7 @@
sec.getKeystorePath(),
CertificateManager.KEY_STORE_TYPE_PKCS12,
sec.getKeystorePassword());
- exportCertificate(certManager, sec.getAliasToUse(),
+ SetupUtils.exportCertificate(certManager, sec.getAliasToUse(),
getTemporaryCertificatePath());
trustManager = new CertificateManager(
@@ -1098,7 +1096,7 @@
CertificateManager.KEY_STORE_PATH_PKCS11,
CertificateManager.KEY_STORE_TYPE_PKCS11,
sec.getKeystorePassword());
- exportCertificate(certManager, sec.getAliasToUse(),
+ SetupUtils.exportCertificate(certManager, sec.getAliasToUse(),
getTemporaryCertificatePath());
trustManager = new CertificateManager(
@@ -1919,7 +1917,7 @@
getFormattedSummary(INFO_SUMMARY_CANCELING.get()));
Installation installation = getInstallation();
- String cmd = getPath(installation.getStatusPanelCommandFile());
+ String cmd = getPath(installation.getControlPanelCommandFile());
cmd = UIFactory.applyFontToHtml(cmd, UIFactory.INSTRUCTIONS_MONOSPACE_FONT);
hmSummary.put(InstallProgressStep.FINISHED_SUCCESSFULLY,
getFormattedSuccess(
@@ -1944,7 +1942,7 @@
Map<InstallProgressStep, Message> hmSummary)
{
Installation installation = getInstallation();
- String cmd = getPath(installation.getStatusPanelCommandFile());
+ String cmd = getPath(installation.getControlPanelCommandFile());
cmd = UIFactory.applyFontToHtml(cmd, UIFactory.INSTRUCTIONS_MONOSPACE_FONT);
Message status;
if (installation.getStatus().isServerRunning())
@@ -2922,6 +2920,45 @@
qs.displayFieldInvalid(FieldName.SERVER_PORT, true);
}
+ // Check the admin connector port
+ sPort = qs.getFieldStringValue(FieldName.ADMIN_CONNECTOR_PORT);
+ int adminConnectorPort = -1;
+ try
+ {
+ adminConnectorPort = Integer.parseInt(sPort);
+ if ((adminConnectorPort < MIN_PORT_VALUE) ||
+ (adminConnectorPort > MAX_PORT_VALUE))
+ {
+ errorMsgs.add(INFO_INVALID_PORT_VALUE_RANGE.get(
+ String.valueOf(MIN_PORT_VALUE),
+ String.valueOf(MAX_PORT_VALUE)));
+ qs.displayFieldInvalid(FieldName.ADMIN_CONNECTOR_PORT, true);
+ } else if (!canUseAsPort(adminConnectorPort))
+ {
+ if (isPriviledgedPort(adminConnectorPort))
+ {
+ errorMsgs.add(INFO_CANNOT_BIND_PRIVILEDGED_PORT.get(
+ String.valueOf(adminConnectorPort)));
+ } else
+ {
+ errorMsgs.add(INFO_CANNOT_BIND_PORT.get(
+ String.valueOf(adminConnectorPort)));
+ }
+ qs.displayFieldInvalid(FieldName.ADMIN_CONNECTOR_PORT, true);
+
+ } else
+ {
+ getUserData().setAdminConnectorPort(adminConnectorPort);
+ qs.displayFieldInvalid(FieldName.ADMIN_CONNECTOR_PORT, false);
+ }
+
+ } catch (NumberFormatException nfe)
+ {
+ errorMsgs.add(INFO_INVALID_PORT_VALUE_RANGE.get(
+ String.valueOf(MIN_PORT_VALUE), String.valueOf(MAX_PORT_VALUE)));
+ qs.displayFieldInvalid(FieldName.ADMIN_CONNECTOR_PORT, true);
+ }
+
// Check the secure port
SecurityOptions sec =
(SecurityOptions)qs.getFieldValue(FieldName.SECURITY_OPTIONS);
@@ -3061,8 +3098,6 @@
Integer port = null;
String dn = null;
String pwd = null;
- boolean isSecure = Boolean.TRUE.equals(qs.getFieldValue(
- FieldName.REMOTE_SERVER_IS_SECURE_PORT));
ArrayList<Message> errorMsgs = new ArrayList<Message>();
DataReplicationOptions.Type type = (DataReplicationOptions.Type)
@@ -3140,7 +3175,7 @@
}
auth.setDn(dn);
auth.setPwd(pwd);
- auth.setUseSecureConnection(isSecure);
+ auth.setUseSecureConnection(true);
DataReplicationOptions repl;
switch (type)
@@ -3290,18 +3325,8 @@
boolean[] hasGlobalAdministrators,
String[] effectiveDn) throws UserDataException
{
- String ldapUrl;
host = getHostNameForLdapUrl(host);
- boolean isSecure = Boolean.TRUE.equals(qs.getFieldValue(
- FieldName.REMOTE_SERVER_IS_SECURE_PORT));
- if (isSecure)
- {
- ldapUrl = "ldaps://"+host+":"+port;
- }
- else
- {
- ldapUrl = "ldap://"+host+":"+port;
- }
+ String ldapUrl = "ldaps://"+host+":"+port;
InitialLdapContext ctx = null;
ApplicationTrustManager trustManager = getTrustManager();
@@ -3312,16 +3337,8 @@
effectiveDn[0] = dn;
try
{
- if (isSecure)
- {
- ctx = createLdapsContext(ldapUrl, dn, pwd,
+ ctx = createLdapsContext(ldapUrl, dn, pwd,
getDefaultLDAPTimeout(), null, trustManager);
- }
- else
- {
- ctx = createLdapContext(ldapUrl, dn, pwd,
- getDefaultLDAPTimeout(), null);
- }
}
catch (Throwable t)
{
@@ -3330,16 +3347,8 @@
// Try using a global administrator
dn = ADSContext.getAdministratorDN(dn);
effectiveDn[0] = dn;
- if (isSecure)
- {
- ctx = createLdapsContext(ldapUrl, dn, pwd,
+ ctx = createLdapsContext(ldapUrl, dn, pwd,
getDefaultLDAPTimeout(), null, trustManager);
- }
- else
- {
- ctx = createLdapContext(ldapUrl, dn, pwd,
- getDefaultLDAPTimeout(), null);
- }
}
else
{
@@ -4072,83 +4081,11 @@
protected String getSelfSignedCertificatePwd()
{
if (selfSignedCertPw == null) {
- selfSignedCertPw = createSelfSignedCertificatePwd();
+ selfSignedCertPw = SetupUtils.createSelfSignedCertificatePwd();
}
return new String(selfSignedCertPw);
}
- /**
- * Returns a randomly generated password for the self-signed certificate
- * keystore.
- * @return a randomly generated password for the self-signed certificate
- * keystore.
- */
- private char[] createSelfSignedCertificatePwd() {
- int pwdLength = 50;
- char[] pwd = new char[pwdLength];
- Random random = new Random();
- for (int pos=0; pos < pwdLength; pos++) {
- int type = getRandomInt(random,3);
- char nextChar = getRandomChar(random,type);
- pwd[pos] = nextChar;
- }
- return pwd;
- }
-
- private void exportCertificate(CertificateManager certManager, String alias,
- String path) throws CertificateEncodingException, IOException,
- KeyStoreException
- {
- Certificate certificate = certManager.getCertificate(alias);
-
- byte[] certificateBytes = certificate.getEncoded();
-
- FileOutputStream outputStream = new FileOutputStream(path, false);
- outputStream.write(certificateBytes);
- outputStream.close();
- }
-
- /* The next two methods are used to generate the random password for the
- * self-signed certificate. */
- private char getRandomChar(Random random, int type)
- {
- char generatedChar;
- int next = random.nextInt();
- int d;
-
- switch (type)
- {
- case 0:
- // Will return a digit
- d = next % 10;
- if (d < 0)
- {
- d = d * (-1);
- }
- generatedChar = (char) (d+48);
- break;
- case 1:
- // Will return a lower case letter
- d = next % 26;
- if (d < 0)
- {
- d = d * (-1);
- }
- generatedChar = (char) (d + 97);
- break;
- default:
- // Will return a capital letter
- d = (next % 26);
- if (d < 0)
- {
- d = d * (-1);
- }
- generatedChar = (char) (d + 65) ;
- }
-
- return generatedChar;
- }
-
private Map<ServerDescriptor, AuthenticationData>
getRemoteWithNoReplicationPort(UserData userData)
{
@@ -4165,6 +4102,7 @@
ServerDescriptor.ServerProperty.IS_REPLICATION_SERVER);
if (!Boolean.TRUE.equals(v))
{
+
AuthenticationData authData = new AuthenticationData();
authData.setPort(Constants.DEFAULT_REPLICATION_PORT);
authData.setUseSecureConnection(false);
@@ -4177,13 +4115,13 @@
private InitialLdapContext createLocalContext() throws NamingException
{
- String ldapUrl = "ldap://"+
+ String ldapUrl = "ldaps://"+
getHostNameForLdapUrl(getUserData().getHostName())+":"+
- getUserData().getServerPort();
+ getUserData().getAdminConnectorPort();
String dn = getUserData().getDirectoryManagerDn();
String pwd = getUserData().getDirectoryManagerPwd();
- return createLdapContext(ldapUrl, dn, pwd,
- getDefaultLDAPTimeout(), null);
+ return createLdapsContext(ldapUrl, dn, pwd,
+ getDefaultLDAPTimeout(), null, null);
}
/**
@@ -4566,11 +4504,6 @@
return getUserData().getHostName()+":"+getUserData().getServerPort();
}
- private static int getRandomInt(Random random,int modulo)
- {
- return (random.nextInt() & modulo);
- }
-
private void resetGenerationId(InitialLdapContext ctx,
String suffixDn, String sourceServerDisplay)
throws ApplicationException
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/DataReplicationPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
index 815128d..05c7f64 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
@@ -74,7 +74,6 @@
private JRadioButton rbReplicated;
private JCheckBox cbSecureReplication;
private JCheckBox cbTopologyExists;
- private JCheckBox cbRemoteServerPortSecure;
private HashMap<FieldName, JLabel> hmLabels =
new HashMap<FieldName, JLabel>();
private HashMap<FieldName, JTextComponent> hmFields =
@@ -118,17 +117,6 @@
value = DataReplicationOptions.Type.FIRST_IN_TOPOLOGY;
}
}
- else if (fieldName == FieldName.REMOTE_SERVER_IS_SECURE_PORT)
- {
- if (cbRemoteServerPortSecure.isSelected())
- {
- value = Boolean.TRUE;
- }
- else
- {
- value = Boolean.FALSE;
- }
- }
else if (fieldName == FieldName.REPLICATION_SECURE)
{
if (cbSecureReplication.isSelected())
@@ -269,12 +257,6 @@
gbc.weightx = 0.0;
aux2Panel.add(getField(fields[i]), gbc);
- if (fields[i] == FieldName.REMOTE_SERVER_PORT)
- {
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- aux2Panel.add(cbRemoteServerPortSecure, gbc);
- }
-
gbc.gridwidth = GridBagConstraints.REMAINDER;
gbc.insets.left = 0;
gbc.weightx = 1.0;
@@ -507,10 +489,6 @@
defaultUserData.getReplicationOptions().useSecureReplication());
cbTopologyExists.setSelected(type ==
DataReplicationOptions.Type.IN_EXISTING_TOPOLOGY);
- cbRemoteServerPortSecure = UIFactory.makeJCheckBox(
- INFO_REMOTE_SERVER_PORT_IS_SECURE_LABEL.get(),
- INFO_REMOTE_SERVER_PORT_IS_SECURE_TOOLTIP.get(),
- UIFactory.TextStyle.SECONDARY_FIELD_VALID);
checkEnablingState();
}
@@ -644,7 +622,6 @@
getLabel(FieldName.REPLICATION_PORT).setEnabled(rbReplicated.isSelected());
getField(FieldName.REPLICATION_PORT).setEnabled(rbReplicated.isSelected());
cbSecureReplication.setEnabled(rbReplicated.isSelected());
- cbRemoteServerPortSecure.setEnabled(enableFields);
}
/**
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index 28bfdeb..b6217e6 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -97,6 +97,8 @@
String.valueOf(userData.getHostName()));
setFieldValue(FieldName.SERVER_PORT,
String.valueOf(userData.getServerPort()));
+ setFieldValue(FieldName.ADMIN_CONNECTOR_PORT,
+ String.valueOf(userData.getAdminConnectorPort()));
setFieldValue(FieldName.SECURITY_OPTIONS,
getSecurityOptionsString(userData.getSecurityOptions(), false));
setFieldValue(FieldName.DIRECTORY_MANAGER_DN, userData
@@ -193,6 +195,12 @@
LabelFieldDescriptor.FieldType.READ_ONLY,
LabelFieldDescriptor.LabelType.PRIMARY, 0));
+ hm.put(FieldName.ADMIN_CONNECTOR_PORT, new LabelFieldDescriptor(
+ INFO_ADMIN_CONNECTOR_PORT_LABEL.get(),
+ INFO_ADMIN_CONNECTOR_PORT_TOOLTIP.get(),
+ LabelFieldDescriptor.FieldType.READ_ONLY,
+ LabelFieldDescriptor.LabelType.PRIMARY, 0));
+
hm.put(FieldName.SECURITY_OPTIONS, new LabelFieldDescriptor(
INFO_SERVER_SECURITY_LABEL.get(),
INFO_SERVER_SECURITY_TOOLTIP.get(),
@@ -450,7 +458,8 @@
new FieldName[]
{
FieldName.SERVER_LOCATION, FieldName.HOST_NAME,
- FieldName.SERVER_PORT, FieldName.SECURITY_OPTIONS,
+ FieldName.SERVER_PORT, FieldName.ADMIN_CONNECTOR_PORT,
+ FieldName.SECURITY_OPTIONS,
FieldName.DIRECTORY_MANAGER_DN, FieldName.GLOBAL_ADMINISTRATOR_UID,
FieldName.DATA_OPTIONS, FieldName.REPLICATION_PORT
};
@@ -461,6 +470,7 @@
new FieldName[]
{
FieldName.HOST_NAME, FieldName.SERVER_PORT,
+ FieldName.ADMIN_CONNECTOR_PORT,
FieldName.SECURITY_OPTIONS, FieldName.DIRECTORY_MANAGER_DN,
FieldName.GLOBAL_ADMINISTRATOR_UID, FieldName.DATA_OPTIONS,
FieldName.REPLICATION_PORT
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
index 9813a15..94c5c86 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
@@ -190,6 +190,7 @@
{
FieldName.HOST_NAME,
FieldName.SERVER_PORT,
+ FieldName.ADMIN_CONNECTOR_PORT,
FieldName.SECURITY_OPTIONS,
FieldName.DIRECTORY_MANAGER_DN,
FieldName.DIRECTORY_MANAGER_PWD,
@@ -274,8 +275,11 @@
panel.add(auxPanel, gbc);
boolean isPortField = fieldName == FieldName.SERVER_PORT;
+ boolean isAdminConnectorPortField =
+ fieldName == FieldName.ADMIN_CONNECTOR_PORT;
gbc.insets = UIFactory.getEmptyInsets();
- if (isPortField || (isSecurityField && canUpdateSecurity))
+ if (isPortField || isAdminConnectorPortField ||
+ (isSecurityField && canUpdateSecurity))
{
gbc.gridwidth = 3;
}
@@ -313,6 +317,16 @@
gbc.insets.left = UIFactory.LEFT_INSET_SECONDARY_FIELD;
auxPanel.add(l, gbc);
}
+ else if (isAdminConnectorPortField)
+ {
+ JLabel l =
+ UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
+ getAdminConnectorPortHelpMessage(),
+ UIFactory.TextStyle.SECONDARY_FIELD_VALID);
+ gbc.gridwidth = GridBagConstraints.RELATIVE;
+ gbc.insets.left = UIFactory.LEFT_INSET_SECONDARY_FIELD;
+ auxPanel.add(l, gbc);
+ }
else if (isSecurityField && canUpdateSecurity)
{
gbc.gridwidth = GridBagConstraints.RELATIVE;
@@ -395,6 +409,17 @@
}
break;
+ case ADMIN_CONNECTOR_PORT:
+ if (defaultUserData.getAdminConnectorPort() > 0)
+ {
+ value = String.valueOf(defaultUserData.getAdminConnectorPort());
+ }
+ else
+ {
+ value = "";
+ }
+ break;
+
case DIRECTORY_MANAGER_DN:
value = defaultUserData.getDirectoryManagerDn();
break;
@@ -440,6 +465,12 @@
LabelFieldDescriptor.FieldType.TEXTFIELD,
LabelFieldDescriptor.LabelType.PRIMARY, UIFactory.PORT_FIELD_SIZE));
+ hm.put(FieldName.ADMIN_CONNECTOR_PORT, new LabelFieldDescriptor(
+ INFO_ADMIN_CONNECTOR_PORT_LABEL.get(),
+ INFO_ADMIN_CONNECTOR_PORT_TOOLTIP.get(),
+ LabelFieldDescriptor.FieldType.TEXTFIELD,
+ LabelFieldDescriptor.LabelType.PRIMARY, UIFactory.PORT_FIELD_SIZE));
+
hm.put(FieldName.SECURITY_OPTIONS, new LabelFieldDescriptor(
INFO_SERVER_SECURITY_LABEL.get(),
INFO_SERVER_SECURITY_TOOLTIP.get(),
@@ -630,6 +661,22 @@
/**
* Returns the port help message that we display when we cannot use the
+ * default admin connector port (4444).
+ * @return the port help message that we display when we cannot use the
+ * default admin connector port (4444).
+ */
+ private Message getAdminConnectorPortHelpMessage()
+ {
+ Message s = Message.EMPTY;
+ if (defaultUserData.getAdminConnectorPort() != 4444)
+ {
+ s = INFO_CANNOT_USE_DEFAULT_ADMIN_CONNECTOR_PORT.get();
+ }
+ return s;
+ }
+
+ /**
+ * Returns the port help message that we display when we cannot use the
* default port (389).
* @return the port help message that we display when we cannot use the
* default port (389).
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java
index 24a500a..d6da08b 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FieldName.java
@@ -68,6 +68,10 @@
/**
* The value associated with this is a String.
*/
+ ADMIN_CONNECTOR_PORT,
+ /**
+ * The value associated with this is a String.
+ */
DIRECTORY_MANAGER_DN,
/**
* The value associated with this is a String.
@@ -134,11 +138,6 @@
*/
REMOTE_SERVER_PORT,
/**
- * Whether the Remote Server Port is a secure port or not. The value
- * associated with this is a Boolean.
- */
- REMOTE_SERVER_IS_SECURE_PORT,
- /**
* The value associated with this is a String.
*/
GLOBAL_ADMINISTRATOR_UID,
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
index fe54ad0..e73c3d4 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
@@ -391,11 +391,11 @@
ArrayList<String> cmd = new ArrayList<String>();
cmd.add(MAC_APPLICATIONS_OPENER);
cmd.add(getScriptPath(
- getPath(installation.getStatusPanelCommandFile())));
+ getPath(installation.getControlPanelCommandFile())));
pb = new ProcessBuilder(cmd);
} else {
String cmd = getScriptPath(
- getPath(installation.getStatusPanelCommandFile()));
+ getPath(installation.getControlPanelCommandFile()));
pb = new ProcessBuilder(cmd);
}
Map<String, String> env = pb.environment();
@@ -426,7 +426,7 @@
if (returnValue != 0)
{
throw new Error(
- INFO_COULD_NOT_LAUNCH_STATUS_PANEL_MSG.get().toString());
+ INFO_COULD_NOT_LAUNCH_CONTROL_PANEL_MSG.get().toString());
}
}
catch (Throwable t)
@@ -434,7 +434,7 @@
// This looks like a bug
t.printStackTrace();
throw new Error(
- INFO_COULD_NOT_LAUNCH_STATUS_PANEL_MSG.get().toString());
+ INFO_COULD_NOT_LAUNCH_CONTROL_PANEL_MSG.get().toString());
}
return null;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java b/opendj-sdk/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
index b9a3f66..b77e97d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
@@ -999,7 +999,8 @@
allPropertyDefinitions.put(propName, d);
if (d instanceof AggregationPropertyDefinition) {
- AggregationPropertyDefinition apd = (AggregationPropertyDefinition) d;
+ AggregationPropertyDefinition<?, ?> apd =
+ (AggregationPropertyDefinition<?, ?>) d;
aggregationPropertyDefinitions.put(propName, apd);
// The key must also contain the managed object name, since several MOs
// in an inheritance tree may aggregate the same aggregation property name
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/AdministrationConnector.java b/opendj-sdk/opends/src/server/org/opends/server/admin/AdministrationConnector.java
new file mode 100644
index 0000000..fcffdd3
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/AdministrationConnector.java
@@ -0,0 +1,617 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+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.IOException;
+import java.security.KeyStoreException;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.security.cert.CertificateEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import javax.naming.ldap.Rdn;
+import org.opends.messages.Message;
+import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.opends.server.admin.server.ServerManagementContext;
+import org.opends.server.admin.std.meta.LDAPConnectionHandlerCfgDefn.
+ SSLClientAuthPolicy;
+import org.opends.server.admin.std.server.AdministrationConnectorCfg;
+import org.opends.server.admin.std.server.ConnectionHandlerCfg;
+import org.opends.server.admin.std.server.KeyManagerProviderCfg;
+import org.opends.server.admin.std.server.FileBasedKeyManagerProviderCfg;
+import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
+import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
+import org.opends.server.admin.std.server.RootCfg;
+import org.opends.server.config.ConfigException;
+import org.opends.server.core.SynchronousStrategy;
+import org.opends.server.protocols.ldap.LDAPConnectionHandler;
+import org.opends.server.types.AddressMask;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.DN;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.ResultCode;
+import org.opends.server.util.CertificateManager;
+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.opends.server.types.DirectoryException;
+import org.opends.server.types.FilePermission;
+import org.opends.server.util.SetupUtils;
+
+/**
+ * This class is a wrapper on top of LDAPConnectionHandler to manage
+ * the administration connector, which is an LDAPConnectionHandler with specific
+ * (limited) configuration properties.
+ */
+public final class AdministrationConnector
+ implements ConfigurationChangeListener<AdministrationConnectorCfg> {
+
+ /**
+ * Default Administration Connector port.
+ */
+ public static final int DEFAULT_ADMINISTRATION_CONNECTOR_PORT = 4444;
+
+ /**
+ * Validity (in days) of the generated certificate.
+ */
+ public static final int ADMIN_CERT_VALIDITY = 2 * 365;
+
+ // 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 LDAPConnectionHandler adminConnectionHandler;
+ private AdministrationConnectorCfg config; //
+ // Predefined values for Administration Connector configuration
+ //
+ private static final String ADMIN_CLASS_NAME =
+ "org.opends.server.protocols.ldap.LDAPConnectionHandler";
+ private static final boolean ADMIN_ALLOW_LDAP_V2 = true;
+ private static final boolean ADMIN_ALLOW_START_TLS = false;
+ private static final SortedSet<AddressMask> ADMIN_ALLOWED_CLIENT =
+ new TreeSet<AddressMask>();
+ private static final SortedSet<AddressMask> ADMIN_DENIED_CLIENT =
+ new TreeSet<AddressMask>();
+ private static final boolean ADMIN_ENABLED = true;
+ private static final boolean ADMIN_KEEP_STATS = true;
+ private static final boolean ADMIN_USE_SSL = true;
+ private static final int ADMIN_ACCEPT_BACKLOG = 128;
+ private static final boolean ADMIN_ALLOW_TCP_REUSE_ADDRESS = true;
+ private static final long ADMIN_MAX_BLOCKED_WRITE_TIME_LIMIT = 120000; // 2mn
+ private static final int ADMIN_MAX_REQUEST_SIZE = 5000000; // 5 Mb
+ private static final int ADMIN_NUM_REQUEST_HANDLERS = 1;
+ private static final boolean ADMIN_SEND_REJECTION_NOTICE = true;
+ private static final boolean ADMIN_USE_TCP_KEEP_ALIVE = true;
+ private static final boolean ADMIN_USE_TCP_NO_DELAY = true;
+ private static final SSLClientAuthPolicy ADMIN_SSL_CLIENT_AUTH_POLICY =
+ SSLClientAuthPolicy.DISABLED;
+ private static final SortedSet<String> ADMIN_SSL_CIPHER_SUITE =
+ new TreeSet<String>();
+ private static final SortedSet<String> ADMIN_SSL_PROTOCOL =
+ new TreeSet<String>();
+
+ /**
+ * Initializes this administration connector provider based on the
+ * information in the provided administration connector configuration.
+ *
+ * @param configuration
+ * The connection handler configuration that contains the
+ * information to use to initialize this connection
+ * handler.
+ * @throws ConfigException
+ * If an unrecoverable problem arises in the process of
+ * performing the initialization as a result of the server
+ * configuration.
+ * @throws InitializationException
+ * If a problem occurs during initialization that is not
+ * related to the server configuration.
+ */
+ public void initializeAdministrationConnector(
+ AdministrationConnectorCfg configuration)
+ throws ConfigException, InitializationException {
+
+ this.config = configuration;
+
+ // Create a fake LDAP connection handler configuration
+ LDAPConnectionHandlerCfg ldapConnectionHandlerCfg =
+ new FakeLDAPConnectionHandlerCfg(config);
+
+ createSelfSignedCertifIfNeeded();
+
+ // Administration Connector uses the LDAP connection handler implementation
+ adminConnectionHandler =
+ new LDAPConnectionHandler(new SynchronousStrategy(), FRIENDLY_NAME);
+ adminConnectionHandler.
+ initializeConnectionHandler(ldapConnectionHandlerCfg);
+
+ // Register this as a change listener.
+ config.addChangeListener(this);
+ }
+
+ /**
+ * Create an instance of the administration connector.
+ */
+ public AdministrationConnector() {
+ // Do nothing.
+ }
+
+ /**
+ * Retrieves the connection handler linked to this administration connector.
+ *
+ * @return The connection handler linked to this administration connector.
+ */
+ public LDAPConnectionHandler getConnectionHandler() {
+ return adminConnectionHandler;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationChangeAcceptable(
+ AdministrationConnectorCfg configuration,
+ List<Message> unacceptableReasons) {
+ LDAPConnectionHandlerCfg cfg =
+ new FakeLDAPConnectionHandlerCfg(configuration);
+ return adminConnectionHandler.isConfigurationAcceptable(
+ cfg, unacceptableReasons);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationChange(
+ AdministrationConnectorCfg configuration) {
+ return new ConfigChangeResult(
+ ResultCode.SUCCESS, true, new ArrayList<Message>());
+ }
+
+ /**
+ * This private class implements a fake LDAP connection Handler configuration.
+ * This allows to re-use the LDAPConnectionHandler as it is.
+ *
+ */
+ private static class FakeLDAPConnectionHandlerCfg
+ implements LDAPConnectionHandlerCfg {
+
+ private final AdministrationConnectorCfg config;
+
+ public FakeLDAPConnectionHandlerCfg(AdministrationConnectorCfg config) {
+ this.config = config;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Class<? extends LDAPConnectionHandlerCfg> configurationClass() {
+ return LDAPConnectionHandlerCfg.class;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addLDAPChangeListener(
+ ConfigurationChangeListener<LDAPConnectionHandlerCfg> listener) {
+ // do nothing. change listener already added.
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeLDAPChangeListener(
+ ConfigurationChangeListener<LDAPConnectionHandlerCfg> listener) {
+ // do nothing. change listener already added.
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getAcceptBacklog() {
+ return ADMIN_ACCEPT_BACKLOG;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isAllowLDAPV2() {
+ return ADMIN_ALLOW_LDAP_V2;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isAllowStartTLS() {
+ return ADMIN_ALLOW_START_TLS;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isAllowTCPReuseAddress() {
+ return ADMIN_ALLOW_TCP_REUSE_ADDRESS;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getJavaClass() {
+ return ADMIN_CLASS_NAME;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isKeepStats() {
+ return ADMIN_KEEP_STATS;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getKeyManagerProvider() {
+ return config.getKeyManagerProvider();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public DN getKeyManagerProviderDN() {
+ return config.getKeyManagerProviderDN();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public SortedSet<InetAddress> getListenAddress() {
+ return config.getListenAddress();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getListenPort() {
+ return config.getListenPort();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getMaxBlockedWriteTimeLimit() {
+ return ADMIN_MAX_BLOCKED_WRITE_TIME_LIMIT;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getMaxRequestSize() {
+ return ADMIN_MAX_REQUEST_SIZE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getNumRequestHandlers() {
+ return ADMIN_NUM_REQUEST_HANDLERS;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isSendRejectionNotice() {
+ return ADMIN_SEND_REJECTION_NOTICE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getSSLCertNickname() {
+ return config.getSSLCertNickname();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public SortedSet<String> getSSLCipherSuite() {
+ return ADMIN_SSL_CIPHER_SUITE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public SSLClientAuthPolicy getSSLClientAuthPolicy() {
+ return ADMIN_SSL_CLIENT_AUTH_POLICY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public SortedSet<String> getSSLProtocol() {
+ return ADMIN_SSL_PROTOCOL;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getTrustManagerProvider() {
+ return config.getTrustManagerProvider();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public DN getTrustManagerProviderDN() {
+ return config.getTrustManagerProviderDN();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isUseSSL() {
+ return ADMIN_USE_SSL;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isUseTCPKeepAlive() {
+ return ADMIN_USE_TCP_KEEP_ALIVE;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isUseTCPNoDelay() {
+ return ADMIN_USE_TCP_NO_DELAY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addChangeListener(
+ ConfigurationChangeListener<ConnectionHandlerCfg> listener) {
+ // do nothing. change listener already added.
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void removeChangeListener(
+ ConfigurationChangeListener<ConnectionHandlerCfg> listener) {
+ // do nothing. change listener already added.
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public SortedSet<AddressMask> getAllowedClient() {
+ return ADMIN_ALLOWED_CLIENT;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public SortedSet<AddressMask> getDeniedClient() {
+ return ADMIN_DENIED_CLIENT;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isEnabled() {
+ return ADMIN_ENABLED;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public DN dn() {
+ return config.dn();
+ }
+ }
+
+ /**
+ * Creates a self-signed JKS certificate if needed.
+ */
+ private void createSelfSignedCertifIfNeeded()
+ throws InitializationException {
+
+ try {
+
+ // Check if certificate generation is needed
+ String certAlias = config.getSSLCertNickname();
+ KeyManagerProviderCfg keyMgrConfig =
+ getAdminConnectorKeyManagerConfig(config.getKeyManagerProvider());
+ TrustManagerProviderCfg trustMgrConfig =
+ getAdminConnectorTrustManagerConfig(config.getTrustManagerProvider());
+
+ if (!(keyMgrConfig instanceof FileBasedKeyManagerProviderCfg) ||
+ !(trustMgrConfig instanceof FileBasedTrustManagerProviderCfg)) {
+ // The default config has been changed, nothing to do
+ return;
+ }
+
+ FileBasedKeyManagerProviderCfg fbKeyManagerConfig =
+ (FileBasedKeyManagerProviderCfg) keyMgrConfig;
+ String keystorePath =
+ getFullPath(fbKeyManagerConfig.getKeyStoreFile());
+ FileBasedTrustManagerProviderCfg fbTrustManagerConfig =
+ (FileBasedTrustManagerProviderCfg) trustMgrConfig;
+ String truststorePath =
+ getFullPath(fbTrustManagerConfig.getTrustStoreFile());
+ String pinFilePath = getFullPath(fbKeyManagerConfig.getKeyStorePinFile());
+
+ // Check that either we do not have any file,
+ // or we have the 3 required files (keystore, truststore, pin file)
+ boolean keystore = false;
+ boolean truststore = false;
+ boolean pinFile = false;
+ int nbFiles = 0;
+ if (new File(keystorePath).exists()) {
+ keystore = true;
+ nbFiles++;
+ }
+ if (new File(truststorePath).exists()) {
+ truststore = true;
+ nbFiles++;
+ }
+ if (new File(pinFilePath).exists()) {
+ pinFile = true;
+ nbFiles++;
+ }
+ if (nbFiles == 3) {
+ // nothing to do
+ return;
+ }
+ if (nbFiles != 0) {
+ // 1 or 2 files are missing : error
+ String err = "";
+ if (!keystore) {
+ err += keystorePath + " ";
+ }
+ if (!truststore) {
+ err += truststorePath + " ";
+ }
+ if (!pinFile) {
+ err += pinFilePath + " ";
+ }
+ Message message =
+ ERR_ADMIN_CERTIFICATE_GENERATION_MISSING_FILES.get(err);
+ logError(message);
+ throw new InitializationException(message);
+ }
+
+ // Generate a password
+ String pwd = new String(SetupUtils.createSelfSignedCertificatePwd());
+
+ // Generate a self-signed certificate
+ CertificateManager certManager = new CertificateManager(
+ getFullPath(fbKeyManagerConfig.getKeyStoreFile()),
+ fbKeyManagerConfig.getKeyStoreType(),
+ pwd);
+ String subjectDN = "cn=" +
+ Rdn.escapeValue(InetAddress.getLocalHost().getHostName()) +
+ ",O=" + FRIENDLY_NAME + " Self-Signed Certificate";
+ certManager.generateSelfSignedCertificate(
+ certAlias, subjectDN, ADMIN_CERT_VALIDITY);
+
+ // Export the certificate
+ String tempCertPath = getFullPath("config" + File.separator +
+ "admin-cert.txt");
+ SetupUtils.exportCertificate(certManager, certAlias,
+ tempCertPath);
+
+ // Create a new trust store and import the server certificate into it
+ CertificateManager trustManager = new CertificateManager(
+ truststorePath,
+ CertificateManager.KEY_STORE_TYPE_JKS,
+ pwd);
+ trustManager.addCertificate(certAlias, new File(tempCertPath));
+
+ // Generate a password file
+ if (!new File(pinFilePath).exists()) {
+ FileWriter file = new FileWriter(pinFilePath);
+ PrintWriter out = new PrintWriter(file);
+ out.println(pwd);
+ out.flush();
+ out.close();
+ file.close();
+ }
+
+ // Change the password file permission if possible
+ if (FilePermission.canSetPermissions()) {
+ try {
+ if (!FilePermission.setPermissions(new File(pinFilePath),
+ new FilePermission(0600))) {
+ // Log a warning that the permissions were not set.
+ Message message =
+ WARN_ADMIN_SET_PERMISSIONS_FAILED.get(pinFilePath);
+ ErrorLogger.logError(message);
+ }
+ } catch (DirectoryException e) {
+ // Log a warning that the permissions were not set.
+ Message message = WARN_ADMIN_SET_PERMISSIONS_FAILED.get(pinFilePath);
+ ErrorLogger.logError(message);
+ }
+ }
+
+ // Delete the exported certificate
+ File f = new File(tempCertPath);
+ f.delete();
+
+ } catch (ConfigException e) {
+ handleCertifExceptions(e);
+ } catch (KeyStoreException e) {
+ handleCertifExceptions(e);
+ } catch (IOException e) {
+ handleCertifExceptions(e);
+ } catch (CertificateEncodingException e) {
+ handleCertifExceptions(e);
+ }
+ }
+
+ private void handleCertifExceptions(Exception e) throws
+ InitializationException {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+ Message message = ERR_ADMIN_CERTIFICATE_GENERATION.get(e.getMessage());
+ logError(message);
+ throw new InitializationException(message);
+ }
+
+ private KeyManagerProviderCfg getAdminConnectorKeyManagerConfig(String name)
+ throws ConfigException {
+ RootCfg root = ServerManagementContext.getInstance().getRootConfiguration();
+ return root.getKeyManagerProvider(name);
+ }
+
+ private TrustManagerProviderCfg getAdminConnectorTrustManagerConfig(
+ String name)
+ throws ConfigException {
+ RootCfg root =
+ ServerManagementContext.getInstance().getRootConfiguration();
+ return root.getTrustManagerProvider(name);
+ }
+
+ private static String getFullPath(String path) {
+ File file = new File(path);
+ if (!file.isAbsolute()) {
+ path = DirectoryServer.getInstanceRoot() + File.separator + path;
+ }
+
+ return path;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/ClassLoaderProvider.java b/opendj-sdk/opends/src/server/org/opends/server/admin/ClassLoaderProvider.java
index 078ed0c..dd640cf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/ClassLoaderProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/ClassLoaderProvider.java
@@ -29,16 +29,20 @@
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;
+import java.io.ByteArrayOutputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.PrintStream;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
@@ -48,8 +52,10 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
+import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import java.util.jar.Manifest;
import org.opends.messages.Message;
import org.opends.server.admin.std.meta.RootCfgDefn;
@@ -147,6 +153,15 @@
// The singleton instance.
private static final ClassLoaderProvider INSTANCE = new ClassLoaderProvider();
+ // Attribute name in jar's MANIFEST corresponding to the revision number.
+ private static final String REVISION_NUMBER = "Revision-Number";
+
+ // The attribute names for build information is name, version and revision
+ // number
+ private static final String[] BUILD_INFORMATION_ATTRIBUTE_NAMES =
+ new String[]{Attributes.Name.EXTENSION_NAME.toString(),
+ Attributes.Name.IMPLEMENTATION_VERSION.toString(),
+ REVISION_NUMBER};
/**
@@ -385,6 +400,112 @@
/**
+ * Prints out all information about extensions.
+ *
+ * @return a String instance representing all information about extensions;
+ * <code>null</code> if there is no information available.
+ */
+ public String printExtensionInformation() {
+ File extensionsPath =
+ new File(new StringBuilder(DirectoryServer.getServerRoot()).
+ append(File.separator).
+ append(LIB_DIR).
+ append(File.separator).
+ append(EXTENSIONS_DIR).
+ toString());
+
+ if (!extensionsPath.exists() || !extensionsPath.isDirectory()) {
+ // no extensions' directory
+ return null;
+ }
+
+ File[] extensions = extensionsPath.listFiles(new FileFilter(){
+ public boolean accept(File pathname) {
+ // only files with names ending with ".jar"
+ return pathname.isFile() && pathname.getName().endsWith(".jar");
+ }
+ });
+
+ if ( extensions.length == 0 ) {
+ return null;
+ }
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(baos);
+ // prints:
+ // --
+ // Name Build number Revision number
+ ps.printf("--%s %-20s %-20s %-20s%s",
+ EOL,
+ "Name",
+ "Build number",
+ "Revision number",
+ EOL);
+
+ for(File extension : extensions) {
+ // retrieve MANIFEST entry and display name, build number and revision
+ // number
+ try {
+ String[] information = getBuildInformation(new JarFile(extension));
+
+ ps.append("Extension: ");
+ boolean addBlank = false;
+ for(String name : information) {
+ if ( addBlank ) {
+ ps.append(addBlank ? " " : ""); // add blank if not first append
+ } else {
+ addBlank = true;
+ }
+
+ ps.printf("%-20s", name);
+ }
+ ps.append(EOL);
+ } catch(Exception e) {
+ // ignore extra information for this extension
+ }
+ }
+
+ return baos.toString();
+ }
+
+
+
+ /**
+ * Returns a String array with the following information :
+ * <br>index 0: the name of the extension.
+ * <br>index 1: the build number of the extension.
+ * <br>index 2: the revision number of the extension.
+ *
+ * @param extension the jar file of the extension
+ * @return a String array containing the name, the build number and the
+ * revision number of the extension given in argument
+ * @throws java.io.IOException thrown if the jar file has been closed.
+ */
+ private String[] getBuildInformation(JarFile extension) throws IOException {
+ String[] result = new String[3];
+
+ // retrieve MANIFEST entry and display name, version and revision
+ Manifest manifest = extension.getManifest();
+
+ if ( manifest != null ) {
+ Attributes attributes = manifest.getMainAttributes();
+
+ int index = 0;
+ for(String name : BUILD_INFORMATION_ATTRIBUTE_NAMES) {
+ String value = attributes.getValue(name);
+ if ( value == null ) {
+ value = "<unknown>";
+ }
+ result[index++] = value;
+ }
+ }
+
+ return result;
+ }
+
+
+
+ /**
* Put extensions jars into the class loader and load all
* configuration definition classes in that they contain.
*
@@ -529,6 +650,18 @@
.getName(), EXTENSION_MANIFEST, stackTraceToSingleLineString(e));
throw new InitializationException(message);
}
+ try {
+ // Log build information of extensions in the error log
+ String[] information = getBuildInformation(jarFile);
+ logError(
+ INFO_LOG_EXTENSION_INFORMATION.
+ get(jarFile.getName().replace(DirectoryServer.getServerRoot(),
+ "$SERVER_ROOT"),
+ information[1],
+ information[2]));
+ } catch(Exception e) {
+ // Do not log information for that extension
+ }
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java
index a633b9d..9383cc1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java
@@ -77,6 +77,9 @@
public HashSet<DsFrameworkCliSubCommandGroup> cliGroup;
+ // This CLI is always using the administration connector with SSL
+ private final boolean alwaysSSL = true;
+
/**
* Creates a new instance of this subcommand argument parser with no
@@ -114,7 +117,7 @@
throws ArgumentException
{
// Global parameters
- initializeGlobalArguments(createGlobalArguments(outStream));
+ initializeGlobalArguments(createGlobalArguments(outStream, alwaysSSL));
// ads Group cli
cliGroup.add(new DsFrameworkCliAds());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index d365221..db67e61 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -43,6 +43,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
+import java.net.InetAddress;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -186,11 +187,20 @@
static private final Logger LOG =
Logger.getLogger(SecureConnectionCliArgs.class.getName());
+ // Defines if the CLI always use the SSL connection type.
+ private boolean alwaysSSL = false;
+
/**
* Creates a new instance of secure arguments.
+ *
+ * @param alwaysSSL If true, always use the SSL connection type. In this case,
+ * the arguments useSSL and startTLS are not present.
*/
- public SecureConnectionCliArgs()
+ public SecureConnectionCliArgs(boolean alwaysSSL)
{
+ if (alwaysSSL) {
+ this.alwaysSSL = true;
+ }
}
/**
@@ -423,26 +433,45 @@
argList = new LinkedHashSet<Argument>();
useSSLArg = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
- OPTION_LONG_USE_SSL, INFO_DESCRIPTION_USE_SSL.get());
+ OPTION_LONG_USE_SSL, INFO_DESCRIPTION_USE_SSL.get());
useSSLArg.setPropertyName(OPTION_LONG_USE_SSL);
- argList.add(useSSLArg);
+ if (!alwaysSSL) {
+ argList.add(useSSLArg);
+ } else {
+ // simulate that the useSSL arg has been given in the CLI
+ useSSLArg.setPresent(true);
+ }
useStartTLSArg = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
- OPTION_LONG_START_TLS,
- INFO_DESCRIPTION_START_TLS.get());
+ OPTION_LONG_START_TLS,
+ INFO_DESCRIPTION_START_TLS.get());
useStartTLSArg.setPropertyName(OPTION_LONG_START_TLS);
- argList.add(useStartTLSArg);
+ if (!alwaysSSL) {
+ argList.add(useStartTLSArg);
+ }
+ String defaultHostName;
+ try {
+ defaultHostName = InetAddress.getLocalHost().getHostName();
+ } catch (Exception e) {
+ defaultHostName="Unknown (" + e + ")";
+ }
hostNameArg = new StringArgument("host", OPTION_SHORT_HOST,
OPTION_LONG_HOST, false, false, true, INFO_HOST_PLACEHOLDER.get(),
- "localhost",
+ defaultHostName,
null, INFO_DESCRIPTION_HOST.get());
hostNameArg.setPropertyName(OPTION_LONG_HOST);
argList.add(hostNameArg);
+
+ Message portDescription = INFO_DESCRIPTION_PORT.get();
+ if (alwaysSSL) {
+ portDescription = INFO_DESCRIPTION_ADMIN_PORT.get();
+ }
+
portArg = new IntegerArgument("port", OPTION_SHORT_PORT, OPTION_LONG_PORT,
false, false, true, INFO_PORT_PLACEHOLDER.get(), 389, null,
- INFO_DESCRIPTION_PORT.get());
+ portDescription);
portArg.setPropertyName(OPTION_LONG_PORT);
argList.add(portArg);
@@ -650,15 +679,15 @@
}
}
- // Couldn't have at the same time startTLSArg and
- // useSSLArg
+ // Couldn't have at the same time startTLSArg and
+ // useSSLArg
if (useStartTLSArg.isPresent()
&& useSSLArg.isPresent()) {
- Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
useStartTLSArg
.getLongIdentifier(), useSSLArg.getLongIdentifier());
- errors.add(message);
- }
+ errors.add(message);
+ }
if (errors.size() > 0)
{
for (Message error : errors)
@@ -727,6 +756,16 @@
}
/**
+ * Indicate if the SSL mode is always used.
+ *
+ * @return True if SSL mode is always used.
+ */
+ public boolean alwaysSSL()
+ {
+ return alwaysSSL;
+ }
+
+ /**
* Handle TrustStore.
*
* @return The trustStore manager to be used for the command.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
index 28cbd0e..b7b455b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
@@ -308,16 +308,19 @@
*
* @param outStream
* The output stream used for the usage.
+ * @param alwaysSSL If true, always use the SSL connection type. In this case,
+ * the arguments useSSL and startTLS are not present.
+ *
* @throws ArgumentException
* If there is a problem with any of the parameters used
* to create this argument.
* @return a ArrayList with the options created.
*/
protected LinkedHashSet<Argument> createGlobalArguments(
- OutputStream outStream)
+ OutputStream outStream, boolean alwaysSSL)
throws ArgumentException
{
- secureArgsList = new SecureConnectionCliArgs();
+ secureArgsList = new SecureConnectionCliArgs(alwaysSSL);
LinkedHashSet<Argument> set = secureArgsList.createGlobalArguments();
showUsageArg = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
index 39a357d..9e35a95 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
@@ -47,7 +47,9 @@
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
+import org.opends.admin.ads.util.BlindTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.admin.ads.util.TrustedSocketFactory;
import org.opends.server.admin.client.AuthenticationException;
import org.opends.server.admin.client.AuthenticationNotSupportedException;
import org.opends.server.admin.client.CommunicationException;
@@ -124,6 +126,63 @@
return new JNDIDirContextAdaptor(ctx);
}
+ /**
+ * Creates a new JNDI connection adaptor by performing a simple bind
+ * operation to the specified LDAP server.
+ *
+ * @param host
+ * The host.
+ * @param port
+ * The port.
+ * @param name
+ * The LDAP bind DN.
+ * @param password
+ * The LDAP bind password.
+ * @return Returns a new JNDI connection adaptor.
+ * @throws CommunicationException
+ * If the client cannot contact the server due to an
+ * underlying communication problem.
+ * @throws AuthenticationNotSupportedException
+ * If the server does not support simple authentication.
+ * @throws AuthenticationException
+ * If authentication failed for some reason, usually due
+ * to invalid credentials.
+ */
+ public static JNDIDirContextAdaptor simpleSSLBind(String host, int port,
+ String name, String password) throws CommunicationException,
+ AuthenticationNotSupportedException, AuthenticationException {
+ Hashtable<String, Object> env = new Hashtable<String, Object>();
+ env.put(Context.INITIAL_CONTEXT_FACTORY,
+ "com.sun.jndi.ldap.LdapCtxFactory");
+ String hostname = ConnectionUtils.getHostNameForLdapUrl(host) ;
+ env.put(Context.PROVIDER_URL, "ldaps://" + hostname + ":" + port);
+ env.put(Context.SECURITY_PRINCIPAL, name);
+ env.put(Context.SECURITY_CREDENTIALS, password);
+ env.put(Context.SECURITY_AUTHENTICATION, "simple");
+ // Specify SSL
+ env.put(Context.SECURITY_PROTOCOL, "ssl");
+ env.put("java.naming.ldap.factory.socket",
+ org.opends.admin.ads.util.TrustedSocketFactory.class.getName());
+ TrustedSocketFactory.setCurrentThreadTrustManager(new BlindTrustManager(),
+ null);
+ DirContext ctx;
+ try {
+ ctx = new InitialLdapContext(env, null);
+ } catch (javax.naming.CommunicationException e) {
+ throw new CommunicationException(e);
+ } catch (javax.naming.AuthenticationException e) {
+ throw new AuthenticationException(e);
+ } catch (javax.naming.AuthenticationNotSupportedException e) {
+ throw new AuthenticationNotSupportedException(e);
+ } catch (NamingException e) {
+ // Assume some kind of communication problem.
+ throw new CommunicationException(e);
+ }
+
+ return new JNDIDirContextAdaptor(ctx);
+ }
+
+
// The JNDI connection context.
private final DirContext dirContext;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AccessLogPublisher.java b/opendj-sdk/opends/src/server/org/opends/server/api/AccessLogPublisher.java
index ce6fc12..1a259c7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AccessLogPublisher.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AccessLogPublisher.java
@@ -29,6 +29,7 @@
import java.util.List;
+import java.util.Map;
import org.opends.server.admin.std.server.AccessLogPublisherCfg;
import org.opends.server.config.ConfigException;
@@ -37,71 +38,70 @@
import org.opends.messages.Message;
+
/**
* This class defines the set of methods and structures that must be
* implemented for a Directory Server access log publisher.
*
- * @param <T> The type of access log publisher configuration handled
- * by this log publisher implementation.
+ * @param <T>
+ * The type of access log publisher configuration handled by
+ * this log publisher implementation.
*/
@org.opends.server.types.PublicAPI(
- stability=org.opends.server.types.StabilityLevel.VOLATILE,
- mayInstantiate=false,
- mayExtend=true,
- mayInvoke=false)
+ stability = org.opends.server.types.StabilityLevel.VOLATILE,
+ mayInstantiate = false,
+ mayExtend = true,
+ mayInvoke = false)
public abstract class AccessLogPublisher
- <T extends AccessLogPublisherCfg>
+ <T extends AccessLogPublisherCfg>
{
+
/**
* Initializes this access publisher provider based on the
* information in the provided debug publisher configuration.
*
- * @param config The access publisher configuration that contains
- * the information to use to initialize this access
- * publisher.
- *
- * @throws ConfigException If an unrecoverable problem arises in
- * the process of performing the
- * initialization as a result of the
- * server configuration.
- *
- * @throws InitializationException If a problem occurs during
- * initialization that is not
- * related to the server
- * configuration.
+ * @param config
+ * The access publisher configuration that contains the
+ * information to use to initialize this access publisher.
+ * @throws ConfigException
+ * If an unrecoverable problem arises in the process of
+ * performing the initialization as a result of the server
+ * configuration.
+ * @throws InitializationException
+ * If a problem occurs during initialization that is not
+ * related to the server configuration.
*/
public abstract void initializeAccessLogPublisher(T config)
- throws ConfigException, InitializationException;
+ throws ConfigException, InitializationException;
/**
* Indicates whether the provided configuration is acceptable for
- * this access log publisher. It should be possible to call this
- * method on an uninitialized access log publisher instance in
- * order to determine whether the access log publisher would be able
- * to use the provided configuration.
- * <BR><BR>
+ * this access log publisher. It should be possible to call this
+ * method on an uninitialized access log publisher instance in order
+ * to determine whether the access log publisher would be able to
+ * use the provided configuration. <BR>
+ * <BR>
* Note that implementations which use a subclass of the provided
- * configuration class will likely need to cast the configuration
- * to the appropriate subclass type.
+ * configuration class will likely need to cast the configuration to
+ * the appropriate subclass type.
*
- * @param configuration The access log publisher
- * configuration for which to make the
- * determination.
- * @param unacceptableReasons A list that may be used to hold the
- * reasons that the provided
- * configuration is not acceptable.
- *
- * @return {@code true} if the provided configuration is acceptable
- * for this access log publisher, or {@code false} if not.
+ * @param configuration
+ * The access log publisher configuration for which to make
+ * the determination.
+ * @param unacceptableReasons
+ * A list that may be used to hold the reasons that the
+ * provided configuration is not acceptable.
+ * @return {@code true} if the provided configuration is acceptable
+ * for this access log publisher, or {@code false} if not.
*/
public boolean isConfigurationAcceptable(
- AccessLogPublisherCfg configuration,
- List<Message> unacceptableReasons)
+ AccessLogPublisherCfg configuration,
+ List<Message> unacceptableReasons)
{
// This default implementation does not perform any special
- // validation. It should be overridden by access log publisher
+ // validation. It should be overridden by access log publisher
// implementations that wish to perform more detailed validation.
return true;
}
@@ -119,167 +119,398 @@
* Writes a message to the access logger with information about a
* new client connection that has been established, regardless of
* whether it will be immediately terminated.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param clientConnection The client connection that has been
- * established.
+ * @param clientConnection
+ * The client connection that has been established.
*/
- public abstract void logConnect(ClientConnection clientConnection);
+ public void logConnect(ClientConnection clientConnection)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* termination of an existing client connection.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param clientConnection The client connection that has been
- * terminated.
- * @param disconnectReason A generic disconnect reason for the
- * connection termination.
- * @param message A human-readable message that can
- * provide additional information about
- * the disconnect.
+ * @param clientConnection
+ * The client connection that has been terminated.
+ * @param disconnectReason
+ * A generic disconnect reason for the connection
+ * termination.
+ * @param message
+ * A human-readable message that can provide additional
+ * information about the disconnect.
*/
- public abstract void logDisconnect(
- ClientConnection clientConnection,
- DisconnectReason disconnectReason,
- Message message);
+ public void logDisconnect(ClientConnection clientConnection,
+ DisconnectReason disconnectReason, Message message)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* abandon request associated with the provided abandon operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param abandonOperation The abandon operation containing the
- * information to use to log the abandon
- * request.
+ * @param abandonOperation
+ * The abandon operation containing the information to use
+ * to log the abandon request.
*/
- public abstract void logAbandonRequest(
- AbandonOperation abandonOperation);
+ public void logAbandonRequest(AbandonOperation abandonOperation)
+ {
+ // Do nothing
+ }
+
+
+
+ /**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided abandon operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ * <p>
+ * The default implementation is to not log anything.
+ *
+ * @param abandonOperation
+ * The abandon operation containing the information to use
+ * to log the abandon request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public void logAbandonIntermediateMessage(
+ AbandonOperation abandonOperation,
+ String category, Map<String, String> content)
+ {
+ // Do nothing.
+ }
/**
* Writes a message to the access logger with information about the
* result of the provided abandon operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param abandonOperation The abandon operation containing the
- * information to use to log the abandon
- * request.
+ * @param abandonOperation
+ * The abandon operation containing the information to use
+ * to log the abandon request.
*/
- public abstract void logAbandonResult(
- AbandonOperation abandonOperation);
+ public void logAbandonResult(AbandonOperation abandonOperation)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* add request associated with the provided add operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param addOperation The add operation containing the
- * information to use to log the add request.
+ * @param addOperation
+ * The add operation containing the information to use to
+ * log the add request.
*/
- public abstract void logAddRequest(AddOperation addOperation);
+ public void logAddRequest(AddOperation addOperation)
+ {
+ // Do nothing
+ }
+
+
+
+ /**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided add operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ * <p>
+ * The default implementation is to not log anything.
+ *
+ * @param addOperation
+ * The add operation containing the information to use to
+ * log the add request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public void logAddIntermediateMessage(AddOperation addOperation,
+ String category, Map<String, String> content)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* add response associated with the provided add operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param addOperation The add operation containing the
- * information to use to log the add response.
+ * @param addOperation
+ * The add operation containing the information to use to
+ * log the add response.
*/
- public abstract void logAddResponse(AddOperation addOperation);
+ public void logAddResponse(AddOperation addOperation)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* bind request associated with the provided bind operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param bindOperation The bind operation containing the
- * information to use to log the bind
- * request.
+ * @param bindOperation
+ * The bind operation containing the information to use to
+ * log the bind request.
*/
- public abstract void logBindRequest(BindOperation bindOperation);
+ public void logBindRequest(BindOperation bindOperation)
+ {
+ // Do nothing
+ }
+
+
+
+ /**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided bind operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ * <p>
+ * The default implementation is to not log anything.
+ *
+ * @param bindOperation
+ * The bind operation containing the information to use to
+ * log the bind request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public void logBindIntermediateMessage(BindOperation bindOperation,
+ String category, Map<String, String> content)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* bind response associated with the provided bind operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param bindOperation The bind operation containing the
- * information to use to log the bind
- * response.
+ * @param bindOperation
+ * The bind operation containing the information to use to
+ * log the bind response.
*/
- public abstract void logBindResponse(BindOperation bindOperation);
+ public void logBindResponse(BindOperation bindOperation)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* compare request associated with the provided compare operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param compareOperation The compare operation containing the
- * information to use to log the compare
- * request.
+ * @param compareOperation
+ * The compare operation containing the information to use
+ * to log the compare request.
*/
- public abstract void logCompareRequest(
- CompareOperation compareOperation);
+ public void logCompareRequest(CompareOperation compareOperation)
+ {
+ // Do nothing
+ }
+
+
+
+ /**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided compare operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ * <p>
+ * The default implementation is to not log anything.
+ *
+ * @param compareOperation
+ * The compare operation containing the information to use
+ * to log the abandon compare.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public void logCompareIntermediateMessage(
+ CompareOperation compareOperation,
+ String category, Map<String, String> content)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* compare response associated with the provided compare operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param compareOperation The compare operation containing the
- * information to use to log the compare
- * response.
+ * @param compareOperation
+ * The compare operation containing the information to use
+ * to log the compare response.
*/
- public abstract void logCompareResponse(
- CompareOperation compareOperation);
+ public void logCompareResponse(CompareOperation compareOperation)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* delete request associated with the provided delete operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param deleteOperation The delete operation containing the
- * information to use to log the delete
- * request.
+ * @param deleteOperation
+ * The delete operation containing the information to use
+ * to log the delete request.
*/
- public abstract void logDeleteRequest(
- DeleteOperation deleteOperation);
+ public void logDeleteRequest(DeleteOperation deleteOperation)
+ {
+ // Do nothing
+ }
+
+
+
+ /**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided delete operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ * <p>
+ * The default implementation is to not log anything.
+ *
+ * @param deleteOperation
+ * The delete operation containing the information to use
+ * to log the delete request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public void logDeleteIntermediateMessage(
+ DeleteOperation deleteOperation,
+ String category, Map<String, String> content)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* delete response associated with the provided delete operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param deleteOperation The delete operation containing the
- * information to use to log the delete
- * response.
+ * @param deleteOperation
+ * The delete operation containing the information to use
+ * to log the delete response.
*/
- public abstract void logDeleteResponse(
- DeleteOperation deleteOperation);
+ public void logDeleteResponse(DeleteOperation deleteOperation)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* extended request associated with the provided extended operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param extendedOperation The extended operation containing the
- * information to use to log the extended
- * request.
+ * @param extendedOperation
+ * The extended operation containing the information to use
+ * to log the extended request.
*/
- public abstract void logExtendedRequest(
- ExtendedOperation extendedOperation);
+ public void logExtendedRequest(ExtendedOperation extendedOperation)
+ {
+ // Do nothing
+ }
+
+
+
+ /**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided extended operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ * <p>
+ * The default implementation is to not log anything.
+ *
+ * @param extendedOperation
+ * The extended operation containing the information to use
+ * to log the extended request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public void logExtendedIntermediateMessage(
+ ExtendedOperation extendedOperation, String category,
+ Map<String, String> content)
+ {
+ // Do nothing
+ }
@@ -287,39 +518,80 @@
* Writes a message to the access logger with information about the
* extended response associated with the provided extended
* operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param extendedOperation The extended operation containing the
- * information to use to log the extended
- * response.
+ * @param extendedOperation
+ * The extended operation containing the information to use
+ * to log the extended response.
*/
- public abstract void logExtendedResponse(
- ExtendedOperation extendedOperation);
+ public void logExtendedResponse(ExtendedOperation extendedOperation)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* modify request associated with the provided modify operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param modifyOperation The modify operation containing the
- * information to use to log the modify
- * request.
+ * @param modifyOperation
+ * The modify operation containing the information to use
+ * to log the modify request.
*/
- public abstract void logModifyRequest(
- ModifyOperation modifyOperation);
+ public void logModifyRequest(ModifyOperation modifyOperation)
+ {
+ // Do nothing
+ }
+
+
+
+ /**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided modify operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ * <p>
+ * The default implementation is to not log anything.
+ *
+ * @param modifyOperation
+ * The modify operation containing the information to use
+ * to log the modify request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public void logModifyIntermediateMessage(
+ ModifyOperation modifyOperation,
+ String category, Map<String, String> content)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* modify response associated with the provided modify operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param modifyOperation The modify operation containing the
- * information to use to log the modify
- * response.
+ * @param modifyOperation
+ * The modify operation containing the information to use
+ * to log the modify response.
*/
- public abstract void logModifyResponse(
- ModifyOperation modifyOperation);
+ public void logModifyResponse(ModifyOperation modifyOperation)
+ {
+ // Do nothing
+ }
@@ -327,13 +599,46 @@
* Writes a message to the access logger with information about the
* modify DN request associated with the provided modify DN
* operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param modifyDNOperation The modify DN operation containing the
- * information to use to log the modify
- * DN request.
+ * @param modifyDNOperation
+ * The modify DN operation containing the information to
+ * use to log the modify DN request.
*/
- public abstract void logModifyDNRequest(
- ModifyDNOperation modifyDNOperation);
+ public void logModifyDNRequest(ModifyDNOperation modifyDNOperation)
+ {
+ // Do nothing
+ }
+
+
+
+ /**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided modify DN operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ * <p>
+ * The default implementation is to not log anything.
+ *
+ * @param modifyDNOperation
+ * The modify DN operation containing the information to
+ * use to log the modify DN request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public void logModifyDNIntermediateMessage(
+ ModifyDNOperation modifyDNOperation, String category,
+ Map<String, String> content)
+ {
+ // Do nothing
+ }
@@ -341,26 +646,63 @@
* Writes a message to the access logger with information about the
* modify DN response associated with the provided modify DN
* operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param modifyDNOperation The modify DN operation containing the
- * information to use to log the modify
- * DN response.
+ * @param modifyDNOperation
+ * The modify DN operation containing the information to
+ * use to log the modify DN response.
*/
- public abstract void logModifyDNResponse(
- ModifyDNOperation modifyDNOperation);
+ public void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* search request associated with the provided search operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param searchOperation The search operation containing the
- * information to use to log the search
- * request.
+ * @param searchOperation
+ * The search operation containing the information to use
+ * to log the search request.
*/
- public abstract void logSearchRequest(
- SearchOperation searchOperation);
+ public void logSearchRequest(SearchOperation searchOperation)
+ {
+ // Do nothing
+ }
+
+
+
+ /**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided search operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ * <p>
+ * The default implementation is to not log anything.
+ *
+ * @param searchOperation
+ * The search operation containing the information to use
+ * to log the search request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public void logSearchIntermediateMessage(
+ SearchOperation searchOperation,
+ String category, Map<String, String> content)
+ {
+ // Do nothing
+ }
@@ -368,14 +710,20 @@
* Writes a message to the access logger with information about the
* search result entry that matches the criteria associated with the
* provided search operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param searchOperation The search operation with which the
- * search result entry is associated.
- * @param searchEntry The search result entry to be logged.
+ * @param searchOperation
+ * The search operation with which the search result entry
+ * is associated.
+ * @param searchEntry
+ * The search result entry to be logged.
*/
- public abstract void logSearchResultEntry(
- SearchOperation searchOperation,
- SearchResultEntry searchEntry);
+ public void logSearchResultEntry(SearchOperation searchOperation,
+ SearchResultEntry searchEntry)
+ {
+ // Do nothing
+ }
@@ -383,40 +731,57 @@
* Writes a message to the access logger with information about the
* search result reference returned while processing the associated
* search operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param searchOperation The search operation with which the
- * search result reference is associated.
- * @param searchReference The search result reference to be
- * logged.
+ * @param searchOperation
+ * The search operation with which the search result
+ * reference is associated.
+ * @param searchReference
+ * The search result reference to be logged.
*/
- public abstract void logSearchResultReference(
- SearchOperation searchOperation,
- SearchResultReference searchReference);
+ public void logSearchResultReference(
+ SearchOperation searchOperation,
+ SearchResultReference searchReference)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* completion of the provided search operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param searchOperation The search operation containing the
- * information to use to log the search
- * result done message.
+ * @param searchOperation
+ * The search operation containing the information to use
+ * to log the search result done message.
*/
- public abstract void logSearchResultDone(
- SearchOperation searchOperation);
+ public void logSearchResultDone(SearchOperation searchOperation)
+ {
+ // Do nothing
+ }
/**
* Writes a message to the access logger with information about the
* unbind request associated with the provided unbind operation.
+ * <p>
+ * The default implementation is to not log anything.
*
- * @param unbindOperation The unbind operation containing the
- * information to use to log the unbind
- * request.
+ * @param unbindOperation
+ * The unbind operation containing the information to use
+ * to log the unbind request.
*/
- public abstract void logUnbind(UnbindOperation unbindOperation);
+ public void logUnbind(UnbindOperation unbindOperation)
+ {
+ // Do nothing
+ }
+
+
/**
* Gets the DN of the configuration entry for this access log
@@ -427,4 +792,3 @@
public abstract DN getDN();
}
-
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java
index 790c0b2..93a4367 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java
@@ -215,6 +215,15 @@
/**
+ * Indicates whether this attribute syntax is a binary one.
+ * @return {@code true} if it is a binary syntax rule
+ * , or {@code false} if not.
+ */
+ public abstract boolean isBinary();
+
+
+
+ /**
* Retrieves the hash code for this attribute syntax. It will be
* calculated as the sum of the characters in the OID.
*
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java b/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java
index d598a0b..12fa4cd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java
@@ -284,7 +284,7 @@
* {@code false} if not.
*/
public boolean isIndexed(AttributeType attributeType,
- MatchingRule matchingRule)
+ MatchingRule<?> matchingRule)
{
return false;
}
@@ -379,7 +379,7 @@
return false;
}
- MatchingRule matchingRule;
+ MatchingRule<?> matchingRule;
String matchingRuleID = filter.getMatchingRuleID();
if (matchingRuleID != null)
{
@@ -545,54 +545,52 @@
/**
* Replaces the specified entry with the provided entry in this
- * backend. The backend must ensure that an entry already exists
- * with the same DN as the provided entry. The caller must hold a
+ * backend. The backend must ensure that an entry already exists
+ * with the same DN as the provided entry. The caller must hold a
* write lock on the DN of the provided entry.
*
- * @param entry The new entry to use in place of the
- * existing entry with the same DN.
- * @param modifyOperation The modify operation with which this
- * action is associated. This may be
- * {@code null} for modifications performed
- * internally.
- *
- * @throws DirectoryException If a problem occurs while trying to
- * replace the entry.
- *
- * @throws CanceledOperationException If this backend noticed and
- * reacted to a request to
- * cancel or abandon the
- * modify operation.
+ * @param oldEntry
+ * The original entry that is being replaced.
+ * @param newEntry
+ * The new entry to use in place of the existing entry with
+ * the same DN.
+ * @param modifyOperation
+ * The modify operation with which this action is
+ * associated. This may be {@code null} for modifications
+ * performed internally.
+ * @throws DirectoryException
+ * If a problem occurs while trying to replace the entry.
+ * @throws CanceledOperationException
+ * If this backend noticed and reacted to a request to
+ * cancel or abandon the modify operation.
*/
- public abstract void replaceEntry(Entry entry,
- ModifyOperation modifyOperation)
- throws DirectoryException, CanceledOperationException;
+ public abstract void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException,
+ CanceledOperationException;
/**
* Moves and/or renames the provided entry in this backend, altering
- * any subordinate entries as necessary. This must ensure that an
+ * any subordinate entries as necessary. This must ensure that an
* entry already exists with the provided current DN, and that no
- * entry exists with the target DN of the provided entry. The
- * caller must hold write locks on both the current DN and the new
- * DN for the entry.
+ * entry exists with the target DN of the provided entry. The caller
+ * must hold write locks on both the current DN and the new DN for
+ * the entry.
*
- * @param currentDN The current DN of the entry to be
- * replaced.
- * @param entry The new content to use for the entry.
- * @param modifyDNOperation The modify DN operation with which
- * this action is associated. This may
- * be {@code null} for modify DN
- * operations performed internally.
- *
- * @throws DirectoryException If a problem occurs while trying to
- * perform the rename.
- *
- * @throws CanceledOperationException If this backend noticed and
- * reacted to a request to
- * cancel or abandon the
- * modify DN operation.
+ * @param currentDN
+ * The current DN of the entry to be replaced.
+ * @param entry
+ * The new content to use for the entry.
+ * @param modifyDNOperation
+ * The modify DN operation with which this action is
+ * associated. This may be {@code null} for modify DN
+ * operations performed internally.
+ * @throws DirectoryException
+ * If a problem occurs while trying to perform the rename.
+ * @throws CanceledOperationException
+ * If this backend noticed and reacted to a request to
+ * cancel or abandon the modify DN operation.
*/
public abstract void renameEntry(DN currentDN, Entry entry,
ModifyDNOperation modifyDNOperation)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java
index e35379c..815f009 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java
@@ -43,7 +43,7 @@
import org.opends.server.core.PersistentSearch;
import org.opends.server.core.PluginConfigManager;
import org.opends.server.core.SearchOperation;
-import org.opends.server.core.NetworkGroup;
+import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.AbstractOperation;
import org.opends.server.types.Attribute;
@@ -131,6 +131,8 @@
// The network group to which the connection belongs to.
private NetworkGroup networkGroup;
+ /** Need to evaluate the network group for the first operation. */
+ protected boolean mustEvaluateNetworkGroup;
/**
@@ -152,6 +154,18 @@
finalized = false;
privileges = new HashSet<Privilege>();
networkGroup = NetworkGroup.getDefaultNetworkGroup();
+ networkGroup.addConnection(this);
+ mustEvaluateNetworkGroup = true;
+ if (debugEnabled())
+ {
+ Message message =
+ INFO_CHANGE_NETWORK_GROUP.get(
+ getConnectionID(),
+ "null",
+ networkGroup.getID());
+ TRACER.debugMessage(DebugLogLevel.INFO, message.toString());
+ }
+
}
@@ -206,6 +220,8 @@
authZEntry.getDN(), this);
}
+ networkGroup.removeConnection(this);
+
try
{
finalizeClientConnection();
@@ -313,6 +329,40 @@
/**
+ * Retrieves the port number for this connection on the client
+ * system if available.
+ *
+ * @return The port number for this connection on the client system
+ * or -1 if there is no client port associated with this
+ * connection (e.g. internal client).
+ */
+ public abstract int getClientPort();
+
+
+
+ /**
+ * Retrieves the address and port (if available) of the client
+ * system, separated by a colon.
+ *
+ * @return The address and port of the client system, separated by a
+ * colon.
+ */
+ public final String getClientHostPort()
+ {
+ int port = getClientPort();
+ if (port >= 0)
+ {
+ return getClientAddress() + ":" + port;
+ }
+ else
+ {
+ return getClientAddress();
+ }
+ }
+
+
+
+ /**
* Retrieves a string representation of the address on the server to
* which the client connected.
*
@@ -323,6 +373,41 @@
+
+ /**
+ * Retrieves the port number for this connection on the server
+ * system if available.
+ *
+ * @return The port number for this connection on the server system
+ * or -1 if there is no server port associated with this
+ * connection (e.g. internal client).
+ */
+ public abstract int getServerPort();
+
+
+
+ /**
+ * Retrieves the address and port of the server system, separated by
+ * a colon.
+ *
+ * @return The address and port of the server system, separated by a
+ * colon.
+ */
+ public final String getServerHostPort()
+ {
+ int port = getServerPort();
+ if (port >= 0)
+ {
+ return getServerAddress() + ":" + port;
+ }
+ else
+ {
+ return getServerAddress();
+ }
+ }
+
+
+
/**
* Retrieves the {@code java.net.InetAddress} associated with the
* remote client system.
@@ -445,6 +530,34 @@
/**
+ * Retrieves the total number of operations performed
+ * on this connection.
+ *
+ * @return The total number of operations performed
+ * on this connection.
+ */
+ public abstract long getNumberOfOperations();
+
+ /**
+ * Indicates whether the network group must be evaluated for
+ * the next connection.
+ * @return boolean indicating if the network group must be evaluated
+ */
+ public boolean mustEvaluateNetworkGroup() {
+ return mustEvaluateNetworkGroup;
+ }
+
+ /**
+ * Indicates that the network group will have to be evaluated
+ * for the next connection.
+ *
+ * @param bool true if the network group must be evaluated
+ */
+ public void mustEvaluateNetworkGroup(boolean bool) {
+ mustEvaluateNetworkGroup = bool;
+ }
+
+ /**
* Indicates that the data in the provided buffer has been read from
* the client and should be processed. The contents of the provided
* buffer will be in clear-text (the data may have been passed
@@ -1180,7 +1293,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
String privName = toLowerCase(v.getStringValue());
@@ -1640,7 +1753,29 @@
*/
public final void setNetworkGroup (NetworkGroup networkGroup)
{
- this.networkGroup = networkGroup;
+ if (this.networkGroup != networkGroup) {
+ if (debugEnabled())
+ {
+ Message message =
+ INFO_CHANGE_NETWORK_GROUP.get(
+ getConnectionID(),
+ this.networkGroup.getID(),
+ networkGroup.getID());
+ TRACER.debugMessage(DebugLogLevel.INFO, message.toString());
+ }
+
+ // If there is a change, first remove this connection
+ // from the current network group
+ this.networkGroup.removeConnection(this);
+ // Then set the new network group
+ this.networkGroup = networkGroup;
+ // And add the connection to the new ng
+ this.networkGroup.addConnection(this);
+
+ // The client connection inherits the resource limits
+ sizeLimit = networkGroup.getSearchSizeLimit();
+ timeLimit = networkGroup.getSearchDurationLimit();
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java b/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java
index d12da31..c29957d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java
@@ -130,7 +130,7 @@
/**
* Performs any necessary finalization for this synchronization
* provider. This will be called just after the provider has been
- * deregistered with the server but before it has been unloaded.
+ * unregistered with the server but before it has been unloaded.
*/
public void finalizeSynchronizationProvider()
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
index 02e2b9e..7dee8d6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
@@ -359,13 +359,10 @@
if(hasAttrMask(mask, ACL_RIGHTS)) {
String typeStr=aclRightsAttributeLevelStr + ";" +
a.getNormalizedPrimaryName();
- AttributeType attributeType=
- DirectoryServer.getDefaultAttributeType(typeStr);
- LinkedHashSet<AttributeValue> vals =
- new LinkedHashSet<AttributeValue>();
- vals.add(new AttributeValue(attributeType, evalInfo.toString()));
- Attribute attr =
- new Attribute(attributeType, typeStr, vals);
+ AttributeType attributeType = DirectoryServer
+ .getDefaultAttributeType(typeStr);
+ Attribute attr = Attributes.create(attributeType, evalInfo
+ .toString());
//It is possible that the user might have specified the same attributes
//in both the search and the specific attribute part of the control.
//Only try to add the attribute type if it already hasn't been added.
@@ -502,10 +499,8 @@
if(hasAttrMask(mask, ACL_RIGHTS)) {
AttributeType attributeType=
DirectoryServer.getDefaultAttributeType(aclRightsEntryLevelStr);
- LinkedHashSet<AttributeValue> vals = new LinkedHashSet<AttributeValue>();
- vals.add(new AttributeValue(attributeType, evalInfo.toString()));
- Attribute attr =
- new Attribute(attributeType, aclRightsEntryLevelStr, vals);
+ Attribute attr = Attributes.create(attributeType, evalInfo
+ .toString());
retEntry.addAttribute(attr,null);
}
return retEntry;
@@ -608,14 +603,12 @@
String typeStr=
aclRightsInfoAttrLogsStr + ";" + rightStr + ";" +
aType.getPrimaryName();
- AttributeType attributeType=
+ AttributeType attributeType=
DirectoryServer.getDefaultAttributeType(typeStr);
- LinkedHashSet<AttributeValue> vals = new LinkedHashSet<AttributeValue>();
- vals.add(new AttributeValue(attributeType, container.getEvalSummary()));
- Attribute attr =
- new Attribute(attributeType, typeStr, vals);
- //The attribute type might have already been added, probably not but it
- //is possible.
+ Attribute attr = Attributes.create(attributeType,
+ container.getEvalSummary());
+ // The attribute type might have already been added, probably
+ // not but it is possible.
if(!retEntry.hasAttribute(attributeType))
retEntry.addAttribute(attr,null);
}
@@ -640,12 +633,10 @@
if(hasAttrMask(mask,ACL_RIGHTS_INFO)) {
String typeStr=
aclRightsInfoEntryLogsStr + ";" + rightStr;
- AttributeType attributeType=
+ AttributeType attributeType=
DirectoryServer.getDefaultAttributeType(typeStr);
- LinkedHashSet<AttributeValue> vals = new LinkedHashSet<AttributeValue>();
- vals.add(new AttributeValue(attributeType, container.getEvalSummary()));
- Attribute attr =
- new Attribute(attributeType, typeStr, vals);
+ Attribute attr = Attributes.create(attributeType,
+ container.getEvalSummary());
retEntry.addAttribute(attr,null);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index 3ed65df..f2f197c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -328,7 +328,7 @@
//deleted than this access check is skipped.
ModificationType modType=m.getModificationType();
if((modType == ModificationType.DELETE &&
- modAttr.getValues().isEmpty()) ||
+ modAttr.isEmpty()) ||
(modType == ModificationType.REPLACE ||
modType == ModificationType.INCREMENT)) {
/*
@@ -341,7 +341,7 @@
resourceEntry.getAttribute(modAttrType,modAttr.getOptions());
if(attrList != null) {
for (Attribute a : attrList) {
- for (AttributeValue v : a.getValues()) {
+ for (AttributeValue v : a) {
container.setCurrentAttributeValue(v);
container.setRights(ACI_WRITE_DELETE);
if(!skipAccessCheck &&
@@ -353,8 +353,8 @@
}
}
- if(modAttr.hasValue()) {
- for(AttributeValue v : modAttr.getValues()) {
+ if(!modAttr.isEmpty()) {
+ for(AttributeValue v : modAttr) {
container.setCurrentAttributeType(modAttrType);
switch (m.getModificationType())
{
@@ -380,7 +380,7 @@
{
for (Attribute attr : modifiedAttrs)
{
- for (AttributeValue val : attr.getValues())
+ for (AttributeValue val : attr)
{
container.setCurrentAttributeValue(val);
container.setRights(ACI_WRITE_ADD);
@@ -842,7 +842,7 @@
entry.getOperationalAttribute(aciType, null);
for (Attribute attribute : attributeList)
{
- for (AttributeValue value : attribute.getValues())
+ for (AttributeValue value : attribute)
{
try {
DN dn=entry.getDN();
@@ -1217,15 +1217,16 @@
boolean ret;
if(!(ret=skipAccessCheck(operation))) {
Entry e = new Entry(dn, null, null, null);
- LinkedHashSet<AttributeValue> vals = new LinkedHashSet<AttributeValue>();
- List<String> URLStrings=reference.getReferralURLs();
- //Load the values, a bind rule might want to evaluate them.
- for(String URLString : URLStrings) {
- vals.add(new AttributeValue(refAttrType, URLString));
+ AttributeBuilder builder =
+ new AttributeBuilder(refAttrType, ATTR_REFERRAL_URL);
+ List<String> URLStrings = reference.getReferralURLs();
+
+ // Load the values, a bind rule might want to evaluate them.
+ for (String URLString : URLStrings) {
+ builder.add(new AttributeValue(refAttrType, URLString));
}
- Attribute attr =
- new Attribute(refAttrType, ATTR_REFERRAL_URL, vals);
- e.addAttribute(attr,null);
+
+ e.addAttribute(builder.toAttribute(),null);
SearchResultEntry se=new SearchResultEntry(e);
AciLDAPOperationContainer operationContainer =
new AciLDAPOperationContainer(operation,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
index 81bc155..8ef7ac6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
@@ -235,7 +235,7 @@
int validAcis=0;
ArrayList<Aci> acis = new ArrayList<Aci>();
for (Attribute attribute : attributeList) {
- for (AttributeValue value : attribute.getValues()) {
+ for (AttributeValue value : attribute) {
try {
Aci aci= Aci.decode(value.getValue(),dn);
acis.add(aci);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java
index 71532bc..e3eb0fc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java
@@ -37,7 +37,6 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.LinkedHashSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -121,7 +120,7 @@
Iterator<DN> it=groupDNs.iterator();
for(; it.hasNext() && matched != EnumEvalResult.TRUE;) {
DN groupDN=it.next();
- Group group = getGroupManager().getGroupInstance(groupDN);
+ Group<?> group = getGroupManager().getGroupInstance(groupDN);
if((group != null) && (evalCtx.isMemberOf(group)))
matched = EnumEvalResult.TRUE;
}
@@ -147,14 +146,13 @@
DN suffixDN) {
EnumEvalResult matched= EnumEvalResult.FALSE;
List<Attribute> attrs = e.getAttribute(attributeType);
- LinkedHashSet<AttributeValue> vals = attrs.get(0).getValues();
- for(AttributeValue v : vals) {
+ for(AttributeValue v : attrs.get(0)) {
try {
DN groupDN=DN.decode(v.getStringValue());
if(suffixDN != null &&
!groupDN.isDescendantOf(suffixDN))
continue;
- Group group = getGroupManager().getGroupInstance(groupDN);
+ Group<?> group = getGroupManager().getGroupInstance(groupDN);
if((group != null) && (evalCtx.isMemberOf(group))) {
matched=EnumEvalResult.TRUE;
break;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
index 5615b50..61b08f8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
@@ -36,7 +36,6 @@
import static org.opends.messages.AccessControlMessages.
WARN_PATTERN_DN_TYPE_WILDCARD_IN_MULTIVALUED_RDN;
import java.util.List;
-import java.util.LinkedHashSet;
import java.util.ArrayList;
import java.util.TreeMap;
import java.util.Set;
@@ -295,11 +294,7 @@
subAnyElements = null;
}
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(value);
- Attribute attr = new Attribute(type, type.getNameOrOID(), values);
-
+ Attribute attr = Attributes.create(type, value);
switch (attr.matchesSubstring(subInitial, subAnyElements, subFinal))
{
case TRUE:
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java
index 10a1994..d614b49 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java
@@ -31,6 +31,7 @@
import static org.opends.messages.AccessControlMessages.*;
import static org.opends.server.authorization.dseecompat.Aci.*;
import org.opends.server.types.*;
+
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import java.util.*;
@@ -385,7 +386,7 @@
AttributeType attrType,
SearchFilter filter) {
boolean filterMatch=true;
- Iterator<AttributeValue> valIterator = a.getValues().iterator();
+ Iterator<AttributeValue> valIterator = a.iterator();
//Iterate through each value and apply the filter against it.
for(; valIterator.hasNext() && filterMatch;) {
AttributeValue value=valIterator.next();
@@ -408,11 +409,7 @@
AttributeValue value,
SearchFilter filter) {
boolean filterMatch;
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(attrType, value.getValue()));
- Attribute attr =
- new Attribute(attrType, attrType.toString(), values);
+ Attribute attr = Attributes.create(attrType, value);
Entry e = new Entry(DN.nullDN(), null, null, null);
e.addAttribute(attr, new ArrayList<AttributeValue>());
try {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
index 369fdd2..df24463 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
@@ -283,8 +283,7 @@
List<Attribute> attrs=evalCtx.getResourceEntry().getAttribute(attrType);
if(!attrs.isEmpty()) {
for(Attribute a : attrs) {
- LinkedHashSet<AttributeValue> vals=a.getValues();
- for(AttributeValue v : vals) {
+ for(AttributeValue v : a) {
String urlStr=v.getStringValue();
LDAPURL url;
try {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java
index b4dd451..a20e5a9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java
@@ -359,8 +359,7 @@
AttributeType attrType) {
EnumEvalResult matched= EnumEvalResult.FALSE;
List<Attribute> attrs = e.getAttribute(attrType);
- LinkedHashSet<AttributeValue> vals = attrs.get(0).getValues();
- for(AttributeValue v : vals) {
+ for(AttributeValue v : attrs.get(0)) {
try {
DN dn=DN.decode(v.getStringValue());
if(dn.equals(clientDN)) {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java
index c18ce9b..351fc74 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java
@@ -46,8 +46,10 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.BackupInfo;
@@ -213,14 +215,10 @@
int numAVAs = rdn.getNumValues();
for (int i=0; i < numAVAs; i++)
{
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(rdn.getAttributeValue(i));
-
AttributeType attrType = rdn.getAttributeType(i);
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(attrType, attrType.getNameOrOID(),
- valueSet));
+ attrList.add(Attributes.create(attrType, rdn
+ .getAttributeValue(i)));
userAttrs.put(attrType, attrList);
}
@@ -442,7 +440,7 @@
List<Attribute> attrList = backupDirEntry.getAttribute(t);
if ((attrList != null) && (! attrList.isEmpty()))
{
- for (AttributeValue v : attrList.get(0).getValues())
+ for (AttributeValue v : attrList.get(0))
{
try
{
@@ -598,24 +596,16 @@
LinkedHashMap<AttributeType,List<Attribute>> userAttrs =
new LinkedHashMap<AttributeType,List<Attribute>>(3);
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(v);
-
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, v));
userAttrs.put(t, attrList);
-
t = DirectoryServer.getAttributeType(ATTR_BACKUP_BACKEND_DN, true);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(t,
- backupDirectory.getConfigEntryDN().toString()));
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, new AttributeValue(t,
+ backupDirectory.getConfigEntryDN().toString())));
userAttrs.put(t, attrList);
-
Entry e = new Entry(entryDN, ocMap, userAttrs, opAttrs);
e.processVirtualAttributes();
return e;
@@ -640,81 +630,66 @@
{
// First, get the backup ID from the entry DN.
AttributeType idType = DirectoryServer.getAttributeType(ATTR_BACKUP_ID,
- true);
+ true);
AttributeValue idValue = entryDN.getRDN().getAttributeValue(idType);
- if (idValue == null)
- {
- Message message =
- ERR_BACKUP_NO_BACKUP_ID_IN_DN.get(String.valueOf(entryDN));
+ if (idValue == null) {
+ Message message = ERR_BACKUP_NO_BACKUP_ID_IN_DN.get(String
+ .valueOf(entryDN));
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
String backupID = idValue.getStringValue();
-
// Next, get the backup directory from the parent DN.
DN parentDN = entryDN.getParentDNInSuffix();
- if (parentDN == null)
- {
- Message message =
- ERR_BACKUP_NO_BACKUP_PARENT_DN.get(String.valueOf(entryDN));
+ if (parentDN == null) {
+ Message message = ERR_BACKUP_NO_BACKUP_PARENT_DN.get(String
+ .valueOf(entryDN));
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
- AttributeType t =
- DirectoryServer.getAttributeType(ATTR_BACKUP_DIRECTORY_PATH, true);
+ AttributeType t = DirectoryServer.getAttributeType(
+ ATTR_BACKUP_DIRECTORY_PATH, true);
AttributeValue v = parentDN.getRDN().getAttributeValue(t);
- if (v == null)
- {
- Message message =
- ERR_BACKUP_NO_BACKUP_DIR_IN_DN.get(String.valueOf(entryDN));
+ if (v == null) {
+ Message message = ERR_BACKUP_NO_BACKUP_DIR_IN_DN.get(String
+ .valueOf(entryDN));
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
-
BackupDirectory backupDirectory;
- try
- {
- backupDirectory =
- BackupDirectory.readBackupDirectoryDescriptor(v.getStringValue());
- }
- catch (ConfigException ce)
- {
- if (debugEnabled())
- {
+ try {
+ backupDirectory = BackupDirectory.readBackupDirectoryDescriptor(v
+ .getStringValue());
+ } catch (ConfigException ce) {
+ if (debugEnabled()) {
TRACER.debugCaught(DebugLogLevel.ERROR, ce);
}
- Message message =
- ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(
- String.valueOf(entryDN), ce.getMessageObject());
+ Message message = ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(String
+ .valueOf(entryDN), ce.getMessageObject());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
+ } catch (Exception e) {
+ if (debugEnabled()) {
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message =
- ERR_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY.get(getExceptionMessage(e));
+ Message message = ERR_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY
+ .get(getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message);
+ message);
}
BackupInfo backupInfo = backupDirectory.getBackupInfo(backupID);
- if (backupInfo == null)
- {
- Message message =
- ERR_BACKUP_NO_SUCH_BACKUP.get(backupID, backupDirectory.getPath());
- throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
- message, parentDN, null);
+ if (backupInfo == null) {
+ Message message = ERR_BACKUP_NO_SUCH_BACKUP.get(backupID, backupDirectory
+ .getPath());
+ throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message,
+ parentDN, null);
}
-
// Construct the backup entry to return.
- LinkedHashMap<ObjectClass,String> ocMap =
- new LinkedHashMap<ObjectClass,String>(3);
+ LinkedHashMap<ObjectClass, String> ocMap =
+ new LinkedHashMap<ObjectClass, String>(3);
ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
ObjectClass oc = DirectoryServer.getObjectClass(OC_BACKUP_INFO, true);
@@ -723,119 +698,88 @@
oc = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC, true);
ocMap.put(oc, OC_EXTENSIBLE_OBJECT);
- LinkedHashMap<AttributeType,List<Attribute>> opAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>(0);
- LinkedHashMap<AttributeType,List<Attribute>> userAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>();
-
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(idValue);
+ LinkedHashMap<AttributeType, List<Attribute>> opAttrs =
+ new LinkedHashMap<AttributeType, List<Attribute>>(0);
+ LinkedHashMap<AttributeType, List<Attribute>> userAttrs =
+ new LinkedHashMap<AttributeType, List<Attribute>>();
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(idType, idType.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(idType, idValue));
userAttrs.put(idType, attrList);
-
backupInfo.getBackupDirectory();
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(v);
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, v));
userAttrs.put(t, attrList);
-
Date backupDate = backupInfo.getBackupDate();
- if (backupDate != null)
- {
+ if (backupDate != null) {
t = DirectoryServer.getAttributeType(ATTR_BACKUP_DATE, true);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(t,
- GeneralizedTimeSyntax.format(backupDate)));
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, new AttributeValue(t,
+ GeneralizedTimeSyntax.format(backupDate))));
userAttrs.put(t, attrList);
}
-
t = DirectoryServer.getAttributeType(ATTR_BACKUP_COMPRESSED, true);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(BooleanSyntax.createBooleanValue(backupInfo.isCompressed()));
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, BooleanSyntax
+ .createBooleanValue(backupInfo.isCompressed())));
userAttrs.put(t, attrList);
-
t = DirectoryServer.getAttributeType(ATTR_BACKUP_ENCRYPTED, true);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(BooleanSyntax.createBooleanValue(backupInfo.isEncrypted()));
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, BooleanSyntax
+ .createBooleanValue(backupInfo.isEncrypted())));
userAttrs.put(t, attrList);
-
t = DirectoryServer.getAttributeType(ATTR_BACKUP_INCREMENTAL, true);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(BooleanSyntax.createBooleanValue(backupInfo.isIncremental()));
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, BooleanSyntax
+ .createBooleanValue(backupInfo.isIncremental())));
userAttrs.put(t, attrList);
-
HashSet<String> dependencies = backupInfo.getDependencies();
- if ((dependencies != null) && (! dependencies.isEmpty()))
- {
+ if ((dependencies != null) && (!dependencies.isEmpty())) {
t = DirectoryServer.getAttributeType(ATTR_BACKUP_DEPENDENCY, true);
- valueSet = new LinkedHashSet<AttributeValue>(dependencies.size());
- for (String s : dependencies)
- {
- valueSet.add(new AttributeValue(t, s));
+ AttributeBuilder builder = new AttributeBuilder(t);
+ for (String s : dependencies) {
+ builder.add(new AttributeValue(t, s));
}
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(builder.toAttribute());
userAttrs.put(t, attrList);
}
-
byte[] signedHash = backupInfo.getSignedHash();
- if (signedHash != null)
- {
+ if (signedHash != null) {
t = DirectoryServer.getAttributeType(ATTR_BACKUP_SIGNED_HASH, true);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(t, new ASN1OctetString(signedHash)));
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, new AttributeValue(t,
+ new ASN1OctetString(signedHash))));
userAttrs.put(t, attrList);
}
-
byte[] unsignedHash = backupInfo.getUnsignedHash();
- if (unsignedHash != null)
- {
+ if (unsignedHash != null) {
t = DirectoryServer.getAttributeType(ATTR_BACKUP_UNSIGNED_HASH, true);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(t, new ASN1OctetString(unsignedHash)));
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, new AttributeValue(t,
+ new ASN1OctetString(unsignedHash))));
userAttrs.put(t, attrList);
}
-
- HashMap<String,String> properties = backupInfo.getBackupProperties();
- if ((properties != null) && (! properties.isEmpty()))
- {
- for (Map.Entry<String,String> e : properties.entrySet())
- {
+ HashMap<String, String> properties = backupInfo.getBackupProperties();
+ if ((properties != null) && (!properties.isEmpty())) {
+ for (Map.Entry<String, String> e : properties.entrySet()) {
t = DirectoryServer.getAttributeType(toLowerCase(e.getKey()), true);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(t, e.getValue()));
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, new AttributeValue(
+ t, e.getValue())));
userAttrs.put(t, attrList);
}
}
-
Entry e = new Entry(entryDN, ocMap, userAttrs, opAttrs);
e.processVirtualAttributes();
return e;
@@ -873,8 +817,8 @@
* {@inheritDoc}
*/
@Override()
- public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
- throws DirectoryException
+ public void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException
{
Message message = ERR_BACKUP_MODIFY_NOT_SUPPORTED.get();
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
@@ -969,7 +913,7 @@
backupDirEntry.getAttribute(backupPathType);
if ((attrList != null) && (! attrList.isEmpty()))
{
- for (AttributeValue v : attrList.get(0).getValues())
+ for (AttributeValue v : attrList.get(0))
{
try
{
@@ -1026,7 +970,7 @@
List<Attribute> attrList = backupDirEntry.getAttribute(t);
if ((attrList != null) && (! attrList.isEmpty()))
{
- for (AttributeValue v : attrList.get(0).getValues())
+ for (AttributeValue v : attrList.get(0))
{
try
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/LDIFBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/LDIFBackend.java
index b2e7428..69ed96c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/LDIFBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/LDIFBackend.java
@@ -808,15 +808,15 @@
* {@inheritDoc}
*/
@Override()
- public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
- throws DirectoryException
+ public void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException
{
backendLock.writeLock().lock();
try
{
// Make sure that the target entry exists. If not, then fail.
- DN entryDN = entry.getDN();
+ DN entryDN = newEntry.getDN();
if (! entryMap.containsKey(entryDN))
{
DN matchedDN = null;
@@ -838,7 +838,7 @@
null);
}
- entryMap.put(entryDN, entry.duplicate(false));
+ entryMap.put(entryDN, newEntry.duplicate(false));
writeLDIF();
return;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java
index 84d3121..054570b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java
@@ -102,9 +102,6 @@
* which is a mapping between the DN of an entry and the DNs of any immediate
* children of that entry. This is needed to efficiently determine whether an
* entry has any children (which must not be the case for delete operations).
- * Modify DN operations are not currently allowed, but if such support is added
- * in the future, then this mapping would play an integral role in that process
- * as well.
*/
public class MemoryBackend
extends Backend
@@ -553,11 +550,10 @@
* {@inheritDoc}
*/
@Override()
- public synchronized void replaceEntry(Entry entry,
- ModifyOperation modifyOperation)
- throws DirectoryException
+ public synchronized void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException
{
- Entry e = entry.duplicate(false);
+ Entry e = newEntry.duplicate(false);
// Make sure the entry exists. If not, then throw an exception.
DN entryDN = e.getDN();
@@ -617,7 +613,7 @@
{
Message message =
ERR_MEMORYBACKEND_ENTRY_ALREADY_EXISTS.get(String.valueOf(e.getDN()));
- throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
+ throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
@@ -646,7 +642,7 @@
{
Message message = ERR_MEMORYBACKEND_RENAME_PARENT_DOESNT_EXIST.get(
String.valueOf(currentDN), String.valueOf(parentDN));
- throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
+ throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java
index ee8e21a..a038e5f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java
@@ -28,11 +28,17 @@
+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.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import org.opends.messages.Message;
@@ -47,21 +53,21 @@
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperation;
+import org.opends.server.core.ModifyOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.ConditionResult;
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.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.IndexType;
import org.opends.server.types.InitializationException;
@@ -79,13 +85,6 @@
import org.opends.server.util.TimeThread;
import org.opends.server.util.Validator;
-import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.messages.BackendMessages.*;
-import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
@@ -546,7 +545,7 @@
}
String rdnValue = rdn.getAttributeValue(0).getStringValue();
- MonitorProvider monitorProvider =
+ MonitorProvider<?> monitorProvider =
DirectoryServer.getMonitorProvider(toLowerCase(rdnValue));
return (monitorProvider != null);
}
@@ -754,12 +753,7 @@
AttributeType rdnType = entryRDN.getAttributeType(0);
AttributeValue rdnValue = entryRDN.getAttributeValue(0);
- LinkedHashSet<AttributeValue> rdnValues =
- new LinkedHashSet<AttributeValue>(1);
- rdnValues.add(rdnValue);
-
- Attribute rdnAttr = new Attribute(rdnType, entryRDN.getAttributeName(0),
- rdnValues);
+ Attribute rdnAttr = Attributes.create(rdnType, rdnValue);
ArrayList<Attribute> rdnList = new ArrayList<Attribute>(1);
rdnList.add(rdnAttr);
attrMap.put(rdnType, rdnList);
@@ -804,17 +798,7 @@
private Attribute createAttribute(String name, String lowerName,
String value)
{
- AttributeType type = DirectoryServer.getAttributeType(lowerName);
- if (type == null)
- {
- type = DirectoryServer.getDefaultAttributeType(name);
- }
-
- LinkedHashSet<AttributeValue> attrValues =
- new LinkedHashSet<AttributeValue>(1);
- attrValues.add(new AttributeValue(type, new ASN1OctetString(value)));
-
- return new Attribute(type, name, attrValues);
+ return Attributes.create(name, value);
}
@@ -851,11 +835,11 @@
* {@inheritDoc}
*/
@Override()
- public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
- throws DirectoryException
+ public void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException
{
Message message = ERR_MONITOR_MODIFY_NOT_SUPPORTED.get(
- String.valueOf(entry.getDN()), String.valueOf(configEntryDN));
+ String.valueOf(newEntry.getDN()), String.valueOf(configEntryDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
@@ -1042,7 +1026,7 @@
// Get all the monitor providers, convert them to entries, and write them to
// LDIF.
- for (MonitorProvider monitorProvider :
+ for (MonitorProvider<?> monitorProvider :
DirectoryServer.getMonitorProviders().values())
{
try
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java
index 13c37f1..c2c4bed 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java
@@ -32,7 +32,6 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -782,17 +781,7 @@
private Attribute createAttribute(String name, String lowerName,
String value)
{
- AttributeType type = DirectoryServer.getAttributeType(lowerName);
- if (type == null)
- {
- type = DirectoryServer.getDefaultAttributeType(name);
- }
-
- LinkedHashSet<AttributeValue> attrValues =
- new LinkedHashSet<AttributeValue>(1);
- attrValues.add(new AttributeValue(type, new ASN1OctetString(value)));
-
- return new Attribute(type, name, attrValues);
+ return Attributes.create(name, value);
}
@@ -816,28 +805,29 @@
type = DirectoryServer.getDefaultAttributeType(name);
}
- LinkedHashSet<AttributeValue> attrValues =
- new LinkedHashSet<AttributeValue>();
- for (DN dn : values)
- {
- attrValues.add(new AttributeValue(type,
- new ASN1OctetString(dn.toString())));
+ AttributeBuilder builder = new AttributeBuilder(type, name);
+ for (DN dn : values) {
+ builder.add(
+ new AttributeValue(type, new ASN1OctetString(dn.toString())));
}
- return new Attribute(type, name, attrValues);
+ return builder.toAttribute();
}
/**
- * Creates an attribute for the root DSE with the following criteria.
+ * Creates an attribute for the root DSE with the following
+ * criteria.
*
- * @param name The name for the attribute.
- * @param lowerName The name for the attribute formatted in all lowercase
- * characters.
- * @param values The set of values to use for the attribute.
- *
- * @return The constructed attribute.
+ * @param name
+ * The name for the attribute.
+ * @param lowerName
+ * The name for the attribute formatted in all lowercase
+ * characters.
+ * @param values
+ * The set of values to use for the attribute.
+ * @return The constructed attribute.
*/
private Attribute createAttribute(String name, String lowerName,
Collection<String> values)
@@ -848,14 +838,13 @@
type = DirectoryServer.getDefaultAttributeType(name);
}
- LinkedHashSet<AttributeValue> attrValues =
- new LinkedHashSet<AttributeValue>();
- for (String s : values)
- {
- attrValues.add(new AttributeValue(type, new ASN1OctetString(s)));
+ AttributeBuilder builder = new AttributeBuilder(type, name);
+ builder.setInitialCapacity(values.size());
+ for (String s : values) {
+ builder.add(new AttributeValue(type, new ASN1OctetString(s)));
}
- return new Attribute(type, name, attrValues);
+ return builder.toAttribute();
}
@@ -935,11 +924,11 @@
* {@inheritDoc}
*/
@Override()
- public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
- throws DirectoryException
+ public void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException
{
Message message = ERR_ROOTDSE_MODIFY_NOT_SUPPORTED.get(
- String.valueOf(entry.getDN()), String.valueOf(configEntryDN));
+ String.valueOf(newEntry.getDN()), String.valueOf(configEntryDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java
index d1e1a05..c3613fd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java
@@ -661,27 +661,22 @@
*/
public Entry getSchemaEntry(DN entryDN, boolean includeSchemaFile)
{
- LinkedHashMap<AttributeType,List<Attribute>> userAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>();
+ LinkedHashMap<AttributeType, List<Attribute>> userAttrs =
+ new LinkedHashMap<AttributeType, List<Attribute>>();
- LinkedHashMap<AttributeType,List<Attribute>> operationalAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>();
-
+ LinkedHashMap<AttributeType, List<Attribute>> operationalAttrs =
+ new LinkedHashMap<AttributeType, List<Attribute>>();
// Add the RDN attribute(s) for the provided entry.
RDN rdn = entryDN.getRDN();
if (rdn != null)
{
int numAVAs = rdn.getNumValues();
- for (int i=0; i < numAVAs; i++)
+ for (int i = 0; i < numAVAs; i++)
{
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(rdn.getAttributeValue(i));
-
AttributeType attrType = rdn.getAttributeType(i);
- String attrName = rdn.getAttributeName(i);
- Attribute a = new Attribute(attrType, attrName, valueSet);
+ Attribute a = Attributes.create(attrType, rdn
+ .getAttributeValue(i));
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
attrList.add(a);
@@ -699,11 +694,11 @@
Schema schema = DirectoryServer.getSchema();
// Add the "attributeTypes" attribute.
- LinkedHashSet<AttributeValue> valueSet =
- DirectoryServer.getAttributeTypeSet();
+ LinkedHashSet<AttributeValue> valueSet = DirectoryServer
+ .getAttributeTypeSet();
- // Add the file name to the description of the attribute type if this
- // was requested by the caller.
+ // Add the file name to the description of the attribute type if
+ // this was requested by the caller.
if (includeSchemaFile)
{
LinkedHashSet<AttributeValue> newValueSet =
@@ -714,14 +709,14 @@
try
{
// Build a new attribute from this value,
- // get the File name from this attribute, build a new attribute
- // including this file name.
+ // get the File name from this attribute, build a new
+ // attribute including this file name.
AttributeType attrType = AttributeTypeSyntax.decodeAttributeType(
value.getValue(), schema, false);
attrType = DirectoryServer.getAttributeType(attrType.getOID());
- newValueSet.add(new AttributeValue(
- attributeTypesType, attrType.getDefinitionWithFileName()));
+ newValueSet.add(new AttributeValue(attributeTypesType, attrType
+ .getDefinitionWithFileName()));
}
catch (DirectoryException e)
{
@@ -731,15 +726,39 @@
valueSet = newValueSet;
}
- Attribute attr;
- if(AttributeTypeSyntax.isStripSyntaxMinimumUpperBound())
- attr = stripMinUpperBoundValues(valueSet);
+ AttributeBuilder builder = new AttributeBuilder(attributeTypesType,
+ ATTR_ATTRIBUTE_TYPES);
+ builder.setInitialCapacity(valueSet.size());
+ if (AttributeTypeSyntax.isStripSyntaxMinimumUpperBound())
+ {
+ for (AttributeValue v : valueSet)
+ {
+ // If it exists, strip the minimum upper bound value from the
+ // attribute value.
+ if (v.toString().indexOf('{') != -1)
+ {
+ // Create an attribute value from the stripped string and
+ // add it to the valueset.
+ String strippedStr = v.toString().replaceFirst(
+ stripMinUpperBoundRegEx, "");
+ ASN1OctetString s = new ASN1OctetString(strippedStr);
+ AttributeValue strippedVal = new AttributeValue(s, s);
+ builder.add(strippedVal);
+ }
+ else
+ {
+ builder.add(v);
+ }
+ }
+ }
else
- attr = new Attribute(attributeTypesType, ATTR_ATTRIBUTE_TYPES,
- valueSet);
+ {
+ builder.addAll(valueSet);
+ }
+
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(attr);
- if (attributeTypesType.isOperational() && (! showAllAttributes))
+ attrList.add(builder.toAttribute());
+ if (attributeTypesType.isOperational() && (!showAllAttributes))
{
operationalAttrs.put(attributeTypesType, attrList);
}
@@ -751,8 +770,8 @@
// Add the "objectClasses" attribute.
valueSet = DirectoryServer.getObjectClassSet();
- // Add the file name to the description if this was requested by the
- // caller.
+ // Add the file name to the description if this was requested by
+ // the caller.
if (includeSchemaFile)
{
LinkedHashSet<AttributeValue> newValueSet =
@@ -762,14 +781,14 @@
{
try
{
- // Build a new attribute from this value,
- // get the File name from this attribute, build a new attribute
- // including this file name.
+ // Build a new attribute from this value, get the File name
+ // from this attribute, build a new attribute including this
+ // file name.
ObjectClass oc = ObjectClassSyntax.decodeObjectClass(
value.getValue(), schema, false);
oc = DirectoryServer.getObjectClass(oc.getOID());
- newValueSet.add(new AttributeValue(
- objectClassesType, oc.getDefinitionWithFileName()));
+ newValueSet.add(new AttributeValue(objectClassesType, oc
+ .getDefinitionWithFileName()));
}
catch (DirectoryException e)
{
@@ -779,10 +798,12 @@
valueSet = newValueSet;
}
- attr = new Attribute(objectClassesType, ATTR_OBJECTCLASSES, valueSet);
+ builder = new AttributeBuilder(objectClassesType, ATTR_OBJECTCLASSES);
+ builder.addAll(valueSet);
attrList = new ArrayList<Attribute>(1);
- attrList.add(attr);
- if (objectClassesType.isOperational() && (! showAllAttributes))
+ attrList.add(builder.toAttribute());
+
+ if (objectClassesType.isOperational() && (!showAllAttributes))
{
operationalAttrs.put(objectClassesType, attrList);
}
@@ -791,13 +812,13 @@
userAttrs.put(objectClassesType, attrList);
}
-
// Add the "matchingRules" attribute.
- valueSet = DirectoryServer.getMatchingRuleSet();
- attr = new Attribute(matchingRulesType, ATTR_MATCHING_RULES, valueSet);
+ builder = new AttributeBuilder(matchingRulesType, ATTR_MATCHING_RULES);
+ builder.addAll(DirectoryServer.getMatchingRuleSet());
attrList = new ArrayList<Attribute>(1);
- attrList.add(attr);
- if (matchingRulesType.isOperational() && (! showAllAttributes))
+ attrList.add(builder.toAttribute());
+
+ if (matchingRulesType.isOperational() && (!showAllAttributes))
{
operationalAttrs.put(matchingRulesType, attrList);
}
@@ -806,19 +827,19 @@
userAttrs.put(matchingRulesType, attrList);
}
-
// Add the "ldapSyntaxes" attribute.
- valueSet = DirectoryServer.getAttributeSyntaxSet();
- attr = new Attribute(ldapSyntaxesType, ATTR_LDAP_SYNTAXES, valueSet);
+ builder = new AttributeBuilder(ldapSyntaxesType, ATTR_LDAP_SYNTAXES);
+ builder.addAll(DirectoryServer.getAttributeSyntaxSet());
attrList = new ArrayList<Attribute>(1);
- attrList.add(attr);
+ attrList.add(builder.toAttribute());
- // Note that we intentionally ignore showAllAttributes for attribute
- // syntaxes, name forms, matching rule uses, DIT content rules, and DIT
- // structure rules because those attributes aren't allowed in the subschema
- // objectclass, and treating them as user attributes would cause schema
- // updates to fail. This means that you'll always have to explicitly
- // request these attributes in order to be able to see them.
+ // Note that we intentionally ignore showAllAttributes for
+ // attribute syntaxes, name forms, matching rule uses, DIT content
+ // rules, and DIT structure rules because those attributes aren't
+ // allowed in the subschema objectclass, and treating them as user
+ // attributes would cause schema updates to fail. This means that
+ // you'll always have to explicitly request these attributes in
+ // order to be able to see them.
if (ldapSyntaxesType.isOperational())
{
operationalAttrs.put(ldapSyntaxesType, attrList);
@@ -828,14 +849,15 @@
userAttrs.put(ldapSyntaxesType, attrList);
}
-
// If there are any name forms defined, then add them.
valueSet = DirectoryServer.getNameFormSet();
- if (! valueSet.isEmpty())
+ if (!valueSet.isEmpty())
{
- attr = new Attribute(nameFormsType, ATTR_NAME_FORMS, valueSet);
+ builder = new AttributeBuilder(nameFormsType, ATTR_NAME_FORMS);
+ builder.addAll(valueSet);
attrList = new ArrayList<Attribute>(1);
- attrList.add(attr);
+ attrList.add(builder.toAttribute());
+
if (nameFormsType.isOperational())
{
operationalAttrs.put(nameFormsType, attrList);
@@ -846,15 +868,16 @@
}
}
-
// If there are any DIT content rules defined, then add them.
valueSet = DirectoryServer.getDITContentRuleSet();
- if (! valueSet.isEmpty())
+ if (!valueSet.isEmpty())
{
- attr = new Attribute(ditContentRulesType, ATTR_DIT_CONTENT_RULES,
- valueSet);
+ builder = new AttributeBuilder(ditContentRulesType,
+ ATTR_DIT_CONTENT_RULES);
+ builder.addAll(valueSet);
attrList = new ArrayList<Attribute>(1);
- attrList.add(attr);
+ attrList.add(builder.toAttribute());
+
if (ditContentRulesType.isOperational())
{
operationalAttrs.put(ditContentRulesType, attrList);
@@ -865,15 +888,16 @@
}
}
-
// If there are any DIT structure rules defined, then add them.
valueSet = DirectoryServer.getDITStructureRuleSet();
- if (! valueSet.isEmpty())
+ if (!valueSet.isEmpty())
{
- attr = new Attribute(ditStructureRulesType, ATTR_DIT_STRUCTURE_RULES,
- valueSet);
+ builder = new AttributeBuilder(ditStructureRulesType,
+ ATTR_DIT_STRUCTURE_RULES);
+ builder.addAll(valueSet);
attrList = new ArrayList<Attribute>(1);
- attrList.add(attr);
+ attrList.add(builder.toAttribute());
+
if (ditStructureRulesType.isOperational())
{
operationalAttrs.put(ditStructureRulesType, attrList);
@@ -884,15 +908,16 @@
}
}
-
// If there are any matching rule uses defined, then add them.
valueSet = DirectoryServer.getMatchingRuleUseSet();
- if (! valueSet.isEmpty())
+ if (!valueSet.isEmpty())
{
- attr = new Attribute(matchingRuleUsesType, ATTR_MATCHING_RULE_USE,
- valueSet);
+ builder = new AttributeBuilder(matchingRuleUsesType,
+ ATTR_MATCHING_RULE_USE);
+ builder.addAll(valueSet);
attrList = new ArrayList<Attribute>(1);
- attrList.add(attr);
+ attrList.add(builder.toAttribute());
+
if (matchingRuleUsesType.isOperational())
{
operationalAttrs.put(matchingRuleUsesType, attrList);
@@ -903,20 +928,13 @@
}
}
-
// Add the lastmod attributes.
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(creatorsName);
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(creatorsNameType, OP_ATTR_CREATORS_NAME,
- valueSet));
+ attrList.add(Attributes.create(creatorsNameType, creatorsName));
operationalAttrs.put(creatorsNameType, attrList);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(createTimestamp);
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(createTimestampType, OP_ATTR_CREATE_TIMESTAMP,
- valueSet));
+ attrList.add(Attributes.create(createTimestampType, createTimestamp));
operationalAttrs.put(createTimestampType, attrList);
if (DirectoryServer.getSchema().getYoungestModificationTime() != modifyTime)
@@ -924,28 +942,22 @@
synchronized (this)
{
modifyTime = DirectoryServer.getSchema().getYoungestModificationTime();
- modifyTimestamp =
- GeneralizedTimeSyntax.createGeneralizedTimeValue(modifyTime);
+ modifyTimestamp = GeneralizedTimeSyntax
+ .createGeneralizedTimeValue(modifyTime);
}
}
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(modifiersName);
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(modifiersNameType, OP_ATTR_MODIFIERS_NAME,
- valueSet));
+ attrList.add(Attributes.create(modifiersNameType, modifiersName));
operationalAttrs.put(modifiersNameType, attrList);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(modifyTimestamp);
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(modifyTimestampType, OP_ATTR_MODIFY_TIMESTAMP,
- valueSet));
+ attrList.add(Attributes.create(modifyTimestampType, modifyTimestamp));
operationalAttrs.put(modifyTimestampType, attrList);
- // Add the extra attributes.
- Map<String, Attribute> attributes =
- DirectoryServer.getSchema().getExtraAttributes();
+ // Add the extra attributes.
+ Map<String, Attribute> attributes = DirectoryServer.getSchema()
+ .getExtraAttributes();
for (Attribute attribute : attributes.values())
{
attrList = new ArrayList<Attribute>(1);
@@ -988,10 +1000,9 @@
}
}
-
// Construct and return the entry.
Entry e = new Entry(entryDN, schemaObjectClasses, userAttrs,
- operationalAttrs);
+ operationalAttrs);
e.processVirtualAttributes();
return e;
}
@@ -1052,8 +1063,8 @@
* {@inheritDoc}
*/
@Override()
- public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
- throws DirectoryException
+ public void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException
{
// Make sure that the authenticated user has the necessary UPDATE_SCHEMA
// privilege.
@@ -1094,15 +1105,9 @@
switch (m.getModificationType())
{
case ADD:
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
- {
- continue;
- }
-
if (at.equals(attributeTypesType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
AttributeType type;
try
@@ -1129,7 +1134,7 @@
}
else if (at.equals(objectClassesType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
ObjectClass oc;
try
@@ -1156,7 +1161,7 @@
}
else if (at.equals(nameFormsType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
NameForm nf;
try
@@ -1183,7 +1188,7 @@
}
else if (at.equals(ditContentRulesType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
DITContentRule dcr;
try
@@ -1210,7 +1215,7 @@
}
else if (at.equals(ditStructureRulesType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
DITStructureRule dsr;
try
@@ -1237,7 +1242,7 @@
}
else if (at.equals(matchingRuleUsesType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
MatchingRuleUse mru;
try
@@ -1274,8 +1279,7 @@
case DELETE:
- values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
Message message =
ERR_SCHEMA_MODIFY_DELETE_NO_VALUES.get(a.getName());
@@ -1285,7 +1289,7 @@
if (at.equals(attributeTypesType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
AttributeType type;
try
@@ -1313,7 +1317,7 @@
}
else if (at.equals(objectClassesType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
ObjectClass oc;
try
@@ -1340,7 +1344,7 @@
}
else if (at.equals(nameFormsType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
NameForm nf;
try
@@ -1367,7 +1371,7 @@
}
else if (at.equals(ditContentRulesType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
DITContentRule dcr;
try
@@ -1395,7 +1399,7 @@
}
else if (at.equals(ditStructureRulesType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
DITStructureRule dsr;
try
@@ -1423,7 +1427,7 @@
}
else if (at.equals(matchingRuleUsesType))
{
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
MatchingRuleUse mru;
try
@@ -1635,7 +1639,7 @@
// Make sure that none of the associated matching rules are marked OBSOLETE.
- MatchingRule mr = attributeType.getEqualityMatchingRule();
+ MatchingRule<?> mr = attributeType.getEqualityMatchingRule();
if ((mr != null) && mr.isObsolete())
{
Message message = ERR_SCHEMA_MODIFY_ATTRTYPE_OBSOLETE_MR.get(
@@ -1777,7 +1781,7 @@
continue;
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
AttributeType at;
try
@@ -2104,7 +2108,7 @@
continue;
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
ObjectClass oc;
try
@@ -2409,7 +2413,7 @@
continue;
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
NameForm nf;
try
@@ -2939,7 +2943,7 @@
continue;
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
DITStructureRule dsr;
try
@@ -3054,7 +3058,7 @@
// matching rule. If there is, then it will only be acceptable if it's the
// matching rule use that we are replacing (in which case we really do want
// to use the "!=" operator).
- MatchingRule matchingRule = matchingRuleUse.getMatchingRule();
+ MatchingRule<?> matchingRule = matchingRuleUse.getMatchingRule();
MatchingRuleUse existingMRUForRule =
schema.getMatchingRuleUse(matchingRule);
if ((existingMRUForRule != null) && (existingMRUForRule != existingMRU))
@@ -3230,14 +3234,8 @@
for (int i=0; i < rdn.getNumValues(); i++)
{
AttributeType type = rdn.getAttributeType(i);
- String name = rdn.getAttributeName(i);
-
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(rdn.getAttributeValue(i));
-
LinkedList<Attribute> attrList = new LinkedList<Attribute>();
- attrList.add(new Attribute(type, name, values));
+ attrList.add(Attributes.create(type, rdn.getAttributeValue(i)));
if (type.isOperational())
{
operationalAttributes.put(type, attrList);
@@ -3294,8 +3292,9 @@
if (! values.isEmpty())
{
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(attributeTypesType,
- attributeTypesType.getPrimaryName(), values));
+ AttributeBuilder builder = new AttributeBuilder(attributeTypesType);
+ builder.addAll(values);
+ attrList.add(builder.toAttribute());
schemaEntry.putAttribute(attributeTypesType, attrList);
}
@@ -3317,8 +3316,9 @@
if (! values.isEmpty())
{
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(objectClassesType,
- objectClassesType.getPrimaryName(), values));
+ AttributeBuilder builder = new AttributeBuilder(objectClassesType);
+ builder.addAll(values);
+ attrList.add(builder.toAttribute());
schemaEntry.putAttribute(objectClassesType, attrList);
}
@@ -3338,8 +3338,9 @@
if (! values.isEmpty())
{
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(nameFormsType,
- nameFormsType.getPrimaryName(), values));
+ AttributeBuilder builder = new AttributeBuilder(nameFormsType);
+ builder.addAll(values);
+ attrList.add(builder.toAttribute());
schemaEntry.putAttribute(nameFormsType, attrList);
}
@@ -3360,8 +3361,9 @@
if (! values.isEmpty())
{
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(ditContentRulesType,
- ditContentRulesType.getPrimaryName(), values));
+ AttributeBuilder builder = new AttributeBuilder(ditContentRulesType);
+ builder.addAll(values);
+ attrList.add(builder.toAttribute());
schemaEntry.putAttribute(ditContentRulesType, attrList);
}
@@ -3383,9 +3385,9 @@
if (! values.isEmpty())
{
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(ditStructureRulesType,
- ditStructureRulesType.getPrimaryName(),
- values));
+ AttributeBuilder builder = new AttributeBuilder(ditStructureRulesType);
+ builder.addAll(values);
+ attrList.add(builder.toAttribute());
schemaEntry.putAttribute(ditStructureRulesType, attrList);
}
@@ -3406,9 +3408,9 @@
if (! values.isEmpty())
{
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(matchingRuleUsesType,
- matchingRuleUsesType.getPrimaryName(),
- values));
+ AttributeBuilder builder = new AttributeBuilder(matchingRuleUsesType);
+ builder.addAll(values);
+ attrList.add(builder.toAttribute());
schemaEntry.putAttribute(matchingRuleUsesType, attrList);
}
@@ -4229,7 +4231,7 @@
{
// Look for attributetypes that could have been added to the schema
// or modified in the schema
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
// Parse the attribute type.
AttributeType attrType = AttributeTypeSyntax.decodeAttributeType(
@@ -4343,7 +4345,7 @@
{
for (Attribute a : ocList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
// It IS important here to allow the unknown elements that could
// appear in the new config schema.
@@ -5553,41 +5555,6 @@
/**
- * Returns an attribute that has the minimum upper bound value removed from
- * all of its attribute values.
- *
- * @param valueSet The original valueset containing the
- * attribute type definitions.
- *
- * @return Attribute that with all of the minimum upper bound values removed
- * from its attribute values.
- */
- private Attribute
- stripMinUpperBoundValues(LinkedHashSet<AttributeValue> valueSet) {
-
- LinkedHashSet<AttributeValue> valueSetCopy =
- new LinkedHashSet<AttributeValue>();
- for(AttributeValue v : valueSet) {
- //If it exists, strip the minimum upper bound value from the
- //attribute value.
- if(v.toString().indexOf('{') != -1) {
- //Create an attribute value from the stripped string and add it to the
- //valueset.
- String strippedStr=
- v.toString().replaceFirst(stripMinUpperBoundRegEx, "");
- ASN1OctetString s=new ASN1OctetString(strippedStr);
- AttributeValue strippedVal=new AttributeValue(s,s);
- valueSetCopy.add(strippedVal);
- } else
- valueSetCopy.add(v);
- }
- return
- new Attribute(attributeTypesType, ATTR_ATTRIBUTE_TYPES, valueSetCopy);
- }
-
-
-
- /**
* {@inheritDoc}
*/
public void preloadEntryCache() throws UnsupportedOperationException {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/TrustStoreBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/TrustStoreBackend.java
index 1b712d8..aba9109 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/TrustStoreBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/TrustStoreBackend.java
@@ -28,14 +28,20 @@
-import java.io.File;
+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.*;
+
import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.File;
import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.PrintWriter;
import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.net.UnknownHostException;
import java.security.Key;
import java.security.KeyStore;
@@ -43,11 +49,12 @@
import java.security.cert.Certificate;
import java.util.ArrayList;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Random;
import java.util.SortedSet;
+
import javax.naming.ldap.Rdn;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
@@ -63,23 +70,25 @@
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperation;
+import org.opends.server.core.ModifyOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.ByteString;
import org.opends.server.types.ConditionResult;
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.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.FilePermission;
import org.opends.server.types.IndexType;
@@ -96,12 +105,6 @@
import org.opends.server.util.CertificateManager;
import org.opends.server.util.Validator;
-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.*;
-
/**
@@ -376,15 +379,9 @@
int numAVAs = rdn.getNumValues();
for (int i=0; i < numAVAs; i++)
{
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(rdn.getAttributeValue(i));
-
AttributeType attrType = rdn.getAttributeType(i);
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(attrType, attrType.getNameOrOID(),
- valueSet));
-
+ attrList.add(Attributes.create(attrType, rdn.getAttributeValue(i)));
userAttrs.put(attrType, attrList);
}
@@ -623,24 +620,19 @@
LinkedHashMap<AttributeType,List<Attribute>> userAttrs =
new LinkedHashMap<AttributeType,List<Attribute>>(3);
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(v);
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), valueSet));
+ attrList.add(Attributes.create(t, v));
userAttrs.put(t, attrList);
- t = DirectoryServer.getAttributeType(
- ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE, true);
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(t,
- certValue));
+ t = DirectoryServer.getAttributeType(ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE,
+ true);
+ AttributeBuilder builder = new AttributeBuilder(t);
+ builder.setOption("binary");
+ builder.add(new AttributeValue(t, certValue));
attrList = new ArrayList<Attribute>(1);
- LinkedHashSet<String> options = new LinkedHashSet<String>(1);
- options.add("binary");
- attrList.add(new Attribute(t, t.getNameOrOID(), options, valueSet));
+ attrList.add(builder.toAttribute());
userAttrs.put(t, attrList);
@@ -721,8 +713,8 @@
* {@inheritDoc}
*/
@Override()
- public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
- throws DirectoryException
+ public void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException
{
Message message = ERR_TRUSTSTORE_MODIFY_NOT_SUPPORTED.get();
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
@@ -1637,8 +1629,10 @@
DirectoryServer.getServerErrorResultCode(), message);
}
- LinkedHashSet<AttributeValue> certValues = certAttrs.get(0).getValues();
- if (certValues == null)
+ Attribute certAttr = certAttrs.get(0);
+ Iterator<AttributeValue> i = certAttr.iterator();
+
+ if (!i.hasNext())
{
Message message =
ERR_TRUSTSTORE_ENTRY_MISSING_CERT_VALUE.get(
@@ -1647,7 +1641,10 @@
throw new DirectoryException(
DirectoryServer.getServerErrorResultCode(), message);
}
- if (certValues.size() != 1)
+
+ byte[] certBytes = i.next().getValueBytes();
+
+ if (i.hasNext())
{
Message message =
ERR_TRUSTSTORE_ENTRY_HAS_MULTIPLE_CERT_VALUES.get(
@@ -1657,7 +1654,6 @@
DirectoryServer.getServerErrorResultCode(), message);
}
- byte[] certBytes = certValues.iterator().next().getValueBytes();
try
{
File tempDir = getFileForPath("config");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java
index 11d9874..4267aca 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java
@@ -128,8 +128,6 @@
indexAttribute(newAttributes, modifiedKeys, true);
}
-
-
/**
* Generate the set of index keys to be added and the set of index keys
* to be deleted for an entry that was modified.
@@ -162,34 +160,21 @@
for (Attribute attr : attrList)
{
- indexValues(attr.getValues(), keys);
- }
- }
-
- /**
- * Generate the set of index keys for a set of attribute values.
- * @param values The set of attribute values to be indexed.
- * @param keys The set into which the keys will be inserted.
- */
- private void indexValues(Set<AttributeValue> values,
- Set<byte[]> keys)
- {
- if (values == null) return;
-
- for (AttributeValue value : values)
- {
- try
+ for (AttributeValue value : attr)
{
- byte[] keyBytes =
- approximateRule.normalizeValue(value.getValue()).value();
-
- keys.add(keyBytes);
- }
- catch (DirectoryException e)
- {
- if (debugEnabled())
+ try
{
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ byte[] keyBytes =
+ approximateRule.normalizeValue(value.getValue()).value();
+
+ keys.add(keyBytes);
+ }
+ catch (DirectoryException e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
}
}
}
@@ -211,46 +196,29 @@
for (Attribute attr : attrList)
{
- indexValues(attr.getValues(), modifiedKeys, insert);
- }
- }
-
- /**
- * Generate the set of index keys for a set of attribute values.
- * @param values The set of attribute values to be indexed.
- * @param modifiedKeys The map into which the modified
- * keys will be inserted.
- * @param insert <code>true</code> if generated keys should
- * be inserted or <code>false</code> otherwise.
- */
- private void indexValues(Set<AttributeValue> values,
- Map<byte[], Boolean> modifiedKeys,
- Boolean insert)
- {
- if (values == null) return;
-
- for (AttributeValue value : values)
- {
- try
+ for (AttributeValue value : attr)
{
- byte[] keyBytes =
- approximateRule.normalizeValue(value.getValue()).value();
+ try
+ {
+ byte[] keyBytes =
+ approximateRule.normalizeValue(value.getValue()).value();
- Boolean cInsert = modifiedKeys.get(keyBytes);
- if(cInsert == null)
- {
- modifiedKeys.put(keyBytes, insert);
+ Boolean cInsert = modifiedKeys.get(keyBytes);
+ if(cInsert == null)
+ {
+ modifiedKeys.put(keyBytes, insert);
+ }
+ else if(!cInsert.equals(insert))
+ {
+ modifiedKeys.remove(keyBytes);
+ }
}
- else if(!cInsert.equals(insert))
+ catch (DirectoryException e)
{
- modifiedKeys.remove(keyBytes);
- }
- }
- catch (DirectoryException e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
}
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index 23fc66b..759789d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -63,6 +63,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+
import static org.opends.server.util.ServerConstants.*;
import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.admin.std.server.LocalDBIndexCfg;
@@ -834,12 +835,13 @@
* {@inheritDoc}
*/
@Override()
- public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
- throws DirectoryException, CanceledOperationException
+ public void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException,
+ CanceledOperationException
{
writerBegin();
- DN entryDN = entry.getDN();
+ DN entryDN = newEntry.getDN();
EntryContainer ec;
if (rootContainer != null)
{
@@ -856,7 +858,7 @@
try
{
- ec.replaceEntry(entry, modifyOperation);
+ ec.replaceEntry(oldEntry, newEntry, modifyOperation);
}
catch (DatabaseException e)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java
index 052ea5d..c0f2825 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java
@@ -60,6 +60,7 @@
* @param entryContainer The entryContainer of the DN database.
* @throws DatabaseException If an error occurs in the JE database.
*/
+ @SuppressWarnings("unchecked")
DN2ID(String name, Environment env, EntryContainer entryContainer)
throws DatabaseException
{
@@ -87,7 +88,10 @@
}
this.dbConfig = dn2idConfig;
- this.dbConfig.setBtreeComparator(dn2idComparator.getClass());
+ //This line causes an unchecked cast error if the SuppressWarnings
+ //annotation is removed at the beginning of this method.
+ this.dbConfig.setBtreeComparator((Class<? extends Comparator<byte[]>>)
+ dn2idComparator.getClass());
}
/**
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
index 114f4af..e2aed63 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
@@ -106,6 +106,7 @@
* @param entryContainer The entryContainer of the DN database.
* @throws DatabaseException If an error occurs in the JE database.
*/
+ @SuppressWarnings("unchecked")
DN2URI(String name, Environment env,
EntryContainer entryContainer)
throws DatabaseException
@@ -136,7 +137,10 @@
dn2uriConfig.setTransactional(true);
}
this.dbConfig = dn2uriConfig;
- this.dbConfig.setBtreeComparator(dn2uriComparator.getClass());
+ //This line causes an unchecked cast error if the SuppressWarnings
+ //annotation is removed at the beginning of this method.
+ this.dbConfig.setBtreeComparator((Class<? extends Comparator<byte[]>>)
+ dn2uriComparator.getClass());
}
/**
@@ -309,7 +313,7 @@
case ADD:
if (a != null)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
insert(txn, entryDN, v.getStringValue());
}
@@ -317,13 +321,13 @@
break;
case DELETE:
- if (a == null || !a.hasValue())
+ if (a == null || a.isEmpty())
{
delete(txn, entryDN);
}
else
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
delete(txn, entryDN, v.getStringValue());
}
@@ -338,7 +342,7 @@
delete(txn, entryDN);
if (a != null)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
insert(txn, entryDN, v.getStringValue());
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
index ca77bc3..ac18901 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -1112,17 +1112,8 @@
debugBuffer.append(" final=");
entryIDList.toString(debugBuffer);
- AttributeSyntax syntax =
- DirectoryServer.getDefaultStringSyntax();
- AttributeType attrType =
- DirectoryServer.getDefaultAttributeType(ATTR_DEBUG_SEARCH_INDEX,
- syntax);
- ASN1OctetString valueString =
- new ASN1OctetString(debugBuffer.toString());
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(valueString, valueString));
- Attribute attr = new Attribute(attrType, ATTR_DEBUG_SEARCH_INDEX, values);
+ Attribute attr = Attributes.create(ATTR_DEBUG_SEARCH_INDEX,
+ debugBuffer.toString());
Entry debugEntry;
debugEntry = new Entry(DN.decode("cn=debugsearch"), null, null, null);
@@ -1840,7 +1831,7 @@
EntryContainer.transactionCommit(txn);
// Update the entry cache.
- EntryCache entryCache = DirectoryServer.getEntryCache();
+ EntryCache<?> entryCache = DirectoryServer.getEntryCache();
if (entryCache != null)
{
entryCache.putEntry(entry, backend, entryID.longValue());
@@ -2200,7 +2191,7 @@
}
// Remove the entry from the entry cache.
- EntryCache entryCache = DirectoryServer.getEntryCache();
+ EntryCache<?> entryCache = DirectoryServer.getEntryCache();
if (entryCache != null)
{
entryCache.removeEntry(leafDN);
@@ -2221,7 +2212,7 @@
public boolean entryExists(DN entryDN)
throws DirectoryException
{
- EntryCache entryCache = DirectoryServer.getEntryCache();
+ EntryCache<?> entryCache = DirectoryServer.getEntryCache();
// Try the entry cache first.
if (entryCache != null)
@@ -2265,7 +2256,7 @@
public Entry getEntry(DN entryDN)
throws DatabaseException, DirectoryException
{
- EntryCache entryCache = DirectoryServer.getEntryCache();
+ EntryCache<?> entryCache = DirectoryServer.getEntryCache();
Entry entry = null;
// Try the entry cache first.
@@ -2315,7 +2306,8 @@
* The simplest case of replacing an entry in which the entry DN has
* not changed.
*
- * @param entry The new contents of the entry
+ * @param oldEntry The old contents of the entry
+ * @param newEntry The new contents of the entry
* @param modifyOperation The modify operation with which this action is
* associated. This may be <CODE>null</CODE> for
* modifications performed internally.
@@ -2323,39 +2315,30 @@
* @throws DirectoryException If a Directory Server error occurs.
* @throws CanceledOperationException if this operation should be cancelled.
*/
- public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
- throws DatabaseException, DirectoryException, CanceledOperationException
+ public void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DatabaseException,
+ DirectoryException, CanceledOperationException
{
Transaction txn = beginTransaction();
try
{
// Read dn2id.
- EntryID entryID = dn2id.get(txn, entry.getDN(), LockMode.RMW);
+ EntryID entryID = dn2id.get(txn, newEntry.getDN(), LockMode.RMW);
if (entryID == null)
{
// The entry does not exist.
Message message =
- ERR_JEB_MODIFY_NO_SUCH_OBJECT.get(entry.getDN().toString());
+ ERR_JEB_MODIFY_NO_SUCH_OBJECT.get(newEntry.getDN().toString());
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
message, matchedDN, null);
}
- // Read id2entry for the original entry.
- Entry originalEntry = id2entry.get(txn, entryID, LockMode.RMW);
- if (originalEntry == null)
- {
- // The entry does not exist.
- Message msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(entryID.toString());
- throw new DirectoryException(
- DirectoryServer.getServerErrorResultCode(), msg);
- }
-
if (!isManageDsaITOperation(modifyOperation))
{
// Check if the entry is a referral entry.
- dn2uri.checkTargetForReferral(originalEntry, null);
+ dn2uri.checkTargetForReferral(oldEntry, null);
}
// Update the referral database.
@@ -2363,28 +2346,28 @@
{
// In this case we know from the operation what the modifications were.
List<Modification> mods = modifyOperation.getModifications();
- dn2uri.modifyEntry(txn, originalEntry, entry, mods);
+ dn2uri.modifyEntry(txn, oldEntry, newEntry, mods);
}
else
{
- dn2uri.replaceEntry(txn, originalEntry, entry);
+ dn2uri.replaceEntry(txn, oldEntry, newEntry);
}
// Replace id2entry.
- id2entry.put(txn, entryID, entry);
+ id2entry.put(txn, entryID, newEntry);
// Update the indexes.
if (modifyOperation != null)
{
// In this case we know from the operation what the modifications were.
List<Modification> mods = modifyOperation.getModifications();
- indexModifications(txn, originalEntry, entry, entryID, mods);
+ indexModifications(txn, oldEntry, newEntry, entryID, mods);
}
else
{
// The most optimal would be to figure out what the modifications were.
- indexRemoveEntry(txn, originalEntry, entryID);
- indexInsertEntry(txn, entry, entryID);
+ indexRemoveEntry(txn, oldEntry, entryID);
+ indexInsertEntry(txn, newEntry, entryID);
}
if(modifyOperation != null)
@@ -2397,10 +2380,10 @@
EntryContainer.transactionCommit(txn);
// Update the entry cache.
- EntryCache entryCache = DirectoryServer.getEntryCache();
+ EntryCache<?> entryCache = DirectoryServer.getEntryCache();
if (entryCache != null)
{
- entryCache.putEntry(entry, backend, entryID.longValue());
+ entryCache.putEntry(newEntry, backend, entryID.longValue());
}
}
catch (DatabaseException databaseException)
@@ -2790,7 +2773,7 @@
}
// Remove the entry from the entry cache.
- EntryCache entryCache = DirectoryServer.getEntryCache();
+ EntryCache<?> entryCache = DirectoryServer.getEntryCache();
if (entryCache != null)
{
entryCache.removeEntry(oldDN);
@@ -2939,7 +2922,7 @@
}
// Remove the entry from the entry cache.
- EntryCache entryCache = DirectoryServer.getEntryCache();
+ EntryCache<?> entryCache = DirectoryServer.getEntryCache();
if (entryCache != null)
{
entryCache.removeEntry(oldDN);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java
index a14e1a5..8aecf0e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java
@@ -157,34 +157,6 @@
}
/**
- * Generate the set of index keys for a set of attribute values.
- * @param values The set of attribute values to be indexed.
- * @param keys The set into which the keys will be inserted.
- */
- private void indexValues(Set<AttributeValue> values,
- Set<byte[]> keys)
- {
- if (values == null) return;
-
- for (AttributeValue value : values)
- {
- try
- {
- byte[] keyBytes = value.getNormalizedValue().value();
-
- keys.add(keyBytes);
- }
- catch (DirectoryException e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
- }
- }
- }
-
- /**
* Generate the set of index keys for an attribute.
* @param attrList The attribute to be indexed.
* @param keys The set into which the keys will be inserted.
@@ -196,7 +168,22 @@
for (Attribute attr : attrList)
{
- indexValues(attr.getValues(), keys);
+ for (AttributeValue value : attr)
+ {
+ try
+ {
+ byte[] keyBytes = value.getNormalizedValue().value();
+
+ keys.add(keyBytes);
+ }
+ catch (DirectoryException e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+ }
+ }
}
}
@@ -216,45 +203,28 @@
for (Attribute attr : attrList)
{
- indexValues(attr.getValues(), modifiedKeys, insert);
- }
- }
-
- /**
- * Generate the set of index keys for a set of attribute values.
- * @param values The set of attribute values to be indexed.
- * @param modifiedKeys The map into which the modified
- * keys will be inserted.
- * @param insert <code>true</code> if generated keys should
- * be inserted or <code>false</code> otherwise.
- */
- private void indexValues(Set<AttributeValue> values,
- Map<byte[], Boolean> modifiedKeys,
- Boolean insert)
- {
- if (values == null) return;
-
- for (AttributeValue value : values)
- {
- try
+ for (AttributeValue value : attr)
{
- byte[] keyBytes = value.getNormalizedValue().value();
+ try
+ {
+ byte[] keyBytes = value.getNormalizedValue().value();
- Boolean cInsert = modifiedKeys.get(keyBytes);
- if(cInsert == null)
- {
- modifiedKeys.put(keyBytes, insert);
+ Boolean cInsert = modifiedKeys.get(keyBytes);
+ if(cInsert == null)
+ {
+ modifiedKeys.put(keyBytes, insert);
+ }
+ else if(!cInsert.equals(insert))
+ {
+ modifiedKeys.remove(keyBytes);
+ }
}
- else if(!cInsert.equals(insert))
+ catch (DirectoryException e)
{
- modifiedKeys.remove(keyBytes);
- }
- }
- catch (DirectoryException e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
}
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java
index 7fa85b3..d26a70c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java
@@ -133,6 +133,7 @@
* @param entryContainer The database entryContainer holding this index.
* @throws DatabaseException If an error occurs in the JE database.
*/
+ @SuppressWarnings("unchecked")
public Index(String name, Indexer indexer, State state,
int indexEntryLimit, int cursorEntryLimit, boolean maintainCount,
Environment env, EntryContainer entryContainer)
@@ -167,7 +168,8 @@
this.dbConfig = dbNodupsConfig;
this.dbConfig.setOverrideBtreeComparator(true);
- this.dbConfig.setBtreeComparator(comparator.getClass());
+ this.dbConfig.setBtreeComparator((Class<? extends Comparator<byte[]>>)
+ comparator.getClass());
this.state = state;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JECompressedSchema.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JECompressedSchema.java
index ed75f82..f480da1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JECompressedSchema.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JECompressedSchema.java
@@ -28,23 +28,18 @@
+import static org.opends.messages.JebMessages.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import com.sleepycat.je.Cursor;
-import com.sleepycat.je.Database;
-import com.sleepycat.je.DatabaseConfig;
-import com.sleepycat.je.DatabaseEntry;
-import com.sleepycat.je.DatabaseException;
-import com.sleepycat.je.DeadlockException;
-import com.sleepycat.je.Environment;
-import com.sleepycat.je.LockMode;
-import com.sleepycat.je.OperationStatus;
-
import org.opends.messages.Message;
import org.opends.server.api.CompressedSchema;
import org.opends.server.core.DirectoryServer;
@@ -54,17 +49,24 @@
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.asn1.ASN1Sequence;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteArray;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ObjectClass;
-import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.messages.JebMessages.*;
-import static org.opends.server.util.StaticUtils.*;
+import com.sleepycat.je.Cursor;
+import com.sleepycat.je.Database;
+import com.sleepycat.je.DatabaseConfig;
+import com.sleepycat.je.DatabaseEntry;
+import com.sleepycat.je.DatabaseException;
+import com.sleepycat.je.DeadlockException;
+import com.sleepycat.je.Environment;
+import com.sleepycat.je.LockMode;
+import com.sleepycat.je.OperationStatus;
@@ -108,7 +110,7 @@
private ConcurrentHashMap<ByteArray,AttributeType> atDecodeMap;
// The map between encoded representations and attribute options.
- private ConcurrentHashMap<ByteArray,LinkedHashSet<String>> aoDecodeMap;
+ private ConcurrentHashMap<ByteArray,Set<String>> aoDecodeMap;
// The map between encoded representations and object class sets.
private ConcurrentHashMap<ByteArray,Map<ObjectClass,String>> ocDecodeMap;
@@ -116,7 +118,7 @@
// The map between attribute descriptions and their encoded
// representations.
private ConcurrentHashMap<AttributeType,
- ConcurrentHashMap<LinkedHashSet<String>,ByteArray>> adEncodeMap;
+ ConcurrentHashMap<Set<String>,ByteArray>> adEncodeMap;
// The map between object class sets and encoded representations.
private ConcurrentHashMap<Map<ObjectClass,String>,ByteArray> ocEncodeMap;
@@ -148,11 +150,11 @@
this.environment = environment;
atDecodeMap = new ConcurrentHashMap<ByteArray,AttributeType>();
- aoDecodeMap = new ConcurrentHashMap<ByteArray,LinkedHashSet<String>>();
+ aoDecodeMap = new ConcurrentHashMap<ByteArray,Set<String>>();
ocDecodeMap = new ConcurrentHashMap<ByteArray,Map<ObjectClass,String>>();
adEncodeMap =
new ConcurrentHashMap<AttributeType,
- ConcurrentHashMap<LinkedHashSet<String>,ByteArray>>();
+ ConcurrentHashMap<Set<String>,ByteArray>>();
ocEncodeMap = new ConcurrentHashMap<Map<ObjectClass,String>,ByteArray>();
adCounter = new AtomicInteger(1);
@@ -287,11 +289,11 @@
atDecodeMap.put(token, attrType);
aoDecodeMap.put(token, options);
- ConcurrentHashMap<LinkedHashSet<String>,ByteArray> map =
+ ConcurrentHashMap<Set<String>,ByteArray> map =
adEncodeMap.get(attrType);
if (map == null)
{
- map = new ConcurrentHashMap<LinkedHashSet<String>,ByteArray>(1);
+ map = new ConcurrentHashMap<Set<String>,ByteArray>(1);
map.put(options, token);
adEncodeMap.put(attrType, map);
}
@@ -438,16 +440,16 @@
throws DirectoryException
{
AttributeType type = attribute.getAttributeType();
- LinkedHashSet<String> options = attribute.getOptions();
+ Set<String> options = attribute.getOptions();
- ConcurrentHashMap<LinkedHashSet<String>,ByteArray> map =
+ ConcurrentHashMap<Set<String>,ByteArray> map =
adEncodeMap.get(type);
if (map == null)
{
byte[] tokenArray;
synchronized (adEncodeMap)
{
- map = new ConcurrentHashMap<LinkedHashSet<String>,ByteArray>(1);
+ map = new ConcurrentHashMap<Set<String>,ByteArray>(1);
int intValue = adCounter.getAndIncrement();
tokenArray = encodeInt(intValue);
@@ -521,11 +523,10 @@
*/
private byte[] encodeAttribute(byte[] adArray, Attribute attribute)
{
- LinkedHashSet<AttributeValue> values = attribute.getValues();
int totalValuesLength = 0;
- byte[][] subArrays = new byte[values.size()*2][];
+ byte[][] subArrays = new byte[attribute.size()*2][];
int pos = 0;
- for (AttributeValue v : values)
+ for (AttributeValue v : attribute)
{
byte[] vBytes = v.getValueBytes();
byte[] lBytes = ASN1Element.encodeLength(vBytes.length);
@@ -537,7 +538,7 @@
}
byte[] adArrayLength = ASN1Element.encodeLength(adArray.length);
- byte[] countBytes = ASN1Element.encodeLength(values.size());
+ byte[] countBytes = ASN1Element.encodeLength(attribute.size());
int totalLength = adArrayLength.length + adArray.length +
countBytes.length + totalValuesLength;
byte[] array = new byte[totalLength];
@@ -591,7 +592,7 @@
System.arraycopy(encodedEntry, pos, adArray.array(), 0, adArrayLength);
pos += adArrayLength;
AttributeType attrType = atDecodeMap.get(adArray);
- LinkedHashSet<String> options = aoDecodeMap.get(adArray);
+ Set<String> options = aoDecodeMap.get(adArray);
if ((attrType == null) || (options == null))
{
Message message = ERR_JEB_COMPSCHEMA_UNRECOGNIZED_AD_TOKEN.get(
@@ -614,17 +615,16 @@
}
- // Read the appropriate number of values.
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(numValues);
- for (int i=0; i < numValues; i++)
+ // For the common case of a single value with no options, generate
+ // less garbage.
+ if (numValues == 1 && options.isEmpty())
{
int valueLength = encodedEntry[pos] & 0x7F;
if (valueLength != encodedEntry[pos++])
{
int valueLengthBytes = valueLength;
valueLength = 0;
- for (int j=0; j < valueLengthBytes; j++, pos++)
+ for (int j = 0; j < valueLengthBytes; j++, pos++)
{
valueLength = (valueLength << 8) | (encodedEntry[pos] & 0xFF);
}
@@ -632,11 +632,38 @@
byte[] valueBytes = new byte[valueLength];
System.arraycopy(encodedEntry, pos, valueBytes, 0, valueLength);
- pos += valueLength;
- values.add(new AttributeValue(attrType, new ASN1OctetString(valueBytes)));
- }
- return new Attribute(attrType, attrType.getPrimaryName(), options, values);
+ return Attributes.create(attrType, new AttributeValue(attrType,
+ new ASN1OctetString(valueBytes)));
+ }
+ else
+ {
+ // Read the appropriate number of values.
+ AttributeBuilder builder = new AttributeBuilder(attrType);
+ builder.setOptions(options);
+ builder.setInitialCapacity(numValues);
+ for (int i = 0; i < numValues; i++)
+ {
+ int valueLength = encodedEntry[pos] & 0x7F;
+ if (valueLength != encodedEntry[pos++])
+ {
+ int valueLengthBytes = valueLength;
+ valueLength = 0;
+ for (int j = 0; j < valueLengthBytes; j++, pos++)
+ {
+ valueLength = (valueLength << 8) | (encodedEntry[pos] & 0xFF);
+ }
+ }
+
+ byte[] valueBytes = new byte[valueLength];
+ System.arraycopy(encodedEntry, pos, valueBytes, 0, valueLength);
+ pos += valueLength;
+ builder.add(new AttributeValue(attrType,
+ new ASN1OctetString(valueBytes)));
+ }
+
+ return builder.toAttribute();
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
index a59c629..6eed624 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
@@ -152,34 +152,6 @@
}
- /**
- * Generate the set of index keys for a set of attribute values.
- * @param values The set of attribute values to be indexed.
- * @param keys The set into which the keys will be inserted.
- */
- private void indexValues(Set<AttributeValue> values,
- Set<byte[]> keys)
- {
- if (values == null) return;
-
- for (AttributeValue value : values)
- {
- try
- {
- byte[] keyBytes =
- orderingRule.normalizeValue(value.getValue()).value();
-
- keys.add(keyBytes);
- }
- catch (DirectoryException e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
- }
- }
- }
/**
* Generate the set of index keys for an attribute.
@@ -193,7 +165,23 @@
for (Attribute attr : attrList)
{
- indexValues(attr.getValues(), keys);
+ for (AttributeValue value : attr)
+ {
+ try
+ {
+ byte[] keyBytes = orderingRule.normalizeValue(value.getValue())
+ .value();
+
+ keys.add(keyBytes);
+ }
+ catch (DirectoryException e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+ }
+ }
}
}
@@ -214,46 +202,29 @@
for (Attribute attr : attrList)
{
- indexValues(attr.getValues(), modifiedKeys, insert);
- }
- }
-
- /**
- * Generate the set of index keys for a set of attribute values.
- * @param values The set of attribute values to be indexed.
- * @param modifiedKeys The map into which the modified
- * keys will be inserted.
- * @param insert <code>true</code> if generated keys should
- * be inserted or <code>false</code> otherwise.
- */
- private void indexValues(Set<AttributeValue> values,
- Map<byte[], Boolean> modifiedKeys,
- Boolean insert)
- {
- if (values == null) return;
-
- for (AttributeValue value : values)
- {
- try
+ for (AttributeValue value : attr)
{
- byte[] keyBytes =
- orderingRule.normalizeValue(value.getValue()).value();
+ try
+ {
+ byte[] keyBytes =
+ orderingRule.normalizeValue(value.getValue()).value();
- Boolean cInsert = modifiedKeys.get(keyBytes);
- if(cInsert == null)
- {
- modifiedKeys.put(keyBytes, insert);
+ Boolean cInsert = modifiedKeys.get(keyBytes);
+ if(cInsert == null)
+ {
+ modifiedKeys.put(keyBytes, insert);
+ }
+ else if(!cInsert.equals(insert))
+ {
+ modifiedKeys.remove(keyBytes);
+ }
}
- else if(!cInsert.equals(insert))
+ catch (DirectoryException e)
{
- modifiedKeys.remove(keyBytes);
- }
- }
- catch (DirectoryException e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
}
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SortValues.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SortValues.java
index 308af69..d3da96c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SortValues.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SortValues.java
@@ -112,7 +112,7 @@
// handled by the SortKey.compareValues method.
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (sortValue == null)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
index 8691016..b75f9d4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
@@ -164,33 +164,20 @@
for (Attribute attr : attrList)
{
- indexValues(attr.getValues(), keys);
- }
- }
-
- /**
- * Generate the set of index keys for a set of attribute values.
- * @param values The set of attribute values to be indexed.
- * @param keys The set into which the keys will be inserted.
- */
- private void indexValues(Set<AttributeValue> values,
- Set<byte[]> keys)
- {
- if (values == null) return;
-
- for (AttributeValue value : values)
- {
- try
+ for (AttributeValue value : attr)
{
- byte[] normalizedBytes = value.getNormalizedValue().value();
-
- substringKeys(normalizedBytes, keys);
- }
- catch (DirectoryException e)
- {
- if (debugEnabled())
+ try
{
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ byte[] normalizedBytes = value.getNormalizedValue().value();
+
+ substringKeys(normalizedBytes, keys);
+ }
+ catch (DirectoryException e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
}
}
}
@@ -254,37 +241,20 @@
for (Attribute attr : attrList)
{
- indexValues(attr.getValues(), modifiedKeys, insert);
- }
- }
-
- /**
- * Generate the set of index keys for a set of attribute values.
- * @param values The set of attribute values to be indexed.
- * @param modifiedKeys The map into which the modified
- * keys will be inserted.
- * @param insert <code>true</code> if generated keys should
- * be inserted or <code>false</code> otherwise.
- */
- private void indexValues(Set<AttributeValue> values,
- Map<byte[], Boolean> modifiedKeys,
- Boolean insert)
- {
- if (values == null) return;
-
- for (AttributeValue value : values)
- {
- try
+ for (AttributeValue value : attr)
{
- byte[] normalizedBytes = value.getNormalizedValue().value();
-
- substringKeys(normalizedBytes, modifiedKeys, insert);
- }
- catch (DirectoryException e)
- {
- if (debugEnabled())
+ try
{
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ byte[] normalizedBytes = value.getNormalizedValue().value();
+
+ substringKeys(normalizedBytes, modifiedKeys, insert);
+ }
+ catch (DirectoryException e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
}
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VLVIndex.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VLVIndex.java
index b1ceb15..b6b6fca 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VLVIndex.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VLVIndex.java
@@ -112,8 +112,6 @@
*/
private LocalDBVLVIndexCfg config;
- private ID2Entry id2entry;
-
private DN baseDN;
private SearchFilter filter;
@@ -150,7 +148,6 @@
this.baseDN = config.getBaseDN();
this.scope = SearchScope.valueOf(config.getScope().name());
this.sortedSetCapacity = config.getMaxBlockSize();
- this.id2entry = entryContainer.getID2Entry();
try
{
@@ -1552,7 +1549,7 @@
// handled by the SortKey.compareValues method.
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (sortValue == null)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
index 5c21a27..32e07fa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -49,12 +49,12 @@
import org.opends.server.util.ServerConstants;
import org.opends.server.types.*;
+
import static org.opends.messages.JebMessages.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.IdentityHashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -1316,7 +1316,7 @@
{
for (Attribute a : attrs)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
ByteString nv =
approximateMatchingRule.normalizeValue(v.getValue());
@@ -1837,8 +1837,7 @@
{
for (Attribute attr : attrList)
{
- LinkedHashSet<AttributeValue> values = attr.getValues();
- for (AttributeValue value : values)
+ for (AttributeValue value : attr)
{
byte[] normalizedBytes = value.getNormalizedValue().value();
@@ -2142,7 +2141,7 @@
{
if (statEntry != null)
{
- Attribute a = new Attribute(t, v);
+ Attribute a = Attributes.create(t, v);
statEntry.addAttribute(a, null);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 39e41e8..34dc4f1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -1097,11 +1097,11 @@
long evictPasses = envStats.getNEvictPasses();
long evictNodes = envStats.getNNodesExplicitlyEvicted();
long evictBinsStrip = envStats.getNBINsStripped();
- int cleanerRuns = envStats.getNCleanerRuns();
- int cleanerDeletions = envStats.getNCleanerDeletions();
- int cleanerEntriesRead = envStats.getNCleanerEntriesRead();
- int cleanerINCleaned = envStats.getNINsCleaned();
- int checkPoints = envStats.getNCheckpoints();
+ long cleanerRuns = envStats.getNCleanerRuns();
+ long cleanerDeletions = envStats.getNCleanerDeletions();
+ long cleanerEntriesRead = envStats.getNCleanerEntriesRead();
+ long cleanerINCleaned = envStats.getNINsCleaned();
+ long checkPoints = envStats.getNCheckpoints();
if(evictPasses != 0) {
if(!evicting) {
evicting=true;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java
index e3481db..ab117ae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java
@@ -30,7 +30,6 @@
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import org.opends.server.core.DirectoryServer;
@@ -79,10 +78,6 @@
// class.
private String taskClassName;
- // The reference to the task scheduler that will be used to schedule new
- // iterations of this recurring task.
- private TaskScheduler taskScheduler;
-
/**
@@ -100,7 +95,6 @@
public RecurringTask(TaskScheduler taskScheduler, Entry recurringTaskEntry)
throws DirectoryException
{
- this.taskScheduler = taskScheduler;
this.recurringTaskEntry = recurringTaskEntry;
this.recurringTaskEntryDN = recurringTaskEntry.getDN();
@@ -130,14 +124,13 @@
}
Attribute attr = attrList.get(0);
- LinkedHashSet<AttributeValue> values = attr.getValues();
- if ((values == null) || values.isEmpty())
+ if (attr.isEmpty())
{
Message message = ERR_RECURRINGTASK_NO_ID.get(ATTR_RECURRING_TASK_ID);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = attr.iterator();
AttributeValue value = iterator.next();
if (iterator.hasNext())
{
@@ -178,15 +171,14 @@
}
attr = attrList.get(0);
- values = attr.getValues();
- if ((values == null) || values.isEmpty())
+ if (attr.isEmpty())
{
Message message =
ERR_RECURRINGTASK_NO_CLASS_VALUES.get(ATTR_RECURRING_TASK_CLASS_NAME);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
- iterator = values.iterator();
+ iterator = attr.iterator();
value = iterator.next();
if (iterator.hasNext())
{
@@ -199,7 +191,7 @@
// Make sure that the specified class can be loaded.
- Class taskClass;
+ Class<?> taskClass;
try
{
taskClass = DirectoryServer.loadClass(taskClassName);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java
index 345385d..82fc38f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java
@@ -25,12 +25,18 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.backends.task;
-import org.opends.messages.Message;
+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.*;
+
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedHashSet;
@@ -38,37 +44,30 @@
import java.util.List;
import java.util.TimeZone;
import java.util.UUID;
-import java.util.Collections;
import java.util.concurrent.locks.Lock;
+
import javax.mail.MessagingException;
+import org.opends.messages.Message;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.DN;
import org.opends.server.types.Entry;
+import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
-
-
-import org.opends.server.types.InitializationException;
import org.opends.server.types.Operation;
import org.opends.server.util.EMailMessage;
-import org.opends.server.util.TimeThread;
import org.opends.server.util.StaticUtils;
-
-import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.messages.BackendMessages.*;
-
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
+import org.opends.server.util.TimeThread;
@@ -418,7 +417,7 @@
throw new InitializationException(message);
}
- Iterator<AttributeValue> iterator = attrList.get(0).getValues().iterator();
+ Iterator<AttributeValue> iterator = attrList.get(0).iterator();
if (! iterator.hasNext())
{
if (isRequired)
@@ -478,7 +477,7 @@
throw new InitializationException(message);
}
- Iterator<AttributeValue> iterator = attrList.get(0).getValues().iterator();
+ Iterator<AttributeValue> iterator = attrList.get(0).iterator();
while (iterator.hasNext())
{
valueStrings.add(iterator.next().getStringValue());
@@ -615,22 +614,11 @@
try
{
this.taskState = taskState;
-
- AttributeType type =
- DirectoryServer.getAttributeType(ATTR_TASK_STATE.toLowerCase());
- if (type == null)
- {
- type = DirectoryServer.getDefaultAttributeType(ATTR_TASK_STATE);
- }
-
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(type,
- new ASN1OctetString(taskState.toString())));
-
+ Attribute attr = Attributes.create(ATTR_TASK_STATE,
+ taskState.toString());
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(type, ATTR_TASK_STATE, values));
- taskEntry.putAttribute(type, attrList);
+ attrList.add(attr);
+ taskEntry.putAttribute(attr.getAttributeType(), attrList);
}
finally
{
@@ -721,7 +709,7 @@
ArrayList<Modification> modifications = new ArrayList<Modification>();
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(name, value)));
+ Attributes.create(name, value)));
taskEntry.applyModifications(modifications);
}
@@ -787,26 +775,13 @@
try
{
this.actualStartTime = actualStartTime;
-
- AttributeType type = DirectoryServer.getAttributeType(
- ATTR_TASK_ACTUAL_START_TIME.toLowerCase());
- if (type == null)
- {
- type = DirectoryServer.getDefaultAttributeType(
- ATTR_TASK_ACTUAL_START_TIME);
- }
-
Date d = new Date(actualStartTime);
String startTimeStr = StaticUtils.formatDateTimeString(d);
- ASN1OctetString s = new ASN1OctetString(startTimeStr);
-
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(type, s));
-
+ Attribute attr = Attributes.create(ATTR_TASK_ACTUAL_START_TIME,
+ startTimeStr);
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(type, ATTR_TASK_ACTUAL_START_TIME, values));
- taskEntry.putAttribute(type, attrList);
+ attrList.add(attr);
+ taskEntry.putAttribute(attr.getAttributeType(), attrList);
}
finally
{
@@ -857,26 +832,14 @@
{
this.completionTime = completionTime;
- AttributeType type = DirectoryServer.getAttributeType(
- ATTR_TASK_COMPLETION_TIME.toLowerCase());
- if (type == null)
- {
- type =
- DirectoryServer.getDefaultAttributeType(ATTR_TASK_COMPLETION_TIME);
- }
-
SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT_GMT_TIME);
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
Date d = new Date(completionTime);
- ASN1OctetString s = new ASN1OctetString(dateFormat.format(d));
-
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(type, s));
-
+ Attribute attr = Attributes.create(ATTR_TASK_COMPLETION_TIME,
+ dateFormat.format(d));
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(type, ATTR_TASK_COMPLETION_TIME, values));
- taskEntry.putAttribute(type, attrList);
+ attrList.add(attr);
+ taskEntry.putAttribute(attr.getAttributeType(), attrList);
}
finally
{
@@ -1031,25 +994,23 @@
}
List<Attribute> attrList = taskEntry.getAttribute(type);
- LinkedHashSet<AttributeValue> values;
+ AttributeValue value = new AttributeValue(type, messageString);
if (attrList == null)
{
attrList = new ArrayList<Attribute>();
- values = new LinkedHashSet<AttributeValue>();
- attrList.add(new Attribute(type, ATTR_TASK_LOG_MESSAGES, values));
+ attrList.add(Attributes.create(type, value));
taskEntry.putAttribute(type, attrList);
}
else if (attrList.isEmpty())
{
- values = new LinkedHashSet<AttributeValue>();
- attrList.add(new Attribute(type, ATTR_TASK_LOG_MESSAGES, values));
+ attrList.add(Attributes.create(type, value));
}
else
{
- Attribute attr = attrList.get(0);
- values = attr.getValues();
+ AttributeBuilder builder = new AttributeBuilder(attrList.get(0));
+ builder.add(value);
+ attrList.set(0, builder.toAttribute());
}
- values.add(new AttributeValue(type, new ASN1OctetString(messageString)));
}
finally
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java
index eafd70a..b158520 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -660,10 +660,10 @@
* {@inheritDoc}
*/
@Override()
- public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
- throws DirectoryException
+ public void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException
{
- DN entryDN = entry.getDN();
+ DN entryDN = newEntry.getDN();
Lock entryLock = null;
if (! taskScheduler.holdsSchedulerLock())
@@ -715,8 +715,8 @@
TaskState state = t.getTaskState();
if (TaskState.isPending(state))
{
- Task newTask =
- taskScheduler.entryToScheduledTask(entry, modifyOperation);
+ Task newTask = taskScheduler.entryToScheduledTask(newEntry,
+ modifyOperation);
taskScheduler.removePendingTask(t.getTaskID());
taskScheduler.scheduleTask(newTask, true);
return;
@@ -749,7 +749,7 @@
break;
}
- Iterator<AttributeValue> iterator = a.getValues().iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
if (! iterator.hasNext())
{
acceptable = false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java
index 7ed0d17..7dcd46b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java
@@ -25,36 +25,44 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.backends.task;
-import org.opends.messages.Message;
-import java.io.IOException;
+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.*;
+
import java.io.File;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.TreeSet;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import org.opends.messages.Message;
import org.opends.server.api.AlertGenerator;
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.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.DirectoryException;
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.ExistingFileBehavior;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.LDIFExportConfig;
+import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.LockManager;
import org.opends.server.types.Operation;
import org.opends.server.types.ResultCode;
@@ -64,15 +72,6 @@
import org.opends.server.util.LDIFWriter;
import org.opends.server.util.TimeThread;
-import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
-import static org.opends.messages.BackendMessages.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
@@ -1850,14 +1849,13 @@
}
Attribute attr = attrList.get(0);
- LinkedHashSet<AttributeValue> values = attr.getValues();
- if ((values == null) || values.isEmpty())
+ if (attr.isEmpty())
{
Message message = ERR_TASKSCHED_NO_CLASS_VALUES.get(ATTR_TASK_ID);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = attr.iterator();
AttributeValue value = iterator.next();
if (iterator.hasNext())
{
@@ -1874,7 +1872,7 @@
// Try to load the specified class.
- Class taskClass;
+ Class<?> taskClass;
try
{
taskClass = DirectoryServer.loadClass(taskClassName);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
index 7a6abe5..052a7e8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
@@ -33,6 +33,7 @@
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
+
import javax.management.AttributeList;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanParameterInfo;
@@ -167,7 +168,7 @@
*
* @return The attribute syntax for this configuration attribute.
*/
- public AttributeSyntax getSyntax()
+ public AttributeSyntax<?> getSyntax()
{
return DirectoryServer.getDefaultBooleanSyntax();
}
@@ -453,8 +454,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
// This is illegal -- it must have a value.
Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName());
@@ -463,7 +463,7 @@
else
{
// Get the value and parse it as a Boolean.
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
String valueString = iterator.next().getStringValue().toLowerCase();
if (valueString.equals("true") || valueString.equals("yes") ||
@@ -516,8 +516,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
// This is illegal -- it must have a value.
Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName());
@@ -526,7 +525,7 @@
else
{
// Get the value and parse it as a Boolean.
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
String valueString = iterator.next().getStringValue().toLowerCase();
if (valueString.equals("true") || valueString.equals("yes") ||
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java
index 5a7b10d..b98adc5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java
@@ -266,7 +266,7 @@
*
* @return The attribute syntax for this configuration attribute.
*/
- public abstract AttributeSyntax getSyntax();
+ public abstract AttributeSyntax<?> getSyntax();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java
index 176d6da..2b38b0e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java
@@ -29,7 +29,6 @@
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -41,6 +40,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -243,13 +243,15 @@
}
ArrayList<Attribute> attrs = new ArrayList<Attribute>(2);
- attrs.add(new Attribute(attrType, name, attribute.getActiveValues()));
+ AttributeBuilder builder = new AttributeBuilder(attrType, name);
+ builder.addAll(attribute.getActiveValues());
+ attrs.add(builder.toAttribute());
if (attribute.hasPendingValues())
{
- LinkedHashSet<String> options = new LinkedHashSet<String>(1);
- options.add(OPTION_PENDING_VALUES);
- attrs.add(new Attribute(attrType, name, options,
- attribute.getPendingValues()));
+ builder = new AttributeBuilder(attrType, name);
+ builder.setOption(OPTION_PENDING_VALUES);
+ builder.addAll(attribute.getPendingValues());
+ attrs.add(builder.toAttribute());
}
entry.putAttribute(attrType, attrs);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
index 1889b87..dcccb9e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
@@ -33,6 +33,7 @@
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
+
import javax.management.AttributeList;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanParameterInfo;
@@ -253,7 +254,7 @@
*
* @return The attribute syntax for this configuration attribute.
*/
- public AttributeSyntax getSyntax()
+ public AttributeSyntax<?> getSyntax()
{
return DirectoryServer.getDefaultStringSyntax();
}
@@ -809,8 +810,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
if (isRequired())
{
@@ -826,7 +826,7 @@
}
else
{
- int numValues = values.size();
+ int numValues = a.size();
if ((numValues > 1) && (! isMultiValued()))
{
// This is illegal -- the attribute is single-valued.
@@ -836,7 +836,7 @@
}
pendingValues = new ArrayList<DN>(numValues);
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
DN dn;
try
@@ -880,8 +880,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
if (isRequired())
{
@@ -897,7 +896,7 @@
}
else
{
- int numValues = values.size();
+ int numValues = a.size();
if ((numValues > 1) && (! isMultiValued()))
{
// This is illegal -- the attribute is single-valued.
@@ -907,7 +906,7 @@
}
activeValues = new ArrayList<DN>(numValues);
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
DN dn;
try
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
index 764f829..69bc80e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
@@ -33,6 +33,7 @@
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
+
import javax.management.AttributeList;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanParameterInfo;
@@ -325,7 +326,7 @@
*
* @return The attribute syntax for this configuration attribute.
*/
- public AttributeSyntax getSyntax()
+ public AttributeSyntax<?> getSyntax()
{
return DirectoryServer.getDefaultIntegerSyntax();
}
@@ -1069,8 +1070,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
if (isRequired())
{
@@ -1086,7 +1086,7 @@
}
else
{
- int numValues = values.size();
+ int numValues = a.size();
if ((numValues > 1) && (! isMultiValued()))
{
// This is illegal -- the attribute is single-valued.
@@ -1096,7 +1096,7 @@
}
pendingValues = new ArrayList<Long>(numValues);
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
long longValue;
try
@@ -1152,8 +1152,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
if (isRequired())
{
@@ -1169,7 +1168,7 @@
}
else
{
- int numValues = values.size();
+ int numValues = a.size();
if ((numValues > 1) && (! isMultiValued()))
{
// This is illegal -- the attribute is single-valued.
@@ -1179,7 +1178,7 @@
}
activeValues = new ArrayList<Long>(numValues);
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
long longValue;
try
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
index c361eaa..d2eb81c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
@@ -34,6 +34,7 @@
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
+
import javax.management.AttributeList;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanParameterInfo;
@@ -310,7 +311,7 @@
*
* @return The attribute syntax for this configuration attribute.
*/
- public AttributeSyntax getSyntax()
+ public AttributeSyntax<?> getSyntax()
{
return DirectoryServer.getDefaultStringSyntax();
}
@@ -945,8 +946,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
// This is illegal -- it must have a value.
Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName());
@@ -954,7 +954,7 @@
}
else
{
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
String valueString = iterator.next().getStringValue();
@@ -1031,8 +1031,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
// This is illegal -- it must have a value.
Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName());
@@ -1040,7 +1039,7 @@
}
else
{
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
String valueString = iterator.next().getStringValue();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java b/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java
index 052c65b..e2fb06f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java
@@ -32,7 +32,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.management.Attribute;
@@ -403,7 +402,7 @@
* @return <CODE>true</CODE> if the specified component was successfully
* removed, or <CODE>false</CODE> if not.
*/
- public boolean removeMonitorProvider(MonitorProvider component)
+ public boolean removeMonitorProvider(MonitorProvider<?> component)
{
synchronized (monitorProviders)
{
@@ -438,13 +437,12 @@
{
if (attrType.equals(a.getAttributeType()))
{
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
continue;
}
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
AttributeValue value = iterator.next();
if (iterator.hasNext())
@@ -672,13 +670,12 @@
{
if (attrType.equals(a.getAttributeType()))
{
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
continue;
}
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
AttributeValue value = iterator.next();
if (iterator.hasNext())
@@ -890,21 +887,24 @@
*/
private ClientConnection getClientConnection()
{
- ClientConnection clientConnection=null;
- java.security.AccessControlContext acc = java.security.AccessController
- .getContext();
- try
- {
- javax.security.auth.Subject subject = javax.security.auth.Subject
+ ClientConnection clientConnection = null;
+ java.security.AccessControlContext acc = java.security.AccessController
+ .getContext();
+ try
+ {
+ javax.security.auth.Subject subject = javax.security.auth.Subject
.getSubject(acc);
- if(subject != null) {
- Set privateCreds = subject.getPrivateCredentials(Credential.class);
- clientConnection = ((Credential) privateCreds
- .iterator().next()).getClientConnection();
- }
+ if (subject != null)
+ {
+ Set<?> privateCreds = subject.getPrivateCredentials(Credential.class);
+ clientConnection = ((Credential) privateCreds.iterator().next())
+ .getClientConnection();
}
- catch (Exception e) {}
- return clientConnection;
+ }
+ catch (Exception e)
+ {
+ }
+ return clientConnection;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
index c41d1cc..bd935e9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
@@ -290,7 +290,7 @@
*
* @return The attribute syntax for this configuration attribute.
*/
- public AttributeSyntax getSyntax()
+ public AttributeSyntax<?> getSyntax()
{
return DirectoryServer.getDefaultStringSyntax();
}
@@ -832,8 +832,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
if (isRequired())
{
@@ -849,7 +848,7 @@
}
else
{
- int numValues = values.size();
+ int numValues = a.size();
if ((numValues > 1) && (! isMultiValued()))
{
// This is illegal -- the attribute is single-valued.
@@ -859,7 +858,7 @@
}
pendingValues = new ArrayList<String>(numValues);
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
String lowerValue = v.getStringValue().toLowerCase();
if (! allowedValues.contains(lowerValue))
@@ -895,8 +894,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
if (isRequired())
{
@@ -912,7 +910,7 @@
}
else
{
- int numValues = values.size();
+ int numValues = a.size();
if ((numValues > 1) && (! isMultiValued()))
{
// This is illegal -- the attribute is single-valued.
@@ -922,7 +920,7 @@
}
activeValues = new ArrayList<String>(numValues);
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
String lowerValue = v.getStringValue().toLowerCase();
if (! allowedValues.contains(lowerValue))
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
index e2113db..9057570 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
@@ -154,7 +154,7 @@
*
* @return The attribute syntax for this configuration attribute.
*/
- public AttributeSyntax getSyntax()
+ public AttributeSyntax<?> getSyntax()
{
return DirectoryServer.getDefaultStringSyntax();
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java
index 881c4fd..6b79c98 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java
@@ -33,6 +33,7 @@
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
+
import javax.management.AttributeList;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanParameterInfo;
@@ -256,7 +257,7 @@
*
* @return The attribute syntax for this configuration attribute.
*/
- public AttributeSyntax getSyntax()
+ public AttributeSyntax<?> getSyntax()
{
return DirectoryServer.getDefaultStringSyntax();
}
@@ -745,8 +746,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
if (isRequired())
{
@@ -762,7 +762,7 @@
}
else
{
- int numValues = values.size();
+ int numValues = a.size();
if ((numValues > 1) && (! isMultiValued()))
{
// This is illegal -- the attribute is single-valued.
@@ -772,7 +772,7 @@
}
pendingValues = new ArrayList<String>(numValues);
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
pendingValues.add(v.getStringValue());
}
@@ -799,8 +799,7 @@
}
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
if (isRequired())
{
@@ -816,7 +815,7 @@
}
else
{
- int numValues = values.size();
+ int numValues = a.size();
if ((numValues > 1) && (! isMultiValued()))
{
// This is illegal -- the attribute is single-valued.
@@ -826,7 +825,7 @@
}
activeValues = new ArrayList<String>(numValues);
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
activeValues.add(v.getStringValue());
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AddOperationBasis.java b/opendj-sdk/opends/src/server/org/opends/server/core/AddOperationBasis.java
index 355a4ad..4d74a49 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AddOperationBasis.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AddOperationBasis.java
@@ -47,12 +47,12 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
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.opends.server.protocols.asn1.ASN1OctetString;
@@ -61,7 +61,7 @@
import org.opends.server.types.operation.PostResponseAddOperation;
import org.opends.server.types.operation.PreParseAddOperation;
import org.opends.server.workflowelement.localbackend.LocalBackendAddOperation;
-
+import org.opends.server.protocols.ldap.LDAPResultCode;
@@ -380,16 +380,32 @@
{
if (! (isInternalOperation() || isSynchronizationOperation()))
{
- setResultCode(ResultCode.UNWILLING_TO_PERFORM);
- appendErrorMessage(ERR_ADD_ATTR_IS_NO_USER_MOD.get(
+ throw new LDAPException(LDAPResultCode.UNWILLING_TO_PERFORM,
+ ERR_ADD_ATTR_IS_NO_USER_MOD.get(
String.valueOf(entryDN),
attr.getName()));
+ }
+ }
- objectClasses = null;
- userAttributes = null;
- operationalAttributes = null;
- ldapError = true;
- return;
+ if(attrType.isBinary())
+ {
+ if(!attr.hasOption("binary"))
+ {
+ //A binary option wasn't provided by the client so add it.
+ AttributeBuilder builder = new AttributeBuilder(attr);
+ builder.setOption("binary");
+ attr = builder.toAttribute();
+ }
+ }
+ else
+ {
+ // binary option is not honored for non-BER-encodable attributes.
+ if(attr.hasOption("binary"))
+ {
+ throw new LDAPException(LDAPResultCode.UNDEFINED_ATTRIBUTE_TYPE,
+ ERR_ADD_ATTR_IS_INVALID_OPTION.get(
+ String.valueOf(entryDN),
+ attr.getName()));
}
}
@@ -437,15 +453,17 @@
// have the same set of options. If so, then add the values
// to that attribute.
boolean attributeSeen = false;
- for (Attribute ea : attrs)
- {
+ for (int i = 0; i < attrs.size(); i++) {
+ Attribute ea = attrs.get(i);
if (ea.optionsEqual(attr.getOptions()))
{
- LinkedHashSet<AttributeValue> valueSet = ea.getValues();
- valueSet.addAll(attr.getValues());
+ AttributeBuilder builder = new AttributeBuilder(ea);
+ builder.addAll(attr);
+ attrs.set(i, builder.toAttribute());
attributeSeen = true;
}
}
+
if (!attributeSeen)
{
// This is the first occurrence of the attribute and options.
@@ -815,8 +833,8 @@
{
// Invoke the post response plugins that have been registered by
// the workflow elements
- List localOperations =
- (List)getAttachment(Operation.LOCALBACKENDOPERATIONS);
+ List<?> localOperations =
+ (List<?>)getAttachment(Operation.LOCALBACKENDOPERATIONS);
if (localOperations != null)
{
@@ -851,8 +869,8 @@
return;
}
- List localOperations =
- (List)getAttachment(Operation.LOCALBACKENDOPERATIONS);
+ List<?> localOperations =
+ (List<?>)getAttachment(Operation.LOCALBACKENDOPERATIONS);
if (localOperations != null)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/BindOperationBasis.java b/opendj-sdk/opends/src/server/org/opends/server/core/BindOperationBasis.java
index 89dc056..874aed7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/BindOperationBasis.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/BindOperationBasis.java
@@ -29,6 +29,7 @@
import org.opends.messages.MessageBuilder;
+import static org.opends.server.config.ConfigConstants.DN_CONFIG_ROOT;
import static org.opends.server.core.CoreConstants.LOG_ELEMENT_AUTH_TYPE;
import static org.opends.server.core.CoreConstants.LOG_ELEMENT_BIND_DN;
import static org.opends.server.core.CoreConstants.LOG_ELEMENT_ERROR_MESSAGE;
@@ -48,6 +49,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.opends.server.protocols.asn1.ASN1OctetString;
@@ -790,10 +792,30 @@
}
- // Retrieve the network group attached to the client connection
- // and get a workflow to process the operation.
- NetworkGroup ng = getClientConnection().getNetworkGroup();
- Workflow workflow = ng.getWorkflowCandidate(bindDN);
+ // Special case to manage RootDNs
+ // RootDNs are stored in cn=config but this workflow is not
+ // available through non-admin network groups.
+ // So if the bind DN is in cn=config, we directly retrieve
+ // the workflow handling cn=config
+ // FIXME: it would be better to store RootDNs in a separate backend.
+ // Issue #3502 has been logged to track this request.
+ boolean isInConfig;
+ try {
+ isInConfig = bindDN.isDescendantOf(DN.decode(DN_CONFIG_ROOT));
+ } catch (DirectoryException ex) {
+ // can not happen
+ isInConfig = false;
+ }
+
+ Workflow workflow;
+ if (isInConfig) {
+ workflow = WorkflowImpl.getWorkflow("__config.ldif__#cn=config");
+ } else {
+ // Retrieve the network group attached to the client connection
+ // and get a workflow to process the operation.
+ NetworkGroup ng = getClientConnection().getNetworkGroup();
+ workflow = ng.getWorkflowCandidate(bindDN);
+ }
if (workflow == null)
{
// We have found no workflow for the requested base DN, just return
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperationBasis.java b/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperationBasis.java
index 794dbea..12c3650 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperationBasis.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperationBasis.java
@@ -38,6 +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.opends.server.protocols.asn1.ASN1OctetString;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
index 3c1521e..69218b1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -41,16 +41,19 @@
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
+import org.opends.server.admin.AdministrationConnector;
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.admin.server.ConfigurationAddListener;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.admin.std.meta.*;
+import org.opends.server.admin.std.server.AdministrationConnectorCfg;
import org.opends.server.admin.std.server.ConnectionHandlerCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.config.ConfigException;
+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;
@@ -77,7 +80,8 @@
// The mapping between configuration entry DNs and their
// corresponding connection handler implementations.
- private ConcurrentHashMap<DN, ConnectionHandler> connectionHandlers;
+ private ConcurrentHashMap<DN, ConnectionHandler> connectionHandlers =
+ new ConcurrentHashMap<DN, ConnectionHandler>();
@@ -325,6 +329,40 @@
/**
+ * Initializes the configuration associated with the Directory
+ * Server administration connector. This should only be called at
+ * Directory Server startup.
+ *
+ * @throws ConfigException
+ * If a critical configuration problem prevents the
+ * administration connector initialization from succeeding.
+ * @throws InitializationException
+ * If a problem occurs while initializing the administration
+ * connector that is not related to the server
+ * configuration.
+ */
+ public void initializeAdministrationConnectorConfig()
+ throws ConfigException, InitializationException {
+
+ RootCfg root =
+ ServerManagementContext.getInstance().getRootConfiguration();
+ AdministrationConnectorCfg administrationConnectorCfg =
+ root.getAdministrationConnector();
+
+ AdministrationConnector ac = new AdministrationConnector();
+ ac.initializeAdministrationConnector(administrationConnectorCfg);
+
+ // Put this connection handler in the hash so that we will be
+ // able to find it if it is altered.
+ LDAPConnectionHandler connectionHandler = ac.getConnectionHandler();
+ connectionHandlers.put(administrationConnectorCfg.dn(), connectionHandler);
+
+ // Register the connection handler with the Directory Server.
+ DirectoryServer.registerConnectionHandler(connectionHandler);
+ }
+
+
+ /**
* {@inheritDoc}
*/
public boolean isConfigurationAddAcceptable(
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DefaultCompressedSchema.java b/opendj-sdk/opends/src/server/org/opends/server/core/DefaultCompressedSchema.java
index fbf7e5a..6f67cff 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DefaultCompressedSchema.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DefaultCompressedSchema.java
@@ -35,6 +35,7 @@
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
@@ -48,8 +49,10 @@
import org.opends.server.protocols.asn1.ASN1Sequence;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteArray;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
@@ -87,7 +90,7 @@
private ConcurrentHashMap<ByteArray,AttributeType> atDecodeMap;
// The map between encoded representations and attribute options.
- private ConcurrentHashMap<ByteArray,LinkedHashSet<String>> aoDecodeMap;
+ private ConcurrentHashMap<ByteArray,Set<String>> aoDecodeMap;
// The map between encoded representations and object class sets.
private ConcurrentHashMap<ByteArray,Map<ObjectClass,String>> ocDecodeMap;
@@ -95,7 +98,7 @@
// The map between attribute descriptions and their encoded
// representations.
private ConcurrentHashMap<AttributeType,
- ConcurrentHashMap<LinkedHashSet<String>,ByteArray>> adEncodeMap;
+ ConcurrentHashMap<Set<String>,ByteArray>> adEncodeMap;
// The map between object class sets and encoded representations.
private ConcurrentHashMap<Map<ObjectClass,String>,ByteArray> ocEncodeMap;
@@ -107,13 +110,12 @@
*/
public DefaultCompressedSchema()
{
- atDecodeMap = new ConcurrentHashMap<ByteArray,AttributeType>();
- aoDecodeMap = new ConcurrentHashMap<ByteArray,LinkedHashSet<String>>();
- ocDecodeMap = new ConcurrentHashMap<ByteArray,Map<ObjectClass,String>>();
- adEncodeMap =
- new ConcurrentHashMap<AttributeType,
- ConcurrentHashMap<LinkedHashSet<String>,ByteArray>>();
- ocEncodeMap = new ConcurrentHashMap<Map<ObjectClass,String>,ByteArray>();
+ atDecodeMap = new ConcurrentHashMap<ByteArray, AttributeType>();
+ aoDecodeMap = new ConcurrentHashMap<ByteArray, Set<String>>();
+ ocDecodeMap = new ConcurrentHashMap<ByteArray, Map<ObjectClass, String>>();
+ adEncodeMap = new ConcurrentHashMap
+ <AttributeType, ConcurrentHashMap<Set<String>, ByteArray>>();
+ ocEncodeMap = new ConcurrentHashMap<Map<ObjectClass, String>, ByteArray>();
adCounter = new AtomicInteger(1);
ocCounter = new AtomicInteger(1);
@@ -208,11 +210,11 @@
atDecodeMap.put(token, attrType);
aoDecodeMap.put(token, options);
- ConcurrentHashMap<LinkedHashSet<String>,ByteArray> map =
- adEncodeMap.get(attrType);
+ ConcurrentHashMap<Set<String>, ByteArray> map = adEncodeMap
+ .get(attrType);
if (map == null)
{
- map = new ConcurrentHashMap<LinkedHashSet<String>,ByteArray>(1);
+ map = new ConcurrentHashMap<Set<String>, ByteArray>(1);
map.put(options, token);
adEncodeMap.put(attrType, map);
}
@@ -324,7 +326,7 @@
for (ByteArray token : atDecodeMap.keySet())
{
AttributeType attrType = atDecodeMap.get(token);
- LinkedHashSet<String> options = aoDecodeMap.get(token);
+ Set<String> options = aoDecodeMap.get(token);
ArrayList<ASN1Element> elements =
new ArrayList<ASN1Element>(options.size()+2);
@@ -458,16 +460,15 @@
throws DirectoryException
{
AttributeType type = attribute.getAttributeType();
- LinkedHashSet<String> options = attribute.getOptions();
+ Set<String> options = attribute.getOptions();
- ConcurrentHashMap<LinkedHashSet<String>,ByteArray> map =
- adEncodeMap.get(type);
+ ConcurrentHashMap<Set<String>, ByteArray> map = adEncodeMap.get(type);
if (map == null)
{
byte[] array;
synchronized (adEncodeMap)
{
- map = new ConcurrentHashMap<LinkedHashSet<String>,ByteArray>(1);
+ map = new ConcurrentHashMap<Set<String>,ByteArray>(1);
int intValue = adCounter.getAndIncrement();
array = encodeInt(intValue);
@@ -523,11 +524,10 @@
*/
private byte[] encodeAttribute(byte[] adArray, Attribute attribute)
{
- LinkedHashSet<AttributeValue> values = attribute.getValues();
int totalValuesLength = 0;
- byte[][] subArrays = new byte[values.size()*2][];
+ byte[][] subArrays = new byte[attribute.size()*2][];
int pos = 0;
- for (AttributeValue v : values)
+ for (AttributeValue v : attribute)
{
byte[] vBytes = v.getValueBytes();
byte[] lBytes = ASN1Element.encodeLength(vBytes.length);
@@ -539,7 +539,7 @@
}
byte[] adArrayLength = ASN1Element.encodeLength(adArray.length);
- byte[] countBytes = ASN1Element.encodeLength(values.size());
+ byte[] countBytes = ASN1Element.encodeLength(attribute.size());
int totalLength = adArrayLength.length + adArray.length +
countBytes.length + totalValuesLength;
byte[] array = new byte[totalLength];
@@ -592,8 +592,9 @@
ByteArray adArray = new ByteArray(new byte[adArrayLength]);
System.arraycopy(encodedEntry, pos, adArray.array(), 0, adArrayLength);
pos += adArrayLength;
+
AttributeType attrType = atDecodeMap.get(adArray);
- LinkedHashSet<String> options = aoDecodeMap.get(adArray);
+ Set<String> options = aoDecodeMap.get(adArray);
if ((attrType == null) || (options == null))
{
Message message = ERR_COMPRESSEDSCHEMA_UNRECOGNIZED_AD_TOKEN.get(
@@ -616,17 +617,16 @@
}
- // Read the appropriate number of values.
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(numValues);
- for (int i=0; i < numValues; i++)
+ // For the common case of a single value with no options, generate
+ // less garbage.
+ if (numValues == 1 && options.isEmpty())
{
int valueLength = encodedEntry[pos] & 0x7F;
if (valueLength != encodedEntry[pos++])
{
int valueLengthBytes = valueLength;
valueLength = 0;
- for (int j=0; j < valueLengthBytes; j++, pos++)
+ for (int j = 0; j < valueLengthBytes; j++, pos++)
{
valueLength = (valueLength << 8) | (encodedEntry[pos] & 0xFF);
}
@@ -634,11 +634,38 @@
byte[] valueBytes = new byte[valueLength];
System.arraycopy(encodedEntry, pos, valueBytes, 0, valueLength);
- pos += valueLength;
- values.add(new AttributeValue(attrType, new ASN1OctetString(valueBytes)));
- }
- return new Attribute(attrType, attrType.getPrimaryName(), options, values);
+ return Attributes.create(attrType, new AttributeValue(attrType,
+ new ASN1OctetString(valueBytes)));
+ }
+ else
+ {
+ // Read the appropriate number of values.
+ AttributeBuilder builder = new AttributeBuilder(attrType);
+ builder.setOptions(options);
+ builder.setInitialCapacity(numValues);
+ for (int i = 0; i < numValues; i++)
+ {
+ int valueLength = encodedEntry[pos] & 0x7F;
+ if (valueLength != encodedEntry[pos++])
+ {
+ int valueLengthBytes = valueLength;
+ valueLength = 0;
+ for (int j = 0; j < valueLengthBytes; j++, pos++)
+ {
+ valueLength = (valueLength << 8) | (encodedEntry[pos] & 0xFF);
+ }
+ }
+
+ byte[] valueBytes = new byte[valueLength];
+ System.arraycopy(encodedEntry, pos, valueBytes, 0, valueLength);
+ pos += valueLength;
+ builder.add(new AttributeValue(attrType,
+ new ASN1OctetString(valueBytes)));
+ }
+
+ return builder.toAttribute();
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperationBasis.java b/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperationBasis.java
index 07e2761..3d33ca6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperationBasis.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperationBasis.java
@@ -48,6 +48,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.opends.server.protocols.asn1.ASN1OctetString;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
index 2db04b8..69d8cd3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -81,6 +81,8 @@
import org.opends.server.config.JMXMBean;
import org.opends.server.controls.PasswordPolicyErrorType;
import org.opends.server.controls.PasswordPolicyResponseControl;
+import org.opends.server.core.networkgroups.NetworkGroup;
+import org.opends.server.core.networkgroups.NetworkGroupConfigManager;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.extensions.JMXAlertHandler;
import static org.opends.server.loggers.AccessLogger.*;
@@ -189,6 +191,7 @@
import org.opends.server.protocols.internal.InternalConnectionHandler;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.crypto.CryptoManagerSync;
+import org.opends.server.servicetag.ServiceTagRegistration;
import static org.opends.messages.ConfigMessages.*;
import javax.management.MBeanServer;
@@ -470,7 +473,7 @@
private ConcurrentHashMap<String,SASLMechanismHandler> saslMechanismHandlers;
// The connection handler configuration manager for the Directory Server.
- private ConnectionHandlerConfigManager connectionHandlerConfigManager;
+ private ConnectionHandlerConfigManager connectionHandlerConfigManager = null;
// The set of alert handlers registered with the Directory Server.
private CopyOnWriteArrayList<AlertHandler> alertHandlers;
@@ -738,6 +741,10 @@
// mode is 'manual'.
private WorkflowElementConfigManager workflowElementConfigManager;
+ // The ServiceTag Registration service for the Directory Server.
+ // The Registration is used to create and register a ServiceTag
+ // if it does not exist in the common servicetag registry.
+ private ServiceTagRegistration serviceTagRegistry;
/**
@@ -1288,6 +1295,11 @@
}
+ // Mark the current time as the start time.
+ startUpTime = System.currentTimeMillis();
+ startTimeUTC = TimeThread.getGMTTime();
+
+
// Determine whether or not we should start the connection handlers.
boolean startConnectionHandlers =
(! environmentConfig.disableConnectionHandlers());
@@ -1329,8 +1341,13 @@
entryCacheConfigManager = new EntryCacheConfigManager();
entryCacheConfigManager.initializeDefaultEntryCache();
+ // Initialize the administration connector.
+ if (startConnectionHandlers)
+ {
+ initializeAdministrationConnector();
+ }
- // Initialize the key manager provider.
+ // Initialize the key manager provider.
keyManagerProviderConfigManager = new KeyManagerProviderConfigManager();
keyManagerProviderConfigManager.initializeKeyManagerProviders();
@@ -1407,7 +1424,8 @@
initializeVirtualAttributes();
- // Initialize all the connection handlers.
+ // Initialize all the connection handlers
+ // (including the administration connector).
if (startConnectionHandlers)
{
initializeConnectionHandlers();
@@ -1449,6 +1467,7 @@
}
+ // Start administration connector and connection handlers
if (startConnectionHandlers)
{
startConnectionHandlers();
@@ -1467,11 +1486,8 @@
}
- // Mark the current time as the start time and indicate that the server is
- // now running.
- startUpTime = System.currentTimeMillis();
- startTimeUTC = TimeThread.getGMTTime();
- isRunning = true;
+ // Indicate that the server is now running.
+ isRunning = true;
Message message = NOTE_DIRECTORY_SERVER_STARTED.get();
logError(message);
@@ -2562,7 +2578,7 @@
* the backends that is not related to the
* server configuration.
*/
- private void initializeBackends()
+ public void initializeBackends()
throws ConfigException, InitializationException
{
backendConfigManager = new BackendConfigManager();
@@ -2809,7 +2825,7 @@
* attempting to initialize and start the
* Directory Server.
*/
- private void configureWorkflowsManual()
+ public void configureWorkflowsManual()
throws ConfigException, InitializationException
{
// First of all re-initialize the current workflow configuration
@@ -2817,6 +2833,10 @@
WorkflowImpl.resetConfig();
directoryServer.workflowElements.clear();
+ // We now need to complete the workflow creation for the
+ // config backend and rootDSE backend.
+ createAndRegisterRemainingWorkflows();
+
// Then configure the workflows
workflowElementConfigManager = new WorkflowElementConfigManager();
workflowElementConfigManager.initializeWorkflowElements();
@@ -2826,10 +2846,6 @@
networkGroupConfigManager = new NetworkGroupConfigManager();
networkGroupConfigManager.initializeNetworkGroups();
-
- // We now need to complete the workflow creation for the
- // config backend and rootDSE backend.
- createAndRegisterRemainingWorkflows();
}
@@ -2849,10 +2865,10 @@
// For each base DN in a backend create a workflow and register
// the workflow with the default network group
- Map<String, Backend> backends = getBackends();
- for (String backendID: backends.keySet())
+ Map<String, Backend> backendMap = getBackends();
+ for (String backendID: backendMap.keySet())
{
- Backend backend = backends.get(backendID);
+ Backend backend = backendMap.get(backendID);
for (DN baseDN: backend.getBaseDNs())
{
WorkflowImpl workflowImpl;
@@ -3053,13 +3069,36 @@
private void initializeConnectionHandlers()
throws ConfigException, InitializationException
{
- connectionHandlerConfigManager = new ConnectionHandlerConfigManager();
+ if (connectionHandlerConfigManager == null) {
+ connectionHandlerConfigManager = new ConnectionHandlerConfigManager();
+ }
connectionHandlerConfigManager.initializeConnectionHandlerConfig();
}
/**
+ * Initializes the administration connector for the Directory Server.
+ *
+ * @throws ConfigException If a configuration problem is identified while
+ * initializing the administration connector.
+ *
+ * @throws InitializationException If a problem occurs while initializing
+ * the administration connector that is not
+ * related to the server configuration.
+ */
+ public void initializeAdministrationConnector()
+ throws ConfigException, InitializationException
+ {
+ if (connectionHandlerConfigManager == null) {
+ connectionHandlerConfigManager = new ConnectionHandlerConfigManager();
+ }
+ connectionHandlerConfigManager.initializeAdministrationConnectorConfig();
+ }
+
+
+
+ /**
* Initializes the set of password policy components for use by the Directory
* Server.
*
@@ -8904,7 +8943,13 @@
throws IOException
{
outputStream.write(getBytes(PRINTABLE_VERSION_STRING));
- return;
+
+ // Print extensions' extra information
+ String extensionInformation =
+ ClassLoaderProvider.getInstance().printExtensionInformation();
+ if ( extensionInformation != null ) {
+ outputStream.write(extensionInformation.getBytes());
+ }
}
@@ -9668,6 +9713,19 @@
System.exit(1);
}
+ try {
+ directoryServer.serviceTagRegistry =
+ ServiceTagRegistration.getRegistrationService();
+ directoryServer.serviceTagRegistry.registerServiceTags("Server");
+ }
+ catch(Exception ex) {
+ // ServiceTags Registration errors do not prevent the server to
+ // start. WARNING logged in debug mode
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.WARNING, ex);
+ }
+ }
+
try
{
directoryServer.startServer();
@@ -9689,8 +9747,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ce);
}
- Message message = ERR_DSCORE_CANNOT_START.get(ce.getMessage()
- + " " + ce.getCause().getLocalizedMessage());
+ Message message = ERR_DSCORE_CANNOT_START.get(ce.getMessage() +
+ (ce.getCause() != null ? " " + ce.getCause().getLocalizedMessage() : ""));
shutDown(directoryServer.getClass().getName(), message);
}
catch (Exception e)
@@ -10093,6 +10151,13 @@
System.out.println(SetupUtils.INCOMPATIBILITY_EVENTS+separator+
StaticUtils.listToString(
VersionCompatibilityIssue.getAllEvents(), ","));
+
+ // Print extensions' extra information
+ String extensionInformation =
+ ClassLoaderProvider.getInstance().printExtensionInformation();
+ if ( extensionInformation != null ) {
+ System.out.print(extensionInformation);
+ }
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperationBasis.java b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperationBasis.java
index 306e8f6..ef02509 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperationBasis.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperationBasis.java
@@ -33,6 +33,7 @@
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.protocols.asn1.ASN1OctetString;
import org.opends.server.types.operation.PostResponseModifyDNOperation;
import org.opends.server.types.operation.PreParseModifyDNOperation;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperationBasis.java b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperationBasis.java
index 752a3b5..8ab08ce 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperationBasis.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperationBasis.java
@@ -49,6 +49,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.opends.server.protocols.asn1.ASN1OctetString;
@@ -58,7 +59,7 @@
import org.opends.server.types.operation.PostResponseModifyOperation;
import org.opends.server.types.operation.PreParseModifyOperation;
import org.opends.server.workflowelement.localbackend.*;
-
+import org.opends.server.protocols.ldap.LDAPResultCode;
/**
@@ -247,7 +248,33 @@
try {
for (RawModification m : rawModifications)
{
- modifications.add(m.toModification());
+ Modification mod = m.toModification();
+ Attribute attr = mod.getAttribute();
+ AttributeType type = attr.getAttributeType();
+
+ if(type.isBinary())
+ {
+ if(!attr.hasOption("binary"))
+ {
+ //A binary option wasn't provided by the client so add it.
+ AttributeBuilder builder = new AttributeBuilder(attr);
+ builder.setOption("binary");
+ attr = builder.toAttribute();
+ }
+ }
+ else
+ {
+ // binary option is not honored for non-BER-encodable attributes.
+ if(attr.hasOption("binary"))
+ {
+ throw new LDAPException(LDAPResultCode.UNDEFINED_ATTRIBUTE_TYPE,
+ ERR_ADD_ATTR_IS_INVALID_OPTION.get(
+ String.valueOf(entryDN),
+ attr.getName()));
+ }
+ }
+
+ modifications.add(mod);
}
}
catch (LDAPException le)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroup.java b/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroup.java
deleted file mode 100644
index 8494441..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroup.java
+++ /dev/null
@@ -1,631 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2007-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.core;
-import org.opends.messages.Message;
-import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.util.Validator.ensureNotNull;
-
-import java.util.TreeMap;
-import java.util.Collection;
-
-import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
-import org.opends.server.workflowelement.WorkflowElement;
-
-
-/**
- * This class defines the network group. A network group is used to categorize
- * client connections. A network group is defined by a set of criteria, a
- * set of policies and a set of workflow nodes. A client connection belongs to
- * a network group whenever it satisfies all the network group criteria. As
- * soon as a client connection belongs to a network group, it has to comply
- * with all the network group policies. Any cleared client operation can be
- * routed to one the network group workflow nodes.
- */
-public class NetworkGroup
-{
- // Workflow nodes registered with the current network group.
- // Keys are workflowIDs.
- private TreeMap<String, WorkflowTopologyNode> registeredWorkflowNodes =
- new TreeMap<String, WorkflowTopologyNode>();
-
-
- // A lock to protect concurrent access to the registered Workflow nodes.
- private Object registeredWorkflowNodesLock = new Object();
-
-
- // The workflow node for the rootDSE entry. The RootDSE workflow node
- // is not stored in the list of registered workflow nodes.
- private RootDseWorkflowTopology rootDSEWorkflowNode = null;
-
-
- // List of naming contexts handled by the network group.
- private NetworkGroupNamingContexts namingContexts =
- new NetworkGroupNamingContexts();
-
-
- // The default network group (singleton).
- // The default network group has no criterion, no policy, and gives
- // access to all the workflows. The purpose of the default network
- // group is to allow new clients to perform a first operation before
- // they can be attached to a specific network group.
- private static NetworkGroup defaultNetworkGroup =
- new NetworkGroup ("default");
-
-
- // The list of all network groups that are registered with the server.
- // The defaultNetworkGroup is not in the list of registered network groups.
- private static TreeMap<String, NetworkGroup> registeredNetworkGroups =
- new TreeMap<String, NetworkGroup>();
-
-
- // A lock to protect concurrent access to the registeredNetworkGroups.
- private static Object registeredNetworkGroupsLock = new Object();
-
-
- // The network group internal identifier.
- private String networkGroupID = null;
-
-
-
- /**
- * Creates a new instance of the network group.
- *
- * @param networkGroupID the network group internal identifier
- */
- public NetworkGroup(
- String networkGroupID
- )
- {
- this.networkGroupID = networkGroupID;
- }
-
-
- /**
- * Performs any finalization that might be required when this
- * network group is unloaded. No action is taken in the
- * default implementation.
- */
- public void finalizeNetworkGroup()
- {
- // No action is required by default.
- }
-
-
- /**
- * Registers the current network group (this) with the server.
- *
- * @throws DirectoryException If the network group ID for the provided
- * network group conflicts with the network
- * group ID of an existing network group.
- */
- public void register()
- throws DirectoryException
- {
- ensureNotNull(networkGroupID);
-
- synchronized (registeredNetworkGroupsLock)
- {
- // The network group must not be already registered
- if (registeredNetworkGroups.containsKey(networkGroupID))
- {
- Message message = ERR_REGISTER_NETWORK_GROUP_ALREADY_EXISTS.get(
- networkGroupID);
- throw new DirectoryException(
- ResultCode.UNWILLING_TO_PERFORM, message);
- }
-
- TreeMap<String, NetworkGroup> newRegisteredNetworkGroups =
- new TreeMap<String, NetworkGroup>(registeredNetworkGroups);
- newRegisteredNetworkGroups.put(networkGroupID, this);
- registeredNetworkGroups = newRegisteredNetworkGroups;
- }
- }
-
-
- /**
- * Deregisters the current network group (this) with the server.
- */
- public void deregister()
- {
- synchronized (registeredNetworkGroupsLock)
- {
- TreeMap<String, NetworkGroup> networkGroups =
- new TreeMap<String, NetworkGroup>(registeredNetworkGroups);
- networkGroups.remove(networkGroupID);
- registeredNetworkGroups = networkGroups;
- }
- }
-
-
- /**
- * Registers a workflow with the network group.
- *
- * @param workflow the workflow to register
- *
- * @throws DirectoryException If the workflow ID for the provided
- * workflow conflicts with the workflow
- * ID of an existing workflow.
- */
- public void registerWorkflow(
- WorkflowImpl workflow
- ) throws DirectoryException
- {
- // The workflow is rgistered with no pre/post workflow element.
- registerWorkflow(workflow, null, null);
- }
-
-
- /**
- * Registers a workflow with the network group and the workflow may have
- * pre and post workflow element.
- *
- * @param workflow the workflow to register
- * @param preWorkflowElements the tasks to execute before the workflow
- * @param postWorkflowElements the tasks to execute after the workflow
- *
- * @throws DirectoryException If the workflow ID for the provided
- * workflow conflicts with the workflow
- * ID of an existing workflow.
- */
- private void registerWorkflow(
- WorkflowImpl workflow,
- WorkflowElement[] preWorkflowElements,
- WorkflowElement[] postWorkflowElements
- ) throws DirectoryException
- {
- // Is it the rootDSE workflow?
- DN baseDN = workflow.getBaseDN();
- if (baseDN.isNullDN())
- {
- // NOTE - The rootDSE workflow is stored with the registeredWorkflows.
- rootDSEWorkflowNode =
- new RootDseWorkflowTopology(workflow, namingContexts);
- }
- else
- {
- // This workflow is not the rootDSE workflow. Try to insert it in the
- // workflow topology.
- WorkflowTopologyNode workflowNode = new WorkflowTopologyNode(
- workflow, preWorkflowElements, postWorkflowElements);
-
- // Register the workflow node with the network group. If the workflow
- // ID is already existing then an exception is raised.
- registerWorkflowNode(workflowNode);
-
- // Now add the workflow in the workflow topology...
- for (WorkflowTopologyNode curNode: registeredWorkflowNodes.values())
- {
- // Try to insert the new workflow under an existing workflow...
- if (curNode.insertSubordinate(workflowNode))
- {
- // new workflow has been inserted in the topology
- continue;
- }
-
- // ... or try to insert the existing workflow below the new
- // workflow
- if (workflowNode.insertSubordinate(curNode))
- {
- // new workflow has been inserted in the topology
- continue;
- }
- }
-
- // Rebuild the list of naming context handled by the network group
- rebuildNamingContextList();
- }
- }
-
-
- /**
- * Deregisters a workflow with the network group. The workflow to
- * deregister is identified by its baseDN.
- *
- * @param baseDN the baseDN of the workflow to deregister, may be null
- *
- * @return the deregistered workflow
- */
- public Workflow deregisterWorkflow(
- DN baseDN
- )
- {
- Workflow workflow = null;
-
- if (baseDN == null)
- {
- return workflow;
- }
-
- if (baseDN.isNullDN())
- {
- // deregister the rootDSE
- deregisterWorkflow(rootDSEWorkflowNode);
- workflow = rootDSEWorkflowNode.getWorkflowImpl();
- }
- else
- {
- // deregister a workflow node
- synchronized (registeredWorkflowNodesLock)
- {
- for (WorkflowTopologyNode node: registeredWorkflowNodes.values())
- {
- DN curDN = node.getBaseDN();
- if (curDN.equals(baseDN))
- {
- // Call deregisterWorkflow() instead of deregisterWorkflowNode()
- // because we want the naming context list to be updated as well.
- deregisterWorkflow(node);
- workflow = node.getWorkflowImpl();
-
- // Only one workflow can match the baseDN, so we can break
- // the loop here.
- break;
- }
- }
- }
- }
-
- return workflow;
- }
-
-
- /**
- * Deregisters a workflow with the network group. The workflow to
- * deregister is identified by its workflow ID.
- *
- * @param workflowID the workflow identifier of the workflow to deregister
- */
- public void deregisterWorkflow(
- String workflowID
- )
- {
- String rootDSEWorkflowID = null;
- if (rootDSEWorkflowNode != null)
- {
- rootDSEWorkflowID = rootDSEWorkflowNode.getWorkflowImpl().getWorkflowId();
- }
-
- if (workflowID.equalsIgnoreCase(rootDSEWorkflowID))
- {
- // deregister the rootDSE
- deregisterWorkflow(rootDSEWorkflowNode);
- }
- else
- {
- // deregister a workflow node
- synchronized (registeredWorkflowNodesLock)
- {
- for (WorkflowTopologyNode node: registeredWorkflowNodes.values())
- {
- String curID = node.getWorkflowImpl().getWorkflowId();
- if (curID.equals(workflowID))
- {
- // Call deregisterWorkflow() instead of deregisterWorkflowNode()
- // because we want the naming context list to be updated as well.
- deregisterWorkflow(node);
-
- // Only one workflow can match the baseDN, so we can break
- // the loop here.
- break;
- }
- }
- }
- }
- }
-
-
- /**
- * Deregisters a workflow node with the network group.
- *
- * @param workflow the workflow node to deregister
- */
- private void deregisterWorkflow(Workflow workflow)
- {
- // true as soon as the workflow has been deregistered
- boolean deregistered = false;
-
- // Is it the rootDSE workflow?
- if (workflow == rootDSEWorkflowNode)
- {
- rootDSEWorkflowNode = null;
- deregistered = true;
- }
- else
- {
- // Deregister the workflow with the network group.
- WorkflowTopologyNode workflowNode = (WorkflowTopologyNode) workflow;
- deregisterWorkflowNode(workflowNode);
- deregistered = true;
-
- // The workflow to deregister is not the root DSE workflow.
- // Remove it from the workflow topology.
- workflowNode.remove();
-
- // Rebuild the list of naming context handled by the network group
- rebuildNamingContextList();
- }
-
- // If the workflow has been deregistered then deregister it with
- // the default network group as well
- if (deregistered && (this != defaultNetworkGroup))
- {
- defaultNetworkGroup.deregisterWorkflow(workflow);
- }
- }
-
-
- /**
- * Registers a workflow node with the network group.
- *
- * @param workflowNode the workflow node to register
- *
- * @throws DirectoryException If the workflow node ID for the provided
- * workflow node conflicts with the workflow
- * node ID of an existing workflow node.
- */
- private void registerWorkflowNode(
- WorkflowTopologyNode workflowNode
- ) throws DirectoryException
- {
- String workflowID = workflowNode.getWorkflowImpl().getWorkflowId();
- ensureNotNull(workflowID);
-
- synchronized (registeredWorkflowNodesLock)
- {
- // The workflow must not be already registered
- if (registeredWorkflowNodes.containsKey(workflowID))
- {
- Message message = ERR_REGISTER_WORKFLOW_NODE_ALREADY_EXISTS.get(
- workflowID, networkGroupID);
- throw new DirectoryException(
- ResultCode.UNWILLING_TO_PERFORM, message);
- }
-
- TreeMap<String, WorkflowTopologyNode> newRegisteredWorkflowNodes =
- new TreeMap<String, WorkflowTopologyNode>(registeredWorkflowNodes);
- newRegisteredWorkflowNodes.put(workflowID, workflowNode);
- registeredWorkflowNodes = newRegisteredWorkflowNodes;
- }
- }
-
-
- /**
- * Deregisters the current worklow (this) with the server.
- *
- * @param workflowNode the workflow node to deregister
- */
- private void deregisterWorkflowNode(
- WorkflowTopologyNode workflowNode
- )
- {
- synchronized (registeredWorkflowNodesLock)
- {
- TreeMap<String, WorkflowTopologyNode> newWorkflowNodes =
- new TreeMap<String, WorkflowTopologyNode>(registeredWorkflowNodes);
- newWorkflowNodes.remove(workflowNode.getWorkflowImpl().getWorkflowId());
- registeredWorkflowNodes = newWorkflowNodes;
- }
- }
-
-
- /**
- * Gets the highest workflow in the topology that can handle the baseDN.
- *
- * @param baseDN the base DN of the request
- * @return the highest workflow in the topology that can handle the base DN,
- * <code>null</code> if none was found
- */
- public Workflow getWorkflowCandidate(
- DN baseDN
- )
- {
- // the top workflow to return
- Workflow workflowCandidate = null;
-
- // get the list of workflow candidates
- if (baseDN.isNullDN())
- {
- // The rootDSE workflow is the candidate.
- workflowCandidate = rootDSEWorkflowNode;
- }
- else
- {
- // Search the highest workflow in the topology that can handle
- // the baseDN.
- for (WorkflowTopologyNode curWorkflow: namingContexts.getNamingContexts())
- {
- workflowCandidate = curWorkflow.getWorkflowCandidate (baseDN);
- if (workflowCandidate != null)
- {
- break;
- }
- }
- }
-
- return workflowCandidate;
- }
-
-
- /**
- * Returns the default network group. The default network group is always
- * defined and has no criterion, no policy and provide full access to
- * all the registered workflows.
- *
- * @return the default network group
- */
- public static NetworkGroup getDefaultNetworkGroup()
- {
- return defaultNetworkGroup;
- }
-
-
- /**
- * Rebuilds the list of naming contexts handled by the network group.
- * This operation should be performed whenever a workflow topology
- * has been updated (workflow registration or de-registration).
- */
- private void rebuildNamingContextList()
- {
- // reset lists of naming contexts
- namingContexts.resetLists();
-
- // a registered workflow with no parent is a naming context
- for (WorkflowTopologyNode workflowNode: registeredWorkflowNodes.values())
- {
- WorkflowTopologyNode parent = workflowNode.getParent();
- if (parent == null)
- {
- namingContexts.addNamingContext (workflowNode);
- }
- }
- }
-
-
- /**
- * Returns the list of naming contexts handled by the network group.
- *
- * @return the list of naming contexts
- */
- public NetworkGroupNamingContexts getNamingContexts()
- {
- return namingContexts;
- }
-
-
- /**
- * Dumps info from the current network group for debug purpose.
- *
- * @param leftMargin white spaces used to indent traces
- * @return a string buffer that contains trace information
- */
- public StringBuilder toString(String leftMargin)
- {
- StringBuilder sb = new StringBuilder();
- String newMargin = leftMargin + " ";
-
- sb.append (leftMargin + "Networkgroup (" + networkGroupID+ "\n");
- sb.append (leftMargin + "List of registered workflows:\n");
- for (WorkflowTopologyNode node: registeredWorkflowNodes.values())
- {
- sb.append (node.toString (newMargin));
- }
-
- namingContexts.toString (leftMargin);
-
- sb.append (leftMargin + "rootDSEWorkflow:\n");
- if (rootDSEWorkflowNode == null)
- {
- sb.append (newMargin + "null\n");
- }
- else
- {
- sb.append (rootDSEWorkflowNode.toString (newMargin));
- }
-
- return sb;
- }
-
-
- /**
- * Deregisters all network groups that have been registered. This should be
- * called when the server is shutting down.
- */
- public static void deregisterAllOnShutdown()
- {
- synchronized (registeredNetworkGroupsLock)
- {
- // Invalidate all NetworkGroups so they cannot accidentally be used
- // after a restart.
- Collection<NetworkGroup> networkGroups = registeredNetworkGroups.values();
- for (NetworkGroup networkGroup: networkGroups)
- {
- networkGroup.invalidate();
- }
- defaultNetworkGroup.invalidate();
-
- registeredNetworkGroups = new TreeMap<String,NetworkGroup>();
- defaultNetworkGroup = new NetworkGroup ("default");
- }
- }
-
- /**
- * We've seen parts of the server hold references to a NetworkGroup
- * during an in-core server restart. To help detect when this happens,
- * we null out the member variables, so we will fail fast with an NPE if an
- * invalidate NetworkGroup is used.
- */
- private void invalidate()
- {
- namingContexts = null;
- networkGroupID = null;
- rootDSEWorkflowNode = null;
- registeredWorkflowNodes = null;
- }
-
-
- /**
- * Provides the list of network group registered with the server.
- *
- * @return the list of registered network groups
- */
- public static Collection<NetworkGroup> getRegisteredNetworkGroups()
- {
- return registeredNetworkGroups.values();
- }
-
-
- /**
- * Resets the configuration of all the registered network groups.
- */
- public static void resetConfig()
- {
- // Reset the default network group
- defaultNetworkGroup.reset();
-
- // Reset all the registered network group
- synchronized (registeredNetworkGroupsLock)
- {
- registeredNetworkGroups = new TreeMap<String, NetworkGroup>();
- }
- }
-
-
- /**
- * Resets the configuration of the current network group.
- */
- public void reset()
- {
- synchronized (registeredWorkflowNodesLock)
- {
- registeredWorkflowNodes = new TreeMap<String, WorkflowTopologyNode>();
- rootDSEWorkflowNode = null;
- namingContexts = new NetworkGroupNamingContexts();
- }
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupConfigManager.java
deleted file mode 100644
index 5ca60ef..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupConfigManager.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.server.core;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.opends.messages.Message;
-import org.opends.server.admin.server.ConfigurationAddListener;
-import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.NetworkGroupCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.config.ConfigException;
-import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
-
-
-/**
- * This class defines a utility that will be used to manage the configuration
- * for the set of network groups defined in the Directory Server.
- * It will perform the necessary initialization of those network groups when
- * the server is first started, and then will manage any changes to them while
- * the server is running.
- */
-public class NetworkGroupConfigManager
- implements ConfigurationChangeListener<NetworkGroupCfg>,
- ConfigurationAddListener<NetworkGroupCfg>,
- ConfigurationDeleteListener<NetworkGroupCfg>
-
-{
- // A mapping between the DNs of the config entries and the associated
- // network groups.
- private ConcurrentHashMap<DN, NetworkGroup> networkGroups;
-
-
-
- /**
- * Creates a new instance of this network group config manager.
- */
- public NetworkGroupConfigManager()
- {
- networkGroups = new ConcurrentHashMap<DN, NetworkGroup>();
- }
-
-
-
- /**
- * Initializes all network groups currently defined in the Directory
- * Server configuration. This should only be called at Directory Server
- * startup.
- *
- * @throws ConfigException If a configuration problem causes the network
- * group initialization process to fail.
- */
- public void initializeNetworkGroups()
- throws ConfigException
- {
- // Get the root configuration object.
- ServerManagementContext managementContext =
- ServerManagementContext.getInstance();
- RootCfg rootConfiguration =
- managementContext.getRootConfiguration();
-
-
- // Register as an add and delete listener with the root configuration so we
- // can be notified if any network group entries are added or removed.
- rootConfiguration.addNetworkGroupAddListener(this);
- rootConfiguration.addNetworkGroupDeleteListener(this);
-
-
- //Initialize the existing network groups.
- for (String networkGroupName : rootConfiguration.listNetworkGroups())
- {
- NetworkGroupCfg networkGroupConfiguration =
- rootConfiguration.getNetworkGroup(networkGroupName);
- networkGroupConfiguration.addChangeListener(this);
-
- if (networkGroupConfiguration.isEnabled())
- {
- try
- {
- createAndRegisterNetworkGroup(networkGroupConfiguration);
- }
- catch (DirectoryException de)
- {
- throw new ConfigException(de.getMessageObject());
- }
- }
- }
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isConfigurationAddAcceptable(
- NetworkGroupCfg configuration,
- List<Message> unacceptableReasons)
- {
- // Nothing to check.
- return true;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public ConfigChangeResult applyConfigurationAdd(
- NetworkGroupCfg configuration)
- {
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
-
- configuration.addChangeListener(this);
-
- // If the new network group is enabled then create it and register it.
- if (configuration.isEnabled())
- {
- try
- {
- createAndRegisterNetworkGroup(configuration);
- }
- catch (DirectoryException de)
- {
- if (resultCode == ResultCode.SUCCESS)
- {
- resultCode = DirectoryServer.getServerErrorResultCode();
- }
-
- messages.add(de.getMessageObject());
- }
-
- }
-
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isConfigurationDeleteAcceptable(
- NetworkGroupCfg configuration,
- List<Message> unacceptableReasons)
- {
- return true;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public ConfigChangeResult applyConfigurationDelete(
- NetworkGroupCfg configuration)
- {
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
-
-
- NetworkGroup networkGroup = networkGroups.remove(configuration.dn());
- if (networkGroup != null)
- {
- networkGroup.deregister();
- networkGroup.finalizeNetworkGroup();
- }
-
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isConfigurationChangeAcceptable(
- NetworkGroupCfg configuration,
- List<Message> unacceptableReasons)
- {
- // Nothing to check.
- return true;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public ConfigChangeResult applyConfigurationChange(
- NetworkGroupCfg configuration)
- {
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
-
- ConfigChangeResult configChangeResult =
- new ConfigChangeResult(resultCode, adminActionRequired, messages);
-
-
- // Get the existing network group if it's already enabled.
- NetworkGroup existingNetworkGroup = networkGroups.get(configuration.dn());
-
- // If the new configuration has the network group disabled, then disable
- // it if it is enabled, or do nothing if it's already disabled.
- if (! configuration.isEnabled())
- {
- if (existingNetworkGroup != null)
- {
- networkGroups.remove(configuration.dn());
- existingNetworkGroup.deregister();
- existingNetworkGroup.finalizeNetworkGroup();
- }
-
- return configChangeResult;
- }
-
- // If the network group is disabled then create it and register it.
- if (existingNetworkGroup == null)
- {
- try
- {
- createAndRegisterNetworkGroup(configuration);
- }
- catch (DirectoryException de)
- {
- if (resultCode == ResultCode.SUCCESS)
- {
- resultCode = DirectoryServer.getServerErrorResultCode();
- }
-
- messages.add(de.getMessageObject());
- }
- }
-
- return configChangeResult;
- }
-
-
- /**
- * Creates and registers a network group.
- *
- * @param networkGroupCfg the network group configuration
- *
- * @throws DirectoryException If a problem occurs while trying to
- * register a network group.
- */
- private void createAndRegisterNetworkGroup(
- NetworkGroupCfg networkGroupCfg
- ) throws DirectoryException
- {
- // create the network group
- String networkGroupId = networkGroupCfg.getNetworkGroupId();
- NetworkGroup networkGroup = new NetworkGroup(networkGroupId);
-
- // register the workflows with the network group
- for (String workflowID: networkGroupCfg.getWorkflow())
- {
- WorkflowImpl workflowImpl =
- (WorkflowImpl) WorkflowImpl.getWorkflow(workflowID);
- networkGroup.registerWorkflow(workflowImpl);
- }
-
- // finally register the network group with the server
- networkGroups.put(networkGroupCfg.dn(), networkGroup);
- networkGroup.register();
- }
-
-}
-
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupCriteria.java
deleted file mode 100644
index 301ba1b..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupCriteria.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.server.core;
-
-
-/**
- * This class defines the network group criteria. A criterion is used
- * by the network groups to determine whether a client connection belongs
- * to the network group or not.
- */
-public class NetworkGroupCriteria
-{
-
- /**
- * Creates a new instance of the network group criteria.
- */
- public NetworkGroupCriteria()
- {
- // No implementation is required.
- }
-
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupNamingContexts.java b/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupNamingContexts.java
deleted file mode 100644
index 957994f..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupNamingContexts.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.server.core;
-
-
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-
-/**
- * This classes defines a list of naming contexts for a network group.
- */
-public class NetworkGroupNamingContexts
-{
- // List of naming contexts.
- private List<WorkflowTopologyNode> namingContexts;
- // If list of naming contexts is returned, ensure it is immutable
- private List<WorkflowTopologyNode> _namingContexts;
-
- // List of public naming contexts.
- private List<WorkflowTopologyNode> publicNamingContexts;
- // If list of public naming contexts is returned, ensure it is immutable
- private List<WorkflowTopologyNode> _publicNamingContexts;
-
- // List of private naming contexts.
- private List<WorkflowTopologyNode> privateNamingContexts;
- // If list of private naming contexts is returned, ensure it is immutable
- private List<WorkflowTopologyNode> _privateNamingContexts;
-
- /**
- * Create a list of naming contexts for a network group.
- */
- public NetworkGroupNamingContexts()
- {
- namingContexts = new CopyOnWriteArrayList<WorkflowTopologyNode>();
- _namingContexts = Collections.unmodifiableList(namingContexts);
-
- privateNamingContexts = new CopyOnWriteArrayList<WorkflowTopologyNode>();
- _privateNamingContexts =
- Collections.unmodifiableList(privateNamingContexts);
-
- publicNamingContexts = new CopyOnWriteArrayList<WorkflowTopologyNode>();
- _publicNamingContexts = Collections.unmodifiableList(publicNamingContexts);
- }
-
-
- /**
- * Reset the list of naming contexts.
- */
- public void resetLists()
- {
- namingContexts.clear();
- privateNamingContexts.clear();
- publicNamingContexts.clear();
- }
-
-
- /**
- * Add a workflow in the list of naming context.
- *
- * @param workflow the workflow to add in the list of naming contexts
- */
- public void addNamingContext (
- WorkflowTopologyNode workflow
- )
- {
- // add the workflow to the list of naming context
- namingContexts.add (workflow);
-
- // add the workflow to the private/public list of naming contexts
- if (workflow.isPrivate())
- {
- privateNamingContexts.add (workflow);
- }
- else
- {
- publicNamingContexts.add (workflow);
- }
- }
-
-
- /**
- * Get the list of naming contexts.
- *
- * <br>Note: the returned iterable instance is immutable and attempts to
- * remove elements will throw an UnsupportedOperationException exception.
- *
- * @return the list of all the naming contexts
- */
- public Iterable<WorkflowTopologyNode> getNamingContexts()
- {
- return _namingContexts;
- }
-
-
- /**
- * Get the list of private naming contexts.
- *
- * <br>Note: the returned iterable instance is immutable and attempts to
- * remove elements will throw an UnsupportedOperationException exception.
- *
- * @return the list of private naming contexts
- */
- public Iterable<WorkflowTopologyNode> getPrivateNamingContexts()
- {
- return _privateNamingContexts;
- }
-
-
- /**
- * Get the list of public naming contexts.
- *
- * <br>Note: the returned iterable instance is immutable and attempts to
- * remove elements will throw an UnsupportedOperationException exception.
- *
- * @return the list of public naming contexts
- */
- public Iterable<WorkflowTopologyNode> getPublicNamingContexts()
- {
- return _publicNamingContexts;
- }
-
-
- /**
- * Dumps info from the current networkk group for debug purpose.
- *
- * @param leftMargin white spaces used to indent traces
- * @return a string buffer that contains trace information
- */
- public StringBuilder toString (String leftMargin)
- {
- StringBuilder sb = new StringBuilder();
- String newMargin = leftMargin + " ";
-
- sb.append (leftMargin + "List of naming contexts:\n");
- for (WorkflowTopologyNode w: namingContexts)
- {
- sb.append (w.toString (newMargin));
- }
-
- sb.append (leftMargin + "List of PRIVATE naming contexts:\n");
- for (WorkflowTopologyNode w: privateNamingContexts)
- {
- sb.append (w.toString (newMargin));
- }
-
- sb.append (leftMargin + "List of PUBLIC naming contexts:\n");
- for (WorkflowTopologyNode w: publicNamingContexts)
- {
- sb.append (w.toString (newMargin));
- }
-
- return sb;
- }
-
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupPolicy.java
deleted file mode 100644
index 5dc69c1..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/core/NetworkGroupPolicy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.server.core;
-
-
-/**
- * This class defines the network group policy. A client connection
- * that belongs to a network group has to comply with the policies
- * attach to the network group.
- */
-public class NetworkGroupPolicy
-{
-
- /**
- * Creates a new instance of the network group policy.
- */
- public NetworkGroupPolicy()
- {
- // No implementation is required.
- }
-
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
index fcd2365..86b48ef 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
@@ -142,7 +142,7 @@
DEFAULT_PWPOLICY_SKIP_ADMIN_VALIDATION;
// The set of account status notification handlers for this password policy.
- private ConcurrentHashMap<DN, AccountStatusNotificationHandler>
+ private ConcurrentHashMap<DN, AccountStatusNotificationHandler<?>>
notificationHandlers;
// The set of password validators that will be used with this
@@ -151,10 +151,10 @@
// The set of default password storage schemes for this password
// policy.
- private CopyOnWriteArrayList<PasswordStorageScheme> defaultStorageSchemes =
- new CopyOnWriteArrayList<PasswordStorageScheme>();
+ private CopyOnWriteArrayList<PasswordStorageScheme<?>> defaultStorageSchemes =
+ new CopyOnWriteArrayList<PasswordStorageScheme<?>>();
{
- PasswordStorageScheme defaultScheme =
+ PasswordStorageScheme<?> defaultScheme =
DirectoryServer.getPasswordStorageScheme(DEFAULT_PASSWORD_STORAGE_SCHEME);
if (defaultScheme != null) defaultStorageSchemes.add(defaultScheme);
}
@@ -168,7 +168,7 @@
private DN passwordGeneratorDN = null;
// The password generator for use with this password policy.
- private PasswordGenerator passwordGenerator = null;
+ private PasswordGenerator<?> passwordGenerator = null;
// The number of grace logins that a user may have.
private int graceLoginCount = DEFAULT_PWPOLICY_GRACE_LOGIN_COUNT;
@@ -294,11 +294,11 @@
configuration.getDefaultPasswordStorageSchemeDNs();
try
{
- LinkedList<PasswordStorageScheme> schemes =
- new LinkedList<PasswordStorageScheme>();
+ LinkedList<PasswordStorageScheme<?>> schemes =
+ new LinkedList<PasswordStorageScheme<?>>();
for (DN configEntryDN : storageSchemeDNs)
{
- PasswordStorageScheme scheme =
+ PasswordStorageScheme<?> scheme =
DirectoryServer.getPasswordStorageScheme(configEntryDN);
if (this.authPasswordSyntax &&
@@ -314,7 +314,7 @@
}
this.defaultStorageSchemes =
- new CopyOnWriteArrayList<PasswordStorageScheme>(schemes);
+ new CopyOnWriteArrayList<PasswordStorageScheme<?>>(schemes);
}
catch (ConfigException ce)
{
@@ -342,7 +342,7 @@
new LinkedHashSet<String>();
for (DN schemeDN : deprecatedStorageSchemeDNs)
{
- PasswordStorageScheme scheme =
+ PasswordStorageScheme<?> scheme =
DirectoryServer.getPasswordStorageScheme(schemeDN);
if (this.authPasswordSyntax)
{
@@ -398,11 +398,11 @@
// Get the status notification handlers.
SortedSet<DN> statusNotificationHandlers =
configuration.getAccountStatusNotificationHandlerDNs();
- ConcurrentHashMap<DN,AccountStatusNotificationHandler> handlers =
- new ConcurrentHashMap<DN,AccountStatusNotificationHandler>();
+ ConcurrentHashMap<DN,AccountStatusNotificationHandler<?>> handlers =
+ new ConcurrentHashMap<DN,AccountStatusNotificationHandler<?>>();
for (DN handlerDN : statusNotificationHandlers)
{
- AccountStatusNotificationHandler handler =
+ AccountStatusNotificationHandler<?> handler =
DirectoryServer.getAccountStatusNotificationHandler(handlerDN);
handlers.put(handlerDN, handler);
}
@@ -746,7 +746,8 @@
* @return The default set of password storage schemes that will be used for
* this password policy.
*/
- public CopyOnWriteArrayList<PasswordStorageScheme> getDefaultStorageSchemes()
+ public CopyOnWriteArrayList<PasswordStorageScheme<?>>
+ getDefaultStorageSchemes()
{
return defaultStorageSchemes;
}
@@ -765,14 +766,14 @@
*/
public boolean isDefaultStorageScheme(String name)
{
- CopyOnWriteArrayList<PasswordStorageScheme> defaultSchemes =
+ CopyOnWriteArrayList<PasswordStorageScheme<?>> defaultSchemes =
getDefaultStorageSchemes();
if (defaultSchemes == null)
{
return false;
}
- for (PasswordStorageScheme s : defaultSchemes)
+ for (PasswordStorageScheme<?> s : defaultSchemes)
{
if (authPasswordSyntax)
{
@@ -867,7 +868,7 @@
* @return The set of account status notification handlers that should be
* used with this password policy.
*/
- public ConcurrentHashMap<DN,AccountStatusNotificationHandler>
+ public ConcurrentHashMap<DN,AccountStatusNotificationHandler<?>>
getAccountStatusNotificationHandlers()
{
return notificationHandlers;
@@ -969,7 +970,7 @@
* @return The password generator that will be used with this password
* policy, or <CODE>null</CODE> if there is none.
*/
- public PasswordGenerator getPasswordGenerator()
+ public PasswordGenerator<?> getPasswordGenerator()
{
return passwordGenerator;
}
@@ -1395,7 +1396,7 @@
}
else
{
- Iterator<PasswordStorageScheme> iterator =
+ Iterator<PasswordStorageScheme<?>> iterator =
defaultStorageSchemes.iterator();
buffer.append(iterator.next().getStorageSchemeName());
buffer.append(EOL);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java
index 8b6e436..a709199 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -31,6 +31,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
@@ -61,8 +62,10 @@
import org.opends.server.types.AccountStatusNotificationProperty;
import org.opends.server.types.AccountStatusNotificationType;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DebugLogLevel;
@@ -295,9 +298,9 @@
{
for (Attribute a : attrList)
{
- if(a.getValues().isEmpty()) continue;
+ if (a.isEmpty()) continue;
- AttributeValue v = a.getValues().iterator().next();
+ AttributeValue v = a.iterator().next();
DN subentryDN;
try
{
@@ -395,9 +398,9 @@
{
for (Attribute a : attrList)
{
- if (a.getValues().isEmpty()) continue;
+ if (a.isEmpty()) continue;
- stringValue = a.getValues().iterator().next().getStringValue();
+ stringValue = a.iterator().next().getStringValue();
break ;
}
}
@@ -447,9 +450,9 @@
{
for (Attribute a : attrList)
{
- if (a.getValues().isEmpty()) continue;
+ if (a.isEmpty()) continue;
- AttributeValue v = a.getValues().iterator().next();
+ AttributeValue v = a.iterator().next();
try
{
timeValue = GeneralizedTimeSyntax.decodeGeneralizedTimeValue(
@@ -516,7 +519,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -580,10 +583,10 @@
{
for (Attribute a : attrList)
{
- if (a.getValues().isEmpty()) continue;
+ if (a.isEmpty()) continue;
String valueString
- = toLowerCase(a.getValues().iterator().next().getStringValue());
+ = toLowerCase(a.iterator().next().getStringValue());
if (valueString.equals("true") || valueString.equals("yes") ||
valueString.equals("on") || valueString.equals("1"))
@@ -674,31 +677,40 @@
/**
- * Retrieves the set of values for the password attribute from the user entry.
+ * Retrieves the unmodifiable set of values for the password
+ * attribute from the user entry.
*
- * @return The set of values for the password attribute from the user entry.
+ * @return The unmodifiable set of values for the password attribute
+ * from the user entry.
*/
- public LinkedHashSet<AttributeValue> getPasswordValues()
+ public Set<AttributeValue> getPasswordValues()
{
- List<Attribute> attrList =
- userEntry.getAttribute(passwordPolicy.getPasswordAttribute());
+ List<Attribute> attrList = userEntry.getAttribute(passwordPolicy
+ .getPasswordAttribute());
if (attrList != null)
{
for (Attribute a : attrList)
{
- if (a.getValues().isEmpty()) continue;
+ if (a.isEmpty()) continue;
- return a.getValues();
+ Set<AttributeValue> values =
+ new LinkedHashSet<AttributeValue>(a.size());
+ for (AttributeValue value : a)
+ {
+ values.add(value);
+ }
+ return Collections.unmodifiableSet(values);
}
}
- return new LinkedHashSet<AttributeValue>(0);
+ return Collections.emptySet();
}
/**
- * Sets a new value for the password changed time equal to the current time.
+ * Sets a new value for the password changed time equal to the
+ * current time.
*/
public void setPasswordChangedTime()
{
@@ -728,26 +740,15 @@
{
this.passwordChangedTime = passwordChangedTime;
- AttributeType type =
- DirectoryServer.getAttributeType(OP_ATTR_PWPOLICY_CHANGED_TIME_LC);
- if (type == null)
- {
- type = DirectoryServer.getDefaultAttributeType(
- OP_ATTR_PWPOLICY_CHANGED_TIME);
- }
-
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
String timeValue = GeneralizedTimeSyntax.format(passwordChangedTime);
- values.add(new AttributeValue(type, timeValue));
-
- Attribute a = new Attribute(type, OP_ATTR_PWPOLICY_CHANGED_TIME, values);
+ Attribute a = Attributes.create(OP_ATTR_PWPOLICY_CHANGED_TIME,
+ timeValue);
if (updateEntry)
{
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
attrList.add(a);
- userEntry.putAttribute(type, attrList);
+ userEntry.putAttribute(a.getAttributeType(), attrList);
}
else
{
@@ -780,7 +781,7 @@
}
else
{
- Attribute a = new Attribute(type);
+ Attribute a = Attributes.empty(type);
modifications.add(new Modification(ModificationType.REPLACE, a, true));
}
@@ -902,10 +903,7 @@
if (isDisabled)
{
- LinkedHashSet<AttributeValue> values
- = new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(type, String.valueOf(true)));
- Attribute a = new Attribute(type, OP_ATTR_ACCOUNT_DISABLED, values);
+ Attribute a = Attributes.create(type, String.valueOf(true));
if (updateEntry)
{
@@ -928,7 +926,7 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
}
}
@@ -1064,13 +1062,7 @@
DirectoryServer.getAttributeType(OP_ATTR_ACCOUNT_EXPIRATION_TIME,
true);
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(type, timeStr));
-
- Attribute a = new Attribute(type, OP_ATTR_ACCOUNT_EXPIRATION_TIME,
- values);
-
+ Attribute a = Attributes.create(type, timeStr);
if (updateEntry)
{
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
@@ -1110,21 +1102,22 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
}
/**
- * Retrieves the set of times of failed authentication attempts for the user.
- * If authentication failure time expiration is enabled, and there are expired
- * times in the entry, these times are removed from the instance field and an
- * update is provided to delete those values from the entry.
+ * Retrieves the set of times of failed authentication attempts for
+ * the user. If authentication failure time expiration is enabled,
+ * and there are expired times in the entry, these times are removed
+ * from the instance field and an update is provided to delete those
+ * values from the entry.
*
- * @return The set of times of failed authentication attempts for the user,
- * which will be an empty list in the case of no valid (unexpired)
- * times in the entry.
+ * @return The set of times of failed authentication attempts for
+ * the user, which will be an empty list in the case of no
+ * valid (unexpired) times in the entry.
*/
public List<Long> getAuthFailureTimes()
{
@@ -1175,7 +1168,7 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
return authFailureTimes;
@@ -1234,23 +1227,22 @@
}
else
{
- LinkedHashSet<AttributeValue> keepValues =
- new LinkedHashSet<AttributeValue>(authFailureTimes.size());
+ AttributeBuilder builder = new AttributeBuilder(type);
for (Long l : authFailureTimes)
{
- keepValues.add(
+ builder.add(
new AttributeValue(type, GeneralizedTimeSyntax.format(l)));
}
ArrayList<Attribute> keepList = new ArrayList<Attribute>(1);
- keepList.add(new Attribute(type, OP_ATTR_PWPOLICY_FAILURE_TIME,
- keepValues));
+ keepList.add(builder.toAttribute());
userEntry.putAttribute(type, keepList);
}
}
else
{
- Attribute a = new Attribute(type, OP_ATTR_PWPOLICY_FAILURE_TIME,
- valuesToRemove);
+ AttributeBuilder builder = new AttributeBuilder(type);
+ builder.addAll(valuesToRemove);
+ Attribute a = builder.toAttribute();
modifications.add(new Modification(ModificationType.DELETE, a,
true));
}
@@ -1313,23 +1305,17 @@
OP_ATTR_PWPOLICY_FAILURE_TIME);
}
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(failureTimes.size());
+ AttributeBuilder builder = new AttributeBuilder(type);
for (Long l : failureTimes)
{
- values.add(new AttributeValue(type, GeneralizedTimeSyntax.format(l)));
+ builder.add(new AttributeValue(type, GeneralizedTimeSyntax.format(l)));
}
- Attribute a = new Attribute(type, OP_ATTR_PWPOLICY_FAILURE_TIME, values);
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(a);
+ attrList.add(builder.toAttribute());
- LinkedHashSet<AttributeValue> addValues =
- new LinkedHashSet<AttributeValue>(1);
- addValues.add(new AttributeValue(type,
- GeneralizedTimeSyntax.format(highestFailureTime)));
- Attribute addAttr = new Attribute(type, OP_ATTR_PWPOLICY_FAILURE_TIME,
- addValues);
+ Attribute addAttr = Attributes.create(type, new AttributeValue(type,
+ GeneralizedTimeSyntax.format(highestFailureTime)));
if (updateEntry)
{
@@ -1384,14 +1370,13 @@
DirectoryServer.getAttributeType(OP_ATTR_PWPOLICY_FAILURE_TIME_LC,
true);
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(authFailureTimes.size());
+ AttributeBuilder builder = new AttributeBuilder(type);
for (Long l : authFailureTimes)
{
- values.add(new AttributeValue(type, GeneralizedTimeSyntax.format(l)));
+ builder
+ .add(new AttributeValue(type, GeneralizedTimeSyntax.format(l)));
}
-
- Attribute a = new Attribute(type, OP_ATTR_PWPOLICY_FAILURE_TIME, values);
+ Attribute a = builder.toAttribute();
if (updateEntry)
{
@@ -1455,7 +1440,7 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
}
@@ -1531,10 +1516,8 @@
OP_ATTR_PWPOLICY_LOCKED_TIME);
}
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(type,
- GeneralizedTimeSyntax.format(failureLockedTime)));
- Attribute a = new Attribute(type, OP_ATTR_PWPOLICY_LOCKED_TIME, values);
+ Attribute a = Attributes.create(type, new AttributeValue(type,
+ GeneralizedTimeSyntax.format(failureLockedTime)));
if (updateEntry)
{
@@ -1584,7 +1567,7 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
}
@@ -1784,9 +1767,9 @@
{
for (Attribute a : attrList)
{
- if (a.getValues().isEmpty()) continue;
+ if (a.isEmpty()) continue;
- String valueString = a.getValues().iterator().next().getStringValue();
+ String valueString = a.iterator().next().getStringValue();
try
{
@@ -1927,11 +1910,7 @@
}
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(type, timestamp));
-
- Attribute a = new Attribute(type, type.getNameOrOID(), values);
-
+ Attribute a = Attributes.create(type, timestamp);
if (updateEntry)
{
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
@@ -1975,7 +1954,7 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
}
@@ -2190,12 +2169,7 @@
if (mustChangePassword)
{
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(type, String.valueOf(true)));
- Attribute a = new Attribute(type, OP_ATTR_PWPOLICY_RESET_REQUIRED,
- values);
-
+ Attribute a = Attributes.create(type, String.valueOf(true));
if (updateEntry)
{
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
@@ -2217,7 +2191,7 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
}
}
@@ -2727,14 +2701,8 @@
AttributeType type = DirectoryServer.getAttributeType(
OP_ATTR_PWPOLICY_CHANGED_BY_REQUIRED_TIME, true);
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
String timeValue = GeneralizedTimeSyntax.format(requiredChangeTime);
- values.add(new AttributeValue(type, timeValue));
-
- Attribute a = new Attribute(type,
- OP_ATTR_PWPOLICY_CHANGED_BY_REQUIRED_TIME,
- values);
+ Attribute a = Attributes.create(type, timeValue);
if (updateEntry)
{
@@ -2772,7 +2740,7 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
}
@@ -2860,10 +2828,8 @@
AttributeType type =
DirectoryServer.getAttributeType(OP_ATTR_PWPOLICY_WARNED_TIME, true);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(1);
- values.add(GeneralizedTimeSyntax.createGeneralizedTimeValue(currentTime));
-
- Attribute a = new Attribute(type, OP_ATTR_PWPOLICY_WARNED_TIME, values);
+ Attribute a = Attributes.create(type, GeneralizedTimeSyntax
+ .createGeneralizedTimeValue(currentTime));
if (updateEntry)
{
@@ -2908,7 +2874,7 @@
}
else
{
- Attribute a = new Attribute(type);
+ Attribute a = Attributes.empty(type);
modifications.add(new Modification(ModificationType.REPLACE, a, true));
}
@@ -2966,7 +2932,7 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
}
}
@@ -3042,28 +3008,22 @@
if (updateEntry)
{
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(graceTimes.size());
+ AttributeBuilder builder = new AttributeBuilder(type);
for (Long l : graceTimes)
{
- values.add(new AttributeValue(type, GeneralizedTimeSyntax.format(l)));
+ builder.add(new AttributeValue(type, GeneralizedTimeSyntax
+ .format(l)));
}
- Attribute a = new Attribute(type, OP_ATTR_PWPOLICY_GRACE_LOGIN_TIME,
- values);
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(a);
+ attrList.add(builder.toAttribute());
userEntry.putAttribute(type, attrList);
}
else
{
- LinkedHashSet<AttributeValue> addValues =
- new LinkedHashSet<AttributeValue>(1);
- addValues.add(new AttributeValue(type,
- GeneralizedTimeSyntax.format(highestGraceTime)));
- Attribute addAttr = new Attribute(type, OP_ATTR_PWPOLICY_GRACE_LOGIN_TIME,
- addValues);
+ Attribute addAttr = Attributes.create(type, new AttributeValue(
+ type, GeneralizedTimeSyntax.format(highestGraceTime)));
modifications.add(new Modification(ModificationType.ADD, addAttr, true));
}
@@ -3094,14 +3054,13 @@
AttributeType type =
DirectoryServer.getAttributeType(OP_ATTR_PWPOLICY_GRACE_LOGIN_TIME_LC,
true);
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(graceLoginTimes.size());
+ AttributeBuilder builder = new AttributeBuilder(type);
for (Long l : graceLoginTimes)
{
- values.add(new AttributeValue(type, GeneralizedTimeSyntax.format(l)));
+ builder
+ .add(new AttributeValue(type, GeneralizedTimeSyntax.format(l)));
}
- Attribute a =
- new Attribute(type, OP_ATTR_PWPOLICY_GRACE_LOGIN_TIME, values);
+ Attribute a = builder.toAttribute();
if (updateEntry)
{
@@ -3151,7 +3110,7 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
}
@@ -3179,7 +3138,7 @@
{
boolean usesAuthPasswordSyntax = passwordPolicy.usesAuthPasswordSyntax();
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -3201,7 +3160,7 @@
}
String schemeName = pwComponents[0].toString();
- PasswordStorageScheme scheme = (usesAuthPasswordSyntax)
+ PasswordStorageScheme<?> scheme = (usesAuthPasswordSyntax)
? DirectoryServer.getAuthPasswordStorageScheme(schemeName)
: DirectoryServer.getPasswordStorageScheme(schemeName);
if (scheme == null)
@@ -3277,7 +3236,7 @@
{
boolean usesAuthPasswordSyntax = passwordPolicy.usesAuthPasswordSyntax();
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -3299,7 +3258,7 @@
}
String schemeName = pwComponents[0].toString();
- PasswordStorageScheme scheme = (usesAuthPasswordSyntax)
+ PasswordStorageScheme<?> scheme = (usesAuthPasswordSyntax)
? DirectoryServer.getAuthPasswordStorageScheme(schemeName)
: DirectoryServer.getPasswordStorageScheme(schemeName);
if (scheme == null)
@@ -3398,21 +3357,21 @@
public List<ByteString> encodePassword(ByteString password)
throws DirectoryException
{
- List<PasswordStorageScheme> schemes =
+ List<PasswordStorageScheme<?>> schemes =
passwordPolicy.getDefaultStorageSchemes();
List<ByteString> encodedPasswords =
new ArrayList<ByteString>(schemes.size());
if (passwordPolicy.usesAuthPasswordSyntax())
{
- for (PasswordStorageScheme s : schemes)
+ for (PasswordStorageScheme<?> s : schemes)
{
encodedPasswords.add(s.encodeAuthPassword(password));
}
}
else
{
- for (PasswordStorageScheme s : schemes)
+ for (PasswordStorageScheme<?> s : schemes)
{
encodedPasswords.add(s.encodePasswordWithScheme(password));
}
@@ -3523,7 +3482,7 @@
for (Attribute a : attrList)
{
- Iterator<AttributeValue> iterator = a.getValues().iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
while (iterator.hasNext())
{
AttributeValue v = iterator.next();
@@ -3548,7 +3507,7 @@
}
String schemeName = pwComponents[0].toString();
- PasswordStorageScheme scheme = (usesAuthPasswordSyntax)
+ PasswordStorageScheme<?> scheme = (usesAuthPasswordSyntax)
? DirectoryServer.getAuthPasswordStorageScheme(schemeName)
: DirectoryServer.getPasswordStorageScheme(schemeName);
if (scheme == null)
@@ -3621,7 +3580,7 @@
LinkedHashSet<AttributeValue> addedValues = new
LinkedHashSet<AttributeValue>();
- for (PasswordStorageScheme s :
+ for (PasswordStorageScheme<?> s :
passwordPolicy.getDefaultStorageSchemes())
{
if (! existingDefaultSchemes.contains(
@@ -3668,18 +3627,24 @@
if (updateEntry)
{
+ AttributeBuilder builder = new AttributeBuilder(type);
+ builder.addAll(updatedValues);
ArrayList<Attribute> newList = new ArrayList<Attribute>(1);
- newList.add(new Attribute(type, type.getNameOrOID(), updatedValues));
+ newList.add(builder.toAttribute());
userEntry.putAttribute(type, newList);
}
else
{
- Attribute a = new Attribute(type, type.getNameOrOID(), removedValues);
+ AttributeBuilder builder = new AttributeBuilder(type);
+ builder.addAll(removedValues);
+ Attribute a = builder.toAttribute();
modifications.add(new Modification(ModificationType.DELETE, a, true));
if (! addedValues.isEmpty())
{
- Attribute a2 = new Attribute(type, type.getNameOrOID(), addedValues);
+ builder = new AttributeBuilder(type);
+ builder.addAll(addedValues);
+ Attribute a2 = builder.toAttribute();
modifications.add(new Modification(ModificationType.ADD, a2, true));
}
}
@@ -3833,7 +3798,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
String histStr = v.getStringValue();
int hashPos = histStr.indexOf('#');
@@ -3846,13 +3811,9 @@
"for removal.");
}
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(v);
if (removeAttrs != null)
{
- removeAttrs.add(new Attribute(a.getAttributeType(), a.getName(),
- values));
+ removeAttrs.add(Attributes.create(a.getAttributeType(), v));
}
}
else
@@ -3875,13 +3836,10 @@
". Marking it for removal.");
}
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(v);
if (removeAttrs != null)
{
- removeAttrs.add(new Attribute(a.getAttributeType(), a.getName(),
- values));
+ removeAttrs.add(Attributes
+ .create(a.getAttributeType(), v));
}
}
}
@@ -3944,7 +3902,7 @@
StringBuilder[] authPWComponents =
AuthPasswordSyntax.decodeAuthPassword(
histStr.substring(hashPos2+1));
- PasswordStorageScheme scheme =
+ PasswordStorageScheme<?> scheme =
DirectoryServer.getAuthPasswordStorageScheme(
authPWComponents[0].toString());
if (scheme.authPasswordMatches(password, authPWComponents[1].toString(),
@@ -3974,7 +3932,7 @@
String[] userPWComponents =
UserPasswordSyntax.decodeUserPassword(
histStr.substring(hashPos2+1));
- PasswordStorageScheme scheme =
+ PasswordStorageScheme<?> scheme =
DirectoryServer.getPasswordStorageScheme(userPWComponents[0]);
if (scheme.passwordMatches(password,
new ASN1OctetString(userPWComponents[1])))
@@ -4041,7 +3999,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
addPasswordToHistory(v.getStringValue());
}
@@ -4109,8 +4067,9 @@
if (! removeValues.isEmpty())
{
- removeAttrs.add(new Attribute(historyType, historyType.getPrimaryName(),
- removeValues));
+ AttributeBuilder builder = new AttributeBuilder(historyType);
+ builder.addAll(removeValues);
+ removeAttrs.add(builder.toAttribute());
}
}
@@ -4147,8 +4106,9 @@
if (! removeValues.isEmpty())
{
- removeAttrs.add(new Attribute(historyType, historyType.getPrimaryName(),
- removeValues));
+ AttributeBuilder builder = new AttributeBuilder(historyType);
+ builder.addAll(removeValues);
+ removeAttrs.add(builder.toAttribute());
}
}
@@ -4165,12 +4125,7 @@
String newHistStr = GeneralizedTimeSyntax.format(newTimestamp) + "#" +
passwordPolicy.getPasswordAttribute().getSyntaxOID() +
"#" + encodedPassword;
- LinkedHashSet<AttributeValue> newHistValues =
- new LinkedHashSet<AttributeValue>(1);
- newHistValues.add(new AttributeValue(historyType, newHistStr));
- Attribute newHistAttr =
- new Attribute(historyType, historyType.getPrimaryName(),
- newHistValues);
+ Attribute newHistAttr = Attributes.create(historyType, newHistStr);
if (debugEnabled())
{
@@ -4220,7 +4175,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
historyValues.add(v.getStringValue());
}
@@ -4253,7 +4208,7 @@
else
{
modifications.add(new Modification(ModificationType.REPLACE,
- new Attribute(type), true));
+ Attributes.empty(type), true));
}
}
@@ -4271,7 +4226,7 @@
public ByteString generatePassword()
throws DirectoryException
{
- PasswordGenerator generator = passwordPolicy.getPasswordGenerator();
+ PasswordGenerator<?> generator = passwordPolicy.getPasswordGenerator();
if (generator == null)
{
if (debugEnabled())
@@ -4321,14 +4276,14 @@
public void generateAccountStatusNotification(
AccountStatusNotification notification)
{
- Collection<AccountStatusNotificationHandler> handlers =
+ Collection<AccountStatusNotificationHandler<?>> handlers =
passwordPolicy.getAccountStatusNotificationHandlers().values();
if ((handlers == null) || handlers.isEmpty())
{
return;
}
- for (AccountStatusNotificationHandler handler : handlers)
+ for (AccountStatusNotificationHandler<?> handler : handlers)
{
handler.handleStatusNotification(notification);
}
@@ -4344,7 +4299,7 @@
* password policy processing that may need to be applied to the user
* entry.
*/
- public LinkedList<Modification> getModifications()
+ public List<Modification> getModifications()
{
return modifications;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/QueueingStrategy.java b/opendj-sdk/opends/src/server/org/opends/server/core/QueueingStrategy.java
new file mode 100644
index 0000000..35144eb
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/QueueingStrategy.java
@@ -0,0 +1,48 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.core;
+
+import org.opends.server.types.AbstractOperation;
+import org.opends.server.types.DirectoryException;
+
+/**
+ * This interface defines request handling strategies.
+ */
+public interface QueueingStrategy {
+
+ /**
+ * Put the request in the queue.
+ *
+ * @param operation Operation to put in the queue.
+ * @throws org.opends.server.types.DirectoryException
+ * If a problem occurs in the Directory Server.
+ */
+ public void enqueueRequest(AbstractOperation operation)
+ throws DirectoryException;
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/RootDseWorkflowTopology.java b/opendj-sdk/opends/src/server/org/opends/server/core/RootDseWorkflowTopology.java
index ea88331..10efaf6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/RootDseWorkflowTopology.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/RootDseWorkflowTopology.java
@@ -27,6 +27,7 @@
package org.opends.server.core;
+import org.opends.server.core.networkgroups.NetworkGroupNamingContexts;
import org.opends.server.types.*;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java
index 21f37af..a8f71b3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java
@@ -35,7 +35,6 @@
import java.util.LinkedList;
import java.util.List;
-import org.opends.server.api.ConfigHandler;
import org.opends.server.config.ConfigException;
import org.opends.server.schema.AttributeTypeSyntax;
import org.opends.server.schema.DITContentRuleSyntax;
@@ -91,9 +90,6 @@
// The schema that has been parsed from the server configuration.
private Schema schema;
- // The configuration handler for the Directory Server.
- private ConfigHandler configHandler;
-
/**
@@ -101,8 +97,6 @@
*/
public SchemaConfigManager()
{
- configHandler = DirectoryServer.getConfigHandler();
-
schema = new Schema();
}
@@ -499,7 +493,7 @@
{
for (Attribute a : attrList)
{
- mods.add(new Modification(ModificationType.ADD, a.duplicate()));
+ mods.add(new Modification(ModificationType.ADD, a));
}
}
@@ -540,7 +534,7 @@
{
for (Attribute a : ocList)
{
- mods.add(new Modification(ModificationType.ADD, a.duplicate()));
+ mods.add(new Modification(ModificationType.ADD, a));
}
}
@@ -580,7 +574,7 @@
{
for (Attribute a : nfList)
{
- mods.add(new Modification(ModificationType.ADD, a.duplicate()));
+ mods.add(new Modification(ModificationType.ADD, a));
}
}
@@ -622,7 +616,7 @@
{
for (Attribute a : dcrList)
{
- mods.add(new Modification(ModificationType.ADD, a.duplicate()));
+ mods.add(new Modification(ModificationType.ADD, a));
}
}
@@ -664,7 +658,7 @@
{
for (Attribute a : dsrList)
{
- mods.add(new Modification(ModificationType.ADD, a.duplicate()));
+ mods.add(new Modification(ModificationType.ADD, a));
}
}
@@ -706,7 +700,7 @@
{
for (Attribute a : mruList)
{
- mods.add(new Modification(ModificationType.ADD, a.duplicate()));
+ mods.add(new Modification(ModificationType.ADD, a));
}
}
@@ -725,7 +719,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
// Parse the attribute type.
AttributeType attrType;
@@ -818,7 +812,7 @@
{
for (Attribute a : ocList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
// Parse the objectclass.
ObjectClass oc;
@@ -913,7 +907,7 @@
{
for (Attribute a : nfList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
// Parse the name form.
NameForm nf;
@@ -1005,7 +999,7 @@
{
for (Attribute a : dcrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
// Parse the DIT content rule.
DITContentRule dcr;
@@ -1099,7 +1093,7 @@
{
for (Attribute a : dsrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
// Parse the DIT content rule.
DITStructureRule dsr;
@@ -1193,7 +1187,7 @@
{
for (Attribute a : mruList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
// Parse the matching rule use definition.
MatchingRuleUse mru;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java
index 662eed5..f296b93 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java
@@ -33,12 +33,14 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
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.opends.server.protocols.asn1.ASN1OctetString;
@@ -715,8 +717,7 @@
}
// Make a copy of the entry and pare it down to only include the set
- // of
- // requested attributes.
+ // of requested attributes.
Entry entryToReturn;
if ((getAttributes() == null) || getAttributes().isEmpty())
{
@@ -739,22 +740,16 @@
AttributeType ocType =
DirectoryServer.getObjectClassAttributeType();
List<Attribute> ocList = new ArrayList<Attribute>(1);
- ocList.add(new Attribute(ocType));
+ ocList.add(Attributes.empty(ocType));
entryToReturn.putAttribute(ocType, ocList);
}
else
{
// First, add the objectclass attribute.
Attribute ocAttr = entry.getObjectClassAttribute();
- try
+ if (ocAttr != null)
{
- if (ocAttr != null)
- entryToReturn.setObjectClasses(ocAttr.getValues());
- }
- catch (DirectoryException e)
- {
- // We cannot get this exception because the object classes have
- // already been validated in the entry they came from.
+ entryToReturn.replaceAttribute(ocAttr);
}
}
@@ -855,7 +850,7 @@
AttributeType ocType =
DirectoryServer.getObjectClassAttributeType();
List<Attribute> ocList = new ArrayList<Attribute>(1);
- ocList.add(new Attribute(ocType));
+ ocList.add(Attributes.empty(ocType));
entryToReturn.putAttribute(ocType, ocList);
}
else
@@ -914,20 +909,27 @@
}
+ // Build a list of all filtered attributes. These will be
+ // replaced in the entry after processing.
+ List<Attribute> modifiedAttributes = new LinkedList<Attribute>();
+
+
// Next, the set of user attributes.
for (AttributeType t : entryToReturn.getUserAttributes().keySet())
{
for (Attribute a : entryToReturn.getUserAttribute(t))
{
- Iterator<AttributeValue> valueIterator = a.getValues().iterator();
- while (valueIterator.hasNext())
+ // Assume that the attribute will be either empty or contain
+ // very few values.
+ AttributeBuilder builder = new AttributeBuilder(a, true);
+ for (AttributeValue v : a)
{
- AttributeValue v = valueIterator.next();
- if (! matchedValuesControl.valueMatches(t, v))
+ if (matchedValuesControl.valueMatches(t, v))
{
- valueIterator.remove();
+ builder.add(v);
}
}
+ modifiedAttributes.add(builder.toAttribute());
}
}
@@ -935,17 +937,31 @@
// Then the set of operational attributes.
for (AttributeType t : entryToReturn.getOperationalAttributes().keySet())
{
- for (Attribute a : entryToReturn.getOperationalAttribute(t))
+ for (Attribute a : entryToReturn.getUserAttribute(t))
{
- Iterator<AttributeValue> valueIterator = a.getValues().iterator();
- while (valueIterator.hasNext())
+ // Assume that the attribute will be either empty or contain
+ // very few values.
+ AttributeBuilder builder = new AttributeBuilder(a);
+ for (AttributeValue v : a)
{
- AttributeValue v = valueIterator.next();
- if (! matchedValuesControl.valueMatches(t, v))
+ if (matchedValuesControl.valueMatches(t, v))
{
- valueIterator.remove();
+ builder.add(v);
}
}
+ modifiedAttributes.add(builder.toAttribute());
+ }
+ }
+
+
+ // Replace any modified attributes.
+ for (Attribute a : modifiedAttributes)
+ {
+ entryToReturn.replaceAttribute(a);
+ if (a.isEmpty())
+ {
+ // Add a place holder.
+ entryToReturn.addAttribute(a, null);
}
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SynchronousStrategy.java b/opendj-sdk/opends/src/server/org/opends/server/core/SynchronousStrategy.java
new file mode 100644
index 0000000..90d0f8a
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SynchronousStrategy.java
@@ -0,0 +1,50 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core;
+
+import org.opends.server.types.AbstractOperation;
+import org.opends.server.types.DirectoryException;
+
+/**
+ *
+ * This class implements the "synchronous" strategy, that is the operation
+ * is directly handled, without going to the work queue.
+ */
+public class SynchronousStrategy implements QueueingStrategy {
+
+ /**
+ * Run the request synchronously.
+ *
+ * @param operation Operation to run.
+ * @throws org.opends.server.types.DirectoryException
+ * If a problem occurs in the Directory Server.
+ */
+ public void enqueueRequest(AbstractOperation operation)
+ throws DirectoryException {
+ operation.run();
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/WorkQueueStrategy.java b/opendj-sdk/opends/src/server/org/opends/server/core/WorkQueueStrategy.java
new file mode 100644
index 0000000..b528d7b
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/WorkQueueStrategy.java
@@ -0,0 +1,49 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core;
+
+import org.opends.server.types.AbstractOperation;
+import org.opends.server.types.DirectoryException;
+
+/**
+ *
+ * This class implements the work queue strategy.
+ */
+public class WorkQueueStrategy implements QueueingStrategy {
+
+ /**
+ * Put the request in the work queue.
+ *
+ * @param operation Operation to put in the work queue.
+ * @throws org.opends.server.types.DirectoryException
+ * If a problem occurs in the Directory Server.
+ */
+ public void enqueueRequest(AbstractOperation operation)
+ throws DirectoryException {
+ DirectoryServer.enqueueRequest(operation);
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowConfigManager.java
index 8ea5280..53ae343 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowConfigManager.java
@@ -40,6 +40,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.server.WorkflowCfg;
import org.opends.server.config.ConfigException;
+import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
@@ -293,7 +294,7 @@
// Create the root workflow element to associate with the workflow
String rootWorkflowElementID = workflowCfg.getWorkflowElement();
- WorkflowElement rootWorkflowElement =
+ WorkflowElement<?> rootWorkflowElement =
DirectoryServer.getWorkflowElement(rootWorkflowElementID);
// Get the base DN targeted by the workflow
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowImpl.java b/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowImpl.java
index f0a729e..10208e0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowImpl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowImpl.java
@@ -28,6 +28,8 @@
import static org.opends.messages.CoreMessages.*;
import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+
import static org.opends.server.util.Validator.ensureNotNull;
import java.util.Collection;
@@ -52,7 +54,7 @@
private String workflowID = null;
// The root of the workflow task tree.
- private WorkflowElement rootWorkflowElement = null;
+ private WorkflowElement<?> rootWorkflowElement = null;
// The base DN of the data handled by the workflow.
private DN baseDN = null;
@@ -90,9 +92,9 @@
* @param rootWorkflowElement the root node of the workflow task tree
*/
public WorkflowImpl(
- String workflowId,
- DN baseDN,
- WorkflowElement rootWorkflowElement
+ String workflowId,
+ DN baseDN,
+ WorkflowElement<?> rootWorkflowElement
)
{
this.workflowID = workflowId;
@@ -130,7 +132,7 @@
/**
* Gets the workflow internal identifier.
*
- * @return the workflow internal indentifier
+ * @return the workflow internal identifier
*/
public String getWorkflowId()
{
@@ -158,15 +160,28 @@
* @param operation the operation to execute
*
* @throws CanceledOperationException if this operation should
- * be cancelled.
+ * be canceled.
*/
- public void execute(Operation operation) throws CanceledOperationException {
- rootWorkflowElement.execute(operation);
+ public void execute(Operation operation)
+ throws CanceledOperationException
+ {
+ if (rootWorkflowElement != null)
+ {
+ rootWorkflowElement.execute(operation);
+ }
+ else
+ {
+ // No root workflow element? It's a configuration error.
+ operation.setResultCode(ResultCode.OPERATIONS_ERROR);
+ MessageBuilder message = new MessageBuilder(
+ ERR_ROOT_WORKFLOW_ELEMENT_NOT_DEFINED.get(workflowID));
+ operation.setErrorMessage(message);
+ }
}
/**
- * Registers the current worklow (this) with the server.
+ * Registers the current workflow (this) with the server.
*
* @throws DirectoryException If the workflow ID for the provided workflow
* conflicts with the workflow ID of an existing
@@ -197,7 +212,7 @@
/**
- * Deregisters the current worklow (this) with the server.
+ * Deregisters the current workflow (this) with the server.
*/
public void deregister()
{
@@ -214,7 +229,7 @@
/**
- * Deregisters a worklow with the server. The workflow to deregister
+ * Deregisters a workflow with the server. The workflow to deregister
* is identified with its identifier.
*
* @param workflowID the identifier of the workflow to deregister
@@ -283,7 +298,7 @@
*
* @return the root workflow element.
*/
- WorkflowElement getRootWorkflowElement()
+ WorkflowElement<?> getRootWorkflowElement()
{
return rootWorkflowElement;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowTopologyNode.java b/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowTopologyNode.java
index 858b540..8f342d9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowTopologyNode.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/WorkflowTopologyNode.java
@@ -77,8 +77,8 @@
*/
public WorkflowTopologyNode(
WorkflowImpl workflowImpl,
- WorkflowElement[] preWorkflowElements,
- WorkflowElement[] postWorkflowElements
+ WorkflowElement<?>[] preWorkflowElements,
+ WorkflowElement<?>[] postWorkflowElements
)
{
super(workflowImpl);
@@ -92,7 +92,7 @@
* @param operation the operation to execute
*
* @throws CanceledOperationException if this operation should
- * be cancelled.
+ * be canceled.
*/
public void execute(Operation operation)
throws CanceledOperationException {
@@ -114,7 +114,7 @@
* @param searchOp the search operation to execute
*
* @throws CanceledOperationException if this operation should
- * be cancelled.
+ * be canceled.
*/
private void executeSearchOnSubordinates(SearchOperation searchOp)
throws CanceledOperationException {
@@ -152,7 +152,7 @@
}
// If the request base DN is not a subordinate of the subordinate
- // worklfow base DN then don't search in the subordinate workflow.
+ // workflow base DN then don't search in the subordinate workflow.
if (! originalBaseDN.isAncestorOf(subordinateDN))
{
continue;
@@ -220,7 +220,7 @@
/**
* Gets the base DN of the workflow that handles a given dn. The elected
- * workflow may be the current workflow or one of its subordiante workflows.
+ * workflow may be the current workflow or one of its subordinate workflows.
*
* @param dn the DN for which we are looking a parent DN
* @return the base DN which is the parent of the <code>dn</code>,
@@ -298,7 +298,7 @@
WorkflowTopologyNode newWorkflow
)
{
- // Dont try to add the workflow to itself.
+ // Don't try to add the workflow to itself.
if (newWorkflow == this)
{
return;
@@ -314,7 +314,7 @@
DN newDN = newWorkflow.getBaseDN();
DN subordinateDN = curSubordinate.getBaseDN();
- // Dont try to add workflow when baseDNs are
+ // Don't try to add workflow when baseDNs are
// the same on both workflows.
if (newDN.equals(subordinateDN)) {
return;
@@ -370,7 +370,7 @@
DN parentBaseDN = getBaseDN();
DN newBaseDN = newWorkflow.getBaseDN();
- // dont' try to insert workflows when baseDNs are the same on both
+ // don't try to insert workflows when baseDNs are the same on both
// workflows
if (parentBaseDN.equals(newBaseDN))
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/AuthMethodCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/AuthMethodCriteria.java
new file mode 100644
index 0000000..34edede
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/AuthMethodCriteria.java
@@ -0,0 +1,108 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.TreeSet;
+import
+ org.opends.server.admin.std.meta.NetworkGroupCriteriaCfgDefn.AllowedAuthMethod;
+import org.opends.server.api.ClientConnection;
+import org.opends.server.types.AuthenticationType;
+import org.opends.server.types.DN;
+
+/**
+ * This class defines the authentication method criteria.
+ * A connection matches the criteria if the authentication
+ * method used on this connection is one of the allowed
+ * authentication methods specified in the criteria.
+ */
+
+public class AuthMethodCriteria implements NetworkGroupCriterion {
+ private Collection<AllowedAuthMethod> authMethods;
+
+ /**
+ * Constructor.
+ */
+ public AuthMethodCriteria() {
+ authMethods = new TreeSet<AllowedAuthMethod>();
+ }
+
+ /**
+ * Adds a new allowed authentication method to the list of allowed
+ * authentication methods.
+ * @param method The authentication method
+ */
+ public void addAuthMethod(AllowedAuthMethod method) {
+ authMethods.add(method);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean match(ClientConnection connection) {
+ Collection<AuthenticationType> authTypes =
+ new ArrayList<AuthenticationType>();
+
+ for (AllowedAuthMethod method:authMethods) {
+ if (method == AllowedAuthMethod.ANONYMOUS) {
+ if (connection.getAuthenticationInfo().isAuthenticated() == false) {
+ return (true);
+ }
+ } else if (method == AllowedAuthMethod.SASL) {
+ authTypes.add(AuthenticationType.SASL);
+ } else if (method == AllowedAuthMethod.SIMPLE) {
+ authTypes.add(AuthenticationType.SIMPLE);
+ }
+ }
+ return (connection.getAuthenticationInfo().hasAnyAuthenticationType(
+ authTypes));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean matchAfterBind(ClientConnection connection, DN bindDN,
+ AuthenticationType authType, boolean isSecure) {
+ for (AllowedAuthMethod method:authMethods) {
+ if (method == AllowedAuthMethod.ANONYMOUS
+ && bindDN.toNormalizedString().equals("")) {
+ return true;
+ }
+ if (method == AllowedAuthMethod.SASL
+ && authType == AuthenticationType.SASL) {
+ return true;
+ }
+ if (method == AllowedAuthMethod.SIMPLE
+ && authType == AuthenticationType.SIMPLE
+ && !bindDN.toNormalizedString().equals("")) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/BindDnCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/BindDnCriteria.java
new file mode 100644
index 0000000..c4ac72f
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/BindDnCriteria.java
@@ -0,0 +1,86 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import org.opends.server.api.ClientConnection;
+import org.opends.server.authorization.dseecompat.PatternDN;
+import org.opends.server.types.AuthenticationType;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+
+/**
+ * This class defines the client bind DN criteria.
+ * A client connection matches the criteria when the DN used by
+ * the client to bind matches at least one of the DN patterns.
+ */
+public class BindDnCriteria implements NetworkGroupCriterion {
+
+ private Collection<PatternDN> patternDNs;
+
+ /**
+ * Constructor.
+ */
+ public BindDnCriteria() {
+ patternDNs = new ArrayList<PatternDN>();
+ }
+
+ /**
+ * Adds a new bind DN filter to the list of bind DN filters.
+ * @param filter The bind DN filter
+ * @throws DirectoryException if the filter is not a valid filter
+ */
+ public void addBindDnFilter(String filter)
+ throws DirectoryException {
+ patternDNs.add(PatternDN.decode(filter));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean match(ClientConnection connection) {
+ DN dn = connection.getAuthenticationInfo().getAuthenticationDN();
+ return matchAfterBind(connection, dn, null, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean matchAfterBind(ClientConnection connection, DN bindDN,
+ AuthenticationType authType, boolean isSecure) {
+ if (bindDN == null) {
+ return false;
+ }
+ for (PatternDN patternDN:patternDNs) {
+ if (patternDN.matchesDN(bindDN)) {
+ return (true);
+ }
+ }
+ return (false);
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/IpFilterCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/IpFilterCriteria.java
new file mode 100644
index 0000000..32e4c0d
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/IpFilterCriteria.java
@@ -0,0 +1,82 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.HashSet;
+import org.opends.server.api.ClientConnection;
+import org.opends.server.types.AddressMask;
+import org.opends.server.types.AuthenticationType;
+import org.opends.server.types.DN;
+
+/**
+ * This class defines the IP filter criteria.
+ * A client connection matches the criteria when it is performed from
+ * a host whose IP address matches at least one of the specified filters.
+ */
+public class IpFilterCriteria implements NetworkGroupCriterion {
+
+ private Collection<AddressMask> ipFilters;
+
+ /**
+ * Constructor.
+ */
+ public IpFilterCriteria() {
+ ipFilters = new HashSet<AddressMask>();
+ }
+
+ /**
+ * Adds a new Ip Filter to the list of allowed IP filters.
+ * @param filter The new IP filter
+ */
+ public void addIpFilter(AddressMask filter) {
+ ipFilters.add(filter);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean match(ClientConnection connection) {
+ InetAddress ipAddr = connection.getRemoteAddress();
+ if (AddressMask.maskListContains(ipAddr.getAddress(),
+ ipAddr.getCanonicalHostName(),
+ ipFilters.toArray(new AddressMask[0]))) {
+ return (true);
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean matchAfterBind(ClientConnection connection, DN bindDN,
+ AuthenticationType authType, boolean isSecure) {
+ return (match(connection));
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroup.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
new file mode 100644
index 0000000..91eed31
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
@@ -0,0 +1,939 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2007-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+import org.opends.messages.Message;
+import static org.opends.messages.CoreMessages.*;
+import static org.opends.server.util.Validator.ensureNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeMap;
+import java.util.Collection;
+
+import org.opends.server.api.ClientConnection;
+import org.opends.server.core.*;
+import org.opends.server.types.AuthenticationType;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.ResultCode;
+import org.opends.server.types.operation.PreParseOperation;
+import org.opends.server.workflowelement.WorkflowElement;
+
+
+/**
+ * This class defines the network group. A network group is used to categorize
+ * client connections. A network group is defined by a set of criteria, a
+ * set of policies and a set of workflow nodes. A client connection belongs to
+ * a network group whenever it satisfies all the network group criteria. As
+ * soon as a client connection belongs to a network group, it has to comply
+ * with all the network group policies. Any cleared client operation can be
+ * routed to one the network group workflow nodes.
+ */
+public class NetworkGroup
+{
+ // Workflow nodes registered with the current network group.
+ // Keys are workflowIDs.
+ private TreeMap<String, WorkflowTopologyNode> registeredWorkflowNodes =
+ new TreeMap<String, WorkflowTopologyNode>();
+
+
+ // A lock to protect concurrent access to the registered Workflow nodes.
+ private Object registeredWorkflowNodesLock = new Object();
+
+
+ // The workflow node for the rootDSE entry. The RootDSE workflow node
+ // is not stored in the list of registered workflow nodes.
+ private RootDseWorkflowTopology rootDSEWorkflowNode = null;
+
+
+ // List of naming contexts handled by the network group.
+ private NetworkGroupNamingContexts namingContexts =
+ new NetworkGroupNamingContexts();
+
+
+ // The default network group (singleton).
+ // The default network group has no criterion, no policy, and gives
+ // access to all the workflows. The purpose of the default network
+ // group is to allow new clients to perform a first operation before
+ // they can be attached to a specific network group.
+ private static NetworkGroup defaultNetworkGroup =
+ new NetworkGroup ("default");
+
+
+ // The list of all network groups that are registered with the server.
+ // The defaultNetworkGroup is not in the list of registered network groups.
+ private static TreeMap<String, NetworkGroup> registeredNetworkGroups =
+ new TreeMap<String, NetworkGroup>();
+
+ // A lock to protect concurrent access to the registeredNetworkGroups.
+ private static Object registeredNetworkGroupsLock = new Object();
+
+ // The ordered list of network groups.
+ private static List<NetworkGroup> orderedNetworkGroups =
+ new ArrayList<NetworkGroup>();
+
+
+ // The network group internal identifier.
+ private String networkGroupID = null;
+
+ // The network group priority
+ private int priority = 100;
+
+ // The network group criteria.
+ private NetworkGroupCriteria criteria = null;
+
+ // The network group resource limits
+ private ResourceLimits resourceLimits = null;
+
+ // The network group request filtering policy
+ private RequestFilteringPolicy requestFilteringPolicy = null;
+
+ /**
+ * Creates a new instance of the network group.
+ *
+ * @param networkGroupID the network group internal identifier
+ */
+ public NetworkGroup(
+ String networkGroupID
+ )
+ {
+ this.networkGroupID = networkGroupID;
+ }
+
+
+ /**
+ * Retrieves the network group ID.
+ * @return a string indicating the network group ID
+ */
+ public String getID() {
+ return networkGroupID;
+ }
+
+
+ /**
+ * Performs any finalization that might be required when this
+ * network group is unloaded. No action is taken in the
+ * default implementation.
+ */
+ public void finalizeNetworkGroup()
+ {
+ // No action is required by default.
+ }
+
+
+ /**
+ * Registers the current network group (this) with the server.
+ *
+ * @throws DirectoryException If the network group ID for the provided
+ * network group conflicts with the network
+ * group ID of an existing network group.
+ */
+ public void register()
+ throws DirectoryException
+ {
+ ensureNotNull(networkGroupID);
+
+ synchronized (registeredNetworkGroupsLock)
+ {
+ // The network group must not be already registered
+ if (registeredNetworkGroups.containsKey(networkGroupID))
+ {
+ Message message = ERR_REGISTER_NETWORK_GROUP_ALREADY_EXISTS.get(
+ networkGroupID);
+ throw new DirectoryException(
+ ResultCode.UNWILLING_TO_PERFORM, message);
+ }
+
+ TreeMap<String, NetworkGroup> newRegisteredNetworkGroups =
+ new TreeMap<String, NetworkGroup>(registeredNetworkGroups);
+ newRegisteredNetworkGroups.put(networkGroupID, this);
+ registeredNetworkGroups = newRegisteredNetworkGroups;
+
+ // Insert the network group at the right position in the ordered list
+ int index = 0;
+ for (NetworkGroup ng : registeredNetworkGroups.values()) {
+ if (ng.equals(this)) {
+ continue;
+ }
+ if (this.priority > ng.priority) {
+ index++;
+ }
+ }
+ orderedNetworkGroups.add(index, this);
+ }
+ }
+
+
+ /**
+ * Deregisters the current network group (this) with the server.
+ */
+ public void deregister()
+ {
+ synchronized (registeredNetworkGroupsLock)
+ {
+ TreeMap<String, NetworkGroup> networkGroups =
+ new TreeMap<String, NetworkGroup>(registeredNetworkGroups);
+ networkGroups.remove(networkGroupID);
+ registeredNetworkGroups = networkGroups;
+ orderedNetworkGroups.remove(this);
+ }
+ }
+
+
+ /**
+ * Registers a workflow with the network group.
+ *
+ * @param workflow the workflow to register
+ *
+ * @throws DirectoryException If the workflow ID for the provided
+ * workflow conflicts with the workflow
+ * ID of an existing workflow.
+ */
+ public void registerWorkflow(
+ WorkflowImpl workflow
+ ) throws DirectoryException
+ {
+ // The workflow is rgistered with no pre/post workflow element.
+ registerWorkflow(workflow, null, null);
+ }
+
+
+ /**
+ * Registers a workflow with the network group and the workflow may have
+ * pre and post workflow element.
+ *
+ * @param workflow the workflow to register
+ * @param preWorkflowElements the tasks to execute before the workflow
+ * @param postWorkflowElements the tasks to execute after the workflow
+ *
+ * @throws DirectoryException If the workflow ID for the provided
+ * workflow conflicts with the workflow
+ * ID of an existing workflow.
+ */
+ private void registerWorkflow(
+ WorkflowImpl workflow,
+ WorkflowElement<?>[] preWorkflowElements,
+ WorkflowElement<?>[] postWorkflowElements
+ ) throws DirectoryException
+ {
+ // Is it the rootDSE workflow?
+ DN baseDN = workflow.getBaseDN();
+ if (baseDN.isNullDN())
+ {
+ // NOTE - The rootDSE workflow is stored with the registeredWorkflows.
+ rootDSEWorkflowNode =
+ new RootDseWorkflowTopology(workflow, namingContexts);
+ }
+ else
+ {
+ // This workflow is not the rootDSE workflow. Try to insert it in the
+ // workflow topology.
+ WorkflowTopologyNode workflowNode = new WorkflowTopologyNode(
+ workflow, preWorkflowElements, postWorkflowElements);
+
+ // Register the workflow node with the network group. If the workflow
+ // ID is already existing then an exception is raised.
+ registerWorkflowNode(workflowNode);
+
+ // Now add the workflow in the workflow topology...
+ for (WorkflowTopologyNode curNode: registeredWorkflowNodes.values())
+ {
+ // Try to insert the new workflow under an existing workflow...
+ if (curNode.insertSubordinate(workflowNode))
+ {
+ // new workflow has been inserted in the topology
+ continue;
+ }
+
+ // ... or try to insert the existing workflow below the new
+ // workflow
+ if (workflowNode.insertSubordinate(curNode))
+ {
+ // new workflow has been inserted in the topology
+ continue;
+ }
+ }
+
+ // Rebuild the list of naming context handled by the network group
+ rebuildNamingContextList();
+ }
+ }
+
+
+ /**
+ * Deregisters a workflow with the network group. The workflow to
+ * deregister is identified by its baseDN.
+ *
+ * @param baseDN the baseDN of the workflow to deregister, may be null
+ *
+ * @return the deregistered workflow
+ */
+ public Workflow deregisterWorkflow(
+ DN baseDN
+ )
+ {
+ Workflow workflow = null;
+
+ if (baseDN == null)
+ {
+ return workflow;
+ }
+
+ if (baseDN.isNullDN())
+ {
+ // deregister the rootDSE
+ deregisterWorkflow(rootDSEWorkflowNode);
+ workflow = rootDSEWorkflowNode.getWorkflowImpl();
+ }
+ else
+ {
+ // deregister a workflow node
+ synchronized (registeredWorkflowNodesLock)
+ {
+ for (WorkflowTopologyNode node: registeredWorkflowNodes.values())
+ {
+ DN curDN = node.getBaseDN();
+ if (curDN.equals(baseDN))
+ {
+ // Call deregisterWorkflow() instead of deregisterWorkflowNode()
+ // because we want the naming context list to be updated as well.
+ deregisterWorkflow(node);
+ workflow = node.getWorkflowImpl();
+
+ // Only one workflow can match the baseDN, so we can break
+ // the loop here.
+ break;
+ }
+ }
+ }
+ }
+
+ return workflow;
+ }
+
+
+ /**
+ * Deregisters a workflow with the network group. The workflow to
+ * deregister is identified by its workflow ID.
+ *
+ * @param workflowID the workflow identifier of the workflow to deregister
+ */
+ public void deregisterWorkflow(
+ String workflowID
+ )
+ {
+ String rootDSEWorkflowID = null;
+ if (rootDSEWorkflowNode != null)
+ {
+ rootDSEWorkflowID = rootDSEWorkflowNode.getWorkflowImpl().getWorkflowId();
+ }
+
+ if (workflowID.equalsIgnoreCase(rootDSEWorkflowID))
+ {
+ // deregister the rootDSE
+ deregisterWorkflow(rootDSEWorkflowNode);
+ }
+ else
+ {
+ // deregister a workflow node
+ synchronized (registeredWorkflowNodesLock)
+ {
+ for (WorkflowTopologyNode node: registeredWorkflowNodes.values())
+ {
+ String curID = node.getWorkflowImpl().getWorkflowId();
+ if (curID.equals(workflowID))
+ {
+ // Call deregisterWorkflow() instead of deregisterWorkflowNode()
+ // because we want the naming context list to be updated as well.
+ deregisterWorkflow(node);
+
+ // Only one workflow can match the baseDN, so we can break
+ // the loop here.
+ break;
+ }
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Deregisters a workflow node with the network group.
+ *
+ * @param workflow the workflow node to deregister
+ */
+ private void deregisterWorkflow(Workflow workflow)
+ {
+ // true as soon as the workflow has been deregistered
+ boolean deregistered = false;
+
+ // Is it the rootDSE workflow?
+ if (workflow == rootDSEWorkflowNode)
+ {
+ rootDSEWorkflowNode = null;
+ deregistered = true;
+ }
+ else
+ {
+ // Deregister the workflow with the network group.
+ WorkflowTopologyNode workflowNode = (WorkflowTopologyNode) workflow;
+ deregisterWorkflowNode(workflowNode);
+ deregistered = true;
+
+ // The workflow to deregister is not the root DSE workflow.
+ // Remove it from the workflow topology.
+ workflowNode.remove();
+
+ // Rebuild the list of naming context handled by the network group
+ rebuildNamingContextList();
+ }
+
+ // If the workflow has been deregistered then deregister it with
+ // the default network group as well
+ if (deregistered && (this != defaultNetworkGroup))
+ {
+ defaultNetworkGroup.deregisterWorkflow(workflow);
+ }
+ }
+
+
+ /**
+ * Retrieves the list of registered workflows.
+ * @return a list of workflow ids
+ */
+ public List<String> getRegisteredWorkflows() {
+ List<String> workflowIDs = new ArrayList<String>();
+ synchronized (registeredWorkflowNodesLock) {
+ for (WorkflowTopologyNode node : registeredWorkflowNodes.values()) {
+ workflowIDs.add(node.getWorkflowImpl().getWorkflowId());
+ }
+ }
+ return workflowIDs;
+ }
+
+
+ /**
+ * Registers a workflow node with the network group.
+ *
+ * @param workflowNode the workflow node to register
+ *
+ * @throws DirectoryException If the workflow node ID for the provided
+ * workflow node conflicts with the workflow
+ * node ID of an existing workflow node.
+ */
+ private void registerWorkflowNode(
+ WorkflowTopologyNode workflowNode
+ ) throws DirectoryException
+ {
+ String workflowID = workflowNode.getWorkflowImpl().getWorkflowId();
+ ensureNotNull(workflowID);
+
+ synchronized (registeredWorkflowNodesLock)
+ {
+ // The workflow must not be already registered
+ if (registeredWorkflowNodes.containsKey(workflowID))
+ {
+ Message message = ERR_REGISTER_WORKFLOW_NODE_ALREADY_EXISTS.get(
+ workflowID, networkGroupID);
+ throw new DirectoryException(
+ ResultCode.UNWILLING_TO_PERFORM, message);
+ }
+
+ TreeMap<String, WorkflowTopologyNode> newRegisteredWorkflowNodes =
+ new TreeMap<String, WorkflowTopologyNode>(registeredWorkflowNodes);
+ newRegisteredWorkflowNodes.put(workflowID, workflowNode);
+ registeredWorkflowNodes = newRegisteredWorkflowNodes;
+ }
+ }
+
+
+ /**
+ * Deregisters the current worklow (this) with the server.
+ *
+ * @param workflowNode the workflow node to deregister
+ */
+ private void deregisterWorkflowNode(
+ WorkflowTopologyNode workflowNode
+ )
+ {
+ synchronized (registeredWorkflowNodesLock)
+ {
+ TreeMap<String, WorkflowTopologyNode> newWorkflowNodes =
+ new TreeMap<String, WorkflowTopologyNode>(registeredWorkflowNodes);
+ newWorkflowNodes.remove(workflowNode.getWorkflowImpl().getWorkflowId());
+ registeredWorkflowNodes = newWorkflowNodes;
+ }
+ }
+
+
+ /**
+ * Adds a connection to the group.
+ *
+ * @param connection the ClientConnection
+ */
+ public void addConnection(ClientConnection connection) {
+ if (resourceLimits != null) {
+ resourceLimits.addConnection(connection);
+ }
+ }
+
+ /**
+ * Removes a connection from the group.
+ *
+ * @param connection the ClientConnection
+ */
+ public void removeConnection(ClientConnection connection) {
+ if (resourceLimits != null) {
+ resourceLimits.removeConnection(connection);
+ }
+ }
+
+ /**
+ *
+ * Sets the network group priority.
+ *
+ * @param prio the network group priority
+ */
+ public void setNetworkGroupPriority(int prio) {
+ // Check whether the priority has changed
+ if (priority != prio) {
+ synchronized (registeredNetworkGroupsLock)
+ {
+ priority = prio;
+
+ // Nothing to do if the network group is not registered
+ if (registeredNetworkGroups.containsKey(networkGroupID)) {
+ // If the network group was already registered, remove it from the
+ // ordered list
+ orderedNetworkGroups.remove(this);
+
+ // Then insert it at the right position in the ordered list
+ int index = 0;
+ for (NetworkGroup ng : registeredNetworkGroups.values()) {
+ if (ng.equals(this)) {
+ continue;
+ }
+ if (this.priority > ng.priority) {
+ index++;
+ }
+ }
+ orderedNetworkGroups.add(index, this);
+ }
+ }
+ }
+ }
+
+ /**
+ *
+ * Sets the network group criteria.
+ *
+ * @param ngCriteria the criteria
+ */
+ public void setCriteria(NetworkGroupCriteria ngCriteria) {
+ criteria = ngCriteria;
+ }
+
+ /**
+ * Sets the Resource Limits.
+ *
+ * @param limits the new resource limits
+ */
+ public void setResourceLimits(ResourceLimits limits) {
+ resourceLimits = limits;
+ }
+
+
+ /**
+ * Sets the Request Filtering Policy.
+ *
+ * @param policy the new request filtering policy
+ */
+ public void setRequestFilteringPolicy(RequestFilteringPolicy policy) {
+ requestFilteringPolicy = policy;
+ }
+
+ /**
+ * Gets the highest priority matching network group.
+ *
+ * @param connection the client connection
+ * @return matching network group
+ */
+ public static NetworkGroup findMatchingNetworkGroup(
+ ClientConnection connection) {
+ for (NetworkGroup ng : getOrderedNetworkGroups()) {
+ if (ng.match(connection)) {
+ return ng;
+ }
+ }
+ return defaultNetworkGroup;
+ }
+
+ /**
+ * Gets the highest priority matching network group for a BIND op.
+ *
+ * @param connection the client connection
+ * @param dn the operation bindDN
+ * @param authType the operation authentication type
+ * @param isSecure a boolean indicating whether the operation is secured
+ * @return matching network group
+ */
+ public static NetworkGroup findBindMatchingNetworkGroup(
+ ClientConnection connection, DN dn, AuthenticationType authType,
+ boolean isSecure) {
+ for (NetworkGroup ng:getOrderedNetworkGroups()) {
+ if (ng.matchAfterBind(connection, dn, authType, isSecure)) {
+ return ng;
+ }
+ }
+ return defaultNetworkGroup;
+ }
+
+ /**
+ * Checks whether the connection matches the network group criteria.
+ *
+ * @param connection the client connection
+ * @return a boolean indicating the match
+ */
+ private boolean match(ClientConnection connection) {
+ if (criteria != null) {
+ return (criteria.match(connection));
+ }
+ return (true);
+ }
+
+ /**
+ * Checks whether the client connection matches the criteria after bind.
+ *
+ * @param connection the ClientConnection
+ * @param bindDN the DN used to bind
+ * @param authType the authentication type
+ * @param isSecure a boolean indicating whether the connection is secure
+ * @return a boolean indicating whether the connection matches the criteria
+ */
+ private boolean matchAfterBind(ClientConnection connection, DN bindDN,
+ AuthenticationType authType, boolean isSecure) {
+ if (criteria != null) {
+ return (criteria.matchAfterBind(connection, bindDN, authType, isSecure));
+ }
+ return (true);
+ }
+
+
+ /**
+ * Checks the resource limits.
+ *
+ * @param connection the client connection
+ * @param operation the ongoing operation
+ * @param fullCheck a boolean indicating the level of checking: full/partial
+ * @param messages the messages indicating the cause of the failure.
+ * @return a boolean indicating whether resource limits are exceeded
+ */
+ public boolean checkResourceLimits(
+ ClientConnection connection,
+ PreParseOperation operation,
+ boolean fullCheck,
+ List<Message> messages)
+ {
+ if (resourceLimits != null) {
+ return (resourceLimits.checkLimits(connection, operation,
+ fullCheck, messages));
+ }
+ return (true);
+ }
+
+ /**
+ * Gets the search size limit, i.e. the maximum number of entries returned
+ * by a search.
+ * @return the maximum number of entries returned by a search
+ */
+ public int getSearchSizeLimit() {
+ if (resourceLimits != null) {
+ return resourceLimits.getSizeLimit();
+ }
+ return 0;
+ }
+
+ /**
+ * Gets the search duration limit, i.e. the maximum duration of a search
+ * operation.
+ * @return the maximum duration in ms of a search operation
+ */
+ public int getSearchDurationLimit() {
+ if (resourceLimits != null) {
+ return resourceLimits.getTimeLimit();
+ }
+ return 0;
+ }
+
+ /**
+ * Gets the minimum string length of a substring filter in a search
+ * operation.
+ * @return the minimum substring length
+ */
+ public int getMinSubstring() {
+ if (resourceLimits != null) {
+ return resourceLimits.getMinSubstring();
+ }
+ return 0;
+ }
+
+
+ /**
+ * Checks the request filtering policy.
+ * @param operation the operation to be checked
+ * @param messages the error messages
+ * @return boolean indicating whether the operation conforms to the
+ * network group request filtering policy
+ */
+ public boolean checkRequestFilteringPolicy(
+ PreParseOperation operation,
+ List<Message> messages) {
+ if (requestFilteringPolicy != null) {
+ return requestFilteringPolicy.checkPolicy(operation, messages);
+ }
+ return true;
+ }
+
+
+ /**
+ * Gets the highest workflow in the topology that can handle the baseDN.
+ *
+ * @param baseDN the base DN of the request
+ * @return the highest workflow in the topology that can handle the base DN,
+ * <code>null</code> if none was found
+ */
+ public Workflow getWorkflowCandidate(
+ DN baseDN
+ )
+ {
+ // the top workflow to return
+ Workflow workflowCandidate = null;
+
+ // get the list of workflow candidates
+ if (baseDN.isNullDN())
+ {
+ // The rootDSE workflow is the candidate.
+ workflowCandidate = rootDSEWorkflowNode;
+ }
+ else
+ {
+ // Search the highest workflow in the topology that can handle
+ // the baseDN.
+ for (WorkflowTopologyNode curWorkflow: namingContexts.getNamingContexts())
+ {
+ workflowCandidate = curWorkflow.getWorkflowCandidate (baseDN);
+ if (workflowCandidate != null)
+ {
+ break;
+ }
+ }
+ }
+
+ return workflowCandidate;
+ }
+
+
+ /**
+ * Returns the default network group. The default network group is always
+ * defined and has no criterion, no policy and provide full access to
+ * all the registered workflows.
+ *
+ * @return the default network group
+ */
+ public static NetworkGroup getDefaultNetworkGroup()
+ {
+ return defaultNetworkGroup;
+ }
+
+
+ /**
+ * Rebuilds the list of naming contexts handled by the network group.
+ * This operation should be performed whenever a workflow topology
+ * has been updated (workflow registration or de-registration).
+ */
+ private void rebuildNamingContextList()
+ {
+ // reset lists of naming contexts
+ namingContexts.resetLists();
+
+ // a registered workflow with no parent is a naming context
+ for (WorkflowTopologyNode workflowNode: registeredWorkflowNodes.values())
+ {
+ WorkflowTopologyNode parent = workflowNode.getParent();
+ if (parent == null)
+ {
+ namingContexts.addNamingContext (workflowNode);
+ }
+ }
+ }
+
+
+ /**
+ * Returns the list of naming contexts handled by the network group.
+ *
+ * @return the list of naming contexts
+ */
+ public NetworkGroupNamingContexts getNamingContexts()
+ {
+ return namingContexts;
+ }
+
+
+ /**
+ * Dumps info from the current network group for debug purpose.
+ *
+ * @param leftMargin white spaces used to indent traces
+ * @return a string buffer that contains trace information
+ */
+ public StringBuilder toString(String leftMargin)
+ {
+ StringBuilder sb = new StringBuilder();
+ String newMargin = leftMargin + " ";
+
+ sb.append (leftMargin + "Networkgroup (" + networkGroupID+ "\n");
+ sb.append (leftMargin + "List of registered workflows:\n");
+ for (WorkflowTopologyNode node: registeredWorkflowNodes.values())
+ {
+ sb.append (node.toString (newMargin));
+ }
+
+ namingContexts.toString (leftMargin);
+
+ sb.append (leftMargin + "rootDSEWorkflow:\n");
+ if (rootDSEWorkflowNode == null)
+ {
+ sb.append (newMargin + "null\n");
+ }
+ else
+ {
+ sb.append (rootDSEWorkflowNode.toString (newMargin));
+ }
+
+ return sb;
+ }
+
+
+ /**
+ * Deregisters all network groups that have been registered. This should be
+ * called when the server is shutting down.
+ */
+ public static void deregisterAllOnShutdown()
+ {
+ synchronized (registeredNetworkGroupsLock)
+ {
+ // Invalidate all NetworkGroups so they cannot accidentally be used
+ // after a restart.
+ Collection<NetworkGroup> networkGroups = registeredNetworkGroups.values();
+ for (NetworkGroup networkGroup: networkGroups)
+ {
+ networkGroup.invalidate();
+ }
+ defaultNetworkGroup.invalidate();
+
+ registeredNetworkGroups = new TreeMap<String,NetworkGroup>();
+ defaultNetworkGroup = new NetworkGroup ("default");
+ }
+ }
+
+ /**
+ * We've seen parts of the server hold references to a NetworkGroup
+ * during an in-core server restart. To help detect when this happens,
+ * we null out the member variables, so we will fail fast with an NPE if an
+ * invalidate NetworkGroup is used.
+ */
+ private void invalidate()
+ {
+ namingContexts = null;
+ networkGroupID = null;
+ rootDSEWorkflowNode = null;
+ registeredWorkflowNodes = null;
+ }
+
+
+ /**
+ * Provides the list of network group registered with the server.
+ *
+ * @return the list of registered network groups
+ */
+ public static Collection<NetworkGroup> getRegisteredNetworkGroups()
+ {
+ return registeredNetworkGroups.values();
+ }
+
+
+ /**
+ * Provides the ordered list of registered Network groups.
+ *
+ * @return the ordered list of registered network groups
+ */
+ private static List<NetworkGroup> getOrderedNetworkGroups()
+ {
+ return orderedNetworkGroups;
+ }
+
+
+ /**
+ * Returns a specific NetworkGroup.
+ *
+ * @param networkGroupId the identifier of the requested network group
+ * @return the requested NetworkGroup
+ */
+ public static NetworkGroup getNetworkGroup(String networkGroupId)
+ {
+ return registeredNetworkGroups.get(networkGroupId);
+ }
+
+
+ /**
+ * Resets the configuration of all the registered network groups.
+ */
+ public static void resetConfig()
+ {
+ // Reset the default network group
+ defaultNetworkGroup.reset();
+
+ // Reset all the registered network group
+ synchronized (registeredNetworkGroupsLock)
+ {
+ registeredNetworkGroups = new TreeMap<String, NetworkGroup>();
+ }
+ }
+
+
+ /**
+ * Resets the configuration of the current network group.
+ */
+ public void reset()
+ {
+ synchronized (registeredWorkflowNodesLock)
+ {
+ registeredWorkflowNodes = new TreeMap<String, WorkflowTopologyNode>();
+ rootDSEWorkflowNode = null;
+ namingContexts = new NetworkGroupNamingContexts();
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java
new file mode 100644
index 0000000..3c6bd24
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java
@@ -0,0 +1,414 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.opends.messages.Message;
+import org.opends.server.admin.server.ConfigurationAddListener;
+import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.opends.server.admin.server.ConfigurationDeleteListener;
+import org.opends.server.admin.server.ServerManagementContext;
+import org.opends.server.admin.std.server.NetworkGroupCfg;
+import org.opends.server.admin.std.server.NetworkGroupCriteriaCfg;
+import
+ org.opends.server.admin.std.server.NetworkGroupRequestFilteringPolicyCfg;
+import org.opends.server.admin.std.server.NetworkGroupResourceLimitsCfg;
+import org.opends.server.admin.std.server.RootCfg;
+import org.opends.server.config.ConfigException;
+import org.opends.server.core.*;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.ResultCode;
+
+
+/**
+ * This class defines a utility that will be used to manage the configuration
+ * for the set of network groups defined in the Directory Server.
+ * It will perform the necessary initialization of those network groups when
+ * the server is first started, and then will manage any changes to them while
+ * the server is running.
+ */
+public class NetworkGroupConfigManager
+ implements ConfigurationChangeListener<NetworkGroupCfg>,
+ ConfigurationAddListener<NetworkGroupCfg>,
+ ConfigurationDeleteListener<NetworkGroupCfg>
+
+{
+ // A mapping between the DNs of the config entries and the associated
+ // network groups.
+ private ConcurrentHashMap<DN, NetworkGroup> networkGroups;
+
+
+
+ /**
+ * Creates a new instance of this network group config manager.
+ */
+ public NetworkGroupConfigManager()
+ {
+ networkGroups = new ConcurrentHashMap<DN, NetworkGroup>();
+ }
+
+
+
+ /**
+ * Initializes all network groups currently defined in the Directory
+ * Server configuration. This should only be called at Directory Server
+ * startup.
+ *
+ * @throws ConfigException If a configuration problem causes the network
+ * group initialization process to fail.
+ */
+ public void initializeNetworkGroups()
+ throws ConfigException
+ {
+ // Get the root configuration object.
+ ServerManagementContext managementContext =
+ ServerManagementContext.getInstance();
+ RootCfg rootConfiguration =
+ managementContext.getRootConfiguration();
+
+
+ // Register as an add and delete listener with the root configuration so we
+ // can be notified if any network group entries are added or removed.
+ rootConfiguration.addNetworkGroupAddListener(this);
+ rootConfiguration.addNetworkGroupDeleteListener(this);
+
+
+ //Initialize the existing network groups.
+ for (String networkGroupName : rootConfiguration.listNetworkGroups())
+ {
+ NetworkGroupCfg networkGroupConfiguration =
+ rootConfiguration.getNetworkGroup(networkGroupName);
+ networkGroupConfiguration.addChangeListener(this);
+
+ if (networkGroupConfiguration.isEnabled())
+ {
+ try
+ {
+ createAndRegisterNetworkGroup(networkGroupConfiguration);
+ }
+ catch (DirectoryException de)
+ {
+ throw new ConfigException(de.getMessageObject());
+ }
+ }
+ }
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationAddAcceptable(
+ NetworkGroupCfg configuration,
+ List<Message> unacceptableReasons)
+ {
+ // Nothing to check.
+ return true;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationAdd(
+ NetworkGroupCfg configuration)
+ {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ configuration.addChangeListener(this);
+
+ // If the new network group is enabled then create it and register it.
+ if (configuration.isEnabled())
+ {
+ try
+ {
+ createAndRegisterNetworkGroup(configuration);
+ }
+ catch (DirectoryException de)
+ {
+ if (resultCode == ResultCode.SUCCESS)
+ {
+ resultCode = DirectoryServer.getServerErrorResultCode();
+ }
+
+ messages.add(de.getMessageObject());
+ }
+
+ }
+
+ return new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationDeleteAcceptable(
+ NetworkGroupCfg configuration,
+ List<Message> unacceptableReasons)
+ {
+ return true;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationDelete(
+ NetworkGroupCfg configuration)
+ {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+
+ NetworkGroup networkGroup = networkGroups.remove(configuration.dn());
+ if (networkGroup != null)
+ {
+ networkGroup.deregister();
+ networkGroup.finalizeNetworkGroup();
+ }
+
+ return new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationChangeAcceptable(
+ NetworkGroupCfg configuration,
+ List<Message> unacceptableReasons)
+ {
+ // Nothing to check.
+ return true;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationChange(
+ NetworkGroupCfg configuration)
+ {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ ConfigChangeResult configChangeResult =
+ new ConfigChangeResult(resultCode, adminActionRequired, messages);
+
+
+ // Get the existing network group if it's already enabled.
+ NetworkGroup existingNetworkGroup = networkGroups.get(configuration.dn());
+
+ // If the new configuration has the network group disabled, then disable
+ // it if it is enabled, or do nothing if it's already disabled.
+ if (! configuration.isEnabled())
+ {
+ if (existingNetworkGroup != null)
+ {
+ networkGroups.remove(configuration.dn());
+ existingNetworkGroup.deregister();
+ existingNetworkGroup.finalizeNetworkGroup();
+ }
+
+ return configChangeResult;
+ }
+
+ // If the network group is disabled then create it and register it.
+ if (existingNetworkGroup == null)
+ {
+ try
+ {
+ createAndRegisterNetworkGroup(configuration);
+ }
+ catch (DirectoryException de)
+ {
+ if (resultCode == ResultCode.SUCCESS)
+ {
+ resultCode = DirectoryServer.getServerErrorResultCode();
+ }
+
+ messages.add(de.getMessageObject());
+ }
+ } else {
+ // The network group is already defined
+ // Simply update the properties
+ existingNetworkGroup.setNetworkGroupPriority(configuration.getPriority());
+
+ // Check for workflows currently registered in the network group
+ // but that must be removed
+ SortedSet<String> configWorkflows = configuration.getWorkflow();
+ for (String id : existingNetworkGroup.getRegisteredWorkflows()) {
+ if (!configWorkflows.contains(id)) {
+ existingNetworkGroup.deregisterWorkflow(id);
+ }
+ }
+
+ // Check for newly defined workflows
+ List<String> ngWorkflows = existingNetworkGroup.getRegisteredWorkflows();
+ for (String id : configuration.getWorkflow()) {
+ if (! ngWorkflows.contains(id)) {
+ WorkflowImpl workflowImpl =
+ (WorkflowImpl) WorkflowImpl.getWorkflow(id);
+ try {
+ existingNetworkGroup.registerWorkflow(workflowImpl);
+ } catch (DirectoryException de) {
+ if (resultCode == ResultCode.SUCCESS)
+ {
+ resultCode = DirectoryServer.getServerErrorResultCode();
+ }
+ messages.add(de.getMessageObject());
+ }
+ }
+ }
+ }
+
+ return configChangeResult;
+ }
+
+
+ /**
+ * Creates and registers a network group.
+ *
+ * @param networkGroupCfg the network group configuration
+ *
+ * @throws DirectoryException If a problem occurs while trying to
+ * register a network group.
+ */
+ private void createAndRegisterNetworkGroup(
+ NetworkGroupCfg networkGroupCfg
+ ) throws DirectoryException
+ {
+ // create the network group
+ String networkGroupId = networkGroupCfg.getNetworkGroupId();
+ NetworkGroup networkGroup = new NetworkGroup(networkGroupId);
+
+ // register the workflows with the network group
+ for (String workflowID: networkGroupCfg.getWorkflow())
+ {
+ WorkflowImpl workflowImpl =
+ (WorkflowImpl) WorkflowImpl.getWorkflow(workflowID);
+ networkGroup.registerWorkflow(workflowImpl);
+ }
+
+ // register the root DSE workflow with the network group
+ WorkflowImpl rootDSEworkflow =
+ (WorkflowImpl) WorkflowImpl.getWorkflow("__root.dse__#");
+ networkGroup.registerWorkflow(rootDSEworkflow);
+
+ // finally register the network group with the server
+ networkGroups.put(networkGroupCfg.dn(), networkGroup);
+ networkGroup.register();
+ // Set the priority
+ networkGroup.setNetworkGroupPriority(networkGroupCfg.getPriority());
+
+ // Set the criteria
+ NetworkGroupCriteriaCfg criteriaCfg;
+ NetworkGroupCriteria criteria;
+ try {
+ criteriaCfg = networkGroupCfg.getNetworkGroupCriteria();
+ } catch (ConfigException ce) {
+ criteriaCfg = null;
+ }
+
+ criteria = new NetworkGroupCriteria(criteriaCfg);
+ networkGroup.setCriteria(criteria);
+
+ // Add a config listener on the criteria
+ try {
+ networkGroupCfg.addNetworkGroupCriteriaAddListener(criteria);
+ networkGroupCfg.addNetworkGroupCriteriaDeleteListener(criteria);
+ } catch (ConfigException ex) {
+ throw new DirectoryException(ResultCode.UNDEFINED,
+ ex.getMessageObject());
+ }
+
+ // Set the resource limits
+ NetworkGroupResourceLimitsCfg limitsCfg;
+ ResourceLimits limits;
+
+ try {
+ limitsCfg = networkGroupCfg.getNetworkGroupResourceLimits();
+ } catch (ConfigException ex) {
+ limitsCfg = null;
+ }
+ limits = new ResourceLimits(limitsCfg);
+ networkGroup.setResourceLimits(limits);
+
+ // Add a config listener on the resource limits
+ try {
+ networkGroupCfg.addNetworkGroupResourceLimitsAddListener(limits);
+ networkGroupCfg.addNetworkGroupResourceLimitsDeleteListener(limits);
+ } catch (ConfigException ex) {
+ throw new DirectoryException(ResultCode.UNDEFINED,
+ ex.getMessageObject());
+ }
+
+ // Set the request filtering policy
+ NetworkGroupRequestFilteringPolicyCfg policyCfg;
+ RequestFilteringPolicy policy;
+ try {
+ policyCfg = networkGroupCfg.getNetworkGroupRequestFilteringPolicy();
+ } catch (ConfigException ex) {
+ policyCfg = null;
+ }
+ policy = new RequestFilteringPolicy(policyCfg);
+ networkGroup.setRequestFilteringPolicy(policy);
+
+ // Add a config listener on the request filtering policy
+ try {
+ networkGroupCfg.addNetworkGroupRequestFilteringPolicyAddListener
+ (policy);
+ networkGroupCfg.addNetworkGroupRequestFilteringPolicyDeleteListener(
+ policy);
+ } catch (ConfigException ex) {
+ throw new DirectoryException(ResultCode.UNDEFINED,
+ ex.getMessageObject());
+ }
+
+ }
+
+}
+
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupCriteria.java
new file mode 100644
index 0000000..02b0286
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupCriteria.java
@@ -0,0 +1,336 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+
+import org.opends.server.core.*;
+import java.util.ArrayList;
+import java.util.List;
+import org.opends.messages.Message;
+import org.opends.server.admin.server.ConfigurationAddListener;
+import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.opends.server.admin.server.ConfigurationDeleteListener;
+import
+ org.opends.server.admin.std.meta.NetworkGroupCriteriaCfgDefn.AllowedAuthMethod;
+import
+ org.opends.server.admin.std.meta.NetworkGroupCriteriaCfgDefn.AllowedLDAPPort;
+import org.opends.server.admin.std.server.NetworkGroupCriteriaCfg;
+import org.opends.server.api.ClientConnection;
+import org.opends.server.types.AddressMask;
+import org.opends.server.types.AuthenticationType;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.ResultCode;
+
+
+/**
+ * This class defines the network group criteria. A criterion is used
+ * by the network groups to determine whether a client connection belongs
+ * to the network group or not.
+ */
+public class NetworkGroupCriteria
+ implements ConfigurationAddListener<NetworkGroupCriteriaCfg>,
+ ConfigurationDeleteListener<NetworkGroupCriteriaCfg>,
+ ConfigurationChangeListener<NetworkGroupCriteriaCfg>,
+ NetworkGroupCriterion
+
+{
+ // Indicates whether the criteria are defined through the config
+ private boolean isConfigured = false;
+
+ // The network group criteria.
+ private AuthMethodCriteria authMethodCriteria;
+ private BindDnCriteria bindDnCriteria;
+ private IpFilterCriteria ipFilterCriteria;
+ private PortCriteria portCriteria;
+ private SecurityCriteria securityCriteria;
+
+ /**
+ * Constructor.
+ *
+ * @param criteriaCfg the configuration object used to build the Network
+ * Group Criteria.
+ * @throws DirectoryException If the criteria could not be created because
+ * of an invalid configuration parameter
+ */
+ public NetworkGroupCriteria(NetworkGroupCriteriaCfg criteriaCfg)
+ throws DirectoryException {
+ createCriteria(criteriaCfg);
+ }
+
+ /**
+ * Resets all the fields.
+ */
+ private void resetCriteria() {
+ authMethodCriteria = null;
+ bindDnCriteria = null;
+ ipFilterCriteria = null;
+ portCriteria = null;
+ securityCriteria = null;
+ isConfigured = false;
+ }
+
+ /**
+ * Creates a new NetworkGroupCriteria based on the configuration object.
+ *
+ * @param criteriaCfg the configuration
+ * @throws DirectoryException If the bind-dn-filter is not a valid DN filter
+ */
+ private void createCriteria(NetworkGroupCriteriaCfg criteriaCfg)
+ throws DirectoryException {
+ if (criteriaCfg != null) {
+ if (!criteriaCfg.getAllowedAuthMethod().isEmpty()) {
+ authMethodCriteria = new AuthMethodCriteria();
+ for (AllowedAuthMethod method: criteriaCfg.getAllowedAuthMethod()) {
+ authMethodCriteria.addAuthMethod(method);
+ }
+ } else {
+ authMethodCriteria = null;
+ }
+ if (!criteriaCfg.getBindDNFilter().isEmpty()) {
+ bindDnCriteria = new BindDnCriteria();
+ for (String filter: criteriaCfg.getBindDNFilter()) {
+ bindDnCriteria.addBindDnFilter(filter);
+ }
+ } else {
+ bindDnCriteria = null;
+ }
+ if (!criteriaCfg.getIPAddressFilter().isEmpty()) {
+ ipFilterCriteria = new IpFilterCriteria();
+ for (AddressMask filter: criteriaCfg.getIPAddressFilter()) {
+ ipFilterCriteria.addIpFilter(filter);
+ }
+ } else {
+ ipFilterCriteria = null;
+ }
+ if (!criteriaCfg.getAllowedLDAPPort().isEmpty()) {
+ portCriteria = new PortCriteria();
+ for (AllowedLDAPPort port : criteriaCfg.getAllowedLDAPPort()) {
+ portCriteria.addPort(port);
+ }
+ } else {
+ portCriteria = null;
+ }
+ if (criteriaCfg.isIsSecurityMandatory()) {
+ securityCriteria = new SecurityCriteria(true);
+ } else {
+ securityCriteria = null;
+ }
+ isConfigured = true;
+ criteriaCfg.addChangeListener(this);
+ } else {
+ resetCriteria();
+ }
+ }
+
+ /**
+ * Sets the authentication method criteria.
+ * @param criteria The authentication method criteria
+ */
+ public void setAuthMethodCriteria(AuthMethodCriteria criteria) {
+ authMethodCriteria = criteria;
+ isConfigured = true;
+ }
+
+ /**
+ * Sets the bind dn criteria.
+ * @param criteria The bind DN criteria
+ */
+ public void setBindDnCriteria(BindDnCriteria criteria) {
+ bindDnCriteria = criteria;
+ isConfigured = true;
+ }
+
+ /**
+ * Sets the IP filter criteria.
+ * @param criteria The IP filter criteria
+ */
+ public void setIpFilterCriteria(IpFilterCriteria criteria) {
+ ipFilterCriteria = criteria;
+ isConfigured = true;
+ }
+
+ /**
+ * Sets the port criteria.
+ * @param criteria The IP filter criteria
+ */
+ public void setPortCriteria(PortCriteria criteria) {
+ portCriteria = criteria;
+ isConfigured = true;
+ }
+
+ /**
+ * Sets the IP filter criteria.
+ * @param criteria The IP filter criteria
+ */
+ public void setSecurityCriteria(SecurityCriteria criteria) {
+ securityCriteria = criteria;
+ isConfigured = true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean match(ClientConnection connection) {
+ if ((authMethodCriteria != null)
+ && (!authMethodCriteria.match(connection))) {
+ return (false);
+ }
+ if ((bindDnCriteria != null) && (!bindDnCriteria.match(connection))) {
+ return (false);
+ }
+ if ((ipFilterCriteria != null) && (!ipFilterCriteria.match(connection))) {
+ return (false);
+ }
+ if ((portCriteria != null) && (!portCriteria.match(connection))) {
+ return (false);
+ }
+ if ((securityCriteria != null) && (!securityCriteria.match(connection))) {
+ return (false);
+ }
+ return (true);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean matchAfterBind(ClientConnection connection,
+ DN bindDN,
+ AuthenticationType authType,
+ boolean isSecure) {
+ if ((authMethodCriteria != null) && (!authMethodCriteria.matchAfterBind(
+ connection, bindDN, authType, isSecure))) {
+ return (false);
+ }
+ if ((bindDnCriteria != null) && (!bindDnCriteria.matchAfterBind(
+ connection, bindDN, authType, isSecure))) {
+ return (false);
+ }
+ if ((ipFilterCriteria != null) && (!ipFilterCriteria.matchAfterBind(
+ connection, bindDN, authType, isSecure))) {
+ return (false);
+ }
+ if ((portCriteria != null) && (!portCriteria.matchAfterBind(
+ connection, bindDN, authType, isSecure))) {
+ return (false);
+ }
+ if ((securityCriteria != null) && (!securityCriteria.matchAfterBind(
+ connection, bindDN, authType, isSecure))) {
+ return (false);
+ }
+ return (true);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationAddAcceptable(
+ NetworkGroupCriteriaCfg configuration,
+ List<Message> unacceptableReasons) {
+ return (!isConfigured);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationAdd(
+ NetworkGroupCriteriaCfg cfg) {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ ConfigChangeResult configChangeResult =
+ new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ try {
+ createCriteria(cfg);
+ } catch (DirectoryException de) {
+ if (resultCode == ResultCode.SUCCESS) {
+ resultCode = DirectoryServer.getServerErrorResultCode();
+ }
+ messages.add(de.getMessageObject());
+ }
+ return configChangeResult;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationDeleteAcceptable(
+ NetworkGroupCriteriaCfg configuration,
+ List<Message> unacceptableReasons) {
+ return (isConfigured);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationDelete(
+ NetworkGroupCriteriaCfg configuration) {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ ConfigChangeResult configChangeResult =
+ new ConfigChangeResult(resultCode, adminActionRequired, messages);
+
+ resetCriteria();
+
+ return configChangeResult;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationChangeAcceptable(
+ NetworkGroupCriteriaCfg configuration,
+ List<Message> unacceptableReasons) {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationChange(
+ NetworkGroupCriteriaCfg cfg) {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ ConfigChangeResult configChangeResult =
+ new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ try {
+ createCriteria(cfg);
+ } catch (DirectoryException de) {
+ if (resultCode == ResultCode.SUCCESS) {
+ resultCode = DirectoryServer.getServerErrorResultCode();
+ }
+ messages.add(de.getMessageObject());
+ }
+ return configChangeResult;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupCriterion.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupCriterion.java
new file mode 100644
index 0000000..ad39a13
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupCriterion.java
@@ -0,0 +1,63 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+import org.opends.server.api.ClientConnection;
+import org.opends.server.types.AuthenticationType;
+import org.opends.server.types.DN;
+
+/**
+ * This class defines the network group criteria. A criterion is used
+ * by the network groups to determine whether a client connection belongs
+ * to the network group or not.
+ */
+public interface NetworkGroupCriterion
+{
+
+ /**
+ * Checks whether the client connection matches the criteria.
+ *
+ * @param connection the ClientConnection
+ * @return a boolean indicating whether the connection matches the criteria
+ */
+ public boolean match(ClientConnection connection);
+
+ /**
+ * Checks whether the client connection matches the criteria after bind.
+ *
+ * @param connection the ClientConnection
+ * @param bindDN the DN used to bind
+ * @param authType the authentication type
+ * @param isSecure a boolean indicating whether the connection is secure
+ * @return a boolean indicating whether the connection matches the criteria
+ */
+ public boolean matchAfterBind(ClientConnection connection,
+ DN bindDN,
+ AuthenticationType authType,
+ boolean isSecure);
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupNamingContexts.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupNamingContexts.java
new file mode 100644
index 0000000..43e1668
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupNamingContexts.java
@@ -0,0 +1,182 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+import org.opends.server.core.*;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+
+/**
+ * This classes defines a list of naming contexts for a network group.
+ */
+public class NetworkGroupNamingContexts
+{
+ // List of naming contexts.
+ private List<WorkflowTopologyNode> namingContexts;
+ // If list of naming contexts is returned, ensure it is immutable
+ private List<WorkflowTopologyNode> _namingContexts;
+
+ // List of public naming contexts.
+ private List<WorkflowTopologyNode> publicNamingContexts;
+ // If list of public naming contexts is returned, ensure it is immutable
+ private List<WorkflowTopologyNode> _publicNamingContexts;
+
+ // List of private naming contexts.
+ private List<WorkflowTopologyNode> privateNamingContexts;
+ // If list of private naming contexts is returned, ensure it is immutable
+ private List<WorkflowTopologyNode> _privateNamingContexts;
+
+ /**
+ * Create a list of naming contexts for a network group.
+ */
+ public NetworkGroupNamingContexts()
+ {
+ namingContexts = new CopyOnWriteArrayList<WorkflowTopologyNode>();
+ _namingContexts = Collections.unmodifiableList(namingContexts);
+
+ privateNamingContexts = new CopyOnWriteArrayList<WorkflowTopologyNode>();
+ _privateNamingContexts =
+ Collections.unmodifiableList(privateNamingContexts);
+
+ publicNamingContexts = new CopyOnWriteArrayList<WorkflowTopologyNode>();
+ _publicNamingContexts = Collections.unmodifiableList(publicNamingContexts);
+ }
+
+
+ /**
+ * Reset the list of naming contexts.
+ */
+ public void resetLists()
+ {
+ namingContexts.clear();
+ privateNamingContexts.clear();
+ publicNamingContexts.clear();
+ }
+
+
+ /**
+ * Add a workflow in the list of naming context.
+ *
+ * @param workflow the workflow to add in the list of naming contexts
+ */
+ public void addNamingContext (
+ WorkflowTopologyNode workflow
+ )
+ {
+ // add the workflow to the list of naming context
+ namingContexts.add (workflow);
+
+ // add the workflow to the private/public list of naming contexts
+ if (workflow.isPrivate())
+ {
+ privateNamingContexts.add (workflow);
+ }
+ else
+ {
+ publicNamingContexts.add (workflow);
+ }
+ }
+
+
+ /**
+ * Get the list of naming contexts.
+ *
+ * <br>Note: the returned iterable instance is immutable and attempts to
+ * remove elements will throw an UnsupportedOperationException exception.
+ *
+ * @return the list of all the naming contexts
+ */
+ public Iterable<WorkflowTopologyNode> getNamingContexts()
+ {
+ return _namingContexts;
+ }
+
+
+ /**
+ * Get the list of private naming contexts.
+ *
+ * <br>Note: the returned iterable instance is immutable and attempts to
+ * remove elements will throw an UnsupportedOperationException exception.
+ *
+ * @return the list of private naming contexts
+ */
+ public Iterable<WorkflowTopologyNode> getPrivateNamingContexts()
+ {
+ return _privateNamingContexts;
+ }
+
+
+ /**
+ * Get the list of public naming contexts.
+ *
+ * <br>Note: the returned iterable instance is immutable and attempts to
+ * remove elements will throw an UnsupportedOperationException exception.
+ *
+ * @return the list of public naming contexts
+ */
+ public Iterable<WorkflowTopologyNode> getPublicNamingContexts()
+ {
+ return _publicNamingContexts;
+ }
+
+
+ /**
+ * Dumps info from the current networkk group for debug purpose.
+ *
+ * @param leftMargin white spaces used to indent traces
+ * @return a string buffer that contains trace information
+ */
+ public StringBuilder toString (String leftMargin)
+ {
+ StringBuilder sb = new StringBuilder();
+ String newMargin = leftMargin + " ";
+
+ sb.append (leftMargin + "List of naming contexts:\n");
+ for (WorkflowTopologyNode w: namingContexts)
+ {
+ sb.append (w.toString (newMargin));
+ }
+
+ sb.append (leftMargin + "List of PRIVATE naming contexts:\n");
+ for (WorkflowTopologyNode w: privateNamingContexts)
+ {
+ sb.append (w.toString (newMargin));
+ }
+
+ sb.append (leftMargin + "List of PUBLIC naming contexts:\n");
+ for (WorkflowTopologyNode w: publicNamingContexts)
+ {
+ sb.append (w.toString (newMargin));
+ }
+
+ return sb;
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupPolicy.java
new file mode 100644
index 0000000..ec0d10b
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/NetworkGroupPolicy.java
@@ -0,0 +1,46 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+
+/**
+ * This class defines the network group policy. A client connection
+ * that belongs to a network group has to comply with the policies
+ * attach to the network group.
+ */
+public class NetworkGroupPolicy
+{
+
+ /**
+ * Creates a new instance of the network group policy.
+ */
+ public NetworkGroupPolicy()
+ {
+ // No implementation is required.
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/PortCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/PortCriteria.java
new file mode 100644
index 0000000..cba4fd0
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/PortCriteria.java
@@ -0,0 +1,85 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import
+ org.opends.server.admin.std.meta.NetworkGroupCriteriaCfgDefn.AllowedLDAPPort;
+import org.opends.server.api.ClientConnection;
+import org.opends.server.types.AuthenticationType;
+import org.opends.server.types.DN;
+
+/**
+ * This class defines the port criteria.
+ * A client connection matches the criteria when it is received in
+ * a port matching at least one of the specified ports.
+ * The port can be "ldap" or "ldaps".
+ */
+public class PortCriteria implements NetworkGroupCriterion {
+ private Collection<String> allowedPorts;
+
+ /**
+ * Constructor.
+ */
+ public PortCriteria() {
+ allowedPorts = new ArrayList<String>();
+ }
+
+ /**
+ * Adds a new allowed LDAP port to the list of allowed LDAP ports.
+ * @param port The new LDAP port
+ */
+ public void addPort(AllowedLDAPPort port) {
+ if (port.toString().equals("ldap")) {
+ allowedPorts.add("LDAP");
+ } else if (port.toString().equals("ldaps")) {
+ allowedPorts.add("LDAP+SSL");
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean match(ClientConnection connection) {
+ String connectionPort = connection.getConnectionHandler().getProtocol();
+ for (String port:allowedPorts) {
+ if (connectionPort.equalsIgnoreCase(port)) {
+ return true;
+ }
+ }
+ return (false);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean matchAfterBind(ClientConnection connection, DN bindDN,
+ AuthenticationType authType, boolean isSecure) {
+ return (match(connection));
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicy.java
new file mode 100644
index 0000000..1c3a462
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicy.java
@@ -0,0 +1,595 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.opends.messages.Message;
+import org.opends.server.admin.server.ConfigurationAddListener;
+import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.opends.server.admin.server.ConfigurationDeleteListener;
+import org.opends.server.admin.std.server.
+ NetworkGroupRequestFilteringPolicyCfg;
+import org.opends.server.admin.std.meta.
+ NetworkGroupRequestFilteringPolicyCfgDefn.AllowedOperations;
+import org.opends.server.admin.std.meta.
+ NetworkGroupRequestFilteringPolicyCfgDefn.AllowedSearchScopes;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.OperationType;
+import org.opends.server.types.RawFilter;
+
+import org.opends.server.types.ResultCode;
+import org.opends.server.types.operation.PreParseAddOperation;
+import org.opends.server.types.operation.PreParseCompareOperation;
+import org.opends.server.types.operation.PreParseDeleteOperation;
+import org.opends.server.types.operation.PreParseModifyDNOperation;
+import org.opends.server.types.operation.PreParseModifyOperation;
+import org.opends.server.types.operation.PreParseOperation;
+import org.opends.server.types.operation.PreParseSearchOperation;
+import static org.opends.messages.CoreMessages.*;
+
+
+/**
+ * This class defines the request filtering policy applicable to all
+ * connections inside the same network group.
+ */
+public class RequestFilteringPolicy
+implements ConfigurationAddListener<NetworkGroupRequestFilteringPolicyCfg>,
+ ConfigurationDeleteListener<NetworkGroupRequestFilteringPolicyCfg>,
+ ConfigurationChangeListener<NetworkGroupRequestFilteringPolicyCfg>
+{
+ // The request filtering policy is defined through the config
+ private boolean isConfigured = false;
+
+ // The list of allowed operations
+ Set<AllowedOperations> allowedOperations = null;
+
+ // The list of allowed attributes
+ Set<String> allowedAttributes = null;
+
+ // The list of prohibited attributes
+ Set<String> prohibitedAttributes = null;
+
+ // The list of allowed search scopes
+ Set<AllowedSearchScopes> allowedSearchScopes = null;
+
+ // The list of allowed subtrees
+ Set<DN> allowedSubtrees = null;
+
+ // The list of prohibited subtrees
+ Set<DN> prohibitedSubtrees = null;
+
+
+ /**
+ * Constructor.
+ *
+ * @param policyCfg configuration
+ */
+ public RequestFilteringPolicy(
+ NetworkGroupRequestFilteringPolicyCfg policyCfg)
+ {
+ createPolicy(policyCfg);
+ }
+
+ /**
+ * Resets all the fields.
+ */
+ private void resetPolicy() {
+ allowedOperations = Collections.emptySet();
+ allowedAttributes = Collections.emptySet();
+ prohibitedAttributes = Collections.emptySet();
+ allowedSearchScopes = Collections.emptySet();
+ allowedSubtrees = Collections.emptySet();
+ prohibitedSubtrees = Collections.emptySet();
+
+ isConfigured = false;
+ }
+
+ /**
+ * Creates a RequestFilteringPolicy from a configuration object.
+ *
+ * @param policyCfg the configuration
+ */
+ private void createPolicy(
+ NetworkGroupRequestFilteringPolicyCfg policyCfg)
+ {
+ if (policyCfg != null) {
+ allowedOperations = policyCfg.getAllowedOperations();
+ allowedAttributes = policyCfg.getAllowedAttributes();
+ prohibitedAttributes = policyCfg.getProhibitedAttributes();
+ allowedSearchScopes = policyCfg.getAllowedSearchScopes();
+ allowedSubtrees = policyCfg.getAllowedSubtrees();
+ prohibitedSubtrees = policyCfg.getProhibitedSubtrees();
+
+ policyCfg.addChangeListener(this);
+
+ isConfigured = true;
+ } else {
+ resetPolicy();
+ }
+ }
+
+ /**
+ * Configures the set of allowed operations.
+ * @param allowedOps The set of allowed operations
+ */
+ public void setAllowedOperations(Set<AllowedOperations> allowedOps) {
+ if (allowedOps == null) {
+ allowedOperations = Collections.emptySet();
+ } else {
+ allowedOperations = allowedOps;
+ }
+ }
+
+ /**
+ * Configures the set of allowed attributes in search and compare operations.
+ * @param allowedAttrs The set of allowed attributes
+ */
+ public void setAllowedAttributes(Set<String> allowedAttrs) {
+ if (allowedAttrs == null) {
+ allowedAttributes = Collections.emptySet();
+ } else {
+ allowedAttributes = allowedAttrs;
+ }
+ }
+
+ /**
+ * Configures the set of prohibited attributes in search and compare
+ * operations.
+ * @param prohibitedAttrs The set of prohibited attributes
+ */
+ public void setProhibitedAttributes(Set<String> prohibitedAttrs) {
+ if (prohibitedAttrs == null) {
+ prohibitedAttributes = Collections.emptySet();
+ } else {
+ prohibitedAttributes = prohibitedAttrs;
+ }
+ }
+
+ /**
+ * Configures the set of allowed search scopes.
+ * @param allowedScopes The set of scopes
+ */
+ public void setAllowedSearchScopes(Set<AllowedSearchScopes> allowedScopes) {
+ if (allowedScopes == null) {
+ allowedSearchScopes = Collections.emptySet();
+ } else {
+ allowedSearchScopes = allowedScopes;
+ }
+ }
+
+ /**
+ * Configures the set of subtrees allowed in search operations.
+ * @param allowedSubt The set of allowed subtrees
+ */
+ public void setAllowedSubtrees(Set<DN> allowedSubt) {
+ if (allowedSubt == null) {
+ allowedSubtrees = Collections.emptySet();
+ } else {
+ allowedSubtrees = allowedSubt;
+ }
+ }
+
+ /**
+ * Configures the set of subtrees prohibited in search operations.
+ * @param prohibitedSubt The set of prohibited subtrees
+ */
+ public void setProhibitedSubtrees(Set<DN> prohibitedSubt) {
+ if (prohibitedSubt == null) {
+ prohibitedSubtrees = Collections.emptySet();
+ } else {
+ prohibitedSubtrees = prohibitedSubt;
+ }
+ }
+
+
+ /**
+ * Checks the request filtering policy.
+ *
+ * @param operation the ongoing operation
+ * @param messages the messages to include in the disconnect notification
+ * response. It may be <CODE>null</CODE> if no message
+ * is to be sent.
+ * @return a boolean indicating whether the operation is allowed
+ */
+ public boolean checkPolicy(
+ PreParseOperation operation,
+ List<Message> messages)
+ {
+ boolean result = true;
+
+ // Check the allowed operations
+ if (!allowedOperations.isEmpty()) {
+ switch (operation.getOperationType()) {
+ case ABANDON:
+ result= true;
+ break;
+ case ADD:
+ result = allowedOperations.contains(AllowedOperations.ADD);
+ break;
+ case BIND:
+ result = allowedOperations.contains(AllowedOperations.BIND);
+ break;
+ case COMPARE:
+ result = allowedOperations.contains(AllowedOperations.COMPARE);
+ break;
+ case DELETE:
+ result = allowedOperations.contains(AllowedOperations.DELETE);
+ break;
+ case EXTENDED:
+ result = allowedOperations.contains(AllowedOperations.EXTENDED);
+ break;
+ case MODIFY:
+ result = allowedOperations.contains(AllowedOperations.MODIFY);
+ break;
+ case MODIFY_DN:
+ result = allowedOperations.contains(AllowedOperations.RENAME);
+ break;
+ case SEARCH:
+ result = allowedOperations.contains(AllowedOperations.SEARCH);
+
+ // If inequality search are prohibited, need to check
+ if (result && !allowedOperations.contains(
+ AllowedOperations.INEQUALITY_SEARCH)) {
+ RawFilter flt =
+ ((PreParseSearchOperation) operation).getRawFilter();
+ result = (!containsInequalitySearch(flt));
+ }
+ break;
+ case UNBIND:
+ result = true;
+ break;
+ }
+
+ if (!result) {
+ messages.add(INFO_ERROR_OPERATION_NOT_ALLOWED.get());
+ return result;
+ }
+ }
+
+ // For search operations:
+ if (operation.getOperationType().equals(OperationType.SEARCH)) {
+ PreParseSearchOperation searchOp = (PreParseSearchOperation) operation;
+
+ // Check the allowed/prohibited attributes in search filter
+ if (!prohibitedAttributes.isEmpty()) {
+ // The attributes specified in prohibitedAttributes are not OK
+ result = (!containsProhibitedAttribute(searchOp.getRawFilter()));
+ }
+ if (!allowedAttributes.isEmpty()) {
+ // Only the attributes specified in allowedAttributes are OK
+ result = (containsOnlyAllowedAttributes(searchOp.getRawFilter()));
+ }
+ if (!result) {
+ messages.add(INFO_ERROR_ATTRIBUTE_NOT_ALLOWED.get());
+ return result;
+ }
+
+ // Check the search scope
+ if (!allowedSearchScopes.isEmpty()) {
+ switch (searchOp.getScope()) {
+ case BASE_OBJECT:
+ result = allowedSearchScopes.contains(AllowedSearchScopes.BASE);
+ break;
+ case SINGLE_LEVEL:
+ result = allowedSearchScopes.contains(AllowedSearchScopes.ONE);
+ break;
+ case WHOLE_SUBTREE:
+ result = allowedSearchScopes.contains(AllowedSearchScopes.SUB);
+ break;
+ case SUBORDINATE_SUBTREE:
+ result = allowedSearchScopes.contains(AllowedSearchScopes.CHILDREN);
+ break;
+ }
+
+ if (!result) {
+ messages.add(INFO_ERROR_SEARCH_SCOPE_NOT_ALLOWED.get());
+ return result;
+ }
+ }
+ }
+
+ // For compare operation
+ if (operation.getOperationType().equals(OperationType.COMPARE)) {
+ PreParseCompareOperation compareOp = (PreParseCompareOperation) operation;
+
+ // Check the allowed/prohibited attributes
+ if (!prohibitedAttributes.isEmpty()) {
+ result = (!prohibitedAttributes.contains(
+ compareOp.getRawAttributeType()));
+ }
+ if (!allowedAttributes.isEmpty()) {
+ result = (allowedAttributes.contains(compareOp.getRawAttributeType()));
+ }
+ if (!result) {
+ messages.add(INFO_ERROR_ATTRIBUTE_NOT_ALLOWED.get());
+ return result;
+ }
+ }
+
+ DN entryDN = null;
+ DN newEntryDN = null;
+ try {
+ switch (operation.getOperationType()) {
+ case ADD:
+ entryDN = DN.decode(
+ ((PreParseAddOperation) operation).getRawEntryDN());
+ break;
+ case COMPARE:
+ entryDN = DN.decode(
+ ((PreParseCompareOperation) operation).getRawEntryDN());
+ break;
+ case DELETE:
+ entryDN = DN.decode(
+ ((PreParseDeleteOperation) operation).getRawEntryDN());
+ break;
+ case EXTENDED:
+ break;
+ case MODIFY:
+ entryDN = DN.decode(
+ ((PreParseModifyOperation) operation).getRawEntryDN());
+ break;
+ case MODIFY_DN:
+ entryDN = DN.decode(
+ ((PreParseModifyDNOperation) operation).getRawEntryDN());
+ newEntryDN = DN.decode(
+ ((PreParseModifyDNOperation) operation).getRawNewRDN());
+ break;
+ case SEARCH:
+ entryDN = DN.decode(
+ ((PreParseSearchOperation) operation).getRawBaseDN());
+ break;
+ default:
+ break;
+ }
+ if (entryDN != null) {
+ result = ((isInAllowedSubtrees(entryDN))
+ && !(isInProhibitedSubtrees(entryDN)));
+ }
+ if (newEntryDN != null) {
+ result = ((isInAllowedSubtrees(newEntryDN))
+ && !(isInProhibitedSubtrees(newEntryDN)));
+ }
+
+ } catch (DirectoryException ex) {
+ Logger.getLogger(RequestFilteringPolicy.class.getName())
+ .log(Level.SEVERE, null, ex);
+ }
+ if (!result) {
+ messages.add(INFO_ERROR_SUBTREE_NOT_ALLOWED.get());
+ return result;
+ }
+
+ return (true);
+ }
+
+
+ /**
+ * Checks whether a filter contains an inequality search filter
+ * (i.e. either a greater_or_equal or a less_or_equal filter).
+ * @param filter The filter to be tested
+ * @return boolean indicating whether the filter contains an inequality
+ * search filter
+ */
+ private boolean containsInequalitySearch(RawFilter filter) {
+ boolean result = false;
+ switch (filter.getFilterType()) {
+ case AND:
+ case OR:
+ ArrayList<RawFilter> filterComponents = filter.getFilterComponents();
+ if (filterComponents != null) {
+ for (RawFilter element : filterComponents) {
+ if (containsInequalitySearch(element)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ case NOT:
+ return containsInequalitySearch(filter.getNOTComponent());
+ case GREATER_OR_EQUAL:
+ case LESS_OR_EQUAL:
+ return true;
+ default:
+ return false;
+ }
+
+ }
+
+ /**
+ * Checks whether a filter contains one of the prohibited attributes.
+ * @param filter The filter to be tested
+ * @return boolean indicating whether the filter contains at least one of
+ * the prohibited attributes
+ */
+ private boolean containsProhibitedAttribute(
+ RawFilter filter) {
+ boolean result = false;
+ switch (filter.getFilterType()) {
+ case AND:
+ case OR:
+ ArrayList<RawFilter> filterComponents = filter.getFilterComponents();
+ if (filterComponents != null) {
+ for (RawFilter element : filterComponents) {
+ if (containsProhibitedAttribute(element)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ case NOT:
+ return (containsProhibitedAttribute(filter.getNOTComponent()));
+ default:
+ return (prohibitedAttributes.contains(filter.getAttributeType()));
+ }
+ }
+
+ /**
+ * Checks whether a filter contains unallowed attributes.
+ * @param filter The filter to be tested
+ * @return boolean indicating whether the filter contains at least one
+ * attribute which is not in the allowed list
+ */
+ private boolean containsOnlyAllowedAttributes(
+ RawFilter filter) {
+ switch (filter.getFilterType()) {
+ case AND:
+ case OR:
+ ArrayList<RawFilter> filterComponents = filter.getFilterComponents();
+ if (filterComponents != null) {
+ for (RawFilter element : filterComponents) {
+ if (!containsOnlyAllowedAttributes(element)) {
+ return false;
+ }
+ }
+ }
+ return true;
+ case NOT:
+ return (containsOnlyAllowedAttributes(filter.getNOTComponent()));
+ default:
+ return (allowedAttributes.contains(filter.getAttributeType()));
+ }
+ }
+
+ /**
+ * Checks whether a DN is in a branch of the allowed subtrees.
+ * @param dn The DN to be tested
+ * @return boolean indicating whether the dn is in a branch of the allowed
+ * subtrees
+ */
+ private boolean isInAllowedSubtrees(DN dn) {
+ boolean result = false;
+ // If the variable is not set, consider allowedSubtrees = rootDSE
+ if (allowedSubtrees.isEmpty()) {
+ return true;
+ }
+ for (DN branch:allowedSubtrees) {
+ if (dn.isDescendantOf(branch)) {
+ result = true;
+ break;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Checks whether a DN is in a branch of the prohibited subtrees.
+ * @param dn The Dn to be tested
+ * @return boolean indicating whether the dn is in a branch of the prohibited
+ * subtrees
+ */
+ private boolean isInProhibitedSubtrees(DN dn) {
+ boolean result = false;
+ for (DN branch:prohibitedSubtrees) {
+ if (dn.isDescendantOf(branch)) {
+ result = true;
+ break;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationAddAcceptable(
+ NetworkGroupRequestFilteringPolicyCfg configuration,
+ List<Message> unacceptableReasons) {
+ return (!isConfigured);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationAdd(
+ NetworkGroupRequestFilteringPolicyCfg configuration) {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ ConfigChangeResult configChangeResult =
+ new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ createPolicy(configuration);
+ return configChangeResult;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationDeleteAcceptable(
+ NetworkGroupRequestFilteringPolicyCfg configuration,
+ List<Message> unacceptableReasons) {
+ return isConfigured;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationDelete(
+ NetworkGroupRequestFilteringPolicyCfg configuration) {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ ConfigChangeResult configChangeResult =
+ new ConfigChangeResult(resultCode, adminActionRequired, messages);
+
+ resetPolicy();
+
+ return configChangeResult;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationChangeAcceptable(
+ NetworkGroupRequestFilteringPolicyCfg configuration,
+ List<Message> unacceptableReasons) {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationChange(
+ NetworkGroupRequestFilteringPolicyCfg configuration) {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ ConfigChangeResult configChangeResult =
+ new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ createPolicy(configuration);
+ return configChangeResult;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/ResourceLimits.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/ResourceLimits.java
new file mode 100644
index 0000000..ae50064
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/ResourceLimits.java
@@ -0,0 +1,485 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import org.opends.messages.Message;
+import org.opends.server.admin.server.ConfigurationAddListener;
+import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.opends.server.admin.server.ConfigurationDeleteListener;
+import org.opends.server.admin.std.server.NetworkGroupResourceLimitsCfg;
+import org.opends.server.api.ClientConnection;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.RawFilter;
+import org.opends.server.types.ResultCode;
+
+import org.opends.server.types.operation.PreParseOperation;
+import org.opends.server.types.operation.PreParseSearchOperation;
+import static org.opends.messages.CoreMessages.*;
+
+
+/**
+ * This class defines the resource limits applicable to all
+ * connections inside the same network group.
+ */
+public class ResourceLimits
+ implements ConfigurationAddListener<NetworkGroupResourceLimitsCfg>,
+ ConfigurationDeleteListener<NetworkGroupResourceLimitsCfg>,
+ ConfigurationChangeListener<NetworkGroupResourceLimitsCfg>
+{
+ // The resource limits are defined through the config
+ private boolean isConfigured = false;
+
+ // The maximum number of connections in the network group
+ private int maxConnections;
+
+ // The maximum number of connections coming from the same IP address
+ private int maxConnectionsFromSameIP;
+
+ // The maximum number of operations per connection
+ private int maxOpsPerConnection;
+
+ // The maximum number of concurrent operations per connection
+ private int maxConcurrentOpsPerConnection;
+
+ // The maximum size for a search
+ private int searchSizeLimit;
+
+ // The maximum duration for a search
+ private int searchTimeLimit;
+
+ // The minimum substring length in a search
+ private int minSearchSubstringLength;
+
+ // The number of connections in the group
+ private int numConnections;
+
+ // Map containing the connections sorted by incoming IP address
+ HashMap<String, Integer> connectionsPerIpMap;
+
+ // The lock for the counter numConnections and the map connectionsPerIpMap
+ Object connMutex = new Object();
+
+ /**
+ * Constructor.
+ *
+ * @param resourceLimitsCfg configuration
+ */
+ public ResourceLimits(NetworkGroupResourceLimitsCfg resourceLimitsCfg) {
+ createLimits(resourceLimitsCfg);
+ }
+
+ /**
+ * Resets all the fields.
+ */
+ private void resetLimits() {
+ maxConnections = 0;
+ maxConnectionsFromSameIP = 0;
+ maxOpsPerConnection = 0;
+ maxConcurrentOpsPerConnection = 0;
+
+ searchSizeLimit = 0;
+ searchTimeLimit = 0;
+ minSearchSubstringLength = 0;
+ numConnections = 0;
+ connectionsPerIpMap = new HashMap<String, Integer>();
+ isConfigured = false;
+ }
+
+ /**
+ * Creates a ResourceLimits from a configuration object.
+ *
+ * @param resourcesCfg the configuration
+ */
+ private void createLimits(NetworkGroupResourceLimitsCfg resourcesCfg) {
+ if (resourcesCfg != null) {
+ maxConnections = resourcesCfg.getMaxConnections();
+ maxConnectionsFromSameIP = resourcesCfg.getMaxConnectionsFromSameIP();
+ maxOpsPerConnection = resourcesCfg.getMaxOpsPerConnection();
+ maxConcurrentOpsPerConnection =
+ resourcesCfg.getMaxConcurrentOpsPerConnection();
+
+ searchSizeLimit = resourcesCfg.getSearchSizeLimit();
+ searchTimeLimit = (int) resourcesCfg.getSearchTimeLimit();
+ minSearchSubstringLength = resourcesCfg.getMinSubstringLength();
+
+ resourcesCfg.addChangeListener(this);
+ isConfigured = true;
+ } else {
+ resetLimits();
+ }
+ }
+
+ /**
+ * Sets the maximum number of connections allowed in this network group.
+ * @param maxConn The maximum number of connections handled by this
+ * network group
+ */
+ public void setMaxConnections(int maxConn) {
+ maxConnections = maxConn;
+ }
+
+ /**
+ * Sets the maximum number of connections coming from the same client
+ * in this network group.
+ * @param maxConnFromSameClient The maximum number of connections coming
+ * from the same client in this network group
+ */
+ public void setMaxConnectionsFromSameIP(int maxConnFromSameClient) {
+ maxConnectionsFromSameIP = maxConnFromSameClient;
+ }
+
+ /**
+ * Sets the maximum number of operations performed on the same connection
+ * in this network group.
+ * @param maxOpsPerConn The maximum number of operations performed on
+ * the same connection
+ */
+ public void setMaxOpsPerConnection(int maxOpsPerConn) {
+ maxOpsPerConnection = maxOpsPerConn;
+ }
+
+ /**
+ * Sets the maximum number of concurrent operations performed on the same
+ * connection in this network group.
+ * @param maxConcurrentOpsPerConn The maximum number of simultaneous
+ * operations per connection on the same
+ * connection
+ */
+ public void setMaxConcurrentOpsPerConnection(int maxConcurrentOpsPerConn) {
+ maxConcurrentOpsPerConnection = maxConcurrentOpsPerConn;
+ }
+
+ /**
+ * Sets the search time limit for operations performed in this network group.
+ * @param maxSearchTime The search time limit
+ */
+ public void setSearchTimeLimit(int maxSearchTime) {
+ searchTimeLimit = maxSearchTime;
+ }
+
+ /**
+ * Sets the search size limit for operations performed in this network group.
+ * @param maxSearchSize The search size limit
+ */
+ public void setSearchSizeLimit(int maxSearchSize) {
+ searchSizeLimit = maxSearchSize;
+ }
+
+ /**
+ * Sets the minimum substring length for a search filter in this network
+ * group.
+ * @param minLength The minimum substring length
+ */
+ public void setMinSearchSubstringLength(int minLength) {
+ minSearchSubstringLength = minLength;
+ }
+
+ /**
+ * Returns the maximum number of entries returned by a search operation
+ * performed in this network group.
+ * @return the maximum number of entries
+ */
+ public int getSizeLimit() {
+ return searchSizeLimit;
+ }
+
+ /**
+ * Returns the maximum duration for a search operation performed in this
+ * network group.
+ * @return the maximum duration in ms
+ */
+ public int getTimeLimit() {
+ return searchTimeLimit;
+ }
+
+ /**
+ * Returns the minimum string length for a substring filter.
+ * @return minimum string length
+ */
+ public int getMinSubstring() {
+ return minSearchSubstringLength;
+ }
+
+ /**
+ * Adds a connection to the resource group.
+ *
+ * @param connection the ClientConnection to ad
+ */
+ public void addConnection(ClientConnection connection) {
+ synchronized(connMutex) {
+ // increment the number of connections managed by the network group
+ numConnections++;
+
+ // increment the number of connections from the given IP address
+ String ip = connection.getClientAddress();
+ Integer currentCount = connectionsPerIpMap.get(ip);
+ if (currentCount == null) {
+ currentCount = new Integer(0);
+ }
+
+ connectionsPerIpMap.put(ip, currentCount + 1);
+ }
+ }
+
+ /**
+ * Removes a connection from the nerwork group.
+ *
+ * @param connection the ClientConnection to remove
+ */
+ public void removeConnection(ClientConnection connection) {
+ synchronized(connMutex) {
+ // decrement the number of connections managed by the network group
+ numConnections--;
+
+ // decrement the number of connections from the given IP address
+ String ip = connection.getClientAddress();
+ Integer currentCount = connectionsPerIpMap.get(ip);
+ if (currentCount == null) {
+ // Should be error!
+ currentCount = new Integer(1);
+ }
+ if (currentCount == 1) {
+ // This was the last connection
+ connectionsPerIpMap.remove(ip);
+ } else {
+ connectionsPerIpMap.put(ip, currentCount - 1);
+ }
+ }
+ }
+
+ /**
+ * Checks the resource limits.
+ *
+ * @param connection the ClientConnection to check
+ * @param operation the ongoing operation
+ * @param fullCheck a boolean indicating if full checks must be done
+ * @param messages the messages to include in the disconnect notification
+ * response. It may be <CODE>null</CODE> if no message
+ * is to be sent.
+ * @return a boolean indicating whether the connection is allowed
+ */
+ public boolean checkLimits(
+ ClientConnection connection,
+ PreParseOperation operation,
+ boolean fullCheck,
+ List<Message> messages)
+ {
+ boolean result = true;
+
+ if (fullCheck) {
+ // Check the total number of connections in the resource group
+ synchronized(connMutex) {
+ if ((maxConnections > 0) && (numConnections > maxConnections)) {
+ messages.add(INFO_ERROR_MAX_CONNECTIONS_LIMIT_EXCEEDED.get());
+ result = false;
+ }
+ }
+ if (! result) {
+ return result;
+ }
+
+ // Check the number of connections coming from the same IP
+ synchronized(connMutex) {
+ // Add the connection in the map
+ String ip = connection.getClientAddress();
+
+ Integer currentCount = connectionsPerIpMap.get(ip);
+ if (currentCount == null) {
+ currentCount = new Integer(0);
+ }
+
+ if ((maxConnectionsFromSameIP > 0)
+ && (currentCount.intValue() > maxConnectionsFromSameIP)) {
+ messages.add(
+ INFO_ERROR_MAX_CONNECTIONS_FROM_SAME_IP_LIMIT_EXCEEDED.get());
+ result = false;
+ }
+ }
+ if (! result) {
+ return result;
+ }
+ }
+
+ // Check the max number of operations per connection
+ if ((maxOpsPerConnection > 0)
+ && (connection.getNumberOfOperations() > maxOpsPerConnection)) {
+ messages.add(
+ INFO_ERROR_MAX_OPERATIONS_PER_CONNECTION_LIMIT_EXCEEDED.get());
+ return false;
+ }
+
+ // Check the max number of concurrent operations per connection
+ if ((maxConcurrentOpsPerConnection > 0)
+ && (connection.getOperationsInProgress().size()
+ > maxConcurrentOpsPerConnection)) {
+ messages.add(
+ INFO_ERROR_MAX_CONCURRENT_OPERATIONS_PER_CONNECTION_LIMIT_EXCEEDED
+ .get());
+ return false;
+ }
+
+ // If the operation is a search, check the min search substring length
+ if ((operation != null) && (operation instanceof PreParseSearchOperation)) {
+ if (!checkSubstringFilter(
+ ((PreParseSearchOperation)operation).getRawFilter())) {
+ messages.add(
+ INFO_ERROR_MIN_SEARCH_SUBSTRING_LENGTH_LIMIT_EXCEEDED.get());
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Checks whether a filter enforces minimum substring length. If the
+ * filter is a composed filter (AND, OR, NOT filters), each component
+ * of the filter is recursively checked.
+ * When the filter is a substring filter, this routine checks that
+ * the substring length is greater or equal to the minimum substring
+ * length.
+ * For other search filter types, true is returned.
+ * @param filter The LDAP search filter to be tested
+ * @return boolean indicating whether the filter conforms to the
+ * minimum substring length rule.
+ */
+ private boolean checkSubstringFilter(RawFilter filter) {
+ switch (filter.getFilterType()) {
+ case AND:
+ case OR:
+ ArrayList<RawFilter> filterComponents = filter.getFilterComponents();
+ if (filterComponents != null) {
+ for (RawFilter element : filterComponents) {
+ if (!checkSubstringFilter(element)) {
+ return false;
+ }
+ }
+ }
+ return true;
+ case NOT:
+ return checkSubstringFilter(filter.getNOTComponent());
+ case SUBSTRING:
+ int length = 0;
+ ByteString subInitialElement = filter.getSubInitialElement();
+ if (subInitialElement != null) {
+ length += subInitialElement.stringValue().length();
+ }
+ ArrayList<ByteString> subAnyElements = filter.getSubAnyElements();
+ if (subAnyElements != null) {
+ for (ByteString element : subAnyElements) {
+ length += element.stringValue().length();
+ }
+ }
+ ByteString subFinalElement = filter.getSubFinalElement();
+ if (subFinalElement != null) {
+ length += subFinalElement.stringValue().length();
+ }
+ return (length >= minSearchSubstringLength);
+ default:
+ return true;
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationAddAcceptable(
+ NetworkGroupResourceLimitsCfg configuration,
+ List<Message> unacceptableReasons) {
+ return (!isConfigured);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationAdd(
+ NetworkGroupResourceLimitsCfg configuration) {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ ConfigChangeResult configChangeResult =
+ new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ createLimits(configuration);
+ return configChangeResult;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationDeleteAcceptable(
+ NetworkGroupResourceLimitsCfg configuration,
+ List<Message> unacceptableReasons) {
+ return isConfigured;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationDelete(
+ NetworkGroupResourceLimitsCfg configuration) {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ ConfigChangeResult configChangeResult =
+ new ConfigChangeResult(resultCode, adminActionRequired, messages);
+
+ resetLimits();
+ isConfigured = false;
+
+ return configChangeResult;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationChangeAcceptable(
+ NetworkGroupResourceLimitsCfg configuration,
+ List<Message> unacceptableReasons) {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationChange(
+ NetworkGroupResourceLimitsCfg configuration) {
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ ConfigChangeResult configChangeResult =
+ new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ createLimits(configuration);
+ return configChangeResult;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/SecurityCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/SecurityCriteria.java
new file mode 100644
index 0000000..b84a2be
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/SecurityCriteria.java
@@ -0,0 +1,75 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+import org.opends.server.api.ClientConnection;
+import org.opends.server.types.AuthenticationType;
+import org.opends.server.types.DN;
+
+/**
+ * This class defines a Security criteria.
+ * The criteria specifies whether all connections are allowed
+ * or only secured connections.
+ * A connection is considered secure if it takes place over
+ * SSL or with StartTLS.
+ */
+public class SecurityCriteria implements NetworkGroupCriterion {
+
+ // If the Security Criteria is enabled,
+ // a connection matches only if it is secured
+ // Otherwise (Security Criteria disabled),
+ // all connections match
+ private boolean enabled = true;
+
+ /**
+ * Constructor.
+ *
+ * @param isEnabled boolean indicating if security is mandatory
+ */
+ public SecurityCriteria(boolean isEnabled) {
+ enabled = isEnabled;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean match(ClientConnection connection) {
+ return (matchAfterBind(null, null, null, connection.isSecure()));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean matchAfterBind(ClientConnection connection, DN bindDN,
+ AuthenticationType authType, boolean isSecure) {
+ if (enabled) {
+ return isSecure;
+ } else {
+ return true;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/package-info.java
new file mode 100644
index 0000000..2e9358e
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/package-info.java
@@ -0,0 +1,49 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Contains various classes that comprise the network group criteria
+ * and resource limits of the Directory Server codebase. This includes:
+ * <BR>
+ * <UL>
+ * <LI>
+ * The code that is invoked to initialize the network group criteria
+ * and check if a connection matches a criteria.
+ * </LI>
+ * <LI>
+ * The code that is invoked to initialize the network group resource limits
+ * and check that a new connection or a new operation is within
+ * the resource limits.
+ * </LI>
+ * </UL>
+ */
+@org.opends.server.types.PublicAPI(
+ stability=org.opends.server.types.StabilityLevel.PRIVATE)
+package org.opends.server.core.networkgroups;
+
diff --git a/opendj-sdk/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-sdk/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index 31329cd..be481d5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -105,8 +105,6 @@
cryptographic operations.
<p>
Other components of CryptoManager:
- @see "src/admin/defn/org/opends/server/admin/std\
- /CryptoManagerConfiguration.xml"
@see org.opends.server.crypto.CryptoManagerSync
@see org.opends.server.crypto.GetSymmetricKeyExtendedOperation
*/
@@ -674,31 +672,20 @@
final Entry entry = new Entry(entryDN, null, null, null);
entry.addObjectClass(DirectoryServer.getTopObjectClass());
entry.addObjectClass(ocInstanceKey);
+
// Add the key ID attribute.
- final LinkedHashSet<AttributeValue> keyIDValueSet =
- new LinkedHashSet<AttributeValue>(1);
- keyIDValueSet.add(distinguishedValue);
- final Attribute keyIDAttr = new Attribute(
- attrKeyID,
- attrKeyID.getNameOrOID(),
- keyIDValueSet);
- entry.addAttribute(keyIDAttr,
- new ArrayList<AttributeValue>(0));
+ final Attribute keyIDAttr = Attributes.create(attrKeyID,
+ distinguishedValue);
+ entry.addAttribute(keyIDAttr, new ArrayList<AttributeValue>(0));
+
// Add the public key certificate attribute.
- final LinkedHashSet<AttributeValue> certificateValueSet =
- new LinkedHashSet<AttributeValue>(1);
- final AttributeValue certificateValue = new AttributeValue(
- attrPublicKeyCertificate,
- ByteStringFactory.create(instanceKeyCertificate));
- certificateValueSet.add(certificateValue);
- final LinkedHashSet<String> certificateOptions =
- new LinkedHashSet<String>(1);
- certificateOptions.add("binary");
- final Attribute certificateAttr = new Attribute(
- attrPublicKeyCertificate,
- attrPublicKeyCertificate.getNameOrOID(),
- certificateOptions,
- certificateValueSet);
+ AttributeBuilder builder = new AttributeBuilder(
+ attrPublicKeyCertificate);
+ builder.setOption("binary");
+ builder.add(new AttributeValue(
+ attrPublicKeyCertificate,
+ ByteStringFactory.create(instanceKeyCertificate)));
+ final Attribute certificateAttr = builder.toAttribute();
entry.addAttribute(certificateAttr,
new ArrayList<AttributeValue>(0));
@@ -1225,9 +1212,8 @@
InternalClientConnection.getRootConnection();
List<Modification> modifications =
new ArrayList<Modification>(1);
- Attribute attribute =
- new Attribute(ConfigConstants.ATTR_CRYPTO_SYMMETRIC_KEY,
- symmetricKey);
+ Attribute attribute = Attributes.create(
+ ConfigConstants.ATTR_CRYPTO_SYMMETRIC_KEY, symmetricKey);
modifications.add(
new Modification(ModificationType.ADD, attribute,
false));
@@ -1324,9 +1310,8 @@
InternalClientConnection.getRootConnection();
List<Modification> modifications =
new ArrayList<Modification>(1);
- Attribute attribute =
- new Attribute(ConfigConstants.ATTR_CRYPTO_SYMMETRIC_KEY,
- symmetricKey);
+ Attribute attribute = Attributes.create(
+ ConfigConstants.ATTR_CRYPTO_SYMMETRIC_KEY, symmetricKey);
modifications.add(
new Modification(ModificationType.ADD, attribute,
false));
@@ -1434,7 +1419,7 @@
* Returns the compact {@code byte[]} representation of this
* {@code KeyEntryID}.
* @return The compact {@code byte[]} representation of this
- * {@code KeyEntryID
+ * {@code KeyEntryID}.
*/
public byte[] getByteValue(){
final byte[] uuidBytes = new byte[16];
@@ -1743,53 +1728,28 @@
new LinkedHashMap<AttributeType,List<Attribute>>();
// Add the key ID attribute.
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(distinguishedValue);
-
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(attrKeyID,
- attrKeyID.getNameOrOID(),
- valueSet));
+ attrList.add(Attributes.create(attrKeyID, distinguishedValue));
userAttrs.put(attrKeyID, attrList);
// Add the transformation name attribute.
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(attrTransformation,
- keyEntry.getType()));
-
attrList = new ArrayList<Attribute>(1);
- attrList.add(
- new Attribute(attrTransformation,
- attrTransformation.getNameOrOID(),
- valueSet));
+ attrList.add(Attributes.create(attrTransformation,
+ new AttributeValue(attrTransformation, keyEntry.getType())));
userAttrs.put(attrTransformation, attrList);
-
// Add the init vector length attribute.
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(
- attrInitVectorLength,
- String.valueOf(keyEntry.getIVLengthBits())));
-
attrList = new ArrayList<Attribute>(1);
- attrList.add(
- new Attribute(attrInitVectorLength,
- attrInitVectorLength.getNameOrOID(),
- valueSet));
+ attrList.add(Attributes.create(attrInitVectorLength,
+ new AttributeValue(attrInitVectorLength, String.valueOf(keyEntry
+ .getIVLengthBits()))));
userAttrs.put(attrInitVectorLength, attrList);
// Add the key length attribute.
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(attrKeyLength,
- String.valueOf(keyEntry.getKeyLengthBits())));
-
attrList = new ArrayList<Attribute>(1);
- attrList.add(
- new Attribute(attrKeyLength,
- attrKeyLength.getNameOrOID(),
- valueSet));
+ attrList.add(Attributes.create(attrKeyLength, new AttributeValue(
+ attrKeyLength, String.valueOf(keyEntry.getKeyLengthBits()))));
userAttrs.put(attrKeyLength, attrList);
@@ -1804,27 +1764,17 @@
instanceKeyCertificate);
// Add the symmetric key attribute.
- LinkedHashSet<AttributeValue> symmetricKeyValues =
- new LinkedHashSet<AttributeValue>(trustedCerts.size());
-
- for (Map.Entry<String, byte[]> mapEntry :
- trustedCerts.entrySet())
+ AttributeBuilder builder = new AttributeBuilder(attrSymmetricKey);
+ for (Map.Entry<String, byte[]> mapEntry : trustedCerts.entrySet())
{
- String symmetricKey =
- cryptoManager.encodeSymmetricKeyAttribute(
- mapEntry.getKey(),
- mapEntry.getValue(),
- keyEntry.getSecretKey());
+ String symmetricKey = cryptoManager.encodeSymmetricKeyAttribute(
+ mapEntry.getKey(), mapEntry.getValue(), keyEntry.getSecretKey());
- symmetricKeyValues.add(
- new AttributeValue(attrSymmetricKey, symmetricKey));
-
- attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(attrSymmetricKey,
- attrSymmetricKey.getNameOrOID(),
- symmetricKeyValues));
- userAttrs.put(attrSymmetricKey, attrList);
+ builder.add(new AttributeValue(attrSymmetricKey, symmetricKey));
}
+ attrList = new ArrayList<Attribute>(1);
+ attrList.add(builder.toAttribute());
+ userAttrs.put(attrSymmetricKey, attrList);
// Create the entry.
Entry entry = new Entry(entryDN, ocMap, userAttrs, opAttrs);
@@ -1994,8 +1944,7 @@
* {@code null} if no such entry exists.
*
* @see CryptoManagerImpl.MacKeyEntry
- * #getKeyEntry(org.opends.server.types.CryptoManager,
- * java.lang.String, int)
+ * #getKeyEntry(CryptoManagerImpl, String, int)
*/
public static CipherKeyEntry getKeyEntry(
CryptoManagerImpl cryptoManager,
@@ -2324,39 +2273,22 @@
new LinkedHashMap<AttributeType,List<Attribute>>();
// Add the key ID attribute.
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(distinguishedValue);
-
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(attrKeyID,
- attrKeyID.getNameOrOID(),
- valueSet));
+ attrList.add(Attributes.create(attrKeyID,
+ distinguishedValue));
userAttrs.put(attrKeyID, attrList);
// Add the mac algorithm name attribute.
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(attrMacAlgorithm,
- keyEntry.getType()));
-
attrList = new ArrayList<Attribute>(1);
- attrList.add(
- new Attribute(attrMacAlgorithm,
- attrMacAlgorithm.getNameOrOID(),
- valueSet));
+ attrList.add(Attributes.create(attrMacAlgorithm,
+ new AttributeValue(attrMacAlgorithm, keyEntry.getType())));
userAttrs.put(attrMacAlgorithm, attrList);
// Add the key length attribute.
- valueSet = new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(
- attrKeyLength, String.valueOf(keyEntry.getKeyLengthBits())));
-
attrList = new ArrayList<Attribute>(1);
- attrList.add(
- new Attribute(attrKeyLength,
- attrKeyLength.getNameOrOID(),
- valueSet));
+ attrList.add(Attributes.create(attrKeyLength, new AttributeValue(
+ attrKeyLength, String.valueOf(keyEntry.getKeyLengthBits()))));
userAttrs.put(attrKeyLength, attrList);
@@ -2371,9 +2303,7 @@
instanceKeyCertificate);
// Add the symmetric key attribute.
- LinkedHashSet<AttributeValue> symmetricKeyValues =
- new LinkedHashSet<AttributeValue>(trustedCerts.size());
-
+ AttributeBuilder builder = new AttributeBuilder(attrSymmetricKey);
for (Map.Entry<String, byte[]> mapEntry :
trustedCerts.entrySet())
{
@@ -2383,16 +2313,14 @@
mapEntry.getValue(),
keyEntry.getSecretKey());
- symmetricKeyValues.add(
+ builder.add(
new AttributeValue(attrSymmetricKey, symmetricKey));
-
- attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(attrSymmetricKey,
- attrSymmetricKey.getNameOrOID(),
- symmetricKeyValues));
- userAttrs.put(attrSymmetricKey, attrList);
}
+ attrList = new ArrayList<Attribute>(1);
+ attrList.add(builder.toAttribute());
+ userAttrs.put(attrSymmetricKey, attrList);
+
// Create the entry.
Entry entry = new Entry(entryDN, ocMap, userAttrs, opAttrs);
@@ -2547,8 +2475,7 @@
* {@code null} if no such entry exists.
*
* @see CryptoManagerImpl.CipherKeyEntry
- * #getKeyEntry(org.opends.server.types.CryptoManager,
- * java.lang.String, int)
+ * #getKeyEntry(CryptoManagerImpl, String, int)
*/
public static MacKeyEntry getKeyEntry(
final CryptoManagerImpl cryptoManager,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
index 2830f01..8f722cb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
@@ -142,8 +142,8 @@
for (Attribute a : attrList)
{
- if (a.hasValue(vf) ||
- (config.isTestReversedPassword() && a.hasValue(vr)))
+ if (a.contains(vf) ||
+ (config.isTestReversedPassword() && a.contains(vr)))
{
invalidReason.append(ERR_ATTRVALUE_VALIDATOR_PASSWORD_IN_ENTRY.get());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 6a14302..e2abe0c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -1600,10 +1600,10 @@
* {@inheritDoc}
*/
@Override()
- public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
- throws DirectoryException
+ public void replaceEntry(Entry oldEntry, Entry newEntry,
+ ModifyOperation modifyOperation) throws DirectoryException
{
- Entry e = entry.duplicate(false);
+ Entry e = newEntry.duplicate(false);
// If there is a modify operation, then make sure that the associated user
// has both the CONFIG_READ and CONFIG_WRITE privileges. Also, if the
@@ -1681,7 +1681,7 @@
// If the structural class is different between the current entry and the
// new entry, then reject the change.
if (! currentEntry.getEntry().getStructuralObjectClass().equals(
- entry.getStructuralObjectClass()))
+ newEntry.getStructuralObjectClass()))
{
Message message = ERR_CONFIG_FILE_MODIFY_STRUCTURAL_CHANGE_NOT_ALLOWED.
get(String.valueOf(entryDN));
@@ -1690,7 +1690,7 @@
// Create a new config entry to use for the validation testing.
- ConfigEntry newEntry = new ConfigEntry(e, currentEntry.getParent());
+ ConfigEntry newConfigEntry = new ConfigEntry(e, currentEntry.getParent());
// See if there are any config change listeners registered for this entry.
@@ -1700,7 +1700,7 @@
MessageBuilder unacceptableReason = new MessageBuilder();
for (ConfigChangeListener l : changeListeners)
{
- if (! l.configChangeIsAcceptable(newEntry, unacceptableReason))
+ if (! l.configChangeIsAcceptable(newConfigEntry, unacceptableReason))
{
Message message = ERR_CONFIG_FILE_MODIFY_REJECTED_BY_CHANGE_LISTENER.
get(String.valueOf(entryDN), String.valueOf(unacceptableReason));
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/DynamicGroup.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/DynamicGroup.java
index 94ed97a..8a627ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/DynamicGroup.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/DynamicGroup.java
@@ -154,7 +154,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java
index 10e7068..a1fffc2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java
@@ -25,26 +25,26 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
-import org.opends.messages.Message;
+
+
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.util.StaticUtils.*;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.SortedSet;
-import org.opends.server.core.DirectoryServer;
+import org.opends.messages.Message;
+import org.opends.messages.MessageDescriptor;
import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchFilter;
-import org.opends.messages.MessageDescriptor;
-import static org.opends.server.loggers.ErrorLogger.logError;
-import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
+
/**
* This class provides some common tools to all entry cache implementations.
@@ -381,84 +381,48 @@
{
ArrayList<Attribute> attrs = new ArrayList<Attribute>();
- if (cacheHits != null) {
- AttributeType hitsAttrType =
- DirectoryServer.getDefaultAttributeType("entryCacheHits");
- LinkedHashSet<AttributeValue> hitsValues =
- new LinkedHashSet<AttributeValue>();
- hitsValues.add(new AttributeValue(hitsAttrType,
- cacheHits.toString()));
- attrs.add(new Attribute(hitsAttrType, "entryCacheHits",
- hitsValues));
- // Cache misses is required to get cache tries and hit ratio.
- if (cacheMisses != null) {
- AttributeType triesAttrType =
- DirectoryServer.getDefaultAttributeType("entryCacheTries");
- LinkedHashSet<AttributeValue> triesValues =
- new LinkedHashSet<AttributeValue>();
- Long cacheTries = cacheHits + cacheMisses;
- triesValues.add(new AttributeValue(triesAttrType,
- cacheTries.toString()));
- attrs.add(new Attribute(triesAttrType, "entryCacheTries",
- triesValues));
+ if (cacheHits != null)
+ {
+ attrs
+ .add(Attributes.create("entryCacheHits", cacheHits.toString()));
- AttributeType hitRatioAttrType =
- DirectoryServer.getDefaultAttributeType("entryCacheHitRatio");
- LinkedHashSet<AttributeValue> hitRatioValues =
- new LinkedHashSet<AttributeValue>();
- Double hitRatioRaw = cacheTries > 0 ?
- cacheHits.doubleValue() / cacheTries.doubleValue() :
- cacheHits.doubleValue() / 1;
+ // Cache misses is required to get cache tries and hit ratio.
+ if (cacheMisses != null)
+ {
+ Long cacheTries = cacheHits + cacheMisses;
+ attrs.add(Attributes.create("entryCacheTries", cacheTries
+ .toString()));
+
+ Double hitRatioRaw = cacheTries > 0 ? cacheHits.doubleValue()
+ / cacheTries.doubleValue() : cacheHits.doubleValue() / 1;
Double hitRatio = hitRatioRaw * 100D;
- hitRatioValues.add(new AttributeValue(hitRatioAttrType,
- Long.toString(hitRatio.longValue())));
- attrs.add(new Attribute(hitRatioAttrType, "entryCacheHitRatio",
- hitRatioValues));
+ attrs.add(Attributes.create("entryCacheHitRatio", Long
+ .toString(hitRatio.longValue())));
}
}
- if (cacheSize != null) {
- AttributeType memoryAttrType =
- DirectoryServer.getDefaultAttributeType("currentEntryCacheSize");
- LinkedHashSet<AttributeValue> memoryValues =
- new LinkedHashSet<AttributeValue>();
- memoryValues.add(new AttributeValue(memoryAttrType,
- cacheSize.toString()));
- attrs.add(new Attribute(memoryAttrType, "currentEntryCacheSize",
- memoryValues));
+ if (cacheSize != null)
+ {
+ attrs.add(Attributes.create("currentEntryCacheSize", cacheSize
+ .toString()));
}
- if (maxCacheSize != null) {
- AttributeType maxMemoryAttrType =
- DirectoryServer.getDefaultAttributeType("maxEntryCacheSize");
- LinkedHashSet<AttributeValue> maxMemoryValues =
- new LinkedHashSet<AttributeValue>();
- maxMemoryValues.add(new AttributeValue(maxMemoryAttrType,
- maxCacheSize.toString()));
- attrs.add(new Attribute(maxMemoryAttrType, "maxEntryCacheSize",
- maxMemoryValues));
+ if (maxCacheSize != null)
+ {
+ attrs.add(Attributes.create("maxEntryCacheSize", maxCacheSize
+ .toString()));
}
- if (cacheCount != null) {
- AttributeType entriesAttrType =
- DirectoryServer.getDefaultAttributeType("currentEntryCacheCount");
- LinkedHashSet<AttributeValue> entriesValues =
- new LinkedHashSet<AttributeValue>();
- entriesValues.add(new AttributeValue(entriesAttrType,
- cacheCount.toString()));
- attrs.add(new Attribute(entriesAttrType, "currentEntryCacheCount",
- entriesValues));
+ if (cacheCount != null)
+ {
+ attrs.add(Attributes.create("currentEntryCacheCount", cacheCount
+ .toString()));
}
- if (maxCacheCount != null) {
- AttributeType maxEntriesAttrType =
- DirectoryServer.getDefaultAttributeType("maxEntryCacheCount");
- LinkedHashSet<AttributeValue> maxEntriesValues =
- new LinkedHashSet<AttributeValue>();
- maxEntriesValues.add(new AttributeValue(maxEntriesAttrType,
- maxCacheCount.toString()));
- attrs.add(new Attribute(maxEntriesAttrType, "maxEntryCacheCount",
- maxEntriesValues));
+ if (maxCacheCount != null)
+ {
+ attrs.add(Attributes.create("maxEntryCacheCount", maxCacheCount
+ .toString()));
}
return attrs;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index ccead89..be9ee9c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -301,7 +301,7 @@
boolean found = false;
for (Attribute a : certAttrList)
{
- if (a.hasValue(v))
+ if (a.contains(v))
{
found = true;
break;
@@ -349,7 +349,7 @@
boolean found = false;
for (Attribute a : certAttrList)
{
- if (a.hasValue(v))
+ if (a.contains(v))
{
found = true;
break;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java
index a2eeb96..0a212b1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java
@@ -215,6 +215,7 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public void initializeEntryCache(FileSystemEntryCacheCfg configuration)
throws ConfigException, InitializationException {
@@ -309,6 +310,8 @@
entryCacheEnv.openDatabase(null, INDEXCLASSDBNAME, entryCacheDBConfig);
// Instantiate the class catalog
classCatalog = new StoredClassCatalog(entryCacheClassDB);
+ //This line causes an unchecked call error if the SuppressWarnings
+ //annotation is removed at the beginning of this method.
entryCacheDataBinding =
new SerialBinding(classCatalog,
FileSystemEntryCacheIndex.class);
@@ -438,6 +441,7 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public void finalizeEntryCache() {
cacheWriteLock.lock();
@@ -462,7 +466,8 @@
// Persistent state save report.
Message message = NOTE_FSCACHE_SAVE.get();
logError(message);
-
+ //This line causes an unchecked call error if the SuppressWarnings
+ //annotation is removed at the beginning of this method.
entryCacheDataBinding.objectToEntry(entryCacheIndex, indexData);
DatabaseEntry indexKey =
new DatabaseEntry(INDEXKEY.getBytes("UTF-8"));
@@ -696,6 +701,7 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public void clear() {
cacheWriteLock.lock();
@@ -719,6 +725,8 @@
INDEXCLASSDBNAME, entryCacheDBConfig);
// Instantiate the class catalog
classCatalog = new StoredClassCatalog(entryCacheClassDB);
+ //This line causes an unchecked call error if the SuppressWarnings
+ //annotation is removed at the beginning of this method.
entryCacheDataBinding = new SerialBinding(classCatalog,
FileSystemEntryCacheIndex.class);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index a1a4788..2ca82a4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -62,6 +62,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AuthenticationInfo;
@@ -114,7 +115,7 @@
private DN identityMapperDN;
// The reference to the identity mapper.
- private IdentityMapper identityMapper;
+ private IdentityMapper<?> identityMapper;
// The default set of supported control OIDs for this extended
private Set<String> supportedControlOIDs = new HashSet<String>(0);
@@ -1047,8 +1048,7 @@
if (oldPassword != null)
{
// Remove all existing encoded values that match the old password.
- LinkedHashSet<AttributeValue> existingValues =
- pwPolicyState.getPasswordValues();
+ Set<AttributeValue> existingValues = pwPolicyState.getPasswordValues();
LinkedHashSet<AttributeValue> deleteValues =
new LinkedHashSet<AttributeValue>(existingValues.size());
if (pwPolicyState.getPolicy().usesAuthPasswordSyntax())
@@ -1059,7 +1059,7 @@
{
StringBuilder[] components =
AuthPasswordSyntax.decodeAuthPassword(v.getStringValue());
- PasswordStorageScheme scheme =
+ PasswordStorageScheme<?> scheme =
DirectoryServer.getAuthPasswordStorageScheme(
components[0].toString());
if (scheme == null)
@@ -1099,7 +1099,7 @@
{
String[] components =
UserPasswordSyntax.decodeUserPassword(v.getStringValue());
- PasswordStorageScheme scheme =
+ PasswordStorageScheme<?> scheme =
DirectoryServer.getPasswordStorageScheme(
toLowerCase(components[0]));
if (scheme == null)
@@ -1131,8 +1131,9 @@
}
}
- Attribute deleteAttr = new Attribute(attrType, attrType.getNameOrOID(),
- deleteValues);
+ AttributeBuilder builder = new AttributeBuilder(attrType);
+ builder.addAll(deleteValues);
+ Attribute deleteAttr = builder.toAttribute();
modList.add(new Modification(ModificationType.DELETE, deleteAttr));
@@ -1144,8 +1145,9 @@
addValues.add(new AttributeValue(attrType, s));
}
- Attribute addAttr = new Attribute(attrType, attrType.getNameOrOID(),
- addValues);
+ builder = new AttributeBuilder(attrType);
+ builder.addAll(addValues);
+ Attribute addAttr = builder.toAttribute();
modList.add(new Modification(ModificationType.ADD, addAttr));
}
else
@@ -1157,8 +1159,9 @@
replaceValues.add(new AttributeValue(attrType, s));
}
- Attribute addAttr = new Attribute(attrType, attrType.getNameOrOID(),
- replaceValues);
+ AttributeBuilder builder = new AttributeBuilder(attrType);
+ builder.addAll(replaceValues);
+ Attribute addAttr = builder.toAttribute();
modList.add(new Modification(ModificationType.REPLACE, addAttr));
}
@@ -1414,7 +1417,7 @@
try
{
DN mapperDN = config.getIdentityMapperDN();
- IdentityMapper mapper = DirectoryServer.getIdentityMapper(mapperDN);
+ IdentityMapper<?> mapper = DirectoryServer.getIdentityMapper(mapperDN);
if (mapper == null)
{
Message message = ERR_EXTOP_PASSMOD_NO_SUCH_ID_MAPPER.get(
@@ -1469,7 +1472,7 @@
// Make sure that the specified identity mapper is OK.
DN mapperDN = null;
- IdentityMapper mapper = null;
+ IdentityMapper<?> mapper = null;
try
{
mapperDN = config.getIdentityMapperDN();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
index ae2a17b..f031fd1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
@@ -567,7 +567,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (debugEnabled())
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java
index 03bff8b..f502262 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java
@@ -47,6 +47,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.Control;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryConfig;
@@ -229,7 +230,7 @@
{
for (Attribute a : memberAttrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -388,15 +389,8 @@
ResultCode.ATTRIBUTE_OR_VALUE_EXISTS, msg);
}
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(memberAttributeType,
- nestedGroupDN.toString()));
-
- Attribute attr = new Attribute(memberAttributeType,
- memberAttributeType.getNameOrOID(),
- values);
-
+ Attribute attr = Attributes.create(memberAttributeType,
+ nestedGroupDN.toString());
LinkedList<Modification> mods = new LinkedList<Modification>();
mods.add(new Modification(ModificationType.ADD, attr));
@@ -455,15 +449,8 @@
String.valueOf(groupEntryDN)));
}
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(memberAttributeType,
- nestedGroupDN.toString()));
-
- Attribute attr = new Attribute(memberAttributeType,
- memberAttributeType.getNameOrOID(),
- values);
-
+ Attribute attr = Attributes.create(memberAttributeType,
+ nestedGroupDN.toString());
LinkedList<Modification> mods = new LinkedList<Modification>();
mods.add(new Modification(ModificationType.DELETE, attr));
@@ -663,14 +650,8 @@
message);
}
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(memberAttributeType, userDN.toString()));
-
- Attribute attr = new Attribute(memberAttributeType,
- memberAttributeType.getNameOrOID(),
- values);
-
+ Attribute attr = Attributes.create(memberAttributeType, userDN
+ .toString());
LinkedList<Modification> mods = new LinkedList<Modification>();
mods.add(new Modification(ModificationType.ADD, attr));
@@ -723,14 +704,8 @@
}
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(memberAttributeType, userDN.toString()));
-
- Attribute attr = new Attribute(memberAttributeType,
- memberAttributeType.getNameOrOID(),
- values);
-
+ Attribute attr = Attributes.create(memberAttributeType, userDN
+ .toString());
LinkedList<Modification> mods = new LinkedList<Modification>();
mods.add(new Modification(ModificationType.DELETE, attr));
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
index 8455e87..2d2e80d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
@@ -78,7 +78,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
buffer.append(v.getStringValue());
return;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/VirtualStaticGroup.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/VirtualStaticGroup.java
index c25c480..dd93e91 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/VirtualStaticGroup.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/VirtualStaticGroup.java
@@ -147,7 +147,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (targetDN != null)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/AccessLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/AccessLogger.java
index 3b08502..58c54d6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/AccessLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/AccessLogger.java
@@ -32,6 +32,7 @@
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.List;
import java.util.ArrayList;
+import java.util.Map;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
@@ -72,8 +73,8 @@
// The set of access loggers that have been registered with the server. It
// will initially be empty.
- static CopyOnWriteArrayList<AccessLogPublisher> accessPublishers =
- new CopyOnWriteArrayList<AccessLogPublisher>();
+ static CopyOnWriteArrayList<AccessLogPublisher<?>> accessPublishers =
+ new CopyOnWriteArrayList<AccessLogPublisher<?>>();
// The singleton instance of this class for configuration purposes.
static final AccessLogger instance = new AccessLogger();
@@ -96,7 +97,7 @@
* @param publisher The access log publisher to add.
*/
public synchronized static void addAccessLogPublisher(
- AccessLogPublisher publisher)
+ AccessLogPublisher<?> publisher)
{
accessPublishers.add(publisher);
}
@@ -108,7 +109,7 @@
* @return The publisher that was removed or null if it was not found.
*/
public synchronized static boolean removeAccessLogPublisher(
- AccessLogPublisher publisher)
+ AccessLogPublisher<?> publisher)
{
boolean removed = accessPublishers.remove(publisher);
@@ -125,7 +126,7 @@
*/
public synchronized static void removeAllAccessLogPublishers()
{
- for(AccessLogPublisher publisher : accessPublishers)
+ for(AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.close();
}
@@ -154,7 +155,7 @@
if(config.isEnabled())
{
- AccessLogPublisher AccessLogPublisher = getAccessPublisher(config);
+ AccessLogPublisher<?> AccessLogPublisher = getAccessPublisher(config);
addAccessLogPublisher(AccessLogPublisher);
}
@@ -199,7 +200,7 @@
{
try
{
- AccessLogPublisher AccessLogPublisher = getAccessPublisher(config);
+ AccessLogPublisher<?> AccessLogPublisher = getAccessPublisher(config);
addAccessLogPublisher(AccessLogPublisher);
}
@@ -241,8 +242,8 @@
DN dn = config.dn();
- AccessLogPublisher accessLogPublisher = null;
- for(AccessLogPublisher publisher : accessPublishers)
+ AccessLogPublisher<?> accessLogPublisher = null;
+ for(AccessLogPublisher<?> publisher : accessPublishers)
{
if(publisher.getDN().equals(dn))
{
@@ -293,8 +294,8 @@
{
DN dn = config.dn();
- AccessLogPublisher accessLogPublisher = null;
- for(AccessLogPublisher publisher : accessPublishers)
+ AccessLogPublisher<?> accessLogPublisher = null;
+ for(AccessLogPublisher<?> publisher : accessPublishers)
{
if(publisher.getDN().equals(dn))
{
@@ -317,8 +318,8 @@
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- AccessLogPublisher accessLogPublisher = null;
- for(AccessLogPublisher publisher : accessPublishers)
+ AccessLogPublisher<?> accessLogPublisher = null;
+ for(AccessLogPublisher<?> publisher : accessPublishers)
{
if(publisher.getDN().equals(config.dn()))
{
@@ -347,7 +348,7 @@
ClassPropertyDefinition pd =
d.getJavaClassPropertyDefinition();
// Load the class and cast it to a DebugLogPublisher.
- AccessLogPublisher publisher = null;
+ AccessLogPublisher<?> publisher = null;
Class<? extends AccessLogPublisher> theClass;
try {
theClass = pd.loadClass(className, AccessLogPublisher.class);
@@ -387,7 +388,7 @@
return true;
}
- private AccessLogPublisher getAccessPublisher(AccessLogPublisherCfg config)
+ private AccessLogPublisher<?> getAccessPublisher(AccessLogPublisherCfg config)
throws ConfigException {
String className = config.getJavaClass();
AccessLogPublisherCfgDefn d = AccessLogPublisherCfgDefn.getInstance();
@@ -395,7 +396,7 @@
d.getJavaClassPropertyDefinition();
// Load the class and cast it to a AccessLogPublisher.
Class<? extends AccessLogPublisher> theClass;
- AccessLogPublisher AccessLogPublisher;
+ AccessLogPublisher<?> AccessLogPublisher;
try {
theClass = pd.loadClass(className, AccessLogPublisher.class);
AccessLogPublisher = theClass.newInstance();
@@ -438,7 +439,7 @@
*/
public static void logConnect(ClientConnection clientConnection)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logConnect(clientConnection);
}
@@ -460,7 +461,7 @@
DisconnectReason disconnectReason,
Message message)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logDisconnect(clientConnection, disconnectReason, message);
}
@@ -476,7 +477,7 @@
*/
public static void logAbandonRequest(AbandonOperation abandonOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logAbandonRequest(abandonOperation);
}
@@ -485,6 +486,37 @@
/**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided abandon operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ *
+ * @param abandonOperation
+ * The abandon operation containing the information to use
+ * to log the abandon request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public static void logAbandonIntermediateMessage(
+ AbandonOperation abandonOperation, String category,
+ Map<String, String> content)
+ {
+ for (AccessLogPublisher<?> publisher : accessPublishers)
+ {
+ publisher.logAbandonIntermediateMessage(abandonOperation,
+ category, content);
+ }
+ }
+
+
+
+ /**
* Writes a message to the access logger with information about the result of
* the provided abandon operation.
*
@@ -493,7 +525,7 @@
*/
public static void logAbandonResult(AbandonOperation abandonOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logAbandonResult(abandonOperation);
}
@@ -510,7 +542,7 @@
*/
public static void logAddRequest(AddOperation addOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logAddRequest(addOperation);
}
@@ -519,6 +551,37 @@
/**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided add operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ *
+ * @param addOperation
+ * The add operation containing the information to use
+ * to log the add request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public static void logAddIntermediateMessage(
+ AddOperation addOperation, String category,
+ Map<String, String> content)
+ {
+ for (AccessLogPublisher<?> publisher : accessPublishers)
+ {
+ publisher.logAddIntermediateMessage(addOperation,
+ category, content);
+ }
+ }
+
+
+
+ /**
* Writes a message to the access logger with information about the add
* response associated with the provided add operation.
*
@@ -527,7 +590,7 @@
*/
public static void logAddResponse(AddOperation addOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logAddResponse(addOperation);
}
@@ -544,7 +607,7 @@
*/
public static void logBindRequest(BindOperation bindOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logBindRequest(bindOperation);
}
@@ -553,6 +616,37 @@
/**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided bind operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ *
+ * @param bindOperation
+ * The bind operation containing the information to use
+ * to log the bind request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public static void logBindIntermediateMessage(
+ BindOperation bindOperation, String category,
+ Map<String, String> content)
+ {
+ for (AccessLogPublisher<?> publisher : accessPublishers)
+ {
+ publisher.logBindIntermediateMessage(bindOperation,
+ category, content);
+ }
+ }
+
+
+
+ /**
* Writes a message to the access logger with information about the bind
* response associated with the provided bind operation.
*
@@ -561,7 +655,7 @@
*/
public static void logBindResponse(BindOperation bindOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logBindResponse(bindOperation);
}
@@ -578,7 +672,7 @@
*/
public static void logCompareRequest(CompareOperation compareOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logCompareRequest(compareOperation);
}
@@ -587,6 +681,37 @@
/**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided compare operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ *
+ * @param compareOperation
+ * The compare operation containing the information to use
+ * to log the compare request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public static void logCompareIntermediateMessage(
+ CompareOperation compareOperation, String category,
+ Map<String, String> content)
+ {
+ for (AccessLogPublisher<?> publisher : accessPublishers)
+ {
+ publisher.logCompareIntermediateMessage(compareOperation,
+ category, content);
+ }
+ }
+
+
+
+ /**
* Writes a message to the access logger with information about the compare
* response associated with the provided compare operation.
*
@@ -595,7 +720,7 @@
*/
public static void logCompareResponse(CompareOperation compareOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logCompareResponse(compareOperation);
}
@@ -612,7 +737,7 @@
*/
public static void logDeleteRequest(DeleteOperation deleteOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logDeleteRequest(deleteOperation);
}
@@ -621,6 +746,37 @@
/**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided delete operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ *
+ * @param deleteOperation
+ * The delete operation containing the information to use
+ * to log the delete request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public static void logDeleteIntermediateMessage(
+ DeleteOperation deleteOperation, String category,
+ Map<String, String> content)
+ {
+ for (AccessLogPublisher<?> publisher : accessPublishers)
+ {
+ publisher.logDeleteIntermediateMessage(deleteOperation,
+ category, content);
+ }
+ }
+
+
+
+ /**
* Writes a message to the access logger with information about the delete
* response associated with the provided delete operation.
*
@@ -629,7 +785,7 @@
*/
public static void logDeleteResponse(DeleteOperation deleteOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logDeleteResponse(deleteOperation);
}
@@ -646,7 +802,7 @@
*/
public static void logExtendedRequest(ExtendedOperation extendedOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logExtendedRequest(extendedOperation);
}
@@ -655,6 +811,37 @@
/**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided extended operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ *
+ * @param extendedOperation
+ * The extended operation containing the information to use
+ * to log the extended request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public static void logExtendedIntermediateMessage(
+ ExtendedOperation extendedOperation, String category,
+ Map<String, String> content)
+ {
+ for (AccessLogPublisher<?> publisher : accessPublishers)
+ {
+ publisher.logExtendedIntermediateMessage(extendedOperation,
+ category, content);
+ }
+ }
+
+
+
+ /**
* Writes a message to the access logger with information about the extended
* response associated with the provided extended operation.
*
@@ -663,7 +850,7 @@
*/
public static void logExtendedResponse(ExtendedOperation extendedOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logExtendedResponse(extendedOperation);
}
@@ -680,7 +867,7 @@
*/
public static void logModifyRequest(ModifyOperation modifyOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logModifyRequest(modifyOperation);
}
@@ -689,6 +876,37 @@
/**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided modify operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ *
+ * @param modifyOperation
+ * The modify operation containing the information to use
+ * to log the modify request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public static void logModifyIntermediateMessage(
+ ModifyOperation modifyOperation, String category,
+ Map<String, String> content)
+ {
+ for (AccessLogPublisher<?> publisher : accessPublishers)
+ {
+ publisher.logModifyIntermediateMessage(modifyOperation,
+ category, content);
+ }
+ }
+
+
+
+ /**
* Writes a message to the access logger with information about the modify
* response associated with the provided modify operation.
*
@@ -697,7 +915,7 @@
*/
public static void logModifyResponse(ModifyOperation modifyOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logModifyResponse(modifyOperation);
}
@@ -714,7 +932,7 @@
*/
public static void logModifyDNRequest(ModifyDNOperation modifyDNOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logModifyDNRequest(modifyDNOperation);
}
@@ -723,6 +941,37 @@
/**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided modify DN operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ *
+ * @param modifyDNOperation
+ * The modify DN operation containing the information to use
+ * to log the modify DN request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public static void logModifyDNIntermediateMessage(
+ ModifyDNOperation modifyDNOperation, String category,
+ Map<String, String> content)
+ {
+ for (AccessLogPublisher<?> publisher : accessPublishers)
+ {
+ publisher.logModifyDNIntermediateMessage(modifyDNOperation,
+ category, content);
+ }
+ }
+
+
+
+ /**
* Writes a message to the access logger with information about the modify DN
* response associated with the provided modify DN operation.
*
@@ -732,7 +981,7 @@
*/
public static void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logModifyDNResponse(modifyDNOperation);
}
@@ -749,7 +998,7 @@
*/
public static void logSearchRequest(SearchOperation searchOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logSearchRequest(searchOperation);
}
@@ -758,6 +1007,37 @@
/**
+ * Writes a message to the access logger containing additional
+ * information associated with the provided search operation.
+ * <p>
+ * This method will only be called after the request has been logged
+ * and before the response. Implementations can choose to ignore
+ * intermediate responses or filter them based on their category.
+ *
+ * @param searchOperation
+ * The search operation containing the information to use
+ * to log the search request.
+ * @param category
+ * The category of the intermediate message.
+ * @param content
+ * The content of the intermediate message. This comprises
+ * of one or more key/value pairs which form the content of
+ * the intermediate message.
+ */
+ public static void logSearchIntermediateMessage(
+ SearchOperation searchOperation, String category,
+ Map<String, String> content)
+ {
+ for (AccessLogPublisher<?> publisher : accessPublishers)
+ {
+ publisher.logSearchIntermediateMessage(searchOperation,
+ category, content);
+ }
+ }
+
+
+
+ /**
* Writes a message to the access logger with information about the search
* result entry that matches the criteria associated with the provided search
* operation.
@@ -769,7 +1049,7 @@
public static void logSearchResultEntry(SearchOperation searchOperation,
SearchResultEntry searchEntry)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logSearchResultEntry(searchOperation, searchEntry);
}
@@ -788,7 +1068,7 @@
public static void logSearchResultReference(SearchOperation searchOperation,
SearchResultReference searchReference)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logSearchResultReference(searchOperation, searchReference);
}
@@ -805,7 +1085,7 @@
*/
public static void logSearchResultDone(SearchOperation searchOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logSearchResultDone(searchOperation);
}
@@ -822,7 +1102,7 @@
*/
public static void logUnbind(UnbindOperation unbindOperation)
{
- for (AccessLogPublisher publisher : accessPublishers)
+ for (AccessLogPublisher<?> publisher : accessPublishers)
{
publisher.logUnbind(unbindOperation);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
index 11f4b4a..751bd5a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -25,17 +25,27 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.loggers;
-import org.opends.messages.Message;
+
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.FileBasedAccessLogPublisherCfg;
import org.opends.server.admin.std.server.AccessLogPublisherCfg;
-import org.opends.server.api.*;
+import org.opends.server.admin.std.server.FileBasedAccessLogPublisherCfg;
+import org.opends.server.api.AccessLogPublisher;
+import org.opends.server.api.ClientConnection;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AbandonOperation;
import org.opends.server.core.AddOperation;
@@ -44,48 +54,59 @@
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
-import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperation;
+import org.opends.server.core.ModifyOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.core.UnbindOperation;
-import org.opends.server.types.*;
+import org.opends.server.types.AuthenticationInfo;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.DisconnectReason;
+import org.opends.server.types.FilePermission;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.Operation;
+import org.opends.server.types.ResultCode;
import org.opends.server.util.TimeThread;
-import static org.opends.messages.ConfigMessages.*;
-
-import org.opends.messages.MessageBuilder;
-import static org.opends.server.util.StaticUtils.getFileForPath;
-import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
/**
* This class provides the implementation of the access logger used by
* the directory server.
*/
-public class TextAccessLogPublisher
- extends AccessLogPublisher<FileBasedAccessLogPublisherCfg>
- implements ConfigurationChangeListener<FileBasedAccessLogPublisherCfg>
+public class TextAccessLogPublisher extends
+ AccessLogPublisher<FileBasedAccessLogPublisherCfg> implements
+ ConfigurationChangeListener<FileBasedAccessLogPublisherCfg>
{
- private boolean suppressInternalOperations = true;
-
- private boolean suppressSynchronizationOperations = false;
-
- private TextWriter writer;
-
- private FileBasedAccessLogPublisherCfg currentConfig;
/**
- * Returns an instance of the text access log publisher that will print
- * all messages to the provided writer. This is used to print the messages
- * to the console when the server starts up.
- *
- * @param writer The text writer where the message will be written to.
- * @param suppressInternal Indicates whether to suppress internal operations.
- * @return The instance of the text error log publisher that will print
- * all messages to standard out.
+ * The category to use when logging responses.
*/
- public static TextAccessLogPublisher
- getStartupTextAccessPublisher(TextWriter writer, boolean suppressInternal)
+ private static final String CATEGORY_RESPONSE = "RES";
+
+ /**
+ * The category to use when logging requests.
+ */
+ private static final String CATEGORY_REQUEST = "REQ";
+
+
+
+ /**
+ * Returns an instance of the text access log publisher that will
+ * print all messages to the provided writer. This is used to print
+ * the messages to the console when the server starts up.
+ *
+ * @param writer
+ * The text writer where the message will be written to.
+ * @param suppressInternal
+ * Indicates whether to suppress internal operations.
+ * @return The instance of the text error log publisher that will
+ * print all messages to standard out.
+ */
+ public static TextAccessLogPublisher getStartupTextAccessPublisher(
+ TextWriter writer, boolean suppressInternal)
{
TextAccessLogPublisher startupPublisher = new TextAccessLogPublisher();
startupPublisher.writer = writer;
@@ -94,17 +115,151 @@
return startupPublisher;
}
+ private FileBasedAccessLogPublisherCfg currentConfig;
+
+ private boolean suppressInternalOperations = true;
+
+ private boolean suppressSynchronizationOperations = false;
+
+ private TextWriter writer;
+
+
+
/**
* {@inheritDoc}
*/
- public boolean isConfigurationAcceptable(AccessLogPublisherCfg configuration,
- List<Message> unacceptableReasons)
+ public ConfigChangeResult applyConfigurationChange(
+ FileBasedAccessLogPublisherCfg config)
{
- FileBasedAccessLogPublisherCfg config =
- (FileBasedAccessLogPublisherCfg) configuration;
- return isConfigurationChangeAcceptable(config, unacceptableReasons);
+ // Default result code.
+ ResultCode resultCode = ResultCode.SUCCESS;
+ boolean adminActionRequired = false;
+ ArrayList<Message> messages = new ArrayList<Message>();
+
+ suppressInternalOperations = config.isSuppressInternalOperations();
+ suppressSynchronizationOperations = config
+ .isSuppressSynchronizationOperations();
+
+ File logFile = getFileForPath(config.getLogFile());
+ FileNamingPolicy fnPolicy = new TimeStampNaming(logFile);
+
+ try
+ {
+ FilePermission perm = FilePermission.decodeUNIXMode(config
+ .getLogFilePermissions());
+
+ boolean writerAutoFlush = config.isAutoFlush()
+ && !config.isAsynchronous();
+
+ TextWriter currentWriter;
+ // Determine the writer we are using. If we were writing
+ // asynchronously, we need to modify the underlying writer.
+ if (writer instanceof AsyncronousTextWriter)
+ {
+ currentWriter = ((AsyncronousTextWriter) writer).getWrappedWriter();
+ }
+ else
+ {
+ currentWriter = writer;
+ }
+
+ if (currentWriter instanceof MultifileTextWriter)
+ {
+ MultifileTextWriter mfWriter = (MultifileTextWriter) currentWriter;
+
+ mfWriter.setNamingPolicy(fnPolicy);
+ mfWriter.setFilePermissions(perm);
+ mfWriter.setAppend(config.isAppend());
+ mfWriter.setAutoFlush(writerAutoFlush);
+ mfWriter.setBufferSize((int) config.getBufferSize());
+ mfWriter.setInterval(config.getTimeInterval());
+
+ mfWriter.removeAllRetentionPolicies();
+ mfWriter.removeAllRotationPolicies();
+
+ for (DN dn : config.getRotationPolicyDNs())
+ {
+ mfWriter.addRotationPolicy(DirectoryServer.getRotationPolicy(dn));
+ }
+
+ for (DN dn : config.getRetentionPolicyDNs())
+ {
+ mfWriter.addRetentionPolicy(DirectoryServer.getRetentionPolicy(dn));
+ }
+
+ if (writer instanceof AsyncronousTextWriter && !config.isAsynchronous())
+ {
+ // The asynchronous setting is being turned off.
+ AsyncronousTextWriter asyncWriter = ((AsyncronousTextWriter) writer);
+ writer = mfWriter;
+ asyncWriter.shutdown(false);
+ }
+
+ if (!(writer instanceof AsyncronousTextWriter)
+ && config.isAsynchronous())
+ {
+ // The asynchronous setting is being turned on.
+ AsyncronousTextWriter asyncWriter = new AsyncronousTextWriter(
+ "Asyncronous Text Writer for " + config.dn().toNormalizedString(),
+ config.getQueueSize(), config.isAutoFlush(), mfWriter);
+ writer = asyncWriter;
+ }
+
+ if ((currentConfig.isAsynchronous() && config.isAsynchronous())
+ && (currentConfig.getQueueSize() != config.getQueueSize()))
+ {
+ adminActionRequired = true;
+ }
+
+ currentConfig = config;
+ }
+ }
+ catch (Exception e)
+ {
+ Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(config.dn()
+ .toString(), stackTraceToSingleLineString(e));
+ resultCode = DirectoryServer.getServerErrorResultCode();
+ messages.add(message);
+
+ }
+
+ return new ConfigChangeResult(resultCode, adminActionRequired, messages);
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void close()
+ {
+ writer.shutdown();
+
+ if (currentConfig != null)
+ {
+ currentConfig.removeFileBasedAccessChangeListener(this);
+ }
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public DN getDN()
+ {
+ if (currentConfig != null)
+ {
+ return currentConfig.dn();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+
+
/**
* {@inheritDoc}
*/
@@ -117,68 +272,60 @@
try
{
- FilePermission perm =
- FilePermission.decodeUNIXMode(config.getLogFilePermissions());
+ FilePermission perm = FilePermission.decodeUNIXMode(config
+ .getLogFilePermissions());
- LogPublisherErrorHandler errorHandler =
- new LogPublisherErrorHandler(config.dn());
+ LogPublisherErrorHandler errorHandler = new LogPublisherErrorHandler(
+ config.dn());
- boolean writerAutoFlush =
- config.isAutoFlush() && !config.isAsynchronous();
+ boolean writerAutoFlush = config.isAutoFlush()
+ && !config.isAsynchronous();
- MultifileTextWriter writer =
- new MultifileTextWriter("Multifile Text Writer for " +
- config.dn().toNormalizedString(),
- config.getTimeInterval(),
- fnPolicy,
- perm,
- errorHandler,
- "UTF-8",
- writerAutoFlush,
- config.isAppend(),
- (int)config.getBufferSize());
+ MultifileTextWriter writer = new MultifileTextWriter(
+ "Multifile Text Writer for " + config.dn().toNormalizedString(),
+ config.getTimeInterval(), fnPolicy, perm, errorHandler, "UTF-8",
+ writerAutoFlush, config.isAppend(), (int) config.getBufferSize());
// Validate retention and rotation policies.
- for(DN dn : config.getRotationPolicyDNs())
+ for (DN dn : config.getRotationPolicyDNs())
{
writer.addRotationPolicy(DirectoryServer.getRotationPolicy(dn));
}
- for(DN dn: config.getRetentionPolicyDNs())
+ for (DN dn : config.getRetentionPolicyDNs())
{
writer.addRetentionPolicy(DirectoryServer.getRetentionPolicy(dn));
}
- if(config.isAsynchronous())
+ if (config.isAsynchronous())
{
- this.writer = new AsyncronousTextWriter("Asyncronous Text Writer for " +
- config.dn().toNormalizedString(), config.getQueueSize(),
- config.isAutoFlush(),
- writer);
+ this.writer = new AsyncronousTextWriter("Asyncronous Text Writer for "
+ + config.dn().toNormalizedString(), config.getQueueSize(), config
+ .isAutoFlush(), writer);
}
else
{
this.writer = writer;
}
}
- catch(DirectoryException e)
+ catch (DirectoryException e)
{
- Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
- config.dn().toString(), String.valueOf(e));
+ Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(config.dn()
+ .toString(), String.valueOf(e));
throw new InitializationException(message, e);
}
- catch(IOException e)
+ catch (IOException e)
{
- Message message = ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(
- logFile.toString(), config.dn().toString(), String.valueOf(e));
+ Message message = ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(logFile
+ .toString(), config.dn().toString(), String.valueOf(e));
throw new InitializationException(message, e);
}
suppressInternalOperations = config.isSuppressInternalOperations();
- suppressSynchronizationOperations =
- config.isSuppressSynchronizationOperations();
+ suppressSynchronizationOperations = config
+ .isSuppressSynchronizationOperations();
currentConfig = config;
@@ -190,160 +337,469 @@
/**
* {@inheritDoc}
*/
- public boolean isConfigurationChangeAcceptable(
- FileBasedAccessLogPublisherCfg config, List<Message> unacceptableReasons)
- {
- // Make sure the permission is valid.
- try
- {
- FilePermission filePerm =
- FilePermission.decodeUNIXMode(config.getLogFilePermissions());
- if(!filePerm.isOwnerWritable())
- {
- Message message = ERR_CONFIG_LOGGING_INSANE_MODE.get(
- config.getLogFilePermissions());
- unacceptableReasons.add(message);
- return false;
- }
- }
- catch(DirectoryException e)
- {
- Message message = ERR_CONFIG_LOGGING_MODE_INVALID.get(
- config.getLogFilePermissions(), String.valueOf(e));
- unacceptableReasons.add(message);
- return false;
- }
-
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- public ConfigChangeResult applyConfigurationChange(
- FileBasedAccessLogPublisherCfg config)
- {
- // Default result code.
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
-
- suppressInternalOperations = config.isSuppressInternalOperations();
- suppressSynchronizationOperations =
- config.isSuppressSynchronizationOperations();
-
- File logFile = getFileForPath(config.getLogFile());
- FileNamingPolicy fnPolicy = new TimeStampNaming(logFile);
-
- try
- {
- FilePermission perm =
- FilePermission.decodeUNIXMode(config.getLogFilePermissions());
-
- boolean writerAutoFlush =
- config.isAutoFlush() && !config.isAsynchronous();
-
- TextWriter currentWriter;
- // Determine the writer we are using. If we were writing asyncronously,
- // we need to modify the underlaying writer.
- if(writer instanceof AsyncronousTextWriter)
- {
- currentWriter = ((AsyncronousTextWriter)writer).getWrappedWriter();
- }
- else
- {
- currentWriter = writer;
- }
-
- if(currentWriter instanceof MultifileTextWriter)
- {
- MultifileTextWriter mfWriter = (MultifileTextWriter)currentWriter;
-
- mfWriter.setNamingPolicy(fnPolicy);
- mfWriter.setFilePermissions(perm);
- mfWriter.setAppend(config.isAppend());
- mfWriter.setAutoFlush(writerAutoFlush);
- mfWriter.setBufferSize((int)config.getBufferSize());
- mfWriter.setInterval(config.getTimeInterval());
-
- mfWriter.removeAllRetentionPolicies();
- mfWriter.removeAllRotationPolicies();
-
- for(DN dn : config.getRotationPolicyDNs())
- {
- mfWriter.addRotationPolicy(DirectoryServer.getRotationPolicy(dn));
- }
-
- for(DN dn: config.getRetentionPolicyDNs())
- {
- mfWriter.addRetentionPolicy(DirectoryServer.getRetentionPolicy(dn));
- }
-
- if(writer instanceof AsyncronousTextWriter && !config.isAsynchronous())
- {
- // The asynronous setting is being turned off.
- AsyncronousTextWriter asyncWriter = ((AsyncronousTextWriter)writer);
- writer = mfWriter;
- asyncWriter.shutdown(false);
- }
-
- if(!(writer instanceof AsyncronousTextWriter) &&
- config.isAsynchronous())
- {
- // The asynronous setting is being turned on.
- AsyncronousTextWriter asyncWriter =
- new AsyncronousTextWriter("Asyncronous Text Writer for " +
- config.dn().toNormalizedString(), config.getQueueSize(),
- config.isAutoFlush(),
- mfWriter);
- writer = asyncWriter;
- }
-
- if((currentConfig.isAsynchronous() && config.isAsynchronous()) &&
- (currentConfig.getQueueSize() != config.getQueueSize()))
- {
- adminActionRequired = true;
- }
-
- currentConfig = config;
- }
- }
- catch(Exception e)
- {
- Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
- config.dn().toString(),
- stackTraceToSingleLineString(e));
- resultCode = DirectoryServer.getServerErrorResultCode();
- messages.add(message);
-
- }
-
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public void close()
+ public boolean isConfigurationAcceptable(
+ AccessLogPublisherCfg configuration,
+ List<Message> unacceptableReasons)
{
- writer.shutdown();
-
- if(currentConfig != null)
- {
- currentConfig.removeFileBasedAccessChangeListener(this);
- }
+ FileBasedAccessLogPublisherCfg config =
+ (FileBasedAccessLogPublisherCfg) configuration;
+ return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
/**
- * Writes a message to the access logger with information about a new client
- * connection that has been established, regardless of whether it will be
- * immediately terminated.
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationChangeAcceptable(
+ FileBasedAccessLogPublisherCfg config, List<Message> unacceptableReasons)
+ {
+ // Make sure the permission is valid.
+ try
+ {
+ FilePermission filePerm = FilePermission.decodeUNIXMode(config
+ .getLogFilePermissions());
+ if (!filePerm.isOwnerWritable())
+ {
+ Message message = ERR_CONFIG_LOGGING_INSANE_MODE.get(config
+ .getLogFilePermissions());
+ unacceptableReasons.add(message);
+ return false;
+ }
+ }
+ catch (DirectoryException e)
+ {
+ Message message = ERR_CONFIG_LOGGING_MODE_INVALID.get(config
+ .getLogFilePermissions(), String.valueOf(e));
+ unacceptableReasons.add(message);
+ return false;
+ }
+
+ return true;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void logAbandonIntermediateMessage(AbandonOperation abandonOperation,
+ String category, Map<String, String> content)
+ {
+ logIntermediateMessage(abandonOperation, "ABANDON", category, content);
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * abandon request associated with the provided abandon operation.
*
- * @param clientConnection The client connection that has been established.
+ * @param abandonOperation
+ * The abandon operation containing the information to use
+ * to log the abandon request.
+ */
+ public void logAbandonRequest(AbandonOperation abandonOperation)
+ {
+ if (!isLoggable(abandonOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(abandonOperation, "ABANDON", CATEGORY_REQUEST, buffer);
+ buffer.append(" idToAbandon=");
+ buffer.append(abandonOperation.getIDToAbandon());
+ if (abandonOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * result of the provided abandon operation.
+ *
+ * @param abandonOperation
+ * The abandon operation containing the information to use
+ * to log the abandon request.
+ */
+ public void logAbandonResult(AbandonOperation abandonOperation)
+ {
+ if (!isLoggable(abandonOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(abandonOperation, "ABANDON", CATEGORY_RESPONSE, buffer);
+ buffer.append(" result=");
+ buffer.append(abandonOperation.getResultCode().getIntValue());
+ MessageBuilder msg = abandonOperation.getErrorMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" message=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ msg = abandonOperation.getAdditionalLogMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" additionalInfo=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ buffer.append(" etime=");
+ buffer.append(abandonOperation.getProcessingTime());
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void logAddIntermediateMessage(AddOperation addOperation,
+ String category, Map<String, String> content)
+ {
+ logIntermediateMessage(addOperation, "ADD", category, content);
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * add request associated with the provided add operation.
+ *
+ * @param addOperation
+ * The add operation containing the information to use to
+ * log the add request.
+ */
+ public void logAddRequest(AddOperation addOperation)
+ {
+ if (!isLoggable(addOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(addOperation, "ADD", CATEGORY_REQUEST, buffer);
+ buffer.append(" dn=\"");
+ addOperation.getRawEntryDN().toString(buffer);
+ buffer.append("\"");
+ if (addOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * add response associated with the provided add operation.
+ *
+ * @param addOperation
+ * The add operation containing the information to use to
+ * log the add response.
+ */
+ public void logAddResponse(AddOperation addOperation)
+ {
+ if (!isLoggable(addOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(addOperation, "ADD", CATEGORY_RESPONSE, buffer);
+ buffer.append(" result=");
+ buffer.append(addOperation.getResultCode().getIntValue());
+
+ MessageBuilder msg = addOperation.getErrorMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" message=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ msg = addOperation.getAdditionalLogMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" additionalInfo=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ DN proxiedAuthDN = addOperation.getProxiedAuthorizationDN();
+ if (proxiedAuthDN != null)
+ {
+ buffer.append(" authzDN=\"");
+ proxiedAuthDN.toString(buffer);
+ buffer.append('\"');
+ }
+
+ buffer.append(" etime=");
+ buffer.append(addOperation.getProcessingTime());
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void logBindIntermediateMessage(BindOperation bindOperation,
+ String category, Map<String, String> content)
+ {
+ logIntermediateMessage(bindOperation, "BIND", category, content);
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * bind request associated with the provided bind operation.
+ *
+ * @param bindOperation
+ * The bind operation with the information to use to log
+ * the bind request.
+ */
+ public void logBindRequest(BindOperation bindOperation)
+ {
+ if (!isLoggable(bindOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(bindOperation, "BIND", CATEGORY_REQUEST, buffer);
+
+ switch (bindOperation.getAuthenticationType())
+ {
+ case SIMPLE:
+ buffer.append(" type=SIMPLE");
+ break;
+ case SASL:
+ buffer.append(" type=SASL mechanism=");
+ buffer.append(bindOperation.getSASLMechanism());
+ break;
+ default:
+ buffer.append(" type=");
+ buffer.append(bindOperation.getAuthenticationType());
+ break;
+ }
+
+ buffer.append(" dn=\"");
+ bindOperation.getRawBindDN().toString(buffer);
+ buffer.append("\"");
+ if (bindOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * bind response associated with the provided bind operation.
+ *
+ * @param bindOperation
+ * The bind operation containing the information to use to
+ * log the bind response.
+ */
+ public void logBindResponse(BindOperation bindOperation)
+ {
+ if (!isLoggable(bindOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(bindOperation, "BIND", CATEGORY_RESPONSE, buffer);
+ buffer.append(" result=");
+ buffer.append(bindOperation.getResultCode().getIntValue());
+
+ MessageBuilder msg = bindOperation.getErrorMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" message=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ Message failureMessage = bindOperation.getAuthFailureReason();
+ if (failureMessage != null)
+ {
+ buffer.append(" authFailureID=");
+ buffer.append(failureMessage.getDescriptor().getId());
+ buffer.append(" authFailureReason=\"");
+ buffer.append(failureMessage);
+ buffer.append('\"');
+ }
+
+ msg = bindOperation.getAdditionalLogMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" additionalInfo=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ if (bindOperation.getResultCode() == ResultCode.SUCCESS)
+ {
+ AuthenticationInfo authInfo = bindOperation.getAuthenticationInfo();
+ if (authInfo != null)
+ {
+ DN authDN = authInfo.getAuthenticationDN();
+ if (authDN != null)
+ {
+ buffer.append(" authDN=\"");
+ authDN.toString(buffer);
+ buffer.append('\"');
+
+ DN authzDN = authInfo.getAuthorizationDN();
+ if (!authDN.equals(authzDN))
+ {
+ buffer.append(" authzDN=\"");
+ if (authzDN != null)
+ {
+ authzDN.toString(buffer);
+ }
+ buffer.append('\"');
+ }
+ }
+ else
+ {
+ buffer.append(" authDN=\"\"");
+ }
+ }
+ }
+
+ buffer.append(" etime=");
+ long etime = bindOperation.getProcessingNanoTime();
+ if (etime <= -1)
+ {
+ etime = bindOperation.getProcessingTime();
+ }
+ buffer.append(etime);
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void logCompareIntermediateMessage(CompareOperation compareOperation,
+ String category, Map<String, String> content)
+ {
+ logIntermediateMessage(compareOperation, "COMPARE", category, content);
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * compare request associated with the provided compare operation.
+ *
+ * @param compareOperation
+ * The compare operation containing the information to use
+ * to log the compare request.
+ */
+ public void logCompareRequest(CompareOperation compareOperation)
+ {
+ if (!isLoggable(compareOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(compareOperation, "COMPARE", CATEGORY_REQUEST, buffer);
+ buffer.append(" dn=\"");
+ compareOperation.getRawEntryDN().toString(buffer);
+ buffer.append("\" attr=");
+ buffer.append(compareOperation.getAttributeType());
+ if (compareOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * compare response associated with the provided compare operation.
+ *
+ * @param compareOperation
+ * The compare operation containing the information to use
+ * to log the compare response.
+ */
+ public void logCompareResponse(CompareOperation compareOperation)
+ {
+ if (!isLoggable(compareOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(compareOperation, "COMPARE", CATEGORY_RESPONSE, buffer);
+ buffer.append(" result=");
+ buffer.append(compareOperation.getResultCode().getIntValue());
+
+ MessageBuilder msg = compareOperation.getErrorMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" message=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ msg = compareOperation.getAdditionalLogMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" additionalInfo=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ DN proxiedAuthDN = compareOperation.getProxiedAuthorizationDN();
+ if (proxiedAuthDN != null)
+ {
+ buffer.append(" authzDN=\"");
+ proxiedAuthDN.toString(buffer);
+ buffer.append('\"');
+ }
+
+ buffer.append(" etime=");
+ long etime = compareOperation.getProcessingNanoTime();
+ if (etime <= -1)
+ {
+ etime = compareOperation.getProcessingTime();
+ }
+ buffer.append(etime);
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about a
+ * new client connection that has been established, regardless of
+ * whether it will be immediately terminated.
+ *
+ * @param clientConnection
+ * The client connection that has been established.
*/
public void logConnect(ClientConnection clientConnection)
{
@@ -360,9 +816,9 @@
buffer.append(" CONNECT conn=");
buffer.append(connectionID);
buffer.append(" from=");
- buffer.append(clientConnection.getClientAddress());
+ buffer.append(clientConnection.getClientHostPort());
buffer.append(" to=");
- buffer.append(clientConnection.getServerAddress());
+ buffer.append(clientConnection.getServerHostPort());
buffer.append(" protocol=");
buffer.append(clientConnection.getProtocol());
@@ -371,19 +827,118 @@
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public void logDeleteIntermediateMessage(DeleteOperation deleteOperation,
+ String category, Map<String, String> content)
+ {
+ logIntermediateMessage(deleteOperation, "DELETE", category, content);
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * delete request associated with the provided delete operation.
+ *
+ * @param deleteOperation
+ * The delete operation with the information to use to log
+ * the delete request.
+ */
+ public void logDeleteRequest(DeleteOperation deleteOperation)
+ {
+ if (!isLoggable(deleteOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(deleteOperation, "DELETE", CATEGORY_REQUEST, buffer);
+ buffer.append(" dn=\"");
+ deleteOperation.getRawEntryDN().toString(buffer);
+ buffer.append("\"");
+ if (deleteOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * delete response associated with the provided delete operation.
+ *
+ * @param deleteOperation
+ * The delete operation containing the information to use
+ * to log the delete response.
+ */
+ public void logDeleteResponse(DeleteOperation deleteOperation)
+ {
+ if (!isLoggable(deleteOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(deleteOperation, "DELETE", CATEGORY_RESPONSE, buffer);
+ buffer.append(" result=");
+ buffer.append(deleteOperation.getResultCode().getIntValue());
+
+ MessageBuilder msg = deleteOperation.getErrorMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" message=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ msg = deleteOperation.getAdditionalLogMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" additionalInfo=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ DN proxiedAuthDN = deleteOperation.getProxiedAuthorizationDN();
+ if (proxiedAuthDN != null)
+ {
+ buffer.append(" authzDN=\"");
+ proxiedAuthDN.toString(buffer);
+ buffer.append('\"');
+ }
+
+ buffer.append(" etime=");
+ long etime = deleteOperation.getProcessingNanoTime();
+ if (etime <= -1)
+ {
+ etime = deleteOperation.getProcessingTime();
+ }
+ buffer.append(etime);
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
/**
* Writes a message to the access logger with information about the
* termination of an existing client connection.
*
- * @param clientConnection The client connection that has been terminated.
- * @param disconnectReason A generic disconnect reason for the connection
- * termination.
- * @param message A human-readable message that can provide
- * additional information about the disconnect.
+ * @param clientConnection
+ * The client connection that has been terminated.
+ * @param disconnectReason
+ * A generic disconnect reason for the connection
+ * termination.
+ * @param message
+ * A human-readable message that can provide additional
+ * information about the disconnect.
*/
public void logDisconnect(ClientConnection clientConnection,
- DisconnectReason disconnectReason,
- Message message)
+ DisconnectReason disconnectReason, Message message)
{
long connectionID = clientConnection.getConnectionID();
if (connectionID < 0 && suppressInternalOperations)
@@ -413,766 +968,94 @@
/**
- * Writes a message to the access logger with information about the abandon
- * request associated with the provided abandon operation.
- *
- * @param abandonOperation The abandon operation containing the information
- * to use to log the abandon request.
+ * {@inheritDoc}
*/
- public void logAbandonRequest(AbandonOperation abandonOperation)
+ public void logExtendedIntermediateMessage(
+ ExtendedOperation extendedOperation, String category,
+ Map<String, String> content)
{
- long connectionID = abandonOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (abandonOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
-
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" ABANDON conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(abandonOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(abandonOperation.getMessageID());
- buffer.append(" idToAbandon=");
- buffer.append(abandonOperation.getIDToAbandon());
- if (abandonOperation.isSynchronizationOperation())
- buffer.append(" type=synchronization");
-
- writer.writeRecord(buffer.toString());
- }
-
- /**
- * Writes a message to the access logger with information about the result
- * of the provided abandon operation.
- *
- * @param abandonOperation The abandon operation containing the information
- * to use to log the abandon request.
- */
- public void logAbandonResult(AbandonOperation abandonOperation)
- {
- long connectionID = abandonOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (abandonOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" ABANDON conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(abandonOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(abandonOperation.getMessageID());
- buffer.append(" result=\"");
- buffer.append(abandonOperation.getResultCode());
- buffer.append("\"");
- MessageBuilder msg = abandonOperation.getErrorMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append(" message=\"");
- buffer.append(msg);
- buffer.append("\"");
- }
-
- msg = abandonOperation.getAdditionalLogMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append(" additionalInfo=\"");
- buffer.append(msg);
- buffer.append("\"");
- }
-
- buffer.append(" etime=");
- buffer.append(abandonOperation.getProcessingTime());
-
- writer.writeRecord(buffer.toString());
- }
-
-
- /**
- * Writes a message to the access logger with information about the add
- * request associated with the provided add operation.
- *
- * @param addOperation The add operation containing the information to use
- * to log the add request.
- */
- public void logAddRequest(AddOperation addOperation)
- {
- long connectionID = addOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (addOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" ADD conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(addOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(addOperation.getMessageID());
- buffer.append(" dn=\"");
- addOperation.getRawEntryDN().toString(buffer);
- buffer.append("\"");
- if (addOperation.isSynchronizationOperation())
- buffer.append(" type=synchronization");
-
-
- writer.writeRecord(buffer.toString());
- }
-
-
- /**
- * Writes a message to the access logger with information about the add
- * response associated with the provided add operation.
- *
- * @param addOperation The add operation containing the information to use
- * to log the add response.
- */
- public void logAddResponse(AddOperation addOperation)
- {
- long connectionID = addOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (addOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" ADD conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(addOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(addOperation.getMessageID());
- buffer.append(" result=\"");
- buffer.append(addOperation.getResultCode());
-
- MessageBuilder msg = addOperation.getErrorMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append("\" message=\"");
- buffer.append(msg);
- }
-
- msg = addOperation.getAdditionalLogMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append("\" additionalInfo=\"");
- buffer.append(msg);
- }
-
- DN proxiedAuthDN = addOperation.getProxiedAuthorizationDN();
- if (proxiedAuthDN != null)
- {
- buffer.append("\" authzDN=\"");
- proxiedAuthDN.toString(buffer);
- }
-
- buffer.append("\" etime=");
- buffer.append(addOperation.getProcessingTime());
-
- writer.writeRecord(buffer.toString());
+ logIntermediateMessage(extendedOperation, "EXTENDED", category, content);
}
/**
- * Writes a message to the access logger with information about the bind
- * request associated with the provided bind operation.
+ * Writes a message to the access logger with information about the
+ * extended request associated with the provided extended operation.
*
- * @param bindOperation The bind operation with the information to use
- * to log the bind request.
- */
- public void logBindRequest(BindOperation bindOperation)
- {
- long connectionID = bindOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (bindOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" BIND conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(bindOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(bindOperation.getMessageID());
-
- switch (bindOperation.getAuthenticationType())
- {
- case SIMPLE:
- buffer.append(" type=SIMPLE");
- break;
- case SASL:
- buffer.append(" type=SASL mechanism=");
- buffer.append(bindOperation.getSASLMechanism());
- break;
- default:
- buffer.append(" type=");
- buffer.append(bindOperation.getAuthenticationType());
- break;
- }
-
- buffer.append(" dn=\"");
- bindOperation.getRawBindDN().toString(buffer);
- buffer.append("\"");
- if (bindOperation.isSynchronizationOperation())
- buffer.append(" type=synchronization");
-
-
- writer.writeRecord(buffer.toString());
- }
-
-
- /**
- * Writes a message to the access logger with information about the bind
- * response associated with the provided bind operation.
- *
- * @param bindOperation The bind operation containing the information to use
- * to log the bind response.
- */
- public void logBindResponse(BindOperation bindOperation)
- {
- long connectionID = bindOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (bindOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" BIND conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(bindOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(bindOperation.getMessageID());
- buffer.append(" result=\"");
- buffer.append(bindOperation.getResultCode());
-
- MessageBuilder msg = bindOperation.getErrorMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append("\" message=\"");
- buffer.append(msg);
- }
-
- Message failureMessage = bindOperation.getAuthFailureReason();
- if (failureMessage != null)
- {
- buffer.append("\" authFailureID=");
- buffer.append(failureMessage.getDescriptor().getId());
- buffer.append(" authFailureReason=\"");
- buffer.append(failureMessage);
- }
-
- msg = bindOperation.getAdditionalLogMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append("\" additionalInfo=\"");
- buffer.append(msg);
- }
-
- if (bindOperation.getResultCode() == ResultCode.SUCCESS)
- {
- AuthenticationInfo authInfo = bindOperation.getAuthenticationInfo();
- if (authInfo != null)
- {
- DN authDN = authInfo.getAuthenticationDN();
- buffer.append("\" authDN=\"");
- if (authDN != null)
- {
- authDN.toString(buffer);
-
- DN authzDN = authInfo.getAuthorizationDN();
- if (! authDN.equals(authzDN))
- {
- buffer.append("\" authzDN=\"");
- if (authzDN != null)
- {
- authzDN.toString(buffer);
- }
- }
- }
- }
- }
-
- buffer.append("\" etime=");
- long etime = bindOperation.getProcessingNanoTime();
- if(etime <= -1)
- {
- etime = bindOperation.getProcessingTime();
- }
- buffer.append(etime);
-
- writer.writeRecord(buffer.toString());
- }
-
-
- /**
- * Writes a message to the access logger with information about the compare
- * request associated with the provided compare operation.
- *
- * @param compareOperation The compare operation containing the information
- * to use to log the compare request.
- */
- public void logCompareRequest(CompareOperation compareOperation)
- {
- long connectionID = compareOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (compareOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" COMPARE conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(compareOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(compareOperation.getMessageID());
- buffer.append(" dn=\"");
- compareOperation.getRawEntryDN().toString(buffer);
- buffer.append("\" attr=");
- buffer.append(compareOperation.getAttributeType());
- if (compareOperation.isSynchronizationOperation())
- buffer.append(" type=synchronization");
-
-
- writer.writeRecord(buffer.toString());
- }
-
-
- /**
- * Writes a message to the access logger with information about the compare
- * response associated with the provided compare operation.
- *
- * @param compareOperation The compare operation containing the information
- * to use to log the compare response.
- */
- public void logCompareResponse(CompareOperation compareOperation)
- {
- long connectionID = compareOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (compareOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" COMPARE conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(compareOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(compareOperation.getMessageID());
- buffer.append(" result=\"");
- buffer.append(compareOperation.getResultCode());
-
- MessageBuilder msg = compareOperation.getErrorMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append("\" message=\"");
- buffer.append(msg);
- }
-
- msg = compareOperation.getAdditionalLogMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append("\" additionalInfo=\"");
- buffer.append(msg);
- }
-
- DN proxiedAuthDN = compareOperation.getProxiedAuthorizationDN();
- if (proxiedAuthDN != null)
- {
- buffer.append("\" authzDN=\"");
- proxiedAuthDN.toString(buffer);
- }
-
- buffer.append("\" etime=");
- long etime = compareOperation.getProcessingNanoTime();
- if(etime <= -1)
- {
- etime = compareOperation.getProcessingTime();
- }
- buffer.append(etime);
-
- writer.writeRecord(buffer.toString());
- }
-
-
- /**
- * Writes a message to the access logger with information about the delete
- * request associated with the provided delete operation.
- *
- * @param deleteOperation The delete operation with the information to
- * use to log the delete request.
- */
- public void logDeleteRequest(DeleteOperation deleteOperation)
- {
- long connectionID = deleteOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (deleteOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" DELETE conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(deleteOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(deleteOperation.getMessageID());
- buffer.append(" dn=\"");
- deleteOperation.getRawEntryDN().toString(buffer);
- buffer.append("\"");
- if (deleteOperation.isSynchronizationOperation())
- buffer.append(" type=synchronization");
-
-
-
- writer.writeRecord(buffer.toString());
- }
-
-
- /**
- * Writes a message to the access logger with information about the delete
- * response associated with the provided delete operation.
- *
- * @param deleteOperation The delete operation containing the information to
- * use to log the delete response.
- */
- public void logDeleteResponse(DeleteOperation deleteOperation)
- {
- long connectionID = deleteOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (deleteOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" DELETE conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(deleteOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(deleteOperation.getMessageID());
- buffer.append(" result=\"");
- buffer.append(deleteOperation.getResultCode());
-
- MessageBuilder msg = deleteOperation.getErrorMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append("\" message=\"");
- buffer.append(msg);
- }
-
- msg = deleteOperation.getAdditionalLogMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append("\" additionalInfo=\"");
- buffer.append(msg);
- }
-
- DN proxiedAuthDN = deleteOperation.getProxiedAuthorizationDN();
- if (proxiedAuthDN != null)
- {
- buffer.append("\" authzDN=\"");
- proxiedAuthDN.toString(buffer);
- }
-
- buffer.append("\" etime=");
- long etime = deleteOperation.getProcessingNanoTime();
- if(etime <= -1)
- {
- etime = deleteOperation.getProcessingTime();
- }
- buffer.append(etime);
-
- writer.writeRecord(buffer.toString());
- }
-
-
-
- /**
- * Writes a message to the access logger with information about the extended
- * request associated with the provided extended operation.
- *
- * @param extendedOperation The extended operation containing the
- * information to use to log the extended request.
+ * @param extendedOperation
+ * The extended operation containing the information to use
+ * to log the extended request.
*/
public void logExtendedRequest(ExtendedOperation extendedOperation)
{
- long connectionID = extendedOperation.getConnectionID();
- if (connectionID < 0)
+ if (!isLoggable(extendedOperation))
{
- // This is an internal operation.
- if (extendedOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
+ return;
}
+
StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" EXTENDED conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(extendedOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(extendedOperation.getMessageID());
+ appendHeader(extendedOperation, "EXTENDED", CATEGORY_REQUEST, buffer);
buffer.append(" oid=\"");
buffer.append(extendedOperation.getRequestOID());
buffer.append("\"");
if (extendedOperation.isSynchronizationOperation())
buffer.append(" type=synchronization");
-
writer.writeRecord(buffer.toString());
}
/**
- * Writes a message to the access logger with information about the extended
- * response associated with the provided extended operation.
+ * Writes a message to the access logger with information about the
+ * extended response associated with the provided extended
+ * operation.
*
- * @param extendedOperation The extended operation containing the
- * info to use to log the extended response.
+ * @param extendedOperation
+ * The extended operation containing the info to use to log
+ * the extended response.
*/
public void logExtendedResponse(ExtendedOperation extendedOperation)
{
- long connectionID = extendedOperation.getConnectionID();
- if (connectionID < 0)
+ if (!isLoggable(extendedOperation))
{
- // This is an internal operation.
- if (extendedOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
+ return;
}
+
StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" EXTENDED conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(extendedOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(extendedOperation.getMessageID());
+ appendHeader(extendedOperation, "EXTENDED", CATEGORY_RESPONSE, buffer);
String oid = extendedOperation.getResponseOID();
if (oid != null)
{
buffer.append(" oid=\"");
buffer.append(oid);
- buffer.append("\"");
+ buffer.append('\"');
}
- buffer.append(" result=\"");
- buffer.append(extendedOperation.getResultCode());
+ buffer.append(" result=");
+ buffer.append(extendedOperation.getResultCode().getIntValue());
MessageBuilder msg = extendedOperation.getErrorMessage();
if ((msg != null) && (msg.length() > 0))
{
- buffer.append("\" message=\"");
+ buffer.append(" message=\"");
buffer.append(msg);
+ buffer.append('\"');
}
msg = extendedOperation.getAdditionalLogMessage();
if ((msg != null) && (msg.length() > 0))
{
- buffer.append("\" additionalInfo=\"");
+ buffer.append(" additionalInfo=\"");
buffer.append(msg);
+ buffer.append('\"');
}
- buffer.append("\" etime=");
+ buffer.append(" etime=");
long etime = extendedOperation.getProcessingNanoTime();
- if(etime <= -1)
+ if (etime <= -1)
{
etime = extendedOperation.getProcessingTime();
}
@@ -1184,168 +1067,35 @@
/**
- * Writes a message to the access logger with information about the modify
- * request associated with the provided modify operation.
- *
- * @param modifyOperation The modify operation containing the information to
- * use to log the modify request.
+ * {@inheritDoc}
*/
- public void logModifyRequest(ModifyOperation modifyOperation)
+ public void logModifyDNIntermediateMessage(
+ ModifyDNOperation modifyDNOperation, String category,
+ Map<String, String> content)
{
- long connectionID = modifyOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (modifyOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" MODIFY conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(modifyOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(modifyOperation.getMessageID());
- buffer.append(" dn=\"");
- modifyOperation.getRawEntryDN().toString(buffer);
- buffer.append("\"");
- if (modifyOperation.isSynchronizationOperation())
- buffer.append(" type=synchronization");
-
-
- writer.writeRecord(buffer.toString());
+ logIntermediateMessage(modifyDNOperation, "MODIFY", category, content);
}
/**
- * Writes a message to the access logger with information about the modify
- * response associated with the provided modify operation.
+ * Writes a message to the access logger with information about the
+ * modify DN request associated with the provided modify DN
+ * operation.
*
- * @param modifyOperation The modify operation containing the information to
- * use to log the modify response.
- */
- public void logModifyResponse(ModifyOperation modifyOperation)
- {
- long connectionID = modifyOperation.getConnectionID();
- if (connectionID < 0)
- {
- // this is an internal operation
- if (modifyOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" MODIFY conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(modifyOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(modifyOperation.getMessageID());
- buffer.append(" result=\"");
- buffer.append(modifyOperation.getResultCode());
-
- MessageBuilder msg = modifyOperation.getErrorMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append("\" message=\"");
- buffer.append(msg);
- }
-
- msg = modifyOperation.getAdditionalLogMessage();
- if ((msg != null) && (msg.length() > 0))
- {
- buffer.append("\" additionalInfo=\"");
- buffer.append(msg);
- }
-
- DN proxiedAuthDN = modifyOperation.getProxiedAuthorizationDN();
- if (proxiedAuthDN != null)
- {
- buffer.append("\" authzDN=\"");
- proxiedAuthDN.toString(buffer);
- }
-
- buffer.append("\" etime=");
- long etime = modifyOperation.getProcessingNanoTime();
- if(etime <= -1)
- {
- etime = modifyOperation.getProcessingTime();
- }
- buffer.append(etime);
-
- writer.writeRecord(buffer.toString());
- }
-
-
-
- /**
- * Writes a message to the access logger with information about the modify DN
- * request associated with the provided modify DN operation.
- *
- * @param modifyDNOperation The modify DN operation containing the
- * info to use to log the modify DN request.
+ * @param modifyDNOperation
+ * The modify DN operation containing the info to use to
+ * log the modify DN request.
*/
public void logModifyDNRequest(ModifyDNOperation modifyDNOperation)
{
- long connectionID = modifyDNOperation.getConnectionID();
- if (connectionID < 0)
+ if (!isLoggable(modifyDNOperation))
{
- // This is an internal operation.
- if (modifyDNOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
+ return;
}
+
StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" MODIFYDN conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(modifyDNOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(modifyDNOperation.getMessageID());
+ appendHeader(modifyDNOperation, "MODIFYDN", CATEGORY_REQUEST, buffer);
buffer.append(" dn=\"");
modifyDNOperation.getRawEntryDN().toString(buffer);
buffer.append("\" newRDN=\"");
@@ -1362,78 +1112,59 @@
if (modifyDNOperation.isSynchronizationOperation())
buffer.append(" type=synchronization");
-
writer.writeRecord(buffer.toString());
}
/**
- * Writes a message to the access logger with information about the modify DN
- * response associated with the provided modify DN operation.
+ * Writes a message to the access logger with information about the
+ * modify DN response associated with the provided modify DN
+ * operation.
*
- * @param modifyDNOperation The modify DN operation containing the
- * information to use to log the modify DN
- * response.
+ * @param modifyDNOperation
+ * The modify DN operation containing the information to
+ * use to log the modify DN response.
*/
public void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
{
- long connectionID = modifyDNOperation.getConnectionID();
- if (connectionID < 0)
+ if (!isLoggable(modifyDNOperation))
{
- // This is an internal operation.
- if (modifyDNOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
+ return;
}
+
StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" MODIFYDN conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(modifyDNOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(modifyDNOperation.getMessageID());
- buffer.append(" result=\"");
- buffer.append(modifyDNOperation.getResultCode());
+ appendHeader(modifyDNOperation, "MODIFYDN", CATEGORY_RESPONSE, buffer);
+ buffer.append(" result=");
+ buffer.append(modifyDNOperation.getResultCode().getIntValue());
MessageBuilder msg = modifyDNOperation.getErrorMessage();
if ((msg != null) && (msg.length() > 0))
{
- buffer.append("\" message=\"");
+ buffer.append(" message=\"");
buffer.append(msg);
+ buffer.append('\"');
}
msg = modifyDNOperation.getAdditionalLogMessage();
if ((msg != null) && (msg.length() > 0))
{
- buffer.append("\" additionalInfo=\"");
+ buffer.append(" additionalInfo=\"");
buffer.append(msg);
+ buffer.append('\"');
}
DN proxiedAuthDN = modifyDNOperation.getProxiedAuthorizationDN();
if (proxiedAuthDN != null)
{
- buffer.append("\" authzDN=\"");
+ buffer.append(" authzDN=\"");
proxiedAuthDN.toString(buffer);
+ buffer.append('\"');
}
- buffer.append("\" etime=");
+ buffer.append(" etime=");
long etime = modifyDNOperation.getProcessingNanoTime();
- if(etime <= -1)
+ if (etime <= -1)
{
etime = modifyDNOperation.getProcessingTime();
}
@@ -1443,44 +1174,131 @@
}
+
/**
- * Writes a message to the access logger with information about the search
- * request associated with the provided search operation.
+ * {@inheritDoc}
+ */
+ public void logModifyIntermediateMessage(ModifyOperation modifyOperation,
+ String category, Map<String, String> content)
+ {
+ logIntermediateMessage(modifyOperation, "MODIFY", category, content);
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * modify request associated with the provided modify operation.
*
- * @param searchOperation The search operation containing the info to
- * use to log the search request.
+ * @param modifyOperation
+ * The modify operation containing the information to use
+ * to log the modify request.
+ */
+ public void logModifyRequest(ModifyOperation modifyOperation)
+ {
+ if (!isLoggable(modifyOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(modifyOperation, "MODIFY", CATEGORY_REQUEST, buffer);
+ buffer.append(" dn=\"");
+ modifyOperation.getRawEntryDN().toString(buffer);
+ buffer.append("\"");
+ if (modifyOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * modify response associated with the provided modify operation.
+ *
+ * @param modifyOperation
+ * The modify operation containing the information to use
+ * to log the modify response.
+ */
+ public void logModifyResponse(ModifyOperation modifyOperation)
+ {
+ if (!isLoggable(modifyOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(modifyOperation, "MODIFY", CATEGORY_RESPONSE, buffer);
+ buffer.append(" result=");
+ buffer.append(modifyOperation.getResultCode().getIntValue());
+
+ MessageBuilder msg = modifyOperation.getErrorMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" message=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ msg = modifyOperation.getAdditionalLogMessage();
+ if ((msg != null) && (msg.length() > 0))
+ {
+ buffer.append(" additionalInfo=\"");
+ buffer.append(msg);
+ buffer.append('\"');
+ }
+
+ DN proxiedAuthDN = modifyOperation.getProxiedAuthorizationDN();
+ if (proxiedAuthDN != null)
+ {
+ buffer.append(" authzDN=\"");
+ proxiedAuthDN.toString(buffer);
+ buffer.append('\"');
+ }
+
+ buffer.append(" etime=");
+ long etime = modifyOperation.getProcessingNanoTime();
+ if (etime <= -1)
+ {
+ etime = modifyOperation.getProcessingTime();
+ }
+ buffer.append(etime);
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void logSearchIntermediateMessage(SearchOperation searchOperation,
+ String category, Map<String, String> content)
+ {
+ logIntermediateMessage(searchOperation, "SEARCH", category, content);
+ }
+
+
+
+ /**
+ * Writes a message to the access logger with information about the
+ * search request associated with the provided search operation.
+ *
+ * @param searchOperation
+ * The search operation containing the info to use to log
+ * the search request.
*/
public void logSearchRequest(SearchOperation searchOperation)
{
- long connectionID = searchOperation.getConnectionID();
- if (connectionID < 0)
+ if (!isLoggable(searchOperation))
{
- // This is an internal operation.
- if (searchOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
+ return;
}
+
StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" SEARCH conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(searchOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(searchOperation.getMessageID());
+ appendHeader(searchOperation, "SEARCH", CATEGORY_REQUEST, buffer);
buffer.append(" base=\"");
searchOperation.getRawBaseDN().toString(buffer);
buffer.append("\" scope=");
@@ -1510,93 +1328,40 @@
if (searchOperation.isSynchronizationOperation())
buffer.append(" type=synchronization");
-
writer.writeRecord(buffer.toString());
}
- /**
- * Writes a message to the access logger with information about the search
- * result entry that matches the criteria associated with the provided search
- * operation.
- *
- * @param searchOperation The search operation with which the search result
- * entry is associated.
- * @param searchEntry The search result entry to be logged.
- */
- public void logSearchResultEntry(SearchOperation searchOperation,
- SearchResultEntry searchEntry)
- {
- // NYI
- }
-
-
- /**
- * Writes a message to the access logger with information about the search
- * result reference returned while processing the associated search
- * operation.
- *
- * @param searchOperation The search operation with which the search result
- * reference is associated.
- * @param searchReference The search result reference to be logged.
- */
- public void logSearchResultReference(SearchOperation searchOperation,
- SearchResultReference searchReference)
- {
- // NYI
- }
-
-
/**
* Writes a message to the access logger with information about the
* completion of the provided search operation.
*
- * @param searchOperation The search operation containing the information
- * to use to log the search result done message.
+ * @param searchOperation
+ * The search operation containing the information to use
+ * to log the search result done message.
*/
public void logSearchResultDone(SearchOperation searchOperation)
{
- long connectionID = searchOperation.getConnectionID();
- if (connectionID < 0)
+ if (!isLoggable(searchOperation))
{
- // This is an internal operation.
- if (searchOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
+ return;
}
+
StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" SEARCH conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(searchOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(searchOperation.getMessageID());
- buffer.append(" result=\"");
- buffer.append(searchOperation.getResultCode());
+ appendHeader(searchOperation, "SEARCH", CATEGORY_RESPONSE, buffer);
+ buffer.append(" result=");
+ buffer.append(searchOperation.getResultCode().getIntValue());
MessageBuilder msg = searchOperation.getErrorMessage();
if ((msg != null) && (msg.length() > 0))
{
- buffer.append("\" message=\"");
+ buffer.append(" message=\"");
buffer.append(msg);
+ buffer.append('\"');
}
- buffer.append("\" nentries=");
+ buffer.append(" nentries=");
buffer.append(searchOperation.getEntriesSent());
msg = searchOperation.getAdditionalLogMessage();
@@ -1604,7 +1369,7 @@
{
buffer.append(" additionalInfo=\"");
buffer.append(msg);
- buffer.append("\"");
+ buffer.append('\"');
}
DN proxiedAuthDN = searchOperation.getProxiedAuthorizationDN();
@@ -1612,12 +1377,12 @@
{
buffer.append(" authzDN=\"");
proxiedAuthDN.toString(buffer);
- buffer.append("\"");
+ buffer.append('\"');
}
buffer.append(" etime=");
long etime = searchOperation.getProcessingNanoTime();
- if(etime <= -1)
+ if (etime <= -1)
{
etime = searchOperation.getProcessingTime();
}
@@ -1629,63 +1394,97 @@
/**
- * Writes a message to the access logger with information about the unbind
- * request associated with the provided unbind operation.
+ * Writes a message to the access logger with information about the
+ * unbind request associated with the provided unbind operation.
*
- * @param unbindOperation The unbind operation containing the info to
- * use to log the unbind request.
+ * @param unbindOperation
+ * The unbind operation containing the info to use to log
+ * the unbind request.
*/
public void logUnbind(UnbindOperation unbindOperation)
{
- long connectionID = unbindOperation.getConnectionID();
+ if (!isLoggable(unbindOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(unbindOperation, "UNBIND", CATEGORY_REQUEST, buffer);
+ if (unbindOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
+ writer.writeRecord(buffer.toString());
+ }
+
+
+
+ // Appends the common log header information to the provided buffer.
+ private void appendHeader(Operation operation, String opType,
+ String category, StringBuilder buffer)
+ {
+ buffer.append("[");
+ buffer.append(TimeThread.getLocalTime());
+ buffer.append("] ");
+ buffer.append(opType);
+ buffer.append(" ");
+ buffer.append(category);
+ buffer.append(" conn=");
+ buffer.append(operation.getConnectionID());
+ buffer.append(" op=");
+ buffer.append(operation.getOperationID());
+ buffer.append(" msgID=");
+ buffer.append(operation.getMessageID());
+ }
+
+
+
+ // Determines whether the provided operation should be logged.
+ private boolean isLoggable(Operation operation)
+ {
+ long connectionID = operation.getConnectionID();
if (connectionID < 0)
{
// This is an internal operation.
- if (unbindOperation.isSynchronizationOperation())
+ if (operation.isSynchronizationOperation())
{
if (suppressSynchronizationOperations)
{
- return;
+ return false;
}
}
else
{
if (suppressInternalOperations)
{
- return;
+ return false;
}
}
}
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("[");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("]");
- buffer.append(" UNBIND conn=");
- buffer.append(connectionID);
- buffer.append(" op=");
- buffer.append(unbindOperation.getOperationID());
- buffer.append(" msgID=");
- buffer.append(unbindOperation.getMessageID());
- if (unbindOperation.isSynchronizationOperation())
- buffer.append(" type=synchronization");
+ return true;
+ }
+
+ // Writes an intermediate message to the log.
+ private void logIntermediateMessage(Operation operation, String opType,
+ String category, Map<String, String> content)
+ {
+ if (!isLoggable(operation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(operation, opType, category, buffer);
+
+ for (Map.Entry<String, String> entry : content.entrySet())
+ {
+ buffer.append(' ');
+ buffer.append(entry.getKey());
+ buffer.append('=');
+ buffer.append(entry.getValue());
+ }
+
writer.writeRecord(buffer.toString());
}
-
- /**
- * {@inheritDoc}
- */
- public DN getDN()
- {
- if(currentConfig != null)
- {
- return currentConfig.dn();
- }
- else
- {
- return null;
- }
- }
}
-
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
index 915fe7f..a2d41d8a4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
@@ -25,49 +25,56 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.loggers;
-import org.opends.messages.Message;
+
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.server.types.ResultCode.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
-import org.opends.server.admin.std.server.FileBasedAccessLogPublisherCfg;
-import org.opends.server.admin.std.server.AccessLogPublisherCfg;
+import org.opends.messages.Message;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.api.*;
+import org.opends.server.admin.std.server.AccessLogPublisherCfg;
+import org.opends.server.admin.std.server.FileBasedAccessLogPublisherCfg;
+import org.opends.server.api.AccessLogPublisher;
import org.opends.server.config.ConfigException;
-import org.opends.server.core.AbandonOperation;
import org.opends.server.core.AddOperation;
-import org.opends.server.core.BindOperation;
-import org.opends.server.core.CompareOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.core.ExtendedOperation;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
-import org.opends.server.core.SearchOperation;
-import org.opends.server.core.UnbindOperation;
-import org.opends.server.types.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.FilePermission;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.Modification;
+import org.opends.server.types.Operation;
+import org.opends.server.types.ResultCode;
import org.opends.server.util.Base64;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
-import static org.opends.messages.ConfigMessages.*;
-
-import static org.opends.server.types.ResultCode.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
/**
* This class provides the implementation of the audit logger used by
* the directory server.
*/
-public class TextAuditLogPublisher
- extends AccessLogPublisher<FileBasedAccessLogPublisherCfg>
- implements ConfigurationChangeListener<FileBasedAccessLogPublisherCfg>
+public class TextAuditLogPublisher extends
+ AccessLogPublisher<FileBasedAccessLogPublisherCfg> implements
+ ConfigurationChangeListener<FileBasedAccessLogPublisherCfg>
{
+
private boolean suppressInternalOperations = true;
private boolean suppressSynchronizationOperations = false;
@@ -76,129 +83,7 @@
private FileBasedAccessLogPublisherCfg currentConfig;
- /**
- * {@inheritDoc}
- */
- public boolean isConfigurationAcceptable(AccessLogPublisherCfg configuration,
- List<Message> unacceptableReasons)
- {
- FileBasedAccessLogPublisherCfg config =
- (FileBasedAccessLogPublisherCfg) configuration;
- return isConfigurationChangeAcceptable(config, unacceptableReasons);
- }
- /**
- * {@inheritDoc}
- */
- @Override()
- public void initializeAccessLogPublisher(
- FileBasedAccessLogPublisherCfg config)
- throws ConfigException, InitializationException
- {
- File logFile = getFileForPath(config.getLogFile());
- FileNamingPolicy fnPolicy = new TimeStampNaming(logFile);
-
- try
- {
- FilePermission perm =
- FilePermission.decodeUNIXMode(config.getLogFilePermissions());
-
- LogPublisherErrorHandler errorHandler =
- new LogPublisherErrorHandler(config.dn());
-
- boolean writerAutoFlush =
- config.isAutoFlush() && !config.isAsynchronous();
-
- MultifileTextWriter writer =
- new MultifileTextWriter("Multifile Text Writer for " +
- config.dn().toNormalizedString(),
- config.getTimeInterval(),
- fnPolicy,
- perm,
- errorHandler,
- "UTF-8",
- writerAutoFlush,
- config.isAppend(),
- (int)config.getBufferSize());
-
- // Validate retention and rotation policies.
- for(DN dn : config.getRotationPolicyDNs())
- {
- writer.addRotationPolicy(DirectoryServer.getRotationPolicy(dn));
- }
-
- for(DN dn: config.getRetentionPolicyDNs())
- {
- writer.addRetentionPolicy(DirectoryServer.getRetentionPolicy(dn));
- }
-
- if(config.isAsynchronous())
- {
- this.writer = new AsyncronousTextWriter("Asyncronous Text Writer for " +
- config.dn().toNormalizedString(), config.getQueueSize(),
- config.isAutoFlush(),
- writer);
- }
- else
- {
- this.writer = writer;
- }
- }
- catch(DirectoryException e)
- {
- Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
- config.dn().toString(), String.valueOf(e));
- throw new InitializationException(message, e);
-
- }
- catch(IOException e)
- {
- Message message = ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(
- logFile.toString(), config.dn().toString(), String.valueOf(e));
- throw new InitializationException(message, e);
-
- }
-
- suppressInternalOperations = config.isSuppressInternalOperations();
- suppressSynchronizationOperations =
- config.isSuppressSynchronizationOperations();
-
- currentConfig = config;
-
- config.addFileBasedAccessChangeListener(this);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isConfigurationChangeAcceptable(
- FileBasedAccessLogPublisherCfg config, List<Message> unacceptableReasons)
- {
- // Make sure the permission is valid.
- try
- {
- FilePermission filePerm =
- FilePermission.decodeUNIXMode(config.getLogFilePermissions());
- if(!filePerm.isOwnerWritable())
- {
- Message message = ERR_CONFIG_LOGGING_INSANE_MODE.get(
- config.getLogFilePermissions());
- unacceptableReasons.add(message);
- return false;
- }
- }
- catch(DirectoryException e)
- {
- Message message = ERR_CONFIG_LOGGING_MODE_INVALID.get(
- config.getLogFilePermissions(), String.valueOf(e));
- unacceptableReasons.add(message);
- return false;
- }
-
- return true;
- }
/**
* {@inheritDoc}
@@ -212,78 +97,77 @@
ArrayList<Message> messages = new ArrayList<Message>();
suppressInternalOperations = config.isSuppressInternalOperations();
- suppressSynchronizationOperations =
- config.isSuppressSynchronizationOperations();
+ suppressSynchronizationOperations = config
+ .isSuppressSynchronizationOperations();
File logFile = getFileForPath(config.getLogFile());
FileNamingPolicy fnPolicy = new TimeStampNaming(logFile);
try
{
- FilePermission perm =
- FilePermission.decodeUNIXMode(config.getLogFilePermissions());
+ FilePermission perm = FilePermission.decodeUNIXMode(config
+ .getLogFilePermissions());
- boolean writerAutoFlush =
- config.isAutoFlush() && !config.isAsynchronous();
+ boolean writerAutoFlush = config.isAutoFlush()
+ && !config.isAsynchronous();
TextWriter currentWriter;
- // Determine the writer we are using. If we were writing asyncronously,
+ // Determine the writer we are using. If we were writing
+ // asyncronously,
// we need to modify the underlaying writer.
- if(writer instanceof AsyncronousTextWriter)
+ if (writer instanceof AsyncronousTextWriter)
{
- currentWriter = ((AsyncronousTextWriter)writer).getWrappedWriter();
+ currentWriter = ((AsyncronousTextWriter) writer).getWrappedWriter();
}
else
{
currentWriter = writer;
}
- if(currentWriter instanceof MultifileTextWriter)
+ if (currentWriter instanceof MultifileTextWriter)
{
- MultifileTextWriter mfWriter = (MultifileTextWriter)currentWriter;
+ MultifileTextWriter mfWriter = (MultifileTextWriter) currentWriter;
mfWriter.setNamingPolicy(fnPolicy);
mfWriter.setFilePermissions(perm);
mfWriter.setAppend(config.isAppend());
mfWriter.setAutoFlush(writerAutoFlush);
- mfWriter.setBufferSize((int)config.getBufferSize());
+ mfWriter.setBufferSize((int) config.getBufferSize());
mfWriter.setInterval(config.getTimeInterval());
mfWriter.removeAllRetentionPolicies();
mfWriter.removeAllRotationPolicies();
- for(DN dn : config.getRotationPolicyDNs())
+ for (DN dn : config.getRotationPolicyDNs())
{
mfWriter.addRotationPolicy(DirectoryServer.getRotationPolicy(dn));
}
- for(DN dn: config.getRetentionPolicyDNs())
+ for (DN dn : config.getRetentionPolicyDNs())
{
mfWriter.addRetentionPolicy(DirectoryServer.getRetentionPolicy(dn));
}
- if(writer instanceof AsyncronousTextWriter && !config.isAsynchronous())
+ if (writer instanceof AsyncronousTextWriter && !config.isAsynchronous())
{
// The asynronous setting is being turned off.
- AsyncronousTextWriter asyncWriter = ((AsyncronousTextWriter)writer);
+ AsyncronousTextWriter asyncWriter = ((AsyncronousTextWriter) writer);
writer = mfWriter;
asyncWriter.shutdown(false);
}
- if(!(writer instanceof AsyncronousTextWriter) &&
- config.isAsynchronous())
+ if (!(writer instanceof AsyncronousTextWriter)
+ && config.isAsynchronous())
{
// The asynronous setting is being turned on.
- AsyncronousTextWriter asyncWriter =
- new AsyncronousTextWriter("Asyncronous Text Writer for " +
- config.dn().toNormalizedString(), config.getQueueSize(),
- config.isAutoFlush(),
- mfWriter);
+ AsyncronousTextWriter asyncWriter = new AsyncronousTextWriter(
+ "Asyncronous Text Writer for " + config.dn().toNormalizedString(),
+ config.getQueueSize(), config.isAutoFlush(), mfWriter);
writer = asyncWriter;
}
- if((currentConfig.isAsynchronous() && config.isAsynchronous()) &&
- (currentConfig.getQueueSize() != config.getQueueSize()))
+ if ((currentConfig.isAsynchronous() && config.isAsynchronous())
+ && (currentConfig.getQueueSize() != config.getQueueSize()))
{
adminActionRequired = true;
}
@@ -291,11 +175,10 @@
currentConfig = config;
}
}
- catch(Exception e)
+ catch (Exception e)
{
- Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
- config.dn().toString(),
- stackTraceToSingleLineString(e));
+ Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(config.dn()
+ .toString(), stackTraceToSingleLineString(e));
resultCode = DirectoryServer.getServerErrorResultCode();
messages.add(message);
@@ -321,9 +204,17 @@
/**
* {@inheritDoc}
*/
- @Override()
- public void logConnect(ClientConnection clientConnection)
+ @Override
+ public DN getDN()
{
+ if (currentConfig != null)
+ {
+ return currentConfig.dn();
+ }
+ else
+ {
+ return null;
+ }
}
@@ -332,10 +223,73 @@
* {@inheritDoc}
*/
@Override()
- public void logDisconnect(ClientConnection clientConnection,
- DisconnectReason disconnectReason,
- Message message)
+ public void initializeAccessLogPublisher(
+ FileBasedAccessLogPublisherCfg config)
+ throws ConfigException, InitializationException
{
+ File logFile = getFileForPath(config.getLogFile());
+ FileNamingPolicy fnPolicy = new TimeStampNaming(logFile);
+
+ try
+ {
+ FilePermission perm = FilePermission.decodeUNIXMode(config
+ .getLogFilePermissions());
+
+ LogPublisherErrorHandler errorHandler = new LogPublisherErrorHandler(
+ config.dn());
+
+ boolean writerAutoFlush = config.isAutoFlush()
+ && !config.isAsynchronous();
+
+ MultifileTextWriter writer = new MultifileTextWriter(
+ "Multifile Text Writer for " + config.dn().toNormalizedString(),
+ config.getTimeInterval(), fnPolicy, perm, errorHandler, "UTF-8",
+ writerAutoFlush, config.isAppend(), (int) config.getBufferSize());
+
+ // Validate retention and rotation policies.
+ for (DN dn : config.getRotationPolicyDNs())
+ {
+ writer.addRotationPolicy(DirectoryServer.getRotationPolicy(dn));
+ }
+
+ for (DN dn : config.getRetentionPolicyDNs())
+ {
+ writer.addRetentionPolicy(DirectoryServer.getRetentionPolicy(dn));
+ }
+
+ if (config.isAsynchronous())
+ {
+ this.writer = new AsyncronousTextWriter("Asyncronous Text Writer for "
+ + config.dn().toNormalizedString(), config.getQueueSize(), config
+ .isAutoFlush(), writer);
+ }
+ else
+ {
+ this.writer = writer;
+ }
+ }
+ catch (DirectoryException e)
+ {
+ Message message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(config.dn()
+ .toString(), String.valueOf(e));
+ throw new InitializationException(message, e);
+
+ }
+ catch (IOException e)
+ {
+ Message message = ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(logFile
+ .toString(), config.dn().toString(), String.valueOf(e));
+ throw new InitializationException(message, e);
+
+ }
+
+ suppressInternalOperations = config.isSuppressInternalOperations();
+ suppressSynchronizationOperations = config
+ .isSuppressSynchronizationOperations();
+
+ currentConfig = config;
+
+ config.addFileBasedAccessChangeListener(this);
}
@@ -343,9 +297,13 @@
/**
* {@inheritDoc}
*/
- @Override()
- public void logAbandonRequest(AbandonOperation abandonOperation)
+ @Override
+ public boolean isConfigurationAcceptable(AccessLogPublisherCfg configuration,
+ List<Message> unacceptableReasons)
{
+ FileBasedAccessLogPublisherCfg config =
+ (FileBasedAccessLogPublisherCfg) configuration;
+ return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
@@ -353,19 +311,31 @@
/**
* {@inheritDoc}
*/
- @Override()
- public void logAbandonResult(AbandonOperation abandonOperation)
+ public boolean isConfigurationChangeAcceptable(
+ FileBasedAccessLogPublisherCfg config, List<Message> unacceptableReasons)
{
- }
+ // Make sure the permission is valid.
+ try
+ {
+ FilePermission filePerm = FilePermission.decodeUNIXMode(config
+ .getLogFilePermissions());
+ if (!filePerm.isOwnerWritable())
+ {
+ Message message = ERR_CONFIG_LOGGING_INSANE_MODE.get(config
+ .getLogFilePermissions());
+ unacceptableReasons.add(message);
+ return false;
+ }
+ }
+ catch (DirectoryException e)
+ {
+ Message message = ERR_CONFIG_LOGGING_MODE_INVALID.get(config
+ .getLogFilePermissions(), String.valueOf(e));
+ unacceptableReasons.add(message);
+ return false;
+ }
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logAddRequest(AddOperation addOperation)
- {
+ return true;
}
@@ -376,133 +346,58 @@
@Override()
public void logAddResponse(AddOperation addOperation)
{
- long connectionID = addOperation.getConnectionID();
- if (connectionID < 0)
+ if (!isLoggable(addOperation))
{
- // This is an internal operation.
- if (addOperation.isSynchronizationOperation())
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(addOperation, buffer);
+
+ buffer.append("dn:");
+ encodeValue(addOperation.getEntryDN().toString(), buffer);
+ buffer.append(EOL);
+
+ buffer.append("changetype: add");
+ buffer.append(EOL);
+
+ for (String ocName : addOperation.getObjectClasses().values())
+ {
+ buffer.append("objectClass: ");
+ buffer.append(ocName);
+ buffer.append(EOL);
+ }
+
+ for (List<Attribute> attrList : addOperation.getUserAttributes().values())
+ {
+ for (Attribute a : attrList)
{
- if (suppressSynchronizationOperations)
+ for (AttributeValue v : a)
{
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
+ buffer.append(a.getName());
+ buffer.append(":");
+ encodeValue(v.getValue(), buffer);
+ buffer.append(EOL);
}
}
}
- ResultCode code = addOperation.getResultCode();
- if(code == SUCCESS)
+ for (List<Attribute> attrList : addOperation.getOperationalAttributes()
+ .values())
{
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("# ");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("; conn=");
- buffer.append(addOperation.getConnectionID());
- buffer.append("; op=");
- buffer.append(addOperation.getOperationID());
- buffer.append(EOL);
-
- buffer.append("dn:");
- encodeValue(addOperation.getEntryDN().toString(), buffer);
- buffer.append(EOL);
-
- buffer.append("changetype: add");
- buffer.append(EOL);
-
- for (String ocName : addOperation.getObjectClasses().values())
+ for (Attribute a : attrList)
{
- buffer.append("objectClass: ");
- buffer.append(ocName);
- buffer.append(EOL);
- }
-
- for (List<Attribute> attrList : addOperation.getUserAttributes().values())
- {
- for (Attribute a : attrList)
+ for (AttributeValue v : a)
{
- for (AttributeValue v : a.getValues())
- {
- buffer.append(a.getName());
- buffer.append(":");
- encodeValue(v.getValue(), buffer);
- buffer.append(EOL);
- }
+ buffer.append(a.getName());
+ buffer.append(":");
+ encodeValue(v.getValue(), buffer);
+ buffer.append(EOL);
}
}
-
- for (List<Attribute> attrList :
- addOperation.getOperationalAttributes().values())
- {
- for (Attribute a : attrList)
- {
- for (AttributeValue v : a.getValues())
- {
- buffer.append(a.getName());
- buffer.append(":");
- encodeValue(v.getValue(), buffer);
- buffer.append(EOL);
- }
- }
- }
-
- writer.writeRecord(buffer.toString());
}
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logBindRequest(BindOperation bindOperation)
- {
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logBindResponse(BindOperation bindOperation)
- {
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logCompareRequest(CompareOperation compareOperation)
- {
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logCompareResponse(CompareOperation compareOperation)
- {
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logDeleteRequest(DeleteOperation deleteOperation)
- {
+ writer.writeRecord(buffer.toString());
}
@@ -513,183 +408,22 @@
@Override()
public void logDeleteResponse(DeleteOperation deleteOperation)
{
- long connectionID = deleteOperation.getConnectionID();
- if (connectionID < 0)
+ if (!isLoggable(deleteOperation))
{
- // This is an internal operation.
- if (deleteOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- ResultCode code = deleteOperation.getResultCode();
-
- if(code == SUCCESS)
- {
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("# ");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("; conn=");
- buffer.append(deleteOperation.getConnectionID());
- buffer.append("; op=");
- buffer.append(deleteOperation.getOperationID());
- buffer.append(EOL);
-
- buffer.append("dn:");
- encodeValue(deleteOperation.getEntryDN().toString(), buffer);
- buffer.append(EOL);
-
- buffer.append("changetype: delete");
- buffer.append(EOL);
-
- writer.writeRecord(buffer.toString());
+ return;
}
- }
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(deleteOperation, buffer);
+ buffer.append("dn:");
+ encodeValue(deleteOperation.getEntryDN().toString(), buffer);
+ buffer.append(EOL);
+ buffer.append("changetype: delete");
+ buffer.append(EOL);
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logExtendedRequest(ExtendedOperation extendedOperation)
- {
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logExtendedResponse(ExtendedOperation extendedOperation)
- {
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logModifyRequest(ModifyOperation modifyOperation)
- {
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logModifyResponse(ModifyOperation modifyOperation)
- {
- long connectionID = modifyOperation.getConnectionID();
- if (connectionID < 0)
- {
- // This is an internal operation.
- if (modifyOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
- }
- ResultCode code = modifyOperation.getResultCode();
-
- if(code == SUCCESS)
- {
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("# ");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("; conn=");
- buffer.append(modifyOperation.getConnectionID());
- buffer.append("; op=");
- buffer.append(modifyOperation.getOperationID());
- buffer.append(EOL);
-
- buffer.append("dn:");
- encodeValue(modifyOperation.getEntryDN().toString(), buffer);
- buffer.append(EOL);
-
- buffer.append("changetype: modify");
- buffer.append(EOL);
-
- boolean first = true;
- for (Modification mod : modifyOperation.getModifications())
- {
- if (first)
- {
- first = false;
- }
- else
- {
- buffer.append("-");
- buffer.append(EOL);
- }
-
- switch (mod.getModificationType())
- {
- case ADD:
- buffer.append("add: ");
- break;
- case DELETE:
- buffer.append("delete: ");
- break;
- case REPLACE:
- buffer.append("replace: ");
- break;
- case INCREMENT:
- buffer.append("increment: ");
- break;
- default:
- continue;
- }
-
- Attribute a = mod.getAttribute();
- buffer.append(a.getName());
- buffer.append(EOL);
-
- for (AttributeValue v : a.getValues())
- {
- buffer.append(a.getName());
- buffer.append(":");
- encodeValue(v.getValue(), buffer);
- buffer.append(EOL);
- }
- }
-
- writer.writeRecord(buffer.toString());
- }
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logModifyDNRequest(ModifyDNOperation modifyDNOperation)
- {
+ writer.writeRecord(buffer.toString());
}
@@ -700,140 +434,151 @@
@Override()
public void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
{
- long connectionID = modifyDNOperation.getConnectionID();
- if (connectionID < 0)
+ if (!isLoggable(modifyDNOperation))
{
- // This is an internal operation.
- if (modifyDNOperation.isSynchronizationOperation())
- {
- if (suppressSynchronizationOperations)
- {
- return;
- }
- }
- else
- {
- if (suppressInternalOperations)
- {
- return;
- }
- }
+ return;
}
- ResultCode code = modifyDNOperation.getResultCode();
- if(code == SUCCESS)
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(modifyDNOperation, buffer);
+
+ buffer.append("dn:");
+ encodeValue(modifyDNOperation.getEntryDN().toString(), buffer);
+ buffer.append(EOL);
+
+ buffer.append("changetype: moddn");
+ buffer.append(EOL);
+
+ buffer.append("newrdn:");
+ encodeValue(modifyDNOperation.getNewRDN().toString(), buffer);
+ buffer.append(EOL);
+
+ buffer.append("deleteoldrdn: ");
+ if (modifyDNOperation.deleteOldRDN())
{
- StringBuilder buffer = new StringBuilder(50);
- buffer.append("# ");
- buffer.append(TimeThread.getLocalTime());
- buffer.append("; conn=");
- buffer.append(modifyDNOperation.getConnectionID());
- buffer.append("; op=");
- buffer.append(modifyDNOperation.getOperationID());
- buffer.append(EOL);
+ buffer.append("1");
+ }
+ else
+ {
+ buffer.append("0");
+ }
+ buffer.append(EOL);
- buffer.append("dn:");
- encodeValue(modifyDNOperation.getEntryDN().toString(), buffer);
+ DN newSuperior = modifyDNOperation.getNewSuperior();
+ if (newSuperior != null)
+ {
+ buffer.append("newsuperior:");
+ encodeValue(newSuperior.toString(), buffer);
buffer.append(EOL);
+ }
- buffer.append("changetype: moddn");
- buffer.append(EOL);
+ writer.writeRecord(buffer.toString());
+ }
- buffer.append("newrdn:");
- encodeValue(modifyDNOperation.getNewRDN().toString(), buffer);
- buffer.append(EOL);
- buffer.append("deleteoldrdn: ");
- if (modifyDNOperation.deleteOldRDN())
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public void logModifyResponse(ModifyOperation modifyOperation)
+ {
+ if (!isLoggable(modifyOperation))
+ {
+ return;
+ }
+
+ StringBuilder buffer = new StringBuilder(50);
+ appendHeader(modifyOperation, buffer);
+
+ buffer.append("dn:");
+ encodeValue(modifyOperation.getEntryDN().toString(), buffer);
+ buffer.append(EOL);
+
+ buffer.append("changetype: modify");
+ buffer.append(EOL);
+
+ boolean first = true;
+ for (Modification mod : modifyOperation.getModifications())
+ {
+ if (first)
{
- buffer.append("1");
+ first = false;
}
else
{
- buffer.append("0");
- }
- buffer.append(EOL);
-
- DN newSuperior = modifyDNOperation.getNewSuperior();
- if (newSuperior != null)
- {
- buffer.append("newsuperior:");
- encodeValue(newSuperior.toString(), buffer);
+ buffer.append("-");
buffer.append(EOL);
}
- writer.writeRecord(buffer.toString());
+ switch (mod.getModificationType())
+ {
+ case ADD:
+ buffer.append("add: ");
+ break;
+ case DELETE:
+ buffer.append("delete: ");
+ break;
+ case REPLACE:
+ buffer.append("replace: ");
+ break;
+ case INCREMENT:
+ buffer.append("increment: ");
+ break;
+ default:
+ continue;
+ }
+
+ Attribute a = mod.getAttribute();
+ buffer.append(a.getName());
+ buffer.append(EOL);
+
+ for (AttributeValue v : a)
+ {
+ buffer.append(a.getName());
+ buffer.append(":");
+ encodeValue(v.getValue(), buffer);
+ buffer.append(EOL);
+ }
}
+
+ writer.writeRecord(buffer.toString());
}
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logSearchRequest(SearchOperation searchOperation)
+ // Appends the common log header information to the provided buffer.
+ private void appendHeader(Operation operation, StringBuilder buffer)
{
+ buffer.append("# ");
+ buffer.append(TimeThread.getLocalTime());
+ buffer.append("; conn=");
+ buffer.append(operation.getConnectionID());
+ buffer.append("; op=");
+ buffer.append(operation.getOperationID());
+ buffer.append(EOL);
}
/**
- * {@inheritDoc}
- */
- @Override()
- public void logSearchResultEntry(SearchOperation searchOperation,
- SearchResultEntry searchEntry)
- {
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logSearchResultReference(SearchOperation searchOperation,
- SearchResultReference searchReference)
- {
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logSearchResultDone(SearchOperation searchOperation)
- {
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override()
- public void logUnbind(UnbindOperation unbindOperation)
- {
- }
-
-
-
- /**
- * Appends the appropriately-encoded attribute value to the provided buffer.
+ * Appends the appropriately-encoded attribute value to the provided
+ * buffer.
*
- * @param str The ASN.1 octet string containing the value to append.
- * @param buffer The buffer to which to append the value.
+ * @param str
+ * The ASN.1 octet string containing the value to append.
+ * @param buffer
+ * The buffer to which to append the value.
*/
private void encodeValue(ByteString str, StringBuilder buffer)
{
byte[] byteVal = str.value();
- if(StaticUtils.needsBase64Encoding(byteVal))
+ if (StaticUtils.needsBase64Encoding(byteVal))
{
buffer.append(": ");
buffer.append(Base64.encode(byteVal));
- } else
+ }
+ else
{
buffer.append(" ");
str.toString(buffer);
@@ -843,37 +588,58 @@
/**
- * Appends the appropriately-encoded attribute value to the provided buffer.
+ * Appends the appropriately-encoded attribute value to the provided
+ * buffer.
*
- * @param str The string containing the value to append.
- * @param buffer The buffer to which to append the value.
+ * @param str
+ * The string containing the value to append.
+ * @param buffer
+ * The buffer to which to append the value.
*/
private void encodeValue(String str, StringBuilder buffer)
{
- if(StaticUtils.needsBase64Encoding(str))
+ if (StaticUtils.needsBase64Encoding(str))
{
buffer.append(": ");
buffer.append(Base64.encode(getBytes(str)));
- } else
+ }
+ else
{
buffer.append(" ");
buffer.append(str);
}
}
- /**
- * {@inheritDoc}
- */
- public DN getDN()
+
+
+ // Determines whether the provided operation should be logged.
+ private boolean isLoggable(Operation operation)
{
- if(currentConfig != null)
+ long connectionID = operation.getConnectionID();
+ if (connectionID < 0)
{
- return currentConfig.dn();
+ // This is an internal operation.
+ if (operation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return false;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return false;
+ }
+ }
}
- else
+
+ if (operation.getResultCode() != SUCCESS)
{
- return null;
+ return false;
}
+
+ return true;
}
}
-
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java
index 156fab0..3bb2c92 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java
@@ -28,7 +28,9 @@
-import java.util.LinkedHashSet;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.util.ServerConstants.*;
+
import java.util.LinkedList;
import java.util.List;
@@ -38,18 +40,15 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.schema.BooleanSyntax;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteStringFactory;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryConfig;
-import org.opends.server.types.DN;
import org.opends.server.types.ObjectClass;
-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.*;
-
/**
@@ -191,33 +190,24 @@
{
LinkedList<Attribute> attrs = new LinkedList<Attribute>();
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(backendIDType,
- ByteStringFactory.create(backend.getBackendID())));
- attrs.add(new Attribute(backendIDType, ATTR_MONITOR_BACKEND_ID, values));
+ attrs.add(Attributes.create(backendIDType, backend.getBackendID()));
- values = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(baseDNType);
DN[] baseDNs = backend.getBaseDNs();
for (DN dn : baseDNs)
{
- values.add(new AttributeValue(baseDNType,
- ByteStringFactory.create(dn.toString())));
+ builder.add(new AttributeValue(baseDNType, dn.toString()));
}
- attrs.add(new Attribute(baseDNType, ATTR_MONITOR_BACKEND_BASE_DN, values));
+ attrs.add(builder.toAttribute());
- values = new LinkedHashSet<AttributeValue>();
- values.add(BooleanSyntax.createBooleanValue(backend.isPrivateBackend()));
- attrs.add(new Attribute(isPrivateType, ATTR_MONITOR_BACKEND_IS_PRIVATE,
- values));
+ attrs.add(Attributes.create(isPrivateType, BooleanSyntax
+ .createBooleanValue(backend.isPrivateBackend())));
- values = new LinkedHashSet<AttributeValue>();
long backendCount = backend.getEntryCount();
- values.add(new AttributeValue(entryCountType,
- ByteStringFactory.create(String.valueOf(backendCount))));
- attrs.add(new Attribute(entryCountType, ATTR_MONITOR_BACKEND_ENTRY_COUNT,
- values));
+ attrs.add(Attributes.create(entryCountType, String
+ .valueOf(backendCount)));
- values = new LinkedHashSet<AttributeValue>();
+ builder = new AttributeBuilder(baseDNEntryCountType);
if (baseDNs.length != 1)
{
for (DN dn : baseDNs)
@@ -235,28 +225,21 @@
}
}
String s = entryCount + " " + dn.toString();
- values.add(new AttributeValue(baseDNEntryCountType,
- ByteStringFactory.create(s)));
+ builder.add(new AttributeValue(baseDNEntryCountType, s));
}
}
else
{
- // This is done to avoid recalculating the number of entries using the
- // hasNumSubordinates method in the case where the backend has a single
- // base DN.
+ // This is done to avoid recalculating the number of entries
+ // using the hasNumSubordinates method in the case where the
+ // backend has a single base DN.
String s = backendCount + " " + baseDNs[0].toString();
- values.add(new AttributeValue(baseDNEntryCountType,
- ByteStringFactory.create(s)));
+ builder.add(new AttributeValue(baseDNEntryCountType, s));
}
- attrs.add(new Attribute(baseDNEntryCountType,
- ATTR_MONITOR_BASE_DN_ENTRY_COUNT, values));
+ attrs.add(builder.toAttribute());
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(writabilityModeType,
- ByteStringFactory.create(
- String.valueOf(backend.getWritabilityMode()))));
- attrs.add(new Attribute(writabilityModeType,
- ATTR_MONITOR_BACKEND_WRITABILITY_MODE, values));
+ attrs.add(Attributes.create(writabilityModeType, String
+ .valueOf(backend.getWritabilityMode())));
return attrs;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/ClientConnectionMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/ClientConnectionMonitorProvider.java
index cc765aa..58294d6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/ClientConnectionMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/ClientConnectionMonitorProvider.java
@@ -30,7 +30,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.LinkedHashSet;
import java.util.TreeMap;
import org.opends.server.admin.std.server.ConnectionHandlerCfg;
@@ -41,6 +40,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.InitializationException;
@@ -138,7 +138,7 @@
// Get information about all the available connections.
ArrayList<Collection<ClientConnection>> connCollections =
new ArrayList<Collection<ClientConnection>>();
- for (ConnectionHandler handler : DirectoryServer.getConnectionHandlers())
+ for (ConnectionHandler<?> handler : DirectoryServer.getConnectionHandlers())
{
ConnectionHandler<? extends ConnectionHandlerCfg> connHandler =
(ConnectionHandler<? extends ConnectionHandlerCfg>) handler;
@@ -160,18 +160,17 @@
// Iterate through all the client connections and create a one-line summary
// of each.
- AttributeType attrType =
- DirectoryServer.getDefaultAttributeType("connection");
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(connMap.size());
+ AttributeType attrType = DirectoryServer
+ .getDefaultAttributeType("connection");
+ AttributeBuilder builder = new AttributeBuilder(attrType);
for (ClientConnection conn : connMap.values())
{
- values.add(new AttributeValue(attrType, conn.getMonitorSummary()));
+ builder.add(new AttributeValue(attrType, conn.getMonitorSummary()));
}
ArrayList<Attribute> attrs = new ArrayList<Attribute>(1);
- attrs.add(new Attribute(attrType, "connection", values));
+ attrs.add(builder.toAttribute());
return attrs;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
index 7a1ae05..72c8aba 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
@@ -28,7 +28,8 @@
-import java.util.LinkedHashSet;
+import static org.opends.server.util.ServerConstants.*;
+
import java.util.LinkedList;
import java.util.List;
@@ -38,15 +39,14 @@
import org.opends.server.api.ConnectionHandler;
import org.opends.server.api.MonitorProvider;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteStringFactory;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.HostPort;
import org.opends.server.types.ObjectClass;
-import static org.opends.server.util.ServerConstants.*;
-
/**
@@ -175,49 +175,38 @@
LinkedList<Attribute> attrs = new LinkedList<Attribute>();
int numConnections = 0;
- LinkedList<ClientConnection> conns =
- new LinkedList<ClientConnection>(
- connectionHandler.getClientConnections());
- LinkedList<HostPort> listeners =
- new LinkedList<HostPort>(connectionHandler.getListeners());
+ LinkedList<ClientConnection> conns = new LinkedList<ClientConnection>(
+ connectionHandler.getClientConnections());
+ LinkedList<HostPort> listeners = new LinkedList<HostPort>(connectionHandler
+ .getListeners());
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(protocolType,
- ByteStringFactory.create(connectionHandler.getProtocol())));
- attrs.add(new Attribute(protocolType, ATTR_MONITOR_CONNHANDLER_PROTOCOL,
- values));
+ attrs.add(Attributes.create(protocolType, connectionHandler
+ .getProtocol()));
-
- if (! listeners.isEmpty())
+ if (!listeners.isEmpty())
{
- values = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(listenerType);
for (HostPort hp : listeners)
{
- values.add(new AttributeValue(listenerType,
- ByteStringFactory.create(hp.toString())));
+ builder.add(new AttributeValue(listenerType, hp.toString()));
}
- attrs.add(new Attribute(listenerType, ATTR_MONITOR_CONNHANDLER_LISTENER,
- values));
+ attrs.add(builder.toAttribute());
}
- if (! conns.isEmpty())
+ if (!conns.isEmpty())
{
- values = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(connectionsType);
for (ClientConnection c : conns)
{
numConnections++;
- values.add(new AttributeValue(connectionsType,
- ByteStringFactory.create(c.getMonitorSummary())));
+ builder.add(new AttributeValue(connectionsType, c
+ .getMonitorSummary()));
}
- attrs.add(new Attribute(connectionsType,
- ATTR_MONITOR_CONNHANDLER_CONNECTION, values));
+ attrs.add(builder.toAttribute());
}
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(numConnectionsType,
- ByteStringFactory.create(String.valueOf(numConnections))));
- attrs.add(new Attribute(numConnectionsType,
- ATTR_MONITOR_CONNHANDLER_NUMCONNECTIONS, values));
+ attrs.add(Attributes.create(numConnectionsType, String
+ .valueOf(numConnections)));
return attrs;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
index e206d94..c411090 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
@@ -26,21 +26,25 @@
*/
package org.opends.server.monitors;
+
+
import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.MonitorProvider;
+import org.opends.server.backends.jeb.RootContainer;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
+import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.InitializationException;
-import org.opends.server.backends.jeb.RootContainer;
import com.sleepycat.je.DatabaseException;
import com.sleepycat.je.EnvironmentStats;
@@ -49,9 +53,7 @@
import com.sleepycat.je.StatsConfig;
import com.sleepycat.je.TransactionStats;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.lang.reflect.Method;
+
/**
* A monitor provider for a Berkeley DB JE environment.
@@ -155,7 +157,7 @@
private void addAttributesForStatsObject(ArrayList<Attribute> monitorAttrs,
Object stats, String attrPrefix)
{
- Class c = stats.getClass();
+ Class<?> c = stats.getClass();
Method[] methods = c.getMethods();
// Iterate through all the statistic class methods.
@@ -167,7 +169,7 @@
Class<?> returnType = method.getReturnType();
if (returnType.equals(int.class) || returnType.equals(long.class))
{
- AttributeSyntax integerSyntax =
+ AttributeSyntax<?> integerSyntax =
DirectoryServer.getDefaultIntegerSyntax();
// Remove the 'get' from the method name and add the prefix.
@@ -182,12 +184,8 @@
AttributeType attrType =
DirectoryServer.getDefaultAttributeType(attrName,
integerSyntax);
- ASN1OctetString valueString =
- new ASN1OctetString(String.valueOf(statValue));
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(valueString, valueString));
- monitorAttrs.add(new Attribute(attrType, attrName, values));
+ monitorAttrs.add(Attributes.create(attrType, String
+ .valueOf(statValue)));
} catch (Exception e)
{
@@ -236,9 +234,7 @@
String jeVersion = JEVersion.CURRENT_VERSION.getVersionString();
AttributeType versionType =
DirectoryServer.getDefaultAttributeType("JEVersion");
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(versionType, jeVersion));
- monitorAttrs.add(new Attribute(versionType, "JEVersion", values));
+ monitorAttrs.add(Attributes.create(versionType, jeVersion));
addAttributesForStatsObject(monitorAttrs, environmentStats, "Environment");
addAttributesForStatsObject(monitorAttrs, lockStats, "Lock");
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java
index c6f8504..1089c55 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java
@@ -26,9 +26,12 @@
*/
package org.opends.server.monitors;
-import java.util.ArrayList;
-import org.opends.messages.Message;
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.server.loggers.ErrorLogger.*;
+import java.util.ArrayList;
+
+import org.opends.messages.Message;
import org.opends.server.admin.std.server.EntryCacheCfg;
import org.opends.server.admin.std.server.EntryCacheMonitorProviderCfg;
import org.opends.server.api.EntryCache;
@@ -38,10 +41,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.messages.ConfigMessages.*;
-
/**
* This class defines a Directory Server monitor provider that can be used to
* obtain information about the entry cache state. Note that the information
@@ -69,8 +68,7 @@
{
super("Entry Caches Monitor Provider");
this.entryCacheName = "Entry Caches";
- this.entryCache = (EntryCache<? extends EntryCacheCfg>)
- DirectoryServer.getEntryCache();
+ this.entryCache = (EntryCache<?>) DirectoryServer.getEntryCache();
}
/**
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/MemoryUsageMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/MemoryUsageMonitorProvider.java
index 0ce77ce..5d53eb0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/MemoryUsageMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/MemoryUsageMonitorProvider.java
@@ -34,7 +34,6 @@
import java.lang.management.MemoryUsage;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedHashSet;
import org.opends.server.admin.std.server.MemoryUsageMonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
@@ -42,6 +41,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.InitializationException;
@@ -257,19 +257,18 @@
AttributeType attrType = DirectoryServer.getDefaultAttributeType(name);
ASN1OctetString encodedValue = new ASN1OctetString(value);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(1);
-
+ AttributeBuilder builder = new AttributeBuilder(attrType);
try
{
- values.add(new AttributeValue(encodedValue,
+ builder.add(new AttributeValue(encodedValue,
attrType.normalize(encodedValue)));
}
catch (Exception e)
{
- values.add(new AttributeValue(encodedValue, encodedValue));
+ builder.add(new AttributeValue(encodedValue, encodedValue));
}
- return new Attribute(attrType, name, values);
+ return builder.toAttribute();
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
index d334ca6..814678a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
@@ -29,9 +29,7 @@
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.TreeMap;
import org.opends.server.admin.std.server.StackTraceMonitorProviderCfg;
@@ -39,6 +37,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.InitializationException;
@@ -147,8 +146,7 @@
AttributeType attrType =
DirectoryServer.getDefaultAttributeType("jvmThread");
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
-
+ AttributeBuilder builder = new AttributeBuilder(attrType);
for (Map.Entry<Thread,StackTraceElement[]> e : orderedStacks.values())
{
Thread t = e.getKey();
@@ -162,7 +160,7 @@
buffer.append(" ---------- ");
buffer.append(t.getName());
buffer.append(" ----------");
- values.add(new AttributeValue(attrType, buffer.toString()));
+ builder.add(new AttributeValue(attrType, buffer.toString()));
// Create an attribute for the stack trace.
if (stackElements != null)
@@ -192,13 +190,13 @@
}
buffer.append(")");
- values.add(new AttributeValue(attrType, buffer.toString()));
+ builder.add(new AttributeValue(attrType, buffer.toString()));
}
}
}
ArrayList<Attribute> attrs = new ArrayList<Attribute>();
- attrs.add(new Attribute(attrType, "jvmThread", values));
+ attrs.add(builder.toAttribute());
return attrs;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
index 34a14b8..42f1efe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
@@ -28,11 +28,12 @@
+import static org.opends.server.loggers.debug.DebugLogger.*;
+
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.net.InetAddress;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.List;
import org.opends.server.admin.std.server.SystemInfoMonitorProviderCfg;
@@ -42,13 +43,12 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.InitializationException;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-
/**
@@ -246,11 +246,11 @@
AttributeType attrType = DirectoryServer.getDefaultAttributeType(name);
ASN1OctetString encodedValue = new ASN1OctetString(value);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(1);
+ AttributeBuilder builder = new AttributeBuilder(attrType);
try
{
- values.add(new AttributeValue(encodedValue,
+ builder.add(new AttributeValue(encodedValue,
attrType.normalize(encodedValue)));
}
catch (Exception e)
@@ -260,10 +260,10 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- values.add(new AttributeValue(encodedValue, encodedValue));
+ builder.add(new AttributeValue(encodedValue, encodedValue));
}
- return new Attribute(attrType, name, values);
+ return builder.toAttribute();
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
index f95fb91..b1329c3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
@@ -29,7 +29,6 @@
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.AttributeSyntax;
@@ -37,10 +36,9 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.TraditionalWorkQueue;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.InitializationException;
@@ -209,60 +207,42 @@
long averageBacklog = (long) (1.0 * totalBacklog / numPolls);
- long opsSubmitted = workQueue.getOpsSubmitted();
+ long opsSubmitted = workQueue.getOpsSubmitted();
long rejectedQueueFull = workQueue.getOpsRejectedDueToQueueFull();
ArrayList<Attribute> monitorAttrs = new ArrayList<Attribute>();
- AttributeSyntax integerSyntax = DirectoryServer.getDefaultIntegerSyntax();
-
+ AttributeSyntax<?> integerSyntax = DirectoryServer
+ .getDefaultIntegerSyntax();
// The current backlog.
- AttributeType attrType =
- DirectoryServer.getDefaultAttributeType(ATTR_CURRENT_BACKLOG,
- integerSyntax);
- ASN1OctetString valueString = new ASN1OctetString(String.valueOf(backlog));
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(valueString, valueString));
- monitorAttrs.add(new Attribute(attrType, ATTR_CURRENT_BACKLOG, values));
-
+ AttributeType attrType = DirectoryServer.getDefaultAttributeType(
+ ATTR_CURRENT_BACKLOG, integerSyntax);
+ monitorAttrs
+ .add(Attributes.create(attrType, String.valueOf(backlog)));
// The average backlog.
attrType = DirectoryServer.getDefaultAttributeType(ATTR_AVERAGE_BACKLOG,
- integerSyntax);
- valueString = new ASN1OctetString(String.valueOf(averageBacklog));
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(valueString, valueString));
- monitorAttrs.add(new Attribute(attrType, ATTR_AVERAGE_BACKLOG, values));
-
+ integerSyntax);
+ monitorAttrs.add(Attributes.create(attrType, String
+ .valueOf(averageBacklog)));
// The maximum backlog.
attrType = DirectoryServer.getDefaultAttributeType(ATTR_MAX_BACKLOG,
- integerSyntax);
- valueString = new ASN1OctetString(String.valueOf(maxBacklog));
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(valueString, valueString));
- monitorAttrs.add(new Attribute(attrType, ATTR_MAX_BACKLOG, values));
-
+ integerSyntax);
+ monitorAttrs.add(Attributes.create(attrType, String
+ .valueOf(maxBacklog)));
// The total number of operations submitted.
attrType = DirectoryServer.getDefaultAttributeType(ATTR_OPS_SUBMITTED,
- integerSyntax);
- valueString = new ASN1OctetString(String.valueOf(opsSubmitted));
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(valueString, valueString));
- monitorAttrs.add(new Attribute(attrType, ATTR_OPS_SUBMITTED, values));
-
+ integerSyntax);
+ monitorAttrs.add(Attributes.create(attrType, String
+ .valueOf(opsSubmitted)));
// The total number of operations rejected due to a full work queue.
- attrType =
- DirectoryServer.getDefaultAttributeType(ATTR_OPS_REJECTED_QUEUE_FULL,
- integerSyntax);
- valueString = new ASN1OctetString(String.valueOf(rejectedQueueFull));
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(valueString, valueString));
- monitorAttrs.add(new Attribute(attrType, ATTR_OPS_REJECTED_QUEUE_FULL,
- values));
-
+ attrType = DirectoryServer.getDefaultAttributeType(
+ ATTR_OPS_REJECTED_QUEUE_FULL, integerSyntax);
+ monitorAttrs.add(Attributes.create(attrType, String
+ .valueOf(rejectedQueueFull)));
return monitorAttrs;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
index 5fed358..5af2c91 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
@@ -28,8 +28,9 @@
+import static org.opends.server.loggers.debug.DebugLogger.*;
+
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import org.opends.server.admin.std.server.VersionMonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
@@ -38,14 +39,13 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.InitializationException;
import org.opends.server.util.DynamicConstants;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-
/**
@@ -281,11 +281,11 @@
AttributeType attrType = DirectoryServer.getDefaultAttributeType(name);
ASN1OctetString encodedValue = new ASN1OctetString(value);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(1);
+ AttributeBuilder builder = new AttributeBuilder(attrType);
try
{
- values.add(new AttributeValue(encodedValue,
+ builder.add(new AttributeValue(encodedValue,
attrType.normalize(encodedValue)));
}
catch (Exception e)
@@ -295,10 +295,10 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- values.add(new AttributeValue(encodedValue, encodedValue));
+ builder.add(new AttributeValue(encodedValue, encodedValue));
}
- return new Attribute(attrType, name, values);
+ return builder.toAttribute();
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java
new file mode 100644
index 0000000..32480c8
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java
@@ -0,0 +1,291 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.plugins;
+
+import java.util.List;
+import java.util.Set;
+
+import java.util.TreeSet;
+import org.opends.messages.Message;
+import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.opends.server.admin.std.meta.PluginCfgDefn;
+import org.opends.server.admin.std.server.ChangeNumberControlPluginCfg;
+import org.opends.server.admin.std.server.PluginCfg;
+import org.opends.server.api.plugin.DirectoryServerPlugin;
+import org.opends.server.api.plugin.PluginType;
+import org.opends.server.api.plugin.PluginResult;
+import org.opends.server.config.ConfigException;
+import org.opends.server.protocols.asn1.ASN1OctetString;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.OperationContext;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.Control;
+import org.opends.server.types.ResultCode;
+import org.opends.server.types.operation.PostOperationAddOperation;
+import org.opends.server.types.operation.PostOperationDeleteOperation;
+import org.opends.server.types.operation.PostOperationModifyDNOperation;
+import org.opends.server.types.operation.PostOperationModifyOperation;
+import org.opends.server.types.operation.PostOperationOperation;
+import static org.opends.messages.PluginMessages.*;
+import static org.opends.server.util.ServerConstants.*;
+/**
+ * This class implements a Directory Server plugin that will add the
+ * replication CSN to a response whenever the CSN control is received.
+ */
+public final class ChangeNumberControlPlugin
+ extends DirectoryServerPlugin<ChangeNumberControlPluginCfg>
+ implements ConfigurationChangeListener<ChangeNumberControlPluginCfg>
+{
+
+ // The current configuration for this plugin.
+ private ChangeNumberControlPluginCfg currentConfig;
+
+ /**
+ * Creates a new instance of this Directory Server plugin. Every plugin must
+ * implement a default constructor (it is the only one that will be used to
+ * create plugins defined in the configuration), and every plugin constructor
+ * must call <CODE>super()</CODE> as its first element.
+ */
+ public ChangeNumberControlPlugin()
+ {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public final void initializePlugin(Set<PluginType> pluginTypes,
+ ChangeNumberControlPluginCfg configuration)
+ throws ConfigException
+ {
+ currentConfig = configuration;
+ configuration.addChangeNumberControlChangeListener(this);
+ Set<PluginType> types = new TreeSet<PluginType>();
+
+ // Make sure that the plugin has been enabled for the appropriate types.
+ for (PluginType t : pluginTypes)
+ {
+ switch (t)
+ {
+ case POST_OPERATION_ADD:
+ case POST_OPERATION_DELETE:
+ case POST_OPERATION_MODIFY:
+ case POST_OPERATION_MODIFY_DN:
+ // These are acceptable.
+ types.add(t);
+ break;
+
+ default:
+ Message message =
+ ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE.get(t.toString());
+ throw new ConfigException(message);
+ }
+ }
+ if (types.size() != 4) {
+ StringBuffer expected = new StringBuffer();
+ expected.append(PluginType.POST_OPERATION_ADD.toString());
+ expected.append(", ");
+ expected.append(PluginType.POST_OPERATION_DELETE.toString());
+ expected.append(", ");
+ expected.append(PluginType.POST_OPERATION_MODIFY.toString());
+ expected.append(", ");
+ expected.append(PluginType.POST_OPERATION_MODIFY_DN.toString());
+
+ StringBuffer found = new StringBuffer();
+ boolean first = true;
+ for (PluginType t : types) {
+ if (first) {
+ first = false;
+ } else {
+ found.append(", ");
+ }
+ found.append(t.toString());
+ }
+
+ Message message = ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE_LIST.get(
+ found.toString(), expected.toString());
+ throw new ConfigException(message);
+ }
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public final void finalizePlugin()
+ {
+ currentConfig.removeChangeNumberControlChangeListener(this);
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public final PluginResult.PostOperation
+ doPostOperation(PostOperationAddOperation addOperation)
+ {
+ processCsnControl(addOperation);
+
+ // We shouldn't ever need to return a non-success result.
+ return PluginResult.PostOperation.continueOperationProcessing();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public final PluginResult.PostOperation
+ doPostOperation(PostOperationDeleteOperation deleteOperation)
+ {
+ processCsnControl(deleteOperation);
+
+ // We shouldn't ever need to return a non-success result.
+ return PluginResult.PostOperation.continueOperationProcessing();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public final PluginResult.PostOperation
+ doPostOperation(PostOperationModifyOperation modifyOperation)
+ {
+ processCsnControl(modifyOperation);
+
+ // We shouldn't ever need to return a non-success result.
+ return PluginResult.PostOperation.continueOperationProcessing();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public final PluginResult.PostOperation
+ doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
+ {
+ processCsnControl(modifyDNOperation);
+
+ // We shouldn't ever need to return a non-success result.
+ return PluginResult.PostOperation.continueOperationProcessing();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public boolean isConfigurationAcceptable(PluginCfg configuration,
+ List<Message> unacceptableReasons)
+ {
+ ChangeNumberControlPluginCfg cfg =
+ (ChangeNumberControlPluginCfg) configuration;
+ return isConfigurationChangeAcceptable(cfg, unacceptableReasons);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationChangeAcceptable(
+ ChangeNumberControlPluginCfg configuration,
+ List<Message> unacceptableReasons)
+ {
+ boolean configAcceptable = true;
+
+ // Ensure that the set of plugin types contains only pre-operation add,
+ // pre-operation modify, and pre-operation modify DN.
+ for (PluginCfgDefn.PluginType pluginType : configuration.getPluginType())
+ {
+ switch (pluginType)
+ {
+ case POSTOPERATIONADD:
+ case POSTOPERATIONDELETE:
+ case POSTOPERATIONMODIFY:
+ case POSTOPERATIONMODIFYDN:
+ // These are acceptable.
+ break;
+
+
+ default:
+ Message message = ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE.get(
+ pluginType.toString());
+ unacceptableReasons.add(message);
+ configAcceptable = false;
+ }
+ }
+
+ return configAcceptable;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationChange(
+ ChangeNumberControlPluginCfg configuration)
+ {
+ currentConfig = configuration;
+ return new ConfigChangeResult(ResultCode.SUCCESS, false);
+ }
+
+ /**
+ * Retrieves the Change number from the synchronization context
+ * and sets teh control respsonse in the operation.
+ *
+ * @param operation the operation
+ */
+ private void processCsnControl(PostOperationOperation operation) {
+ List<Control> requestControls = operation.getRequestControls();
+ if ((requestControls != null) && (! requestControls.isEmpty())) {
+ for (Control c : requestControls) {
+ if (c.getOID().equals(OID_CSN_CONTROL)) {
+ OperationContext ctx = (OperationContext)
+ operation.getAttachment(OperationContext.SYNCHROCONTEXT);
+ if (ctx != null) {
+ ChangeNumber cn = ctx.getChangeNumber();
+ if (cn != null) {
+ String csn = cn.toString();
+ if (csn != null) {
+ Control responseControl =
+ new Control(OID_CSN_CONTROL, c.isCritical(),
+ new ASN1OctetString(csn));
+ operation.getResponseControls().add(responseControl);
+ }
+ }
+ }
+ break;
+ }
+ }
+ }
+ }
+}
+
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
index f7e3e32..a9880a4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
@@ -30,7 +30,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -47,6 +46,7 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeUsage;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteStringFactory;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryConfig;
@@ -187,12 +187,10 @@
byte[] dnBytes = getBytes(entry.getDN().toNormalizedString());
UUID uuid = UUID.nameUUIDFromBytes(dnBytes);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(entryUUIDType,
- ByteStringFactory.create(uuid.toString())));
-
+ Attribute uuidAttr = Attributes.create(entryUUIDType,
+ new AttributeValue(entryUUIDType, ByteStringFactory.create(uuid
+ .toString())));
uuidList = new ArrayList<Attribute>(1);
- Attribute uuidAttr = new Attribute(entryUUIDType, "entryUUID", values);
uuidList.add(uuidAttr);
entry.putAttribute(entryUUIDType, uuidList);
@@ -224,13 +222,10 @@
// Construct a new random UUID.
UUID uuid = UUID.randomUUID();
-
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(1);
- values.add(new AttributeValue(entryUUIDType,
- ByteStringFactory.create(uuid.toString())));
-
+ Attribute uuidAttr = Attributes.create(entryUUIDType,
+ new AttributeValue(entryUUIDType, ByteStringFactory.create(uuid
+ .toString())));
uuidList = new ArrayList<Attribute>(1);
- Attribute uuidAttr = new Attribute(entryUUIDType, "entryUUID", values);
uuidList.add(uuidAttr);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java
index c1287c3..98949e0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java
@@ -29,7 +29,6 @@
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -44,8 +43,10 @@
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteStringFactory;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DebugLogLevel;
@@ -176,36 +177,31 @@
doPreOperation(PreOperationAddOperation addOperation)
{
// Create the attribute list for the creatorsName attribute, if appropriate.
+ AttributeBuilder builder = new AttributeBuilder(creatorsNameType,
+ OP_ATTR_CREATORS_NAME);
DN creatorDN = addOperation.getAuthorizationDN();
- LinkedHashSet<AttributeValue> nameValues =
- new LinkedHashSet<AttributeValue>(1);
if (creatorDN == null)
{
- // This must mean that the operation was performed anonymously. Even so,
- // we still need to update the creatorsName attribute.
- nameValues.add(new AttributeValue(creatorsNameType,
- ByteStringFactory.create()));
+ // This must mean that the operation was performed anonymously.
+ // Even so, we still need to update the creatorsName attribute.
+ builder.add(new AttributeValue(creatorsNameType, ByteStringFactory
+ .create()));
}
else
{
- nameValues.add(new AttributeValue(creatorsNameType,
- ByteStringFactory.create(creatorDN.toString())));
+ builder.add(new AttributeValue(creatorsNameType, ByteStringFactory
+ .create(creatorDN.toString())));
}
- Attribute nameAttr = new Attribute(creatorsNameType, OP_ATTR_CREATORS_NAME,
- nameValues);
+ Attribute nameAttr = builder.toAttribute();
ArrayList<Attribute> nameList = new ArrayList<Attribute>(1);
nameList.add(nameAttr);
addOperation.setAttribute(creatorsNameType, nameList);
// Create the attribute list for the createTimestamp attribute.
- LinkedHashSet<AttributeValue> timeValues =
- new LinkedHashSet<AttributeValue>(1);
- timeValues.add(new AttributeValue(createTimestampType,
- ByteStringFactory.create(getGMTTime())));
-
- Attribute timeAttr = new Attribute(createTimestampType,
- OP_ATTR_CREATE_TIMESTAMP, timeValues);
+ Attribute timeAttr = Attributes.create(createTimestampType,
+ OP_ATTR_CREATE_TIMESTAMP, new AttributeValue(createTimestampType,
+ ByteStringFactory.create(getGMTTime())));
ArrayList<Attribute> timeList = new ArrayList<Attribute>(1);
timeList.add(timeAttr);
addOperation.setAttribute(createTimestampType, timeList);
@@ -225,23 +221,22 @@
doPreOperation(PreOperationModifyOperation modifyOperation)
{
// Create the modifiersName attribute.
+ AttributeBuilder builder = new AttributeBuilder(modifiersNameType,
+ OP_ATTR_MODIFIERS_NAME);
DN modifierDN = modifyOperation.getAuthorizationDN();
- LinkedHashSet<AttributeValue> nameValues =
- new LinkedHashSet<AttributeValue>(1);
if (modifierDN == null)
{
- // This must mean that the operation was performed anonymously. Even so,
- // we still need to update the modifiersName attribute.
- nameValues.add(new AttributeValue(modifiersNameType,
- ByteStringFactory.create()));
+ // This must mean that the operation was performed anonymously.
+ // Even so, we still need to update the modifiersName attribute.
+ builder.add(new AttributeValue(modifiersNameType, ByteStringFactory
+ .create()));
}
else
{
- nameValues.add(new AttributeValue(modifiersNameType,
- ByteStringFactory.create(modifierDN.toString())));
+ builder.add(new AttributeValue(modifiersNameType, ByteStringFactory
+ .create(modifierDN.toString())));
}
- Attribute nameAttr = new Attribute(modifiersNameType,
- OP_ATTR_MODIFIERS_NAME, nameValues);
+ Attribute nameAttr = builder.toAttribute();
try
{
modifyOperation.addModification(new Modification(ModificationType.REPLACE,
@@ -261,13 +256,9 @@
// Create the modifyTimestamp attribute.
- LinkedHashSet<AttributeValue> timeValues =
- new LinkedHashSet<AttributeValue>(1);
- timeValues.add(new AttributeValue(modifyTimestampType,
- ByteStringFactory.create(getGMTTime())));
-
- Attribute timeAttr = new Attribute(modifyTimestampType,
- OP_ATTR_MODIFY_TIMESTAMP, timeValues);
+ Attribute timeAttr = Attributes.create(modifyTimestampType,
+ OP_ATTR_MODIFY_TIMESTAMP, new AttributeValue(modifyTimestampType,
+ ByteStringFactory.create(getGMTTime())));
try
{
modifyOperation.addModification(new Modification(ModificationType.REPLACE,
@@ -300,37 +291,32 @@
doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
{
// Create the modifiersName attribute.
+ AttributeBuilder builder = new AttributeBuilder(modifiersNameType,
+ OP_ATTR_MODIFIERS_NAME);
DN modifierDN = modifyDNOperation.getAuthorizationDN();
- LinkedHashSet<AttributeValue> nameValues =
- new LinkedHashSet<AttributeValue>(1);
if (modifierDN == null)
{
- // This must mean that the operation was performed anonymously. Even so,
- // we still need to update the modifiersName attribute.
- nameValues.add(new AttributeValue(modifiersNameType,
- ByteStringFactory.create()));
+ // This must mean that the operation was performed anonymously.
+ // Even so, we still need to update the modifiersName attribute.
+ builder.add(new AttributeValue(modifiersNameType, ByteStringFactory
+ .create()));
}
else
{
- nameValues.add(new AttributeValue(modifiersNameType,
- ByteStringFactory.create(modifierDN.toString())));
+ builder.add(new AttributeValue(modifiersNameType, ByteStringFactory
+ .create(modifierDN.toString())));
}
- Attribute nameAttr = new Attribute(modifiersNameType,
- OP_ATTR_MODIFIERS_NAME, nameValues);
- modifyDNOperation.addModification(new Modification(ModificationType.REPLACE,
- nameAttr, true));
+ Attribute nameAttr = builder.toAttribute();
+ modifyDNOperation.addModification(new Modification(
+ ModificationType.REPLACE, nameAttr, true));
- // Create the modifyTimestamp attribute.
- LinkedHashSet<AttributeValue> timeValues =
- new LinkedHashSet<AttributeValue>(1);
- timeValues.add(new AttributeValue(modifyTimestampType,
- ByteStringFactory.create(getGMTTime())));
-
- Attribute timeAttr = new Attribute(modifyTimestampType,
- OP_ATTR_MODIFY_TIMESTAMP, timeValues);
- modifyDNOperation.addModification(new Modification(ModificationType.REPLACE,
- timeAttr, true));
+ // Create the modifyTimestamp attribute.
+ Attribute timeAttr = Attributes.create(modifyTimestampType,
+ OP_ATTR_MODIFY_TIMESTAMP, new AttributeValue(modifyTimestampType,
+ ByteStringFactory.create(getGMTTime())));
+ modifyDNOperation.addModification(new Modification(
+ ModificationType.REPLACE, timeAttr, true));
// We shouldn't ever need to return a non-success result.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/NetworkGroupPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/NetworkGroupPlugin.java
new file mode 100644
index 0000000..546a17c
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/NetworkGroupPlugin.java
@@ -0,0 +1,453 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.plugins;
+
+
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.opends.messages.Message;
+import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.opends.server.admin.std.meta.PluginCfgDefn;
+import org.opends.server.admin.std.server.NetworkGroupPluginCfg;
+import org.opends.server.admin.std.server.PluginCfg;
+import org.opends.server.api.ClientConnection;
+import org.opends.server.api.plugin.*;
+import org.opends.server.config.ConfigException;
+import org.opends.server.core.networkgroups.NetworkGroup;
+import org.opends.server.types.AuthenticationType;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.DisconnectReason;
+import org.opends.server.types.DN;
+import org.opends.server.types.ResultCode;
+
+import org.opends.server.types.operation.PreParseAddOperation;
+import org.opends.server.types.operation.PreParseBindOperation;
+import org.opends.server.types.operation.PreParseCompareOperation;
+import org.opends.server.types.operation.PreParseDeleteOperation;
+import org.opends.server.types.operation.PreParseExtendedOperation;
+import org.opends.server.types.operation.PreParseModifyOperation;
+import org.opends.server.types.operation.PreParseModifyDNOperation;
+import org.opends.server.types.operation.PreParseSearchOperation;
+import org.opends.server.types.operation.PreParseUnbindOperation;
+import org.opends.server.types.operation.PostResponseBindOperation;
+import org.opends.server.types.operation.PostResponseExtendedOperation;
+import org.opends.server.types.operation.PreParseOperation;
+import static org.opends.messages.PluginMessages.*;
+import static org.opends.server.util.ServerConstants.*;
+
+
+/**
+ * This class implements a Directory Server plugin that will evaluate
+ * the appropriate network group for each client connection.
+ * A network group enforces specific resource limits.
+ */
+public final class NetworkGroupPlugin
+ extends DirectoryServerPlugin<NetworkGroupPluginCfg>
+ implements ConfigurationChangeListener<NetworkGroupPluginCfg>
+{
+ // The current configuration for this plugin.
+ private NetworkGroupPluginCfg currentConfig;
+
+
+
+ /**
+ * Creates a new instance of this Directory Server plugin. Every plugin must
+ * implement a default constructor (it is the only one that will be used to
+ * create plugins defined in the configuration), and every plugin constructor
+ * must call <CODE>super()</CODE> as its first element.
+ */
+ public NetworkGroupPlugin()
+ {
+ super();
+
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public final void initializePlugin(Set<PluginType> pluginTypes,
+ NetworkGroupPluginCfg configuration)
+ throws ConfigException
+ {
+ currentConfig = configuration;
+
+ // Make sure that the plugin has been enabled for the appropriate types.
+ for (PluginType t : pluginTypes)
+ {
+ switch (t)
+ {
+ case POST_CONNECT:
+ case PRE_PARSE_ADD:
+ case PRE_PARSE_BIND:
+ case PRE_PARSE_COMPARE:
+ case PRE_PARSE_DELETE:
+ case PRE_PARSE_EXTENDED:
+ case PRE_PARSE_MODIFY:
+ case PRE_PARSE_MODIFY_DN:
+ case PRE_PARSE_SEARCH:
+ case PRE_PARSE_UNBIND:
+ case POST_RESPONSE_BIND:
+ case POST_RESPONSE_EXTENDED:
+ // These are acceptable
+ break;
+ default:
+ Message message =
+ ERR_PLUGIN_NETWORKGROUP_INVALID_PLUGIN_TYPE.get(t.toString());
+ throw new ConfigException(message);
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public final void finalizePlugin()
+ {
+ }
+
+ /**
+ * Performs resource limits checks and request filtering policy checks.
+ *
+ * @param connection The client connection on which the operation is done
+ * @param operation The operation to be performed
+ * @param fullCheck boolean indicating whether all the resource limit checks
+ * must be performed or only a limited set
+ * @param messages The list of error messages returned during the checking
+ */
+ private boolean checkNetworkGroup(
+ ClientConnection connection,
+ PreParseOperation operation,
+ boolean fullCheck,
+ ArrayList<Message> messages)
+ {
+ if (!connection.getNetworkGroup().checkResourceLimits(
+ connection, operation, fullCheck, messages)) {
+ return false;
+ }
+ if (operation != null) {
+ if (!connection.getNetworkGroup().checkRequestFilteringPolicy(
+ operation, messages)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Sets the network group and checks resource limits + request
+ * filtering policy.
+ *
+ * @param connection The client connection on which the operation is
+ * executed
+ */
+ private boolean setAndCheckNetworkGroup(
+ ClientConnection connection,
+ PreParseOperation operation,
+ ArrayList<Message> messages)
+ {
+ boolean fullCheck = false;
+ if (connection.mustEvaluateNetworkGroup()) {
+ NetworkGroup ng = NetworkGroup.findMatchingNetworkGroup(connection);
+ if (ng != connection.getNetworkGroup()) {
+ connection.setNetworkGroup(ng);
+ fullCheck = true;
+ }
+ connection.mustEvaluateNetworkGroup(false);
+ }
+
+ return (checkNetworkGroup(connection, operation, fullCheck, messages));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public final PluginResult.PostConnect
+ doPostConnect(ClientConnection clientConnection)
+ {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ if (setAndCheckNetworkGroup(clientConnection, null, messages)) {
+ return PluginResult.PostConnect.continueConnectProcessing();
+ } else {
+ return PluginResult.PostConnect.disconnectClient(
+ DisconnectReason.ADMIN_LIMIT_EXCEEDED, true, messages.get(0));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PreParse
+ doPreParse(PreParseAddOperation addOperation) {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ ClientConnection connection = addOperation.getClientConnection();
+ if (setAndCheckNetworkGroup(connection, addOperation, messages)) {
+ return PluginResult.PreParse.continueOperationProcessing();
+ } else {
+ return PluginResult.PreParse.stopProcessing(
+ ResultCode.ADMIN_LIMIT_EXCEEDED, messages.get(0));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PreParse
+ doPreParse(PreParseBindOperation bindOperation) {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ ClientConnection connection = bindOperation.getClientConnection();
+ boolean fullCheck = false;
+ DN dn;
+ try {
+ dn = DN.decode(bindOperation.getRawBindDN());
+ } catch (DirectoryException ex) {
+ return PluginResult.PreParse.stopProcessing(ResultCode.OPERATIONS_ERROR,
+ ex.getMessageObject());
+ }
+ AuthenticationType authType = bindOperation.getAuthenticationType();
+
+ NetworkGroup ng = NetworkGroup.findBindMatchingNetworkGroup(connection, dn,
+ authType, connection.isSecure());
+
+ if (ng != connection.getNetworkGroup()) {
+ connection.setNetworkGroup(ng);
+ fullCheck = true;
+ }
+ connection.mustEvaluateNetworkGroup(false);
+
+ if (!checkNetworkGroup(connection, bindOperation, fullCheck, messages)) {
+ return PluginResult.PreParse.stopProcessing(
+ ResultCode.ADMIN_LIMIT_EXCEEDED, messages.get(0));
+ }
+ return PluginResult.PreParse.continueOperationProcessing();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PreParse
+ doPreParse(PreParseCompareOperation compareOperation) {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ ClientConnection connection = compareOperation.getClientConnection();
+ if (setAndCheckNetworkGroup(connection, compareOperation, messages)) {
+ return PluginResult.PreParse.continueOperationProcessing();
+ } else {
+ return PluginResult.PreParse.stopProcessing(
+ ResultCode.ADMIN_LIMIT_EXCEEDED, messages.get(0));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PreParse
+ doPreParse(PreParseDeleteOperation deleteOperation) {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ ClientConnection connection = deleteOperation.getClientConnection();
+ if (setAndCheckNetworkGroup(connection, deleteOperation, messages)) {
+ return PluginResult.PreParse.continueOperationProcessing();
+ } else {
+ return PluginResult.PreParse.stopProcessing(
+ ResultCode.ADMIN_LIMIT_EXCEEDED, messages.get(0));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PreParse
+ doPreParse(PreParseExtendedOperation extendedOperation) {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ ClientConnection connection = extendedOperation.getClientConnection();
+ if (setAndCheckNetworkGroup(connection, extendedOperation, messages)) {
+ return PluginResult.PreParse.continueOperationProcessing();
+ } else {
+ return PluginResult.PreParse.stopProcessing(
+ ResultCode.ADMIN_LIMIT_EXCEEDED, messages.get(0));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PreParse
+ doPreParse(PreParseModifyOperation modifyOperation) {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ ClientConnection connection = modifyOperation.getClientConnection();
+ if (setAndCheckNetworkGroup(connection, modifyOperation, messages)) {
+ return PluginResult.PreParse.continueOperationProcessing();
+ } else {
+ return PluginResult.PreParse.stopProcessing(
+ ResultCode.ADMIN_LIMIT_EXCEEDED, messages.get(0));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PreParse
+ doPreParse(PreParseModifyDNOperation modifyDNOperation) {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ ClientConnection connection = modifyDNOperation.getClientConnection();
+ if (setAndCheckNetworkGroup(connection, modifyDNOperation, messages)) {
+ return PluginResult.PreParse.continueOperationProcessing();
+ } else {
+ return PluginResult.PreParse.stopProcessing(
+ ResultCode.ADMIN_LIMIT_EXCEEDED, messages.get(0));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PreParse
+ doPreParse(PreParseSearchOperation searchOperation) {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ ClientConnection connection = searchOperation.getClientConnection();
+ if (setAndCheckNetworkGroup(connection, searchOperation, messages)) {
+ return PluginResult.PreParse.continueOperationProcessing();
+ } else {
+ return PluginResult.PreParse.stopProcessing(
+ ResultCode.ADMIN_LIMIT_EXCEEDED, messages.get(0));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PreParse
+ doPreParse(PreParseUnbindOperation unbindOperation) {
+ ClientConnection connection = unbindOperation.getClientConnection();
+ connection.mustEvaluateNetworkGroup(true);
+ return PluginResult.PreParse.continueOperationProcessing();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PostResponse
+ doPostResponse(PostResponseBindOperation bindOperation) {
+ if (bindOperation.getResultCode() != ResultCode.SUCCESS) {
+ bindOperation.getClientConnection().mustEvaluateNetworkGroup(true);
+ }
+ return PluginResult.PostResponse.continueOperationProcessing();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public PluginResult.PostResponse
+ doPostResponse(PostResponseExtendedOperation extendedOperation) {
+ if ((extendedOperation.getRequestOID().equals(OID_START_TLS_REQUEST))
+ && (extendedOperation.getResultCode() == ResultCode.SUCCESS)) {
+ extendedOperation.getClientConnection().mustEvaluateNetworkGroup(true);
+ }
+ return PluginResult.PostResponse.continueOperationProcessing();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override()
+ public boolean isConfigurationAcceptable(PluginCfg configuration,
+ List<Message> unacceptableReasons)
+ {
+ NetworkGroupPluginCfg cfg = (NetworkGroupPluginCfg) configuration;
+ return isConfigurationChangeAcceptable(cfg, unacceptableReasons);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isConfigurationChangeAcceptable(
+ NetworkGroupPluginCfg configuration,
+ List<Message> unacceptableReasons)
+ {
+ boolean configAcceptable = true;
+
+ // Ensure that the set of plugin types contains only LDIF import and
+ // pre-operation add.
+ for (PluginCfgDefn.PluginType pluginType : configuration.getPluginType())
+ {
+ switch (pluginType)
+ {
+ case POSTCONNECT:
+ case PREPARSEADD:
+ case PREPARSEBIND:
+ case PREPARSECOMPARE:
+ case PREPARSEDELETE:
+ case PREPARSEEXTENDED:
+ case PREPARSEMODIFY:
+ case PREPARSEMODIFYDN:
+ case PREPARSESEARCH:
+ case PREPARSEUNBIND:
+ case POSTRESPONSEBIND:
+ case POSTRESPONSEEXTENDED:
+ // These are acceptable.
+ break;
+
+
+ default:
+ Message message = ERR_PLUGIN_NETWORKGROUP_INVALID_PLUGIN_TYPE.get(
+ pluginType.toString());
+ unacceptableReasons.add(message);
+ configAcceptable = false;
+ }
+ }
+
+ return configAcceptable;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConfigChangeResult applyConfigurationChange(
+ NetworkGroupPluginCfg configuration)
+ {
+ currentConfig = configuration;
+ return new ConfigChangeResult(ResultCode.SUCCESS, false);
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index 8595253..56225d6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -25,19 +25,25 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.plugins;
-import org.opends.messages.Message;
+import static org.opends.messages.PluginMessages.*;
+import static org.opends.server.config.ConfigConstants.*;
+import static org.opends.server.extensions.ExtensionsConstants.*;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.opends.messages.Message;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.PluginCfgDefn;
import org.opends.server.admin.std.server.PasswordPolicyImportPluginCfg;
@@ -46,8 +52,8 @@
import org.opends.server.api.ImportTaskListener;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.api.plugin.DirectoryServerPlugin;
-import org.opends.server.api.plugin.PluginType;
import org.opends.server.api.plugin.PluginResult;
+import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordPolicy;
@@ -55,25 +61,18 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ByteString;
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.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.ResultCode;
-import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.extensions.ExtensionsConstants.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.messages.PluginMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
@@ -106,13 +105,13 @@
// The set of password storage schemes to use for the various password
// policies defined in the server.
- private HashMap<DN,PasswordStorageScheme[]> schemesByPolicy;
+ private HashMap<DN,PasswordStorageScheme<?>[]> schemesByPolicy;
// The default password storage schemes for auth password attributes.
- private PasswordStorageScheme[] defaultAuthPasswordSchemes;
+ private PasswordStorageScheme<?>[] defaultAuthPasswordSchemes;
// The default password storage schemes for user password attributes.
- private PasswordStorageScheme[] defaultUserPasswordSchemes;
+ private PasswordStorageScheme<?>[] defaultUserPasswordSchemes;
@@ -170,7 +169,7 @@
{
if (defaultPolicy.usesAuthPasswordSyntax())
{
- CopyOnWriteArrayList<PasswordStorageScheme> schemeList =
+ CopyOnWriteArrayList<PasswordStorageScheme<?>> schemeList =
defaultPolicy.getDefaultStorageSchemes();
defaultAuthPasswordSchemes =
new PasswordStorageScheme[schemeList.size()];
@@ -226,7 +225,7 @@
{
if (! defaultPolicy.usesAuthPasswordSyntax())
{
- CopyOnWriteArrayList<PasswordStorageScheme> schemeList =
+ CopyOnWriteArrayList<PasswordStorageScheme<?>> schemeList =
defaultPolicy.getDefaultStorageSchemes();
defaultUserPasswordSchemes =
new PasswordStorageScheme[schemeList.size()];
@@ -295,13 +294,13 @@
// Get the set of password policies defined in the server and get the
// attribute types associated with them.
- HashMap<DN,PasswordStorageScheme[]> schemeMap =
- new HashMap<DN,PasswordStorageScheme[]>();
+ HashMap<DN,PasswordStorageScheme<?>[]> schemeMap =
+ new HashMap<DN,PasswordStorageScheme<?>[]>();
for (PasswordPolicy p : DirectoryServer.getPasswordPolicies())
{
- CopyOnWriteArrayList<PasswordStorageScheme> schemeList =
+ CopyOnWriteArrayList<PasswordStorageScheme<?>> schemeList =
p.getDefaultStorageSchemes();
- PasswordStorageScheme[] schemeArray =
+ PasswordStorageScheme<?>[] schemeArray =
new PasswordStorageScheme[schemeList.size()];
schemeList.toArray(schemeArray);
schemeMap.put(p.getConfigEntryDN(), schemeArray);
@@ -338,12 +337,8 @@
public final PluginResult.ImportLDIF
doLDIFImport(LDIFImportConfig importConfig, Entry entry)
{
- // Create a list that we will use to hold new encoded values.
- ArrayList<ByteString> encodedValueList = new ArrayList<ByteString>();
-
-
// See if the entry explicitly states the password policy that it should
- // use. If so, then only use it to perform the encoding.
+ // use. If so, then only use it to perform the encoding.
List<Attribute> attrList = entry.getAttribute(customPolicyAttribute);
if (attrList != null)
{
@@ -352,7 +347,7 @@
policyLoop:
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -378,7 +373,7 @@
if (policy != null)
{
- PasswordStorageScheme[] schemes = schemesByPolicy.get(policyDN);
+ PasswordStorageScheme<?>[] schemes = schemesByPolicy.get(policyDN);
if (schemes != null)
{
attrList = entry.getAttribute(policy.getPasswordAttribute());
@@ -389,27 +384,25 @@
for (Attribute a : attrList)
{
- encodedValueList.clear();
+ AttributeBuilder builder = new AttributeBuilder(a, true);
+ boolean gotError = false;
- LinkedHashSet<AttributeValue> values = a.getValues();
- Iterator<AttributeValue> iterator = values.iterator();
- while (iterator.hasNext())
+ for (AttributeValue v : a)
{
- AttributeValue v = iterator.next();
ByteString value = v.getValue();
if (policy.usesAuthPasswordSyntax())
{
- if (! AuthPasswordSyntax.isEncoded(value))
+ if (!AuthPasswordSyntax.isEncoded(value))
{
try
{
- for (PasswordStorageScheme s : schemes)
+ for (PasswordStorageScheme<?> s : schemes)
{
- encodedValueList.add(s.encodeAuthPassword(value));
+ ByteString nv = s.encodeAuthPassword(value);
+ builder.add(new AttributeValue(policy
+ .getPasswordAttribute(), nv));
}
-
- iterator.remove();
}
catch (Exception e)
{
@@ -419,29 +412,32 @@
}
Message message =
- ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD.
- get(policy.getPasswordAttribute().getNameOrOID(),
- String.valueOf(entry.getDN()),
- stackTraceToSingleLineString(e));
+ ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
+ .get(policy.getPasswordAttribute().getNameOrOID(),
+ String.valueOf(entry.getDN()),
+ stackTraceToSingleLineString(e));
logError(message);
-
- encodedValueList.clear();
+ gotError = true;
break;
}
}
+ else
+ {
+ builder.add(v);
+ }
}
else
{
- if (! UserPasswordSyntax.isEncoded(value))
+ if (!UserPasswordSyntax.isEncoded(value))
{
try
{
- for (PasswordStorageScheme s : schemes)
+ for (PasswordStorageScheme<?> s : schemes)
{
- encodedValueList.add(s.encodePasswordWithScheme(value));
+ ByteString nv = s.encodePasswordWithScheme(value);
+ builder.add(new AttributeValue(policy
+ .getPasswordAttribute(), nv));
}
-
- iterator.remove();
}
catch (Exception e)
{
@@ -451,22 +447,25 @@
}
Message message =
- ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD.
- get(policy.getPasswordAttribute().getNameOrOID(),
- String.valueOf(entry.getDN()),
- stackTraceToSingleLineString(e));
+ ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
+ .get(policy.getPasswordAttribute().getNameOrOID(),
+ String.valueOf(entry.getDN()),
+ stackTraceToSingleLineString(e));
logError(message);
-
- encodedValueList.clear();
+ gotError = true;
break;
}
}
+ else
+ {
+ builder.add(v);
+ }
}
}
- for (ByteString s : encodedValueList)
+ if (!gotError)
{
- values.add(new AttributeValue(policy.getPasswordAttribute(), s));
+ entry.replaceAttribute(builder.toAttribute());
}
}
@@ -489,24 +488,21 @@
for (Attribute a : attrList)
{
- encodedValueList.clear();
+ AttributeBuilder builder = new AttributeBuilder(a, true);
+ boolean gotError = false;
- LinkedHashSet<AttributeValue> values = a.getValues();
- Iterator<AttributeValue> iterator = values.iterator();
- while (iterator.hasNext())
+ for (AttributeValue v : a)
{
- AttributeValue v = iterator.next();
ByteString value = v.getValue();
- if (! AuthPasswordSyntax.isEncoded(value))
+ if (!AuthPasswordSyntax.isEncoded(value))
{
try
{
- for (PasswordStorageScheme s : defaultAuthPasswordSchemes)
+ for (PasswordStorageScheme<?> s : defaultAuthPasswordSchemes)
{
- encodedValueList.add(s.encodeAuthPassword(value));
+ ByteString nv = s.encodeAuthPassword(value);
+ builder.add(new AttributeValue(t, nv));
}
-
- iterator.remove();
}
catch (Exception e)
{
@@ -515,20 +511,23 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD.
- get(t.getNameOrOID(), String.valueOf(entry.getDN()),
+ Message message = ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
+ .get(t.getNameOrOID(), String.valueOf(entry.getDN()),
stackTraceToSingleLineString(e));
logError(message);
-
- encodedValueList.clear();
+ gotError = true;
break;
}
}
+ else
+ {
+ builder.add(v);
+ }
}
- for (ByteString s : encodedValueList)
+ if (!gotError)
{
- values.add(new AttributeValue(t, s));
+ entry.replaceAttribute(builder.toAttribute());
}
}
}
@@ -547,24 +546,21 @@
for (Attribute a : attrList)
{
- encodedValueList.clear();
+ AttributeBuilder builder = new AttributeBuilder(a, true);
+ boolean gotError = false;
- LinkedHashSet<AttributeValue> values = a.getValues();
- Iterator<AttributeValue> iterator = values.iterator();
- while (iterator.hasNext())
+ for (AttributeValue v : a)
{
- AttributeValue v = iterator.next();
ByteString value = v.getValue();
- if (! UserPasswordSyntax.isEncoded(value))
+ if (!UserPasswordSyntax.isEncoded(value))
{
try
{
- for (PasswordStorageScheme s : defaultUserPasswordSchemes)
+ for (PasswordStorageScheme<?> s : defaultUserPasswordSchemes)
{
- encodedValueList.add(s.encodePasswordWithScheme(value));
+ ByteString nv = s.encodePasswordWithScheme(value);
+ builder.add(new AttributeValue(t, nv));
}
-
- iterator.remove();
}
catch (Exception e)
{
@@ -573,20 +569,23 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD.
- get(t.getNameOrOID(), String.valueOf(entry.getDN()),
+ Message message = ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
+ .get(t.getNameOrOID(), String.valueOf(entry.getDN()),
stackTraceToSingleLineString(e));
logError(message);
-
- encodedValueList.clear();
+ gotError = true;
break;
}
}
+ else
+ {
+ builder.add(v);
+ }
}
- for (ByteString s : encodedValueList)
+ if (!gotError)
{
- values.add(new AttributeValue(t, s));
+ entry.replaceAttribute(builder.toAttribute());
}
}
}
@@ -645,7 +644,8 @@
configuration.getDefaultAuthPasswordStorageSchemeDNs();
if (authSchemeDNs.isEmpty())
{
- PasswordStorageScheme[] defaultAuthSchemes = new PasswordStorageScheme[1];
+ PasswordStorageScheme<?>[] defaultAuthSchemes =
+ new PasswordStorageScheme[1];
defaultAuthSchemes[0] =
DirectoryServer.getAuthPasswordStorageScheme(
AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_1);
@@ -659,7 +659,7 @@
}
else
{
- PasswordStorageScheme[] defaultAuthSchemes =
+ PasswordStorageScheme<?>[] defaultAuthSchemes =
new PasswordStorageScheme[authSchemeDNs.size()];
int i=0;
for (DN schemeDN : authSchemeDNs)
@@ -693,7 +693,8 @@
configuration.getDefaultUserPasswordStorageSchemeDNs();
if (userSchemeDNs.isEmpty())
{
- PasswordStorageScheme[] defaultUserSchemes = new PasswordStorageScheme[1];
+ PasswordStorageScheme<?>[] defaultUserSchemes =
+ new PasswordStorageScheme[1];
defaultUserSchemes[0] =
DirectoryServer.getPasswordStorageScheme(
toLowerCase(STORAGE_SCHEME_NAME_SALTED_SHA_1));
@@ -707,7 +708,7 @@
}
else
{
- PasswordStorageScheme[] defaultUserSchemes =
+ PasswordStorageScheme<?>[] defaultUserSchemes =
new PasswordStorageScheme[userSchemeDNs.size()];
int i=0;
for (DN schemeDN : userSchemeDNs)
@@ -745,14 +746,14 @@
// Get the set of default password storage schemes for auth password
// attributes.
PasswordPolicy defaultPolicy = DirectoryServer.getDefaultPasswordPolicy();
- PasswordStorageScheme[] defaultAuthSchemes;
+ PasswordStorageScheme<?>[] defaultAuthSchemes;
Set<DN> authSchemeDNs =
configuration.getDefaultAuthPasswordStorageSchemeDNs();
if (authSchemeDNs.isEmpty())
{
if (defaultPolicy.usesAuthPasswordSyntax())
{
- CopyOnWriteArrayList<PasswordStorageScheme> schemeList =
+ CopyOnWriteArrayList<PasswordStorageScheme<?>> schemeList =
defaultPolicy.getDefaultStorageSchemes();
defaultAuthSchemes =
new PasswordStorageScheme[schemeList.size()];
@@ -804,14 +805,14 @@
// Get the set of default password storage schemes for user password
// attributes.
- PasswordStorageScheme[] defaultUserSchemes;
+ PasswordStorageScheme<?>[] defaultUserSchemes;
Set<DN> userSchemeDNs =
configuration.getDefaultUserPasswordStorageSchemeDNs();
if (userSchemeDNs.isEmpty())
{
if (! defaultPolicy.usesAuthPasswordSyntax())
{
- CopyOnWriteArrayList<PasswordStorageScheme> schemeList =
+ CopyOnWriteArrayList<PasswordStorageScheme<?>> schemeList =
defaultPolicy.getDefaultStorageSchemes();
defaultUserSchemes =
new PasswordStorageScheme[schemeList.size()];
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index e38a507..d7e49ea 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -58,9 +58,9 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
-import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DereferencePolicy;
@@ -711,25 +711,15 @@
{
if(e.hasAttribute(type))
{
- AttributeValue deleteValue=
- new AttributeValue(type, oldEntryDN.toString());
- LinkedHashSet<AttributeValue> deleteValues=
- new LinkedHashSet<AttributeValue>();
+ mods.add(new Modification(ModificationType.DELETE, Attributes
+ .create(type, oldEntryDN.toString())));
- deleteValues.add(deleteValue);
- mods.add(new Modification(ModificationType.DELETE,
- new Attribute(type, type.getNameOrOID(), deleteValues)));
-
- //If the new entry DN exists, create an ADD modification for it.
+ // If the new entry DN exists, create an ADD modification for
+ // it.
if(newEntryDN != null)
{
- LinkedHashSet<AttributeValue> addValues=
- new LinkedHashSet<AttributeValue>();
- AttributeValue addValue=
- new AttributeValue(type, newEntryDN.toString());
- addValues.add(addValue);
- mods.add(new Modification(ModificationType.ADD,
- new Attribute(type, type.getNameOrOID(), addValues)));
+ mods.add(new Modification(ModificationType.ADD, Attributes
+ .create(type, newEntryDN.toString())));
}
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
index 797fed8..3688041 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
@@ -185,7 +185,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (! is7BitClean(v.getValue()))
{
@@ -252,7 +252,7 @@
continue;
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (! is7BitClean(v.getValue()))
{
@@ -330,7 +330,7 @@
continue;
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (! is7BitClean(v.getValue()))
{
@@ -458,7 +458,6 @@
{
for (byte b : value.value())
{
- int i = (b & 0xFF);
if ((b & MASK) != b)
{
return false;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
index 7fe1a98..2093ca1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -211,7 +211,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -281,7 +281,7 @@
{
case ADD:
case REPLACE:
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -328,7 +328,7 @@
continue;
}
- for (AttributeValue v : updatedAttr.getValues())
+ for (AttributeValue v : updatedAttr)
{
try
{
@@ -460,7 +460,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -534,7 +534,7 @@
{
case ADD:
case REPLACE:
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -588,7 +588,7 @@
continue;
}
- for (AttributeValue v : updatedAttr.getValues())
+ for (AttributeValue v : updatedAttr)
{
try
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
index f778f8e..781e6fa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -50,8 +50,10 @@
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.AbstractOperation;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.AuthenticationInfo;
import org.opends.server.types.ByteString;
import org.opends.server.types.CancelRequest;
@@ -195,16 +197,18 @@
ATTR_ROOTDN_ALTERNATE_BIND_DN, true);
LinkedList<Attribute> attrList = new LinkedList<Attribute>();
- attrList.add(new Attribute(ATTR_COMMON_NAME, commonName));
+ attrList.add(Attributes.create(ATTR_COMMON_NAME,
+ commonName));
userAttrs.put(cnAT, attrList);
attrList = new LinkedList<Attribute>();
- attrList.add(new Attribute(ATTR_SN, commonName));
+ attrList.add(Attributes.create(ATTR_SN, commonName));
userAttrs.put(snAT, attrList);
attrList = new LinkedList<Attribute>();
- attrList.add(new Attribute(ATTR_ROOTDN_ALTERNATE_BIND_DN,
- shortDNString));
+ attrList.add(Attributes.create(
+ ATTR_ROOTDN_ALTERNATE_BIND_DN,
+ shortDNString));
userAttrs.put(altDNAT, attrList);
@@ -215,16 +219,13 @@
DirectoryServer.getAttributeType(OP_ATTR_PRIVILEGE_NAME,
true);
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(privType);
for (Privilege p : Privilege.getDefaultRootPrivileges())
{
- values.add(new AttributeValue(privType, p.getName()));
+ builder.add(new AttributeValue(privType, p.getName()));
}
- Attribute privAttr =
- new Attribute(privType, OP_ATTR_PRIVILEGE_NAME, values);
attrList = new LinkedList<Attribute>();
- attrList.add(privAttr);
+ attrList.add(builder.toAttribute());
operationalAttrs.put(privType, attrList);
@@ -480,7 +481,7 @@
mayExtend=false,
mayInvoke=false)
@Override()
- public ConnectionHandler getConnectionHandler()
+ public ConnectionHandler<?> getConnectionHandler()
{
return InternalConnectionHandler.getInstance();
}
@@ -516,6 +517,19 @@
/**
+ * Retrieves the port number for this connection on the client
+ * system.
+ *
+ * @return The port number for this connection on the client system.
+ */
+ public int getClientPort()
+ {
+ return -1;
+ }
+
+
+
+ /**
* Retrieves a string representation of the address on the server to
* which the client connected.
*
@@ -531,6 +545,21 @@
/**
+ * Retrieves the port number for this connection on the server
+ * system if available.
+ *
+ * @return The port number for this connection on the server system
+ * or -1 if there is no server port associated with this
+ * connection (e.g. internal client).
+ */
+ public int getServerPort()
+ {
+ return -1;
+ }
+
+
+
+ /**
* Retrieves the <CODE>java.net.InetAddress</CODE> associated with
* the remote client system.
*
@@ -1045,7 +1074,7 @@
{
if (a.getAttributeType().isObjectClassType())
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
String ocName = v.getStringValue();
String lowerName = toLowerCase(ocName);
@@ -3072,5 +3101,16 @@
{
rootConnection = null;
}
+
+ /**
+ * To be implemented.
+ *
+ * @return number of operations performed on this connection
+ */
+ @Override
+ public long getNumberOfOperations() {
+ // Internal operations will not be limited.
+ return 0;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
index 179a4dd..2a60f2a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
@@ -326,6 +326,18 @@
/**
+ * Retrieves the port number for this connection on the client system.
+ *
+ * @return The port number for this connection on the client system.
+ */
+ public int getClientPort()
+ {
+ return -1;
+ }
+
+
+
+ /**
* Retrieves a string representation of the address on the server to which the
* client connected.
*
@@ -340,6 +352,21 @@
/**
+ * Retrieves the port number for this connection on the server
+ * system if available.
+ *
+ * @return The port number for this connection on the server system
+ * or -1 if there is no server port associated with this
+ * connection (e.g. internal client).
+ */
+ public int getServerPort()
+ {
+ return -1;
+ }
+
+
+
+ /**
* Retrieves the <CODE>java.net.InetAddress</CODE> associated with the remote
* client system.
*
@@ -1259,5 +1286,16 @@
super.finalize();
disconnect(DisconnectReason.OTHER, false, null);
}
+
+ /**
+ * To be implemented.
+ *
+ * @return number of operations performed on this connection
+ */
+ @Override
+ public long getNumberOfOperations() {
+ // JMX connections will not be limited.
+ return 0;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 8c951fd..96ebbab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -173,6 +173,16 @@
}
}
+ // If the port number has changed then update the JMX port information
+ // stored in the system properties.
+ if (portChanged)
+ {
+ String key = protocol + "_port";
+ String value = String.valueOf(config.getListenPort());
+ System.clearProperty(key);
+ System.setProperty(key, value);
+ }
+
// Return configuration result.
return new ConfigChangeResult(resultCode, false, messages);
}
@@ -361,6 +371,11 @@
listeners.add(new HostPort("0.0.0.0", config.getListenPort()));
connectionHandlerName = "JMX Connection Handler " + config.getListenPort();
+ // Create a system property to store the JMX port the server is
+ // listening to. This information can be displayed with jinfo.
+ System.setProperty(
+ protocol + "_port", String.valueOf(config.getListenPort()));
+
// Create the associated RMI Connector.
rmiConnector = new RmiConnector(DirectoryServer.getJMXMBeanServer(), this);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
index cce898c..0548cf8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
@@ -25,31 +25,25 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.protocols.ldap;
-import org.opends.messages.Message;
+import static org.opends.messages.ProtocolMessages.*;
+import static org.opends.server.util.ServerConstants.*;
+
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
-import org.opends.server.core.DirectoryServer;
+import org.opends.messages.Message;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.LDAPException;
import org.opends.server.types.RawAttribute;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.messages.ProtocolMessages.*;
-import static org.opends.server.protocols.ldap.LDAPResultCode.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
-
/**
@@ -60,11 +54,6 @@
public class LDAPAttribute
extends RawAttribute
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
-
// The set of values for this attribute.
private ArrayList<ASN1OctetString> values;
@@ -190,15 +179,14 @@
this.attributeType = attribute.getName();
}
- LinkedHashSet<AttributeValue> attrValues = attribute.getValues();
- if ((attrValues == null) || attrValues.isEmpty())
+ if (attribute.isEmpty())
{
values = new ArrayList<ASN1OctetString>(0);
return;
}
- values = new ArrayList<ASN1OctetString>(attrValues.size());
- for (AttributeValue v : attrValues)
+ values = new ArrayList<ASN1OctetString>(attribute.size());
+ for (AttributeValue v : attribute)
{
values.add(v.getValue().toASN1OctetString());
}
@@ -256,21 +244,18 @@
public Attribute toAttribute()
throws LDAPException
{
- String baseName;
- String lowerBaseName;
- int semicolonPos = attributeType.indexOf(';');
- LinkedHashSet<String> options;
+ AttributeBuilder builder;
+ int semicolonPos = attributeType.indexOf(';');
if (semicolonPos > 0)
{
- baseName = attributeType.substring(0, semicolonPos);
- options = new LinkedHashSet<String>();
+ builder = new AttributeBuilder(attributeType.substring(0, semicolonPos));
int nextPos = attributeType.indexOf(';', semicolonPos+1);
while (nextPos > 0)
{
String option = attributeType.substring(semicolonPos+1, nextPos);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
semicolonPos = nextPos;
@@ -280,28 +265,18 @@
String option = attributeType.substring(semicolonPos+1);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
}
else
{
- baseName = attributeType;
- options = new LinkedHashSet<String>(0);
- }
- lowerBaseName = toLowerCase(baseName);
-
- AttributeType attrType = DirectoryServer.getAttributeType(lowerBaseName);
- if (attrType == null)
- {
- attrType = DirectoryServer.getDefaultAttributeType(lowerBaseName);
+ builder = new AttributeBuilder(attributeType);
}
-
- LinkedHashSet<AttributeValue> attributeValues =
- new LinkedHashSet<AttributeValue>(values.size());
+ AttributeType attrType = builder.getAttributeType();
for (ASN1OctetString value : values)
{
- if (! attributeValues.add(new AttributeValue(attrType, value)))
+ if (!builder.add(new AttributeValue(attrType, value)))
{
Message message =
ERR_LDAP_ATTRIBUTE_DUPLICATE_VALUES.get(attributeType);
@@ -310,8 +285,7 @@
}
}
-
- return new Attribute(attrType, baseName, options, attributeValues);
+ return builder.toAttribute();
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index 56cadb2..85273f8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -139,6 +139,13 @@
// The set of all operations currently in progress on this connection.
private ConcurrentHashMap<Integer,AbstractOperation> operationsInProgress;
+ // The number of operations performed on this connection.
+ // Used to compare with the resource limits of the network group.
+ private long operationsPerformed;
+
+ // Lock on the number of operations
+ private Object operationsPerformedLock;
+
// The connection security provider that was in use for the client connection
// before switching to a TLS-based provider.
private ConnectionSecurityProvider clearSecurityProvider;
@@ -251,6 +258,8 @@
connectionValid = true;
disconnectRequested = false;
operationsInProgress = new ConcurrentHashMap<Integer,AbstractOperation>();
+ operationsPerformed = 0;
+ operationsPerformedLock = new Object();
keepStats = connectionHandler.keepStats();
protocol = "LDAP";
writeSelector = new AtomicReference<Selector>();
@@ -297,7 +306,7 @@
*
* @return The connection handler that accepted this client connection.
*/
- public ConnectionHandler getConnectionHandler()
+ public ConnectionHandler<?> getConnectionHandler()
{
return connectionHandler;
}
@@ -385,18 +394,6 @@
/**
- * Retrieves the address and port of the client system, separated by a colon.
- *
- * @return The address and port of the client system, separated by a colon.
- */
- public String getClientHostPort()
- {
- return clientAddress + ":" + clientPort;
- }
-
-
-
- /**
* Retrieves a string representation of the address on the server to which the
* client connected.
*
@@ -423,18 +420,6 @@
/**
- * Retrieves the address and port of the server system, separated by a colon.
- *
- * @return The address and port of the server system, separated by a colon.
- */
- public String getServerHostPort()
- {
- return serverAddress + ":" + serverPort;
- }
-
-
-
- /**
* Retrieves the <CODE>java.net.InetAddress</CODE> associated with the remote
* client system.
*
@@ -738,7 +723,7 @@
SearchResultEntry searchEntry)
{
SearchResultEntryProtocolOp protocolOp =
- new SearchResultEntryProtocolOp(searchEntry);
+ new SearchResultEntryProtocolOp(searchEntry,ldapVersion);
List<Control> entryControls = searchEntry.getControls();
ArrayList<LDAPControl> controls;
@@ -1199,8 +1184,9 @@
operationsInProgress.put(messageID, operation);
- // Try to add the operation to the work queue.
- DirectoryServer.enqueueRequest(operation);
+ // Try to add the operation to the work queue,
+ // or run it synchronously (typically for the administration connector)
+ connectionHandler.getQueueingStrategy().enqueueRequest(operation);
}
catch (DirectoryException de)
{
@@ -1481,6 +1467,20 @@
/**
+ * Returns the total number of operations initiated on this connection.
+ *
+ * @return the total number of operations on this connection
+ */
+ public long getNumberOfOperations() {
+ long tmpNumberOfOperations;
+ synchronized (operationsPerformedLock) {
+ tmpNumberOfOperations = operationsPerformed;
+ }
+ return tmpNumberOfOperations;
+ }
+
+
+ /**
* Process the information contained in the provided byte buffer as an ASN.1
* element. It may take several calls to this method in order to get all the
* information necessary to decode a single ASN.1 element, but it may also be
@@ -1793,6 +1793,9 @@
{
statTracker.updateMessageRead(message);
}
+ synchronized (operationsPerformedLock) {
+ operationsPerformed++;
+ }
ArrayList<Control> opControls;
ArrayList<LDAPControl> ldapControls = message.getControls();
@@ -2807,6 +2810,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public DN getKeyManagerProviderDN()
{
return connectionHandler.getKeyManagerProviderDN();
@@ -2817,6 +2821,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public DN getTrustManagerProviderDN()
{
return connectionHandler.getTrustManagerProviderDN();
@@ -2834,6 +2839,7 @@
* for operations requring a server certificate, or
* {@code null} if any alias is acceptable.
*/
+ @Override
public String getCertificateAlias()
{
return connectionHandler.getSSLServerCertNickname();
@@ -2853,6 +2859,7 @@
* @return The length of time in milliseconds that this client
* connection has been idle.
*/
+ @Override
public long getIdleTime()
{
if (operationsInProgress.isEmpty() && getPersistentSearches().isEmpty())
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index 68ef206..080ab42 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -65,6 +65,8 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PluginConfigManager;
+import org.opends.server.core.QueueingStrategy;
+import org.opends.server.core.WorkQueueStrategy;
import org.opends.server.extensions.NullConnectionSecurityProvider;
import org.opends.server.extensions.TLSConnectionSecurityProvider;
import org.opends.server.types.AddressMask;
@@ -109,6 +111,11 @@
private static final String CLASS_NAME =
"org.opends.server.protocols.ldap.LDAPConnectionHandler";
+ /**
+ * Default friendly name for the LDAP connection handler.
+ */
+ private static final String DEFAULT_FRIENDLY_NAME = "LDAP Connection Handler";
+
// The current configuration state.
private LDAPConnectionHandlerCfg currentConfig;
@@ -185,21 +192,49 @@
// new client connections.
private ConnectionSecurityProvider securityProvider;
+// Queueing strategy
+ private final QueueingStrategy queueingStrategy;
+ // The condition variable that will be used by the start method
+ // to wait for the socket port to be opened and ready to process
+ // requests before returning.
+ private Object waitListen = new Object();
+
+ // The friendly name of this connection handler.
+ private String friendlyName;
/**
* Creates a new instance of this LDAP connection handler. It must
* be initialized before it may be used.
*/
public LDAPConnectionHandler() {
- super("LDAP Connection Handler Thread");
+ this(new WorkQueueStrategy(), DEFAULT_FRIENDLY_NAME);
+ }
+
+
+ /**
+ * Creates a new instance of this LDAP connection handler, using a queueing
+ * strategy. It must be initialized before it may be used.
+ * @param strategy Request handling strategy.
+ * @param friendlyName Friendly name to use in this connector.
+ * If null, the default one is used.
+ */
+ public LDAPConnectionHandler(QueueingStrategy strategy, String friendlyName) {
+ super(DEFAULT_FRIENDLY_NAME + " Thread");
+
+ if (friendlyName == null) {
+ this.friendlyName = DEFAULT_FRIENDLY_NAME;
+ } else {
+ this.friendlyName = friendlyName;
+ }
+
+ this.queueingStrategy = strategy;
// No real implementation is required. Do all the work in the
// initializeConnectionHandler method.
}
-
/**
* Indicates whether this connection handler should allow
* interaction with LDAPv2 clients.
@@ -683,7 +718,7 @@
// set of listeners.
listeners = new LinkedList<HostPort>();
StringBuilder nameBuffer = new StringBuilder();
- nameBuffer.append("LDAP Connection Handler");
+ nameBuffer.append(friendlyName);
for (InetAddress a : listenAddresses) {
listeners.add(new HostPort(a.getHostAddress(), listenPort));
nameBuffer.append(" ");
@@ -724,6 +759,10 @@
}
}
+ // Create a system property to store the LDAP(S) port the server is
+ // listening to. This information can be displayed with jinfo.
+ System.setProperty(protocol + "_port", String.valueOf(listenPort));
+
// Create and start the request handlers.
requestHandlers = new LDAPRequestHandler[numRequestHandlers];
for (int i = 0; i < numRequestHandlers; i++) {
@@ -831,6 +870,32 @@
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void start()
+ {
+ // The Directory Server start process should only return
+ // when the connection handlers port are fully opened
+ // and working. The start method therefore needs to wait for
+ // the created thread to
+ synchronized (waitListen)
+ {
+ super.start();
+
+ try
+ {
+ waitListen.wait();
+ } catch (InterruptedException e) {
+ // If something interrupted the start its probably better
+ // to return ASAP.
+ }
+ }
+ }
+
+
/**
* Operates in a loop, accepting new connections and ensuring that
* requests on those connections are handled properly.
@@ -847,7 +912,7 @@
cleanUpSelector();
listening = false;
- logError(ERR_LDAP_CONNHANDLER_STOPPED_LISTENING.get(handlerName));
+ logError(NOTE_LDAP_CONNHANDLER_STOPPED_LISTENING.get(handlerName));
}
try {
@@ -876,7 +941,7 @@
channel.register(selector, SelectionKey.OP_ACCEPT);
numRegistered++;
- logError(ERR_LDAP_CONNHANDLER_STARTED_LISTENING.get(handlerName));
+ logError(NOTE_LDAP_CONNHANDLER_STARTED_LISTENING.get(handlerName));
} catch (Exception e) {
if (debugEnabled())
{
@@ -889,6 +954,14 @@
}
}
+ // At this point, the connection Handler either started
+ // correctly or failed to start but the start process
+ // should be notified and resume its work in any cases.
+ synchronized(waitListen)
+ {
+ waitListen.notify();
+ }
+
// If none of the listeners were created successfully, then
// consider the connection handler disabled and require
// administrative action before trying again.
@@ -1191,4 +1264,16 @@
}
}
}
+
+
+
+ /**
+ * Get the queueing strategy.
+ *
+ * @return The queueing strategy.
+ */
+ public QueueingStrategy getQueueingStrategy() {
+ return queueingStrategy;
+ }
+
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
index ee429f4..c116b20 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
@@ -54,8 +54,6 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ProtocolMessages.*;
-import static org.opends.server.protocols.ldap.LDAPConstants.*;
-import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.util.StaticUtils.*;
@@ -2095,7 +2093,7 @@
}
else
{
- MatchingRule mr =
+ MatchingRule<?> mr =
DirectoryServer.getMatchingRule(toLowerCase(matchingRuleID));
if (mr == null)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
index 1f939a6..5aae8a6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
@@ -29,7 +29,6 @@
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import org.opends.messages.Message;
import org.opends.server.admin.std.server.MonitorProviderCfg;
@@ -39,6 +38,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DebugLogLevel;
@@ -693,12 +693,11 @@
AttributeType attrType = DirectoryServer.getDefaultAttributeType(name);
ASN1OctetString encodedValue = new ASN1OctetString(value);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(1);
-
+ AttributeBuilder builder = new AttributeBuilder(attrType, name);
try
{
- values.add(new AttributeValue(encodedValue,
- attrType.normalize(encodedValue)));
+ builder.add(new AttributeValue(encodedValue, attrType
+ .normalize(encodedValue)));
}
catch (Exception e)
{
@@ -707,18 +706,20 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- values.add(new AttributeValue(encodedValue, encodedValue));
+ builder.add(new AttributeValue(encodedValue, encodedValue));
}
- return new Attribute(attrType, name, values);
+ return builder.toAttribute();
}
/**
- * Retrieves the number of client connections that have been established.
+ * Retrieves the number of client connections that have been
+ * established.
*
- * @return The number of client connections that have been established.
+ * @return The number of client connections that have been
+ * established.
*/
public long getConnectionsEstablished()
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
index d08b507..9325e51 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
@@ -25,40 +25,40 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.protocols.ldap;
-import org.opends.messages.Message;
+import static org.opends.messages.ProtocolMessages.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.protocols.ldap.LDAPConstants.*;
+import static org.opends.server.protocols.ldap.LDAPResultCode.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
+import org.opends.messages.Message;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1Element;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.asn1.ASN1Sequence;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DN;
+import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.Entry;
import org.opends.server.types.LDAPException;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.util.Base64;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.messages.ProtocolMessages.*;
-import static org.opends.server.protocols.ldap.LDAPConstants.*;
-import static org.opends.server.protocols.ldap.LDAPResultCode.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
@@ -129,6 +129,22 @@
*/
public SearchResultEntryProtocolOp(SearchResultEntry searchEntry)
{
+ this(searchEntry,3);
+ }
+
+
+
+ /**
+ * Creates a new search result entry protocol op from the provided search
+ * result entry and ldap protocol version.
+ *
+ * @param searchEntry The search result entry object to use to create this
+ * search result entry protocol op.
+ * @param ldapVersion The version of the LDAP protocol.
+ */
+ public SearchResultEntryProtocolOp(SearchResultEntry searchEntry,
+ int ldapVersion)
+ {
this.dn = searchEntry.getDN();
attributes = new LinkedList<LDAPAttribute>();
@@ -139,21 +155,84 @@
attributes.add(new LDAPAttribute(ocAttr));
}
- for (List<Attribute> attrList :
- searchEntry.getUserAttributes().values())
+ if (ldapVersion == 2)
{
- for (Attribute a : attrList)
+ // Merge attributes having the same type into a single
+ // attribute.
+ boolean needsMerge;
+ Map<AttributeType, List<Attribute>> attrs = searchEntry
+ .getUserAttributes();
+ for (Map.Entry<AttributeType, List<Attribute>> attrList : attrs
+ .entrySet())
{
- attributes.add(new LDAPAttribute(a));
+ needsMerge = true;
+
+ if(attrList!=null && attrList.getValue().size()==1)
+ {
+ Attribute a = attrList.getValue().get(0);
+ if(!a.hasOptions())
+ {
+ needsMerge = false;
+ attributes.add(new LDAPAttribute(a));
+ }
+ }
+
+ if(needsMerge)
+ {
+ AttributeBuilder builder = new AttributeBuilder(attrList.getKey());
+ for (Attribute a : attrList.getValue())
+ {
+ builder.addAll(a);
+ }
+ attributes.add(new LDAPAttribute(builder.toAttribute()));
+ }
+ }
+
+ attrs = searchEntry.getOperationalAttributes();
+ for (Map.Entry<AttributeType, List<Attribute>> attrList : attrs
+ .entrySet())
+ {
+ needsMerge = true;
+
+ if(attrList!=null && attrList.getValue().size()==1)
+ {
+ Attribute a = attrList.getValue().get(0);
+ if(!a.hasOptions())
+ {
+ needsMerge = false;
+ attributes.add(new LDAPAttribute(a));
+ }
+ }
+
+ if(needsMerge)
+ {
+ AttributeBuilder builder = new AttributeBuilder(attrList.getKey());
+ for (Attribute a : attrList.getValue())
+ {
+ builder.addAll(a);
+ }
+ attributes.add(new LDAPAttribute(builder.toAttribute()));
+ }
}
}
-
- for (List<Attribute> attrList :
- searchEntry.getOperationalAttributes().values())
+ else
{
- for (Attribute a : attrList)
+ // LDAPv3
+ for (List<Attribute> attrList : searchEntry.getUserAttributes().values())
{
- attributes.add(new LDAPAttribute(a));
+ for (Attribute a : attrList)
+ {
+ attributes.add(new LDAPAttribute(a));
+ }
+ }
+
+ for (List<Attribute> attrList : searchEntry.getOperationalAttributes()
+ .values())
+ {
+ for (Attribute a : attrList)
+ {
+ attributes.add(new LDAPAttribute(a));
+ }
}
}
}
@@ -590,12 +669,13 @@
// Check to see if any of the existing attributes in the list have the
// same set of options. If so, then add the values to that attribute.
boolean attributeSeen = false;
- for (Attribute ea : attrs)
- {
+ for (int i = 0; i < attrs.size(); i++) {
+ Attribute ea = attrs.get(i);
if (ea.optionsEqual(attr.getOptions()))
{
- LinkedHashSet<AttributeValue> valueSet = ea.getValues();
- valueSet.addAll(attr.getValues());
+ AttributeBuilder builder = new AttributeBuilder(ea);
+ builder.addAll(attr);
+ attrs.set(i, builder.toAttribute());
attributeSeen = true;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/AssuredMode.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/AssuredMode.java
new file mode 100644
index 0000000..899bcb8
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/AssuredMode.java
@@ -0,0 +1,81 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.common;
+
+/**
+ * The various modes supported for assured replication.
+ */
+public enum AssuredMode
+{
+ /**
+ * Safe read assured mode.
+ */
+ SAFE_READ_MODE((byte) 1),
+ /**
+ * Safe data assured mode.
+ */
+ SAFE_DATA_MODE((byte) 2);
+
+ // The mode value
+ private byte value = -1;
+
+ private AssuredMode(byte value)
+ {
+ this.value = value;
+ }
+
+ /**
+ * Returns the AssuredMode matching the passed mode numeric representation.
+ * @param value The numeric value for the mode to return
+ * @return The matching AssuredMode
+ * @throws java.lang.IllegalArgumentException If provided mode value is
+ * wrong
+ */
+ public static AssuredMode valueOf(byte value) throws IllegalArgumentException
+ {
+ switch (value)
+ {
+ case 1:
+ return SAFE_READ_MODE;
+ case 2:
+ return SAFE_DATA_MODE;
+ default:
+ throw new IllegalArgumentException("Wrong assured mode numeric value: "
+ + value);
+ }
+ }
+
+ /**
+ * Get a numeric representation of the mode.
+ * @return The numeric representation of the mode
+ */
+ public byte getValue()
+ {
+ return value;
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangeNumber.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
index 2b27143..8c8ef70 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
@@ -26,6 +26,8 @@
*/
package org.opends.server.replication.common;
+import java.util.Date;
+
/**
* Class used to represent Change Numbers.
*/
@@ -143,6 +145,19 @@
}
/**
+ * Convert the ChangeNumber to a printable String that is .
+ * @return the string
+ */
+ public String toStringUI()
+ {
+ Date date = new Date(timeStamp);
+ return String.format(
+ "%016x%04x%08x (%s,%d,%d)",
+ timeStamp, serverId, seqnum,
+ date.toString(), serverId, seqnum);
+ }
+
+ /**
* Compares 2 ChangeNumber.
* @param CN1 the first ChangeNumber to compare
* @param CN2 the second ChangeNumber to compare
@@ -186,35 +201,42 @@
}
}
- /**
- * Computes the difference in number of changes between 2
- * change numbers.
- * @param op1 the first ChangeNumber
- * @param op2 the second ChangeNumber
- * @return the difference
- */
- public static int diffSeqNum(ChangeNumber op1, ChangeNumber op2)
+ /**
+ * Computes the difference in number of changes between 2
+ * change numbers. First one is expected to be newer than second one. If this
+ * is not the case, 0 will be returned.
+ * @param op1 the first ChangeNumber
+ * @param op2 the second ChangeNumber
+ * @return the difference
+ */
+ public static int diffSeqNum(ChangeNumber op1, ChangeNumber op2)
{
int totalCount = 0;
int max = op1.getSeqnum();
- if (op2 != null)
+ long maxTimeStamp = op1.getTime();
+ if (op1 != null)
{
- int current = op2.getSeqnum();
- if (current == max)
+ if (op2 != null)
{
- }
- else if (current < max)
+ int current = op2.getSeqnum();
+ long currentTimestamp = op2.getTime();
+ if (current != max)
+ {
+ if (currentTimestamp <= maxTimeStamp)
+ {
+ if (current < max)
+ {
+ totalCount += max - current;
+ } else
+ {
+ totalCount += Integer.MAX_VALUE - (current - max) + 1;
+ }
+ }
+ }
+ } else
{
- totalCount += max - current;
+ totalCount += max;
}
- else
- {
- totalCount += Integer.MAX_VALUE - (current - max) + 1;
- }
- }
- else
- {
- totalCount += max;
}
return totalCount;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/DSInfo.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/DSInfo.java
new file mode 100644
index 0000000..ffda986
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/DSInfo.java
@@ -0,0 +1,250 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.common;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class holds information about a DS connected to the topology. This
+ * information is to be exchanged through the replication protocol in
+ * topology messages, to keep every member (RS or DS) of the topology aware of
+ * the DS topology.
+ */
+public class DSInfo
+{
+
+ // DS server id
+ private short dsId = -1;
+ // Server id of the RS the DS is connected to
+ private short rsId = -1;
+ // DS Generation Id
+ private long generationId = -1;
+ // DS Status
+ private ServerStatus status = ServerStatus.INVALID_STATUS;
+ // Assured replication enabled on DS or not
+ private boolean assuredFlag = false;
+ // DS assured mode (relevant if assured replication enabled)
+ private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
+ // DS safe data level (relevant if assured mode is safe data)
+ private byte safeDataLevel = (byte) -1;
+ // List of referrals URLs exported by the DS
+ private List<String> refUrls = new ArrayList<String>(0);
+ // Group id
+ private byte groupId = (byte) -1;
+
+ /**
+ * Creates a new instance of DSInfo with every given info.
+ *
+ * @param dsId The DS id
+ * @param rsId The RS id the DS is connected to
+ * @param generationId The generation id the DS is using
+ * @param status The DS status
+ * @param assuredFlag DS assured replication enabled or not
+ * @param assuredMode DS assured mode
+ * @param safeDataLevel DS safe data level
+ * @param groupId DS group id
+ * @param refUrls DS exported referrals URLs
+ */
+ public DSInfo(short dsId, short rsId, long generationId, ServerStatus status,
+ boolean assuredFlag, AssuredMode assuredMode, byte safeDataLevel,
+ byte groupId, List<String> refUrls)
+ {
+
+ this.dsId = dsId;
+ this.rsId = rsId;
+ this.generationId = generationId;
+ this.status = status;
+ this.assuredFlag = assuredFlag;
+ this.assuredMode = assuredMode;
+ this.safeDataLevel = safeDataLevel;
+ this.groupId = groupId;
+ this.refUrls = refUrls;
+ }
+
+ /**
+ * Get the DS id.
+ * @return the DS id
+ */
+ public short getDsId()
+ {
+ return dsId;
+ }
+
+ /**
+ * Get the RS id the DS is connected to.
+ * @return the RS id the DS is connected to
+ */
+ public short getRsId()
+ {
+ return rsId;
+ }
+
+ /**
+ * Get the generation id DS is using.
+ * @return the generation id DS is using.
+ */
+ public long getGenerationId()
+ {
+ return generationId;
+ }
+
+ /**
+ * Get the DS status.
+ * @return the DS status
+ */
+ public ServerStatus getStatus()
+ {
+ return status;
+ }
+
+ /**
+ * Tells if the DS has assured replication enabled.
+ * @return True if the DS has assured replication enabled
+ */
+ public boolean isAssured()
+ {
+ return assuredFlag;
+ }
+
+ /**
+ * Get the DS assured mode (relevant if DS has assured replication enabled).
+ * @return The DS assured mode
+ */
+ public AssuredMode getAssuredMode()
+ {
+ return assuredMode;
+ }
+
+ /**
+ * Get the DS safe data level (relevant if assured mode is safe data).
+ * @return The DS safe data level
+ */
+ public byte getSafeDataLevel()
+ {
+ return safeDataLevel;
+ }
+
+ /**
+ * Get the DS group id.
+ * @return The DS group id
+ */
+ public byte getGroupId()
+ {
+ return groupId;
+ }
+
+ /**
+ * Get the DS exported URLs for referrals.
+ * @return The DS exported URLs for referrals
+ */
+ public List<String> getRefUrls()
+ {
+ return refUrls;
+ }
+
+ /**
+ * Test if the passed object is equal to this one.
+ * @param obj The object to test
+ * @return True if both objects are equal
+ */
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj != null)
+ {
+ if (obj.getClass() != this.getClass())
+ {
+ return false;
+ }
+ DSInfo dsInfo = (DSInfo) obj;
+ return ((dsId == dsInfo.getDsId()) &&
+ (rsId == dsInfo.getRsId()) &&
+ (generationId == dsInfo.getGenerationId()) &&
+ (status == dsInfo.getStatus()) &&
+ (assuredFlag == dsInfo.isAssured()) &&
+ (assuredMode == dsInfo.getAssuredMode()) &&
+ (safeDataLevel == dsInfo.getSafeDataLevel()) &&
+ (groupId == dsInfo.getGroupId()) &&
+ (refUrls.equals(dsInfo.getRefUrls())));
+ } else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Computes hash code for this object instance.
+ * @return Hash code for this object instance.
+ */
+ @Override
+ public int hashCode()
+ {
+ int hash = 7;
+ hash = 73 * hash + this.dsId;
+ hash = 73 * hash + this.rsId;
+ hash = 73 * hash + (int) (this.generationId ^ (this.generationId >>> 32));
+ hash = 73 * hash + (this.status != null ? this.status.hashCode() : 0);
+ hash = 73 * hash + (this.assuredFlag ? 1 : 0);
+ hash =
+ 73 * hash + (this.assuredMode != null ? this.assuredMode.hashCode() : 0);
+ hash = 73 * hash + this.safeDataLevel;
+ hash = 73 * hash + (this.refUrls != null ? this.refUrls.hashCode() : 0);
+ hash = 73 * hash + this.groupId;
+ return hash;
+ }
+
+ /**
+ * Returns a string representation of the DS info.
+ * @return A string representation of the DS info
+ */
+ @Override
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append("DS id: ");
+ sb.append(dsId);
+ sb.append("\nRS id: ");
+ sb.append(rsId);
+ sb.append("\nGeneration id: ");
+ sb.append(generationId);
+ sb.append("\nStatus: ");
+ sb.append(status);
+ sb.append("\nAssured replication: ");
+ sb.append(assuredFlag);
+ sb.append("\nAssured mode: ");
+ sb.append(assuredMode);
+ sb.append("\nSafe data level: ");
+ sb.append(safeDataLevel);
+ sb.append("\nGroup id: ");
+ sb.append(groupId);
+ sb.append("\nReferral URLs: ");
+ sb.append(refUrls);
+ return sb.toString();
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/RSInfo.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/RSInfo.java
new file mode 100644
index 0000000..2a5ea4e
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/RSInfo.java
@@ -0,0 +1,140 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.common;
+
+/**
+ * This class holds information about a RS connected to the topology. This
+ * information is to be exchanged through the replication protocol in
+ * topology messages, to keep every member DS of the topology aware of
+ * the RS topology.
+ */
+public class RSInfo
+{
+ // Server id of the RS
+ private short id = -1;
+ // Generation Id of the RS
+ private long generationId = -1;
+ // Group id of the RS
+ private byte groupId = (byte) -1;
+
+ /**
+ * Creates a new instance of RSInfo with every given info.
+ *
+ * @param id The RS id
+ * @param generationId The generation id the RS is using
+ * @param groupId RS group id
+ */
+ public RSInfo(short id, long generationId, byte groupId)
+ {
+ this.id = id;
+ this.generationId = generationId;
+ this.groupId = groupId;
+ }
+
+ /**
+ * Get the RS id.
+ * @return the RS id
+ */
+ public short getId()
+ {
+ return id;
+ }
+
+ /**
+ * Get the generation id RS is using.
+ * @return the generation id RS is using.
+ */
+ public long getGenerationId()
+ {
+ return generationId;
+ }
+
+ /**
+ * Get the RS group id.
+ * @return The RS group id
+ */
+ public byte getGroupId()
+ {
+ return groupId;
+ }
+
+ /**
+ * Test if the passed object is equal to this one.
+ * @param obj The object to test
+ * @return True if both objects are equal
+ */
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj != null)
+ {
+ if (obj.getClass() != this.getClass())
+ {
+ return false;
+ }
+ RSInfo rsInfo = (RSInfo) obj;
+ return ((id == rsInfo.getId()) &&
+ (generationId == rsInfo.getGenerationId()) &&
+ (groupId == rsInfo.getGroupId()));
+ } else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Computes hash code for this object instance.
+ * @return Hash code for this object instance.
+ */
+ @Override
+ public int hashCode()
+ {
+ int hash = 5;
+ hash = 37 * hash + this.id;
+ hash = 37 * hash + (int) (this.generationId ^ (this.generationId >>> 32));
+ hash = 37 * hash + this.groupId;
+ return hash;
+ }
+
+ /**
+ * Returns a string representation of the DS info.
+ * @return A string representation of the DS info
+ */
+ @Override
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append("Id: ");
+ sb.append(id);
+ sb.append("\nGeneration id: ");
+ sb.append(generationId);
+ sb.append("\nGroup id: ");
+ sb.append(groupId);
+ return sb.toString();
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/ServerState.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/ServerState.java
index 5e9393b..81d2ac3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/common/ServerState.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/ServerState.java
@@ -358,4 +358,41 @@
}
return newState;
}
+
+ /**
+ * Computes the number of changes a first server state has in advance
+ * compared to a second server state.
+ * @param ss1 The server state supposed to be newer than the second one
+ * @param ss2 The server state supposed to be older than the first one
+ * @return The difference of changes (sum of the differences for each server
+ * id changes). 0 If no gap between 2 states.
+ * @throws IllegalArgumentException If one of the passed state is null
+ */
+ public static int diffChanges(ServerState ss1, ServerState ss2)
+ throws IllegalArgumentException
+ {
+ if ( (ss1 == null) || (ss2 == null) )
+ throw new IllegalArgumentException("Null server state(s)");
+
+ int diff = 0;
+ for (Short serverId : ss1.list.keySet())
+ {
+ ChangeNumber cn1 = ss1.list.get(serverId);
+ if (cn1 != null)
+ {
+ ChangeNumber cn2 = ss2.list.get(serverId);
+ if (cn2 != null)
+ {
+ diff += ChangeNumber.diffSeqNum(cn1, cn2);
+ } else {
+ // ss2 does not have a change for this server id but ss1, so the
+ // server holding ss1 has every changes represented in cn1 in advance
+ // compared to server hodling ss2, add this amount
+ diff += cn1.getSeqnum();
+ }
+ }
+ }
+
+ return diff;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/ServerStatus.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/ServerStatus.java
new file mode 100644
index 0000000..d46ab82
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/ServerStatus.java
@@ -0,0 +1,134 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.common;
+
+/**
+ * The various status a DS can take.
+ */
+public enum ServerStatus
+{
+
+ /**
+ * Invalid status: special status used in state machine implementation to
+ * return an error (impossible status). See class StatusMachine class for
+ * further details.
+ */
+ INVALID_STATUS((byte) -1),
+ /**
+ * Not connected status: special status used as initial status of the state
+ * machine in the DS context only as already connected while state machine
+ * considered in RS context.
+ */
+ NOT_CONNECTED_STATUS((byte) 0),
+ /**
+ * DS in normal status.
+ * When:
+ * - everything is fine
+ * Properties:
+ * - no referrals
+ * - updates received from RS
+ * - if assured mode, RS asks for ack
+ */
+ NORMAL_STATUS((byte) 1),
+ /**
+ * DS in degraded status.
+ * When:
+ * - DS is too late compared to number of updates RS has to send
+ * Properties:
+ * - referrals returned
+ * - updates received from RS
+ * - if assured mode, RS does not asks for ack
+ */
+ DEGRADED_STATUS((byte) 2),
+ /**
+ * DS in full update (local DS is initialized from another DS).
+ * (if local DS initializes another, it is not in this status)
+ * When:
+ * - A full update is being performed to our local DS
+ * Properties:
+ * - referrals returned
+ * - no updates received from RS
+ * - no ack requested as no updates received
+ */
+ FULL_UPDATE_STATUS((byte) 3),
+ /**
+ * DS in bad generation id status.
+ * When:
+ * - A reset generation id order has been sent to topology
+ * Properties:
+ * - no referrals returned
+ * - no updates received from RS
+ * - no ack requested as no updates received
+ */
+ BAD_GEN_ID_STATUS((byte) 4);
+
+ // The status value
+ private byte value = -1;
+
+ private ServerStatus(byte value)
+ {
+ this.value = value;
+ }
+
+ /**
+ * Returns the ServerStatus matching the passed status numeric representation.
+ * @param value The numeric value for the status to return
+ * @return The matching ServerStatus
+ * @throws java.lang.IllegalArgumentException If provided status value is
+ * wrong
+ */
+ public static ServerStatus valueOf(byte value) throws IllegalArgumentException
+ {
+ switch (value)
+ {
+ case -1:
+ return INVALID_STATUS;
+ case 0:
+ return NOT_CONNECTED_STATUS;
+ case 1:
+ return NORMAL_STATUS;
+ case 2:
+ return DEGRADED_STATUS;
+ case 3:
+ return FULL_UPDATE_STATUS;
+ case 4:
+ return BAD_GEN_ID_STATUS;
+ default:
+ throw new IllegalArgumentException("Wrong status numeric value: " +
+ value);
+ }
+ }
+
+ /**
+ * Get a numeric representation of the status.
+ * @return The numeric representation of the status
+ */
+ public byte getValue()
+ {
+ return value;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/StatusMachine.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/StatusMachine.java
new file mode 100644
index 0000000..0f48d96
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/StatusMachine.java
@@ -0,0 +1,148 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.common;
+
+/**
+ * This class contains static methods to implement the DS status state machine.
+ * They are used to validate the transitions of the state machine according to
+ * the current status and event, and to compute the new status.
+ * - Status (states of the state machine) are defined in ServerStatus enum
+ * - Events are defined in StateMachineEvent enum
+ */
+public class StatusMachine
+{
+
+ /**
+ * Checks if a given status is valid as an entering status for the state
+ * machine.
+ * @param initStatus Initial status to check.
+ * @return True if the passed status is a valid initial status.
+ */
+ public static boolean isValidInitialStatus(ServerStatus initStatus)
+ {
+ switch (initStatus)
+ {
+ case NORMAL_STATUS:
+ case DEGRADED_STATUS:
+ case BAD_GEN_ID_STATUS:
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Computes the new status of the state machine according to the current
+ * status and the new generated event.
+ * @param curStatus The current status we start from.
+ * @param event The event that must make the current status evolve.
+ * @return The newly computed status. If the state transition is impossible
+ * according to state machine, special INVALID_STATUS is returned.
+ */
+ public static ServerStatus computeNewStatus(ServerStatus curStatus,
+ StatusMachineEvent event)
+ {
+ switch (curStatus)
+ {
+ // From NOT_CONNECTED_STATUS
+ case NOT_CONNECTED_STATUS:
+ switch (event)
+ {
+ case TO_NOT_CONNECTED_STATUS_EVENT:
+ return ServerStatus.NOT_CONNECTED_STATUS;
+ case TO_NORMAL_STATUS_EVENT:
+ return ServerStatus.NORMAL_STATUS;
+ case TO_DEGRADED_STATUS_EVENT:
+ return ServerStatus.DEGRADED_STATUS;
+ case TO_BAD_GEN_ID_STATUS_EVENT:
+ return ServerStatus.BAD_GEN_ID_STATUS;
+ default:
+ return ServerStatus.INVALID_STATUS;
+ }
+ // From NORMAL_STATUS
+ case NORMAL_STATUS:
+ switch (event)
+ {
+ case TO_NOT_CONNECTED_STATUS_EVENT:
+ return ServerStatus.NOT_CONNECTED_STATUS;
+ case TO_NORMAL_STATUS_EVENT:
+ return ServerStatus.NORMAL_STATUS;
+ case TO_DEGRADED_STATUS_EVENT:
+ return ServerStatus.DEGRADED_STATUS;
+ case TO_FULL_UPDATE_STATUS_EVENT:
+ return ServerStatus.FULL_UPDATE_STATUS;
+ case TO_BAD_GEN_ID_STATUS_EVENT:
+ return ServerStatus.BAD_GEN_ID_STATUS;
+ default:
+ return ServerStatus.INVALID_STATUS;
+ }
+ // From DEGRADED_STATUS
+ case DEGRADED_STATUS:
+ switch (event)
+ {
+ case TO_NOT_CONNECTED_STATUS_EVENT:
+ return ServerStatus.NOT_CONNECTED_STATUS;
+ case TO_NORMAL_STATUS_EVENT:
+ return ServerStatus.NORMAL_STATUS;
+ case TO_DEGRADED_STATUS_EVENT:
+ return ServerStatus.DEGRADED_STATUS;
+ case TO_FULL_UPDATE_STATUS_EVENT:
+ return ServerStatus.FULL_UPDATE_STATUS;
+ case TO_BAD_GEN_ID_STATUS_EVENT:
+ return ServerStatus.BAD_GEN_ID_STATUS;
+ default:
+ return ServerStatus.INVALID_STATUS;
+ }
+ // From FULL_UPDATE_STATUS
+ case FULL_UPDATE_STATUS:
+ switch (event)
+ {
+ case TO_NOT_CONNECTED_STATUS_EVENT:
+ return ServerStatus.NOT_CONNECTED_STATUS;
+ case TO_FULL_UPDATE_STATUS_EVENT:
+ return ServerStatus.FULL_UPDATE_STATUS;
+ default:
+ return ServerStatus.INVALID_STATUS;
+ }
+ // From BAD_GEN_ID_STATUS
+ case BAD_GEN_ID_STATUS:
+ switch (event)
+ {
+ case TO_NOT_CONNECTED_STATUS_EVENT:
+ return ServerStatus.NOT_CONNECTED_STATUS;
+ case TO_FULL_UPDATE_STATUS_EVENT:
+ return ServerStatus.FULL_UPDATE_STATUS;
+ case TO_BAD_GEN_ID_STATUS_EVENT:
+ return ServerStatus.BAD_GEN_ID_STATUS;
+ default:
+ return ServerStatus.INVALID_STATUS;
+ }
+ default:
+ return ServerStatus.INVALID_STATUS;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/StatusMachineEvent.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/StatusMachineEvent.java
new file mode 100644
index 0000000..05b60bc
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/StatusMachineEvent.java
@@ -0,0 +1,135 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.common;
+
+/**
+ * The possible events for the status state machine of a DS. See StateMachine
+ * class for further details.
+ */
+public enum StatusMachineEvent
+{
+
+ /**
+ * Invalid event: special event used to be returned by some methods to signal
+ * an error.
+ */
+ INVALID_EVENT((byte) -1),
+ /**
+ * Event used when one wants the DS to enter the NOT_CONNECTED_STATUS.
+ */
+ TO_NOT_CONNECTED_STATUS_EVENT((byte) 0),
+ /**
+ * Event used when one wants the DS to enter the NORMAL_STATUS.
+ */
+ TO_NORMAL_STATUS_EVENT((byte) 1),
+ /**
+ * Event used when one wants the DS to enter the DEGRADED_STATUS.
+ */
+ TO_DEGRADED_STATUS_EVENT((byte) 2),
+ /**
+ * Event used when one wants the DS to enter the FULL_UPDATE_STATUS.
+ */
+ TO_FULL_UPDATE_STATUS_EVENT((byte) 3),
+ /**
+ * Event used when one wants the DS to enter the BAD_GEN_ID_STATUS.
+ */
+ TO_BAD_GEN_ID_STATUS_EVENT((byte) 4);
+ // The status value
+ private byte value = -1;
+
+ private StatusMachineEvent(byte value)
+ {
+ this.value = value;
+ }
+
+ /**
+ * Returns the StatusMachineEvent matching the passed event numeric
+ * representation.
+ * @param value The numeric value for the event to return
+ * @return The matching StatusMachineEvent
+ * @throws java.lang.IllegalArgumentException If provided event value is
+ * wrong
+ */
+ public static StatusMachineEvent valueOf(byte value)
+ throws IllegalArgumentException
+ {
+ switch (value)
+ {
+ case 0:
+ return TO_NOT_CONNECTED_STATUS_EVENT;
+ case 1:
+ return TO_NORMAL_STATUS_EVENT;
+ case 2:
+ return TO_DEGRADED_STATUS_EVENT;
+ case 3:
+ return TO_FULL_UPDATE_STATUS_EVENT;
+ case 4:
+ return TO_BAD_GEN_ID_STATUS_EVENT;
+ default:
+ throw new IllegalArgumentException("Wrong event numeric value: "
+ + value);
+ }
+ }
+
+ /**
+ * Returns the event matching the passed requested status.
+ * When an entity receives a request to enter a particular status, this
+ * order is translated into a state machine event according to what is
+ * requested. Then, according to the current status and the computed event,
+ * the state machine retruns the matching new status
+ * (StateMachine.computeNewStatus).
+ * @param reqStatus The status to translate to an event.
+ * @return The matching event.
+ */
+ public static StatusMachineEvent statusToEvent(ServerStatus reqStatus)
+ {
+ switch (reqStatus)
+ {
+ case NOT_CONNECTED_STATUS:
+ return TO_NOT_CONNECTED_STATUS_EVENT;
+ case NORMAL_STATUS:
+ return TO_NORMAL_STATUS_EVENT;
+ case DEGRADED_STATUS:
+ return TO_DEGRADED_STATUS_EVENT;
+ case FULL_UPDATE_STATUS:
+ return TO_FULL_UPDATE_STATUS_EVENT;
+ case BAD_GEN_ID_STATUS:
+ return TO_BAD_GEN_ID_STATUS_EVENT;
+ default:
+ return INVALID_EVENT;
+ }
+ }
+
+ /**
+ * Get a numeric representation of the event.
+ * @return The numeric representation of the event
+ */
+ public byte getValue()
+ {
+ return value;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoMultiple.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoMultiple.java
index 813aeb7..a65d036 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoMultiple.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoMultiple.java
@@ -28,11 +28,10 @@
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.Entry;
@@ -129,7 +128,8 @@
while (it.hasNext())
{
ValueInfo info = it.next();
- if (CN.newerOrEquals(info.getValueUpdateTime()))
+ if (CN.newerOrEquals(info.getValueUpdateTime()) &&
+ CN.newerOrEquals(info.getValueDeleteTime()))
it.remove();
}
@@ -161,31 +161,37 @@
}
/**
- * Change historical information after a delete of a set of values.
- *
- * @param values values that were deleted
- * @param CN time when the delete was done
- */
- protected void delete(LinkedHashSet<AttributeValue> values, ChangeNumber CN)
- {
- for (AttributeValue val : values)
- {
- ValueInfo info = new ValueInfo(val, null, CN);
- this.valuesInfo.remove(info);
- this.valuesInfo.add(info);
- if (CN.newer(lastUpdateTime))
- {
- lastUpdateTime = CN;
- }
- }
- }
+ * Change historical information after a delete of a set of
+ * values.
+ *
+ * @param attr
+ * the attribute containing the set of values that were
+ * deleted
+ * @param CN
+ * time when the delete was done
+ */
+ protected void delete(Attribute attr, ChangeNumber CN)
+ {
+ for (AttributeValue val : attr)
+ {
+ ValueInfo info = new ValueInfo(val, null, CN);
+ this.valuesInfo.remove(info);
+ this.valuesInfo.add(info);
+ if (CN.newer(lastUpdateTime))
+ {
+ lastUpdateTime = CN;
+ }
+ }
+ }
/**
- * Update the historical information when a value is added.
- *
- * @param val values that was added
- * @param CN time when the value was added
- */
+ * Update the historical information when a value is added.
+ *
+ * @param val
+ * values that was added
+ * @param CN
+ * time when the value was added
+ */
protected void add(AttributeValue val, ChangeNumber CN)
{
ValueInfo info = new ValueInfo(val, CN, null);
@@ -198,25 +204,26 @@
}
/**
- * Update the historical information when values are added.
- *
- * @param values the set of added values
- * @param CN time when the add is done
- */
- private void add(LinkedHashSet<AttributeValue> values,
- ChangeNumber CN)
- {
- for (AttributeValue val : values)
- {
- ValueInfo info = new ValueInfo(val, CN, null);
- this.valuesInfo.remove(info);
- valuesInfo.add(info);
- if (CN.newer(lastUpdateTime))
- {
- lastUpdateTime = CN;
- }
- }
- }
+ * Update the historical information when values are added.
+ *
+ * @param attr
+ * the attribute containing the set of added values
+ * @param CN
+ * time when the add is done
+ */
+ private void add(Attribute attr, ChangeNumber CN)
+ {
+ for (AttributeValue val : attr)
+ {
+ ValueInfo info = new ValueInfo(val, CN, null);
+ this.valuesInfo.remove(info);
+ valuesInfo.add(info);
+ if (CN.newer(lastUpdateTime))
+ {
+ lastUpdateTime = CN;
+ }
+ }
+ }
/**
* Get the List of ValueInfo for this attribute Info.
@@ -240,10 +247,8 @@
// conflict
// with some more recent operations on this same entry
// we need to take the more complex path to solve them
- Attribute modAttr = m.getAttribute();
- AttributeType type = modAttr.getAttributeType();
-
- if (ChangeNumber.compare(changeNumber, getLastUpdateTime()) <= 0)
+ if ((ChangeNumber.compare(changeNumber, getLastUpdateTime()) <= 0) ||
+ (m.getModificationType() != ModificationType.REPLACE))
{
// the attribute was modified after this change -> conflict
@@ -259,12 +264,14 @@
break;
}
- conflictDelete(changeNumber, type, m, modifiedEntry, modAttr);
+ if (!conflictDelete(changeNumber, m, modifiedEntry))
+ {
+ modsIterator.remove();
+ }
break;
case ADD:
- conflictAdd(modsIterator, changeNumber,
- modAttr.getValues(), modAttr.getOptions());
+ conflictAdd(changeNumber, m, modsIterator);
break;
case REPLACE:
@@ -276,6 +283,7 @@
modsIterator.remove();
break;
}
+
/* save the values that are added by the replace operation
* into addedValues
* first process the replace as a delete operation -> this generate
@@ -284,15 +292,18 @@
* -> this generate the list of values that needs to be added
* concatenate the 2 generated lists into a replace
*/
- LinkedHashSet<AttributeValue> addedValues = modAttr.getValues();
- modAttr.setValues(new LinkedHashSet<AttributeValue>());
+ Attribute addedValues = m.getAttribute();
+ m.setAttribute(new AttributeBuilder(addedValues, true).toAttribute());
- this.conflictDelete(changeNumber, type, m, modifiedEntry, modAttr);
+ conflictDelete(changeNumber, m, modifiedEntry);
+ Attribute keptValues = m.getAttribute();
- LinkedHashSet<AttributeValue> keptValues = modAttr.getValues();
- this.conflictAdd(modsIterator, changeNumber, addedValues,
- modAttr.getOptions());
- keptValues.addAll(addedValues);
+ m.setAttribute(addedValues);
+ conflictAdd(changeNumber, m, modsIterator);
+
+ AttributeBuilder builder = new AttributeBuilder(keptValues);
+ builder.addAll(m.getAttribute());
+ m.setAttribute(builder.toAttribute());
break;
case INCREMENT:
@@ -339,13 +350,13 @@
switch (mod.getModificationType())
{
case DELETE:
- if (modAttr.getValues().isEmpty())
+ if (modAttr.isEmpty())
{
delete(changeNumber);
}
else
{
- delete(modAttr.getValues(), changeNumber);
+ delete(modAttr, changeNumber);
}
break;
@@ -354,13 +365,13 @@
{
delete(changeNumber);
}
- add(modAttr.getValues(), changeNumber);
+ add(modAttr, changeNumber);
break;
case REPLACE:
/* TODO : can we replace specific attribute values ????? */
delete(changeNumber);
- add(modAttr.getValues(), changeNumber);
+ add(modAttr, changeNumber);
break;
case INCREMENT:
@@ -374,21 +385,13 @@
* modification.
*
* @param changeNumber The changeNumber of the currently processed change
- * @param type attribute type
* @param m the modification that is being processed
* @param modifiedEntry the entry that is modified (before current mod)
- * @param attrInfo the historical info associated to the entry
- * @param modAttr the attribute modification
* @return false if there is nothing to do
*/
- private boolean conflictDelete(ChangeNumber changeNumber,
- AttributeType type, Modification m,
- Entry modifiedEntry,
- Attribute modAttr )
+ private boolean conflictDelete(ChangeNumber changeNumber, Modification m,
+ Entry modifiedEntry)
{
- LinkedHashSet<AttributeValue> delValues;
- LinkedHashSet<AttributeValue> replValues;
-
/*
* We are processing a conflicting DELETE modification
*
@@ -405,21 +408,18 @@
* it must be removed so we simply ignore them
*/
-
-
- delValues = modAttr.getValues();
- if ((delValues == null) || (delValues.isEmpty()))
+ Attribute modAttr = m.getAttribute();
+ if (modAttr.isEmpty())
{
/*
* We are processing a DELETE attribute modification
*/
m.setModificationType(ModificationType.REPLACE);
- replValues = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(modAttr, true);
- for (Iterator it = getValuesInfo().iterator();
- it.hasNext();)
+ for (Iterator<ValueInfo> it = getValuesInfo().iterator(); it.hasNext();)
{
- ValueInfo valInfo; valInfo = (ValueInfo) it.next();
+ ValueInfo valInfo; valInfo = it.next();
if (changeNumber.older(valInfo.getValueUpdateTime()))
{
@@ -427,7 +427,7 @@
* this value has been updated after this delete, therefore
* this value must be kept
*/
- replValues.add(valInfo.getValue());
+ builder.add(valInfo.getValue());
}
else
{
@@ -443,7 +443,8 @@
}
}
- modAttr.setValues(replValues);
+ m.setAttribute(builder.toAttribute());
+
if (changeNumber.newer(getDeleteTime()))
{
deleteTime = changeNumber;
@@ -459,11 +460,10 @@
* we are processing DELETE of some attribute values
*/
ArrayList<ValueInfo> valuesInfo = getValuesInfo();
+ AttributeBuilder builder = new AttributeBuilder(modAttr);
- for (Iterator<AttributeValue> delValIterator = delValues.iterator();
- delValIterator.hasNext();)
+ for (AttributeValue val : modAttr)
{
- AttributeValue val = delValIterator.next();
Boolean deleteIt = true; // true if the delete must be done
/* update historical information */
@@ -488,22 +488,35 @@
{
valuesInfo.add(valInfo);
}
+
/* if the attribute value is not to be deleted
* or if attribute value is not present suppress it from the
- * mod to make sure the delete is going to process again
+ * MOD to make sure the delete is going to succeed
*/
- modifiedEntry.getAttribute(type);
if (!deleteIt
- || !modifiedEntry.hasValue(type, modAttr.getOptions(), val))
+ || !modifiedEntry.hasValue(modAttr.getAttributeType(), modAttr
+ .getOptions(), val))
{
- delValIterator.remove();
+ // this value was already deleted before and therefore
+ // this should not be replayed.
+ builder.remove(val);
+ if (builder.isEmpty())
+ {
+ // This was the last values in the set of values to be deleted.
+ // this MOD must therefore be skipped.
+ return false;
+ }
}
}
+
+ m.setAttribute(builder.toAttribute());
+
if (changeNumber.newer(getLastUpdateTime()))
{
lastUpdateTime = changeNumber;
}
}
+
return true;
}
@@ -511,26 +524,22 @@
* Process a add attribute values that is conflicting with a previous
* modification.
*
- * @param modsIterator iterator on the list of modification
* @param changeNumber the historical info associated to the entry
- * @param addValues the values that are added
- * @param options the options that are added
+ * @param m the modification that is being processed
+ * @param modsIterator iterator on the list of modification
* @return false if operation becomes empty and must not be processed
*/
- private boolean conflictAdd(Iterator modsIterator, ChangeNumber changeNumber,
- LinkedHashSet<AttributeValue> addValues,
- Set<String> options)
+ private boolean conflictAdd(ChangeNumber changeNumber, Modification m,
+ Iterator<Modification> modsIterator)
{
- /* if historicalattributedelete is newer forget this mod
- * else find attr value
- * if does not exist
- * add historicalvalueadded timestamp
- * add real value in entry
- * else if timestamp older and already was historicalvalueadded
- * update historicalvalueadded
- * else if timestamp older and was historicalvaluedeleted
- * change historicalvaluedeleted into historicalvalueadded
- * add value in real entry
+ /*
+ * if historicalattributedelete is newer forget this mod else find
+ * attr value if does not exist add historicalvalueadded timestamp
+ * add real value in entry else if timestamp older and already was
+ * historicalvalueadded update historicalvalueadded else if
+ * timestamp older and was historicalvaluedeleted change
+ * historicalvaluedeleted into historicalvalueadded add value in
+ * real entry
*/
if (changeNumber.older(getDeleteTime()))
@@ -542,10 +551,9 @@
return false;
}
- for (Iterator<AttributeValue> valIterator = addValues.iterator();
- valIterator.hasNext();)
+ AttributeBuilder builder = new AttributeBuilder(m.getAttribute());
+ for (AttributeValue addVal : m.getAttribute())
{
- AttributeValue addVal= valIterator.next();
ArrayList<ValueInfo> valuesInfo = getValuesInfo();
ValueInfo valInfo = new ValueInfo(addVal, changeNumber, null);
int index = valuesInfo.indexOf(valInfo);
@@ -572,7 +580,7 @@
valuesInfo.remove(index);
valuesInfo.add(valInfo);
}
- valIterator.remove();
+ builder.remove(addVal);
}
else
{
@@ -596,12 +604,16 @@
* remove this value from the list of values to add
* don't update the historical information
*/
- valIterator.remove();
+ builder.remove(addVal);
}
}
}
}
- if (addValues.isEmpty())
+
+ Attribute attr = builder.toAttribute();
+ m.setAttribute(attr);
+
+ if (attr.isEmpty())
{
modsIterator.remove();
}
@@ -610,6 +622,7 @@
{
lastUpdateTime = changeNumber;
}
+
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoSingle.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoSingle.java
index 03e7e62..3a28259 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoSingle.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoSingle.java
@@ -28,10 +28,10 @@
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
@@ -86,13 +86,12 @@
public void processLocalOrNonConflictModification(ChangeNumber changeNumber,
Modification mod)
{
- Attribute modAttr = mod.getAttribute();
- LinkedHashSet<AttributeValue> values = null;
- if (modAttr != null)
- values = modAttr.getValues();
AttributeValue newValue = null;
- if ((values != null) && (values.size() != 0))
- newValue = values.iterator().next();
+ Attribute modAttr = mod.getAttribute();
+ if (modAttr != null && !modAttr.isEmpty())
+ {
+ newValue = modAttr.iterator().next();
+ }
switch (mod.getModificationType())
{
@@ -134,22 +133,35 @@
{
boolean conflict = false;
- Attribute modAttr = mod.getAttribute();
- LinkedHashSet<AttributeValue> values = null;
- if (modAttr != null)
- values = modAttr.getValues();
AttributeValue newValue = null;
- if ((values != null) && (values.size() != 0))
- newValue = values.iterator().next();
+ Attribute modAttr = mod.getAttribute();
+ if (modAttr != null && !modAttr.isEmpty())
+ {
+ newValue = modAttr.iterator().next();
+ }
switch (mod.getModificationType())
{
case DELETE:
if ((changeNumber.newer(addTime)) &&
- ((newValue == null) || ((newValue != null)
- && (newValue.equals(value)))))
+ ((newValue == null) ||
+ ((newValue != null) && (newValue.equals(value))) ||
+ (value == null)))
{
- deleteTime = changeNumber;
+ if (changeNumber.newer(deleteTime))
+ deleteTime = changeNumber;
+ AttributeType type = modAttr.getAttributeType();
+ if (!modifiedEntry.hasAttribute(type))
+ {
+ conflict = true;
+ modsIterator.remove();
+ }
+ else if ((newValue != null) &&
+ (!modifiedEntry.hasValue(type, modAttr.getOptions(), newValue)))
+ {
+ conflict = true;
+ modsIterator.remove();
+ }
}
else
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttributeInfo.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttributeInfo.java
index fc16f73..9cf3a08 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttributeInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttributeInfo.java
@@ -76,7 +76,7 @@
ChangeNumber changeNumber, Modification mod);
/**
- * Create a new AttributeInfo object that will be used with the givene type.
+ * Create a new AttributeInfo object that will be used with the given type.
*
* @param type the AttrbuteType with which the ATtributeInfo is going to be
* used.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeAddOperation.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeAddOperation.java
new file mode 100644
index 0000000..9a99c4a
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeAddOperation.java
@@ -0,0 +1,70 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.plugin;
+
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.AddMsg;
+import org.opends.server.types.Entry;
+
+/**
+ * This class if used to build fake ADD Operation from the historical
+ * information that stay in the entry in the database.
+ *
+ * This is useful when a LDAP server can't find a LDAP server that
+ * has already seen all its changes and therefore need to retransmit them.
+ *
+ */
+public class FakeAddOperation extends FakeOperation
+{
+ private Entry entry;
+
+ /**
+ * Creates a new AddFakeOperations.
+ *
+ * @param cn The ChangeNumber when the entry was created.
+ * @param entry The entry that the ADD operation will create.
+ */
+ public FakeAddOperation(ChangeNumber cn, Entry entry)
+ {
+ super(cn);
+ this.entry = entry;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public AddMsg generateMessage()
+ {
+ return new AddMsg(getChangeNumber(), entry.getDN().toString(),
+ Historical.getEntryUuid(entry),
+ ReplicationDomain.findEntryId(
+ entry.getDN().getParentDNInSuffix()),
+ entry.getObjectClasses(),
+ entry.getUserAttributes(), entry.getOperationalAttributes());
+ }
+}
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java
new file mode 100644
index 0000000..15fd6bc
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java
@@ -0,0 +1,72 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.plugin;
+
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.ModifyDNMsg;
+import org.opends.server.replication.protocol.ReplicationMsg;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+
+
+/**
+ * This class if used to build fake MODDN Operation from the historical
+ * information that stay in the entry in the database.
+ *
+ * This is useful when a LDAP server can't find a LDAP server that
+ * has already seen all its changes and therefore need to retransmit them.
+ *
+ */
+public class FakeModdnOperation extends FakeOperation
+{
+ private Entry entry;
+
+ /**
+ * Creates a new FakeModdnOperation.
+ *
+ * @param cn The ChangeNumber when the entry was last renamed.
+ * @param entry The entry that the MODDN operation will rename.
+ */
+ public FakeModdnOperation(ChangeNumber cn, Entry entry)
+ {
+ super(cn);
+ this.entry = entry;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public ReplicationMsg generateMessage()
+ {
+ DN dn = entry.getDN();
+ return new ModifyDNMsg(dn.toString(), this.getChangeNumber(),
+ Historical.getEntryUuid(entry),
+ ReplicationDomain.findEntryId(dn.getParent()),
+ false, dn.getParent().toString(), dn.getRDN().toString());
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeModifyOperation.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeModifyOperation.java
new file mode 100644
index 0000000..394e838
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeModifyOperation.java
@@ -0,0 +1,85 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.plugin;
+
+import java.util.ArrayList;
+
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.ModifyMsg;
+import org.opends.server.replication.protocol.ReplicationMsg;
+import org.opends.server.types.DN;
+import org.opends.server.types.Modification;
+
+/**
+ * This class if used to build fake Modify Operation from the historical
+ * information that stay in the entry in the database.
+ *
+ * This is useful when a LDAP server can't find a LDAP server that
+ * has already seen all its changes and therefore need to retransmit them
+ *
+ */
+public class FakeModifyOperation extends FakeOperation
+{
+ private ArrayList<Modification> mods = new ArrayList<Modification>();
+ private DN dn;
+ private String entryuuid;
+
+ /**
+ * Creates a new ModifyFakeOperation with the provided information.
+ *
+ * @param dn The DN on which the Operation was applied.
+ * @param changenumber The ChangeNumber of the operation.
+ * @param entryuuid The unique ID of the entry on which the Operation applies.
+ */
+ public FakeModifyOperation(DN dn, ChangeNumber changenumber, String entryuuid)
+ {
+ super(changenumber);
+ this.dn = dn;
+ this.entryuuid = entryuuid;
+ }
+
+ /**
+ * Add a modification to the list of modification included
+ * in this fake operation.
+ *
+ * @param mod A modification that must be added to the list of modifications
+ * included in this fake operation.
+ */
+ public void addModification(Modification mod)
+ {
+ mods.add(mod);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public ReplicationMsg generateMessage()
+ {
+ return new ModifyMsg(super.getChangeNumber(), dn, mods, entryuuid);
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeOperation.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeOperation.java
index a67621f..3b2f4ff 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/FakeOperation.java
@@ -27,18 +27,16 @@
package org.opends.server.replication.plugin;
import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.replication.protocol.ReplicationMessage;
-import org.opends.server.types.Modification;
+import org.opends.server.replication.protocol.ReplicationMsg;
/**
* This class if used to build fake Operation from the historical
* information that stay in the entry in the database.
*
- * This is usefull when a LDAP server can't find a LDAP server that
+ * This is useful when a LDAP server can't find a LDAP server that
* has already seen all its changes and therefore need to retransmit them
*
- * @author Gilles Bellaton
*/
public abstract class FakeOperation
{
@@ -65,22 +63,12 @@
}
/**
- * Generate a ReplicationMessage from this fake operation.
- * The ReplicationMessage is used to send the informations about
+ * Generate a ReplicationMsg from this fake operation.
+ * The ReplicationMsg is used to send the informations about
* this operation to the other servers.
*
- * @return A ReplicationMessage that can be used to send information
+ * @return A ReplicationMsg that can be used to send information
* about this operation to remote servers.
*/
- abstract public ReplicationMessage generateMessage();
-
- /**
- * Add a modification to the list of modification included
- * in this fake operation.
- *
- * @param mod A modification that must be adde to the list of modifications
- * included in this fake operation.
- */
- abstract public void addModification(Modification mod);
-
+ abstract public ReplicationMsg generateMessage();
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/GenerationIdChecksum.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/GenerationIdChecksum.java
new file mode 100644
index 0000000..9bd1bb3
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/GenerationIdChecksum.java
@@ -0,0 +1,87 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.plugin;
+
+import java.util.zip.Checksum;
+
+/**
+ * This class computes the generation id used for a replication domain.
+ * It is a checksum based on some special entries/attributes of the domain.
+ * The written stream to this class is the LDIF representation of the entries
+ * we are interested in for computing the generation id. The current
+ * implementation simply does the sum of each written byte and stores the value
+ * in a long. We do not care about the cycling long as the probability of 2
+ * data sets having the same checksum is very low.
+ */
+public class GenerationIdChecksum implements Checksum
+{
+ // Checksum to be returned.
+ private long checksum = 0L;
+
+ /**
+ * Update the checksum with one added byte.
+ */
+ private void updateWithOneByte(byte b)
+ {
+ checksum += (long) b;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void update(int b)
+ {
+ updateWithOneByte((byte) b);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void update(byte[] b, int off, int len)
+ {
+ for (int i = off; i < (off + len); i++)
+ {
+ updateWithOneByte(b[i]);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getValue()
+ {
+ return checksum;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void reset()
+ {
+ checksum = 0L;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/HistVal.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/HistVal.java
index 630909d..eae4433 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/HistVal.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/HistVal.java
@@ -32,6 +32,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.Modification;
@@ -41,8 +42,6 @@
/**
* This Class is used to encode/decode historical information
* from the String form to the internal usable form.
- *
- * @author Gilles Bellaton
*/
public class HistVal
{
@@ -54,8 +53,12 @@
private HistKey histKey;
private String stringValue;
+ // This flag indicates that this HistVal was generated to store the last date
+ // when the entry was renamed.
+ private boolean ismodDN = false;
+
/**
- * Create a new HistVal form the String encoded form.
+ * Create a new HistVal from the String encoded form.
*
* @param strVal The String encoded form of historical information.
*/
@@ -73,10 +76,13 @@
* or
* description:00000108b3a6554100000001:add
* or
+ * dn:00000108b3a6554100000001:add (ADD operation)
+ * or
+ * dn:00000108b3a6554100000001:moddn (MODIFYDN operation)
*
* so after split
* token[0] will contain the attribute name
- * token[1] will contain the changenumber
+ * token[1] will contain the change number
* token[2] will contain the type of historical information
* token[3] will contain the attribute value
*
@@ -103,9 +109,24 @@
attrString = token[0];
}
- attrType = DirectoryServer.getSchema().getAttributeType(attrString);
- if (attrType == null)
- attrType = DirectoryServer.getDefaultAttributeType(attrString);
+ if (attrString.compareTo("dn") != 0)
+ {
+ // This HistVal was used to store the date when some
+ // modifications were done to the entries.
+ attrType = DirectoryServer.getSchema().getAttributeType(attrString);
+ if (attrType == null)
+ attrType = DirectoryServer.getDefaultAttributeType(attrString);
+ }
+ else
+ {
+ // This HistVal is used to store the date when the entry
+ // was added to the directory or when it was last renamed.
+ attrType = null;
+ if ((token.length >= 3) && (token[2].compareTo("moddn") == 0))
+ {
+ ismodDN = true;
+ }
+ }
cn = new ChangeNumber(token[1]);
histKey = HistKey.decodeKey(token[2]);
@@ -139,7 +160,9 @@
/**
* Get the type of this HistVal.
+ *
* @return Returns the type of this HistVal.
+ * Can return NULL if the HistVal was generated for a ADD Operation.
*/
public AttributeType getAttrType()
{
@@ -198,27 +221,55 @@
*/
public Modification generateMod()
{
- Attribute attr = new Attribute(attrType, attrString, options, null);
- Modification mod;
+ AttributeBuilder builder = new AttributeBuilder(attrType, attrString);
+ builder.setOptions(options);
+
if (histKey != HistKey.DELATTR)
{
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(1);
- values.add(attributeValue);
- attr.setValues(values);
+ builder.add(attributeValue);
}
+ Attribute attr = builder.toAttribute();
+
+ Modification mod;
switch (histKey)
{
- case ADD : mod = new Modification(ModificationType.ADD, attr);
+ case ADD:
+ mod = new Modification(ModificationType.ADD, attr);
break;
- case DEL : mod = new Modification(ModificationType.DELETE, attr);
+ case DEL:
+ mod = new Modification(ModificationType.DELETE, attr);
break;
- case REPL: mod = new Modification(ModificationType.REPLACE, attr);
+ case REPL:
+ mod = new Modification(ModificationType.REPLACE, attr);
break;
- case DELATTR: mod = new Modification(ModificationType.DELETE, attr);
+ case DELATTR:
+ mod = new Modification(ModificationType.DELETE, attr);
break;
- default: mod = null;
+ default:
+ mod = null;
}
return mod;
}
+
+ /**
+ * Indicates if the HistVal was generated for a ADD operation.
+ *
+ * @return a boolean indicating if the HistVal was generated for a ADD
+ * operation.
+ */
+ public boolean isADDOperation()
+ {
+ return ((attrType == null) && (ismodDN == false));
+ }
+
+ /**
+ * Indicates if the HistVal was generated for a MODDN operation.
+ *
+ * @return a boolean indicating if the HistVal was generated for a ADDMODDN
+ * operation.
+ */
+ public boolean isMODDNOperation()
+ {
+ return ((attrType == null) && (ismodDN == true));
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java
index ee8f79d..cd45bce 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/Historical.java
@@ -25,30 +25,33 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.replication.plugin;
-import org.opends.messages.Message;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.loggers.ErrorLogger.logError;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-import java.util.HashSet;
+import org.opends.messages.Message;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.protocol.OperationContext;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
import org.opends.server.types.operation.PreOperationAddOperation;
+import org.opends.server.types.operation.PreOperationModifyDNOperation;
import org.opends.server.types.operation.PreOperationModifyOperation;
/**
@@ -93,6 +96,12 @@
private HashMap<AttributeType,AttrInfoWithOptions> attributesInfo
= new HashMap<AttributeType,AttrInfoWithOptions>();
+ // The date when the entry was added.
+ private ChangeNumber ADDDate = null;
+
+ // The date when the entry was last renamed.
+ private ChangeNumber MODDNDate = null;
+
/**
* {@inheritDoc}
*/
@@ -168,14 +177,105 @@
}
Attribute attr = encode();
+ Modification mod = new Modification(ModificationType.REPLACE, attr);
+ mods.add(mod);
+ modifiedEntry.replaceAttribute(attr);
+ }
+
+ /**
+ * Add historical information for a MODRDN operation to existing
+ * historical information.
+ *
+ * @param modifyDNOperation the modification for which the historical
+ * information should be created.
+ */
+ public void generateState(PreOperationModifyDNOperation modifyDNOperation)
+ {
+ // Update this historical information with the operation ChangeNumber.
+ this.MODDNDate = OperationContext.getChangeNumber(modifyDNOperation);
+
+ // Update the operations mods and the modified entry so that the
+ // historical information gets stored in the DB and indexed accordingly.
+ Entry modifiedEntry = modifyDNOperation.getUpdatedEntry();
+ List<Modification> mods = modifyDNOperation.getModifications();
+
+ Attribute attr = encode();
Modification mod;
mod = new Modification(ModificationType.REPLACE, attr);
mods.add(mod);
+
modifiedEntry.removeAttribute(attr.getAttributeType());
modifiedEntry.addAttribute(attr, null);
}
/**
+ * Generate and add to the Operation the historical information for
+ * the ADD Operation.
+ * This historical information will be used to generate fake operation
+ * in case a Directory Server can not find a Replication Server with
+ * all its changes at connection time.
+ * This should only happen if a Directory Server or a Replication Server
+ * crashes.
+ *
+ * @param addOperation The Operation to process.
+ */
+ public static void generateState(PreOperationAddOperation addOperation)
+ {
+ AttributeType historicalAttrType =
+ DirectoryServer.getSchema().getAttributeType(HISTORICALATTRIBUTENAME);
+
+ Attribute attr =
+ Attributes.create(historicalAttrType,
+ encodeAddHistorical(OperationContext.getChangeNumber(addOperation)));
+
+ List<Attribute> attrList = new LinkedList<Attribute>();
+ attrList.add(attr);
+ addOperation.setAttribute(historicalAttrType, attrList);
+ }
+
+ /**
+ * Generate historical information for an ADD Operation.
+ * This historical information will be used to generate fake operation
+ * in case a Directory Server can not find a Replication Server with
+ * all its changes at connection time.
+ * This should only happen if a Directory Server or a Replication Server
+ * crashes.
+ *
+ * @param cn The date when the ADD Operation happened.
+ * @return The encoded historical information for the ADD Operation.
+ */
+ private static AttributeValue encodeAddHistorical(ChangeNumber cn)
+ {
+ AttributeType historicalAttrType =
+ DirectoryServer.getSchema().getAttributeType(HISTORICALATTRIBUTENAME);
+
+ String strValue = "dn:" + cn.toString() +":add";
+ AttributeValue val = new AttributeValue(historicalAttrType, strValue);
+ return val;
+ }
+
+ /**
+ * Generate historical information for a MODDN Operation.
+ * This historical information will be used to generate fake operation
+ * in case a Directory Server can not find a Replication Server with
+ * all its changes at connection time.
+ * This should only happen if a Directory Server or a Replication Server
+ * crashes.
+ *
+ * @param cn The date when the MODDN Operation happened.
+ * @return The encoded historical information for the MODDN Operation.
+ */
+ private static AttributeValue encodeMODDNHistorical(ChangeNumber cn)
+ {
+ AttributeType historicalAttrType =
+ DirectoryServer.getSchema().getAttributeType(HISTORICALATTRIBUTENAME);
+
+ String strValue = "dn:" + cn.toString() +":moddn";
+ AttributeValue val = new AttributeValue(historicalAttrType, strValue);
+ return val;
+ }
+
+ /**
* Get the AttrInfo for a given Modification.
* The AttrInfo is the object that is used to store the historical
* information of a given attribute type.
@@ -225,11 +325,11 @@
{
AttributeType historicalAttrType =
DirectoryServer.getSchema().getAttributeType(HISTORICALATTRIBUTENAME);
- LinkedHashSet<AttributeValue> hist = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(historicalAttrType);
+ // Encode the historical information for modify operation.
for (Map.Entry<AttributeType, AttrInfoWithOptions> entryWithOptions :
attributesInfo.entrySet())
-
{
AttributeType type = entryWithOptions.getKey();
HashMap<Set<String> , AttributeInfo> attrwithoptions =
@@ -273,7 +373,7 @@
":del:" + valInfo.getValue().toString();
AttributeValue val = new AttributeValue(historicalAttrType,
strValue);
- hist.add(val);
+ builder.add(val);
}
else if (valInfo.getValueUpdateTime() != null)
{
@@ -303,7 +403,7 @@
AttributeValue val = new AttributeValue(historicalAttrType,
strValue);
- hist.add(val);
+ builder.add(val);
}
}
@@ -313,22 +413,24 @@
+ optionsString + ":" + deleteTime.toString()
+ ":attrDel";
AttributeValue val = new AttributeValue(historicalAttrType, strValue);
- hist.add(val);
+ builder.add(val);
}
}
}
- Attribute attr;
+ // Encode the historical information for the ADD Operation.
+ if (ADDDate != null)
+ {
+ builder.add(encodeAddHistorical(ADDDate));
+ }
- if (hist.isEmpty())
+ // Encode the historical information for the MODDN Operation.
+ if (MODDNDate != null)
{
- attr = new Attribute(historicalAttrType, HISTORICALATTRIBUTENAME, null);
+ builder.add(encodeMODDNHistorical(MODDNDate));
}
- else
- {
- attr = new Attribute(historicalAttrType, HISTORICALATTRIBUTENAME, hist);
- }
- return attr;
+
+ return builder.toAttribute();
}
@@ -356,7 +458,7 @@
{
for (Attribute attr : hist)
{
- for (AttributeValue val : attr.getValues())
+ for (AttributeValue val : attr)
{
HistVal histVal = new HistVal(val.getStringValue());
AttributeType attrType = histVal.getAttrType();
@@ -365,53 +467,64 @@
AttributeValue value = histVal.getAttributeValue();
HistKey histKey = histVal.getHistKey();
- if (attrType == null)
+ if (histVal.isADDOperation())
{
- /*
- * This attribute is unknown from the schema
- * Just skip it, the modification will be processed but no
- * historical information is going to be kept.
- * Log information for the repair tool.
- */
- Message message = ERR_UNKNOWN_ATTRIBUTE_IN_HISTORICAL.get(
- entry.getDN().toNormalizedString(), histVal.getAttrString());
- logError(message);
- continue;
+ histObj.ADDDate = cn;
}
-
- /* if attribute type does not match we create new
- * AttrInfoWithOptions and AttrInfo
- * we also add old AttrInfoWithOptions into histObj.attributesInfo
- * if attribute type match but options does not match we create new
- * AttrInfo that we add to AttrInfoWithOptions
- * if both match we keep everything
- */
- if (attrType != lastAttrType)
+ else if (histVal.isMODDNOperation())
{
- attrInfo = AttributeInfo.createAttributeInfo(attrType);
- attrInfoWithOptions = new AttrInfoWithOptions();
- attrInfoWithOptions.put(options, attrInfo);
- histObj.attributesInfo.put(attrType, attrInfoWithOptions);
-
- lastAttrType = attrType;
- lastOptions = options;
+ histObj.MODDNDate = cn;
}
else
{
- if (!options.equals(lastOptions))
+ if (attrType == null)
+ {
+ /*
+ * This attribute is unknown from the schema
+ * Just skip it, the modification will be processed but no
+ * historical information is going to be kept.
+ * Log information for the repair tool.
+ */
+ Message message = ERR_UNKNOWN_ATTRIBUTE_IN_HISTORICAL.get(
+ entry.getDN().toNormalizedString(), histVal.getAttrString());
+ logError(message);
+ continue;
+ }
+
+ /* if attribute type does not match we create new
+ * AttrInfoWithOptions and AttrInfo
+ * we also add old AttrInfoWithOptions into histObj.attributesInfo
+ * if attribute type match but options does not match we create new
+ * AttrInfo that we add to AttrInfoWithOptions
+ * if both match we keep everything
+ */
+ if (attrType != lastAttrType)
{
attrInfo = AttributeInfo.createAttributeInfo(attrType);
+ attrInfoWithOptions = new AttrInfoWithOptions();
attrInfoWithOptions.put(options, attrInfo);
+ histObj.attributesInfo.put(attrType, attrInfoWithOptions);
+
+ lastAttrType = attrType;
lastOptions = options;
}
- }
+ else
+ {
+ if (!options.equals(lastOptions))
+ {
+ attrInfo = AttributeInfo.createAttributeInfo(attrType);
+ attrInfoWithOptions.put(options, attrInfo);
+ lastOptions = options;
+ }
+ }
- attrInfo.load(histKey, value, cn);
+ attrInfo.load(histKey, value, cn);
+ }
}
}
} catch (Exception e)
{
- // Any exception happening here means that the coding of the hsitorical
+ // Any exception happening here means that the coding of the historical
// information was wrong.
// Log an error and continue with an empty historical.
Message message = ERR_BAD_HISTORICAL.get(entry.getDN().toString());
@@ -426,8 +539,8 @@
/**
* Use this historical information to generate fake operations that would
* result in this historical information.
- * TODO : This is only implemented for modify operation, should implement ADD
- * DELETE and MODRDN.
+ * TODO : This is only implemented for MODIFY, MODRDN and ADD
+ * need to complete with DELETE.
* @param entry The Entry to use to generate the FakeOperation Iterable.
*
* @return an Iterable of FakeOperation that would result in this historical
@@ -442,29 +555,52 @@
{
for (Attribute attr : attrs)
{
- for (AttributeValue val : attr.getValues())
+ for (AttributeValue val : attr)
{
HistVal histVal = new HistVal(val.getStringValue());
- ChangeNumber cn = histVal.getCn();
- Modification mod = histVal.generateMod();
- ModifyFakeOperation modifyFakeOperation;
-
- FakeOperation fakeOperation = operations.get(cn);
-
- if (fakeOperation != null)
+ if (histVal.isADDOperation())
{
- fakeOperation.addModification(mod);
+ // Found some historical information indicating that this
+ // entry was just added.
+ // Create the corresponding ADD operation.
+ operations.put(histVal.getCn(),
+ new FakeAddOperation(histVal.getCn(), entry));
+ }
+ else if (histVal.isMODDNOperation())
+ {
+ // Found some historical information indicating that this
+ // entry was just renamed.
+ // Create the corresponding ADD operation.
+ operations.put(histVal.getCn(),
+ new FakeModdnOperation(histVal.getCn(), entry));
}
else
{
- String uuidString = getEntryUuid(entry);
- if (uuidString != null)
+ // Found some historical information for modify operation.
+ // Generate the corresponding ModifyOperation or update
+ // the already generated Operation if it can be found.
+ ChangeNumber cn = histVal.getCn();
+ Modification mod = histVal.generateMod();
+ FakeModifyOperation modifyFakeOperation;
+ FakeOperation fakeOperation = operations.get(cn);
+
+ if ((fakeOperation != null) &&
+ (fakeOperation instanceof FakeModifyOperation))
{
- modifyFakeOperation = new ModifyFakeOperation(entry.getDN(),
- cn, uuidString);
+ modifyFakeOperation = (FakeModifyOperation) fakeOperation;
+ modifyFakeOperation.addModification(mod);
+ }
+ else
+ {
+ String uuidString = getEntryUuid(entry);
+ if (uuidString != null)
+ {
+ modifyFakeOperation = new FakeModifyOperation(entry.getDN(),
+ cn, uuidString);
modifyFakeOperation.addModification(mod);
operations.put(histVal.getCn(), modifyFakeOperation);
+ }
}
}
}
@@ -503,9 +639,9 @@
if (uuidAttrs != null)
{
Attribute uuid = uuidAttrs.get(0);
- if (uuid.hasValue())
+ if (!uuid.isEmpty())
{
- AttributeValue uuidVal = uuid.getValues().iterator().next();
+ AttributeValue uuidVal = uuid.iterator().next();
uuidString = uuidVal.getStringValue();
}
}
@@ -531,9 +667,9 @@
if (uuidAttrs != null)
{
Attribute uuid = uuidAttrs.get(0);
- if (uuid.hasValue())
+ if (!uuid.isEmpty())
{
- AttributeValue uuidVal = uuid.getValues().iterator().next();
+ AttributeValue uuidVal = uuid.iterator().next();
uuidString = uuidVal.getStringValue();
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ListenerThread.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ListenerThread.java
index 2265aa4..bb5f214 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ListenerThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ListenerThread.java
@@ -37,7 +37,7 @@
import org.opends.server.api.DirectoryThread;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
/**
* Thread that is used to get messages from the Replication servers
@@ -66,9 +66,8 @@
public ListenerThread(ReplicationDomain repDomain,
LinkedBlockingQueue<UpdateToReplay> updateToReplayQueue)
{
- super("Replication Listener thread " +
- "serverID=" + repDomain.serverId +
- " domain=" + repDomain.getName());
+ super("Replication Listener for server id " + repDomain.getServerId() +
+ " and domain " + repDomain.getBaseDN());
this.repDomain = repDomain;
this.updateToReplayQueue = updateToReplayQueue;
}
@@ -87,7 +86,7 @@
@Override
public void run()
{
- UpdateMessage updateMsg = null;
+ UpdateMsg updateMsg = null;
if (debugEnabled())
{
@@ -153,9 +152,18 @@
{
try
{
- while (done == false)
+ int FACTOR = 40; // Wait for 2 seconds before interrupting the thread
+ int n = 0;
+ while ((done == false) && (this.isAlive()))
{
Thread.sleep(50);
+ n++;
+ if (n >= FACTOR)
+ {
+ TRACER.debugInfo("Interrupting listener thread for dn " +
+ repDomain.getBaseDN() + " in DS " + repDomain.getServerId());
+ this.interrupt();
+ }
}
} catch (InterruptedException e)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ModifyFakeOperation.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ModifyFakeOperation.java
deleted file mode 100644
index c3d71be..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ModifyFakeOperation.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.plugin;
-
-import java.util.ArrayList;
-
-import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.replication.protocol.ModifyMsg;
-import org.opends.server.replication.protocol.ReplicationMessage;
-import org.opends.server.types.DN;
-import org.opends.server.types.Modification;
-
-/**
- * This class if used to build fake Modify Operation from the historical
- * information that stay in the entry in the database.
- *
- * This is usefull when a LDAP server can't find a LDAP server that
- * has already seen all its changes and therefore need to retransmit them
- *
- * @author Gilles Bellaton
- */
-public class ModifyFakeOperation extends FakeOperation
-{
- private ArrayList<Modification> mods = new ArrayList<Modification>();
- private DN dn;
- private String entryuuid;
-
- /**
- * Creates a new ModifyFakeOperation with the provided information.
- *
- * @param dn The dn on which the Operation was applied.
- * @param changenumber The ChangeNumber of the operation.
- * @param entryuuid The unique ID of the entry on which the Operation applies.
- */
- public ModifyFakeOperation(DN dn, ChangeNumber changenumber, String entryuuid)
- {
- super(changenumber);
- this.dn = dn;
- this.entryuuid = entryuuid;
- }
-
- /**
- * Add a modification to the list of modification included
- * in this fake operation.
- *
- * @param mod A modification that must be adde to the list of modifications
- * included in this fake operation.
- */
- public void addModification(Modification mod)
- {
- mods.add(mod);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ReplicationMessage generateMessage()
- {
- return new ModifyMsg(super.getChangeNumber(), dn, mods, entryuuid);
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index 924be2b..0af98a0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -182,7 +182,7 @@
* Creates a new domain from its configEntry, do the
* necessary initialization and starts it so that it is
* fully operational when this method returns.
- * @param configuration The entry whith the configuration of this domain.
+ * @param configuration The entry with the configuration of this domain.
* @return The domain created.
* @throws ConfigException When the configuration is not valid.
*/
@@ -484,6 +484,25 @@
PreOperationModifyDNOperation modifyDNOperation)
throws DirectoryException
{
+ DN operationDN = modifyDNOperation.getEntryDN();
+ ReplicationDomain domain = findDomain(operationDN, modifyDNOperation);
+
+ if ((domain == null) || (!domain.solveConflict()))
+ return new SynchronizationProviderResult.ContinueProcessing();
+
+ Historical historicalInformation = (Historical)
+ modifyDNOperation.getAttachment(
+ Historical.HISTORICAL);
+ if (historicalInformation == null)
+ {
+ Entry entry = modifyDNOperation.getUpdatedEntry();
+ historicalInformation = Historical.load(entry);
+ modifyDNOperation.setAttachment(Historical.HISTORICAL,
+ historicalInformation);
+ }
+
+ historicalInformation.generateState(modifyDNOperation);
+
return new SynchronizationProviderResult.ContinueProcessing();
}
@@ -752,4 +771,13 @@
domain.start();
}
}
+
+ /**
+ * Gets the number of handled domain objects.
+ * @return The number of handled domain objects
+ */
+ public static int getNumberOfDomains()
+ {
+ return domains.size();
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PendingChange.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
index b202b70..2ff4904 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PendingChange.java
@@ -28,7 +28,7 @@
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ServerState;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.operation.PluginOperation;
@@ -41,7 +41,7 @@
{
private ChangeNumber changeNumber;
private boolean committed;
- private UpdateMessage msg;
+ private UpdateMsg msg;
private PluginOperation op;
private ServerState dependencyState = null;
private DN targetDN = null;
@@ -54,7 +54,7 @@
*/
public PendingChange(ChangeNumber changeNumber,
PluginOperation op,
- UpdateMessage msg)
+ UpdateMsg msg)
{
this.changeNumber = changeNumber;
this.committed = false;
@@ -94,7 +94,7 @@
* @return the message if operation was a replication operation
* null if the operation was a local operation
*/
- public UpdateMessage getMsg()
+ public UpdateMsg getMsg()
{
return msg;
}
@@ -103,7 +103,7 @@
* Set the message associated to the PendingChange.
* @param msg the message
*/
- public void setMsg(UpdateMessage msg)
+ public void setMsg(UpdateMsg msg)
{
this.msg = msg;
}
@@ -118,7 +118,7 @@
}
/**
- * Set the operation asociated to this PendingChange.
+ * Set the operation associated to this PendingChange.
* @param op The operation associated to this PendingChange.
*/
public void setOp(PluginOperation op)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PendingChanges.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PendingChanges.java
index 46b73b0..513e41c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PendingChanges.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PendingChanges.java
@@ -33,18 +33,18 @@
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ChangeNumberGenerator;
import org.opends.server.replication.common.ServerState;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.types.operation.PluginOperation;
/**
- * This class is use to store the list of local operations currently
+ * This class is used to store the list of local operations currently
* in progress and not yet committed in the database.
*
* It is used to make sure that operations are sent to the Replication
* Server in the order defined by their ChangeNumber.
* It is also used to update the ServerState at the appropriate time.
*
- * On object of this class is instanciated for each ReplicationDomain.
+ * On object of this class is instantiated for each ReplicationDomain.
*/
public class PendingChanges
{
@@ -61,12 +61,12 @@
private ChangeNumberGenerator changeNumberGenerator;
/**
- * The Replicationbroker that will be used to send UpdateMessage.
+ * The Replicationbroker that will be used to send UpdateMsg.
*/
private ReplicationBroker broker;
/**
- * The ServerState that will be updated when UpdateMessage are committed.
+ * The ServerState that will be updated when UpdateMsg are committed.
*/
private ServerState state;
@@ -76,8 +76,8 @@
* @param changeNumberGenerator The ChangeNumberGenerator to use to create
* new unique ChangeNumbers.
* @param broker The Replicationbroker that will be used to send
- * UpdateMessage.
- * @param state The ServerState that will be updated when UpdateMessage
+ * UpdateMsg.
+ * @param state The ServerState that will be updated when UpdateMsg
* are committed.
*/
public PendingChanges(
@@ -94,9 +94,9 @@
*
* @param changeNumber The ChangeNumber of the update to remove.
*
- * @return The UpdateMessage that was just removed.
+ * @return The UpdateMsg that was just removed.
*/
- public synchronized UpdateMessage remove(ChangeNumber changeNumber)
+ public synchronized UpdateMsg remove(ChangeNumber changeNumber)
{
return pendingChanges.remove(changeNumber).getMsg();
}
@@ -119,7 +119,7 @@
* @param msg The message associated to the update.
*/
public synchronized void commit(ChangeNumber changeNumber,
- UpdateMessage msg)
+ UpdateMsg msg)
{
PendingChange curChange = pendingChanges.get(changeNumber);
if (curChange == null)
@@ -148,10 +148,10 @@
}
/**
- * Add a new UpdateMessage to the pending list from the provided local
+ * Add a new UpdateMsg to the pending list from the provided local
* operation.
*
- * @param operation The local operation for which an UpdateMessage mus
+ * @param operation The local operation for which an UpdateMsg must
* be added in the pending list.
* @return The ChangeNumber now associated to the operation.
*/
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index 53f3bd5..8d74618 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -64,7 +64,7 @@
/**
* This class implements a ServerState that is stored on the backends
* used to store the synchronized data and that is therefore persistent
- * accross server reboot.
+ * across server reboot.
*/
public class PersistentServerState extends ServerState
{
@@ -155,7 +155,7 @@
* Run a search operation to find the base entry
* of the replication domain for which this ServerState was created.
*
- * @return Thebasen Entry or null if no entry was found;
+ * @return The base entry or null if no entry was found;
*/
private SearchResultEntry searchBaseEntry()
{
@@ -264,8 +264,7 @@
if (attrs != null)
{
Attribute attr = attrs.get(0);
- LinkedHashSet<AttributeValue> values = attr.getValues();
- for (AttributeValue value : values)
+ for (AttributeValue value : attr)
{
ChangeNumber changeNumber =
new ChangeNumber(value.getStringValue());
@@ -276,9 +275,9 @@
/**
* Save the current values of this PersistentState object
- * in the appropiate entry of the database.
+ * in the appropriate entry of the database.
*
- * @return a ResultCode indicating if the method was successfull.
+ * @return a ResultCode indicating if the method was successful.
*/
private ResultCode updateStateEntry()
{
@@ -412,7 +411,7 @@
for (SearchResultEntry resEntry : op.getSearchEntries())
{
List<Attribute> attrs = resEntry.getAttribute(histType);
- Iterator<AttributeValue> iav = attrs.get(0).getValues().iterator();
+ Iterator<AttributeValue> iav = attrs.get(0).iterator();
try
{
while (true)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java
index 2b0f45b..3552aa6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/RemotePendingChanges.java
@@ -34,6 +34,7 @@
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
+import org.opends.server.core.ModifyDNOperationBasis;
import org.opends.server.core.ModifyOperation;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ChangeNumberGenerator;
@@ -42,19 +43,20 @@
import org.opends.server.replication.protocol.DeleteMsg;
import org.opends.server.replication.protocol.ModifyDNMsg;
import org.opends.server.replication.protocol.OperationContext;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.types.DN;
+import org.opends.server.types.Operation;
/**
*
* This class is used to store the list of remote changes received
- * from a replication server and taht are either currently being replayed
+ * from a replication server and that are either currently being replayed
* or that are waiting for being replayed.
*
- * It is used to know when the ServerState must be updated and to conpute
+ * It is used to know when the ServerState must be updated and to compute
* the dependencies between operations.
*
- * One of this object is instanciated for each ReplicationDomain.
+ * One of this object is instantiated for each ReplicationDomain.
*
*/
public class RemotePendingChanges
@@ -74,7 +76,7 @@
new TreeSet<PendingChange>();
/**
- * The ServerState that will be updated when UpdateMessage are fully replayed.
+ * The ServerState that will be updated when UpdateMsg are fully replayed.
*/
private ServerState state;
@@ -89,7 +91,7 @@
*
* @param changeNumberGenerator The ChangeNumberGenerator that should
* be adjusted when changes are received.
- * @param state The ServerState that will be updated when UpdateMessage
+ * @param state The ServerState that will be updated when UpdateMsg
* have been fully replayed.
*/
public RemotePendingChanges(ChangeNumberGenerator changeNumberGenerator,
@@ -100,13 +102,13 @@
}
/**
- * Add a new UpdateMessage that was received from the replication server
+ * Add a new UpdateMsg that was received from the replication server
* to the pendingList.
*
- * @param update The UpdateMessage that was received from the replication
+ * @param update The UpdateMsg that was received from the replication
* server and that will be added to the pending list.
*/
- public synchronized void putRemoteUpdate(UpdateMessage update)
+ public synchronized void putRemoteUpdate(UpdateMsg update)
{
ChangeNumber changeNumber = update.getChangeNumber();
changeNumberGenerator.adjust(changeNumber);
@@ -152,9 +154,9 @@
/**
* Get the first update in the list that have some dependencies cleared.
*
- * @return The UpdateMessage to be handled.
+ * @return The UpdateMsg to be handled.
*/
- public synchronized UpdateMessage getNextUpdate()
+ public synchronized UpdateMsg getNextUpdate()
{
/*
* Parse the list of Update with dependencies and check if the dependencies
@@ -214,7 +216,7 @@
{
if (pendingChange.getChangeNumber().older(changeNumber))
{
- UpdateMessage pendingMsg = pendingChange.getMsg();
+ UpdateMsg pendingMsg = pendingChange.getMsg();
if (pendingMsg != null)
{
if (pendingMsg instanceof DeleteMsg)
@@ -295,7 +297,7 @@
{
if (pendingChange.getChangeNumber().older(changeNumber))
{
- UpdateMessage pendingMsg = pendingChange.getMsg();
+ UpdateMsg pendingMsg = pendingChange.getMsg();
if (pendingMsg != null)
{
if (pendingMsg instanceof AddMsg)
@@ -347,7 +349,7 @@
{
if (pendingChange.getChangeNumber().older(changeNumber))
{
- UpdateMessage pendingMsg = pendingChange.getMsg();
+ UpdateMsg pendingMsg = pendingChange.getMsg();
if (pendingMsg != null)
{
if (pendingMsg instanceof DeleteMsg)
@@ -422,7 +424,7 @@
{
if (pendingChange.getChangeNumber().older(changeNumber))
{
- UpdateMessage pendingMsg = pendingChange.getMsg();
+ UpdateMsg pendingMsg = pendingChange.getMsg();
if (pendingMsg != null)
{
if (pendingMsg instanceof DeleteMsg)
@@ -468,4 +470,38 @@
}
return hasDependencies;
}
+
+ /**
+ * Check the dependencies of a given Operation/UpdateMsg.
+ *
+ * @param op The Operation for which dependencies must be checked.
+ * @param msg The Message for which dependencies must be checked.
+ * @return A boolean indicating if an operation cannot be replayed
+ * because of dependencies.
+ */
+ public boolean checkDependencies(Operation op, UpdateMsg msg)
+ {
+ if (op instanceof ModifyOperation)
+ {
+ ModifyOperation newOp = (ModifyOperation) op;
+ return checkDependencies(newOp);
+
+ } else if (op instanceof DeleteOperation)
+ {
+ DeleteOperation newOp = (DeleteOperation) op;
+ return checkDependencies(newOp);
+
+ } else if (op instanceof AddOperation)
+ {
+ AddOperation newOp = (AddOperation) op;
+ return checkDependencies(newOp);
+ } else if (op instanceof ModifyDNOperationBasis)
+ {
+ ModifyDNMsg newMsg = (ModifyDNMsg) msg;
+ return checkDependencies(newMsg);
+ } else
+ {
+ return true; // unknown type of operation ?!
+ }
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplayThread.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplayThread.java
index b24e5b5..8993a13 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplayThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplayThread.java
@@ -37,13 +37,13 @@
import org.opends.server.api.DirectoryThread;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
/**
* Thread that is used to get message from the replication servers (stored
* in the updates queue) and replay them in the current server. A configurable
* number of this thread is created for the whole MultimasterReplication object
- * (i.e: these threads are shared accross the ReplicationDomain objects for
+ * (i.e: these threads are shared across the ReplicationDomain objects for
* replaying the updates they receive)
*/
public class ReplayThread extends DirectoryThread
@@ -102,7 +102,7 @@
TimeUnit.SECONDS)) != null))
{
// Find replication domain for that update message
- UpdateMessage updateMsg = updateToreplay.getUpdateMessage();
+ UpdateMsg updateMsg = updateToreplay.getUpdateMessage();
ReplicationDomain domain = updateToreplay.getReplicationDomain();
domain.replay(updateMsg);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
index 31cd19f..27a09c7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
@@ -41,21 +41,26 @@
import java.net.Socket;
import java.net.SocketException;
import java.net.SocketTimeoutException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
+import java.util.List;
import java.util.TreeSet;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import org.opends.server.api.DirectoryThread;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchListener;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.RSInfo;
import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
@@ -82,7 +87,7 @@
private ProtocolSession session = null;
private final ServerState state;
private final DN baseDn;
- private final short serverID;
+ private final short serverId;
private int maxSendDelay;
private int maxReceiveDelay;
private int maxSendQueue;
@@ -96,9 +101,19 @@
private short protocolVersion;
private long generationId = -1;
private ReplSessionSecurity replSessionSecurity;
+ // My group id
+ private byte groupId = (byte) -1;
+ // The group id of the RS we are connected to
+ private byte rsGroupId = (byte) -1;
+ // The server id of the RS we are connected to
+ private short rsServerId = -1;
+ // The server URL of the RS we are connected to
+ private String rsServerUrl = null;
+ // Our replication domain
+ private ReplicationDomain replicationDomain = null;
// Trick for avoiding a inner class for many parameters return for
- // performHandshake method.
+ // performPhaseOneHandshake method.
private String tmpReadableServerName = null;
/**
* The time in milliseconds between heartbeats from the replication
@@ -124,15 +139,19 @@
private boolean connectionError = false;
private final Object connectPhaseLock = new Object();
+ // Same group id poller thread
+ private SameGroupIdPoller sameGroupIdPoller = null;
+
/**
* Creates a new ReplicationServer Broker for a particular ReplicationDomain.
*
+ * @param replicationDomain The replication domain that is creating us.
* @param state The ServerState that should be used by this broker
- * when negociating the session with the replicationServer.
+ * when negotiating the session with the replicationServer.
* @param baseDn The base DN that should be used by this broker
- * when negociating the session with the replicationServer.
- * @param serverID The server ID that should be used by this broker
- * when negociating the session with the replicationServer.
+ * when negotiating the session with the replicationServer.
+ * @param serverId The server ID that should be used by this broker
+ * when negotiating the session with the replicationServer.
* @param maxReceiveQueue The maximum size of the receive queue to use on
* the replicationServer.
* @param maxReceiveDelay The maximum replication delay to use on the
@@ -145,16 +164,19 @@
* replicationServer, or zero if no heartbeats are requested.
*
* @param generationId The generationId for the server associated to the
- * provided serverID and for the domain associated to the provided baseDN.
+ * provided serverId and for the domain associated to the provided baseDN.
* @param replSessionSecurity The session security configuration.
+ * @param groupId The group id of our domain.
*/
- public ReplicationBroker(ServerState state, DN baseDn, short serverID,
- int maxReceiveQueue, int maxReceiveDelay, int maxSendQueue,
- int maxSendDelay, int window, long heartbeatInterval,
- long generationId, ReplSessionSecurity replSessionSecurity)
+ public ReplicationBroker(ReplicationDomain replicationDomain,
+ ServerState state, DN baseDn, short serverId, int maxReceiveQueue,
+ int maxReceiveDelay, int maxSendQueue, int maxSendDelay, int window,
+ long heartbeatInterval, long generationId,
+ ReplSessionSecurity replSessionSecurity, byte groupId)
{
+ this.replicationDomain = replicationDomain;
this.baseDn = baseDn;
- this.serverID = serverID;
+ this.serverId = serverId;
this.maxReceiveDelay = maxReceiveDelay;
this.maxSendDelay = maxSendDelay;
this.maxReceiveQueue = maxReceiveQueue;
@@ -166,9 +188,10 @@
this.maxRcvWindow = window;
this.halfRcvWindow = window / 2;
this.heartbeatInterval = heartbeatInterval;
- this.protocolVersion = ProtocolVersion.currentVersion();
+ this.protocolVersion = ProtocolVersion.getCurrentVersion();
this.generationId = generationId;
this.replSessionSecurity = replSessionSecurity;
+ this.groupId = groupId;
}
/**
@@ -195,17 +218,125 @@
}
/**
+ * Gets the group id of the RS we are connected to.
+ * @return The group id of the RS we are connected to
+ */
+ public byte getRsGroupId()
+ {
+ return rsGroupId;
+ }
+
+ /**
+ * Gets the server id of the RS we are connected to.
+ * @return The server id of the RS we are connected to
+ */
+ public short getRsServerId()
+ {
+ return rsServerId;
+ }
+
+ /**
+ * Gets the server id.
+ * @return The server id
+ */
+ public short getServerId()
+ {
+ return serverId;
+ }
+
+ /**
+ * Gets the server url of the RS we are connected to.
+ * @return The server url of the RS we are connected to
+ */
+ public String getRsServerUrl()
+ {
+ return rsServerUrl;
+ }
+
+ /**
+ * Bag class for keeping info we get from a server in order to compute the
+ * best one to connect to.
+ */
+ public static class ServerInfo
+ {
+
+ private ServerState serverState = null;
+ private byte groupId = (byte) -1;
+
+ /**
+ * Constructor.
+ * @param serverState Server state of the RS
+ * @param groupId Group id of the RS
+ */
+ public ServerInfo(ServerState serverState, byte groupId)
+ {
+ this.serverState = serverState;
+ this.groupId = groupId;
+ }
+
+ /**
+ * Get the server state.
+ * @return The server state
+ */
+ public ServerState getServerState()
+ {
+ return serverState;
+ }
+
+ /**
+ * get the group id.
+ * @return The group id
+ */
+ public byte getGroupId()
+ {
+ return groupId;
+ }
+ }
+
+ /**
* Connect to a ReplicationServer.
*
+ * Handshake sequences between a DS and a RS is divided into 2 logical
+ * consecutive phases (phase 1 and phase 2). DS always initiates connection
+ * and always sends first message:
+ *
+ * DS<->RS:
+ * -------
+ *
+ * phase 1:
+ * DS --- ServerStartMsg ---> RS
+ * DS <--- ReplServerStartMsg --- RS
+ * phase 2:
+ * DS --- StartSessionMsg ---> RS
+ * DS <--- TopologyMsg --- RS
+ *
+ * Before performing a full handshake sequence, DS searches for best suitable
+ * RS by making only phase 1 handshake to every RS he knows then closing
+ * connection. This allows to gather information on available RSs and then
+ * decide with which RS the full handshake (phase 1 then phase 2) will be
+ * finally performed.
+ *
* @throws NumberFormatException address was invalid
*/
private void connect()
{
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
- // Stop any existing heartbeat monitor from a previous session.
+ // May have created a broker with null replication domain for
+ // unit test purpose.
+ if (replicationDomain != null)
+ {
+ // If a first connect or a connection failure occur, we go through here.
+ // force status machine to NOT_CONNECTED_STATUS so that monitoring can
+ // see that we are not connected.
+ replicationDomain.toNotConnectedStatus();
+ }
+
+ // Stop any existing poller and heartbeat monitor from a previous session.
+ stopSameGroupIdPoller();
stopHeartBeat();
+ boolean newServerWithSameGroupId = false;
synchronized (connectPhaseLock)
{
/*
@@ -215,130 +346,221 @@
for (String server : servers)
{
// Connect to server and get reply message
- ReplServerStartMessage replServerStartMsg =
- performHandshake(server, false);
- tmpReadableServerName = null; // Not needed now
+ ReplServerStartMsg replServerStartMsg =
+ performPhaseOneHandshake(server, false);
- // Store reply message in list
+ // Store reply message info in list
if (replServerStartMsg != null)
{
- ServerState rsState = replServerStartMsg.getServerState();
- rsStates.put(server, rsState);
+ ServerInfo serverInfo =
+ new ServerInfo(replServerStartMsg.getServerState(),
+ replServerStartMsg.getGroupId());
+ rsInfos.put(server, serverInfo);
}
} // for servers
- ReplServerStartMessage replServerStartMsg = null;
+ ReplServerStartMsg replServerStartMsg = null;
- if (rsStates.size() > 0)
+ if (rsInfos.size() > 0)
{
// At least one server answered, find the best one.
- String bestServer = computeBestReplicationServer(state, rsStates,
- serverID, baseDn);
+ String bestServer = computeBestReplicationServer(state, rsInfos,
+ serverId, baseDn, groupId);
- // Best found, now connect to this one
- replServerStartMsg = performHandshake(bestServer, true);
+ // Best found, now initialize connection to this one (handshake phase 1)
+ replServerStartMsg = performPhaseOneHandshake(bestServer, true);
- if (replServerStartMsg != null)
+ if (replServerStartMsg != null) // Handshake phase 1 exchange went well
+
{
- try
+ ServerInfo bestServerInfo = rsInfos.get(bestServer);
+
+ // Compute in which status we are starting the session to tell the RS
+ ServerStatus initStatus =
+ computeInitialServerStatus(replServerStartMsg.getGenerationId(),
+ bestServerInfo.getServerState(),
+ replServerStartMsg.getDegradedStatusThreshold(), generationId);
+
+ // Perfom session start (handshake phase 2)
+ TopologyMsg topologyMsg = performPhaseTwoHandshake(bestServer,
+ initStatus);
+
+ if (topologyMsg != null) // Handshake phase 2 exchange went well
+
{
- /*
- * We must not publish changes to a replicationServer that has not
- * seen all our previous changes because this could cause some
- * other ldap servers to miss those changes.
- * Check that the ReplicationServer has seen all our previous
- * changes.
- */
- ChangeNumber replServerMaxChangeNumber =
- replServerStartMsg.getServerState().getMaxChangeNumber(serverID);
-
- if (replServerMaxChangeNumber == null)
+ try
{
- replServerMaxChangeNumber = new ChangeNumber(0, 0, serverID);
- }
- ChangeNumber ourMaxChangeNumber =
- state.getMaxChangeNumber(serverID);
-
- if ((ourMaxChangeNumber != null) &&
- (!ourMaxChangeNumber.olderOrEqual(replServerMaxChangeNumber)))
- {
-
- // Replication server is missing some of our changes: let's send
- // them to him.
- replayOperations.clear();
-
- Message message = DEBUG_GOING_TO_SEARCH_FOR_CHANGES.get();
- logError(message);
-
/*
- * Get all the changes that have not been seen by this
- * replication server and populate the replayOperations
- * list.
+ * If we just connected to a RS with a different group id than us
+ * (because for instance a RS with our group id was unreachable
+ * while connecting to each RS) but the just received TopologyMsg
+ * shows that in the same time a RS with our group id connected,
+ * we must give up the connection to force reconnection that will
+ * certainly go back to a server with our group id as server with
+ * our group id have a greater priority for connection (in
+ * computeBestReplicationServer). In other words, we disconnect to
+ * connect to a server with our group id. If a server with our
+ * group id comes back later in the topology, we will be advised
+ * upon reception of a new TopologyMsg message and we will force
+ * reconnection at that time to retrieve a server with our group
+ * id.
*/
- InternalSearchOperation op = searchForChangedEntries(
- baseDn, replServerMaxChangeNumber, this);
- if (op.getResultCode() != ResultCode.SUCCESS)
+ byte tmpRsGroupId = bestServerInfo.getGroupId();
+ boolean someServersWithSameGroupId =
+ hasSomeServerWithSameGroupId(topologyMsg.getRsList());
+
+ // Really no other server with our group id ?
+ if ((tmpRsGroupId == groupId) ||
+ ((tmpRsGroupId != groupId) && !someServersWithSameGroupId))
{
/*
- * An error happened trying to search for the updates
- * This server will start acepting again new updates but
- * some inconsistencies will stay between servers.
- * Log an error for the repair tool
- * that will need to resynchronize the servers.
+ * We must not publish changes to a replicationServer that has
+ * not seen all our previous changes because this could cause
+ * some other ldap servers to miss those changes.
+ * Check that the ReplicationServer has seen all our previous
+ * changes.
*/
- message = ERR_CANNOT_RECOVER_CHANGES.get(
- baseDn.toNormalizedString());
- logError(message);
+ ChangeNumber replServerMaxChangeNumber =
+ replServerStartMsg.getServerState().
+ getMaxChangeNumber(serverId);
+
+ if (replServerMaxChangeNumber == null)
+ {
+ replServerMaxChangeNumber = new ChangeNumber(0, 0, serverId);
+ }
+ ChangeNumber ourMaxChangeNumber =
+ state.getMaxChangeNumber(serverId);
+
+ if ((ourMaxChangeNumber != null) &&
+ (!ourMaxChangeNumber.olderOrEqual(replServerMaxChangeNumber)))
+ {
+
+ // Replication server is missing some of our changes: let's
+ // send them to him.
+
+ Message message = DEBUG_GOING_TO_SEARCH_FOR_CHANGES.get();
+ logError(message);
+
+ /*
+ * Get all the changes that have not been seen by this
+ * replication server and populate the replayOperations
+ * list.
+ */
+ InternalSearchOperation op = searchForChangedEntries(
+ baseDn, replServerMaxChangeNumber, this);
+ if (op.getResultCode() != ResultCode.SUCCESS)
+ {
+ /*
+ * An error happened trying to search for the updates
+ * This server will start acepting again new updates but
+ * some inconsistencies will stay between servers.
+ * Log an error for the repair tool
+ * that will need to resynchronize the servers.
+ */
+ message = ERR_CANNOT_RECOVER_CHANGES.get(
+ baseDn.toNormalizedString());
+ logError(message);
+ } else
+ {
+ for (FakeOperation replayOp : replayOperations)
+ {
+ ChangeNumber cn = replayOp.getChangeNumber();
+ /*
+ * Because the entry returned by the search operation
+ * can contain old historical information, it is
+ * possible that some of the FakeOperation are
+ * actually older than the
+ * Only send the Operation if it was newer than
+ * the last ChangeNumber known by the Replication Server.
+ */
+ if (cn.newer(replServerMaxChangeNumber))
+ {
+ message =
+ DEBUG_SENDING_CHANGE.get(
+ replayOp.getChangeNumber().toString());
+ logError(message);
+ session.publish(replayOp.generateMessage());
+ }
+ }
+ message = DEBUG_CHANGES_SENT.get();
+ logError(message);
+ }
+ replayOperations.clear();
+ }
+
+ replicationServer = tmpReadableServerName;
+ maxSendWindow = replServerStartMsg.getWindowSize();
+ rsGroupId = replServerStartMsg.getGroupId();
+ rsServerId = replServerStartMsg.getServerId();
+ rsServerUrl = bestServer;
+
+ // May have created a broker with null replication domain for
+ // unit test purpose.
+ if (replicationDomain != null)
+ {
+ replicationDomain.setInitialStatus(initStatus);
+ replicationDomain.receiveTopo(topologyMsg);
+ }
+ connected = true;
+ if (getRsGroupId() != groupId)
+ {
+ // Connected to replication server with wrong group id:
+ // warn user and start poller to recover when a server with
+ // right group id arrives...
+ Message message =
+ WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID.get(
+ Byte.toString(groupId), Short.toString(rsServerId),
+ bestServer, Byte.toString(getRsGroupId()),
+ baseDn.toString(), Short.toString(serverId));
+ logError(message);
+ startSameGroupIdPoller();
+ }
+ startHeartBeat();
} else
{
- for (FakeOperation replayOp : replayOperations)
- {
- message = DEBUG_SENDING_CHANGE.get(replayOp.getChangeNumber().
- toString());
- logError(message);
- session.publish(replayOp.generateMessage());
- }
- message = DEBUG_CHANGES_SENT.get();
+ // Detected new RS with our group id: log disconnection to
+ // inform administrator
+ Message message = NOTE_NEW_SERVER_WITH_SAME_GROUP_ID.get(
+ Byte.toString(groupId), baseDn.toString(),
+ Short.toString(serverId));
logError(message);
+ // Do not log connection error
+ newServerWithSameGroupId = true;
}
- replayOperations.clear();
- }
-
- replicationServer = tmpReadableServerName;
- maxSendWindow = replServerStartMsg.getWindowSize();
- connected = true;
- startHeartBeat();
- } catch (IOException e)
- {
- Message message = ERR_PUBLISHING_FAKE_OPS.get(
- baseDn.toNormalizedString(), bestServer, e.getLocalizedMessage() +
- stackTraceToSingleLineString(e));
- logError(message);
- } catch (Exception e)
- {
- Message message = ERR_COMPUTING_FAKE_OPS.get(
- baseDn.toNormalizedString(), bestServer, e.getLocalizedMessage() +
- stackTraceToSingleLineString(e));
- logError(message);
- } finally
- {
- if (connected == false)
+ } catch (IOException e)
{
- if (session != null)
+ Message message = ERR_PUBLISHING_FAKE_OPS.get(
+ baseDn.toNormalizedString(), bestServer,
+ e.getLocalizedMessage() + stackTraceToSingleLineString(e));
+ logError(message);
+ } catch (Exception e)
+ {
+ Message message = ERR_COMPUTING_FAKE_OPS.get(
+ baseDn.toNormalizedString(), bestServer,
+ e.getLocalizedMessage() + stackTraceToSingleLineString(e));
+ logError(message);
+ } finally
+ {
+ if (connected == false)
{
- try
+ if (session != null)
{
- session.close();
- } catch (IOException e)
- {
- // The session was already closed, just ignore.
+ try
+ {
+ session.close();
+ } catch (IOException e)
+ {
+ // The session was already closed, just ignore.
+ }
+ session = null;
}
- session = null;
}
}
- }
- } // Could perform handshake with best
+ } // Could perform handshake phase 2 with best
+
+ } // Could perform handshake phase 1 with best
+
} // Reached some servers
if (connected)
@@ -361,7 +583,9 @@
Message message =
NOTE_NOW_FOUND_SAME_GENERATION_CHANGELOG.get(
baseDn.toString(),
+ Short.toString(rsServerId),
replicationServer,
+ Short.toString(serverId),
Long.toString(this.generationId));
logError(message);
} else
@@ -380,7 +604,7 @@
* This server could not find any replicationServer. It's going to start
* in degraded mode. Log a message.
*/
- if (!connectionError)
+ if (!connectionError && !newServerWithSameGroupId)
{
connectionError = true;
connectPhaseLock.notify();
@@ -393,23 +617,110 @@
}
/**
- * Connect to the provided server performing the handshake (start messages
- * exchange) and return the reply message from the replication server.
+ * Has the passed RS info list some servers with our group id ?
+ * @return true if at least one server has the same group id
+ */
+ private boolean hasSomeServerWithSameGroupId(List<RSInfo> rsInfos)
+ {
+ for (RSInfo rsInfo : rsInfos)
+ {
+ if (rsInfo.getGroupId() == this.groupId)
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Determines the status we are starting with according to our state and the
+ * RS state.
+ *
+ * @param rsGenId The generation id of the RS
+ * @param rsState The server state of the RS
+ * @param degradedStatusThreshold The degraded status threshold of the RS
+ * @param dsGenId The local generation id
+ * @return The initial status
+ */
+ public ServerStatus computeInitialServerStatus(long rsGenId,
+ ServerState rsState, int degradedStatusThreshold, long dsGenId)
+ {
+ if (rsGenId == -1)
+ {
+ // RS has no generation id
+ return ServerStatus.NORMAL_STATUS;
+ } else
+ {
+ if (rsGenId == dsGenId)
+ {
+ // DS and RS have same generation id
+
+ // Determine if we are late or not to replay changes. RS uses a
+ // threshold value for pending changes to be replayed by a DS to
+ // determine if the DS is in normal status or in degraded status.
+ // Let's compare the local and remote server state using this threshold
+ // value to determine if we are late or not
+
+ ServerStatus initStatus = ServerStatus.INVALID_STATUS;
+ int nChanges = ServerState.diffChanges(rsState, state);
+
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("RB for dn " + baseDn.toNormalizedString() +
+ " and with server id " + Short.toString(serverId) + " computed " +
+ Integer.toString(nChanges) + " changes late.");
+ }
+
+ // Check status to know if it is relevant to change the status. Do not
+ // take RSD lock to test. If we attempt to change the status whereas
+ // we are in a status that do not allows that, this will be noticed by
+ // the changeStatusFromStatusAnalyzer method. This allows to take the
+ // lock roughly only when needed versus every sleep time timeout.
+ if (degradedStatusThreshold > 0)
+ {
+ if (nChanges >= degradedStatusThreshold)
+ {
+ initStatus = ServerStatus.DEGRADED_STATUS;
+ } else
+ {
+ initStatus = ServerStatus.NORMAL_STATUS;
+ }
+ } else
+ {
+ // 0 threshold value means no degrading system used (no threshold):
+ // force normal status
+ initStatus = ServerStatus.NORMAL_STATUS;
+ }
+
+ return initStatus;
+ } else
+ {
+ // DS and RS do not have same generation id
+ return ServerStatus.BAD_GEN_ID_STATUS;
+ }
+ }
+ }
+
+ /**
+ * Connect to the provided server performing the first phase handshake
+ * (start messages exchange) and return the reply message from the replication
+ * server.
*
* @param server Server to connect to.
* @param keepConnection Do we keep session opened or not after handshake.
- * @return The ReplServerStartMessage the server replied. Null if could not
+ * Use true if want to perform handshake phase 2 with the same session
+ * and keep the session to create as the current one.
+ * @return The ReplServerStartMsg the server replied. Null if could not
* get an answer.
*/
- public ReplServerStartMessage performHandshake(String server,
+ private ReplServerStartMsg performPhaseOneHandshake(String server,
boolean keepConnection)
{
- ReplServerStartMessage replServerStartMsg = null;
+ ReplServerStartMsg replServerStartMsg = null;
// Parse server string.
int separator = server.lastIndexOf(':');
String port = server.substring(separator + 1);
String hostname = server.substring(0, separator);
+ ProtocolSession localSession = null;
boolean error = false;
try
@@ -420,41 +731,60 @@
int intPort = Integer.parseInt(port);
InetSocketAddress serverAddr = new InetSocketAddress(
InetAddress.getByName(hostname), intPort);
- tmpReadableServerName = serverAddr.toString();
+ if (keepConnection)
+ tmpReadableServerName = serverAddr.toString();
Socket socket = new Socket();
socket.setReceiveBufferSize(1000000);
socket.setTcpNoDelay(true);
socket.connect(serverAddr, 500);
- session = replSessionSecurity.createClientSession(server, socket);
+ localSession = replSessionSecurity.createClientSession(server, socket,
+ ReplSessionSecurity.HANDSHAKE_TIMEOUT);
boolean isSslEncryption =
replSessionSecurity.isSslEncryption(server);
/*
- * Send our ServerStartMessage.
+ * Send our ServerStartMsg.
*/
- ServerStartMessage msg = new ServerStartMessage(serverID, baseDn,
+ ServerStartMsg serverStartMsg = new ServerStartMsg(serverId, baseDn,
maxReceiveDelay, maxReceiveQueue, maxSendDelay, maxSendQueue,
halfRcvWindow * 2, heartbeatInterval, state,
- protocolVersion, generationId, isSslEncryption, !keepConnection);
- session.publish(msg);
+ ProtocolVersion.getCurrentVersion(), generationId, isSslEncryption,
+ groupId);
+ localSession.publish(serverStartMsg);
/*
- * Read the ReplServerStartMessage that should come back.
+ * Read the ReplServerStartMsg that should come back.
*/
- session.setSoTimeout(1000);
- replServerStartMsg = (ReplServerStartMessage) session.receive();
+ replServerStartMsg = (ReplServerStartMsg) localSession.receive();
+
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("In RB for " + baseDn +
+ "\nRB HANDSHAKE SENT:\n" + serverStartMsg.toString() +
+ "\nAND RECEIVED:\n" + replServerStartMsg.toString());
+ }
+
+ // Sanity check
+ DN repDn = replServerStartMsg.getBaseDn();
+ if (!(this.baseDn.equals(repDn)))
+ {
+ Message message = ERR_DS_DN_DOES_NOT_MATCH.get(repDn.toString(),
+ this.baseDn.toString());
+ logError(message);
+ error = true;
+ }
/*
* We have sent our own protocol version to the replication server.
* The replication server will use the same one (or an older one
* if it is an old replication server).
*/
- protocolVersion = ProtocolVersion.minWithCurrent(
- replServerStartMsg.getVersion());
- session.setSoTimeout(timeout);
+ if (keepConnection)
+ protocolVersion = ProtocolVersion.minWithCurrent(
+ replServerStartMsg.getVersion());
if (!isSslEncryption)
{
- session.stopEncryption();
+ localSession.stopEncryption();
}
} catch (ConnectException e)
{
@@ -464,61 +794,211 @@
*/
if (!connectionError)
{
- // the error message is only logged once to avoid overflowing
- // the error log
Message message = NOTE_NO_CHANGELOG_SERVER_LISTENING.get(server);
- logError(message);
+ if (keepConnection) // Log error message only for final connection
+ {
+ // the error message is only logged once to avoid overflowing
+ // the error log
+ logError(message);
+ } else if (debugEnabled())
+ {
+ TRACER.debugInfo(message.toString());
+ }
}
error = true;
} catch (Exception e)
{
- Message message = ERR_EXCEPTION_STARTING_SESSION.get(
+ if ( (e instanceof SocketTimeoutException) && debugEnabled() )
+ {
+ TRACER.debugInfo("Timeout trying to connect to RS " + server +
+ " for dn: " + baseDn.toNormalizedString());
+ }
+ Message message = ERR_EXCEPTION_STARTING_SESSION_PHASE.get("1",
baseDn.toNormalizedString(), server, e.getLocalizedMessage() +
stackTraceToSingleLineString(e));
- logError(message);
+ if (keepConnection) // Log error message only for final connection
+ {
+ logError(message);
+ } else if (debugEnabled())
+ {
+ TRACER.debugInfo(message.toString());
+ }
error = true;
}
// Close session if requested
if (!keepConnection || error)
{
- if (session != null)
+ if (localSession != null)
{
try
{
- session.close();
+ localSession.close();
} catch (IOException e)
{
- // The session was already closed, just ignore.
+ // The session was already closed, just ignore.
}
- session = null;
+ localSession = null;
}
if (error)
{
replServerStartMsg = null;
} // Be sure to return null.
+
+ }
+
+ // If this connection as the one to use for sending and receiving updates,
+ // store it.
+ if (keepConnection)
+ {
+ session = localSession;
}
return replServerStartMsg;
}
/**
+ * Performs the second phase handshake (send StartSessionMsg and receive
+ * TopologyMsg messages exchange) and return the reply message from the
+ * replication server.
+ *
+ * @param server Server we are connecting with.
+ * @param initStatus The status we are starting with
+ * @return The ReplServerStartMsg the server replied. Null if could not
+ * get an answer.
+ */
+ private TopologyMsg performPhaseTwoHandshake(String server,
+ ServerStatus initStatus)
+ {
+ TopologyMsg topologyMsg = null;
+
+ try
+ {
+ /*
+ * Send our StartSessionMsg.
+ */
+ StartSessionMsg startSessionMsg = null;
+ // May have created a broker with null replication domain for
+ // unit test purpose.
+ if (replicationDomain != null)
+ {
+ startSessionMsg = new StartSessionMsg(initStatus,
+ replicationDomain.getRefUrls(),
+ replicationDomain.isAssured(),
+ replicationDomain.getAssuredMode(),
+ replicationDomain.getAssuredSdLevel());
+ } else
+ {
+ startSessionMsg =
+ new StartSessionMsg(initStatus, new ArrayList<String>());
+ }
+ session.publish(startSessionMsg);
+
+ /*
+ * Read the TopologyMsg that should come back.
+ */
+ topologyMsg = (TopologyMsg) session.receive();
+
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("In RB for " + baseDn +
+ "\nRB HANDSHAKE SENT:\n" + startSessionMsg.toString() +
+ "\nAND RECEIVED:\n" + topologyMsg.toString());
+ }
+
+ // Alright set the timeout to the desired value
+ session.setSoTimeout(timeout);
+
+ } catch (Exception e)
+ {
+ Message message = ERR_EXCEPTION_STARTING_SESSION_PHASE.get("2",
+ baseDn.toNormalizedString(), server, e.getLocalizedMessage() +
+ stackTraceToSingleLineString(e));
+ logError(message);
+
+ if (session != null)
+ {
+ try
+ {
+ session.close();
+ } catch (IOException ex)
+ {
+ // The session was already closed, just ignore.
+ }
+ session = null;
+ }
+ // Be sure to return null.
+ topologyMsg = null;
+ }
+ return topologyMsg;
+ }
+
+ /**
+ * Returns the replication server that best fits our need so that we can
+ * connect to it.
+ * This methods performs some filtering on the group id, then call
+ * the real search for best server algorithm (searchForBestReplicationServer).
+ *
+ * Note: this method put as public static for unit testing purpose.
+ *
+ * @param myState The local server state.
+ * @param rsInfos The list of available replication servers and their
+ * associated information (choice will be made among them).
+ * @param serverId The server id for the suffix we are working for.
+ * @param baseDn The suffix for which we are working for.
+ * @param groupId The groupId we prefer being connected to if possible
+ * @return The computed best replication server.
+ */
+ public static String computeBestReplicationServer(ServerState myState,
+ HashMap<String, ServerInfo> rsInfos, short serverId, DN baseDn,
+ byte groupId)
+ {
+ /*
+ * Preference is given to servers with the requested group id:
+ * If there are some servers with the requested group id in the provided
+ * server list, then we run the search algorithm only on them. If no server
+ * with the requested group id, consider all of them.
+ */
+
+ // Filter for servers with same group id
+ HashMap<String, ServerInfo> sameGroupIdRsInfos =
+ new HashMap<String, ServerInfo>();
+
+ for (String repServer : rsInfos.keySet())
+ {
+ ServerInfo serverInfo = rsInfos.get(repServer);
+ if (serverInfo.getGroupId() == groupId)
+ sameGroupIdRsInfos.put(repServer, serverInfo);
+ }
+
+ // Some servers with same group id ?
+ if (sameGroupIdRsInfos.size() > 0)
+ {
+ return searchForBestReplicationServer(myState, sameGroupIdRsInfos,
+ serverId, baseDn);
+ } else
+ {
+ return searchForBestReplicationServer(myState, rsInfos,
+ serverId, baseDn);
+ }
+ }
+
+ /**
* Returns the replication server that best fits our need so that we can
* connect to it.
*
* Note: this method put as public static for unit testing purpose.
*
* @param myState The local server state.
- * @param rsStates The list of available replication servers and their
- * associated server state.
+ * @param rsInfos The list of available replication servers and their
+ * associated information (choice will be made among them).
* @param serverId The server id for the suffix we are working for.
* @param baseDn The suffix for which we are working for.
* @return The computed best replication server.
*/
- public static String computeBestReplicationServer(ServerState myState,
- HashMap<String, ServerState> rsStates, short serverId, DN baseDn)
+ private static String searchForBestReplicationServer(ServerState myState,
+ HashMap<String, ServerInfo> rsInfos, short serverId, DN baseDn)
{
-
/*
* Find replication servers who are up to date (or more up to date than us,
* if for instance we failed and restarted, having sent some changes to the
@@ -531,12 +1011,19 @@
*/
// Should never happen (sanity check)
- if ((myState == null) || (rsStates == null) || (rsStates.size() < 1) ||
+ if ((myState == null) || (rsInfos == null) || (rsInfos.size() < 1) ||
(baseDn == null))
{
return null;
}
+ // Shortcut, if only one server, this is the best
+ if (rsInfos.size() == 1)
+ {
+ for (String repServer : rsInfos.keySet())
+ return repServer;
+ }
+
String bestServer = null;
// Servers up to dates with regard to our changes
HashMap<String, ServerState> upToDateServers =
@@ -552,10 +1039,10 @@
{
myChangeNumber = new ChangeNumber(0, 0, serverId);
}
- for (String repServer : rsStates.keySet())
+ for (String repServer : rsInfos.keySet())
{
- ServerState rsState = rsStates.get(repServer);
+ ServerState rsState = rsInfos.get(repServer).getServerState();
ChangeNumber rsChangeNumber = rsState.getMaxChangeNumber(serverId);
if (rsChangeNumber == null)
{
@@ -586,7 +1073,8 @@
Message message = NOTE_FOUND_CHANGELOGS_WITH_MY_CHANGES.get(
upToDateServers.size(),
- baseDn.toNormalizedString());
+ baseDn.toNormalizedString(),
+ Short.toString(serverId));
logError(message);
/*
@@ -652,7 +1140,7 @@
if ((minShift < 0) // First time in loop
|| (shift < minShift))
{
- // This sever is even closer to topo state
+ // This server is even closer to topo state
bestServer = upServer;
minShift = shift;
}
@@ -696,6 +1184,7 @@
minShift = tmpShift;
}
} // For late servers
+
}
return bestServer;
}
@@ -732,6 +1221,7 @@
LinkedHashSet<String> attrs = new LinkedHashSet<String>(1);
attrs.add(Historical.HISTORICALATTRIBUTENAME);
attrs.add(Historical.ENTRYUIDNAME);
+ attrs.add("*");
return conn.processSearch(
new ASN1OctetString(baseDn.toString()),
SearchScope.WHOLE_SUBTREE,
@@ -750,14 +1240,37 @@
if (heartbeatInterval > 0)
{
heartbeatMonitor =
- new HeartbeatMonitor("Replication Heartbeat Monitor on " +
- baseDn + " with " + getReplicationServer(),
+ new HeartbeatMonitor("Replication Heartbeat Monitor on RS " +
+ getReplicationServer() + " " + rsServerId + " for " + baseDn +
+ " in DS " + serverId,
session, heartbeatInterval);
heartbeatMonitor.start();
}
}
/**
+ * Starts the same group id poller.
+ */
+ private void startSameGroupIdPoller()
+ {
+ sameGroupIdPoller = new SameGroupIdPoller();
+ sameGroupIdPoller.start();
+ }
+
+ /**
+ * Stops the same group id poller.
+ */
+ private void stopSameGroupIdPoller()
+ {
+ if (sameGroupIdPoller != null)
+ {
+ sameGroupIdPoller.shutdown();
+ sameGroupIdPoller.waitForShutdown();
+ sameGroupIdPoller = null;
+ }
+ }
+
+ /**
* Stop the heartbeat monitor thread.
*/
void stopHeartBeat()
@@ -793,12 +1306,15 @@
}
} catch (IOException e1)
{
- // ignore
+ // ignore
}
if (failingSession == session)
{
this.connected = false;
+ rsGroupId = (byte) -1;
+ rsServerId = -1;
+ rsServerUrl = null;
}
while (!this.connected && (!this.shutdown))
{
@@ -820,7 +1336,7 @@
Thread.sleep(500);
} catch (InterruptedException e)
{
- // ignore
+ // ignore
}
}
}
@@ -830,7 +1346,7 @@
* Publish a message to the other servers.
* @param msg the message to publish
*/
- public void publish(ReplicationMessage msg)
+ public void publish(ReplicationMsg msg)
{
boolean done = false;
@@ -840,14 +1356,14 @@
{
// It was not possible to connect to any replication server.
// Since the operation was already processed, we have no other
- // choice than to return without sending the ReplicationMessage
+ // choice than to return without sending the ReplicationMsg
// and relying on the resend procedure of the connect phase to
// fix the problem when we finally connect.
if (debugEnabled())
{
debugInfo("ReplicationBroker.publish() Publishing a " +
- " message is not possible due to existing connection error.");
+ "message is not possible due to existing connection error.");
}
return;
@@ -871,7 +1387,7 @@
currentWindowSemaphore = sendWindow;
}
- if (msg instanceof UpdateMessage)
+ if (msg instanceof UpdateMsg)
{
// Acquiring the window credit must be done outside of the
// connectPhaseLock because it can be blocking and we don't
@@ -900,10 +1416,10 @@
if (!credit)
{
// the window is still closed.
- // Send a WindowProbe message to wakeup the receiver in case the
+ // Send a WindowProbeMsg message to wakeup the receiver in case the
// window update message was lost somehow...
// then loop to check again if connection was closed.
- session.publish(new WindowProbe());
+ session.publish(new WindowProbeMsg());
}
} catch (IOException e)
{
@@ -946,7 +1462,7 @@
* @throws SocketTimeoutException if the timeout set by setSoTimeout
* has expired
*/
- public ReplicationMessage receive() throws SocketTimeoutException
+ public ReplicationMsg receive() throws SocketTimeoutException
{
while (shutdown == false)
{
@@ -958,13 +1474,12 @@
ProtocolSession failingSession = session;
try
{
- ReplicationMessage msg = session.receive();
- if (msg instanceof WindowMessage)
+ ReplicationMsg msg = session.receive();
+ if (msg instanceof WindowMsg)
{
- WindowMessage windowMsg = (WindowMessage) msg;
+ WindowMsg windowMsg = (WindowMsg) msg;
sendWindow.release(windowMsg.getNumAck());
- }
- else
+ } else
{
return msg;
}
@@ -976,11 +1491,13 @@
if (shutdown == false)
{
Message message =
- NOTE_DISCONNECTED_FROM_CHANGELOG.get(replicationServer);
+ NOTE_DISCONNECTED_FROM_CHANGELOG.get(replicationServer,
+ Short.toString(rsServerId), baseDn.toString(),
+ Short.toString(serverId));
logError(message);
debugInfo("ReplicationBroker.receive() " + baseDn +
- " Exception raised." + e + e.getLocalizedMessage());
+ " Exception raised: " + e.getLocalizedMessage());
this.reStart(failingSession);
}
}
@@ -1002,7 +1519,7 @@
rcvWindow--;
if ((rcvWindow < halfRcvWindow) && (session != null))
{
- session.publish(new WindowMessage(halfRcvWindow));
+ session.publish(new WindowMsg(halfRcvWindow));
rcvWindow += halfRcvWindow;
}
} catch (IOException e)
@@ -1017,18 +1534,22 @@
*/
public void stop()
{
+ if (debugEnabled())
+ {
+ debugInfo("ReplicationBroker " + serverId + " is stopping and will" +
+ " close the connection to replication server " + rsServerId + " for"
+ + " domain " + baseDn);
+ }
+ stopSameGroupIdPoller();
stopHeartBeat();
replicationServer = "stopped";
shutdown = true;
connected = false;
+ rsGroupId = (byte) -1;
+ rsServerId = -1;
+ rsServerUrl = null;
try
{
- if (debugEnabled())
- {
- debugInfo("ReplicationBroker is stopping. and will" +
- " close the connection");
- }
-
if (session != null)
{
session.close();
@@ -1043,7 +1564,7 @@
* With this option set to a non-zero value, calls to the receive() method
* block for only this amount of time after which a
* java.net.SocketTimeoutException is raised.
- * The Broker is valid and useable even after such an Exception is raised.
+ * The Broker is valid and usable even after such an Exception is raised.
*
* @param timeout the specified timeout, in milliseconds.
* @throws SocketException if there is an error in the underlying protocol,
@@ -1092,13 +1613,12 @@
SearchResultEntry searchEntry)
{
/*
- * Only deal with modify operation so far
- * TODO : implement code for ADD, DEL, MODDN operation
- *
- * Parse all ds-sync-hist attribute values
- * - for each Changenumber > replication server MaxChangeNumber :
- * build an attribute mod
- *
+ * This call back is called at session establishment phase
+ * for each entry that has been changed by this server and the changes
+ * have not been sent to any Replication Server.
+ * The role of this method is to build equivalent operation from
+ * the historical information and add them in the replayOperations
+ * table.
*/
Iterable<FakeOperation> updates =
Historical.generateFakeOperations(searchEntry);
@@ -1115,7 +1635,7 @@
InternalSearchOperation searchOperation,
SearchResultReference searchReference)
{
- // TODO to be implemented
+ // TODO to be implemented
}
/**
@@ -1218,7 +1738,7 @@
*/
public boolean isConnected()
{
- return !connectionError;
+ return connected;
}
private boolean debugEnabled()
@@ -1245,4 +1765,161 @@
}
return isEncrypted;
}
+
+ /**
+ * In case we are connected to a RS with a different group id, we use this
+ * thread to poll presence of a RS with the same group id as ours. If a RS
+ * with the same group id is available, we close the session to force
+ * reconnection. Reconnection will choose a server with the same group id.
+ */
+ private class SameGroupIdPoller extends DirectoryThread
+ {
+
+ private boolean sameGroupIdPollershutdown = false;
+ private boolean terminated = false;
+ // Sleep interval in ms
+ private static final int SAME_GROUP_ID_POLLER_PERIOD = 5000;
+
+ public SameGroupIdPoller()
+ {
+ super("Replication Broker Same Group Id Poller for " + baseDn.toString() +
+ " and group id " + groupId + " in server id " + serverId);
+ }
+
+ /**
+ * Wait for the completion of the same group id poller.
+ */
+ public void waitForShutdown()
+ {
+ try
+ {
+ while (terminated == false)
+ {
+ Thread.sleep(50);
+ }
+ } catch (InterruptedException e)
+ {
+ // exit the loop if this thread is interrupted.
+ }
+ }
+
+ /**
+ * Shutdown the same group id poller.
+ */
+ public void shutdown()
+ {
+ sameGroupIdPollershutdown = true;
+ }
+
+ /**
+ * Permanently look for RS with our group id and if found, break current
+ * connection to force reconnection to a new server with the right group id.
+ */
+ @Override
+ public void run()
+ {
+ boolean done = false;
+
+ while ((!done) && (!sameGroupIdPollershutdown))
+ {
+ // Sleep some time between checks
+ try
+ {
+ Thread.sleep(SAME_GROUP_ID_POLLER_PERIOD);
+ } catch (InterruptedException e)
+ {
+ // Stop as we are interrupted
+ sameGroupIdPollershutdown = true;
+ }
+ synchronized (connectPhaseLock)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("Running SameGroupIdPoller for: " +
+ baseDn.toString());
+ }
+ if (session != null) // Check only if not already disconnected
+
+ {
+ for (String server : servers)
+ {
+ // Do not ask the RS we are connected to as it has for sure the
+ // wrong group id
+ if (server.equals(rsServerUrl))
+ continue;
+
+ // Connect to server and get reply message
+ ReplServerStartMsg replServerStartMsg =
+ performPhaseOneHandshake(server, false);
+
+ // Store reply message info in list
+ if (replServerStartMsg != null)
+ {
+ if (groupId == replServerStartMsg.getGroupId())
+ {
+ // Found one server with the same group id as us, disconnect
+ // session to force reconnection to a server with same group
+ // id.
+ Message message = NOTE_NEW_SERVER_WITH_SAME_GROUP_ID.get(
+ Byte.toString(groupId), baseDn.toString(),
+ Short.toString(serverId));
+ logError(message);
+ try
+ {
+ session.close();
+ } catch (Exception e)
+ {
+ // The session was already closed, just ignore.
+ }
+ session = null;
+ done = true; // Terminates thread as did its job.
+
+ break;
+ }
+ }
+ } // for server
+
+ }
+ }
+ }
+
+ terminated = true;
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("SameGroupIdPoller for: " + baseDn.toString() +
+ " terminated.");
+ }
+ }
+ }
+
+ /**
+ * Signals the RS we just entered a new status.
+ * @param newStatus The status the local DS just entered
+ */
+ public void signalStatusChange(ServerStatus newStatus)
+ {
+ try
+ {
+
+ ChangeStatusMsg csMsg = new ChangeStatusMsg(ServerStatus.INVALID_STATUS,
+ newStatus);
+ session.publish(csMsg);
+ } catch (IOException ex)
+ {
+ Message message = ERR_EXCEPTION_SENDING_CS.get(
+ baseDn.toNormalizedString(),
+ Short.toString(serverId),
+ ex.getLocalizedMessage() + stackTraceToSingleLineString(ex));
+ logError(message);
+ }
+ }
+
+ /**
+ * Sets the group id of the broker.
+ * @param groupId The new group id.
+ */
+ public void setGroupId(byte groupId)
+ {
+ this.groupId = groupId;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index fb7b9ee..ed583c6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -36,6 +36,7 @@
import static org.opends.server.util.StaticUtils.createEntry;
import static org.opends.server.util.StaticUtils.getFileForPath;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
+import static org.opends.server.replication.common.StatusMachine.*;
import java.io.File;
import java.io.IOException;
@@ -50,10 +51,10 @@
import java.util.List;
import java.util.NoSuchElementException;
import java.util.SortedMap;
+import java.util.SortedSet;
import java.util.TreeMap;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.zip.Adler32;
import java.util.zip.CheckedOutputStream;
import java.util.zip.DataFormatException;
@@ -85,31 +86,42 @@
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.protocols.ldap.LDAPModification;
+import org.opends.server.replication.common.AssuredMode;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.common.DSInfo;
+import org.opends.server.replication.common.RSInfo;
import org.opends.server.replication.common.ServerState;
-import org.opends.server.replication.protocol.AckMessage;
+import org.opends.server.replication.common.ServerStatus;
+import org.opends.server.replication.common.StatusMachine;
+import org.opends.server.replication.common.StatusMachineEvent;
+import org.opends.server.replication.protocol.AckMsg;
import org.opends.server.replication.protocol.AddContext;
import org.opends.server.replication.protocol.AddMsg;
+import org.opends.server.replication.protocol.ChangeStatusMsg;
import org.opends.server.replication.protocol.DeleteContext;
-import org.opends.server.replication.protocol.DoneMessage;
-import org.opends.server.replication.protocol.EntryMessage;
-import org.opends.server.replication.protocol.ErrorMessage;
-import org.opends.server.replication.protocol.HeartbeatMessage;
-import org.opends.server.replication.protocol.InitializeRequestMessage;
-import org.opends.server.replication.protocol.InitializeTargetMessage;
+import org.opends.server.replication.protocol.DoneMsg;
+import org.opends.server.replication.protocol.EntryMsg;
+import org.opends.server.replication.protocol.ErrorMsg;
+import org.opends.server.replication.protocol.HeartbeatMsg;
+import org.opends.server.replication.protocol.InitializeRequestMsg;
+import org.opends.server.replication.protocol.InitializeTargetMsg;
import org.opends.server.replication.protocol.ModifyContext;
import org.opends.server.replication.protocol.ModifyDNMsg;
import org.opends.server.replication.protocol.ModifyDnContext;
+import org.opends.server.replication.protocol.ModifyMsg;
import org.opends.server.replication.protocol.OperationContext;
import org.opends.server.replication.protocol.ReplSessionSecurity;
-import org.opends.server.replication.protocol.ReplicationMessage;
-import org.opends.server.replication.protocol.ResetGenerationId;
-import org.opends.server.replication.protocol.RoutableMessage;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.ReplicationMsg;
+import org.opends.server.replication.protocol.ResetGenerationIdMsg;
+import org.opends.server.replication.protocol.RoutableMsg;
+import org.opends.server.replication.protocol.TopologyMsg;
+import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.tasks.InitializeTargetTask;
import org.opends.server.tasks.InitializeTask;
import org.opends.server.tasks.TaskUtils;
+import org.opends.server.types.AttributeBuilder;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ExistingFileBehavior;
import org.opends.server.types.AbstractOperation;
import org.opends.server.types.Attribute;
@@ -183,8 +195,8 @@
// The update to replay message queue where the listener thread is going to
// push incoming update messages.
private LinkedBlockingQueue<UpdateToReplay> updateToReplayQueue;
- private SortedMap<ChangeNumber, UpdateMessage> waitingAckMsgs =
- new TreeMap<ChangeNumber, UpdateMessage>();
+ private SortedMap<ChangeNumber, UpdateMsg> waitingAckMsgs =
+ new TreeMap<ChangeNumber, UpdateMsg>();
private AtomicInteger numRcvdUpdates = new AtomicInteger(0);
private AtomicInteger numSentUpdates = new AtomicInteger(0);
private AtomicInteger numProcessedUpdates = new AtomicInteger();
@@ -208,7 +220,7 @@
/**
* This object is used to store the list of update currently being
* done on the local database.
- * Is is usefull to make sure that the local operations are sent in a
+ * Is is useful to make sure that the local operations are sent in a
* correct order to the replication server and that the ServerState
* is not updated too early.
*/
@@ -217,8 +229,8 @@
/**
* It contain the updates that were done on other servers, transmitted
* by the replication server and that are currently replayed.
- * It is usefull to make sure that dependencies between operations
- * are correctly fullfilled and to to make sure that the ServerState is
+ * It is useful to make sure that dependencies between operations
+ * are correctly fulfilled and to to make sure that the ServerState is
* not updated too early.
*/
private RemotePendingChanges remotePendingChanges;
@@ -228,7 +240,7 @@
* server. Zero means heartbeats are off.
*/
private long heartbeatInterval = 0;
- short serverId;
+ private short serverId;
// The context related to an import or export being processed
// Null when none is being processed.
@@ -236,7 +248,7 @@
private Collection<String> replicationServers;
- private DN baseDN;
+ private DN baseDn;
private boolean shutdown = false;
@@ -250,12 +262,42 @@
private int window = 100;
+ /*
+ * Assured mode properties
+ */
+ // Is assured mode enabled or not for this domain ?
+ private boolean assured = false;
+ // Assured sub mode (used when assured is true)
+ private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
+ // Safe Data level (used when assuredMode is SAFE_DATA)
+ private byte assuredSdLevel = (byte)1;
+ // Timeout (in milliseconds) when waiting for acknowledgments
+ private long assuredTimeout = 1000;
+
+ // Group id
+ private byte groupId = (byte)1;
+ // Referrals urls to be published to other servers of the topology
+ // TODO: fill that with all currently opened urls if no urls configured
+ private List<String> refUrls = new ArrayList<String>();
+
+ // Current status for this replicated domain
+ private ServerStatus status = ServerStatus.NOT_CONNECTED_STATUS;
+
+ /*
+ * Properties for the last topology info received from the network.
+ */
+ // Info for other DSs.
+ // Warning: does not contain info for us (for our server id)
+ private List<DSInfo> dsList = new ArrayList<DSInfo>();
+ // Info for other RSs.
+ private List<RSInfo> rsList = new ArrayList<RSInfo>();
+
/**
* The isolation policy that this domain is going to use.
* This field describes the behavior of the domain when an update is
* attempted and the domain could not connect to any Replication Server.
* Possible values are accept-updates or deny-updates, but other values
- * may be added in the futur.
+ * may be added in the future.
*/
private IsolationPolicy isolationpolicy;
@@ -281,9 +323,9 @@
// The input stream for the import
ReplLDIFInputStream ldifImportInputStream = null;
// The target in the case of an export
- short exportTarget = RoutableMessage.UNKNOWN_SERVER;
+ short exportTarget = RoutableMsg.UNKNOWN_SERVER;
// The source in the case of an import
- short importSource = RoutableMessage.UNKNOWN_SERVER;
+ short importSource = RoutableMsg.UNKNOWN_SERVER;
// The total entry count expected to be processed
long entryCount = 0;
@@ -295,7 +337,9 @@
/**
* Initializes the import/export counters with the provider value.
- * @param count The value with which to initialize the counters.
+ * @param total
+ * @param left
+ * @throws DirectoryException
*/
public void setCounters(long total, long left)
throws DirectoryException
@@ -321,6 +365,7 @@
/**
* Update the counters of the task for each entry processed during
* an import or export.
+ * @throws DirectoryException
*/
public void updateCounters()
throws DirectoryException
@@ -366,7 +411,7 @@
*/
public ExportThread(short target)
{
- super("Export thread");
+ super("Export thread " + serverId);
this.target = target;
}
@@ -406,12 +451,13 @@
LinkedBlockingQueue<UpdateToReplay> updateToReplayQueue)
throws ConfigException
{
- super("replicationDomain_" + configuration.getBaseDN());
+ super("Replication State Saver for server id " + configuration.getServerId()
+ + " and domain " + configuration.getBaseDN());
// Read the configuration parameters.
replicationServers = configuration.getReplicationServer();
serverId = (short) configuration.getServerId();
- baseDN = configuration.getBaseDN();
+ baseDn = configuration.getBaseDN();
window = configuration.getWindowSize();
heartbeatInterval = configuration.getHeartbeatInterval();
isolationpolicy = configuration.getIsolationPolicy();
@@ -419,13 +465,43 @@
this.updateToReplayQueue = updateToReplayQueue;
/*
+ * Fill assured configuration properties
+ */
+ AssuredType assuredType = configuration.getAssuredType();
+ switch (assuredType)
+ {
+ case NOT_ASSURED:
+ assured = false;
+ break;
+ case SAFE_DATA:
+ assured = true;
+ this.assuredMode = AssuredMode.SAFE_DATA_MODE;
+ break;
+ case SAFE_READ:
+ assured = true;
+ this.assuredMode = AssuredMode.SAFE_READ_MODE;
+ break;
+ }
+ this.assuredSdLevel = (byte)configuration.getAssuredSdLevel();
+ this.groupId = (byte)configuration.getGroupId();
+ this.assuredTimeout = configuration.getAssuredTimeout();
+ SortedSet<String> urls = configuration.getReferralsUrl();
+ if (urls != null)
+ {
+ for (String url : urls)
+ {
+ this.refUrls.add(url);
+ }
+ }
+
+ /*
* Modify conflicts are solved for all suffixes but the schema suffix
* because we don't want to store extra information in the schema
* ldif files.
* This has no negative impact because the changes on schema should
* not produce conflicts.
*/
- if (baseDN.compareTo(DirectoryServer.getSchemaDN()) == 0)
+ if (baseDn.compareTo(DirectoryServer.getSchemaDN()) == 0)
{
solveConflictFlag = false;
}
@@ -438,7 +514,7 @@
* Create a new Persistent Server State that will be used to store
* the last ChangeNmber seen from all LDAP servers in the topology.
*/
- state = new PersistentServerState(baseDN, serverId);
+ state = new PersistentServerState(baseDn, serverId);
/*
* Create a replication monitor object responsible for publishing
@@ -447,11 +523,11 @@
monitor = new ReplicationMonitor(this);
DirectoryServer.registerMonitorProvider(monitor);
- Backend backend = retrievesBackend(baseDN);
+ Backend backend = retrievesBackend(baseDn);
if (backend == null)
{
throw new ConfigException(ERR_SEARCHING_DOMAIN_BACKEND.get(
- baseDN.toNormalizedString()));
+ baseDn.toNormalizedString()));
}
try
@@ -461,16 +537,16 @@
catch (DirectoryException e)
{
logError(ERR_LOADING_GENERATION_ID.get(
- baseDN.toNormalizedString(), e.getLocalizedMessage()));
+ baseDn.toNormalizedString(), e.getLocalizedMessage()));
}
/*
* create the broker object used to publish and receive changes
*/
- broker = new ReplicationBroker(state, baseDN, serverId, maxReceiveQueue,
- maxReceiveDelay, maxSendQueue, maxSendDelay, window,
+ broker = new ReplicationBroker(this, state, baseDn, serverId,
+ maxReceiveQueue, maxReceiveDelay, maxSendQueue, maxSendDelay, window,
heartbeatInterval, generationId,
- new ReplSessionSecurity(configuration));
+ new ReplSessionSecurity(configuration),getGroupId());
broker.start(replicationServers);
@@ -505,7 +581,7 @@
*/
public DN getBaseDN()
{
- return baseDN;
+ return baseDn;
}
/**
@@ -521,7 +597,7 @@
if ((!deleteOperation.isSynchronizationOperation())
&& (!brokerIsConnected(deleteOperation)))
{
- Message msg = ERR_REPLICATION_COULD_NOT_CONNECT.get(baseDN.toString());
+ Message msg = ERR_REPLICATION_COULD_NOT_CONNECT.get(baseDn.toString());
return new SynchronizationProviderResult.StopProcessing(
ResultCode.UNWILLING_TO_PERFORM, msg);
}
@@ -535,7 +611,7 @@
/*
* This is a replication operation
* Check that the modified entry has the same entryuuid
- * has was in the original message.
+ * as it was in the original message.
*/
String operationEntryUUID = ctx.getEntryUid();
String modifiedEntryUUID = Historical.getEntryUuid(deletedEntry);
@@ -581,7 +657,7 @@
if ((!addOperation.isSynchronizationOperation())
&& (!brokerIsConnected(addOperation)))
{
- Message msg = ERR_REPLICATION_COULD_NOT_CONNECT.get(baseDN.toString());
+ Message msg = ERR_REPLICATION_COULD_NOT_CONNECT.get(baseDn.toString());
return new SynchronizationProviderResult.StopProcessing(
ResultCode.UNWILLING_TO_PERFORM, msg);
}
@@ -686,7 +762,7 @@
if ((!modifyDNOperation.isSynchronizationOperation())
&& (!brokerIsConnected(modifyDNOperation)))
{
- Message msg = ERR_REPLICATION_COULD_NOT_CONNECT.get(baseDN.toString());
+ Message msg = ERR_REPLICATION_COULD_NOT_CONNECT.get(baseDn.toString());
return new SynchronizationProviderResult.StopProcessing(
ResultCode.UNWILLING_TO_PERFORM, msg);
}
@@ -725,7 +801,7 @@
* parent is the same as when the operation was performed.
*/
String newParentId = findEntryId(modifyDNOperation.getNewSuperior());
- if ((newParentId != null) &&
+ if ((newParentId != null) && (ctx.getNewParentId() != null) &&
(!newParentId.equals(ctx.getNewParentId())))
{
return new SynchronizationProviderResult.StopProcessing(
@@ -765,7 +841,7 @@
if ((!modifyOperation.isSynchronizationOperation())
&& (!brokerIsConnected(modifyOperation)))
{
- Message msg = ERR_REPLICATION_COULD_NOT_CONNECT.get(baseDN.toString());
+ Message msg = ERR_REPLICATION_COULD_NOT_CONNECT.get(baseDn.toString());
return new SynchronizationProviderResult.StopProcessing(
ResultCode.UNWILLING_TO_PERFORM, msg);
}
@@ -851,6 +927,7 @@
findEntryId(addOperation.getEntryDN().getParentDNInSuffix()));
addOperation.setAttachment(SYNCHROCONTEXT, ctx);
+ Historical.generateState(addOperation);
}
/**
@@ -858,14 +935,14 @@
* also responsible for updating the list of pending changes
* @return the received message - null if none
*/
- public UpdateMessage receive()
+ public UpdateMsg receive()
{
- UpdateMessage update = null;
+ UpdateMsg update = null;
- while (update == null)
+ while ( (update == null) && (!shutdown) )
{
- InitializeRequestMessage initMsg = null;
- ReplicationMessage msg;
+ InitializeRequestMsg initMsg = null;
+ ReplicationMsg msg;
try
{
msg = broker.receive();
@@ -876,24 +953,24 @@
}
if (debugEnabled())
- if (!(msg instanceof HeartbeatMessage))
+ if (!(msg instanceof HeartbeatMsg))
TRACER.debugVerbose("Message received <" + msg + ">");
- if (msg instanceof AckMessage)
+ if (msg instanceof AckMsg)
{
- AckMessage ack = (AckMessage) msg;
+ AckMsg ack = (AckMsg) msg;
receiveAck(ack);
}
- else if (msg instanceof InitializeRequestMessage)
+ else if (msg instanceof InitializeRequestMsg)
{
// Another server requests us to provide entries
// for a total update
- initMsg = (InitializeRequestMessage)msg;
+ initMsg = (InitializeRequestMsg)msg;
}
- else if (msg instanceof InitializeTargetMessage)
+ else if (msg instanceof InitializeTargetMsg)
{
// Another server is exporting its entries to us
- InitializeTargetMessage importMsg = (InitializeTargetMessage) msg;
+ InitializeTargetMsg importMsg = (InitializeTargetMsg) msg;
try
{
@@ -907,8 +984,8 @@
catch(DirectoryException de)
{
// Returns an error message to notify the sender
- ErrorMessage errorMsg =
- new ErrorMessage(importMsg.getsenderID(),
+ ErrorMsg errorMsg =
+ new ErrorMsg(importMsg.getsenderID(),
de.getMessageObject());
MessageBuilder mb = new MessageBuilder();
mb.append(de.getMessageObject());
@@ -916,7 +993,7 @@
broker.publish(errorMsg);
}
}
- else if (msg instanceof ErrorMessage)
+ else if (msg instanceof ErrorMsg)
{
if (ieContext != null)
{
@@ -925,22 +1002,31 @@
// - or before an import really started
// For example, when we publish a request and the
// replicationServer did not find any import source.
- abandonImportExport((ErrorMessage)msg);
+ abandonImportExport((ErrorMsg)msg);
}
else
{
- /* We can receive an error message from the replication server
- * in the following cases :
- * - we connected with an incorrect generation id
+ /*
+ * Log error message
*/
- ErrorMessage errorMsg = (ErrorMessage)msg;
+ ErrorMsg errorMsg = (ErrorMsg)msg;
logError(ERR_ERROR_MSG_RECEIVED.get(
errorMsg.getDetails()));
}
}
- else if (msg instanceof UpdateMessage)
+ if (msg instanceof TopologyMsg)
{
- update = (UpdateMessage) msg;
+ TopologyMsg topoMsg = (TopologyMsg)msg;
+ receiveTopo(topoMsg);
+ }
+ if (msg instanceof ChangeStatusMsg)
+ {
+ ChangeStatusMsg csMsg = (ChangeStatusMsg)msg;
+ receiveChangeStatus(csMsg);
+ }
+ else if (msg instanceof UpdateMsg)
+ {
+ update = (UpdateMsg) msg;
receiveUpdate(update);
}
}
@@ -968,24 +1054,183 @@
}
/**
- * Do the necessary processing when an UpdateMessage was received.
+ * Processes an incoming TopologyMsg.
+ * Updates the structures for the local view of the topology.
*
- * @param update The received UpdateMessage.
+ * @param topoMsg The topology information received from RS.
*/
- public void receiveUpdate(UpdateMessage update)
+ public void receiveTopo(TopologyMsg topoMsg)
+ {
+
+ if (debugEnabled())
+ TRACER.debugInfo("Replication domain " + baseDn
+ + " received topology info update:\n" + topoMsg);
+
+ // Store new lists
+ synchronized(getDsList())
+ {
+ synchronized(getRsList())
+ {
+ dsList = topoMsg.getDsList();
+ rsList = topoMsg.getRsList();
+ }
+ }
+ }
+
+ /**
+ * Set the initial status of the domain, once he is connected to the topology.
+ * @param initStatus The status to enter the state machine with
+ */
+ public void setInitialStatus(ServerStatus initStatus)
+ {
+ // Sanity check: is it a valid initial status?
+ if (!isValidInitialStatus(initStatus))
+ {
+ Message msg = ERR_DS_INVALID_INIT_STATUS.get(initStatus.toString(),
+ baseDn.toString(), Short.toString(serverId));
+ logError(msg);
+ } else
+ {
+ status = initStatus;
+ }
+ }
+
+ /**
+ * Processes an incoming ChangeStatusMsg. Compute new status according to
+ * given order. Then update domain for being compliant with new status
+ * definition.
+ * @param csMsg The received status message
+ */
+ private void receiveChangeStatus(ChangeStatusMsg csMsg)
+ {
+ if (debugEnabled())
+ TRACER.debugInfo("Replication domain " + baseDn +
+ " received change status message:\n" + csMsg);
+
+ ServerStatus reqStatus = csMsg.getRequestedStatus();
+
+ // Translate requested status to a state machine event
+ StatusMachineEvent event = StatusMachineEvent.statusToEvent(reqStatus);
+ if (event == StatusMachineEvent.INVALID_EVENT)
+ {
+ Message msg = ERR_DS_INVALID_REQUESTED_STATUS.get(reqStatus.toString(),
+ baseDn.toString(), Short.toString(serverId));
+ logError(msg);
+ return;
+ }
+
+ // Compute new status and do matching tasks
+ // Use synchronized as admin task (thread) could order to go in admin status
+ // for instance (concurrent with receive thread).
+ synchronized (status)
+ {
+ ServerStatus newStatus =
+ StatusMachine.computeNewStatus(status, event);
+
+ if (newStatus == ServerStatus.INVALID_STATUS)
+ {
+ Message msg = ERR_DS_CANNOT_CHANGE_STATUS.get(baseDn.toString(),
+ Short.toString(serverId), status.toString(), event.toString());
+ logError(msg);
+ return;
+ }
+
+ // Store new status
+ status = newStatus;
+
+ if (debugEnabled())
+ TRACER.debugInfo("Replication domain " + baseDn +
+ " new status is: " + status);
+
+ // Perform whatever actions are needed to apply properties for being
+ // compliant with new status
+ updateDomainForNewStatus();
+ }
+ }
+
+ /**
+ * Called when first connection or disconnection detected.
+ */
+ public void toNotConnectedStatus()
+ {
+ // Go into not connected status
+ // Use synchronized as somebody could ask another status change at the same
+ // time
+ synchronized (status)
+ {
+ StatusMachineEvent event =
+ StatusMachineEvent.TO_NOT_CONNECTED_STATUS_EVENT;
+ ServerStatus newStatus =
+ StatusMachine.computeNewStatus(status, event);
+
+ if (newStatus == ServerStatus.INVALID_STATUS)
+ {
+ Message msg = ERR_DS_CANNOT_CHANGE_STATUS.get(baseDn.toString(),
+ Short.toString(serverId), status.toString(), event.toString());
+ logError(msg);
+ return;
+ }
+
+ // Store new status
+ status = newStatus;
+
+ if (debugEnabled())
+ TRACER.debugInfo("Replication domain " + baseDn +
+ " new status is: " + status);
+
+ // Perform whatever actions are needed to apply properties for being
+ // compliant with new status
+ updateDomainForNewStatus();
+ }
+ }
+
+ /**
+ * Perform whatever actions are needed to apply properties for being
+ * compliant with new status. Must be called in synchronized section for
+ * status. The new status is already set in status variable.
+ */
+ private void updateDomainForNewStatus()
+ {
+ switch (status)
+ {
+ case NOT_CONNECTED_STATUS:
+ break;
+ case NORMAL_STATUS:
+ break;
+ case DEGRADED_STATUS:
+ break;
+ case FULL_UPDATE_STATUS:
+ // Signal RS we just entered the full update status
+ broker.signalStatusChange(status);
+ break;
+ case BAD_GEN_ID_STATUS:
+ break;
+ default:
+ if (debugEnabled())
+ TRACER.debugInfo("updateDomainForNewStatus: unexpected status: " +
+ status);
+ }
+ }
+
+ /**
+ * Do the necessary processing when an UpdateMsg was received.
+ *
+ * @param update The received UpdateMsg.
+ */
+ public void receiveUpdate(UpdateMsg update)
{
remotePendingChanges.putRemoteUpdate(update);
numRcvdUpdates.incrementAndGet();
}
/**
- * Do the necessary processing when an AckMessage is received.
+ * Do the necessary processing when an AckMsg is received.
*
- * @param ack The AckMessage that was received.
+ * @param ack The AckMsg that was received.
*/
- public void receiveAck(AckMessage ack)
+ public void receiveAck(AckMsg ack)
{
- UpdateMessage update;
+ UpdateMsg update;
ChangeNumber changeNumber = ack.getChangeNumber();
synchronized (waitingAckMsgs)
@@ -1013,7 +1258,7 @@
{
numReplayedPostOpCalled++;
}
- UpdateMessage msg = null;
+ UpdateMsg msg = null;
// Note that a failed non-replication operation might not have a change
// number.
@@ -1025,7 +1270,7 @@
{
// Generate a replication message for a successful non-replication
// operation.
- msg = UpdateMessage.generateMsg(op, isAssured);
+ msg = UpdateMsg.generateMsg(op);
if (msg == null)
{
@@ -1209,7 +1454,7 @@
*/
public void ack(ChangeNumber changeNumber)
{
- broker.publish(new AckMessage(changeNumber));
+ broker.publish(new AckMsg(changeNumber));
}
/**
@@ -1304,18 +1549,17 @@
}
/**
- * Create and replay a synchronized Operation from an UpdateMessage.
+ * Create and replay a synchronized Operation from an UpdateMsg.
*
- * @param msg The UpdateMessage to be replayed.
+ * @param msg The UpdateMsg to be replayed.
*/
- public void replay(UpdateMessage msg)
+ public void replay(UpdateMsg msg)
{
Operation op = null;
boolean done = false;
boolean dependency = false;
ChangeNumber changeNumber = null;
int retryCount = 10;
- boolean firstTry = true;
// Try replay the operation, then flush (replaying) any pending operation
// whose dependency has been replayed until no more left.
@@ -1323,10 +1567,11 @@
{
try
{
+ op = msg.createOperation(conn);
+ dependency = remotePendingChanges.checkDependencies(op, msg);
+
while ((!dependency) && (!done) && (retryCount-- > 0))
{
- op = msg.createOperation(conn);
-
op.setInternalOperation(true);
op.setSynchronizationOperation(true);
changeNumber = OperationContext.getChangeNumber(op);
@@ -1341,36 +1586,23 @@
{
ModifyOperation newOp = (ModifyOperation) op;
dependency = remotePendingChanges.checkDependencies(newOp);
- if ((!dependency) && (!firstTry))
- {
- done = solveNamingConflict(newOp, msg);
- }
+ ModifyMsg modifyMsg = (ModifyMsg) msg;
+ done = solveNamingConflict(newOp, modifyMsg);
} else if (op instanceof DeleteOperation)
{
DeleteOperation newOp = (DeleteOperation) op;
dependency = remotePendingChanges.checkDependencies(newOp);
- if ((!dependency) && (!firstTry))
- {
- done = solveNamingConflict(newOp, msg);
- }
+ done = solveNamingConflict(newOp, msg);
} else if (op instanceof AddOperation)
{
AddOperation newOp = (AddOperation) op;
AddMsg addMsg = (AddMsg) msg;
dependency = remotePendingChanges.checkDependencies(newOp);
- if ((!dependency) && (!firstTry))
- {
- done = solveNamingConflict(newOp, addMsg);
- }
+ done = solveNamingConflict(newOp, addMsg);
} else if (op instanceof ModifyDNOperationBasis)
{
- ModifyDNMsg newMsg = (ModifyDNMsg) msg;
- dependency = remotePendingChanges.checkDependencies(newMsg);
- if ((!dependency) && (!firstTry))
- {
- ModifyDNOperationBasis newOp = (ModifyDNOperationBasis) op;
- done = solveNamingConflict(newOp, msg);
- }
+ ModifyDNOperationBasis newOp = (ModifyDNOperationBasis) op;
+ done = solveNamingConflict(newOp, msg);
} else
{
done = true; // unknown type of operation ?!
@@ -1382,11 +1614,19 @@
// however we still need to push this change to the serverState
updateError(changeNumber);
}
- } else
+ else
+ {
+ /*
+ * Create a new operation as the ConflictResolution
+ * different operation.
+ */
+ op = msg.createOperation(conn);
+ }
+ }
+ else
{
done = true;
}
- firstTry = false;
}
if (!done && !dependency)
@@ -1457,7 +1697,6 @@
dependency = false;
changeNumber = null;
retryCount = 10;
- firstTry = true;
} while (msg != null);
}
@@ -1494,14 +1733,16 @@
*
* @param dn The dn of the entry for which the unique Id is searched.
*
- * @return The unique Id of the entry whith the provided DN.
+ * @return The unique Id of the entry with the provided DN.
*/
- private String findEntryId(DN dn)
+ static String findEntryId(DN dn)
{
if (dn == null)
return null;
try
{
+ InternalClientConnection conn =
+ InternalClientConnection.getRootConnection();
LinkedHashSet<String> attrs = new LinkedHashSet<String>(1);
attrs.add(ENTRYUIDNAME);
InternalSearchOperation search = conn.processSearch(dn,
@@ -1530,17 +1771,17 @@
}
/**
- * find the current dn of an entry from its entry uuid.
+ * find the current DN of an entry from its entry UUID.
*
* @param uuid the Entry Unique ID.
- * @return The curernt dn of the entry or null if there is no entry with
- * the specified uuid.
+ * @return The current DN of the entry or null if there is no entry with
+ * the specified UUID.
*/
private DN findEntryDN(String uuid)
{
try
{
- InternalSearchOperation search = conn.processSearch(baseDN,
+ InternalSearchOperation search = conn.processSearch(baseDn,
SearchScope.WHOLE_SUBTREE,
SearchFilter.createFilterFromString("entryuuid="+uuid));
if (search.getResultCode() == ResultCode.SUCCESS)
@@ -1570,7 +1811,7 @@
* @return true if the process is completed, false if it must continue..
*/
private boolean solveNamingConflict(ModifyOperation op,
- UpdateMessage msg)
+ ModifyMsg msg)
{
ResultCode result = op.getResultCode();
ModifyContext ctx = (ModifyContext) op.getAttachment(SYNCHROCONTEXT);
@@ -1601,6 +1842,57 @@
return true;
}
}
+ else if (result == ResultCode.NOT_ALLOWED_ON_RDN)
+ {
+ DN currentDN = findEntryDN(entryUid);
+ RDN currentRDN = null;
+ if (currentDN != null)
+ {
+ currentRDN = currentDN.getRDN();
+ }
+ else
+ {
+ // The entry does not exist anymore.
+ numResolvedNamingConflicts.incrementAndGet();
+ return true;
+ }
+
+ // The modify operation is trying to delete the value that is
+ // currently used in the RDN. We need to alter the modify so that it does
+ // not remove the current RDN value(s).
+
+ List<Modification> mods = op.getModifications();
+ for (Modification mod : mods)
+ {
+ AttributeType modAttrType = mod.getAttribute().getAttributeType();
+ if ((mod.getModificationType() == ModificationType.DELETE) ||
+ (mod.getModificationType() == ModificationType.REPLACE))
+ {
+ if (currentRDN.hasAttributeType(modAttrType))
+ {
+ // the attribute can't be deleted because it is used
+ // in the RDN, turn this operation is a replace with the
+ // current RDN value(s);
+ mod.setModificationType(ModificationType.REPLACE);
+ Attribute newAttribute = mod.getAttribute();
+ AttributeBuilder attrBuilder;
+ if (newAttribute == null)
+ {
+ attrBuilder = new AttributeBuilder(modAttrType);
+ }
+ else
+ {
+ attrBuilder = new AttributeBuilder(newAttribute);
+ }
+ attrBuilder.add(currentRDN.getAttributeValue(modAttrType));
+ mod.setAttribute(attrBuilder.toAttribute());
+ }
+ }
+ }
+ msg.setMods(mods);
+ numResolvedNamingConflicts.incrementAndGet();
+ return false;
+ }
else
{
// The other type of errors can not be caused by naming conflicts.
@@ -1621,7 +1913,7 @@
* @return true if the process is completed, false if it must continue..
*/
private boolean solveNamingConflict(DeleteOperation op,
- UpdateMessage msg)
+ UpdateMsg msg)
{
ResultCode result = op.getResultCode();
DeleteContext ctx = (DeleteContext) op.getAttachment(SYNCHROCONTEXT);
@@ -1691,7 +1983,7 @@
* @throws Exception When the operation is not valid.
*/
private boolean solveNamingConflict(ModifyDNOperation op,
- UpdateMessage msg) throws Exception
+ UpdateMsg msg) throws Exception
{
ResultCode result = op.getResultCode();
ModifyDnContext ctx = (ModifyDnContext) op.getAttachment(SYNCHROCONTEXT);
@@ -1710,40 +2002,43 @@
* - don't do anything if the operation is replayed.
*/
- // Construct the new DN to use for the entry.
- DN entryDN = op.getEntryDN();
- DN newSuperior = findEntryDN(newSuperiorID);
- RDN newRDN = op.getNewRDN();
- DN parentDN;
-
- if (newSuperior == null)
- {
- parentDN = entryDN.getParent();
- }
- else
- {
- parentDN = newSuperior;
- }
-
- if ((parentDN == null) || parentDN.isNullDN())
- {
- /* this should never happen
- * can't solve any conflict in this case.
- */
- throw new Exception("operation parameters are invalid");
- }
-
- DN newDN = parentDN.concat(newRDN);
-
// get the current DN of this entry in the database.
DN currentDN = findEntryDN(entryUid);
+ // Construct the new DN to use for the entry.
+ DN entryDN = op.getEntryDN();
+ DN newSuperior = null;
+ RDN newRDN = op.getNewRDN();
+
+ if (newSuperiorID != null)
+ {
+ newSuperior = findEntryDN(newSuperiorID);
+ }
+ else
+ {
+ newSuperior = entryDN.getParent();
+ }
+
+ //If we could not find the new parent entry, we missed this entry
+ // earlier or it has disappeared from the database
+ // Log this information for the repair tool and mark the entry
+ // as conflicting.
+ // stop the processing.
+ if (newSuperior == null)
+ {
+ markConflictEntry(op, currentDN, currentDN.getParent().concat(newRDN));
+ numUnresolvedNamingConflicts.incrementAndGet();
+ return true;
+ }
+
+ DN newDN = newSuperior.concat(newRDN);
+
if (currentDN == null)
{
- // The entry targetted by the Modify DN is not in the database
+ // The entry targeted by the Modify DN is not in the database
// anymore.
// This is a conflict between a delete and this modify DN.
- // The entry has been deleted anymore so we can safely assume
+ // The entry has been deleted, we can safely assume
// that the operation is completed.
numResolvedNamingConflicts.incrementAndGet();
return true;
@@ -1758,19 +2053,8 @@
return true;
}
- // If we could not find the new parent entry, we missed this entry
- // earlier or it has disappeared from the database
- // Log this information for the repair tool and mark the entry
- // as conflicting.
- // stop the processing.
- if (newSuperior == null)
- {
- markConflictEntry(op, currentDN, newDN);
- numUnresolvedNamingConflicts.incrementAndGet();
- return true;
- }
-
if ((result == ResultCode.NO_SUCH_OBJECT) ||
+ (result == ResultCode.UNWILLING_TO_PERFORM) ||
(result == ResultCode.OBJECTCLASS_VIOLATION))
{
/*
@@ -1858,7 +2142,7 @@
msg.setDn(generateConflictRDN(entryUid,
op.getEntryDN().getRDN().toString()) + ","
- + baseDN);
+ + baseDn);
// reset the parent uid so that the check done is the handleConflict
// phase does not fail.
msg.setParentUid(null);
@@ -1964,7 +2248,7 @@
}
} catch (DirectoryException e)
{
- // log errror and information for the REPAIR tool.
+ // log error and information for the REPAIR tool.
MessageBuilder mb = new MessageBuilder();
mb.append(ERR_EXCEPTION_RENAME_CONFLICT_ENTRY.get());
mb.append(String.valueOf(entryDN));
@@ -1979,7 +2263,7 @@
/**
* Rename an entry that was conflicting so that it stays below the
- * baseDN of the replicationDomain.
+ * baseDn of the replicationDomain.
*
* @param conflictOp The Operation that caused the conflict.
* @param dn The DN of the entry to be renamed.
@@ -1991,7 +2275,7 @@
InternalClientConnection.getRootConnection();
ModifyDNOperation newOp = conn.processModifyDN(
- dn, generateDeleteConflictDn(uid, dn),false, baseDN);
+ dn, generateDeleteConflictDn(uid, dn),false, baseDn);
if (newOp.getResultCode() != ResultCode.SUCCESS)
{
@@ -2022,11 +2306,10 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AttributeType attrType =
- DirectoryServer.getAttributeType(DS_SYNC_CONFLICT, true);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(attrType, conflictDN.toString()));
- Attribute attr = new Attribute(attrType, DS_SYNC_CONFLICT, values);
+ AttributeType attrType = DirectoryServer.getAttributeType(DS_SYNC_CONFLICT,
+ true);
+ Attribute attr = Attributes.create(attrType, new AttributeValue(
+ attrType, conflictDN.toString()));
List<Modification> mods = new ArrayList<Modification>();
Modification mod = new Modification(ModificationType.REPLACE, attr);
mods.add(mod);
@@ -2042,7 +2325,7 @@
logError(mb.toMessage());
}
- // Generate an alert to let the administratot know that some
+ // Generate an alert to let the administration know that some
// conflict could not be solved.
Message alertMessage = NOTE_UNRESOLVED_CONFLICT.get(conflictDN.toString());
DirectoryServer.sendAlertNotification(this,
@@ -2055,12 +2338,12 @@
*
* @param msg The conflicting Add Operation.
*
- * @throws ASN1Exception When an encoding error happenned manipulating the
+ * @throws ASN1Exception When an encoding error happened manipulating the
* msg.
*/
private void addConflict(AddMsg msg) throws ASN1Exception
{
- // Generate an alert to let the administratot know that some
+ // Generate an alert to let the administrator know that some
// conflict could not be solved.
Message alertMessage = NOTE_UNRESOLVED_CONFLICT.get(msg.getDn());
DirectoryServer.sendAlertNotification(this,
@@ -2215,7 +2498,7 @@
* Get the server ID.
* @return The server ID.
*/
- public int getServerId()
+ public short getServerId()
{
return serverId;
}
@@ -2273,7 +2556,7 @@
/**
* Enable back the domain after a previous disable.
* The domain will connect back to a replication Server and
- * will recreate threads to listen for messages from the Sycnhronization
+ * will recreate threads to listen for messages from the Synchronization
* server.
* The generationId will be retrieved or computed if necessary.
* The ServerState will also be read again from the local database.
@@ -2291,7 +2574,7 @@
* should we stop the modifications ?
*/
logError(ERR_LOADING_GENERATION_ID.get(
- baseDN.toNormalizedString(), e.getLocalizedMessage()));
+ baseDn.toNormalizedString(), e.getLocalizedMessage()));
return;
}
@@ -2349,7 +2632,7 @@
public ResultCode saveGenerationId(long generationId)
{
// The generationId is stored in the root entry of the domain.
- ASN1OctetString asn1BaseDn = new ASN1OctetString(baseDN.toString());
+ ASN1OctetString asn1BaseDn = new ASN1OctetString(baseDn.toString());
ArrayList<ASN1OctetString> values = new ArrayList<ASN1OctetString>();
ASN1OctetString value = new ASN1OctetString(Long.toString(generationId));
@@ -2383,7 +2666,7 @@
Message message = ERR_UPDATING_GENERATION_ID.get(
op.getResultCode().getResultCodeName() + " " +
op.getErrorMessage(),
- baseDN.toString());
+ baseDn.toString());
logError(message);
}
}
@@ -2410,9 +2693,9 @@
if (debugEnabled())
TRACER.debugInfo(
- "Attempt to read generation ID from DB " + baseDN.toString());
+ "Attempt to read generation ID from DB " + baseDn.toString());
- ASN1OctetString asn1BaseDn = new ASN1OctetString(baseDN.toString());
+ ASN1OctetString asn1BaseDn = new ASN1OctetString(baseDn.toString());
boolean found = false;
LDAPFilter filter;
try
@@ -2442,7 +2725,7 @@
Message message = ERR_SEARCHING_GENERATION_ID.get(
search.getResultCode().getResultCodeName() + " " +
search.getErrorMessage(),
- baseDN.toString());
+ baseDn.toString());
logError(message);
}
@@ -2460,27 +2743,26 @@
if (attrs != null)
{
Attribute attr = attrs.get(0);
- LinkedHashSet<AttributeValue> values = attr.getValues();
- if (values.size()>1)
+ if (attr.size()>1)
{
Message message = ERR_LOADING_GENERATION_ID.get(
- baseDN.toString(), "#Values=" + values.size() +
+ baseDn.toString(), "#Values=" + attr.size() +
" Must be exactly 1 in entry " +
resultEntry.toLDIFString());
logError(message);
}
- else if (values.size() == 1)
+ else if (attr.size() == 1)
{
found=true;
try
{
- generationId = Long.decode(values.iterator().next().
+ generationId = Long.decode(attr.iterator().next().
getStringValue());
}
catch(Exception e)
{
Message message = ERR_LOADING_GENERATION_ID.get(
- baseDN.toString(), e.getLocalizedMessage());
+ baseDn.toString(), e.getLocalizedMessage());
logError(message);
}
}
@@ -2495,7 +2777,7 @@
if (debugEnabled())
TRACER.debugInfo("Generation ID created for domain base DN=" +
- baseDN.toString() +
+ baseDn.toString() +
" generationId=" + generationId);
}
else
@@ -2503,7 +2785,7 @@
generationIdSavedStatus = true;
if (debugEnabled())
TRACER.debugInfo(
- "Generation ID successfully read from domain base DN=" + baseDN +
+ "Generation ID successfully read from domain base DN=" + baseDn +
" generationId=" + generationId);
}
return generationId;
@@ -2528,19 +2810,20 @@
{
ResultCode resultCode = ResultCode.OTHER;
Message message = ERR_RESET_GENERATION_CONN_ERR_ID.get(
- baseDN.toNormalizedString());
+ baseDn.toNormalizedString());
throw new DirectoryException(
resultCode, message);
}
- ResetGenerationId genIdMessage = null;
+ ResetGenerationIdMsg genIdMessage = null;
+
if (generationIdNewValue == null)
{
- genIdMessage = new ResetGenerationId(this.generationId);
+ genIdMessage = new ResetGenerationIdMsg(this.generationId);
}
else
{
- genIdMessage = new ResetGenerationId(generationIdNewValue);
+ genIdMessage = new ResetGenerationIdMsg(generationIdNewValue);
}
broker.publish(genIdMessage);
}
@@ -2574,7 +2857,7 @@
*/
public byte[] receiveEntryBytes()
{
- ReplicationMessage msg;
+ ReplicationMsg msg;
while (true)
{
try
@@ -2584,7 +2867,7 @@
if (debugEnabled())
TRACER.debugVerbose(
" sid:" + this.serverId +
- " base DN:" + this.baseDN +
+ " base DN:" + this.baseDn +
" Import EntryBytes received " + msg);
if (msg == null)
{
@@ -2592,26 +2875,26 @@
return null;
}
- if (msg instanceof EntryMessage)
+ if (msg instanceof EntryMsg)
{
- EntryMessage entryMsg = (EntryMessage)msg;
+ EntryMsg entryMsg = (EntryMsg)msg;
byte[] entryBytes = entryMsg.getEntryBytes();
ieContext.updateCounters();
return entryBytes;
}
- else if (msg instanceof DoneMessage)
+ else if (msg instanceof DoneMsg)
{
// This is the normal termination of the import
// No error is stored and the import is ended
// by returning null
return null;
}
- else if (msg instanceof ErrorMessage)
+ else if (msg instanceof ErrorMsg)
{
// This is an error termination during the import
// The error is stored and the import is ended
// by returning null
- ErrorMessage errorMsg = (ErrorMessage)msg;
+ ErrorMsg errorMsg = (ErrorMsg)msg;
ieContext.exception = new DirectoryException(
ResultCode.OTHER,
errorMsg.getDetails());
@@ -2637,7 +2920,7 @@
* on going.
* @param errorMsg The error message received.
*/
- protected void abandonImportExport(ErrorMessage errorMsg)
+ protected void abandonImportExport(ErrorMsg errorMsg)
{
// FIXME TBD Treat the case where the error happens while entries
// are being exported
@@ -2645,7 +2928,7 @@
if (debugEnabled())
TRACER.debugVerbose(
" abandonImportExport:" + this.serverId +
- " base DN:" + this.baseDN +
+ " base DN:" + this.baseDn +
" Error Msg received " + errorMsg);
if (ieContext != null)
@@ -2730,8 +3013,8 @@
throws DirectoryException
{
long genID = 0;
- Backend backend = retrievesBackend(this.baseDN);
- long bec = backend.numSubordinates(baseDN, true) + 1;
+ Backend backend = retrievesBackend(this.baseDn);
+ long bec = backend.numSubordinates(baseDn, true) + 1;
long entryCount = (bec<1000?bec:1000);
// Acquire a shared lock for the backend.
@@ -2764,10 +3047,10 @@
if (checksumOutput)
{
ros = new ReplLDIFOutputStream(this, entryCount);
- os = new CheckedOutputStream(ros, new Adler32());
+ os = new CheckedOutputStream(ros, new GenerationIdChecksum());
try
{
- os.write((Long.toString(backend.numSubordinates(baseDN, true) + 1)).
+ os.write((Long.toString(backend.numSubordinates(baseDn, true) + 1)).
getBytes());
}
catch(Exception e)
@@ -2782,9 +3065,9 @@
}
LDIFExportConfig exportConfig = new LDIFExportConfig(os);
- // baseDN branch is the only one included in the export
+ // baseDn branch is the only one included in the export
List<DN> includeBranches = new ArrayList<DN>(1);
- includeBranches.add(this.baseDN);
+ includeBranches.add(this.baseDn);
exportConfig.setIncludeBranches(includeBranches);
// For the checksum computing mode, only consider the 'stable' attributes
@@ -2838,19 +3121,15 @@
}
finally
{
+ // Clean up after the export by closing the export config.
+ // Will also flush the export and export the remaining entries.
+ exportConfig.close();
if (checksumOutput)
{
genID =
((CheckedOutputStream)os).getChecksum().getValue();
}
- else
- {
- // Clean up after the export by closing the export config.
- // Will also flush the export and export the remaining entries.
- // This is a real export where writer has been initialized.
- exportConfig.close();
- }
// Release the shared lock on the backend.
try
@@ -2882,12 +3161,12 @@
* Retrieves the backend related to the domain.
*
* @return The backend of that domain.
- * @param baseDN The baseDN to retrieve the backend
+ * @param baseDn The baseDn to retrieve the backend
*/
- protected static Backend retrievesBackend(DN baseDN)
+ protected static Backend retrievesBackend(DN baseDn)
{
// Retrieves the backend related to this domain
- return DirectoryServer.getBackend(baseDN);
+ return DirectoryServer.getBackend(baseDn);
}
/**
@@ -2909,7 +3188,7 @@
*/
public void exportLDIFEntry(String lDIFEntry) throws IOException
{
- // If an error was raised - like receiving an ErrorMessage
+ // If an error was raised - like receiving an ErrorMsg
// we just let down the export.
if (ieContext.exception != null)
{
@@ -2918,7 +3197,7 @@
throw ioe;
}
- EntryMessage entryMessage = new EntryMessage(
+ EntryMsg entryMessage = new EntryMsg(
serverId, ieContext.exportTarget, lDIFEntry.getBytes());
broker.publish(entryMessage);
@@ -2949,8 +3228,8 @@
acquireIEContext();
ieContext.initializeTask = initTask;
- InitializeRequestMessage initializeMsg = new InitializeRequestMessage(
- baseDN, serverId, source);
+ InitializeRequestMsg initializeMsg = new InitializeRequestMsg(
+ baseDn, serverId, source);
// Publish Init request msg
broker.publish(initializeMsg);
@@ -3014,7 +3293,7 @@
Throwable cause;
if (targetString.equalsIgnoreCase("all"))
{
- return RoutableMessage.ALL_SERVERS;
+ return RoutableMsg.ALL_SERVERS;
}
// So should be a serverID
@@ -3092,10 +3371,17 @@
public void initializeRemote(short target, short requestorID, Task initTask)
throws DirectoryException
{
+ Message msg = NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START.get(
+ Short.toString(serverId),
+ baseDn.toString(),
+ Short.toString(requestorID));
+ logError(msg);
+
boolean contextAcquired=false;
+
try
{
- Backend backend = retrievesBackend(this.baseDN);
+ Backend backend = retrievesBackend(this.baseDn);
if (!backend.supportsLDIFExport())
{
@@ -3110,7 +3396,7 @@
// The number of entries to be exported is the number of entries under
// the base DN entry and the base entry itself.
- long entryCount = backend.numSubordinates(baseDN, true) + 1;
+ long entryCount = backend.numSubordinates(baseDn, true) + 1;
ieContext.exportTarget = target;
if (initTask != null)
{
@@ -3119,15 +3405,15 @@
ieContext.setCounters(entryCount, entryCount);
// Send start message to the peer
- InitializeTargetMessage initializeMessage = new InitializeTargetMessage(
- baseDN, serverId, ieContext.exportTarget, requestorID, entryCount);
+ InitializeTargetMsg initializeMessage = new InitializeTargetMsg(
+ baseDn, serverId, ieContext.exportTarget, requestorID, entryCount);
broker.publish(initializeMessage);
exportBackend(false);
// Notify the peer of the success
- DoneMessage doneMsg = new DoneMessage(serverId,
+ DoneMsg doneMsg = new DoneMsg(serverId,
initializeMessage.getDestination());
broker.publish(doneMsg);
@@ -3136,8 +3422,8 @@
catch(DirectoryException de)
{
// Notify the peer of the failure
- ErrorMessage errorMsg =
- new ErrorMessage(target,
+ ErrorMsg errorMsg =
+ new ErrorMsg(target,
de.getMessageObject());
broker.publish(errorMsg);
@@ -3146,6 +3432,12 @@
throw(de);
}
+
+ msg = NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END.get(
+ Short.toString(serverId),
+ baseDn.toString(),
+ Short.toString(requestorID));
+ logError(msg);
}
/**
@@ -3180,13 +3472,48 @@
* @param initializeMessage The message that initiated the import.
* @exception DirectoryException Thrown when an error occurs.
*/
- protected void initialize(InitializeTargetMessage initializeMessage)
+ protected void initialize(InitializeTargetMsg initializeMessage)
throws DirectoryException
{
LDIFImportConfig importConfig = null;
DirectoryException de = null;
- Backend backend = retrievesBackend(baseDN);
+ Message msg = NOTE_FULL_UPDATE_ENGAGED_FROM_REMOTE_START.get(
+ Short.toString(serverId),
+ baseDn.toString(),
+ Long.toString(initializeMessage.getRequestorID()));
+ logError(msg);
+
+ // Go into full update status
+ // Use synchronized as somebody could ask another status change at the same
+ // time
+ synchronized (status)
+ {
+ StatusMachineEvent event = StatusMachineEvent.TO_FULL_UPDATE_STATUS_EVENT;
+ ServerStatus newStatus =
+ StatusMachine.computeNewStatus(status, event);
+
+ if (newStatus == ServerStatus.INVALID_STATUS)
+ {
+ msg = ERR_DS_CANNOT_CHANGE_STATUS.get(baseDn.toString(),
+ Short.toString(serverId), status.toString(), event.toString());
+ logError(msg);
+ return;
+ }
+
+ // Store new status
+ status = newStatus;
+
+ if (debugEnabled())
+ TRACER.debugInfo("Replication domain " + baseDn +
+ " new status is: " + status);
+
+ // Perform whatever actions are needed to apply properties for being
+ // compliant with new status
+ updateDomainForNewStatus();
+ }
+
+ Backend backend = retrievesBackend(baseDn);
try
{
@@ -3220,7 +3547,7 @@
importConfig =
new LDIFImportConfig(ieContext.ldifImportInputStream);
List<DN> includeBranches = new ArrayList<DN>();
- includeBranches.add(this.baseDN);
+ includeBranches.add(this.baseDn);
importConfig.setIncludeBranches(includeBranches);
importConfig.setAppendToExistingData(false);
@@ -3254,7 +3581,7 @@
// Re-enable backend
closeBackendImport(backend);
- backend = retrievesBackend(baseDN);
+ backend = retrievesBackend(baseDn);
}
try
@@ -3294,6 +3621,12 @@
{
throw de;
}
+
+ msg = NOTE_FULL_UPDATE_ENGAGED_FROM_REMOTE_END.get(
+ Short.toString(serverId),
+ baseDn.toString(),
+ Long.toString(initializeMessage.getRequestorID()));
+ logError(msg);
}
/**
@@ -3320,21 +3653,21 @@
}
/**
- * Retrieves a replication domain based on the baseDN.
+ * Retrieves a replication domain based on the baseDn.
*
- * @param baseDN The baseDN of the domain to retrieve
+ * @param baseDn The baseDn of the domain to retrieve
* @return The domain retrieved
* @throws DirectoryException When an error occurred or no domain
- * match the provided baseDN.
+ * match the provided baseDn.
*/
- public static ReplicationDomain retrievesReplicationDomain(DN baseDN)
+ public static ReplicationDomain retrievesReplicationDomain(DN baseDn)
throws DirectoryException
{
ReplicationDomain replicationDomain = null;
// Retrieves the domain
DirectoryServer.getSynchronizationProviders();
- for (SynchronizationProvider provider :
+ for (SynchronizationProvider<?> provider :
DirectoryServer.getSynchronizationProviders())
{
if (!( provider instanceof MultimasterReplication))
@@ -3346,7 +3679,7 @@
// From the domainDN retrieves the replication domain
ReplicationDomain sdomain =
- MultimasterReplication.findDomain(baseDN, null);
+ MultimasterReplication.findDomain(baseDn, null);
if (sdomain == null)
{
break;
@@ -3365,7 +3698,7 @@
{
MessageBuilder mb = new MessageBuilder(ERR_NO_MATCHING_DOMAIN.get());
mb.append(" ");
- mb.append(String.valueOf(baseDN));
+ mb.append(String.valueOf(baseDn));
throw new DirectoryException(ResultCode.OTHER,
mb.toMessage());
}
@@ -3378,11 +3711,11 @@
*/
public Backend getBackend()
{
- return retrievesBackend(baseDN);
+ return retrievesBackend(baseDn);
}
/**
- * Returns a boolean indiciating if an import or export is currently
+ * Returns a boolean indicating if an import or export is currently
* processed.
* @return The status
*/
@@ -3396,7 +3729,7 @@
/**
- * Push the modifications contain the in given parameter has
+ * Push the modifications contained in the given parameter as
* a modification that would happen on a local server.
* The modifications are not applied to the local database,
* historical information is not updated but a ChangeNumber
@@ -3427,7 +3760,7 @@
* @param configuration The configuration to check.
* @param unacceptableReasons When the configuration is not acceptable, this
* table is use to return the reasons why this
- * configuration is not acceptbale.
+ * configuration is not acceptable.
*
* @return true if the configuration is acceptable, false other wise.
*/
@@ -3437,7 +3770,7 @@
// Check that there is not already a domain with the same DN
DN dn = configuration.getBaseDN();
ReplicationDomain domain = MultimasterReplication.findDomain(dn, null);
- if ((domain != null) && (domain.baseDN.equals(dn)))
+ if ((domain != null) && (domain.baseDn.equals(dn)))
{
Message message = ERR_SYNC_INVALID_DN.get();
unacceptableReasons.add(message);
@@ -3557,4 +3890,78 @@
else
return false;
}
+
+ /**
+ * Gets the info for DSs in the topology (except us).
+ * @return The info for DSs in the topology (except us)
+ */
+ public List<DSInfo> getDsList()
+ {
+ return dsList;
+ }
+
+ /**
+ * Gets the info for RSs in the topology (except the one we are connected
+ * to).
+ * @return The info for RSs in the topology (except the one we are connected
+ * to)
+ */
+ public List<RSInfo> getRsList()
+ {
+ return rsList;
+ }
+
+ /**
+ * Tells if assured replication is enabled for this domain.
+ * @return True if assured replication is enabled for this domain.
+ */
+ public boolean isAssured()
+ {
+ return assured;
+ }
+
+ /**
+ * Gives the mode for the assured replication of the domain.
+ * @return The mode for the assured replication of the domain.
+ */
+ public AssuredMode getAssuredMode()
+ {
+ return assuredMode;
+ }
+
+ /**
+ * Gives the assured level of the replication of the domain.
+ * @return The assured level of the replication of the domain.
+ */
+ public byte getAssuredSdLevel()
+ {
+ return assuredSdLevel;
+ }
+
+ /**
+ * Gets the group id for this domain.
+ * @return The group id for this domain.
+ */
+ public byte getGroupId()
+ {
+ return groupId;
+ }
+
+ /**
+ * Gets the referrals URLs this domain publishes.
+ * @return The referrals URLs this domain publishes.
+ */
+ public List<String> getRefUrls()
+ {
+ return refUrls;
+ }
+
+ /**
+ * Gets the status for this domain.
+ * @return The status for this domain.
+ */
+ public ServerStatus getStatus()
+ {
+ return status;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationMonitor.java
index d26e63f..005747e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationMonitor.java
@@ -27,14 +27,15 @@
package org.opends.server.replication.plugin;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
/**
* Class used to generate monitoring information for the replication.
@@ -88,11 +89,13 @@
ArrayList<Attribute> attributes = new ArrayList<Attribute>();
/* get the base dn */
- Attribute attr = new Attribute("base-dn", domain.getBaseDN().toString());
+ Attribute attr = Attributes.create("base-dn", domain.getBaseDN()
+ .toString());
attributes.add(attr);
/* get the base dn */
- attr = new Attribute("connected-to", domain.getReplicationServer());
+ attr = Attributes.create("connected-to", domain
+ .getReplicationServer());
attributes.add(attr);
/* get number of lost connections */
@@ -146,18 +149,17 @@
final String ATTR_SERVER_STATE = "server-state";
AttributeType type =
DirectoryServer.getDefaultAttributeType(ATTR_SERVER_STATE);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(type, ATTR_SERVER_STATE);
for (String str : domain.getServerState().toStringSet())
{
- values.add(new AttributeValue(type,str));
+ builder.add(new AttributeValue(type,str));
}
- attr = new Attribute(type, ATTR_SERVER_STATE, values);
- attributes.add(attr);
+ attributes.add(builder.toAttribute());
- attributes.add(new Attribute("ssl-encryption",
+ attributes.add(Attributes.create("ssl-encryption",
String.valueOf(domain.isSessionEncrypted())));
- attributes.add(new Attribute("generation-id",
+ attributes.add(Attributes.create("generation-id",
String.valueOf(domain.getGenerationId())));
return attributes;
@@ -172,17 +174,12 @@
* @param name the name of the attribute to add.
* @param value The integer value of he attribute to add.
*/
- private void addMonitorData(ArrayList<Attribute> attributes,
- String name, int value)
+ private void addMonitorData(ArrayList<Attribute> attributes, String name,
+ int value)
{
- Attribute attr;
- AttributeType type;
- LinkedHashSet<AttributeValue> values;
- type = DirectoryServer.getDefaultAttributeType(name);
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(type, String.valueOf(value)));
- attr = new Attribute(type, name, values);
- attributes.add(attr);
+ AttributeType type = DirectoryServer.getDefaultAttributeType(name);
+ attributes.add(Attributes.create(type, new AttributeValue(type,
+ String.valueOf(value))));
}
/**
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/UpdateToReplay.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/UpdateToReplay.java
index 77049cb..55fcce6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/UpdateToReplay.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/UpdateToReplay.java
@@ -26,7 +26,7 @@
*/
package org.opends.server.replication.plugin;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
/**
* This is a bag class to hold an update to replay in the queue of updates to
@@ -36,7 +36,7 @@
*/
public class UpdateToReplay
{
- private UpdateMessage updateMessage = null;
+ private UpdateMsg updateMessage = null;
private ReplicationDomain replicationDomain = null;
/**
@@ -46,7 +46,7 @@
* @param replicationDomain The replication domain to use for replaying the
* change from the update message
*/
- public UpdateToReplay(UpdateMessage updateMessage,
+ public UpdateToReplay(UpdateMsg updateMessage,
ReplicationDomain replicationDomain)
{
this.updateMessage = updateMessage;
@@ -57,7 +57,7 @@
* Getter for update message.
* @return The update message
*/
- public UpdateMessage getUpdateMessage()
+ public UpdateMsg getUpdateMessage()
{
return updateMessage;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AckMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AckMessage.java
deleted file mode 100644
index d0d0d1a..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AckMessage.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-import org.opends.server.replication.common.ChangeNumber;
-
-/**
- * Used to send acks between LDAP and replication servers.
- */
-public class AckMessage extends ReplicationMessage
-{
- // ChangeNumber of the update that was acked.
- private ChangeNumber changeNumber;
-
- /**
- * Creates a new AckMessage from a ChangeNumber.
- *
- * @param changeNumber The ChangeNumber used to build the AckMessage.
- */
- public AckMessage(ChangeNumber changeNumber)
- {
- this.changeNumber = changeNumber;
- }
-
- /**
- * Creates a new AckMessage by decoding the provided byte array.
- *
- * @param in The byte array containing the encoded form of the AckMessage.
- * @throws DataFormatException If in does not contain a properly encoded
- * AckMessage.
- */
- public AckMessage(byte[] in) throws DataFormatException
- {
- try
- {
- /* first byte is the type */
- if (in[0] != MSG_TYPE_ACK)
- throw new DataFormatException("byte[] is not a valid modify msg");
- int pos = 1;
-
- /* read the changeNumber */
- int length = getNextLength(in, pos);
- String changenumberStr = new String(in, pos, length, "UTF-8");
- changeNumber = new ChangeNumber(changenumberStr);
- pos +=24;
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * Get the ChangeNumber from the message.
- *
- * @return the ChangeNumber
- */
- public ChangeNumber getChangeNumber()
- {
- return changeNumber;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- try
- {
- byte[] changeNumberByte = changeNumber.toString().getBytes("UTF-8");
- int length = 1 + changeNumberByte.length + 1;
- byte[] resultByteArray = new byte[length];
- int pos = 1;
-
- /* put the type of the operation */
- resultByteArray[0] = MSG_TYPE_ACK;
-
- /* put the ChangeNumber */
- pos = addByteArray(changeNumberByte, resultByteArray, pos);
-
- return resultByteArray;
- } catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AckMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AckMsg.java
new file mode 100644
index 0000000..7f5d0e8
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AckMsg.java
@@ -0,0 +1,280 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.DataFormatException;
+
+import org.opends.server.replication.common.ChangeNumber;
+
+/**
+ * AckMsg messages are used for acknowledging an update that has been sent
+ * requesting an ack: update sent in Assured Mode, either safe data or safe
+ * read sub mode.
+ * The change number refers to the update change number that was requested to be
+ * acknowledged.
+ * If some errors occurred during attempt to acknowledge the update in the path
+ * to final servers, errors are marked with the following fields:
+ * - hasTimeout:
+ * Some servers went in timeout when the matching update was sent.
+ * - hasWrongStatus:
+ * Some servers were in a status where we cannot ask for an ack when the
+ * matching update was sent.
+ * - hasReplayError:
+ * Some servers made an error replaying the sent matching update.
+ * - failedServers:
+ * The list of server ids that had errors for the sent matching update. Each
+ * server id of the list had one of the 3 possible errors (timeout/wrong status
+ * /replay error)
+ *
+ * AckMsg messages are sent all along the reverse path of the path followed
+ * an update message.
+ */
+public class AckMsg extends ReplicationMsg
+{
+ // ChangeNumber of the update that was acked.
+ private ChangeNumber changeNumber;
+
+ // Did some servers go in timeout when the matching update (corresponding to
+ // change number) was sent ?
+ private boolean hasTimeout = false;
+
+ // Were some servers in wrong status when the matching
+ // update (correspondig to change number) was sent ?
+ private boolean hasWrongStatus = false;
+
+ // Did some servers make an error replaying the sent matching update
+ // (corresponding to change number) ?
+ private boolean hasReplayError = false;
+
+ // The list of server ids that had errors for the sent matching update
+ // (corresponding to change number). Each server id of the list had one of the
+ // 3 possible errors (timeout/degraded or admin/replay error)
+ private List<Short> failedServers = new ArrayList<Short>();
+
+ /**
+ * Creates a new AckMsg from a ChangeNumber (no errors).
+ *
+ * @param changeNumber The ChangeNumber used to build the AckMsg.
+ */
+ public AckMsg(ChangeNumber changeNumber)
+ {
+ this.changeNumber = changeNumber;
+ }
+
+ /**
+ * Creates a new AckMsg from a ChangeNumber (with specified error info).
+ *
+ * @param changeNumber The ChangeNumber used to build the AckMsg.
+ * @param hasTimeout The hasTimeout info
+ * @param hasWrongStatus The hasWrongStatus info
+ * @param hasReplayError The hasReplayError info
+ * @param failedServers The list of failed servers
+ */
+ public AckMsg(ChangeNumber changeNumber, boolean hasTimeout,
+ boolean hasWrongStatus, boolean hasReplayError, List<Short> failedServers)
+ {
+ this.changeNumber = changeNumber;
+ this.hasTimeout = hasTimeout;
+ this.hasWrongStatus = hasWrongStatus;
+ this.hasReplayError = hasReplayError;
+ this.failedServers = failedServers;
+ }
+
+ /**
+ * Creates a new AckMsg by decoding the provided byte array.
+ *
+ * @param in The byte array containing the encoded form of the AckMsg.
+ * @throws DataFormatException If in does not contain a properly encoded
+ * AckMsg.
+ */
+ public AckMsg(byte[] in) throws DataFormatException
+ {
+ try
+ {
+ /*
+ * The message is stored in the form:
+ * <operation type><change number><has timeout><has degraded><has replay
+ * error><failed server ids>
+ */
+
+ /* First byte is the type */
+ if (in[0] != MSG_TYPE_ACK)
+ {
+ throw new DataFormatException("byte[] is not a valid modify msg");
+ }
+ int pos = 1;
+
+ /* Read the changeNumber */
+ int length = getNextLength(in, pos);
+ String changenumberStr = new String(in, pos, length, "UTF-8");
+ changeNumber = new ChangeNumber(changenumberStr);
+ pos += length + 1;
+
+ /* Read the hasTimeout flag */
+ if (in[pos++] == 1)
+ {
+ hasTimeout = true;
+ } else
+ {
+ hasTimeout = false;
+ }
+
+ /* Read the hasWrongStatus flag */
+ if (in[pos++] == 1)
+ {
+ hasWrongStatus = true;
+ } else
+ {
+ hasWrongStatus = false;
+ }
+
+ /* Read the hasReplayError flag */
+ if (in[pos++] == 1)
+ {
+ hasReplayError = true;
+ } else
+ {
+ hasReplayError = false;
+ }
+
+ /* Read the list of failed server ids */
+ while (pos < in.length)
+ {
+ length = getNextLength(in, pos);
+ String serverIdString = new String(in, pos, length, "UTF-8");
+ Short serverId = Short.valueOf(serverIdString);
+ failedServers.add(serverId);
+ pos += length + 1;
+ }
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * Get the ChangeNumber from the message.
+ *
+ * @return the ChangeNumber
+ */
+ public ChangeNumber getChangeNumber()
+ {
+ return changeNumber;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ try
+ {
+ /*
+ * The message is stored in the form:
+ * <operation type><change number><has timeout><has degraded><has replay
+ * error><failed server ids>
+ */
+
+ ByteArrayOutputStream oStream = new ByteArrayOutputStream();
+
+ /* Put the type of the operation */
+ oStream.write(MSG_TYPE_ACK);
+
+ /* Put the ChangeNumber */
+ byte[] changeNumberByte = changeNumber.toString().getBytes("UTF-8");
+ oStream.write(changeNumberByte);
+ oStream.write(0);
+
+ /* Put the hasTimeout flag */
+ oStream.write((hasTimeout ? (byte) 1 : (byte) 0));
+
+ /* Put the hasWrongStatus flag */
+ oStream.write((hasWrongStatus ? (byte) 1 : (byte) 0));
+
+ /* Put the hasReplayError flag */
+ oStream.write((hasReplayError ? (byte) 1 : (byte) 0));
+
+ /* Put the list of server ids */
+ for (Short sid : failedServers)
+ {
+ byte[] byteServerId =
+ String.valueOf(sid.shortValue()).getBytes("UTF-8");
+ oStream.write(byteServerId);
+ oStream.write(0);
+ }
+
+ return oStream.toByteArray();
+ } catch (IOException e)
+ {
+ // never happens
+ return null;
+ }
+ }
+
+ /**
+ * Tells if the matching update had timeout.
+ * @return true if the matching update had timeout
+ */
+ public boolean hasTimeout()
+ {
+ return hasTimeout;
+ }
+
+ /**
+ * Tells if the matching update had wrong status error.
+ * @return true if the matching update had wrong status error
+ */
+ public boolean hasWrongStatus()
+ {
+ return hasWrongStatus;
+ }
+
+ /**
+ * Tells if the matching update had replay error.
+ * @return true if the matching update had replay error
+ */
+ public boolean hasReplayError()
+ {
+ return hasReplayError;
+ }
+
+ /**
+ * Get the list of failed servers.
+ * @return the list of failed servers
+ */
+ public List<Short> getFailedServers()
+ {
+ return failedServers;
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddContext.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddContext.java
index 99b0ed3..a3093e4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddContext.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddContext.java
@@ -29,13 +29,13 @@
import org.opends.server.replication.common.ChangeNumber;
/**
- * This class describe the contexte that is attached to
+ * This class describes the context that is attached to
* Add Operation.
*/
public class AddContext extends OperationContext
{
/**
- * The Unique Id of the parent entry od the added entry.
+ * The Unique Id of the parent entry of the added entry.
*/
private String parentUid;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
index db5dab6..29059ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
@@ -35,17 +35,19 @@
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Map;
import java.util.zip.DataFormatException;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.types.AbstractOperation;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
+import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.LDAPException;
+import org.opends.server.types.ObjectClass;
import org.opends.server.types.RawAttribute;
import org.opends.server.types.operation.PostOperationAddOperation;
@@ -56,9 +58,8 @@
* This class is used to exchange Add operation between LDAP servers
* and replication servers.
*/
-public class AddMsg extends UpdateMessage
+public class AddMsg extends UpdateMsg
{
- private static final long serialVersionUID = -4905520652801395185L;
private byte[] encodedAttributes;
private String parentUniqueId;
@@ -74,48 +75,87 @@
AddContext ctx = (AddContext) op.getAttachment(SYNCHROCONTEXT);
this.parentUniqueId = ctx.getParentUid();
- // Encode the object classes (SET OF LDAPString).
- LinkedHashSet<AttributeValue> ocValues =
- new LinkedHashSet<AttributeValue>(op.getObjectClasses().size());
- for (String s : op.getObjectClasses().values())
+ this.encodedAttributes =
+ encodeAttributes(op.getObjectClasses(),
+ op.getUserAttributes(),
+ op.getOperationalAttributes());
+ }
+
+ private byte[] encodeAttributes(
+ Map<ObjectClass, String> objectClasses,
+ Map<AttributeType, List<Attribute>> userAttributes,
+ Map<AttributeType, List<Attribute>> operationalAttributes)
+ {
+ // Encode the object classes (SET OF LDAPString).
+ AttributeBuilder builder = new AttributeBuilder(
+ DirectoryServer.getObjectClassAttributeType());
+ builder.setInitialCapacity(objectClasses.size());
+ for (String s : objectClasses.values())
{
- ocValues.add(new AttributeValue(new ASN1OctetString(s),
+ builder.add(new AttributeValue(new ASN1OctetString(s),
new ASN1OctetString(toLowerCase(s))));
}
-
- Attribute attr = new Attribute(
- DirectoryServer.getObjectClassAttributeType(),
- "objectClass", ocValues);
+ Attribute attr = builder.toAttribute();
ArrayList<ASN1Element> elems = new ArrayList<ASN1Element>();
elems.add(new LDAPAttribute(attr).encode());
// Encode the user attributes (AttributeList).
- for (List<Attribute> list : op.getUserAttributes().values())
+ for (List<Attribute> list : userAttributes.values())
{
for (Attribute a : list)
{
- elems.add(new LDAPAttribute(a).encode());
+ if (!a.isVirtual())
+ elems.add(new LDAPAttribute(a).encode());
}
}
// Encode the operational attributes (AttributeList).
- for (List<Attribute> list : op.getOperationalAttributes().values())
+ for (List<Attribute> list : operationalAttributes.values())
{
for (Attribute a : list)
{
- elems.add(new LDAPAttribute(a).encode());
+ if (!a.isVirtual())
+ elems.add(new LDAPAttribute(a).encode());
}
}
// Encode the sequence.
- encodedAttributes = ASN1Element.encodeValue(elems);
+ return ASN1Element.encodeValue(elems);
}
/**
* Creates a new AddMessage.
*
+ * @param cn ChangeNumber of the add.
+ * @param dn DN of the added entry.
+ * @param uniqueId The Unique identifier of the added entry.
+ * @param parentId The unique Id of the parent of the added
+ * entry.
+ * @param objectClasses objectclass of the added entry.
+ * @param userAttributes user attributes of the added entry.
+ * @param operationalAttributes operational attributes of the added entry.
+ */
+ public AddMsg(ChangeNumber cn,
+ String dn,
+ String uniqueId,
+ String parentId,
+ Map<ObjectClass, String> objectClasses,
+ Map<AttributeType,List<Attribute>> userAttributes,
+ Map<AttributeType,List<Attribute>> operationalAttributes)
+ {
+ super (cn, uniqueId, dn);
+ this.parentUniqueId = parentId;
+
+ encodedAttributes = encodeAttributes(objectClasses,
+ userAttributes, operationalAttributes);
+ }
+
+
+ /**
+ * Creates a new AddMessage.
+ *
* @param cn ChangeNumber of the add.
* @param dn DN of the added entry.
* @param uniqueId The Unique identifier of the added entry.
@@ -132,7 +172,7 @@
Collection<Attribute> userAttributes,
Collection<Attribute> operationalAttributes)
{
- super (new AddContext(cn, uniqueId, parentId), dn);
+ super (cn, uniqueId, dn);
this.parentUniqueId = parentId;
ArrayList<ASN1Element> elems = new ArrayList<ASN1Element>();
@@ -158,9 +198,10 @@
public AddMsg(byte[] in) throws DataFormatException,
UnsupportedEncodingException
{
- super(in);
-
- int pos = decodeHeader(MSG_TYPE_ADD_REQUEST, in);
+ byte[] allowedPduTypes = new byte[2];
+ allowedPduTypes[0] = MSG_TYPE_ADD;
+ allowedPduTypes[1] = MSG_TYPE_ADD_V1;
+ int pos = decodeHeader(allowedPduTypes, in);
// read the parent unique Id
int length = getNextLength(in, pos);
@@ -188,7 +229,7 @@
* {@inheritDoc}
*/
@Override
- public AbstractOperation createOperation(
+ public AddOperationBasis createOperation(
InternalClientConnection connection, String newDn)
throws LDAPException, ASN1Exception
{
@@ -212,12 +253,7 @@
}
/**
- * Get the byte[] representation of this Message.
- *
- * @return the byte array representation of this Message.
- *
- * @throws UnsupportedEncodingException When the encoding of the message
- * failed because the UTF-8 encoding is not supported.
+ * {@inheritDoc}
*/
@Override
public byte[] getBytes() throws UnsupportedEncodingException
@@ -235,7 +271,7 @@
}
/* encode the header in a byte[] large enough to also contain the mods */
- byte [] resultByteArray = encodeHeader(MSG_TYPE_ADD_REQUEST, length);
+ byte [] resultByteArray = encodeHeader(MSG_TYPE_ADD, length);
int pos = resultByteArray.length - length;
@@ -258,7 +294,27 @@
@Override
public String toString()
{
- return ("ADD DN=(" + getDn() + ") CN=(" + getChangeNumber() + ")");
+ if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ {
+ return "AddMsg content: " +
+ "\nprotocolVersion: " + protocolVersion +
+ "\ndn: " + dn +
+ "\nchangeNumber: " + changeNumber +
+ "\nuniqueId: " + uniqueId +
+ "\nassuredFlag: " + assuredFlag;
+ }
+ if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V2)
+ {
+ return "AddMsg content: " +
+ "\nprotocolVersion: " + protocolVersion +
+ "\ndn: " + dn +
+ "\nchangeNumber: " + changeNumber +
+ "\nuniqueId: " + uniqueId +
+ "\nassuredFlag: " + assuredFlag +
+ "\nassuredMode: " + assuredMode +
+ "\nsafeDataLevel: " + safeDataLevel;
+ }
+ return "!!! Unknown version: " + protocolVersion + "!!!";
}
/**
@@ -306,4 +362,39 @@
{
return encodedAttributes.length + 40;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public byte[] getBytes_V1() throws UnsupportedEncodingException
+ {
+ int length = encodedAttributes.length;
+ byte[] byteParentId = null;
+ if (parentUniqueId != null)
+ {
+ byteParentId = parentUniqueId.getBytes("UTF-8");
+ length += byteParentId.length + 1;
+ }
+ else
+ {
+ length += 1;
+ }
+
+ /* encode the header in a byte[] large enough to also contain the mods */
+ byte [] resultByteArray = encodeHeader_V1(MSG_TYPE_ADD_V1, length);
+
+ int pos = resultByteArray.length - length;
+
+ if (byteParentId != null)
+ pos = addByteArray(byteParentId, resultByteArray, pos);
+ else
+ resultByteArray[pos++] = 0;
+
+ /* put the attributes */
+ for (int i=0; i<encodedAttributes.length; i++,pos++)
+ {
+ resultByteArray[pos] = encodedAttributes[i];
+ }
+ return resultByteArray;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ChangeStatusMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ChangeStatusMsg.java
new file mode 100644
index 0000000..947e30f
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ChangeStatusMsg.java
@@ -0,0 +1,142 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.util.zip.DataFormatException;
+import org.opends.server.replication.common.ServerStatus;
+
+/**
+ * This message is used by the DS to tell the RS he is changing his status
+ * (new status field used), or by the RS to tell the DS he must change his
+ * status (requested status field used).
+ */
+public class ChangeStatusMsg extends ReplicationMsg
+{
+ // The status we want the DS to enter (used when from RS to DS)
+ private ServerStatus requestedStatus = ServerStatus.INVALID_STATUS;
+ // The new status the DS just entered (used when from DS to RS)
+ private ServerStatus newStatus = ServerStatus.INVALID_STATUS;
+
+ /**
+ * Create a new ChangeStatusMsg.
+ *
+ * @param requestedStatus The requested status
+ * @param newStatus The new status
+ */
+ public ChangeStatusMsg(ServerStatus requestedStatus, ServerStatus newStatus)
+ {
+ this.requestedStatus = requestedStatus;
+ this.newStatus = newStatus;
+ }
+
+ /**
+ * Creates a new ChangeStatusMsg from its encoded form.
+ *
+ * @param encodedMsg The byte array containing the encoded form of the
+ * ChangeStatusMsg.
+ * @throws DataFormatException If the byte array does not contain a valid
+ * encoded form of the ChangeStatusMsg.
+ */
+ public ChangeStatusMsg(byte[] encodedMsg) throws DataFormatException
+ {
+ /*
+ * The message is stored in the form:
+ * <message type><requested status><new status>
+ */
+
+ /* First byte is the type */
+ if (encodedMsg[0] != ReplicationMsg.MSG_TYPE_CHANGE_STATUS)
+ {
+ throw new DataFormatException("byte[] is not a valid msg");
+ }
+
+ try
+ {
+ /* Then the requested status */
+ requestedStatus = ServerStatus.valueOf(encodedMsg[1]);
+
+ /* Then the new status */
+ newStatus = ServerStatus.valueOf(encodedMsg[2]);
+ } catch (IllegalArgumentException e)
+ {
+ throw new DataFormatException(e.getMessage());
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ /*
+ * The message is stored in the form:
+ * <message type><requested status><new status>
+ */
+ byte[] encodedMsg = new byte[3];
+
+ /* Put the type of the operation */
+ encodedMsg[0] = ReplicationMsg.MSG_TYPE_CHANGE_STATUS;
+
+ /* Put the requested status */
+ encodedMsg[1] = requestedStatus.getValue();
+
+ /* Put the requested status */
+ encodedMsg[2] = newStatus.getValue();
+
+ return encodedMsg;
+ }
+
+ /**
+ * Get the requested status.
+ * @return The requested status
+ */
+ public ServerStatus getRequestedStatus()
+ {
+ return requestedStatus;
+ }
+
+ /**
+ * Get the requested status.
+ * @return The new status
+ */
+ public ServerStatus getNewStatus()
+ {
+ return newStatus;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return "ChangeStatusMsg content:" +
+ "\nnewStatus: " + newStatus +
+ "\nrequestedStatus: " + requestedStatus;
+ }
+}
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
index ef24139..fa8f1c3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
@@ -41,10 +41,8 @@
/**
* Object used when sending delete information to replication servers.
*/
-public class DeleteMsg extends UpdateMessage
+public class DeleteMsg extends UpdateMsg
{
- private static final long serialVersionUID = -4905520652801395185L;
-
/**
* Creates a new delete message.
*
@@ -73,14 +71,16 @@
* Creates a new Add message from a byte[].
*
* @param in The byte[] from which the operation must be read.
- * @throws DataFormatException The input byte[] is not a valid AddMsg
+ * @throws DataFormatException The input byte[] is not a valid DeleteMsg
* @throws UnsupportedEncodingException If UTF8 is not supported by the jvm
*/
public DeleteMsg(byte[] in) throws DataFormatException,
UnsupportedEncodingException
{
- super(in);
- decodeHeader(MSG_TYPE_DELETE_REQUEST, in);
+ byte[] allowedPduTypes = new byte[2];
+ allowedPduTypes[0] = MSG_TYPE_DELETE;
+ allowedPduTypes[1] = MSG_TYPE_DELETE_V1;
+ decodeHeader(allowedPduTypes, in);
}
@@ -101,17 +101,12 @@
}
/**
- * Get the byte array representation of this Message.
- *
- * @return The byte array representation of this Message.
- *
- * @throws UnsupportedEncodingException When the encoding of the message
- * failed because the UTF-8 encoding is not supported.
+ * {@inheritDoc}
*/
@Override
public byte[] getBytes() throws UnsupportedEncodingException
{
- return encodeHeader(MSG_TYPE_DELETE_REQUEST, 0);
+ return encodeHeader(MSG_TYPE_DELETE, 0);
}
/**
@@ -120,7 +115,27 @@
@Override
public String toString()
{
- return ("DEL " + getDn() + " " + getChangeNumber());
+ if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ {
+ return "DeleteMsg content: " +
+ "\nprotocolVersion: " + protocolVersion +
+ "\ndn: " + dn +
+ "\nchangeNumber: " + changeNumber +
+ "\nuniqueId: " + uniqueId +
+ "\nassuredFlag: " + assuredFlag;
+ }
+ if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V2)
+ {
+ return "DeleteMsg content: " +
+ "\nprotocolVersion: " + protocolVersion +
+ "\ndn: " + dn +
+ "\nchangeNumber: " + changeNumber +
+ "\nuniqueId: " + uniqueId +
+ "\nassuredFlag: " + assuredFlag +
+ "\nassuredMode: " + assuredMode +
+ "\nsafeDataLevel: " + safeDataLevel;
+ }
+ return "!!! Unknown version: " + protocolVersion + "!!!";
}
/**
@@ -133,4 +148,12 @@
// grow very large. It is therefore safe to assume an average of 40 bytes.
return 40;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public byte[] getBytes_V1() throws UnsupportedEncodingException
+ {
+ return encodeHeader_V1(MSG_TYPE_DELETE_V1, 0);
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DoneMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DoneMessage.java
deleted file mode 100644
index 3e46e8c..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DoneMessage.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-/**
- * This message is part of the replication protocol.
- * This message is sent by a server to one or several other servers after the
- * last entry sent in the context of a total update and signals to the server
- * that receives it that the export is now finished.
- */
-public class DoneMessage extends RoutableMessage implements
- Serializable
-{
- private static final long serialVersionUID = 5216659571724730361L;
-
- /**
- * Creates a message.
- *
- * @param sender The sender server of this message.
- * @param destination The server or servers targetted by this message.
- */
- public DoneMessage(short sender, short destination)
- {
- super(sender, destination);
- }
-
- /**
- * Creates a new message by decoding the provided byte array.
- * @param in A byte array containing the encoded information for the message,
- * @throws DataFormatException If the in does not contain a properly,
- * encoded message.
- */
- public DoneMessage(byte[] in) throws DataFormatException
- {
- super();
- try
- {
- // First byte is the type
- if (in[0] != MSG_TYPE_DONE)
- throw new DataFormatException("input is not a valid DoneMessage");
- int pos = 1;
-
- // sender
- int length = getNextLength(in, pos);
- String senderString = new String(in, pos, length, "UTF-8");
- this.senderID = Short.valueOf(senderString);
- pos += length +1;
-
- // destination
- length = getNextLength(in, pos);
- String destinationString = new String(in, pos, length, "UTF-8");
- this.destination = Short.valueOf(destinationString);
- pos += length +1;
-
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- try
- {
- byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
- byte[] destinationBytes = String.valueOf(destination).getBytes("UTF-8");
-
- int length = 1 + senderBytes.length + 1
- + destinationBytes.length + 1;
-
- byte[] resultByteArray = new byte[length];
-
- /* put the type of the operation */
- resultByteArray[0] = MSG_TYPE_DONE;
- int pos = 1;
-
- /* put the sender */
- pos = addByteArray(senderBytes, resultByteArray, pos);
-
- /* put the destination */
- pos = addByteArray(destinationBytes, resultByteArray, pos);
-
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DoneMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DoneMsg.java
new file mode 100644
index 0000000..24ebd5b
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/DoneMsg.java
@@ -0,0 +1,118 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+/**
+ * This message is part of the replication protocol.
+ * This message is sent by a server to one or several other servers after the
+ * last entry sent in the context of a total update and signals to the server
+ * that receives it that the export is now finished.
+ */
+public class DoneMsg extends RoutableMsg
+{
+ /**
+ * Creates a message.
+ *
+ * @param sender The sender server of this message.
+ * @param destination The server or servers targetted by this message.
+ */
+ public DoneMsg(short sender, short destination)
+ {
+ super(sender, destination);
+ }
+
+ /**
+ * Creates a new message by decoding the provided byte array.
+ * @param in A byte array containing the encoded information for the message,
+ * @throws DataFormatException If the in does not contain a properly,
+ * encoded message.
+ */
+ public DoneMsg(byte[] in) throws DataFormatException
+ {
+ super();
+ try
+ {
+ // First byte is the type
+ if (in[0] != MSG_TYPE_DONE)
+ throw new DataFormatException("input is not a valid DoneMessage");
+ int pos = 1;
+
+ // sender
+ int length = getNextLength(in, pos);
+ String senderString = new String(in, pos, length, "UTF-8");
+ this.senderID = Short.valueOf(senderString);
+ pos += length +1;
+
+ // destination
+ length = getNextLength(in, pos);
+ String destinationString = new String(in, pos, length, "UTF-8");
+ this.destination = Short.valueOf(destinationString);
+ pos += length +1;
+
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ try
+ {
+ byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
+ byte[] destinationBytes = String.valueOf(destination).getBytes("UTF-8");
+
+ int length = 1 + senderBytes.length + 1
+ + destinationBytes.length + 1;
+
+ byte[] resultByteArray = new byte[length];
+
+ /* put the type of the operation */
+ resultByteArray[0] = MSG_TYPE_DONE;
+ int pos = 1;
+
+ /* put the sender */
+ pos = addByteArray(senderBytes, resultByteArray, pos);
+
+ /* put the destination */
+ pos = addByteArray(destinationBytes, resultByteArray, pos);
+
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/EntryMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/EntryMessage.java
deleted file mode 100644
index 2afaf16..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/EntryMessage.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-/**
- * This message is part of the replication protocol.
- * This message is sent by a server to one or several other servers and
- * contain one entry to be sent over the protocol in the context of
- * an import/export over the protocol.
- */
-public class EntryMessage extends RoutableMessage implements
- Serializable
-{
- private static final long serialVersionUID = 6116955858351992926L;
-
- // The byte array containing the bytes of the entry transported
- private byte[] entryByteArray;
-
- /**
- * Creates a new EntryMessage.
- *
- * @param sender The sender of this message.
- * @param destination The destination of this message.
- * @param entryBytes The bytes of the entry.
- */
- public EntryMessage(short sender, short destination, byte[] entryBytes)
- {
- super(sender, destination);
- this.entryByteArray = entryBytes.clone();
- }
-
- /**
- * Creates a new EntryMessage from its encoded form.
- *
- * @param in The byte array containing the encoded form of the message.
- * @throws DataFormatException If the byte array does not contain a valid
- * encoded form of the ServerStartMessage.
- */
- public EntryMessage(byte[] in) throws DataFormatException
- {
- try
- {
- /* first byte is the type */
- if (in[0] != MSG_TYPE_ENTRY)
- throw new DataFormatException("input is not a valid ServerStart msg");
- int pos = 1;
-
- // sender
- int length = getNextLength(in, pos);
- String senderIDString = new String(in, pos, length, "UTF-8");
- this.senderID = Short.valueOf(senderIDString);
- pos += length +1;
-
- // destination
- length = getNextLength(in, pos);
- String destinationString = new String(in, pos, length, "UTF-8");
- this.destination = Short.valueOf(destinationString);
- pos += length +1;
-
- // entry
- length = getNextLength(in, pos);
- this.entryByteArray = new byte[length];
- for (int i=0; i<length; i++)
- {
- entryByteArray[i] = in[pos+i];
- }
- }
- catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * Returns the entry bytes.
- * @return The entry bytes.
- */
- public byte[] getEntryBytes()
- {
- return entryByteArray;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- try {
- byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
- byte[] destinationBytes = String.valueOf(destination).getBytes("UTF-8");
- byte[] entryBytes = entryByteArray;
-
- int length = 1 + senderBytes.length +
- 1 + destinationBytes.length +
- 1 + entryBytes.length + 1;
-
- byte[] resultByteArray = new byte[length];
-
- /* put the type of the operation */
- resultByteArray[0] = MSG_TYPE_ENTRY;
- int pos = 1;
-
- pos = addByteArray(senderBytes, resultByteArray, pos);
- pos = addByteArray(destinationBytes, resultByteArray, pos);
- pos = addByteArray(entryBytes, resultByteArray, pos);
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/EntryMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/EntryMsg.java
new file mode 100644
index 0000000..6e54b2e
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/EntryMsg.java
@@ -0,0 +1,138 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+/**
+ * This message is part of the replication protocol.
+ * This message is sent by a server to one or several other servers and
+ * contain one entry to be sent over the protocol in the context of
+ * an import/export over the protocol.
+ */
+public class EntryMsg extends RoutableMsg
+{
+ // The byte array containing the bytes of the entry transported
+ private byte[] entryByteArray;
+
+ /**
+ * Creates a new EntryMsg.
+ *
+ * @param sender The sender of this message.
+ * @param destination The destination of this message.
+ * @param entryBytes The bytes of the entry.
+ */
+ public EntryMsg(short sender, short destination, byte[] entryBytes)
+ {
+ super(sender, destination);
+ this.entryByteArray = entryBytes.clone();
+ }
+
+ /**
+ * Creates a new EntryMsg from its encoded form.
+ *
+ * @param in The byte array containing the encoded form of the message.
+ * @throws DataFormatException If the byte array does not contain a valid
+ * encoded form of the ServerStartMessage.
+ */
+ public EntryMsg(byte[] in) throws DataFormatException
+ {
+ try
+ {
+ /* first byte is the type */
+ if (in[0] != MSG_TYPE_ENTRY)
+ throw new DataFormatException("input is not a valid ServerStart msg");
+ int pos = 1;
+
+ // sender
+ int length = getNextLength(in, pos);
+ String senderIDString = new String(in, pos, length, "UTF-8");
+ this.senderID = Short.valueOf(senderIDString);
+ pos += length +1;
+
+ // destination
+ length = getNextLength(in, pos);
+ String destinationString = new String(in, pos, length, "UTF-8");
+ this.destination = Short.valueOf(destinationString);
+ pos += length +1;
+
+ // entry
+ length = getNextLength(in, pos);
+ this.entryByteArray = new byte[length];
+ for (int i=0; i<length; i++)
+ {
+ entryByteArray[i] = in[pos+i];
+ }
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * Returns the entry bytes.
+ * @return The entry bytes.
+ */
+ public byte[] getEntryBytes()
+ {
+ return entryByteArray;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ try {
+ byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
+ byte[] destinationBytes = String.valueOf(destination).getBytes("UTF-8");
+ byte[] entryBytes = entryByteArray;
+
+ int length = 1 + senderBytes.length +
+ 1 + destinationBytes.length +
+ 1 + entryBytes.length + 1;
+
+ byte[] resultByteArray = new byte[length];
+
+ /* put the type of the operation */
+ resultByteArray[0] = MSG_TYPE_ENTRY;
+ int pos = 1;
+
+ pos = addByteArray(senderBytes, resultByteArray, pos);
+ pos = addByteArray(destinationBytes, resultByteArray, pos);
+ pos = addByteArray(entryBytes, resultByteArray, pos);
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ErrorMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ErrorMessage.java
deleted file mode 100644
index 7f81a05..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ErrorMessage.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-import org.opends.messages.Message;
-
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-import static org.opends.server.loggers.debug.DebugLogger.getTracer;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-import org.opends.server.loggers.debug.DebugTracer;
-
-/**
- * This message is part of the replication protocol.
- * This message is sent by a server or a replication server when an error
- * is detected in the context of a total update.
- */
-public class ErrorMessage extends RoutableMessage implements
- Serializable
-{
- private static final long serialVersionUID = 2726389860247088266L;
-
- // The tracer object for the debug logger
- private static final DebugTracer TRACER = getTracer();
-
- // Specifies the messageID built from the error that was detected
- private int msgID;
-
- // Specifies the complementary details about the error that was detected
- private Message details = null;
-
- /**
- * Creates an ErrorMessage providing the destination server.
- *
- * @param sender The server ID of the server that send this message.
- * @param destination The destination server or servers of this message.
- * @param details The message containing the details of the error.
- */
- public ErrorMessage(short sender, short destination,
- Message details)
- {
- super(sender, destination);
- this.msgID = details.getDescriptor().getId();
- this.details = details;
-
- if (debugEnabled())
- TRACER.debugInfo(" Creating error message" + this.toString());
- }
-
- /**
- * Creates an ErrorMessage.
- *
- * @param destination replication server id
- * @param details details of the error
- */
- public ErrorMessage(short destination, Message details)
- {
- super((short)-2, destination);
- this.msgID = details.getDescriptor().getId();
- this.details = details;
-
- if (debugEnabled())
- TRACER.debugInfo(this.toString());
- }
-
- /**
- * Creates a new ErrorMessage by decoding the provided byte array.
- *
- * @param in A byte array containing the encoded information for the Message
- * @throws DataFormatException If the in does not contain a properly
- * encoded message.
- */
- public ErrorMessage(byte[] in) throws DataFormatException
- {
- super();
- try
- {
- /* first byte is the type */
- if (in[0] != MSG_TYPE_ERROR)
- throw new DataFormatException("input is not a valid InitializeMessage");
- int pos = 1;
-
- // sender
- int length = getNextLength(in, pos);
- String senderString = new String(in, pos, length, "UTF-8");
- senderID = Short.valueOf(senderString);
- pos += length +1;
-
- // destination
- length = getNextLength(in, pos);
- String serverIdString = new String(in, pos, length, "UTF-8");
- destination = Short.valueOf(serverIdString);
- pos += length +1;
-
- // MsgID
- length = getNextLength(in, pos);
- String msgIdString = new String(in, pos, length, "UTF-8");
- msgID = Integer.valueOf(msgIdString);
- pos += length +1;
-
- // Details
- length = getNextLength(in, pos);
- details = Message.raw(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- }
- catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * Get the base DN from this InitializeMessage.
- *
- * @return the base DN from this InitializeMessage.
- */
- public Message getDetails()
- {
- return details;
- }
-
- /**
- * Get the base DN from this InitializeMessage.
- *
- * @return the base DN from this InitializeMessage.
- */
- public int getMsgID()
- {
- return msgID;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- /* The InitializeMessage is stored in the form :
- * <operation type><basedn><serverid>
- */
- try {
- byte[] byteSender = String.valueOf(senderID).getBytes("UTF-8");
- byte[] byteDestination = String.valueOf(destination).getBytes("UTF-8");
- byte[] byteErrMsgId = String.valueOf(msgID).getBytes("UTF-8");
- byte[] byteDetails = details.toString().getBytes("UTF-8");
-
- int length = 1 + byteSender.length + 1
- + byteDestination.length + 1
- + byteErrMsgId.length + 1
- + byteDetails.length + 1;
-
- byte[] resultByteArray = new byte[length];
-
- // put the type of the operation
- resultByteArray[0] = MSG_TYPE_ERROR;
- int pos = 1;
-
- // sender
- pos = addByteArray(byteSender, resultByteArray, pos);
-
- // destination
- pos = addByteArray(byteDestination, resultByteArray, pos);
-
- // MsgId
- pos = addByteArray(byteErrMsgId, resultByteArray, pos);
-
- // details
- pos = addByteArray(byteDetails, resultByteArray, pos);
-
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-
- /**
- * Returns a string representation of the message.
- *
- * @return the string representation of this message.
- */
- public String toString()
- {
- return "ErrorMessage=["+
- " sender=" + this.senderID +
- " destination=" + this.destination +
- " msgID=" + this.msgID +
- " details=" + this.details + "]";
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ErrorMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ErrorMsg.java
new file mode 100644
index 0000000..bb8b2fd
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ErrorMsg.java
@@ -0,0 +1,214 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+import org.opends.messages.Message;
+
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import static org.opends.server.loggers.debug.DebugLogger.getTracer;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+import org.opends.server.loggers.debug.DebugTracer;
+
+/**
+ * This message is part of the replication protocol.
+ * This message is sent by a server or a replication server when an error
+ * is detected in the context of a total update.
+ */
+public class ErrorMsg extends RoutableMsg
+{
+ // The tracer object for the debug logger
+ private static final DebugTracer TRACER = getTracer();
+
+ // Specifies the messageID built from the error that was detected
+ private int msgID;
+
+ // Specifies the complementary details about the error that was detected
+ private Message details = null;
+
+ /**
+ * Creates an ErrorMsg providing the destination server.
+ *
+ * @param sender The server ID of the server that send this message.
+ * @param destination The destination server or servers of this message.
+ * @param details The message containing the details of the error.
+ */
+ public ErrorMsg(short sender, short destination,
+ Message details)
+ {
+ super(sender, destination);
+ this.msgID = details.getDescriptor().getId();
+ this.details = details;
+
+ if (debugEnabled())
+ TRACER.debugInfo(" Creating error message" + this.toString());
+ }
+
+ /**
+ * Creates an ErrorMsg.
+ *
+ * @param destination replication server id
+ * @param details details of the error
+ */
+ public ErrorMsg(short destination, Message details)
+ {
+ super((short)-2, destination);
+ this.msgID = details.getDescriptor().getId();
+ this.details = details;
+
+ if (debugEnabled())
+ TRACER.debugInfo(this.toString());
+ }
+
+ /**
+ * Creates a new ErrorMsg by decoding the provided byte array.
+ *
+ * @param in A byte array containing the encoded information for the Message
+ * @throws DataFormatException If the in does not contain a properly
+ * encoded message.
+ */
+ public ErrorMsg(byte[] in) throws DataFormatException
+ {
+ super();
+ try
+ {
+ /* first byte is the type */
+ if (in[0] != MSG_TYPE_ERROR)
+ throw new DataFormatException("input is not a valid InitializeMessage");
+ int pos = 1;
+
+ // sender
+ int length = getNextLength(in, pos);
+ String senderString = new String(in, pos, length, "UTF-8");
+ senderID = Short.valueOf(senderString);
+ pos += length +1;
+
+ // destination
+ length = getNextLength(in, pos);
+ String serverIdString = new String(in, pos, length, "UTF-8");
+ destination = Short.valueOf(serverIdString);
+ pos += length +1;
+
+ // MsgID
+ length = getNextLength(in, pos);
+ String msgIdString = new String(in, pos, length, "UTF-8");
+ msgID = Integer.valueOf(msgIdString);
+ pos += length +1;
+
+ // Details
+ length = getNextLength(in, pos);
+ details = Message.raw(new String(in, pos, length, "UTF-8"));
+ pos += length +1;
+
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * Get the base DN from this InitializeMessage.
+ *
+ * @return the base DN from this InitializeMessage.
+ */
+ public Message getDetails()
+ {
+ return details;
+ }
+
+ /**
+ * Get the base DN from this InitializeMessage.
+ *
+ * @return the base DN from this InitializeMessage.
+ */
+ public int getMsgID()
+ {
+ return msgID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ /* The InitializeMessage is stored in the form :
+ * <operation type><basedn><serverid>
+ */
+ try {
+ byte[] byteSender = String.valueOf(senderID).getBytes("UTF-8");
+ byte[] byteDestination = String.valueOf(destination).getBytes("UTF-8");
+ byte[] byteErrMsgId = String.valueOf(msgID).getBytes("UTF-8");
+ byte[] byteDetails = details.toString().getBytes("UTF-8");
+
+ int length = 1 + byteSender.length + 1
+ + byteDestination.length + 1
+ + byteErrMsgId.length + 1
+ + byteDetails.length + 1;
+
+ byte[] resultByteArray = new byte[length];
+
+ // put the type of the operation
+ resultByteArray[0] = MSG_TYPE_ERROR;
+ int pos = 1;
+
+ // sender
+ pos = addByteArray(byteSender, resultByteArray, pos);
+
+ // destination
+ pos = addByteArray(byteDestination, resultByteArray, pos);
+
+ // MsgId
+ pos = addByteArray(byteErrMsgId, resultByteArray, pos);
+
+ // details
+ pos = addByteArray(byteDetails, resultByteArray, pos);
+
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Returns a string representation of the message.
+ *
+ * @return the string representation of this message.
+ */
+ public String toString()
+ {
+ return "ErrorMessage=["+
+ " sender=" + this.senderID +
+ " destination=" + this.destination +
+ " msgID=" + this.msgID +
+ " details=" + this.details + "]";
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatMessage.java
deleted file mode 100644
index c3e73fc..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatMessage.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.server.replication.protocol;
-
-import java.util.zip.DataFormatException;
-
-/**
- * This message is sent at regular intervals by the replication server
- * when it is sending no other messages. It allows the directory server to
- * detect a problem sooner when a synchronization server has crashed or has
- * been isolated from the network.
- */
-public class HeartbeatMessage extends ReplicationMessage
-{
- /**
- * Create a new HeartbeatMessage.
- *
- */
- public HeartbeatMessage()
- {
- }
-
- /**
- * Creates a new heartbeat message from its encoded form.
- *
- * @param in The byte array containing the encoded form of the message.
- * @throws java.util.zip.DataFormatException If the byte array does not
- * contain a valid encoded form of the message.
- */
- public HeartbeatMessage(byte[] in) throws DataFormatException
- {
- /* The heartbeat message is encoded in the form :
- * <msg-type>
- */
-
- /* first byte is the type */
- if (in.length != 1 || in[0] != MSG_TYPE_HEARTBEAT)
- throw new DataFormatException("Input is not a valid Heartbeat Message.");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- /*
- * The heartbeat message contains:
- * <msg-type>
- */
- int length = 1;
- byte[] resultByteArray = new byte[length];
-
- /* put the message type */
- resultByteArray[0] = MSG_TYPE_HEARTBEAT;
-
- return resultByteArray;
- }
-
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatMsg.java
new file mode 100644
index 0000000..7bbfe92
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatMsg.java
@@ -0,0 +1,85 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.replication.protocol;
+
+import java.util.zip.DataFormatException;
+
+/**
+ * This message is sent at regular intervals by the replication server
+ * when it is sending no other messages. It allows the directory server to
+ * detect a problem sooner when a synchronization server has crashed or has
+ * been isolated from the network.
+ */
+public class HeartbeatMsg extends ReplicationMsg
+{
+ /**
+ * Create a new HeartbeatMsg.
+ *
+ */
+ public HeartbeatMsg()
+ {
+ }
+
+ /**
+ * Creates a new heartbeat message from its encoded form.
+ *
+ * @param in The byte array containing the encoded form of the message.
+ * @throws java.util.zip.DataFormatException If the byte array does not
+ * contain a valid encoded form of the message.
+ */
+ public HeartbeatMsg(byte[] in) throws DataFormatException
+ {
+ /* The heartbeat message is encoded in the form :
+ * <msg-type>
+ */
+
+ /* first byte is the type */
+ if (in.length != 1 || in[0] != MSG_TYPE_HEARTBEAT)
+ throw new DataFormatException("Input is not a valid Heartbeat Message.");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ /*
+ * The heartbeat message contains:
+ * <msg-type>
+ */
+ int length = 1;
+ byte[] resultByteArray = new byte[length];
+
+ /* put the message type */
+ resultByteArray[0] = MSG_TYPE_HEARTBEAT;
+
+ return resultByteArray;
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatThread.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatThread.java
index 8341a6e..8b97568 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/HeartbeatThread.java
@@ -99,7 +99,7 @@
TRACER.debugInfo("Heartbeat thread is starting, interval is %d",
heartbeatInterval);
}
- HeartbeatMessage heartbeatMessage = new HeartbeatMessage();
+ HeartbeatMsg heartbeatMessage = new HeartbeatMsg();
while (!shutdown)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMessage.java
deleted file mode 100644
index 1b864a5..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMessage.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
-
-/**
- * This message is part of the replication protocol.
- * This message is sent by a server to another server in order to
- * request this other server to do an export to the server sender
- * of this message.
- */
-public class InitializeRequestMessage extends RoutableMessage implements
- Serializable
-{
- private static final long serialVersionUID = 8303271162942249215L;
-
- private String baseDn = null;
-
- /**
- * Creates a InitializeRequestMessage message.
- *
- * @param baseDn The base DN of the replication domain.
- * @param destination destination of this message
- * @param senderID serverID of the server that will send this message
- */
- public InitializeRequestMessage(DN baseDn, short senderID, short destination)
- {
- super(senderID, destination);
- this.baseDn = baseDn.toNormalizedString();
- }
-
- /**
- * Creates a new InitializeRequestMessage by decoding the provided byte array.
- * @param in A byte array containing the encoded information for the Message
- * @throws DataFormatException If the in does not contain a properly
- * encoded InitializeMessage.
- */
- public InitializeRequestMessage(byte[] in) throws DataFormatException
- {
- super();
- try
- {
- /* first byte is the type */
- if (in[0] != MSG_TYPE_INITIALIZE_REQUEST)
- throw new DataFormatException(
- "input is not a valid InitializeRequestMessage");
- int pos = 1;
-
- // baseDn
- int length = getNextLength(in, pos);
- baseDn = new String(in, pos, length, "UTF-8");
- pos += length +1;
-
- // sender
- length = getNextLength(in, pos);
- String sourceServerIdString = new String(in, pos, length, "UTF-8");
- senderID = Short.valueOf(sourceServerIdString);
- pos += length +1;
-
- // destination
- length = getNextLength(in, pos);
- String destinationServerIdString = new String(in, pos, length, "UTF-8");
- destination = Short.valueOf(destinationServerIdString);
- pos += length +1;
-
-
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * Get the base DN from this InitializeRequestMessage.
- *
- * @return the base DN from this InitializeRequestMessage.
- */
- public DN getBaseDn()
- {
- if (baseDn == null)
- return null;
- try
- {
- return DN.decode(baseDn);
- } catch (DirectoryException e)
- {
- return null;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- try {
- byte[] baseDNBytes = baseDn.getBytes("UTF-8");
- byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
- byte[] destinationBytes = String.valueOf(destination).
- getBytes("UTF-8");
-
- int length = 1 + baseDNBytes.length + 1 + senderBytes.length + 1
- + destinationBytes.length + 1;
-
- byte[] resultByteArray = new byte[length];
-
- // type of the operation
- resultByteArray[0] = MSG_TYPE_INITIALIZE_REQUEST;
- int pos = 1;
-
- // baseDN
- pos = addByteArray(baseDNBytes, resultByteArray, pos);
-
- // sender
- pos = addByteArray(senderBytes, resultByteArray, pos);
-
- // destination
- pos = addByteArray(destinationBytes, resultByteArray, pos);
-
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-
- /**
- * Get a string representation of this object.
- * @return A string representation of this object.
- */
- public String toString()
- {
- return "InitializeRequestMessage: baseDn="+baseDn+" senderId="+senderID +
- " destination=" + destination;
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java
new file mode 100644
index 0000000..668bb2d
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java
@@ -0,0 +1,164 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+
+/**
+ * This message is part of the replication protocol.
+ * This message is sent by a server to another server in order to
+ * request this other server to do an export to the server sender
+ * of this message.
+ */
+public class InitializeRequestMsg extends RoutableMsg
+{
+ private String baseDn = null;
+
+ /**
+ * Creates a InitializeRequestMsg message.
+ *
+ * @param baseDn The base DN of the replication domain.
+ * @param destination destination of this message
+ * @param senderID serverID of the server that will send this message
+ */
+ public InitializeRequestMsg(DN baseDn, short senderID, short destination)
+ {
+ super(senderID, destination);
+ this.baseDn = baseDn.toNormalizedString();
+ }
+
+ /**
+ * Creates a new InitializeRequestMsg by decoding the provided byte array.
+ * @param in A byte array containing the encoded information for the Message
+ * @throws DataFormatException If the in does not contain a properly
+ * encoded InitializeMessage.
+ */
+ public InitializeRequestMsg(byte[] in) throws DataFormatException
+ {
+ super();
+ try
+ {
+ /* first byte is the type */
+ if (in[0] != MSG_TYPE_INITIALIZE_REQUEST)
+ throw new DataFormatException(
+ "input is not a valid InitializeRequestMessage");
+ int pos = 1;
+
+ // baseDn
+ int length = getNextLength(in, pos);
+ baseDn = new String(in, pos, length, "UTF-8");
+ pos += length +1;
+
+ // sender
+ length = getNextLength(in, pos);
+ String sourceServerIdString = new String(in, pos, length, "UTF-8");
+ senderID = Short.valueOf(sourceServerIdString);
+ pos += length +1;
+
+ // destination
+ length = getNextLength(in, pos);
+ String destinationServerIdString = new String(in, pos, length, "UTF-8");
+ destination = Short.valueOf(destinationServerIdString);
+ pos += length +1;
+
+
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * Get the base DN from this InitializeRequestMsg.
+ *
+ * @return the base DN from this InitializeRequestMsg.
+ */
+ public DN getBaseDn()
+ {
+ if (baseDn == null)
+ return null;
+ try
+ {
+ return DN.decode(baseDn);
+ } catch (DirectoryException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ try {
+ byte[] baseDNBytes = baseDn.getBytes("UTF-8");
+ byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
+ byte[] destinationBytes = String.valueOf(destination).
+ getBytes("UTF-8");
+
+ int length = 1 + baseDNBytes.length + 1 + senderBytes.length + 1
+ + destinationBytes.length + 1;
+
+ byte[] resultByteArray = new byte[length];
+
+ // type of the operation
+ resultByteArray[0] = MSG_TYPE_INITIALIZE_REQUEST;
+ int pos = 1;
+
+ // baseDN
+ pos = addByteArray(baseDNBytes, resultByteArray, pos);
+
+ // sender
+ pos = addByteArray(senderBytes, resultByteArray, pos);
+
+ // destination
+ pos = addByteArray(destinationBytes, resultByteArray, pos);
+
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Get a string representation of this object.
+ * @return A string representation of this object.
+ */
+ public String toString()
+ {
+ return "InitializeRequestMessage: baseDn="+baseDn+" senderId="+senderID +
+ " destination=" + destination;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMessage.java
deleted file mode 100644
index 68dc39c..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMessage.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
-
-/**
- * This message is part of the replication protocol.
- * This message is sent by a server to one or several servers as the
- * first message of an export, before sending the entries.
- */
-public class InitializeTargetMessage extends RoutableMessage implements
- Serializable
-{
- private static final long serialVersionUID = -2122460559739139735L;
-
- private String baseDN = null;
-
- // Specifies the number of entries expected to be exported.
- private long entryCount;
-
- // Specifies the serverID of the server that requested this export
- // to happen. It allows a server that previously sent an
- // InitializeRequestMessage to know that the current message
- // is related to its own request.
- private short requestorID;
-
- /**
- * Creates a InitializeDestinationMessage.
- *
- * @param baseDN The base DN for which the InitializeMessage is created.
- * @param senderID The serverID of the server that sends this message.
- * @param destination The destination of this message.
- * @param requestorID The server that initiates this export.
- * @param entryCount The count of entries that will be sent.
- */
- public InitializeTargetMessage(DN baseDN, short senderID,
- short destination, short requestorID, long entryCount)
- {
- super(senderID, destination);
- this.requestorID = requestorID;
- this.baseDN = baseDN.toNormalizedString();
- this.entryCount = entryCount;
- }
-
- /**
- * Creates an InitializeTargetMessage by decoding the provided byte array.
- * @param in A byte array containing the encoded information for the Message
- * @throws DataFormatException If the in does not contain a properly
- * encoded InitializeMessage.
- */
- public InitializeTargetMessage(byte[] in) throws DataFormatException
- {
- super();
- try
- {
- /* first byte is the type */
- if (in[0] != MSG_TYPE_INITIALIZE_TARGET)
- throw new DataFormatException(
- "input is not a valid InitializeDestinationMessage");
- int pos = 1;
-
- // destination
- int length = getNextLength(in, pos);
- String destinationString = new String(in, pos, length, "UTF-8");
- this.destination = Short.valueOf(destinationString);
- pos += length +1;
-
- // baseDn
- length = getNextLength(in, pos);
- baseDN = new String(in, pos, length, "UTF-8");
- pos += length +1;
-
- // sender
- length = getNextLength(in, pos);
- String senderString = new String(in, pos, length, "UTF-8");
- senderID = Short.valueOf(senderString);
- pos += length +1;
-
- // requestor
- length = getNextLength(in, pos);
- String requestorString = new String(in, pos, length, "UTF-8");
- requestorID = Short.valueOf(requestorString);
- pos += length +1;
-
- // entryCount
- length = getNextLength(in, pos);
- String entryCountString = new String(in, pos, length, "UTF-8");
- entryCount = Long.valueOf(entryCountString);
- pos += length +1;
-
- }
- catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * Get the number of entries expected to be sent during the export.
- * @return the entry count
- */
- public long getEntryCount()
- {
- return this.entryCount;
- }
-
- /**
- * Get the serverID of the server that initiated the export.
- * @return the serverID
- */
- public long getRequestorID()
- {
- return this.requestorID;
- }
-
- /**
- * Get the base DN of the domain.
- *
- * @return the base DN
- */
- public DN getBaseDN()
- {
- if (baseDN == null)
- return null;
- try
- {
- return DN.decode(baseDN);
- } catch (DirectoryException e)
- {
- return null;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- try
- {
- byte[] byteDestination = String.valueOf(destination).getBytes("UTF-8");
- byte[] byteDn = baseDN.getBytes("UTF-8");
- byte[] byteSender = String.valueOf(senderID).getBytes("UTF-8");
- byte[] byteRequestor = String.valueOf(requestorID).getBytes("UTF-8");
- byte[] byteEntryCount = String.valueOf(entryCount).getBytes("UTF-8");
-
- int length = 1 + byteDestination.length + 1
- + byteDn.length + 1
- + byteSender.length + 1
- + byteRequestor.length + 1
- + byteEntryCount.length + 1;
-
- byte[] resultByteArray = new byte[length];
-
- /* put the type of the operation */
- resultByteArray[0] = MSG_TYPE_INITIALIZE_TARGET;
- int pos = 1;
-
- /* put the destination */
- pos = addByteArray(byteDestination, resultByteArray, pos);
-
- /* put the baseDN and a terminating 0 */
- pos = addByteArray(byteDn, resultByteArray, pos);
-
- /* put the sender */
- pos = addByteArray(byteSender, resultByteArray, pos);
-
- /* put the requestorID */
- pos = addByteArray(byteRequestor, resultByteArray, pos);
-
- /* put the entryCount */
- pos = addByteArray(byteEntryCount, resultByteArray, pos);
-
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
new file mode 100644
index 0000000..70a80e2
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
@@ -0,0 +1,208 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+
+/**
+ * This message is part of the replication protocol.
+ * This message is sent by a server to one or several servers as the
+ * first message of an export, before sending the entries.
+ */
+public class InitializeTargetMsg extends RoutableMsg
+{
+ private String baseDN = null;
+
+ // Specifies the number of entries expected to be exported.
+ private long entryCount;
+
+ // Specifies the serverID of the server that requested this export
+ // to happen. It allows a server that previously sent an
+ // InitializeRequestMessage to know that the current message
+ // is related to its own request.
+ private short requestorID;
+
+ /**
+ * Creates a InitializeDestinationMessage.
+ *
+ * @param baseDN The base DN for which the InitializeMessage is created.
+ * @param senderID The serverID of the server that sends this message.
+ * @param destination The destination of this message.
+ * @param requestorID The server that initiates this export.
+ * @param entryCount The count of entries that will be sent.
+ */
+ public InitializeTargetMsg(DN baseDN, short senderID,
+ short destination, short requestorID, long entryCount)
+ {
+ super(senderID, destination);
+ this.requestorID = requestorID;
+ this.baseDN = baseDN.toNormalizedString();
+ this.entryCount = entryCount;
+ }
+
+ /**
+ * Creates an InitializeTargetMsg by decoding the provided byte array.
+ * @param in A byte array containing the encoded information for the Message
+ * @throws DataFormatException If the in does not contain a properly
+ * encoded InitializeMessage.
+ */
+ public InitializeTargetMsg(byte[] in) throws DataFormatException
+ {
+ super();
+ try
+ {
+ /* first byte is the type */
+ if (in[0] != MSG_TYPE_INITIALIZE_TARGET)
+ throw new DataFormatException(
+ "input is not a valid InitializeDestinationMessage");
+ int pos = 1;
+
+ // destination
+ int length = getNextLength(in, pos);
+ String destinationString = new String(in, pos, length, "UTF-8");
+ this.destination = Short.valueOf(destinationString);
+ pos += length +1;
+
+ // baseDn
+ length = getNextLength(in, pos);
+ baseDN = new String(in, pos, length, "UTF-8");
+ pos += length +1;
+
+ // sender
+ length = getNextLength(in, pos);
+ String senderString = new String(in, pos, length, "UTF-8");
+ senderID = Short.valueOf(senderString);
+ pos += length +1;
+
+ // requestor
+ length = getNextLength(in, pos);
+ String requestorString = new String(in, pos, length, "UTF-8");
+ requestorID = Short.valueOf(requestorString);
+ pos += length +1;
+
+ // entryCount
+ length = getNextLength(in, pos);
+ String entryCountString = new String(in, pos, length, "UTF-8");
+ entryCount = Long.valueOf(entryCountString);
+ pos += length +1;
+
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * Get the number of entries expected to be sent during the export.
+ * @return the entry count
+ */
+ public long getEntryCount()
+ {
+ return this.entryCount;
+ }
+
+ /**
+ * Get the serverID of the server that initiated the export.
+ * @return the serverID
+ */
+ public long getRequestorID()
+ {
+ return this.requestorID;
+ }
+
+ /**
+ * Get the base DN of the domain.
+ *
+ * @return the base DN
+ */
+ public DN getBaseDN()
+ {
+ if (baseDN == null)
+ return null;
+ try
+ {
+ return DN.decode(baseDN);
+ } catch (DirectoryException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ try
+ {
+ byte[] byteDestination = String.valueOf(destination).getBytes("UTF-8");
+ byte[] byteDn = baseDN.getBytes("UTF-8");
+ byte[] byteSender = String.valueOf(senderID).getBytes("UTF-8");
+ byte[] byteRequestor = String.valueOf(requestorID).getBytes("UTF-8");
+ byte[] byteEntryCount = String.valueOf(entryCount).getBytes("UTF-8");
+
+ int length = 1 + byteDestination.length + 1
+ + byteDn.length + 1
+ + byteSender.length + 1
+ + byteRequestor.length + 1
+ + byteEntryCount.length + 1;
+
+ byte[] resultByteArray = new byte[length];
+
+ /* put the type of the operation */
+ resultByteArray[0] = MSG_TYPE_INITIALIZE_TARGET;
+ int pos = 1;
+
+ /* put the destination */
+ pos = addByteArray(byteDestination, resultByteArray, pos);
+
+ /* put the baseDN and a terminating 0 */
+ pos = addByteArray(byteDn, resultByteArray, pos);
+
+ /* put the sender */
+ pos = addByteArray(byteSender, resultByteArray, pos);
+
+ /* put the requestorID */
+ pos = addByteArray(byteRequestor, resultByteArray, pos);
+
+ /* put the entryCount */
+ pos = addByteArray(byteEntryCount, resultByteArray, pos);
+
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
index 9dac7f6..1a3cd39 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
@@ -44,13 +44,12 @@
/**
* Message used to send Modify DN information.
*/
-public class ModifyDNMsg extends UpdateMessage
+public class ModifyDNMsg extends UpdateMsg
{
private String newRDN;
private String newSuperior;
private boolean deleteOldRdn;
private String newSuperiorId;
- private static final long serialVersionUID = -4905520652801395185L;
/**
* construct a new Modify DN message.
@@ -104,15 +103,16 @@
* Creates a new ModifyDN message from a byte[].
*
* @param in The byte[] from which the operation must be read.
- * @throws DataFormatException The input byte[] is not a valid AddMsg.
+ * @throws DataFormatException The input byte[] is not a valid ModifyDNMsg.
* @throws UnsupportedEncodingException If UTF8 is not supported.
*/
public ModifyDNMsg(byte[] in) throws DataFormatException,
UnsupportedEncodingException
{
- super(in);
-
- int pos = decodeHeader(MSG_TYPE_MODIFYDN_REQUEST, in);
+ byte[] allowedPduTypes = new byte[2];
+ allowedPduTypes[0] = MSG_TYPE_MODIFYDN;
+ allowedPduTypes[1] = MSG_TYPE_MODIFYDN_V1;
+ int pos = decodeHeader(allowedPduTypes, in);
/* read the newRDN
* first calculate the length then construct the string
@@ -167,12 +167,7 @@
}
/**
- * Get the byte array representation of this Message.
- *
- * @return The byte array representation of this Message.
- *
- * @throws UnsupportedEncodingException When the encoding of the message
- * failed because the UTF-8 encoding is not supported.
+ * {@inheritDoc}
*/
@Override
public byte[] getBytes() throws UnsupportedEncodingException
@@ -199,7 +194,7 @@
else
length += 1;
- byte[] resultByteArray = encodeHeader(MSG_TYPE_MODIFYDN_REQUEST, length);
+ byte[] resultByteArray = encodeHeader(MSG_TYPE_MODIFYDN, length);
int pos = resultByteArray.length - length;
/* put the new RDN and a terminating 0 */
@@ -236,8 +231,33 @@
@Override
public String toString()
{
- return ("MODDN " + getDn() + " " + newRDN + " " + newSuperior + " " +
- getChangeNumber());
+ if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ {
+ return "ModifyDNMsg content: " +
+ "\nprotocolVersion: " + protocolVersion +
+ "\ndn: " + dn +
+ "\nchangeNumber: " + changeNumber +
+ "\nuniqueId: " + uniqueId +
+ "\nassuredFlag: " + assuredFlag +
+ "\nnewRDN: " + newRDN +
+ "\nnewSuperior: " + newSuperior +
+ "\ndeleteOldRdn: " + deleteOldRdn;
+ }
+ if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V2)
+ {
+ return "ModifyDNMsg content: " +
+ "\nprotocolVersion: " + protocolVersion +
+ "\ndn: " + dn +
+ "\nchangeNumber: " + changeNumber +
+ "\nuniqueId: " + uniqueId +
+ "\nnewRDN: " + newRDN +
+ "\nnewSuperior: " + newSuperior +
+ "\ndeleteOldRdn: " + deleteOldRdn +
+ "\nassuredFlag: " + assuredFlag +
+ "\nassuredMode: " + assuredMode +
+ "\nsafeDataLevel: " + safeDataLevel;
+ }
+ return "!!! Unknown version: " + protocolVersion + "!!!";
}
/**
@@ -250,6 +270,56 @@
}
/**
+ * Get the new superior.
+ *
+ * @return The new superior.
+ */
+ public String getNewSuperior()
+ {
+ return newSuperior;
+ }
+
+ /**
+ * Get the new superior id.
+ *
+ * @return The new superior id.
+ */
+ public String getNewSuperiorId()
+ {
+ return newSuperiorId;
+ }
+
+ /**
+ * Get the delete old rdn option.
+ *
+ * @return The delete old rdn option.
+ */
+ public boolean deleteOldRdn()
+ {
+ return deleteOldRdn;
+ }
+
+ /**
+ * Set the new superior id.
+ *
+ * @param newSup The new superior id.
+ */
+ public void setNewSuperiorId(String newSup)
+ {
+ newSuperiorId = newSup;
+ }
+
+ /**
+ * Set the delete old rdn option.
+ *
+ * @param delete The delete old rdn option.
+ */
+ public void setDeleteOldRdn(boolean delete)
+ {
+ deleteOldRdn = delete;
+ }
+
+ /**
* Get the new RDN of this operation.
*
* @return The new RDN of this operation.
@@ -371,4 +441,61 @@
return 100;
}
+ /**
+ * {@inheritDoc}
+ */
+ public byte[] getBytes_V1() throws UnsupportedEncodingException
+ {
+ byte[] byteNewRdn = newRDN.getBytes("UTF-8");
+ byte[] byteNewSuperior = null;
+ byte[] byteNewSuperiorId = null;
+
+ // calculate the length necessary to encode the parameters
+ int length = byteNewRdn.length + 1 + 1;
+ if (newSuperior != null)
+ {
+ byteNewSuperior = newSuperior.getBytes("UTF-8");
+ length += byteNewSuperior.length + 1;
+ }
+ else
+ length += 1;
+
+ if (newSuperiorId != null)
+ {
+ byteNewSuperiorId = newSuperiorId.getBytes("UTF-8");
+ length += byteNewSuperiorId.length + 1;
+ }
+ else
+ length += 1;
+
+ byte[] resultByteArray = encodeHeader_V1(MSG_TYPE_MODIFYDN_V1, length);
+ int pos = resultByteArray.length - length;
+
+ /* put the new RDN and a terminating 0 */
+ pos = addByteArray(byteNewRdn, resultByteArray, pos);
+
+ /* put the newsuperior and a terminating 0 */
+ if (newSuperior != null)
+ {
+ pos = addByteArray(byteNewSuperior, resultByteArray, pos);
+ }
+ else
+ resultByteArray[pos++] = 0;
+
+ /* put the newsuperiorId and a terminating 0 */
+ if (newSuperiorId != null)
+ {
+ pos = addByteArray(byteNewSuperiorId, resultByteArray, pos);
+ }
+ else
+ resultByteArray[pos++] = 0;
+
+ /* put the deleteoldrdn flag */
+ if (deleteOldRdn)
+ resultByteArray[pos++] = 1;
+ else
+ resultByteArray[pos++] = 0;
+
+ return resultByteArray;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
index d5397b8..5416659 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
@@ -56,11 +56,9 @@
/**
* Message used to send Modify information.
*/
-public class ModifyMsg extends UpdateMessage
+public class ModifyMsg extends UpdateMsg
{
- private static final long serialVersionUID = -4905520652801395185L;
private byte[] encodedMods = null;
- private byte[] encodedMsg = null;
/**
* Creates a new Modify message from a ModifyOperation.
@@ -95,31 +93,49 @@
* Creates a new Modify message from a byte[].
*
* @param in The byte[] from which the operation must be read.
- * @throws DataFormatException If the input byte[] is not a valid modifyMsg
+ * @throws DataFormatException If the input byte[] is not a valid ModifyMsg
* @throws UnsupportedEncodingException If UTF8 is not supported by the JVM.
*/
public ModifyMsg(byte[] in) throws DataFormatException,
UnsupportedEncodingException
{
- super(in);
- encodedMsg = in;
+ // Decode header
+ byte[] allowedPduTypes = new byte[2];
+ allowedPduTypes[0] = MSG_TYPE_MODIFY;
+ allowedPduTypes[1] = MSG_TYPE_MODIFY_V1;
+ int pos = decodeHeader(allowedPduTypes, in);
+
+ /* Read the mods : all the remaining bytes but the terminating 0 */
+ int length = in.length - pos - 1;
+ encodedMods = new byte[length];
+ try
+ {
+ System.arraycopy(in, pos, encodedMods, 0, length);
+ } catch (IndexOutOfBoundsException e)
+ {
+ throw new DataFormatException(e.getMessage());
+ } catch (ArrayStoreException e)
+ {
+ throw new DataFormatException(e.getMessage());
+ } catch (NullPointerException e)
+ {
+ throw new DataFormatException(e.getMessage());
+ }
}
/**
- * Get the byte array representation of this Message.
- *
- * @return The byte array representation of this Message.
- *
- * @throws UnsupportedEncodingException When the encoding of the message
- * failed because the UTF-8 encoding is not supported.
+ * {@inheritDoc}
*/
@Override
public byte[] getBytes() throws UnsupportedEncodingException
{
- if (encodedMsg == null)
- {
- encode();
- }
+ /* encode the header in a byte[] large enough to also contain the mods */
+ byte[] encodedMsg = encodeHeader(MSG_TYPE_MODIFY, encodedMods.length + 1);
+
+ /* add the mods */
+ int pos = encodedMsg.length - (encodedMods.length + 1);
+ addByteArray(encodedMods, encodedMsg, pos);
+
return encodedMsg;
}
@@ -131,11 +147,6 @@
String newDn)
throws LDAPException, ASN1Exception, DataFormatException
{
- if (encodedMods == null)
- {
- decode();
- }
-
if (newDn == null)
newDn = getDn();
@@ -159,39 +170,6 @@
}
/**
- * Encode the Msg information into a byte array.
- *
- * @throws UnsupportedEncodingException If utf8 is not suported.
- */
- private void encode() throws UnsupportedEncodingException
- {
- /* encode the header in a byte[] large enough to also contain the mods */
- encodedMsg = encodeHeader(MSG_TYPE_MODIFY_REQUEST, encodedMods.length + 1);
- int pos = encodedMsg.length - (encodedMods.length + 1);
-
- /* add the mods */
- pos = addByteArray(encodedMods, encodedMsg, pos);
- }
-
- /**
- * Decode the encodedMsg into mods and dn.
- *
- * @throws DataFormatException when the encodedMsg is no a valid modify.
- */
- private void decode() throws DataFormatException
- {
- int pos = decodeHeader(MSG_TYPE_MODIFY_REQUEST, encodedMsg);
-
- /* Read the mods : all the remaining bytes but the terminating 0 */
- encodedMods = new byte[encodedMsg.length-pos-1];
- int i =0;
- while (pos<encodedMsg.length-1)
- {
- encodedMods[i++] = encodedMsg[pos++];
- }
- }
-
- /**
* Encode an ArrayList of Modification into a byte[] suitable
* for storage in a database or send on the network.
*
@@ -233,7 +211,37 @@
@Override
public String toString()
{
- return("MOD " + getDn() + " " + getChangeNumber());
+ if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ {
+ return "ModifyMsg content: " +
+ "\nprotocolVersion: " + protocolVersion +
+ "\ndn: " + dn +
+ "\nchangeNumber: " + changeNumber +
+ "\nuniqueId: " + uniqueId +
+ "\nassuredFlag: " + assuredFlag;
+ }
+ if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V2)
+ {
+ return "ModifyMsg content: " +
+ "\nprotocolVersion: " + protocolVersion +
+ "\ndn: " + dn +
+ "\nchangeNumber: " + changeNumber +
+ "\nuniqueId: " + uniqueId +
+ "\nassuredFlag: " + assuredFlag +
+ "\nassuredMode: " + assuredMode +
+ "\nsafeDataLevel: " + safeDataLevel;
+ }
+ return "!!! Unknown version: " + protocolVersion + "!!!";
+ }
+
+ /**
+ * Set the Modification associated to the UpdateMsg to the provided value.
+ *
+ * @param mods The new Modification associated to this ModifyMsg.
+ */
+ public void setMods(List<Modification> mods)
+ {
+ encodedMods = modsToByte(mods);
}
/**
@@ -242,9 +250,25 @@
@Override
public int size()
{
- // The ModifyMsh can be very large when added or deleted attribute
+ // The ModifyMsg can be very large when added or deleted attribute
// values are very large. We therefore need to count the
// whole encoded msg.
- return encodedMsg.length;
+ return encodedMods.length + 100; // 100 let's assume header size is 100
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public byte[] getBytes_V1() throws UnsupportedEncodingException
+ {
+ /* encode the header in a byte[] large enough to also contain the mods */
+ byte[] encodedMsg = encodeHeader_V1(MSG_TYPE_MODIFY_V1, encodedMods.length +
+ 1);
+
+ /* add the mods */
+ int pos = encodedMsg.length - (encodedMods.length + 1);
+ addByteArray(encodedMods, encodedMsg, pos);
+
+ return encodedMsg;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMessage.java
deleted file mode 100644
index 8568803..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMessage.java
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.opends.server.replication.common.ServerState;
-import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.protocols.asn1.ASN1Sequence;
-import org.opends.server.protocols.asn1.ASN1Element;
-import org.opends.server.replication.common.ChangeNumber;
-
-/**
- * This message is part of the replication protocol.
- * RS1 sends a MonitorRequestMessage to RS2 to requests its monitoring
- * informations.
- * When RS2 receives a MonitorRequestMessage from RS1, RS2 responds with a
- * MonitorMessage.
- */
-public class MonitorMessage extends RoutableMessage implements
- Serializable
-{
-
- private static final long serialVersionUID = -1900670921496804942L;
-
- /**
- * Data structure to manage the state and the approximation
- * of the data of the first missing change for each LDAP server
- * connected to a Replication Server.
- */
- class ServerData
- {
- ServerState state;
- Long approxFirstMissingDate;
- }
-
- /**
- * Data structure to manage the state of this replication server
- * and the state informations for the servers connected to it.
- *
- */
- class SubTopoMonitorData
- {
- // This replication server DbState
- ServerState replServerDbState;
- // The data related to the LDAP servers connected to this RS
- HashMap<Short, ServerData> ldapStates =
- new HashMap<Short, ServerData>();
- // The data related to the RS servers connected to this RS
- HashMap<Short, ServerData> rsStates =
- new HashMap<Short, ServerData>();
- }
-
- SubTopoMonitorData data = new SubTopoMonitorData();;
-
- /**
- * Creates a new EntryMessage.
- *
- * @param sender The sender of this message.
- * @param destination The destination of this message.
- */
- public MonitorMessage(short sender, short destination)
- {
- super(sender, destination);
- }
-
- /**
- * Sets the state of the replication server.
- * @param state The state.
- */
- public void setReplServerDbState(ServerState state)
- {
- data.replServerDbState = state;
- }
-
- /**
- * Sets the informations of an LDAP server.
- * @param serverId The serverID.
- * @param state The server state.
- * @param approxFirstMissingDate The approximation of the date
- * of the older missing change. null when none.
- * @param isLDAP Specifies whether the server is a LS or a RS
- */
- public void setServerState(short serverId, ServerState state,
- Long approxFirstMissingDate, boolean isLDAP)
- {
- if (data.ldapStates == null)
- {
- data.ldapStates = new HashMap<Short, ServerData>();
- }
- if (data.rsStates == null)
- {
- data.rsStates = new HashMap<Short, ServerData>();
- }
- ServerData sd = new ServerData();
- sd.state = state;
- sd.approxFirstMissingDate = approxFirstMissingDate;
- if (isLDAP)
- data.ldapStates.put(serverId, sd);
- else
- data.rsStates.put(serverId, sd);
- }
-
- /**
- * Get the server state for the LDAP server with the provided serverId.
- * @param serverId The provided serverId.
- * @return The state.
- */
- public ServerState getLDAPServerState(short serverId)
- {
- return data.ldapStates.get(serverId).state;
- }
-
- /**
- * Get the server state for the RS server with the provided serverId.
- * @param serverId The provided serverId.
- * @return The state.
- */
- public ServerState getRSServerState(short serverId)
- {
- return data.rsStates.get(serverId).state;
- }
-
-
- /**
- * Get the approximation of the date of the older missing change for the
- * LDAP Server with the provided server Id.
- * @param serverId The provided serverId.
- * @return The approximated state.
- */
- public Long getLDAPApproxFirstMissingDate(short serverId)
- {
- return data.ldapStates.get(serverId).approxFirstMissingDate;
- }
-
- /**
- * Get the approximation of the date of the older missing change for the
- * RS Server with the provided server Id.
- * @param serverId The provided serverId.
- * @return The approximated state.
- */
- public Long getRSApproxFirstMissingDate(short serverId)
- {
- return data.rsStates.get(serverId).approxFirstMissingDate;
- }
-
- /**
- * Creates a new EntryMessage from its encoded form.
- *
- * @param in The byte array containing the encoded form of the message.
- * @throws DataFormatException If the byte array does not contain a valid
- * encoded form of the ServerStartMessage.
- */
- public MonitorMessage(byte[] in) throws DataFormatException
- {
- try
- {
- /* first byte is the type */
- if (in[0] != MSG_TYPE_REPL_SERVER_MONITOR)
- throw new DataFormatException("input is not a valid " +
- this.getClass().getCanonicalName());
- int pos = 1;
-
- // sender
- int length = getNextLength(in, pos);
- String senderIDString = new String(in, pos, length, "UTF-8");
- this.senderID = Short.valueOf(senderIDString);
- pos += length +1;
-
- // destination
- length = getNextLength(in, pos);
- String destinationString = new String(in, pos, length, "UTF-8");
- this.destination = Short.valueOf(destinationString);
- pos += length +1;
-
- /* Read the states : all the remaining bytes but the terminating 0 */
- byte[] encodedS = new byte[in.length-pos-1];
- int i =0;
- while (pos<in.length-1)
- {
- encodedS[i++] = in[pos++];
- }
-
-
- try
- {
- ASN1Sequence s0 = ASN1Sequence.decodeAsSequence(encodedS);
- // loop on the servers
- for (ASN1Element el0 : s0.elements())
- {
- ServerState newState = new ServerState();
- short serverId = 0;
- Long outime = (long)0;
- boolean isLDAPServer = false;
- ASN1Sequence s1 = el0.decodeAsSequence();
-
- // loop on the list of CN of the state
- for (ASN1Element el1 : s1.elements())
- {
- ASN1OctetString o = el1.decodeAsOctetString();
- String s = o.stringValue();
- ChangeNumber cn = new ChangeNumber(s);
- if ((data.replServerDbState != null) && (serverId == 0))
- {
- // we are on the first CN that is a fake CN to store the serverId
- // and the older update time
- serverId = cn.getServerId();
- outime = cn.getTime();
- isLDAPServer = (cn.getSeqnum()>0);
- }
- else
- {
- // we are on a normal CN
- newState.update(cn);
- }
- }
-
- if (data.replServerDbState == null)
- {
- // the first state is the replication state
- data.replServerDbState = newState;
- }
- else
- {
- // the next states are the server states
- ServerData sd = new ServerData();
- sd.state = newState;
- sd.approxFirstMissingDate = outime;
- if (isLDAPServer)
- data.ldapStates.put(serverId, sd);
- else
- data.rsStates.put(serverId, sd);
- }
- }
- } catch(Exception e)
- {
-
- }
- }
- catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- try
- {
- byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
- byte[] destinationBytes = String.valueOf(destination).getBytes("UTF-8");
-
- int length = 1 + senderBytes.length +
- 1 + destinationBytes.length;
-
- ASN1Sequence stateElementSequence = new ASN1Sequence();
- ArrayList<ASN1Element> stateElementList = new ArrayList<ASN1Element>();
-
- /**
- * First loop computes the length
- */
-
- /* Put the serverStates ... */
- stateElementSequence = new ASN1Sequence();
- stateElementList = new ArrayList<ASN1Element>();
-
- /* first put the Replication Server state */
- ArrayList<ASN1OctetString> cnOctetList =
- data.replServerDbState.toASN1ArrayList();
- ArrayList<ASN1Element> cnElementList = new ArrayList<ASN1Element>();
- for (ASN1OctetString soci : cnOctetList)
- {
- cnElementList.add(soci);
- }
- ASN1Sequence cnSequence = new ASN1Sequence(cnElementList);
- stateElementList.add(cnSequence);
-
- // then the LDAP server data
- Set<Short> servers = data.ldapStates.keySet();
- for (Short sid : servers)
- {
- // State
- ServerState statei = data.ldapStates.get(sid).state;
- // First missing date
- Long outime = data.ldapStates.get(sid).approxFirstMissingDate;
-
- // retrieves the change numbers as an arrayList of ANSN1OctetString
- cnOctetList = statei.toASN1ArrayList();
- cnElementList = new ArrayList<ASN1Element>();
-
- // a fake changenumber helps storing the LDAP server ID
- // and the olderupdatetime
- ChangeNumber cn = new ChangeNumber(outime,0,sid);
- cnElementList.add(new ASN1OctetString(cn.toString()));
-
- // the changenumbers
- for (ASN1OctetString soci : cnOctetList)
- {
- cnElementList.add(soci);
- }
-
- cnSequence = new ASN1Sequence(cnElementList);
- stateElementList.add(cnSequence);
- }
-
- // then the rs server data
- servers = data.rsStates.keySet();
- for (Short sid : servers)
- {
- // State
- ServerState statei = data.rsStates.get(sid).state;
- // First missing date
- Long outime = data.rsStates.get(sid).approxFirstMissingDate;
-
- // retrieves the change numbers as an arrayList of ANSN1OctetString
- cnOctetList = statei.toASN1ArrayList();
- cnElementList = new ArrayList<ASN1Element>();
-
- // a fake changenumber helps storing the LDAP server ID
- // and the olderupdatetime
- ChangeNumber cn = new ChangeNumber(outime,0,sid);
- cnElementList.add(new ASN1OctetString(cn.toString()));
-
- // the changenumbers
- for (ASN1OctetString soci : cnOctetList)
- {
- cnElementList.add(soci);
- }
-
- cnSequence = new ASN1Sequence(cnElementList);
- stateElementList.add(cnSequence);
- }
-
- stateElementSequence.setElements(stateElementList);
- int seqLen = stateElementSequence.encode().length;
-
- //
- length += seqLen;
- length += 2;
-
- // Allocate the array sized from the computed length
- byte[] resultByteArray = new byte[length];
-
- /**
- * Second loop really builds the array
- */
-
- /* put the type of the operation */
- resultByteArray[0] = MSG_TYPE_REPL_SERVER_MONITOR;
- int pos = 1;
-
- pos = addByteArray(senderBytes, resultByteArray, pos);
- pos = addByteArray(destinationBytes, resultByteArray, pos);
-
- /* Put the serverStates ... */
- stateElementSequence = new ASN1Sequence();
- stateElementList = new ArrayList<ASN1Element>();
-
- /* first put the Replication Server state */
- cnOctetList =
- data.replServerDbState.toASN1ArrayList();
- cnElementList = new ArrayList<ASN1Element>();
- for (ASN1OctetString soci : cnOctetList)
- {
- cnElementList.add(soci);
- }
- cnSequence = new ASN1Sequence(cnElementList);
- stateElementList.add(cnSequence);
-
- // then the LDAP server datas
- servers = data.ldapStates.keySet();
- for (Short sid : servers)
- {
- ServerState statei = data.ldapStates.get(sid).state;
- Long outime = data.ldapStates.get(sid).approxFirstMissingDate;
-
- // retrieves the change numbers as an arrayList of ANSN1OctetString
- cnOctetList = statei.toASN1ArrayList();
- cnElementList = new ArrayList<ASN1Element>();
-
- // a fake changenumber helps storing the LDAP server ID
- ChangeNumber cn = new ChangeNumber(outime,1,sid);
- cnElementList.add(new ASN1OctetString(cn.toString()));
-
- // the changenumbers that make the state
- for (ASN1OctetString soci : cnOctetList)
- {
- cnElementList.add(soci);
- }
-
- cnSequence = new ASN1Sequence(cnElementList);
- stateElementList.add(cnSequence);
- }
-
- // then the RS server datas
- servers = data.rsStates.keySet();
- for (Short sid : servers)
- {
- ServerState statei = data.rsStates.get(sid).state;
- Long outime = data.rsStates.get(sid).approxFirstMissingDate;
-
- // retrieves the change numbers as an arrayList of ANSN1OctetString
- cnOctetList = statei.toASN1ArrayList();
- cnElementList = new ArrayList<ASN1Element>();
-
- // a fake changenumber helps storing the LDAP server ID
- ChangeNumber cn = new ChangeNumber(outime,0,sid);
- cnElementList.add(new ASN1OctetString(cn.toString()));
-
- // the changenumbers that make the state
- for (ASN1OctetString soci : cnOctetList)
- {
- cnElementList.add(soci);
- }
-
- cnSequence = new ASN1Sequence(cnElementList);
- stateElementList.add(cnSequence);
- }
-
-
- stateElementSequence.setElements(stateElementList);
- pos = addByteArray(stateElementSequence.encode(), resultByteArray, pos);
-
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-
- /**
- * Get the state of the replication server that sent this message.
- * @return The state.
- */
- public ServerState getReplServerDbState()
- {
- return data.replServerDbState;
- }
-
- /**
- * Returns an iterator on the serverId of the connected LDAP servers.
- * @return The iterator.
- */
- public Iterator<Short> ldapIterator()
- {
- return data.ldapStates.keySet().iterator();
- }
-
- /**
- * Returns an iterator on the serverId of the connected RS servers.
- * @return The iterator.
- */
- public Iterator<Short> rsIterator()
- {
- return data.rsStates.keySet().iterator();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString()
- {
- String stateS = "\nRState:[";
- stateS += data.replServerDbState.toString();
- stateS += "]";
-
- stateS += "\nLDAPStates:[";
- for (Short sid : data.ldapStates.keySet())
- {
- ServerData sd = data.ldapStates.get(sid);
- stateS +=
- "\n[LSstate("+ sid + ")=" +
- sd.state.toString() + "]" +
- " afmd=" + sd.approxFirstMissingDate + "]";
- }
-
- stateS += "\nRSStates:[";
- for (Short sid : data.rsStates.keySet())
- {
- ServerData sd = data.rsStates.get(sid);
- stateS +=
- "\n[RSState("+ sid + ")=" +
- sd.state.toString() + "]" +
- " afmd=" + sd.approxFirstMissingDate + "]";
- }
- String me = this.getClass().getCanonicalName() +
- "[ sender=" + this.senderID +
- " destination=" + this.destination +
- " data=[" + stateS + "]" +
- "]";
- return me;
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMsg.java
new file mode 100644
index 0000000..fa3a16c
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorMsg.java
@@ -0,0 +1,524 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.protocols.asn1.ASN1OctetString;
+import org.opends.server.protocols.asn1.ASN1Sequence;
+import org.opends.server.protocols.asn1.ASN1Element;
+import org.opends.server.replication.common.ChangeNumber;
+
+/**
+ * This message is part of the replication protocol.
+ * RS1 sends a MonitorRequestMessage to RS2 to requests its monitoring
+ * informations.
+ * When RS2 receives a MonitorRequestMessage from RS1, RS2 responds with a
+ * MonitorMsg.
+ */
+public class MonitorMsg extends RoutableMsg
+{
+ /**
+ * Data structure to manage the state and the approximation
+ * of the data of the first missing change for each LDAP server
+ * connected to a Replication Server.
+ */
+ class ServerData
+ {
+ ServerState state;
+ Long approxFirstMissingDate;
+ }
+
+ /**
+ * Data structure to manage the state of this replication server
+ * and the state informations for the servers connected to it.
+ *
+ */
+ class SubTopoMonitorData
+ {
+ // This replication server DbState
+ ServerState replServerDbState;
+ // The data related to the LDAP servers connected to this RS
+ HashMap<Short, ServerData> ldapStates =
+ new HashMap<Short, ServerData>();
+ // The data related to the RS servers connected to this RS
+ HashMap<Short, ServerData> rsStates =
+ new HashMap<Short, ServerData>();
+ }
+
+ SubTopoMonitorData data = new SubTopoMonitorData();;
+
+ /**
+ * Creates a new EntryMessage.
+ *
+ * @param sender The sender of this message.
+ * @param destination The destination of this message.
+ */
+ public MonitorMsg(short sender, short destination)
+ {
+ super(sender, destination);
+ }
+
+ /**
+ * Sets the state of the replication server.
+ * @param state The state.
+ */
+ public void setReplServerDbState(ServerState state)
+ {
+ data.replServerDbState = state;
+ }
+
+ /**
+ * Sets the informations of an LDAP server.
+ * @param serverId The serverID.
+ * @param state The server state.
+ * @param approxFirstMissingDate The approximation of the date
+ * of the older missing change. null when none.
+ * @param isLDAP Specifies whether the server is a LS or a RS
+ */
+ public void setServerState(short serverId, ServerState state,
+ Long approxFirstMissingDate, boolean isLDAP)
+ {
+ if (data.ldapStates == null)
+ {
+ data.ldapStates = new HashMap<Short, ServerData>();
+ }
+ if (data.rsStates == null)
+ {
+ data.rsStates = new HashMap<Short, ServerData>();
+ }
+ ServerData sd = new ServerData();
+ sd.state = state;
+ sd.approxFirstMissingDate = approxFirstMissingDate;
+ if (isLDAP)
+ data.ldapStates.put(serverId, sd);
+ else
+ data.rsStates.put(serverId, sd);
+ }
+
+ /**
+ * Get the server state for the LDAP server with the provided serverId.
+ * @param serverId The provided serverId.
+ * @return The state.
+ */
+ public ServerState getLDAPServerState(short serverId)
+ {
+ return data.ldapStates.get(serverId).state;
+ }
+
+ /**
+ * Get the server state for the RS server with the provided serverId.
+ * @param serverId The provided serverId.
+ * @return The state.
+ */
+ public ServerState getRSServerState(short serverId)
+ {
+ return data.rsStates.get(serverId).state;
+ }
+
+
+ /**
+ * Get the approximation of the date of the older missing change for the
+ * LDAP Server with the provided server Id.
+ * @param serverId The provided serverId.
+ * @return The approximated state.
+ */
+ public Long getLDAPApproxFirstMissingDate(short serverId)
+ {
+ return data.ldapStates.get(serverId).approxFirstMissingDate;
+ }
+
+ /**
+ * Get the approximation of the date of the older missing change for the
+ * RS Server with the provided server Id.
+ * @param serverId The provided serverId.
+ * @return The approximated state.
+ */
+ public Long getRSApproxFirstMissingDate(short serverId)
+ {
+ return data.rsStates.get(serverId).approxFirstMissingDate;
+ }
+
+ /**
+ * Creates a new EntryMessage from its encoded form.
+ *
+ * @param in The byte array containing the encoded form of the message.
+ * @throws DataFormatException If the byte array does not contain a valid
+ * encoded form of the ServerStartMessage.
+ */
+ public MonitorMsg(byte[] in) throws DataFormatException
+ {
+ try
+ {
+ /* first byte is the type */
+ if (in[0] != MSG_TYPE_REPL_SERVER_MONITOR)
+ throw new DataFormatException("input is not a valid " +
+ this.getClass().getCanonicalName());
+ int pos = 1;
+
+ // sender
+ int length = getNextLength(in, pos);
+ String senderIDString = new String(in, pos, length, "UTF-8");
+ this.senderID = Short.valueOf(senderIDString);
+ pos += length +1;
+
+ // destination
+ length = getNextLength(in, pos);
+ String destinationString = new String(in, pos, length, "UTF-8");
+ this.destination = Short.valueOf(destinationString);
+ pos += length +1;
+
+ /* Read the states : all the remaining bytes but the terminating 0 */
+ byte[] encodedS = new byte[in.length-pos-1];
+ int i =0;
+ while (pos<in.length-1)
+ {
+ encodedS[i++] = in[pos++];
+ }
+
+
+ try
+ {
+ ASN1Sequence s0 = ASN1Sequence.decodeAsSequence(encodedS);
+ // loop on the servers
+ for (ASN1Element el0 : s0.elements())
+ {
+ ServerState newState = new ServerState();
+ short serverId = 0;
+ Long outime = (long)0;
+ boolean isLDAPServer = false;
+ ASN1Sequence s1 = el0.decodeAsSequence();
+
+ // loop on the list of CN of the state
+ for (ASN1Element el1 : s1.elements())
+ {
+ ASN1OctetString o = el1.decodeAsOctetString();
+ String s = o.stringValue();
+ ChangeNumber cn = new ChangeNumber(s);
+ if ((data.replServerDbState != null) && (serverId == 0))
+ {
+ // we are on the first CN that is a fake CN to store the serverId
+ // and the older update time
+ serverId = cn.getServerId();
+ outime = cn.getTime();
+ isLDAPServer = (cn.getSeqnum()>0);
+ }
+ else
+ {
+ // we are on a normal CN
+ newState.update(cn);
+ }
+ }
+
+ if (data.replServerDbState == null)
+ {
+ // the first state is the replication state
+ data.replServerDbState = newState;
+ }
+ else
+ {
+ // the next states are the server states
+ ServerData sd = new ServerData();
+ sd.state = newState;
+ sd.approxFirstMissingDate = outime;
+ if (isLDAPServer)
+ data.ldapStates.put(serverId, sd);
+ else
+ data.rsStates.put(serverId, sd);
+ }
+ }
+ } catch(Exception e)
+ {
+
+ }
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ try
+ {
+ byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
+ byte[] destinationBytes = String.valueOf(destination).getBytes("UTF-8");
+
+ int length = 1 + senderBytes.length +
+ 1 + destinationBytes.length;
+
+ ASN1Sequence stateElementSequence = new ASN1Sequence();
+ ArrayList<ASN1Element> stateElementList = new ArrayList<ASN1Element>();
+
+ /**
+ * First loop computes the length
+ */
+
+ /* Put the serverStates ... */
+ stateElementSequence = new ASN1Sequence();
+ stateElementList = new ArrayList<ASN1Element>();
+
+ /* first put the Replication Server state */
+ ArrayList<ASN1OctetString> cnOctetList =
+ data.replServerDbState.toASN1ArrayList();
+ ArrayList<ASN1Element> cnElementList = new ArrayList<ASN1Element>();
+ for (ASN1OctetString soci : cnOctetList)
+ {
+ cnElementList.add(soci);
+ }
+ ASN1Sequence cnSequence = new ASN1Sequence(cnElementList);
+ stateElementList.add(cnSequence);
+
+ // then the LDAP server data
+ Set<Short> servers = data.ldapStates.keySet();
+ for (Short sid : servers)
+ {
+ // State
+ ServerState statei = data.ldapStates.get(sid).state;
+ // First missing date
+ Long outime = data.ldapStates.get(sid).approxFirstMissingDate;
+
+ // retrieves the change numbers as an arrayList of ANSN1OctetString
+ cnOctetList = statei.toASN1ArrayList();
+ cnElementList = new ArrayList<ASN1Element>();
+
+ // a fake changenumber helps storing the LDAP server ID
+ // and the olderupdatetime
+ ChangeNumber cn = new ChangeNumber(outime,0,sid);
+ cnElementList.add(new ASN1OctetString(cn.toString()));
+
+ // the changenumbers
+ for (ASN1OctetString soci : cnOctetList)
+ {
+ cnElementList.add(soci);
+ }
+
+ cnSequence = new ASN1Sequence(cnElementList);
+ stateElementList.add(cnSequence);
+ }
+
+ // then the rs server data
+ servers = data.rsStates.keySet();
+ for (Short sid : servers)
+ {
+ // State
+ ServerState statei = data.rsStates.get(sid).state;
+ // First missing date
+ Long outime = data.rsStates.get(sid).approxFirstMissingDate;
+
+ // retrieves the change numbers as an arrayList of ANSN1OctetString
+ cnOctetList = statei.toASN1ArrayList();
+ cnElementList = new ArrayList<ASN1Element>();
+
+ // a fake changenumber helps storing the LDAP server ID
+ // and the olderupdatetime
+ ChangeNumber cn = new ChangeNumber(outime,0,sid);
+ cnElementList.add(new ASN1OctetString(cn.toString()));
+
+ // the changenumbers
+ for (ASN1OctetString soci : cnOctetList)
+ {
+ cnElementList.add(soci);
+ }
+
+ cnSequence = new ASN1Sequence(cnElementList);
+ stateElementList.add(cnSequence);
+ }
+
+ stateElementSequence.setElements(stateElementList);
+ int seqLen = stateElementSequence.encode().length;
+
+ //
+ length += seqLen;
+ length += 2;
+
+ // Allocate the array sized from the computed length
+ byte[] resultByteArray = new byte[length];
+
+ /**
+ * Second loop really builds the array
+ */
+
+ /* put the type of the operation */
+ resultByteArray[0] = MSG_TYPE_REPL_SERVER_MONITOR;
+ int pos = 1;
+
+ pos = addByteArray(senderBytes, resultByteArray, pos);
+ pos = addByteArray(destinationBytes, resultByteArray, pos);
+
+ /* Put the serverStates ... */
+ stateElementSequence = new ASN1Sequence();
+ stateElementList = new ArrayList<ASN1Element>();
+
+ /* first put the Replication Server state */
+ cnOctetList =
+ data.replServerDbState.toASN1ArrayList();
+ cnElementList = new ArrayList<ASN1Element>();
+ for (ASN1OctetString soci : cnOctetList)
+ {
+ cnElementList.add(soci);
+ }
+ cnSequence = new ASN1Sequence(cnElementList);
+ stateElementList.add(cnSequence);
+
+ // then the LDAP server datas
+ servers = data.ldapStates.keySet();
+ for (Short sid : servers)
+ {
+ ServerState statei = data.ldapStates.get(sid).state;
+ Long outime = data.ldapStates.get(sid).approxFirstMissingDate;
+
+ // retrieves the change numbers as an arrayList of ANSN1OctetString
+ cnOctetList = statei.toASN1ArrayList();
+ cnElementList = new ArrayList<ASN1Element>();
+
+ // a fake changenumber helps storing the LDAP server ID
+ ChangeNumber cn = new ChangeNumber(outime,1,sid);
+ cnElementList.add(new ASN1OctetString(cn.toString()));
+
+ // the changenumbers that make the state
+ for (ASN1OctetString soci : cnOctetList)
+ {
+ cnElementList.add(soci);
+ }
+
+ cnSequence = new ASN1Sequence(cnElementList);
+ stateElementList.add(cnSequence);
+ }
+
+ // then the RS server datas
+ servers = data.rsStates.keySet();
+ for (Short sid : servers)
+ {
+ ServerState statei = data.rsStates.get(sid).state;
+ Long outime = data.rsStates.get(sid).approxFirstMissingDate;
+
+ // retrieves the change numbers as an arrayList of ANSN1OctetString
+ cnOctetList = statei.toASN1ArrayList();
+ cnElementList = new ArrayList<ASN1Element>();
+
+ // a fake changenumber helps storing the LDAP server ID
+ ChangeNumber cn = new ChangeNumber(outime,0,sid);
+ cnElementList.add(new ASN1OctetString(cn.toString()));
+
+ // the changenumbers that make the state
+ for (ASN1OctetString soci : cnOctetList)
+ {
+ cnElementList.add(soci);
+ }
+
+ cnSequence = new ASN1Sequence(cnElementList);
+ stateElementList.add(cnSequence);
+ }
+
+
+ stateElementSequence.setElements(stateElementList);
+ pos = addByteArray(stateElementSequence.encode(), resultByteArray, pos);
+
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Get the state of the replication server that sent this message.
+ * @return The state.
+ */
+ public ServerState getReplServerDbState()
+ {
+ return data.replServerDbState;
+ }
+
+ /**
+ * Returns an iterator on the serverId of the connected LDAP servers.
+ * @return The iterator.
+ */
+ public Iterator<Short> ldapIterator()
+ {
+ return data.ldapStates.keySet().iterator();
+ }
+
+ /**
+ * Returns an iterator on the serverId of the connected RS servers.
+ * @return The iterator.
+ */
+ public Iterator<Short> rsIterator()
+ {
+ return data.rsStates.keySet().iterator();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ String stateS = "\nRState:[";
+ stateS += data.replServerDbState.toString();
+ stateS += "]";
+
+ stateS += "\nLDAPStates:[";
+ for (Short sid : data.ldapStates.keySet())
+ {
+ ServerData sd = data.ldapStates.get(sid);
+ stateS +=
+ "\n[LSstate("+ sid + ")=" +
+ sd.state.toString() + "]" +
+ " afmd=" + sd.approxFirstMissingDate + "]";
+ }
+
+ stateS += "\nRSStates:[";
+ for (Short sid : data.rsStates.keySet())
+ {
+ ServerData sd = data.rsStates.get(sid);
+ stateS +=
+ "\n[RSState("+ sid + ")=" +
+ sd.state.toString() + "]" +
+ " afmd=" + sd.approxFirstMissingDate + "]";
+ }
+ String me = this.getClass().getCanonicalName() +
+ "[ sender=" + this.senderID +
+ " destination=" + this.destination +
+ " data=[" + stateS + "]" +
+ "]";
+ return me;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorRequestMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorRequestMessage.java
deleted file mode 100644
index 929829b..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorRequestMessage.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-/**
- * This message is part of the replication protocol.
- * RS1 sends a MonitorRequestMessage to RS2 to requests its monitoring
- * informations.
- * When RS2 receives a MonitorRequestMessage from RS1, RS2 responds with a
- * MonitorMessage.
- */
-public class MonitorRequestMessage extends RoutableMessage implements
- Serializable
-{
-
- private static final long serialVersionUID = -2407640479423633234L;
-
- /**
- * Creates a message.
- *
- * @param sender The sender server of this message.
- * @param destination The server or servers targetted by this message.
- */
- public MonitorRequestMessage(short sender, short destination)
- {
- super(sender, destination);
- }
-
- /**
- * Creates a new message by decoding the provided byte array.
- * @param in A byte array containing the encoded information for the message,
- * @throws DataFormatException If the in does not contain a properly,
- * encoded message.
- */
- public MonitorRequestMessage(byte[] in) throws DataFormatException
- {
- super();
- try
- {
- // First byte is the type
- if (in[0] != MSG_TYPE_REPL_SERVER_MONITOR_REQUEST)
- throw new DataFormatException("input is not a valid " +
- this.getClass().getCanonicalName());
- int pos = 1;
-
- // sender
- int length = getNextLength(in, pos);
- String senderString = new String(in, pos, length, "UTF-8");
- this.senderID = Short.valueOf(senderString);
- pos += length +1;
-
- // destination
- length = getNextLength(in, pos);
- String destinationString = new String(in, pos, length, "UTF-8");
- this.destination = Short.valueOf(destinationString);
- pos += length +1;
-
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- try
- {
- byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
- byte[] destinationBytes = String.valueOf(destination).getBytes("UTF-8");
-
- int length = 1 + senderBytes.length + 1
- + destinationBytes.length + 1;
-
- byte[] resultByteArray = new byte[length];
-
- /* put the type of the operation */
- resultByteArray[0] = MSG_TYPE_REPL_SERVER_MONITOR_REQUEST;
- int pos = 1;
-
- /* put the sender */
- pos = addByteArray(senderBytes, resultByteArray, pos);
-
- /* put the destination */
- pos = addByteArray(destinationBytes, resultByteArray, pos);
-
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorRequestMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorRequestMsg.java
new file mode 100644
index 0000000..1d13298
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/MonitorRequestMsg.java
@@ -0,0 +1,120 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+/**
+ * This message is part of the replication protocol.
+ * RS1 sends a MonitorRequestMsg to RS2 to requests its monitoring
+ * informations.
+ * When RS2 receives a MonitorRequestMsg from RS1, RS2 responds with a
+ * MonitorMessage.
+ */
+public class MonitorRequestMsg extends RoutableMsg
+{
+ /**
+ * Creates a message.
+ *
+ * @param sender The sender server of this message.
+ * @param destination The server or servers targetted by this message.
+ */
+ public MonitorRequestMsg(short sender, short destination)
+ {
+ super(sender, destination);
+ }
+
+ /**
+ * Creates a new message by decoding the provided byte array.
+ * @param in A byte array containing the encoded information for the message,
+ * @throws DataFormatException If the in does not contain a properly,
+ * encoded message.
+ */
+ public MonitorRequestMsg(byte[] in) throws DataFormatException
+ {
+ super();
+ try
+ {
+ // First byte is the type
+ if (in[0] != MSG_TYPE_REPL_SERVER_MONITOR_REQUEST)
+ throw new DataFormatException("input is not a valid " +
+ this.getClass().getCanonicalName());
+ int pos = 1;
+
+ // sender
+ int length = getNextLength(in, pos);
+ String senderString = new String(in, pos, length, "UTF-8");
+ this.senderID = Short.valueOf(senderString);
+ pos += length +1;
+
+ // destination
+ length = getNextLength(in, pos);
+ String destinationString = new String(in, pos, length, "UTF-8");
+ this.destination = Short.valueOf(destinationString);
+ pos += length +1;
+
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ try
+ {
+ byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
+ byte[] destinationBytes = String.valueOf(destination).getBytes("UTF-8");
+
+ int length = 1 + senderBytes.length + 1
+ + destinationBytes.length + 1;
+
+ byte[] resultByteArray = new byte[length];
+
+ /* put the type of the operation */
+ resultByteArray[0] = MSG_TYPE_REPL_SERVER_MONITOR_REQUEST;
+ int pos = 1;
+
+ /* put the sender */
+ pos = addByteArray(senderBytes, resultByteArray, pos);
+
+ /* put the destination */
+ pos = addByteArray(destinationBytes, resultByteArray, pos);
+
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
new file mode 100644
index 0000000..2b6a7b3
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
@@ -0,0 +1,108 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+/**
+ * This exception should be raised by the un-serialization code of a PDU
+ * (typically the constructor code with a byte[] parameter), when the detected
+ * PDU type (deduced from the first received byte of the message) is a PDU used
+ * in an older version of the replication protocol than the current one, and we
+ * do not support translation from this old version PDU to his matching PDU in
+ * the current protocol version (if it exists). Thus, the code catching this
+ * exception may decide special treatment, depending on the situation. For
+ * instance it may decide to trash the PDU and keep the connection opened, or to
+ * trash the PDU and close the connection...
+ */
+public class NotSupportedOldVersionPDUException extends Exception
+{
+ // Suppress compile warning
+ static final long serialVersionUID = 1739875L;
+ private String msg = null; // Explicit message
+ private short protocolVersion = -1; // protocol version of the pdu
+ private byte pduType = -1; // type of the pdu
+
+ /**
+ * Exception constructor.
+ * @param pduStr PDU description.
+ * @param protocolVersion PDU protocol version.
+ * @param pduType PDU number.
+ */
+ public NotSupportedOldVersionPDUException(String pduStr,
+ short protocolVersion, byte pduType)
+ {
+ super();
+ msg = "Received unsupported " + pduStr + " PDU (" + pduType +
+ ") from protocol version " + protocolVersion;
+ this.protocolVersion = protocolVersion;
+ this.pduType = pduType;
+ }
+
+ /**
+ * Get the PDU message.
+ * @return The PDU message.
+ */
+ public String getMessage()
+ {
+ return msg;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getLocalizedMessage()
+ {
+ return getMessage();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return getMessage();
+ }
+
+ /**
+ * Get the PDU protocol version.
+ * @return The PDU protocol version.
+ */
+ public short getProtocolVersion()
+ {
+ return protocolVersion;
+ }
+
+ /**
+ * Get the PDU type.
+ * @return The PDU type.
+ */
+ public byte getPduType()
+ {
+ return pduType;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ProtocolSession.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ProtocolSession.java
index 5ce848c..0bc3382 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ProtocolSession.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ProtocolSession.java
@@ -36,7 +36,7 @@
* protocol.
*
* This interface is designed to make easy the move from one format
- * of the ReplicationMessage on the wire to another format.
+ * of the ReplicationMsg on the wire to another format.
*/
public interface ProtocolSession
{
@@ -50,37 +50,53 @@
public abstract void close() throws IOException;
/**
- * This method is called when a ReplicationMessage must be sent to
- * the remote entity.
+ * This method is called when a ReplicationMsg must be sent to
+ * the remote entity. The PDU is send using serialization of the current
+ * protocol version.
*
* It can be called by several threads and must implement appropriate
* replication (typically, this method or a part of it should be
* synchronized).
*
- * @param msg The ReplicationMessage that must be sent.
+ * @param msg The ReplicationMsg that must be sent.
* @throws IOException If an IO error happen during the publish process.
*/
- public abstract void publish(ReplicationMessage msg)
+ public abstract void publish(ReplicationMsg msg)
throws IOException;
/**
- * Attempt to receive a ReplicationMessage.
+ * Same as publish(ReplicationMsg msg), but forcing the usage of a particular
+ * protocol version for the PDU serialization.
+ *
+ * @param msg The ReplicationMsg that must be sent.
+ * @param reqProtocolVersion The protocol version to use for serialization.
+ * The version should normally be older than the current one.
+ * @throws IOException If an IO error happen during the publish process.
+ */
+ public abstract void publish(ReplicationMsg msg, short reqProtocolVersion)
+ throws IOException;
+
+ /**
+ * Attempt to receive a ReplicationMsg.
* This method should block the calling thread until a
- * ReplicationMessage is available or until an error condition.
+ * ReplicationMsg is available or until an error condition.
*
* This method can only be called by a single thread and therefore does not
- * neet to implement any replication.
+ * need to implement any replication.
*
- * @return The ReplicationMessage that was received.
- * @throws IOException When error happened durin IO process.
+ * @return The ReplicationMsg that was received.
+ * @throws IOException When error happened during IO process.
* @throws ClassNotFoundException When the data received does extend the
- * ReplicationMessage class.
+ * ReplicationMsg class.
* @throws DataFormatException When the data received is not formatted as a
- * ReplicationMessage.
+ * ReplicationMsg.
+ * @throws NotSupportedOldVersionPDUException If the received PDU is part of
+ * an old protocol version and we do not support it.
*/
- public abstract ReplicationMessage receive()
+ public abstract ReplicationMsg receive()
throws IOException, ClassNotFoundException,
- DataFormatException;
+ DataFormatException,
+ NotSupportedOldVersionPDUException;
/**
* Stop using the security layer, if there is any.
@@ -106,7 +122,7 @@
* With this option set to a non-zero value, calls to the receive() method
* block for only this amount of time after which a
* java.net.SocketTimeoutException is raised.
- * The Broker is valid and useable even after such an Exception is raised.
+ * The Broker is valid and usable even after such an Exception is raised.
*
* @param timeout the specified timeout, in milliseconds.
* @throws SocketException if there is an error in the underlying protocol,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ProtocolVersion.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ProtocolVersion.java
index ae61e30..9e4b6e5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ProtocolVersion.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ProtocolVersion.java
@@ -33,30 +33,55 @@
public class ProtocolVersion
{
/**
- * Get the version included in the Start Message mean the replication
- * protocol version used by the server that created the message.
- *
- * @return The version used by the server that created the message.
+ * The constant for the first historical version of the replication protocol.
*/
- static short CURRENT_VERSION = 1;
+ public static final short REPLICATION_PROTOCOL_V1 = 1;
+ /**
+ * The constant for the real value of the first historical version of the
+ * replication protocol (was used in start messages only).
+ */
+ public static final short REPLICATION_PROTOCOL_V1_REAL = 49;
+ /**
+ * The constant for the second version of the replication protocol.
+ */
+ public static final short REPLICATION_PROTOCOL_V2 = 2;
/**
- * Specifies the current version of the replication protocol.
+ * The replication protocol version used by the instance of RS/DS in this VM.
+ */
+ private static short currentVersion = -1;
+
+ static
+ {
+ resetCurrentVersion();
+ }
+
+ /**
+ * Gets the current version of the replication protocol.
*
* @return The current version of the protocol.
*/
- public static short currentVersion()
+ public static short getCurrentVersion()
{
- return CURRENT_VERSION;
+ return currentVersion;
}
/**
* For test purpose.
- * @param currentVersion The provided current version.
+ * @param curVersion The provided current version.
*/
- public static void setCurrentVersion(short currentVersion)
+ public static void setCurrentVersion(short curVersion)
{
- CURRENT_VERSION = currentVersion;
+ currentVersion = curVersion;
+ }
+
+ /**
+ * Resets the protocol version to the default value (the latest version).
+ * For test purpose.
+ */
+ public static void resetCurrentVersion()
+ {
+ currentVersion = REPLICATION_PROTOCOL_V2;
}
/**
@@ -68,8 +93,7 @@
*/
public static short minWithCurrent(short version)
{
- Short sVersion = Short.valueOf(version);
- Short newVersion = (sVersion<CURRENT_VERSION?sVersion:CURRENT_VERSION);
+ short newVersion = (version < currentVersion ? version : currentVersion);
return newVersion;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerInfoMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerInfoMessage.java
deleted file mode 100644
index 1281b14..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerInfoMessage.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2007-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.server.replication.protocol;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.DataFormatException;
-
-/**
- *
- * This class defines a message that is sent by a replication server
- * to the other replication servers in the topology containing the list
- * of LDAP servers directly connected to it.
- * A replication server sends a ReplServerInfoMessage when an LDAP
- * server connects or disconnects.
- *
- * Exchanging these messages allows to have each replication server
- * knowing the complete list of LDAP servers in the topology and
- * their associated replication server and thus take the appropriate
- * decision to route a message to an LDAP server.
- *
- */
-public class ReplServerInfoMessage extends ReplicationMessage
-{
- private List<String> connectedServers = null;
- private long generationId;
-
- /**
- * Creates a new changelogInfo message from its encoded form.
- *
- * @param in The byte array containing the encoded form of the message.
- * @throws java.util.zip.DataFormatException If the byte array does not
- * contain a valid encoded form of the message.
- */
- public ReplServerInfoMessage(byte[] in) throws DataFormatException
- {
- try
- {
- /* first byte is the type */
- if (in.length < 1 || in[0] != MSG_TYPE_REPL_SERVER_INFO)
- throw new DataFormatException(
- "Input is not a valid " + this.getClass().getCanonicalName());
-
- int pos = 1;
-
- /* read the generationId */
- int length = getNextLength(in, pos);
- generationId = Long.valueOf(new String(in, pos, length,
- "UTF-8"));
- pos += length +1;
-
- /* read the connected servers */
- connectedServers = new ArrayList<String>();
- while (pos < in.length)
- {
- /*
- * Read the next server ID
- * first calculate the length then construct the string
- */
- length = getNextLength(in, pos);
- connectedServers.add(new String(in, pos, length, "UTF-8"));
- pos += length +1;
- }
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
-
- /**
- * Creates a new ReplServerInfo message from a list of the currently
- * connected servers.
- *
- * @param connectedServers The list of currently connected servers ID.
- * @param generationId The generationId currently associated with this
- * domain.
- */
- public ReplServerInfoMessage(List<String> connectedServers,
- long generationId)
- {
- this.connectedServers = connectedServers;
- this.generationId = generationId;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- try
- {
- ByteArrayOutputStream oStream = new ByteArrayOutputStream();
-
- /* Put the message type */
- oStream.write(MSG_TYPE_REPL_SERVER_INFO);
-
- // Put the generationId
- oStream.write(String.valueOf(generationId).getBytes("UTF-8"));
- oStream.write(0);
-
- // Put the servers
- if (connectedServers.size() >= 1)
- {
- for (String server : connectedServers)
- {
- byte[] byteServerURL = server.getBytes("UTF-8");
- oStream.write(byteServerURL);
- oStream.write(0);
- }
- }
-
- return oStream.toByteArray();
- }
- catch (IOException e)
- {
- // never happens
- return null;
- }
- }
-
- /**
- * Get the list of servers currently connected to the Changelog server
- * that generated this message.
- *
- * @return A collection of the servers currently connected to the Changelog
- * server that generated this message.
- */
- public List<String> getConnectedServers()
- {
- return connectedServers;
- }
-
- /**
- * Get the generationId from this message.
- * @return The generationId.
- */
- public long getGenerationId()
- {
- return generationId;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString()
- {
- String csrvs = "";
- for (String s : connectedServers)
- {
- csrvs += s + "/";
- }
- return ("ReplServerInfoMessage: genId=" + getGenerationId() +
- " Connected peers:" + csrvs);
- }
-
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMessage.java
deleted file mode 100644
index ae8cb76..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMessage.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-import org.opends.server.replication.common.ServerState;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.DN;
-
-/**
- * Message sent by a replication server to another replication server
- * at Startup.
- */
-public class ReplServerStartMessage extends StartMessage implements
- Serializable
-{
- private static final long serialVersionUID = -5871385537169856856L;
-
- private short serverId;
- private String serverURL;
- private String baseDn = null;
- private int windowSize;
- private ServerState serverState;
-
- /**
- * Whether to continue using SSL to encrypt messages after the start
- * messages have been exchanged.
- */
- private boolean sslEncryption;
-
-
- /**
- * Create a ReplServerStartMessage.
- *
- * @param serverId replication server id
- * @param serverURL replication server URL
- * @param baseDn base DN for which the ReplServerStartMessage is created.
- * @param windowSize The window size.
- * @param serverState our ServerState for this baseDn.
- * @param protocolVersion The replication protocol version of the creator.
- * @param generationId The generationId for this server.
- * @param sslEncryption Whether to continue using SSL to encrypt messages
- * after the start messages have been exchanged.
- */
- public ReplServerStartMessage(short serverId, String serverURL, DN baseDn,
- int windowSize,
- ServerState serverState,
- short protocolVersion,
- long generationId,
- boolean sslEncryption)
- {
- super(protocolVersion, generationId);
- this.serverId = serverId;
- this.serverURL = serverURL;
- if (baseDn != null)
- this.baseDn = baseDn.toNormalizedString();
- else
- this.baseDn = null;
- this.windowSize = windowSize;
- this.serverState = serverState;
- this.sslEncryption = sslEncryption;
- }
-
- /**
- * Creates a new ReplServerStartMessage by decoding the provided byte array.
- * @param in A byte array containing the encoded information for the
- * ReplServerStartMessage
- * @throws DataFormatException If the in does not contain a properly
- * encoded ReplServerStartMessage.
- */
- public ReplServerStartMessage(byte[] in) throws DataFormatException
- {
- /* The ReplServerStartMessage is encoded in the form :
- * <baseDn><ServerId><ServerUrl><windowsize><ServerState>
- */
- super(MSG_TYPE_REPL_SERVER_START, in);
-
- try
- {
- /* first bytes are the header */
- int pos = headerLength;
-
- /* read the dn
- * first calculate the length then construct the string
- */
- int length = getNextLength(in, pos);
- baseDn = new String(in, pos, length, "UTF-8");
- pos += length +1;
-
- /*
- * read the ServerId
- */
- length = getNextLength(in, pos);
- String serverIdString = new String(in, pos, length, "UTF-8");
- serverId = Short.valueOf(serverIdString);
- pos += length +1;
-
- /*
- * read the ServerURL
- */
- length = getNextLength(in, pos);
- serverURL = new String(in, pos, length, "UTF-8");
- pos += length +1;
-
- /*
- * read the window size
- */
- length = getNextLength(in, pos);
- windowSize = Integer.valueOf(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- /*
- * read the sslEncryption setting
- */
- length = getNextLength(in, pos);
- sslEncryption = Boolean.valueOf(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- /*
- * read the ServerState
- */
- serverState = new ServerState(in, pos, in.length-1);
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * Get the Server Id.
- * @return the server id
- */
- public short getServerId()
- {
- return this.serverId;
- }
-
- /**
- * Set the server URL.
- * @return the server URL
- */
- public String getServerURL()
- {
- return this.serverURL;
- }
-
- /**
- * Get the base DN from this ReplServerStartMessage.
- *
- * @return the base DN from this ReplServerStartMessage.
- */
- public DN getBaseDn()
- {
- if (baseDn == null)
- return null;
- try
- {
- return DN.decode(baseDn);
- } catch (DirectoryException e)
- {
- return null;
- }
- }
-
- /**
- * Get the serverState.
- * @return Returns the serverState.
- */
- public ServerState getServerState()
- {
- return this.serverState;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- /* The ReplServerStartMessage is stored in the form :
- * <operation type><basedn><serverid><serverURL><windowsize><serverState>
- */
- try {
- byte[] byteDn = baseDn.getBytes("UTF-8");
- byte[] byteServerId = String.valueOf(serverId).getBytes("UTF-8");
- byte[] byteServerUrl = serverURL.getBytes("UTF-8");
- byte[] byteServerState = serverState.getBytes();
- byte[] byteWindowSize = String.valueOf(windowSize).getBytes("UTF-8");
- byte[] byteSSLEncryption =
- String.valueOf(sslEncryption).getBytes("UTF-8");
-
- int length = byteDn.length + 1 + byteServerId.length + 1 +
- byteServerUrl.length + 1 + byteWindowSize.length + 1 +
- byteSSLEncryption.length + 1 +
- byteServerState.length + 1;
-
- /* encode the header in a byte[] large enough to also contain the mods */
- byte resultByteArray[] = encodeHeader(MSG_TYPE_REPL_SERVER_START, length);
- int pos = headerLength;
-
- /* put the baseDN and a terminating 0 */
- pos = addByteArray(byteDn, resultByteArray, pos);
-
- /* put the ServerId */
- pos = addByteArray(byteServerId, resultByteArray, pos);
-
- /* put the ServerURL */
- pos = addByteArray(byteServerUrl, resultByteArray, pos);
-
- /* put the window size */
- pos = addByteArray(byteWindowSize, resultByteArray, pos);
-
- /* put the SSL Encryption setting */
- pos = addByteArray(byteSSLEncryption, resultByteArray, pos);
-
- /* put the ServerState */
- pos = addByteArray(byteServerState, resultByteArray, pos);
-
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-
- /**
- * get the window size for the server that created this message.
- *
- * @return The window size for the server that created this message.
- */
- public int getWindowSize()
- {
- return windowSize;
- }
-
- /**
- * Get the SSL encryption value for the server that created the
- * message.
- *
- * @return The SSL encryption value for the server that created the
- * message.
- */
- public boolean getSSLEncryption()
- {
- return sslEncryption;
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
new file mode 100644
index 0000000..d2e244a
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
@@ -0,0 +1,434 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.DN;
+
+/**
+ * Message sent by a replication server to another replication server
+ * at Startup.
+ */
+public class ReplServerStartMsg extends StartMsg
+{
+ private short serverId;
+ private String serverURL;
+ private String baseDn = null;
+ private int windowSize;
+ private ServerState serverState;
+
+ /**
+ * Whether to continue using SSL to encrypt messages after the start
+ * messages have been exchanged.
+ */
+ private boolean sslEncryption;
+
+ /**
+ * Threshold value used by the RS to determine if a DS must be put in
+ * degraded status because the number of pending changes for him has crossed
+ * this value. This field is only used by a DS.
+ */
+ private int degradedStatusThreshold = -1;
+
+ /**
+ * Create a ReplServerStartMsg.
+ *
+ * @param serverId replication server id
+ * @param serverURL replication server URL
+ * @param baseDn base DN for which the ReplServerStartMsg is created.
+ * @param windowSize The window size.
+ * @param serverState our ServerState for this baseDn.
+ * @param protocolVersion The replication protocol version of the creator.
+ * @param generationId The generationId for this server.
+ * @param sslEncryption Whether to continue using SSL to encrypt messages
+ * after the start messages have been exchanged.
+ * @param groupId The group id of the RS
+ * @param degradedStatusThreshold The degraded status threshold
+ */
+ public ReplServerStartMsg(short serverId, String serverURL, DN baseDn,
+ int windowSize,
+ ServerState serverState,
+ short protocolVersion,
+ long generationId,
+ boolean sslEncryption,
+ byte groupId,
+ int degradedStatusThreshold)
+ {
+ super(protocolVersion, generationId);
+ this.serverId = serverId;
+ this.serverURL = serverURL;
+ if (baseDn != null)
+ this.baseDn = baseDn.toNormalizedString();
+ else
+ this.baseDn = null;
+ this.windowSize = windowSize;
+ this.serverState = serverState;
+ this.sslEncryption = sslEncryption;
+ this.groupId = groupId;
+ this.degradedStatusThreshold = degradedStatusThreshold;
+ }
+
+ /**
+ * Creates a new ReplServerStartMsg by decoding the provided byte array.
+ * @param in A byte array containing the encoded information for the
+ * ReplServerStartMsg
+ * @throws DataFormatException If the in does not contain a properly
+ * encoded ReplServerStartMsg.
+ */
+ public ReplServerStartMsg(byte[] in) throws DataFormatException
+ {
+ byte[] allowedPduTypes = new byte[2];
+ allowedPduTypes[0] = MSG_TYPE_REPL_SERVER_START;
+ allowedPduTypes[1] = MSG_TYPE_REPL_SERVER_START_V1;
+ headerLength = decodeHeader(allowedPduTypes, in);
+
+ try
+ {
+ /* The ReplServerStartMsg payload is stored in the form :
+ * <baseDn><serverId><serverURL><windowSize><sslEncryption>
+ * <degradedStatusThreshold><serverState>
+ */
+
+ /* first bytes are the header */
+ int pos = headerLength;
+
+ /* read the dn
+ * first calculate the length then construct the string
+ */
+ int length = getNextLength(in, pos);
+ baseDn = new String(in, pos, length, "UTF-8");
+ pos += length +1;
+
+ /*
+ * read the ServerId
+ */
+ length = getNextLength(in, pos);
+ String serverIdString = new String(in, pos, length, "UTF-8");
+ serverId = Short.valueOf(serverIdString);
+ pos += length +1;
+
+ /*
+ * read the ServerURL
+ */
+ length = getNextLength(in, pos);
+ serverURL = new String(in, pos, length, "UTF-8");
+ pos += length +1;
+
+ /*
+ * read the window size
+ */
+ length = getNextLength(in, pos);
+ windowSize = Integer.valueOf(new String(in, pos, length, "UTF-8"));
+ pos += length +1;
+
+ /*
+ * read the sslEncryption setting
+ */
+ length = getNextLength(in, pos);
+ sslEncryption = Boolean.valueOf(new String(in, pos, length, "UTF-8"));
+ pos += length +1;
+
+ // For easiness (no additional method), simpy compare PDU type to
+ // know if we have to read new parameters of V2
+ if (in[0] == MSG_TYPE_REPL_SERVER_START)
+ {
+ /**
+ * read the degraded status threshold
+ */
+ length = getNextLength(in, pos);
+ degradedStatusThreshold =
+ Integer.valueOf(new String(in, pos, length, "UTF-8"));
+ pos += length + 1;
+ }
+
+ /*
+ * read the ServerState
+ */
+ serverState = new ServerState(in, pos, in.length - 1);
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * Get the Server Id.
+ * @return the server id
+ */
+ public short getServerId()
+ {
+ return this.serverId;
+ }
+
+ /**
+ * Get the server URL.
+ * @return the server URL
+ */
+ public String getServerURL()
+ {
+ return this.serverURL;
+ }
+
+ /**
+ * Get the base DN from this ReplServerStartMsg.
+ *
+ * @return the base DN from this ReplServerStartMsg.
+ */
+ public DN getBaseDn()
+ {
+ if (baseDn == null)
+ return null;
+ try
+ {
+ return DN.decode(baseDn);
+ } catch (DirectoryException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Get the serverState.
+ * @return Returns the serverState.
+ */
+ public ServerState getServerState()
+ {
+ return this.serverState;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ /* The ReplServerStartMsg is stored in the form :
+ * <operation type><baseDn><serverId><serverURL><windowSize><sslEncryption>
+ * <degradedStatusThreshold><serverState>
+ */
+ try {
+ byte[] byteDn = baseDn.getBytes("UTF-8");
+ byte[] byteServerId = String.valueOf(serverId).getBytes("UTF-8");
+ byte[] byteServerUrl = serverURL.getBytes("UTF-8");
+ byte[] byteServerState = serverState.getBytes();
+ byte[] byteWindowSize = String.valueOf(windowSize).getBytes("UTF-8");
+ byte[] byteSSLEncryption =
+ String.valueOf(sslEncryption).getBytes("UTF-8");
+ byte[] byteDegradedStatusThreshold =
+ String.valueOf(degradedStatusThreshold).getBytes("UTF-8");
+
+ int length = byteDn.length + 1 + byteServerId.length + 1 +
+ byteServerUrl.length + 1 + byteWindowSize.length + 1 +
+ byteSSLEncryption.length + 1 +
+ byteDegradedStatusThreshold.length + 1 +
+ byteServerState.length + 1;
+
+ /* encode the header in a byte[] large enough to also contain the mods */
+ byte resultByteArray[] = encodeHeader(MSG_TYPE_REPL_SERVER_START, length);
+ int pos = headerLength;
+
+ /* put the baseDN and a terminating 0 */
+ pos = addByteArray(byteDn, resultByteArray, pos);
+
+ /* put the ServerId */
+ pos = addByteArray(byteServerId, resultByteArray, pos);
+
+ /* put the ServerURL */
+ pos = addByteArray(byteServerUrl, resultByteArray, pos);
+
+ /* put the window size */
+ pos = addByteArray(byteWindowSize, resultByteArray, pos);
+
+ /* put the SSL Encryption setting */
+ pos = addByteArray(byteSSLEncryption, resultByteArray, pos);
+
+ /* put the degraded status threshold */
+ pos = addByteArray(byteDegradedStatusThreshold, resultByteArray, pos);
+
+ /* put the ServerState */
+ pos = addByteArray(byteServerState, resultByteArray, pos);
+
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * get the window size for the server that created this message.
+ *
+ * @return The window size for the server that created this message.
+ */
+ public int getWindowSize()
+ {
+ return windowSize;
+ }
+
+ /**
+ * Get the SSL encryption value for the server that created the
+ * message.
+ *
+ * @return The SSL encryption value for the server that created the
+ * message.
+ */
+ public boolean getSSLEncryption()
+ {
+ return sslEncryption;
+ }
+
+ /**
+ * Get the degraded status threshold value.
+ * @return The degraded status threshold value.
+ */
+ public int getDegradedStatusThreshold()
+ {
+ return degradedStatusThreshold;
+ }
+
+ /**
+ * Set the degraded status threshold (For test purpose).
+ * @param degradedStatusThreshold The degraded status threshold to set.
+ */
+ public void setDegradedStatusThreshold(int degradedStatusThreshold)
+ {
+ this.degradedStatusThreshold = degradedStatusThreshold;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return "ReplServerStartMsg content: " +
+ "\nprotocolVersion: " + protocolVersion +
+ "\ngenerationId: " + generationId +
+ "\ngroupId: " + groupId +
+ "\nbaseDn: " + baseDn.toString() +
+ "\nserverId: " + serverId +
+ "\nserverState: " + serverState +
+ "\nserverURL: " + serverURL +
+ "\nsslEncryption: " + sslEncryption +
+ "\ndegradedStatusThreshold: " + degradedStatusThreshold +
+ "\nwindowSize: " + windowSize;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes(short reqProtocolVersion)
+ throws UnsupportedEncodingException
+ {
+
+ // Using current protocol version should normally not be done as we would
+ // normally call the getBytes() method instead for that. So this check
+ // for security
+ if (reqProtocolVersion == ProtocolVersion.getCurrentVersion())
+ {
+ return getBytes();
+ }
+
+ switch (reqProtocolVersion)
+ {
+ case ProtocolVersion.REPLICATION_PROTOCOL_V1:
+ return getBytes_V1();
+ default:
+ // Unsupported requested version
+ throw new UnsupportedEncodingException(getClass().getSimpleName() +
+ " PDU does not support requested protocol version serialization: " +
+ reqProtocolVersion);
+ }
+ }
+
+ /**
+ * Get the byte array representation of this Message. This uses the version
+ * 1 of the replication protocol (used for compatibility purpose).
+ *
+ * @return The byte array representation of this Message.
+ *
+ * @throws UnsupportedEncodingException When the encoding of the message
+ * failed because the UTF-8 encoding is not supported.
+ */
+ public byte[] getBytes_V1() throws UnsupportedEncodingException
+ {
+ /*
+ * The ReplServerStartMessage is stored in the form :
+ * <operation type><basedn><serverid><serverURL><windowsize><serverState>
+ */
+ try {
+ byte[] byteDn = baseDn.getBytes("UTF-8");
+ byte[] byteServerId = String.valueOf(serverId).getBytes("UTF-8");
+ byte[] byteServerUrl = serverURL.getBytes("UTF-8");
+ byte[] byteServerState = serverState.getBytes();
+ byte[] byteWindowSize = String.valueOf(windowSize).getBytes("UTF-8");
+ byte[] byteSSLEncryption =
+ String.valueOf(sslEncryption).getBytes("UTF-8");
+
+ int length = byteDn.length + 1 + byteServerId.length + 1 +
+ byteServerUrl.length + 1 + byteWindowSize.length + 1 +
+ byteSSLEncryption.length + 1 +
+ byteServerState.length + 1;
+
+ /* encode the header in a byte[] large enough to also contain the mods */
+ byte resultByteArray[] = encodeHeader_V1(MSG_TYPE_REPL_SERVER_START_V1,
+ length);
+ int pos = headerLength;
+
+ /* put the baseDN and a terminating 0 */
+ pos = addByteArray(byteDn, resultByteArray, pos);
+
+ /* put the ServerId */
+ pos = addByteArray(byteServerId, resultByteArray, pos);
+
+ /* put the ServerURL */
+ pos = addByteArray(byteServerUrl, resultByteArray, pos);
+
+ /* put the window size */
+ pos = addByteArray(byteWindowSize, resultByteArray, pos);
+
+ /* put the SSL Encryption setting */
+ pos = addByteArray(byteSSLEncryption, resultByteArray, pos);
+
+ /* put the ServerState */
+ pos = addByteArray(byteServerState, resultByteArray, pos);
+
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
index a198d3f..a94d979 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
@@ -82,6 +82,12 @@
private String sslCipherSuites[];
/**
+ * The default soTimeout value to be used at handshake phases.
+ * (DS<->RS and RS<->RS)
+ */
+ public static final int HANDSHAKE_TIMEOUT = 4000;
+
+ /**
* Create a ReplSessionSecurity instance from the supplied configuration
* values.
*
@@ -192,13 +198,15 @@
* @param serverURL The remote replication server to which the socket is
* connected.
* @param socket The connected socket.
+ * @param soTimeout The socket timeout option to use for the protocol session.
* @return The new protocol session.
* @throws ConfigException If the protocol session could not be established
* due to a configuration problem.
* @throws IOException If the protocol session could not be established
* for some other reason.
*/
- public ProtocolSession createClientSession(String serverURL, Socket socket)
+ public ProtocolSession createClientSession(String serverURL, Socket socket,
+ int soTimeout)
throws ConfigException, IOException
{
boolean useSSL = isSecurePort(serverURL);
@@ -214,6 +222,7 @@
socket.getInetAddress().getHostName(),
socket.getPort(), false);
secureSocket.setUseClientMode(true);
+ secureSocket.setSoTimeout(soTimeout);
if (sslProtocols != null)
{
@@ -240,12 +249,13 @@
* Create a new protocol session in the server role on the provided socket.
* @param socket The connected socket.
* @return The new protocol session.
+ * @param soTimeout The socket timeout option to use for the protocol session.
* @throws ConfigException If the protocol session could not be established
* due to a configuration problem.
* @throws IOException If the protocol session could not be established
* for some other reason.
*/
- public ProtocolSession createServerSession(Socket socket)
+ public ProtocolSession createServerSession(Socket socket, int soTimeout)
throws ConfigException, IOException
{
if (useSSL)
@@ -264,6 +274,7 @@
socket.getPort(), false);
secureSocket.setUseClientMode(false);
secureSocket.setNeedClientAuth(true);
+ secureSocket.setSoTimeout(soTimeout);
if (sslProtocols != null)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMessage.java
deleted file mode 100644
index 86cc311..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMessage.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-/**
- * Abstract class that must be used when defining messages that can
- * be sent for replication purpose between servers.
- *
- * When extending this class one should also create a new MSG_TYPE
- * and should update the generateMsg() method.
- */
-public abstract class ReplicationMessage
-{
- static final byte MSG_TYPE_MODIFY_REQUEST = 1;
- static final byte MSG_TYPE_ADD_REQUEST = 2;
- static final byte MSG_TYPE_DELETE_REQUEST = 3;
- static final byte MSG_TYPE_MODIFYDN_REQUEST = 4;
- static final byte MSG_TYPE_ACK = 5;
- static final byte MSG_TYPE_SERVER_START = 6;
- static final byte MSG_TYPE_REPL_SERVER_START = 7;
- static final byte MSG_TYPE_WINDOW = 8;
- static final byte MSG_TYPE_HEARTBEAT = 9;
- static final byte MSG_TYPE_INITIALIZE_REQUEST = 10;
- static final byte MSG_TYPE_INITIALIZE_TARGET = 11;
- static final byte MSG_TYPE_ENTRY = 12;
- static final byte MSG_TYPE_DONE = 13;
- static final byte MSG_TYPE_ERROR = 14;
- static final byte MSG_TYPE_WINDOW_PROBE = 15;
- static final byte MSG_TYPE_REPL_SERVER_INFO = 16;
- static final byte MSG_TYPE_RESET_GENERATION_ID = 17;
- static final byte MSG_TYPE_REPL_SERVER_MONITOR_REQUEST = 18;
- static final byte MSG_TYPE_REPL_SERVER_MONITOR = 19;
-
- // Adding a new type of message here probably requires to
- // change accordingly generateMsg method below
-
- /**
- * Return the byte[] representation of this message.
- * Depending on the message type, the first byte of the byte[] must be.
- * MSG_TYPE_MODIFY_REQUEST
- * MSG_TYPE_ADD_REQUEST
- * MSG_TYPE_DELETE_REQUEST
- * MSG_TYPE_MODIFY_DN_REQUEST
- * MSG_TYPE_ACK
- * MSG_TYPE_SERVER_START
- * MSG_TYPE_REPL_SERVER_START
- * MSG_TYPE_WINDOW
- * MSG_TYPE_HEARTBEAT
- * MSG_TYPE_INITIALIZE
- * MSG_TYPE_INITIALIZE_TARGET
- * MSG_TYPE_ENTRY
- * MSG_TYPE_DONE
- * MSG_TYPE_ERROR
- * MSG_TYPE_WINDOW_PROBE
- * MSG_TYPE_REPL_SERVER_INFO
- * MSG_TYPE_RESET_GENERATION_ID
- * MSG_TYPE_REPL_SERVER_MONITOR_REQUEST
- * MSG_TYPE_REPL_SERVER_MONITOR
- *
- * @return the byte[] representation of this message.
- * @throws UnsupportedEncodingException When the encoding of the message
- * failed because the UTF-8 encoding is not supported.
- */
- public abstract byte[] getBytes() throws UnsupportedEncodingException;
-
-
- /**
- * Generates a ReplicationMessage from its encoded form.
- *
- * @param buffer The encode form of the ReplicationMessage.
- * @return the generated SycnhronizationMessage.
- * @throws DataFormatException if the encoded form was not a valid msg.
- * @throws UnsupportedEncodingException if UTF8 is not supported.
- */
- public static ReplicationMessage generateMsg(byte[] buffer)
- throws DataFormatException, UnsupportedEncodingException
- {
- ReplicationMessage msg = null;
- switch (buffer[0])
- {
- case MSG_TYPE_MODIFY_REQUEST:
- msg = new ModifyMsg(buffer);
- break;
- case MSG_TYPE_ADD_REQUEST:
- msg = new AddMsg(buffer);
- break;
- case MSG_TYPE_DELETE_REQUEST:
- msg = new DeleteMsg(buffer);
- break;
- case MSG_TYPE_MODIFYDN_REQUEST:
- msg = new ModifyDNMsg(buffer);
- break;
- case MSG_TYPE_ACK:
- msg = new AckMessage(buffer);
- break;
- case MSG_TYPE_SERVER_START:
- msg = new ServerStartMessage(buffer);
- break;
- case MSG_TYPE_REPL_SERVER_START:
- msg = new ReplServerStartMessage(buffer);
- break;
- case MSG_TYPE_WINDOW:
- msg = new WindowMessage(buffer);
- break;
- case MSG_TYPE_HEARTBEAT:
- msg = new HeartbeatMessage(buffer);
- break;
- case MSG_TYPE_INITIALIZE_REQUEST:
- msg = new InitializeRequestMessage(buffer);
- break;
- case MSG_TYPE_INITIALIZE_TARGET:
- msg = new InitializeTargetMessage(buffer);
- break;
- case MSG_TYPE_ENTRY:
- msg = new EntryMessage(buffer);
- break;
- case MSG_TYPE_DONE:
- msg = new DoneMessage(buffer);
- break;
- case MSG_TYPE_ERROR:
- msg = new ErrorMessage(buffer);
- break;
- case MSG_TYPE_RESET_GENERATION_ID:
- msg = new ResetGenerationId(buffer);
- break;
- case MSG_TYPE_WINDOW_PROBE:
- msg = new WindowProbe(buffer);
- break;
- case MSG_TYPE_REPL_SERVER_INFO:
- msg = new ReplServerInfoMessage(buffer);
- break;
- case MSG_TYPE_REPL_SERVER_MONITOR_REQUEST:
- msg = new MonitorRequestMessage(buffer);
- break;
- case MSG_TYPE_REPL_SERVER_MONITOR:
- msg = new MonitorMessage(buffer);
- break;
- default:
- throw new DataFormatException("received message with unknown type");
- }
- return msg;
- }
-
- /**
- * Concatenate the tail byte array into the resultByteArray.
- * The resultByteArray must be large enough before calling this method.
- *
- * @param tail the byte array to concatenate.
- * @param resultByteArray The byte array to concatenate to.
- * @param pos the position where to concatenate.
- * @return the next position to use in the resultByteArray.
- */
- protected int addByteArray(byte[] tail, byte[] resultByteArray, int pos)
- {
- for (int i=0; i<tail.length; i++,pos++)
- {
- resultByteArray[pos] = tail[i];
- }
- resultByteArray[pos++] = 0;
- return pos;
- }
-
- /**
- * Get the length of the next String encoded in the in byte array.
- *
- * @param in the byte array where to calculate the string.
- * @param pos the position whre to start from in the byte array.
- * @return the length of the next string.
- * @throws DataFormatException If the byte array does not end with null.
- */
- protected int getNextLength(byte[] in, int pos) throws DataFormatException
- {
- int offset = pos;
- int length = 0;
- while (in[offset++] != 0)
- {
- if (offset >= in.length)
- throw new DataFormatException("byte[] is not a valid msg");
- length++;
- }
- return length;
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMsg.java
new file mode 100644
index 0000000..a8d347e
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMsg.java
@@ -0,0 +1,260 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+/**
+ * Abstract class that must be used when defining messages that can
+ * be sent for replication purpose between servers.
+ *
+ * When extending this class one should also create a new MSG_TYPE
+ * and should update the generateMsg() method.
+ */
+public abstract class ReplicationMsg
+{
+ // PDU type values kept for compatibility with replication protocol version 1
+ static final byte MSG_TYPE_MODIFY_V1 = 1;
+ static final byte MSG_TYPE_ADD_V1 = 2;
+ static final byte MSG_TYPE_DELETE_V1 = 3;
+ static final byte MSG_TYPE_MODIFYDN_V1 = 4;
+ static final byte MSG_TYPE_SERVER_START_V1 = 6;
+ static final byte MSG_TYPE_REPL_SERVER_START_V1 = 7;
+ static final byte MSG_TYPE_REPL_SERVER_INFO_V1 = 16;
+
+ // PDU type values for current protocol version (see ProtocolVersion)
+ static final byte MSG_TYPE_ACK = 5;
+ static final byte MSG_TYPE_WINDOW = 8;
+ static final byte MSG_TYPE_HEARTBEAT = 9;
+ static final byte MSG_TYPE_INITIALIZE_REQUEST = 10;
+ static final byte MSG_TYPE_INITIALIZE_TARGET = 11;
+ static final byte MSG_TYPE_ENTRY = 12;
+ static final byte MSG_TYPE_DONE = 13;
+ static final byte MSG_TYPE_ERROR = 14;
+ static final byte MSG_TYPE_WINDOW_PROBE = 15;
+ static final byte MSG_TYPE_RESET_GENERATION_ID = 17;
+ static final byte MSG_TYPE_REPL_SERVER_MONITOR_REQUEST = 18;
+ static final byte MSG_TYPE_REPL_SERVER_MONITOR = 19;
+ static final byte MSG_TYPE_SERVER_START = 20;
+ static final byte MSG_TYPE_REPL_SERVER_START = 21;
+ static final byte MSG_TYPE_MODIFY = 22;
+ static final byte MSG_TYPE_ADD = 23;
+ static final byte MSG_TYPE_DELETE = 24;
+ static final byte MSG_TYPE_MODIFYDN = 25;
+ static final byte MSG_TYPE_TOPOLOGY = 26;
+ static final byte MSG_TYPE_START_SESSION = 27;
+ static final byte MSG_TYPE_CHANGE_STATUS = 28;
+
+ // Adding a new type of message here probably requires to
+ // change accordingly generateMsg method below
+
+ /**
+ * Return the byte[] representation of this message.
+ * Depending on the message type, the first byte of the byte[] must be one of
+ * the MSG_TYPE* definitions. The serialization is done using the current
+ * protocol version. For a serialization using a particular protocol version,
+ * call the getBytes(byte protocolVersion) method that should be available
+ * for the subclasses (PDUs) that allow such a translation.
+ *
+ * @return the byte[] representation of this message.
+ * @throws UnsupportedEncodingException When the encoding of the message
+ * failed because the UTF-8 encoding is not supported.
+ */
+ public abstract byte[] getBytes() throws UnsupportedEncodingException;
+
+ /**
+ * Serializes the PDU using the provided replication protocol version.
+ * WARNING: should be overwritten by a PDU (sub class) we want to support
+ * older protocol version serialization for.
+ * @param reqProtocolVersion The protocol version to use for serialization.
+ * The version should normally be older than the current one.
+ * @return The encoded PDU.
+ * @throws UnsupportedEncodingException When the encoding of the message
+ * failed because the UTF-8 encoding is not supported or the
+ * requested protocol version to use is not supported by this PDU.
+ */
+ public byte[] getBytes(short reqProtocolVersion)
+ throws UnsupportedEncodingException
+ {
+
+ // Using current protocol version should normally not be done as we would
+ // normally call the getBytes() method instead for that. So this check
+ // for security
+ if (reqProtocolVersion == ProtocolVersion.getCurrentVersion())
+ {
+ return getBytes();
+ }
+
+ // Unsupported requested version
+ // Any PDU that support older protocol version serialization should
+ // overwrite this method for that.
+ throw new UnsupportedEncodingException(getClass().getSimpleName() +
+ " PDU does not support requested protocol version serialization: " +
+ reqProtocolVersion);
+ }
+
+
+ /**
+ * Generates a ReplicationMsg from its encoded form. This un-serialization
+ * is done taking into account the various supported replication protocol
+ * versions.
+ *
+ * @param buffer The encode form of the ReplicationMsg.
+ * @return The generated SycnhronizationMessage.
+ * @throws DataFormatException If the encoded form was not a valid msg.
+ * @throws UnsupportedEncodingException If UTF8 is not supported.
+ * @throws NotSupportedOldVersionPDUException If the PDU is part of an old
+ * protocol version and we do not support it.
+ */
+ public static ReplicationMsg generateMsg(byte[] buffer)
+ throws DataFormatException, UnsupportedEncodingException,
+ NotSupportedOldVersionPDUException
+ {
+ ReplicationMsg msg = null;
+ switch (buffer[0])
+ {
+ case MSG_TYPE_SERVER_START_V1:
+ throw new NotSupportedOldVersionPDUException("Server Start",
+ ProtocolVersion.REPLICATION_PROTOCOL_V1, buffer[0]);
+ case MSG_TYPE_REPL_SERVER_INFO_V1:
+ throw new NotSupportedOldVersionPDUException("Replication Server Info",
+ ProtocolVersion.REPLICATION_PROTOCOL_V1, buffer[0]);
+ case MSG_TYPE_MODIFY:
+ case MSG_TYPE_MODIFY_V1:
+ msg = new ModifyMsg(buffer);
+ break;
+ case MSG_TYPE_ADD:
+ case MSG_TYPE_ADD_V1:
+ msg = new AddMsg(buffer);
+ break;
+ case MSG_TYPE_DELETE:
+ case MSG_TYPE_DELETE_V1:
+ msg = new DeleteMsg(buffer);
+ break;
+ case MSG_TYPE_MODIFYDN:
+ case MSG_TYPE_MODIFYDN_V1:
+ msg = new ModifyDNMsg(buffer);
+ break;
+ case MSG_TYPE_ACK:
+ msg = new AckMsg(buffer);
+ break;
+ case MSG_TYPE_SERVER_START:
+ msg = new ServerStartMsg(buffer);
+ break;
+ case MSG_TYPE_REPL_SERVER_START:
+ case MSG_TYPE_REPL_SERVER_START_V1:
+ msg = new ReplServerStartMsg(buffer);
+ break;
+ case MSG_TYPE_WINDOW:
+ msg = new WindowMsg(buffer);
+ break;
+ case MSG_TYPE_HEARTBEAT:
+ msg = new HeartbeatMsg(buffer);
+ break;
+ case MSG_TYPE_INITIALIZE_REQUEST:
+ msg = new InitializeRequestMsg(buffer);
+ break;
+ case MSG_TYPE_INITIALIZE_TARGET:
+ msg = new InitializeTargetMsg(buffer);
+ break;
+ case MSG_TYPE_ENTRY:
+ msg = new EntryMsg(buffer);
+ break;
+ case MSG_TYPE_DONE:
+ msg = new DoneMsg(buffer);
+ break;
+ case MSG_TYPE_ERROR:
+ msg = new ErrorMsg(buffer);
+ break;
+ case MSG_TYPE_RESET_GENERATION_ID:
+ msg = new ResetGenerationIdMsg(buffer);
+ break;
+ case MSG_TYPE_WINDOW_PROBE:
+ msg = new WindowProbeMsg(buffer);
+ break;
+ case MSG_TYPE_TOPOLOGY:
+ msg = new TopologyMsg(buffer);
+ break;
+ case MSG_TYPE_REPL_SERVER_MONITOR_REQUEST:
+ msg = new MonitorRequestMsg(buffer);
+ break;
+ case MSG_TYPE_REPL_SERVER_MONITOR:
+ msg = new MonitorMsg(buffer);
+ break;
+ case MSG_TYPE_START_SESSION:
+ msg = new StartSessionMsg(buffer);
+ break;
+ case MSG_TYPE_CHANGE_STATUS:
+ msg = new ChangeStatusMsg(buffer);
+ break;
+ default:
+ throw new DataFormatException("received message with unknown type");
+ }
+ return msg;
+ }
+
+ /**
+ * Concatenate the tail byte array into the resultByteArray.
+ * The resultByteArray must be large enough before calling this method.
+ *
+ * @param tail the byte array to concatenate.
+ * @param resultByteArray The byte array to concatenate to.
+ * @param pos the position where to concatenate.
+ * @return the next position to use in the resultByteArray.
+ */
+ protected int addByteArray(byte[] tail, byte[] resultByteArray, int pos)
+ {
+ for (int i=0; i<tail.length; i++,pos++)
+ {
+ resultByteArray[pos] = tail[i];
+ }
+ resultByteArray[pos++] = 0;
+ return pos;
+ }
+
+ /**
+ * Get the length of the next String encoded in the in byte array.
+ *
+ * @param in the byte array where to calculate the string.
+ * @param pos the position where to start from in the byte array.
+ * @return the length of the next string.
+ * @throws DataFormatException If the byte array does not end with null.
+ */
+ protected int getNextLength(byte[] in, int pos) throws DataFormatException
+ {
+ int offset = pos;
+ int length = 0;
+ while (in[offset++] != 0)
+ {
+ if (offset >= in.length)
+ throw new DataFormatException("byte[] is not a valid msg");
+ length++;
+ }
+ return length;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ResetGenerationId.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ResetGenerationId.java
deleted file mode 100644
index f101188..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ResetGenerationId.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-
-/**
- * This message is used by an LDAP server to communicate to the topology
- * that the generation must be reset for the domain.
- */
-public class ResetGenerationId extends ReplicationMessage implements
- Serializable
-{
- private static final long serialVersionUID = 7657049716115572226L;
- private long generationId;
-
- /**
- * Creates a new message.
- * @param generationId The new reference value of the generationID.
- */
- public ResetGenerationId(long generationId)
- {
- this.generationId = generationId;
- }
-
- /**
- * Creates a new GenerationIdMessage from its encoded form.
- *
- * @param in The byte array containing the encoded form of the
- * WindowMessage.
- * @throws DataFormatException If the byte array does not contain a valid
- * encoded form of the WindowMessage.
- */
- public ResetGenerationId(byte[] in) throws DataFormatException
- {
- try
- {
- if (in[0] != MSG_TYPE_RESET_GENERATION_ID)
- throw new
- DataFormatException("input is not a valid GenerationId Message");
-
- int pos = 1;
-
- /* read the generationId */
- int length = getNextLength(in, pos);
- generationId = Long.valueOf(new String(in, pos, length,
- "UTF-8"));
- pos += length +1;
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- try
- {
- ByteArrayOutputStream oStream = new ByteArrayOutputStream();
-
- /* Put the message type */
- oStream.write(MSG_TYPE_RESET_GENERATION_ID);
-
- // Put the generationId
- oStream.write(String.valueOf(generationId).getBytes("UTF-8"));
- oStream.write(0);
-
- return oStream.toByteArray();
- }
- catch (IOException e)
- {
- // never happens
- return null;
- }
- }
-
- /**
- * Returns the generation Id set in this message.
- * @return the value of the generation ID.
- *
- */
- public long getGenerationId()
- {
- return this.generationId;
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ResetGenerationIdMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ResetGenerationIdMsg.java
new file mode 100644
index 0000000..5186ea3
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ResetGenerationIdMsg.java
@@ -0,0 +1,127 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+
+/**
+ * This message is used by an LDAP server to communicate to the topology
+ * that the generation must be reset for the domain.
+ */
+public class ResetGenerationIdMsg extends ReplicationMsg
+{
+ private long generationId;
+
+ /**
+ * Creates a new message.
+ * @param generationId The new reference value of the generationID.
+ */
+ public ResetGenerationIdMsg(long generationId)
+ {
+ this.generationId = generationId;
+ }
+
+ /**
+ * Creates a new GenerationIdMessage from its encoded form.
+ *
+ * @param in The byte array containing the encoded form of the
+ * WindowMessage.
+ * @throws DataFormatException If the byte array does not contain a valid
+ * encoded form of the WindowMessage.
+ */
+ public ResetGenerationIdMsg(byte[] in) throws DataFormatException
+ {
+ try
+ {
+ if (in[0] != MSG_TYPE_RESET_GENERATION_ID)
+ throw new
+ DataFormatException("input is not a valid GenerationId Message");
+
+ int pos = 1;
+
+ /* read the generationId */
+ int length = getNextLength(in, pos);
+ generationId = Long.valueOf(new String(in, pos, length,
+ "UTF-8"));
+ pos += length +1;
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ try
+ {
+ ByteArrayOutputStream oStream = new ByteArrayOutputStream();
+
+ /* Put the message type */
+ oStream.write(MSG_TYPE_RESET_GENERATION_ID);
+
+ // Put the generationId
+ oStream.write(String.valueOf(generationId).getBytes("UTF-8"));
+ oStream.write(0);
+
+ return oStream.toByteArray();
+ }
+ catch (IOException e)
+ {
+ // never happens
+ return null;
+ }
+ }
+
+ /**
+ * Returns the generation Id set in this message.
+ * @return the value of the generation ID.
+ *
+ */
+ public long getGenerationId()
+ {
+ return this.generationId;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return "ResetGenerationIdMsg content: " +
+ "\ngenerationId: " + generationId;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/RoutableMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/RoutableMessage.java
deleted file mode 100644
index 2219c4b..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/RoutableMessage.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-
-/**
- * This is an abstract class of messages of the replication protocol
- * for message that needs to contain information about the server that
- * send them and the destination servers to whitch they should be sent.
- */
-public abstract class RoutableMessage extends ReplicationMessage implements
- Serializable
-{
-
- /**
- * Special values for the server ids fields contained in the routable
- * messages.
- **/
-
- /**
- * Specifies that no server is identified.
- */
- public static final short UNKNOWN_SERVER = -1;
- /**
- * Specifies all servers in the replication domain.
- */
- public static final short ALL_SERVERS = -2;
- /**
- * Inside a topology of servers in the same domain, it specifies
- * the server that is the "closest" to the sender.
- */
- public static final short THE_CLOSEST_SERVER = -3;
-
- /**
- * The destination server or servers of this message.
- */
- protected short destination = UNKNOWN_SERVER;
- /**
- * The serverID of the server that sends this message.
- */
- protected short senderID = UNKNOWN_SERVER;
-
- /**
- * Creates a routable message.
- * @param senderID replication server id
- * @param destination replication server id
- */
- public RoutableMessage(short senderID, short destination)
- {
- this.senderID = senderID;
- this.destination = destination;
- }
-
- /**
- * Creates a routable message.
- */
- public RoutableMessage()
- {
- }
-
- /**
- * Get the destination.
- * @return the destination
- */
- public short getDestination()
- {
- return this.destination;
- }
-
- /**
- * Get the server ID of the server that sent this message.
- * @return the server id
- */
- public short getsenderID()
- {
- return this.senderID;
- }
-
- /**
- * Returns a string representation of the message.
- *
- * @return the string representation of this message.
- */
- public String toString()
- {
- return "["+
- this.getClass().getCanonicalName() +
- " sender=" + this.senderID +
- " destination=" + this.destination + "]";
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/RoutableMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/RoutableMsg.java
new file mode 100644
index 0000000..4ec9df4
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/RoutableMsg.java
@@ -0,0 +1,113 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+/**
+ * This is an abstract class of messages of the replication protocol
+ * for message that needs to contain information about the server that
+ * send them and the destination servers to whitch they should be sent.
+ */
+public abstract class RoutableMsg extends ReplicationMsg
+{
+
+ /**
+ * Special values for the server ids fields contained in the routable
+ * messages.
+ **/
+
+ /**
+ * Specifies that no server is identified.
+ */
+ public static final short UNKNOWN_SERVER = -1;
+ /**
+ * Specifies all servers in the replication domain.
+ */
+ public static final short ALL_SERVERS = -2;
+ /**
+ * Inside a topology of servers in the same domain, it specifies
+ * the server that is the "closest" to the sender.
+ */
+ public static final short THE_CLOSEST_SERVER = -3;
+
+ /**
+ * The destination server or servers of this message.
+ */
+ protected short destination = UNKNOWN_SERVER;
+ /**
+ * The serverID of the server that sends this message.
+ */
+ protected short senderID = UNKNOWN_SERVER;
+
+ /**
+ * Creates a routable message.
+ * @param senderID replication server id
+ * @param destination replication server id
+ */
+ public RoutableMsg(short senderID, short destination)
+ {
+ this.senderID = senderID;
+ this.destination = destination;
+ }
+
+ /**
+ * Creates a routable message.
+ */
+ public RoutableMsg()
+ {
+ }
+
+ /**
+ * Get the destination.
+ * @return the destination
+ */
+ public short getDestination()
+ {
+ return this.destination;
+ }
+
+ /**
+ * Get the server ID of the server that sent this message.
+ * @return the server id
+ */
+ public short getsenderID()
+ {
+ return this.senderID;
+ }
+
+ /**
+ * Returns a string representation of the message.
+ *
+ * @return the string representation of this message.
+ */
+ public String toString()
+ {
+ return "["+
+ this.getClass().getCanonicalName() +
+ " sender=" + this.senderID +
+ " destination=" + this.destination + "]";
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ServerStartMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ServerStartMessage.java
deleted file mode 100644
index 42f1bdc..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ServerStartMessage.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.zip.DataFormatException;
-
-import org.opends.server.replication.common.ServerState;
-import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
-
-/**
- * This message is used by LDAP server when they first connect.
- * to a replication server to let them know who they are and what is their state
- * (their RUV)
- */
-public class ServerStartMessage extends StartMessage implements
- Serializable
-{
- private static final long serialVersionUID = 8649393307038290287L;
-
- private short serverId; // Id of the LDAP server that sent this message
- private String serverURL;
- private String baseDn;
- private int maxReceiveQueue;
- private int maxSendQueue;
- private int maxReceiveDelay;
- private int maxSendDelay;
- private int windowSize;
- private boolean handshakeOnly;
- private ServerState serverState = null;
-
- /**
- * The time in milliseconds between heartbeats from the replication
- * server. Zero means heartbeats are off.
- */
- private long heartbeatInterval = 0;
-
- /**
- * Whether to continue using SSL to encrypt messages after the start
- * messages have been exchanged.
- */
- private boolean sslEncryption;
-
- /**
- * Creates a new ServerStartMessage. This message is to be sent by an LDAP
- * Server after being connected to a replication server for a given
- * replication domain.
- *
- * @param serverId The serverId of the server for which the ServerStartMessage
- * is created.
- * @param baseDn The base DN.
- * @param maxReceiveDelay The max receive delay for this server.
- * @param maxReceiveQueue The max receive Queue for this server.
- * @param maxSendDelay The max Send Delay from this server.
- * @param maxSendQueue The max send Queue from this server.
- * @param windowSize The window size used by this server.
- * @param heartbeatInterval The requested heartbeat interval.
- * @param serverState The state of this server.
- * @param protocolVersion The replication protocol version of the creator.
- * @param generationId The generationId for this server.
- * @param sslEncryption Whether to continue using SSL to encrypt messages
- * after the start messages have been exchanged.
- * @param handshakeOnly Whether this message is only to get an handshake
- * with the server or not.
- */
- public ServerStartMessage(short serverId, DN baseDn, int maxReceiveDelay,
- int maxReceiveQueue, int maxSendDelay,
- int maxSendQueue, int windowSize,
- long heartbeatInterval,
- ServerState serverState,
- short protocolVersion,
- long generationId,
- boolean sslEncryption,
- boolean handshakeOnly)
- {
- super(protocolVersion, generationId);
-
- this.serverId = serverId;
- this.baseDn = baseDn.toString();
- this.maxReceiveDelay = maxReceiveDelay;
- this.maxReceiveQueue = maxReceiveQueue;
- this.maxSendDelay = maxSendDelay;
- this.maxSendQueue = maxSendQueue;
- this.windowSize = windowSize;
- this.heartbeatInterval = heartbeatInterval;
- this.sslEncryption = sslEncryption;
- this.serverState = serverState;
- this.handshakeOnly = handshakeOnly;
-
- try
- {
- /* TODO : find a better way to get the server URL */
- this.serverURL = InetAddress.getLocalHost().getHostName();
- } catch (UnknownHostException e)
- {
- this.serverURL = "Unknown host";
- }
- }
-
- /**
- * Creates a new ServerStartMessage from its encoded form.
- *
- * @param in The byte array containing the encoded form of the
- * ServerStartMessage.
- * @throws DataFormatException If the byte array does not contain a valid
- * encoded form of the ServerStartMessage.
- */
- public ServerStartMessage(byte[] in) throws DataFormatException
- {
- super(MSG_TYPE_SERVER_START, in);
-
- try
- {
- /* first bytes are the header */
- int pos = headerLength;
-
- /*
- * read the dn
- * first calculate the length then construct the string
- */
- int length = getNextLength(in, pos);
- baseDn = new String(in, pos, length, "UTF-8");
- pos += length +1;
-
- /*
- * read the ServerId
- */
- length = getNextLength(in, pos);
- String serverIdString = new String(in, pos, length, "UTF-8");
- serverId = Short.valueOf(serverIdString);
- pos += length +1;
-
- /*
- * read the ServerURL
- */
- length = getNextLength(in, pos);
- serverURL = new String(in, pos, length, "UTF-8");
- pos += length +1;
-
- /*
- * read the maxReceiveDelay
- */
- length = getNextLength(in, pos);
- maxReceiveDelay = Integer.valueOf(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- /*
- * read the maxReceiveQueue
- */
- length = getNextLength(in, pos);
- maxReceiveQueue = Integer.valueOf(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- /*
- * read the maxSendDelay
- */
- length = getNextLength(in, pos);
- maxSendDelay = Integer.valueOf(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- /*
- * read the maxSendQueue
- */
- length = getNextLength(in, pos);
- maxSendQueue = Integer.valueOf(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- /*
- * read the windowSize
- */
- length = getNextLength(in, pos);
- windowSize = Integer.valueOf(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- /*
- * read the heartbeatInterval
- */
- length = getNextLength(in, pos);
- heartbeatInterval = Integer.valueOf(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- /*
- * read the sslEncryption setting
- */
- length = getNextLength(in, pos);
- sslEncryption = Boolean.valueOf(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
-
- /*
- * read the handshakeOnly flag
- */
- length = getNextLength(in, pos);
- handshakeOnly = Boolean.valueOf(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- /*
- * read the ServerState
- */
- serverState = new ServerState(in, pos, in.length-1);
-
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * Get the ServerID from the message.
- * @return the server ID
- */
- public short getServerId()
- {
- return serverId;
- }
-
- /**
- * get the Server URL from the message.
- * @return the server URL
- */
- public String getServerURL()
- {
- return serverURL;
- }
-
- /**
- * Get the baseDn.
- * @return Returns the baseDn.
- */
- public DN getBaseDn()
- {
- try
- {
- return DN.decode(baseDn);
- } catch (DirectoryException e)
- {
- return null;
- }
- }
-
- /**
- * Get the maxReceiveDelay.
- * @return Returns the maxReceiveDelay.
- */
- public int getMaxReceiveDelay()
- {
- return maxReceiveDelay;
- }
-
- /**
- * Get the maxReceiveQueue.
- * @return Returns the maxReceiveQueue.
- */
- public int getMaxReceiveQueue()
- {
- return maxReceiveQueue;
- }
-
- /**
- * Get the maxSendDelay.
- * @return Returns the maxSendDelay.
- */
- public int getMaxSendDelay()
- {
- return maxSendDelay;
- }
-
- /**
- * Get the maxSendQueue.
- * @return Returns the maxSendQueue.
- */
- public int getMaxSendQueue()
- {
- return maxSendQueue;
- }
-
- /**
- * Get the ServerState.
- * @return The ServerState.
- */
- public ServerState getServerState()
- {
- return serverState;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- try {
- byte[] byteDn = baseDn.getBytes("UTF-8");
- byte[] byteServerId = String.valueOf(serverId).getBytes("UTF-8");
- byte[] byteServerUrl = serverURL.getBytes("UTF-8");
- byte[] byteMaxRecvDelay =
- String.valueOf(maxReceiveDelay).getBytes("UTF-8");
- byte[] byteMaxRecvQueue =
- String.valueOf(maxReceiveQueue).getBytes("UTF-8");
- byte[] byteMaxSendDelay =
- String.valueOf(maxSendDelay).getBytes("UTF-8");
- byte[] byteMaxSendQueue =
- String.valueOf(maxSendQueue).getBytes("UTF-8");
- byte[] byteWindowSize =
- String.valueOf(windowSize).getBytes("UTF-8");
- byte[] byteHeartbeatInterval =
- String.valueOf(heartbeatInterval).getBytes("UTF-8");
- byte[] byteSSLEncryption =
- String.valueOf(sslEncryption).getBytes("UTF-8");
- byte[] byteServerState = serverState.getBytes();
- byte[] byteHandshakeOnly =
- String.valueOf(handshakeOnly).getBytes("UTF-8");
-
- int length = byteDn.length + 1 + byteServerId.length + 1 +
- byteServerUrl.length + 1 +
- byteMaxRecvDelay.length + 1 +
- byteMaxRecvQueue.length + 1 +
- byteMaxSendDelay.length + 1 +
- byteMaxSendQueue.length + 1 +
- byteWindowSize.length + 1 +
- byteHeartbeatInterval.length + 1 +
- byteSSLEncryption.length + 1 +
- byteHandshakeOnly.length + 1 +
- byteServerState.length + 1;
-
- /* encode the header in a byte[] large enough to also contain the mods */
- byte resultByteArray[] = encodeHeader(MSG_TYPE_SERVER_START, length);
- int pos = headerLength;
-
- pos = addByteArray(byteDn, resultByteArray, pos);
-
- pos = addByteArray(byteServerId, resultByteArray, pos);
-
- pos = addByteArray(byteServerUrl, resultByteArray, pos);
-
- pos = addByteArray(byteMaxRecvDelay, resultByteArray, pos);
-
- pos = addByteArray(byteMaxRecvQueue, resultByteArray, pos);
-
- pos = addByteArray(byteMaxSendDelay, resultByteArray, pos);
-
- pos = addByteArray(byteMaxSendQueue, resultByteArray, pos);
-
- pos = addByteArray(byteWindowSize, resultByteArray, pos);
-
- pos = addByteArray(byteHeartbeatInterval, resultByteArray, pos);
-
- pos = addByteArray(byteSSLEncryption, resultByteArray, pos);
-
- pos = addByteArray(byteHandshakeOnly, resultByteArray, pos);
-
- pos = addByteArray(byteServerState, resultByteArray, pos);
-
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-
- /**
- * Get the window size for the ldap server that created the message.
- *
- * @return The window size for the ldap server that created the message.
- */
- public int getWindowSize()
- {
- return windowSize;
- }
-
- /**
- * Get the heartbeat interval requested by the ldap server that created the
- * message.
- *
- * @return The heartbeat interval requested by the ldap server that created
- * the message.
- */
- public long getHeartbeatInterval()
- {
- return heartbeatInterval;
- }
-
- /**
- * Get the SSL encryption value for the ldap server that created the
- * message.
- *
- * @return The SSL encryption value for the ldap server that created the
- * message.
- */
- public boolean getSSLEncryption()
- {
- return sslEncryption;
- }
-
- /**
- * Get the SSL encryption value for the ldap server that created the
- * message.
- *
- * @return The SSL encryption value for the ldap server that created the
- * message.
- */
- public boolean isHandshakeOnly()
- {
- return handshakeOnly;
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
new file mode 100644
index 0000000..8e8496b
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
@@ -0,0 +1,429 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.zip.DataFormatException;
+
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+
+/**
+ * This message is used by LDAP server when they first connect.
+ * to a replication server to let them know who they are and what is their state
+ * (their RUV)
+ */
+public class ServerStartMsg extends StartMsg
+{
+ private short serverId; // Id of the LDAP server that sent this message
+ private String serverURL;
+ private String baseDn;
+ private int maxReceiveQueue;
+ private int maxSendQueue;
+ private int maxReceiveDelay;
+ private int maxSendDelay;
+ private int windowSize;
+ private ServerState serverState = null;
+
+ /**
+ * The time in milliseconds between heartbeats from the replication
+ * server. Zero means heartbeats are off.
+ */
+ private long heartbeatInterval = 0;
+
+ /**
+ * Whether to continue using SSL to encrypt messages after the start
+ * messages have been exchanged.
+ */
+ private boolean sslEncryption;
+
+ /**
+ * Creates a new ServerStartMsg. This message is to be sent by an LDAP
+ * Server after being connected to a replication server for a given
+ * replication domain.
+ *
+ * @param serverId The serverId of the server for which the ServerStartMsg
+ * is created.
+ * @param baseDn The base DN.
+ * @param maxReceiveDelay The max receive delay for this server.
+ * @param maxReceiveQueue The max receive Queue for this server.
+ * @param maxSendDelay The max Send Delay from this server.
+ * @param maxSendQueue The max send Queue from this server.
+ * @param windowSize The window size used by this server.
+ * @param heartbeatInterval The requested heartbeat interval.
+ * @param serverState The state of this server.
+ * @param protocolVersion The replication protocol version of the creator.
+ * @param generationId The generationId for this server.
+ * @param sslEncryption Whether to continue using SSL to encrypt messages
+ * after the start messages have been exchanged.
+ * @param groupId The group id of the DS for this DN
+ */
+ public ServerStartMsg(short serverId, DN baseDn, int maxReceiveDelay,
+ int maxReceiveQueue, int maxSendDelay,
+ int maxSendQueue, int windowSize,
+ long heartbeatInterval,
+ ServerState serverState,
+ short protocolVersion,
+ long generationId,
+ boolean sslEncryption,
+ byte groupId)
+ {
+ super(protocolVersion, generationId);
+
+ this.serverId = serverId;
+ this.baseDn = baseDn.toString();
+ this.maxReceiveDelay = maxReceiveDelay;
+ this.maxReceiveQueue = maxReceiveQueue;
+ this.maxSendDelay = maxSendDelay;
+ this.maxSendQueue = maxSendQueue;
+ this.windowSize = windowSize;
+ this.heartbeatInterval = heartbeatInterval;
+ this.sslEncryption = sslEncryption;
+ this.serverState = serverState;
+ this.groupId = groupId;
+
+ try
+ {
+ /* TODO : find a better way to get the server URL */
+ this.serverURL = InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException e)
+ {
+ this.serverURL = "Unknown host";
+ }
+ }
+
+ /**
+ * Creates a new ServerStartMsg from its encoded form.
+ *
+ * @param in The byte array containing the encoded form of the
+ * ServerStartMsg.
+ * @throws DataFormatException If the byte array does not contain a valid
+ * encoded form of the ServerStartMsg.
+ */
+ public ServerStartMsg(byte[] in) throws DataFormatException
+ {
+ byte[] allowedPduTypes = new byte[1];
+ allowedPduTypes[0] = MSG_TYPE_SERVER_START;
+ headerLength = decodeHeader(allowedPduTypes, in);
+
+ try
+ {
+ /* first bytes are the header */
+ int pos = headerLength;
+
+ /*
+ * read the dn
+ * first calculate the length then construct the string
+ */
+ int length = getNextLength(in, pos);
+ baseDn = new String(in, pos, length, "UTF-8");
+ pos += length +1;
+
+ /*
+ * read the ServerId
+ */
+ length = getNextLength(in, pos);
+ String serverIdString = new String(in, pos, length, "UTF-8");
+ serverId = Short.valueOf(serverIdString);
+ pos += length +1;
+
+ /*
+ * read the ServerURL
+ */
+ length = getNextLength(in, pos);
+ serverURL = new String(in, pos, length, "UTF-8");
+ pos += length +1;
+
+ /*
+ * read the maxReceiveDelay
+ */
+ length = getNextLength(in, pos);
+ maxReceiveDelay = Integer.valueOf(new String(in, pos, length, "UTF-8"));
+ pos += length +1;
+
+ /*
+ * read the maxReceiveQueue
+ */
+ length = getNextLength(in, pos);
+ maxReceiveQueue = Integer.valueOf(new String(in, pos, length, "UTF-8"));
+ pos += length +1;
+
+ /*
+ * read the maxSendDelay
+ */
+ length = getNextLength(in, pos);
+ maxSendDelay = Integer.valueOf(new String(in, pos, length, "UTF-8"));
+ pos += length +1;
+
+ /*
+ * read the maxSendQueue
+ */
+ length = getNextLength(in, pos);
+ maxSendQueue = Integer.valueOf(new String(in, pos, length, "UTF-8"));
+ pos += length +1;
+
+ /*
+ * read the windowSize
+ */
+ length = getNextLength(in, pos);
+ windowSize = Integer.valueOf(new String(in, pos, length, "UTF-8"));
+ pos += length +1;
+
+ /*
+ * read the heartbeatInterval
+ */
+ length = getNextLength(in, pos);
+ heartbeatInterval = Integer.valueOf(new String(in, pos, length, "UTF-8"));
+ pos += length +1;
+
+ /*
+ * read the sslEncryption setting
+ */
+ length = getNextLength(in, pos);
+ sslEncryption = Boolean.valueOf(new String(in, pos, length, "UTF-8"));
+ pos += length +1;
+
+ /*
+ * read the ServerState
+ */
+ serverState = new ServerState(in, pos, in.length - 1);
+
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * Get the ServerID from the message.
+ * @return the server ID
+ */
+ public short getServerId()
+ {
+ return serverId;
+ }
+
+ /**
+ * get the Server URL from the message.
+ * @return the server URL
+ */
+ public String getServerURL()
+ {
+ return serverURL;
+ }
+
+ /**
+ * Get the baseDn.
+ * @return Returns the baseDn.
+ */
+ public DN getBaseDn()
+ {
+ try
+ {
+ return DN.decode(baseDn);
+ } catch (DirectoryException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Get the maxReceiveDelay.
+ * @return Returns the maxReceiveDelay.
+ */
+ public int getMaxReceiveDelay()
+ {
+ return maxReceiveDelay;
+ }
+
+ /**
+ * Get the maxReceiveQueue.
+ * @return Returns the maxReceiveQueue.
+ */
+ public int getMaxReceiveQueue()
+ {
+ return maxReceiveQueue;
+ }
+
+ /**
+ * Get the maxSendDelay.
+ * @return Returns the maxSendDelay.
+ */
+ public int getMaxSendDelay()
+ {
+ return maxSendDelay;
+ }
+
+ /**
+ * Get the maxSendQueue.
+ * @return Returns the maxSendQueue.
+ */
+ public int getMaxSendQueue()
+ {
+ return maxSendQueue;
+ }
+
+ /**
+ * Get the ServerState.
+ * @return The ServerState.
+ */
+ public ServerState getServerState()
+ {
+ return serverState;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ try {
+ byte[] byteDn = baseDn.getBytes("UTF-8");
+ byte[] byteServerId = String.valueOf(serverId).getBytes("UTF-8");
+ byte[] byteServerUrl = serverURL.getBytes("UTF-8");
+ byte[] byteMaxRecvDelay =
+ String.valueOf(maxReceiveDelay).getBytes("UTF-8");
+ byte[] byteMaxRecvQueue =
+ String.valueOf(maxReceiveQueue).getBytes("UTF-8");
+ byte[] byteMaxSendDelay =
+ String.valueOf(maxSendDelay).getBytes("UTF-8");
+ byte[] byteMaxSendQueue =
+ String.valueOf(maxSendQueue).getBytes("UTF-8");
+ byte[] byteWindowSize =
+ String.valueOf(windowSize).getBytes("UTF-8");
+ byte[] byteHeartbeatInterval =
+ String.valueOf(heartbeatInterval).getBytes("UTF-8");
+ byte[] byteSSLEncryption =
+ String.valueOf(sslEncryption).getBytes("UTF-8");
+ byte[] byteServerState = serverState.getBytes();
+
+ int length = byteDn.length + 1 + byteServerId.length + 1 +
+ byteServerUrl.length + 1 +
+ byteMaxRecvDelay.length + 1 +
+ byteMaxRecvQueue.length + 1 +
+ byteMaxSendDelay.length + 1 +
+ byteMaxSendQueue.length + 1 +
+ byteWindowSize.length + 1 +
+ byteHeartbeatInterval.length + 1 +
+ byteSSLEncryption.length + 1 +
+ byteServerState.length + 1;
+
+ /* encode the header in a byte[] large enough to also contain the mods */
+ byte resultByteArray[] = encodeHeader(MSG_TYPE_SERVER_START, length);
+ int pos = headerLength;
+
+ pos = addByteArray(byteDn, resultByteArray, pos);
+
+ pos = addByteArray(byteServerId, resultByteArray, pos);
+
+ pos = addByteArray(byteServerUrl, resultByteArray, pos);
+
+ pos = addByteArray(byteMaxRecvDelay, resultByteArray, pos);
+
+ pos = addByteArray(byteMaxRecvQueue, resultByteArray, pos);
+
+ pos = addByteArray(byteMaxSendDelay, resultByteArray, pos);
+
+ pos = addByteArray(byteMaxSendQueue, resultByteArray, pos);
+
+ pos = addByteArray(byteWindowSize, resultByteArray, pos);
+
+ pos = addByteArray(byteHeartbeatInterval, resultByteArray, pos);
+
+ pos = addByteArray(byteSSLEncryption, resultByteArray, pos);
+
+ pos = addByteArray(byteServerState, resultByteArray, pos);
+
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Get the window size for the ldap server that created the message.
+ *
+ * @return The window size for the ldap server that created the message.
+ */
+ public int getWindowSize()
+ {
+ return windowSize;
+ }
+
+ /**
+ * Get the heartbeat interval requested by the ldap server that created the
+ * message.
+ *
+ * @return The heartbeat interval requested by the ldap server that created
+ * the message.
+ */
+ public long getHeartbeatInterval()
+ {
+ return heartbeatInterval;
+ }
+
+ /**
+ * Get the SSL encryption value for the ldap server that created the
+ * message.
+ *
+ * @return The SSL encryption value for the ldap server that created the
+ * message.
+ */
+ public boolean getSSLEncryption()
+ {
+ return sslEncryption;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return "ServerStartMsg content: " +
+ "\nprotocolVersion: " + protocolVersion +
+ "\ngenerationId: " + generationId +
+ "\ngroupId: " + groupId +
+ "\nbaseDn: " + baseDn.toString() +
+ "\nheartbeatInterval: " + heartbeatInterval +
+ "\nmaxReceiveDelay: " + maxReceiveDelay +
+ "\nmaxReceiveQueue: " + maxReceiveQueue +
+ "\nmaxSendDelay: " + maxSendDelay +
+ "\nmaxSendQueue: " + maxSendQueue +
+ "\nserverId: " + serverId +
+ "\nserverState: " + serverState +
+ "\nserverURL: " + serverURL +
+ "\nsslEncryption: " + sslEncryption +
+ "\nwindowSize: " + windowSize;
+ }
+ }
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/SocketSession.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/SocketSession.java
index cbfc3c8..dbe3893 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/SocketSession.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/SocketSession.java
@@ -41,7 +41,7 @@
/**
* This class Implement a protocol session using a basic socket and relying on
- * the innate encoding/decoding capabilities of the ReplicationMessage
+ * the innate encoding/decoding capabilities of the ReplicationMsg
* by using the getBytes() and generateMsg() methods of those classes.
*/
public class SocketSession implements ProtocolSession
@@ -101,10 +101,19 @@
/**
* {@inheritDoc}
*/
- public synchronized void publish(ReplicationMessage msg)
+ public synchronized void publish(ReplicationMsg msg)
throws IOException
{
- byte[] buffer = msg.getBytes();
+ publish(msg, ProtocolVersion.getCurrentVersion());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public synchronized void publish(ReplicationMsg msg, short reqProtocolVersion)
+ throws IOException
+ {
+ byte[] buffer = msg.getBytes(reqProtocolVersion);
String str = String.format("%08x", buffer.length);
if (debugEnabled())
@@ -124,8 +133,9 @@
/**
* {@inheritDoc}
*/
- public ReplicationMessage receive() throws IOException,
- ClassNotFoundException, DataFormatException
+ public ReplicationMsg receive() throws IOException,
+ ClassNotFoundException, DataFormatException,
+ NotSupportedOldVersionPDUException
{
/* Read the first 8 bytes containing the packet length */
int length = 0;
@@ -161,7 +171,7 @@
/* We do not want the heartbeat to close the session when */
/* we are processing a message even a time consuming one. */
lastReceiveTime=0;
- return ReplicationMessage.generateMsg(buffer);
+ return ReplicationMsg.generateMsg(buffer);
}
catch (OutOfMemoryError e)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartMessage.java
deleted file mode 100644
index a29b6a6..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartMessage.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-
-/**
- * This abstract message class is the superclass for start messages used
- * by LDAP servers and Replication servers to initiate their communications.
- * This class specifies a message header that contains the Replication
- * Protocol version.
- */
-public abstract class StartMessage extends ReplicationMessage
-{
- private short protocolVersion;
- private long generationId;
-
- /**
- * The length of the header of this message.
- */
- protected int headerLength;
-
- /**
- * Create a new StartMessage.
- *
- * @param protocolVersion The Replication Protocol version of the server
- * for which the StartMessage is created.
- * @param generationId The generationId for this server.
- *
- */
- public StartMessage(short protocolVersion, long generationId)
- {
- this.protocolVersion = protocolVersion;
- this.generationId = generationId;
- }
-
- /**
- * Creates a new ServerStartMessage from its encoded form.
- *
- * @param type The type of the message to create.
- * @param encodedMsg The byte array containing the encoded form of the
- * StartMessage.
- * @throws DataFormatException If the byte array does not contain a valid
- * encoded form of the ServerStartMessage.
- */
- public StartMessage(byte type, byte [] encodedMsg) throws DataFormatException
- {
- headerLength = decodeHeader(type, encodedMsg);
- }
-
- /**
- * Encode the header for the start message.
- *
- * @param type The type of the message to create.
- * @param additionalLength additional length needed to encode the remaining
- * part of the UpdateMessage.
- * @return a byte array containing the common header and enough space to
- * encode the reamining bytes of the UpdateMessage as was specified
- * by the additionalLength.
- * (byte array length = common header length + additionalLength)
- * @throws UnsupportedEncodingException if UTF-8 is not supported.
- */
- public byte[] encodeHeader(byte type, int additionalLength)
- throws UnsupportedEncodingException
- {
- byte[] versionByte = Short.toString(protocolVersion).getBytes("UTF-8");
- byte[] byteGenerationID =
- String.valueOf(generationId).getBytes("UTF-8");
-
- /* The message header is stored in the form :
- * <message type><protocol version>
- */
- int length = 1 + versionByte.length + 1 +
- byteGenerationID.length + 1 +
- additionalLength;
-
- byte[] encodedMsg = new byte[length];
-
- /* put the type of the operation */
- encodedMsg[0] = type;
- int pos = 1;
-
- /* put the protocol version */
- pos = addByteArray(versionByte, encodedMsg, pos);
-
- /* put the generationId */
- headerLength = addByteArray(byteGenerationID, encodedMsg, pos);
-
- return encodedMsg;
- }
-
- /**
- * Decode the Header part of this message, and check its type.
- *
- * @param type The type of this message.
- * @param encodedMsg the encoded form of the message.
- * @return the position at which the remaining part of the message starts.
- * @throws DataFormatException if the encodedMsg does not contain a valid
- * common header.
- */
- public int decodeHeader(byte type, byte [] encodedMsg)
- throws DataFormatException
- {
- /* first byte is the type */
- if (encodedMsg[0] != type)
- throw new DataFormatException("byte[] is not a valid msg");
-
- try
- {
- /* then read the version */
- int pos = 1;
- int length = getNextLength(encodedMsg, pos);
- protocolVersion = Short.valueOf(
- new String(encodedMsg, pos, length, "UTF-8"));
- pos += length + 1;
-
- /* read the generationId */
- length = getNextLength(encodedMsg, pos);
- generationId = Long.valueOf(new String(encodedMsg, pos, length,
- "UTF-8"));
- pos += length +1;
-
-
- return pos;
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
-
- }
-
- /**
- * Get the version included in the Start Message mean the replication
- * protocol version used by the server that created the message.
- *
- * @return The version used by the server that created the message.
- */
- public short getVersion()
- {
- return protocolVersion;
- }
-
- /**
- * Get the generationId from this message.
- * @return The generationId.
- */
- public long getGenerationId()
- {
- return generationId;
- }
-
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartMsg.java
new file mode 100644
index 0000000..aa352cb
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartMsg.java
@@ -0,0 +1,304 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+
+/**
+ * This abstract message class is the superclass for start messages used
+ * by LDAP servers and Replication servers to initiate their communications.
+ * This class specifies a message header that contains the Replication
+ * Protocol version.
+ */
+public abstract class StartMsg extends ReplicationMsg
+{
+ /** Protocol version. */
+ protected short protocolVersion;
+ /** Generation id of data set we want to work with. */
+ protected long generationId;
+ /** Group id of the replicated domain. */
+ protected byte groupId = (byte)-1;
+
+ /**
+ * The length of the header of this message.
+ */
+ protected int headerLength;
+
+ /**
+ * Create a new StartMsg.
+ */
+ public StartMsg()
+ {
+ }
+
+ /**
+ * Create a new StartMsg.
+ *
+ * @param protocolVersion The Replication Protocol version of the server
+ * for which the StartMsg is created.
+ * @param generationId The generationId for this server.
+ *
+ */
+ public StartMsg(short protocolVersion, long generationId)
+ {
+ this.protocolVersion = protocolVersion;
+ this.generationId = generationId;
+ }
+
+ /**
+ * Encode the header for the start message.
+ *
+ * @param type The type of the message to create.
+ * @param additionalLength additional length needed to encode the remaining
+ * part of the UpdateMessage.
+ * @return a byte array containing the common header and enough space to
+ * encode the remaining bytes of the UpdateMessage as was specified
+ * by the additionalLength.
+ * (byte array length = common header length + additionalLength)
+ * @throws UnsupportedEncodingException if UTF-8 is not supported.
+ */
+ public byte[] encodeHeader(byte type, int additionalLength)
+ throws UnsupportedEncodingException
+ {
+ byte[] byteGenerationID =
+ String.valueOf(generationId).getBytes("UTF-8");
+
+ /* The message header is stored in the form :
+ * <message type><protocol version><generation id><group id>
+ */
+ int length = 1 + 1 + byteGenerationID.length + 1 + 1 +
+ additionalLength;
+
+ byte[] encodedMsg = new byte[length];
+
+ /* put the type of the operation */
+ encodedMsg[0] = type;
+
+ /* put the protocol version */
+ encodedMsg[1] = (byte)ProtocolVersion.getCurrentVersion();
+
+ /* put the generationId */
+ int pos = 2;
+ pos = addByteArray(byteGenerationID, encodedMsg, pos);
+
+ /* put the group id */
+ encodedMsg[pos] = groupId;
+
+ pos++;
+ headerLength = pos;
+
+ return encodedMsg;
+ }
+
+ /**
+ * Encode the header for the start message. This uses the version 1 of the
+ * replication protocol (used for compatibility purpose).
+ *
+ * @param type The type of the message to create.
+ * @param additionalLength additional length needed to encode the remaining
+ * part of the UpdateMessage.
+ * @return a byte array containing the common header and enough space to
+ * encode the remaining bytes of the UpdateMessage as was specified
+ * by the additionalLength.
+ * (byte array length = common header length + additionalLength)
+ * @throws UnsupportedEncodingException if UTF-8 is not supported.
+ */
+ public byte[] encodeHeader_V1(byte type, int additionalLength)
+ throws UnsupportedEncodingException
+ {
+ byte[] byteGenerationID =
+ String.valueOf(generationId).getBytes("UTF-8");
+
+ /* The message header is stored in the form :
+ * <message type><protocol version><generation id>
+ */
+ int length = 1 + 1 + 1 +
+ byteGenerationID.length + 1 +
+ additionalLength;
+
+ byte[] encodedMsg = new byte[length];
+
+ /* put the type of the operation */
+ encodedMsg[0] = type;
+
+ /* put the protocol version */
+ encodedMsg[1] = (byte)ProtocolVersion.REPLICATION_PROTOCOL_V1_REAL;
+ encodedMsg[2] = (byte)0;
+
+ /* put the generationId */
+ int pos = 3;
+ headerLength = addByteArray(byteGenerationID, encodedMsg, pos);
+
+ return encodedMsg;
+ }
+
+ /**
+ * Decode the Header part of this message, and check its type.
+ *
+ * @param types The allowed types of this message.
+ * @param encodedMsg the encoded form of the message.
+ * @return the position at which the remaining part of the message starts.
+ * @throws DataFormatException if the encodedMsg does not contain a valid
+ * common header.
+ */
+ public int decodeHeader(byte[] types, byte [] encodedMsg)
+ throws DataFormatException
+ {
+ /* first byte is the type */
+ boolean foundMatchingType = false;
+ for (int i = 0; i < types.length; i++)
+ {
+ if (types[i] == encodedMsg[0])
+ {
+ foundMatchingType = true;
+ break;
+ }
+ }
+ if (!foundMatchingType)
+ throw new DataFormatException("byte[] is not a valid start msg: " +
+ encodedMsg[0]);
+
+ // Filter for supported old versions PDUs
+ if (encodedMsg[0] == MSG_TYPE_REPL_SERVER_START_V1)
+ return decodeHeader_V1(MSG_TYPE_REPL_SERVER_START_V1, encodedMsg);
+
+ try
+ {
+ /* then read the version */
+ short readVersion = (short)encodedMsg[1];
+ if (readVersion != ProtocolVersion.getCurrentVersion())
+ throw new DataFormatException("Not a valid message: type is " +
+ encodedMsg[0] + " but protocol version byte is " + readVersion +
+ " instead of " + ProtocolVersion.getCurrentVersion());
+ protocolVersion = ProtocolVersion.getCurrentVersion();
+
+ /* read the generationId */
+ int pos = 2;
+ int length = getNextLength(encodedMsg, pos);
+ generationId = Long.valueOf(new String(encodedMsg, pos, length,
+ "UTF-8"));
+ pos += length +1;
+
+ /* read the group id */
+ groupId = encodedMsg[pos];
+ pos++;
+
+ return pos;
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * Decode the Header part of this message, and check its type. This uses the
+ * version 1 of the replication protocol (used for compatibility purpose).
+ *
+ * @param type The type of this message.
+ * @param encodedMsg the encoded form of the message.
+ * @return the position at which the remaining part of the message starts.
+ * @throws DataFormatException if the encodedMsg does not contain a valid
+ * common header.
+ */
+ public int decodeHeader_V1(byte type, byte [] encodedMsg)
+ throws DataFormatException
+ {
+ if (encodedMsg[0] != type)
+ throw new DataFormatException("byte[] is not a valid start msg: expected "
+ + " a V1 PDU, received: " + encodedMsg[0]);
+
+ if (encodedMsg[1] != ProtocolVersion.REPLICATION_PROTOCOL_V1_REAL)
+ {
+ throw new DataFormatException("Not a valid message: type is " +
+ type + " but protocol version byte is " + encodedMsg[1] + " instead of "
+ + ProtocolVersion.REPLICATION_PROTOCOL_V1_REAL);
+ }
+
+ // Force version to V1
+ // We need to translate the MSG_TYPE_REPL_SERVER_START_V1 version
+ // into REPLICATION_PROTOCOL_V1 so that we only see V1 everywhere.
+ protocolVersion = ProtocolVersion.REPLICATION_PROTOCOL_V1;
+
+ try
+ {
+ // In V1, version was 1 (49) in string, so with a null
+ // terminating string. Let's position the cursor at the next byte
+ int pos = 3;
+
+ /* read the generationId */
+ int length = getNextLength(encodedMsg, pos);
+ generationId = Long.valueOf(new String(encodedMsg, pos, length,
+ "UTF-8"));
+ pos += length +1;
+
+ return pos;
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * Get the version included in the Start Message mean the replication
+ * protocol version used by the server that created the message.
+ *
+ * @return The version used by the server that created the message.
+ */
+ public short getVersion()
+ {
+ return protocolVersion;
+ }
+
+ /**
+ * Get the generationId from this message.
+ * @return The generationId.
+ */
+ public long getGenerationId()
+ {
+ return generationId;
+ }
+
+ /**
+ * Get the group id in this message.
+ * @return The group id in this message
+ */
+ public byte getGroupId()
+ {
+ return groupId;
+ }
+
+ /**
+ * Set the group id in this message (For test purpose).
+ * @param groupId The group id to set.
+ */
+ public void setGroupId(byte groupId)
+ {
+ this.groupId = groupId;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartSessionMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartSessionMsg.java
new file mode 100644
index 0000000..5925ee5
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/StartSessionMsg.java
@@ -0,0 +1,276 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.DataFormatException;
+import org.opends.server.replication.common.AssuredMode;
+import org.opends.server.replication.common.ServerStatus;
+
+/**
+ * This message is used by DS to confirm a RS he wants to connect to him (open
+ * a session):
+ * Handshake sequence between DS and RS is like this:
+ * DS --- ServerStartMsg ---> RS
+ * DS <--- ReplServerStartMsg --- RS
+ * DS --- StartSessionMsg ---> RS
+ * DS <--- TopologyMsg --- RS
+ *
+ * This message contains:
+ * - status: the status we are entering the topology with
+ * - referrals URLs: the referrals URLs we allow peer DSs to use to refer to
+ * our domain when needed.
+ */
+public class StartSessionMsg extends ReplicationMsg
+{
+ // The list of referrals URLs to the sending DS
+ private List<String> referralsURLs = new ArrayList<String>();
+ // The initial status the DS starts with
+ private ServerStatus status = ServerStatus.INVALID_STATUS;
+ // Assured replication enabled on DS or not
+ private boolean assuredFlag = false;
+ // DS assured mode (relevant if assured replication enabled)
+ private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
+ // DS safe data level (relevant if assured mode is safe data)
+ private byte safeDataLevel = (byte) 1;
+
+ /**
+ * Creates a new StartSessionMsg message from its encoded form.
+ *
+ * @param in The byte array containing the encoded form of the message.
+ * @throws java.util.zip.DataFormatException If the byte array does not
+ * contain a valid encoded form of the message.
+ */
+ public StartSessionMsg(byte[] in) throws DataFormatException
+ {
+ /*
+ * The message is stored in the form:
+ * <message type><status><assured flag><assured mode><safe data level>
+ * <list of referrals urls>
+ * (each referral url terminates with 0)
+ */
+
+ try
+ {
+ /* first byte is the type */
+ if (in.length < 1 || in[0] != MSG_TYPE_START_SESSION)
+ {
+ throw new DataFormatException(
+ "Input is not a valid " + this.getClass().getCanonicalName());
+ }
+
+ /* Read the status */
+ status = ServerStatus.valueOf(in[1]);
+
+ /* Read the assured flag */
+ if (in[2] == 1)
+ {
+ assuredFlag = true;
+ } else
+ {
+ assuredFlag = false;
+ }
+
+ /* Read the assured mode */
+ assuredMode = AssuredMode.valueOf(in[3]);
+
+ /* Read the safe data level */
+ safeDataLevel = in[4];
+
+ /* Read the refferals URLs */
+ int pos = 5;
+ referralsURLs = new ArrayList<String>();
+ while (pos < in.length)
+ {
+ /*
+ * Read the next URL
+ * first calculate the length then construct the string
+ */
+ int length = getNextLength(in, pos);
+ referralsURLs.add(new String(in, pos, length, "UTF-8"));
+ pos += length + 1;
+ }
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ } catch (IllegalArgumentException e)
+ {
+ throw new DataFormatException(e.getMessage());
+ }
+ }
+
+ /**
+ * Creates a new StartSessionMsg message with the given required parameters.
+ * @param status Status we are starting with
+ * @param referralsURLs Referrals URLs to be used by peer DSs
+ * @param assuredFlag If assured mode is enabled or not
+ * @param assuredMode Assured type
+ * @param safeDataLevel Assured mode safe data level
+ */
+ public StartSessionMsg(ServerStatus status, List<String> referralsURLs,
+ boolean assuredFlag, AssuredMode assuredMode, byte safeDataLevel)
+ {
+ this.referralsURLs = referralsURLs;
+ this.status = status;
+ this.assuredFlag = assuredFlag;
+ this.assuredMode = assuredMode;
+ this.safeDataLevel = safeDataLevel;
+ }
+
+ /**
+ * Creates a new StartSessionMsg message with the given required parameters.
+ * Assured mode is false.
+ * @param status Status we are starting with
+ * @param referralsURLs Referrals URLs to be used by peer DSs
+ */
+ public StartSessionMsg(ServerStatus status, List<String> referralsURLs)
+ {
+ this.referralsURLs = referralsURLs;
+ this.status = status;
+ this.assuredFlag = false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ /*
+ * The message is stored in the form:
+ * <message type><status><assured flag><assured mode><safe data level>
+ * <list of referrals urls>
+ * (each referral url terminates with 0)
+ */
+
+ try
+ {
+ ByteArrayOutputStream oStream = new ByteArrayOutputStream();
+
+ /* Put the message type */
+ oStream.write(MSG_TYPE_START_SESSION);
+
+ // Put the status
+ oStream.write(status.getValue());
+
+ // Put the assured flag
+ oStream.write(assuredFlag ? (byte) 1 : (byte) 0);
+
+ // Put assured mode
+ oStream.write(assuredMode.getValue());
+
+ // Put safe data level
+ oStream.write(safeDataLevel);
+
+ // Put the referrals URLs
+ if (referralsURLs.size() >= 1)
+ {
+ for (String url : referralsURLs)
+ {
+ byte[] byteArrayURL = url.getBytes("UTF-8");
+ oStream.write(byteArrayURL);
+ oStream.write(0);
+ }
+ }
+
+ return oStream.toByteArray();
+ } catch (IOException e)
+ {
+ // never happens
+ return null;
+ }
+ }
+
+ /**
+ * Get the list of referrals URLs.
+ *
+ * @return The list of referrals URLs.
+ */
+ public List<String> getReferralsURLs()
+ {
+ return referralsURLs;
+ }
+
+ /**
+ * Get the status from this message.
+ * @return The status.
+ */
+ public ServerStatus getStatus()
+ {
+ return status;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ String urls = "";
+ for (String s : referralsURLs)
+ {
+ urls += s + " | ";
+ }
+ return ("StartSessionMsg content:\nstatus: " + status +
+ "\nassuredFlag: " + assuredFlag +
+ "\nassuredMode: " + assuredMode +
+ "\nsafeDataLevel: " + safeDataLevel +
+ "\nreferralsURLs: " + urls);
+ }
+
+ /**
+ * Returns true if assured mode is enabled.
+ * @return true if assured mode is enabled.
+ */
+ public boolean isAssured()
+ {
+ return assuredFlag;
+ }
+
+ /**
+ * Get the assured mode.
+ * @return the assured mode.
+ */
+ public AssuredMode getAssuredMode()
+ {
+ return assuredMode;
+ }
+
+ /**
+ * Get the safe data level.
+ * @return the safe data level.
+ */
+ public byte getSafeDataLevel()
+ {
+ return safeDataLevel;
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/TLSSocketSession.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/TLSSocketSession.java
index 799a043..60bddea 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/TLSSocketSession.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/TLSSocketSession.java
@@ -118,10 +118,19 @@
/**
* {@inheritDoc}
*/
- public synchronized void publish(ReplicationMessage msg)
+ public synchronized void publish(ReplicationMsg msg)
throws IOException
{
- byte[] buffer = msg.getBytes();
+ publish(msg, ProtocolVersion.getCurrentVersion());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public synchronized void publish(ReplicationMsg msg, short reqProtocolVersion)
+ throws IOException
+ {
+ byte[] buffer = msg.getBytes(reqProtocolVersion);
String str = String.format("%08x", buffer.length);
byte[] sendLengthBuf = str.getBytes();
@@ -135,8 +144,9 @@
/**
* {@inheritDoc}
*/
- public ReplicationMessage receive() throws IOException,
- ClassNotFoundException, DataFormatException
+ public ReplicationMsg receive() throws IOException,
+ ClassNotFoundException, DataFormatException,
+ NotSupportedOldVersionPDUException
{
/* Read the first 8 bytes containing the packet length */
int length = 0;
@@ -172,7 +182,7 @@
/* We do not want the heartbeat to close the session when */
/* we are processing a message even a time consuming one. */
lastReceiveTime=0;
- return ReplicationMessage.generateMsg(buffer);
+ return ReplicationMsg.generateMsg(buffer);
}
catch (OutOfMemoryError e)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/TopologyMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/TopologyMsg.java
new file mode 100644
index 0000000..b30f0dd
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/TopologyMsg.java
@@ -0,0 +1,351 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2007-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.DataFormatException;
+import org.opends.server.replication.common.AssuredMode;
+import org.opends.server.replication.common.DSInfo;
+import org.opends.server.replication.common.RSInfo;
+import org.opends.server.replication.common.ServerStatus;
+
+/**
+ *
+ * This class defines a message that is sent:
+ * - By a RS to the other RSs in the topology, containing:
+ * - the list of DSs directly connected to the RS in the DS list
+ * - only this RS in the RS list
+ * - By a RS to his connected DSs, containing every DSs and RSs he knows.
+ * In that case the message contains:
+ * - the list of every DS the RS knows except the destinator DS in the DS list
+ * - the list of every connected RSs (including the sending RS) in the RS list
+ *
+ * Exchanging these messages allows to have each RS or DS take
+ * appropriate decisions according to the current topology:
+ * - a RS can route a message to a DS
+ * - a DS can decide towards which peer DS send referrals
+ * ...
+ */
+public class TopologyMsg extends ReplicationMsg
+{
+ // Information for the DS known in the topology
+ private List<DSInfo> dsList = new ArrayList<DSInfo>();
+ // Information for the RS known in the topology
+ private List<RSInfo> rsList = new ArrayList<RSInfo>();
+
+ /**
+ * Creates a new changelogInfo message from its encoded form.
+ *
+ * @param in The byte array containing the encoded form of the message.
+ * @throws java.util.zip.DataFormatException If the byte array does not
+ * contain a valid encoded form of the message.
+ */
+ public TopologyMsg(byte[] in) throws DataFormatException
+ {
+ try
+ {
+ /* First byte is the type */
+ if (in.length < 1 || in[0] != MSG_TYPE_TOPOLOGY)
+ {
+ throw new DataFormatException(
+ "Input is not a valid " + this.getClass().getCanonicalName());
+ }
+
+ int pos = 1;
+
+ /* Read number of following DS info entries */
+
+ byte nDsInfo = in[pos++];
+
+ /* Read the DS info entries */
+ while ( (nDsInfo > 0) && (pos < in.length) )
+ {
+ /* Read DS id */
+ int length = getNextLength(in, pos);
+ String serverIdString = new String(in, pos, length, "UTF-8");
+ short dsId = Short.valueOf(serverIdString);
+ pos +=
+ length + 1;
+
+ /* Read RS id */
+ length =
+ getNextLength(in, pos);
+ serverIdString =
+ new String(in, pos, length, "UTF-8");
+ short rsId = Short.valueOf(serverIdString);
+ pos +=
+ length + 1;
+
+ /* Read the generation id */
+ length = getNextLength(in, pos);
+ long generationId =
+ Long.valueOf(new String(in, pos, length,
+ "UTF-8"));
+ pos +=
+ length + 1;
+
+ /* Read DS status */
+ ServerStatus status = ServerStatus.valueOf(in[pos++]);
+
+ /* Read DS assured flag */
+ boolean assuredFlag;
+ if (in[pos++] == 1)
+ {
+ assuredFlag = true;
+ } else
+ {
+ assuredFlag = false;
+ }
+
+ /* Read DS assured mode */
+ AssuredMode assuredMode = AssuredMode.valueOf(in[pos++]);
+
+ /* Read DS safe data level */
+ byte safeDataLevel = in[pos++];
+
+ /* Read DS group id */
+ byte groupId = in[pos++];
+
+ /* Read number of referrals URLs */
+ List<String> refUrls = new ArrayList<String>();
+ byte nUrls = in[pos++];
+ byte nRead = 0;
+ /* Read urls until expected number read */
+ while ((nRead != nUrls) &&
+ (pos < in.length) //security
+ )
+ {
+ length = getNextLength(in, pos);
+ String url = new String(in, pos, length, "UTF-8");
+ refUrls.add(url);
+ pos +=
+ length + 1;
+ nRead++;
+ }
+
+ /* Now create DSInfo and store it in list */
+
+ DSInfo dsInfo = new DSInfo(dsId, rsId, generationId, status,
+ assuredFlag, assuredMode, safeDataLevel, groupId, refUrls);
+ dsList.add(dsInfo);
+
+ nDsInfo--;
+ }
+
+ /* Read number of following RS info entries */
+
+ byte nRsInfo = in[pos++];
+
+ /* Read the RS info entries */
+ while ( (nRsInfo > 0) && (pos < in.length) )
+ {
+ /* Read RS id */
+ int length = getNextLength(in, pos);
+ String serverIdString = new String(in, pos, length, "UTF-8");
+ short id = Short.valueOf(serverIdString);
+ pos +=
+ length + 1;
+
+ /* Read the generation id */
+ length = getNextLength(in, pos);
+ long generationId =
+ Long.valueOf(new String(in, pos, length,
+ "UTF-8"));
+ pos +=
+ length + 1;
+
+ /* Read RS group id */
+ byte groupId = in[pos++];
+
+ /* Now create RSInfo and store it in list */
+
+ RSInfo rsInfo = new RSInfo(id, generationId, groupId);
+ rsList.add(rsInfo);
+
+ nRsInfo--;
+ }
+
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+
+ }
+
+ /**
+ * Creates a new ReplServerInfo message from a list of the currently
+ * connected servers.
+ *
+ * @param dsList The list of currently connected DS servers ID.
+ * @param rsList The list of currently connected RS servers ID.
+ */
+ public TopologyMsg(List<DSInfo> dsList, List<RSInfo> rsList)
+ {
+ if (dsList != null) // null means no info, let empty list from init time
+ this.dsList = dsList;
+ if (rsList != null) // null means no info, let empty list from init time
+ this.rsList = rsList;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ try
+ {
+ /**
+ * Message has the following form:
+ * <pdu type><number of following DSInfo entries>[<DSInfo>]*
+ * <number of following RSInfo entries>[<RSInfo>]*
+ */
+ ByteArrayOutputStream oStream = new ByteArrayOutputStream();
+
+ /* Put the message type */
+ oStream.write(MSG_TYPE_TOPOLOGY);
+
+ // Put number of following DS info entries
+ oStream.write((byte)dsList.size());
+
+ // Put DS info
+ for (DSInfo dsInfo : dsList)
+ {
+ // Put DS id
+ byte[] byteServerId =
+ String.valueOf(dsInfo.getDsId()).getBytes("UTF-8");
+ oStream.write(byteServerId);
+ oStream.write(0);
+ // Put RS id
+ byteServerId =
+ String.valueOf(dsInfo.getRsId()).getBytes("UTF-8");
+ oStream.write(byteServerId);
+ oStream.write(0);
+ // Put the generation id
+ oStream.write(String.valueOf(dsInfo.getGenerationId()).
+ getBytes("UTF-8"));
+ oStream.write(0);
+ // Put DS status
+ oStream.write(dsInfo.getStatus().getValue());
+ // Put DS assured flag
+ oStream.write(dsInfo.isAssured() ? (byte) 1 : (byte) 0);
+ // Put DS assured mode
+ oStream.write(dsInfo.getAssuredMode().getValue());
+ // Put DS safe data level
+ oStream.write(dsInfo.getSafeDataLevel());
+ // Put DS group id
+ oStream.write(dsInfo.getGroupId());
+
+ List<String> refUrls = dsInfo.getRefUrls();
+ // Put number of following URLs as a byte
+ oStream.write(refUrls.size());
+ for (String url : refUrls)
+ {
+ // Write the url and a 0 terminating byte
+ oStream.write(url.getBytes("UTF-8"));
+ oStream.write(0);
+ }
+ }
+
+ // Put number of following RS info entries
+ oStream.write((byte)rsList.size());
+
+ // Put RS info
+ for (RSInfo rsInfo : rsList)
+ {
+ // Put RS id
+ byte[] byteServerId =
+ String.valueOf(rsInfo.getId()).getBytes("UTF-8");
+ oStream.write(byteServerId);
+ oStream.write(0);
+ // Put the generation id
+ oStream.write(String.valueOf(rsInfo.getGenerationId()).
+ getBytes("UTF-8"));
+ oStream.write(0);
+ // Put DS group id
+ oStream.write(rsInfo.getGroupId());
+ }
+
+ return oStream.toByteArray();
+ } catch (IOException e)
+ {
+ // never happens
+ return null;
+ }
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ String dsStr = "";
+ for (DSInfo dsInfo : dsList)
+ {
+ dsStr += dsInfo.toString() + "\n----------------------------\n";
+ }
+
+ String rsStr = "";
+ for (RSInfo rsInfo : rsList)
+ {
+ rsStr += rsInfo.toString() + "\n----------------------------\n";
+ }
+
+ return ("TopologyMsg content: "
+ + "\n----------------------------"
+ + "\nCONNECTED DS SERVERS:"
+ + "\n--------------------\n"
+ + dsStr
+ + "CONNECTED RS SERVERS:"
+ + "\n--------------------\n"
+ + rsStr + (rsStr.equals("") ? "----------------------------\n" : ""));
+ }
+
+ /**
+ * Get the list of DS info.
+ * @return The list of DS info
+ */
+ public List<DSInfo> getDsList()
+ {
+ return dsList;
+ }
+
+ /**
+ * Get the list of RS info.
+ * @return The list of RS info
+ */
+ public List<RSInfo> getRsList()
+ {
+ return rsList;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/UpdateMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/UpdateMessage.java
deleted file mode 100644
index 224190e..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/UpdateMessage.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-import org.opends.server.protocols.asn1.ASN1Exception;
-import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.types.AbstractOperation;
-import org.opends.server.types.LDAPException;
-import org.opends.server.types.operation.PostOperationAddOperation;
-import org.opends.server.types.operation.PostOperationDeleteOperation;
-import org.opends.server.types.operation.PostOperationModifyDNOperation;
-import org.opends.server.types.operation.PostOperationModifyOperation;
-import org.opends.server.types.operation.PostOperationOperation;
-
-/**
- * Abstract class that must be extended to define a message
- * used for sending Updates between servers.
- */
-public abstract class UpdateMessage extends ReplicationMessage
- implements Serializable,
- Comparable<UpdateMessage>
-{
- /**
- * The ChangeNumber of this update.
- */
- private ChangeNumber changeNumber;
-
- /**
- * The DN on which the update was originally done.
- */
- private String dn = null;
-
- /**
- * True when the update must use assured replication.
- */
- private boolean assuredFlag = false;
-
- /**
- * The UniqueId of the entry that was updated.
- */
- private String UniqueId;
-
- /**
- * Creates a new UpdateMessage with the given informations.
- *
- * @param ctx The replication Context of the operation for which the
- * update message must be created,.
- * @param dn The dn of the entry on which the change
- * that caused the creation of this object happened
- */
- public UpdateMessage(OperationContext ctx, String dn)
- {
- this.changeNumber = ctx.getChangeNumber();
- this.UniqueId = ctx.getEntryUid();
- this.dn = dn;
- }
-
- /**
- * Creates a new UpdateMessage from an ecoded byte array.
- *
- * @param in The encoded byte array containind the UpdateMessage.
- * @throws DataFormatException if the encoded byte array is not valid.
- * @throws UnsupportedEncodingException if UTF-8 is not supprted.
- */
- protected UpdateMessage(byte[] in) throws DataFormatException,
- UnsupportedEncodingException
- {
- /* read the changeNumber */
- int pos = 1;
- int length = getNextLength(in, pos);
- String changenumberStr = new String(in, pos, length, "UTF-8");
- this.changeNumber = new ChangeNumber(changenumberStr);
- }
-
- /**
- * Generates an Update Message which the provided information.
- *
- * @param op The operation for which the message must be created.
- * @param isAssured flag indicating if the operation is an assured operation.
- * @return The generated message.
- */
- public static UpdateMessage generateMsg(
- PostOperationOperation op, boolean isAssured)
- {
- UpdateMessage msg = null;
- switch (op.getOperationType())
- {
- case MODIFY :
- msg = new ModifyMsg((PostOperationModifyOperation) op);
- if (isAssured)
- msg.setAssured();
- break;
-
- case ADD:
- msg = new AddMsg((PostOperationAddOperation) op);
- if (isAssured)
- msg.setAssured();
- break;
-
- case DELETE :
- msg = new DeleteMsg((PostOperationDeleteOperation) op);
- if (isAssured)
- msg.setAssured();
- break;
-
- case MODIFY_DN :
- msg = new ModifyDNMsg( (PostOperationModifyDNOperation) op);
- if (isAssured)
- msg.setAssured();
- break;
- }
-
- return msg;
- }
-
- /**
- * Get the ChangeNumber from the message.
- * @return the ChangeNumber
- */
- public ChangeNumber getChangeNumber()
- {
- return changeNumber;
- }
-
- /**
- * Get the DN on which the operation happened.
- *
- * @return The DN on which the operations happened.
- */
- public String getDn()
- {
- return dn;
- }
-
- /**
- * Set the DN.
- * @param dn The dn that must now be used for this message.
- */
- public void setDn(String dn)
- {
- this.dn = dn;
- }
-
- /**
- * Get the Unique Identifier of the entry on which the operation happened.
- *
- * @return The Unique Identifier of the entry on which the operation happened.
- */
- public String getUniqueId()
- {
- return UniqueId;
- }
-
- /**
- * Get a boolean indicating if the Update must be processed as an
- * Asynchronous or as an assured replication.
- *
- * @return Returns the assuredFlag.
- */
- public boolean isAssured()
- {
- return assuredFlag;
- }
-
- /**
- * Set the Update message as an assured message.
- */
- public void setAssured()
- {
- assuredFlag = true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals(Object obj)
- {
- if (obj != null)
- {
- if (obj.getClass() != this.getClass())
- return false;
- return changeNumber.equals(((UpdateMessage) obj).changeNumber);
- }
- else
- {
- return false;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode()
- {
- return changeNumber.hashCode();
- }
-
- /**
- * {@inheritDoc}
- */
- public int compareTo(UpdateMessage msg)
- {
- return changeNumber.compareTo(msg.getChangeNumber());
- }
-
- /**
- * Create and Operation from the message.
- *
- * @param conn connection to use when creating the message
- * @return the created Operation
- * @throws LDAPException In case of LDAP decoding exception.
- * @throws ASN1Exception In case of ASN1 decoding exception.
- * @throws DataFormatException In case of bad msg format.
- */
- public AbstractOperation createOperation(InternalClientConnection conn)
- throws LDAPException, ASN1Exception, DataFormatException
- {
- return createOperation(conn, dn);
- }
-
-
- /**
- * Create and Operation from the message using the provided DN.
- *
- * @param conn connection to use when creating the message.
- * @param newDn the DN to use when creating the operation.
- * @return the created Operation.
- * @throws LDAPException In case of LDAP decoding exception.
- * @throws ASN1Exception In case of ASN1 decoding exception.
- * @throws DataFormatException In case of bad msg format.
- */
- public abstract AbstractOperation createOperation(
- InternalClientConnection conn, String newDn)
- throws LDAPException, ASN1Exception, DataFormatException;
-
- /**
- * Encode the common header for all the UpdateMessage.
- *
- * @param type the type of UpdateMessage to encode.
- * @param additionalLength additional length needed to encode the remaining
- * part of the UpdateMessage.
- * @return a byte array containing the common header and enough space to
- * encode the reamining bytes of the UpdateMessage as was specified
- * by the additionalLength.
- * (byte array length = common header length + additionalLength)
- * @throws UnsupportedEncodingException if UTF-8 is not supported.
- */
- public byte[] encodeHeader(byte type, int additionalLength)
- throws UnsupportedEncodingException
- {
- byte[] byteDn = dn.getBytes("UTF-8");
- byte[] changeNumberByte =
- this.getChangeNumber().toString().getBytes("UTF-8");
- byte[] byteEntryuuid = getUniqueId().getBytes("UTF-8");
-
- /* The message header is stored in the form :
- * <operation type>changenumber><dn><assured><entryuuid><change>
- * the length of result byte array is therefore :
- * 1 + change number length + 1 + dn length + 1 + 1 +
- * uuid length + 1 + additional_length
- */
- int length = 5 + changeNumberByte.length + byteDn.length
- + byteEntryuuid.length + additionalLength;
-
- byte[] encodedMsg = new byte[length];
-
- /* put the type of the operation */
- encodedMsg[0] = type;
- int pos = 1;
-
- /* put the ChangeNumber */
- pos = addByteArray(changeNumberByte, encodedMsg, pos);
-
- /* put the assured information */
- encodedMsg[pos++] = (assuredFlag ? (byte) 1 : 0);
-
- /* put the DN and a terminating 0 */
- pos = addByteArray(byteDn, encodedMsg, pos);
-
- /* put the entry uuid and a terminating 0 */
- pos = addByteArray(byteEntryuuid, encodedMsg, pos);
-
- return encodedMsg;
- }
-
- /**
- * Decode the Header part of this Update Message, and check its type.
- *
- * @param type The type of this Update Message.
- * @param encodedMsg the encoded form of the UpdateMessage.
- * @return the position at which the remaining part of the message starts.
- * @throws DataFormatException if the encodedMsg does not contain a valid
- * common header.
- */
- public int decodeHeader(byte type, byte [] encodedMsg)
- throws DataFormatException
- {
- /* first byte is the type */
- if (encodedMsg[0] != type)
- throw new DataFormatException("byte[] is not a valid msg");
-
- try
- {
- /* read the changeNumber */
- int pos = 1;
- int length = getNextLength(encodedMsg, pos);
- String changenumberStr = new String(encodedMsg, pos, length, "UTF-8");
- pos += length + 1;
- changeNumber = new ChangeNumber(changenumberStr);
-
- /* read the assured information */
- if (encodedMsg[pos++] == 1)
- assuredFlag = true;
- else
- assuredFlag = false;
-
- /* read the dn */
- length = getNextLength(encodedMsg, pos);
- dn = new String(encodedMsg, pos, length, "UTF-8");
- pos += length + 1;
-
- /* read the entryuuid */
- length = getNextLength(encodedMsg, pos);
- UniqueId = new String(encodedMsg, pos, length, "UTF-8");
- pos += length + 1;
-
- return pos;
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
-
- }
-
- /**
- * Return the number of bytes used by this message.
- *
- * @return The number of bytes used by this message.
- */
- public abstract int size();
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/UpdateMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/UpdateMsg.java
new file mode 100644
index 0000000..f74ff7a
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/UpdateMsg.java
@@ -0,0 +1,632 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+import org.opends.server.protocols.asn1.ASN1Exception;
+import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.replication.common.AssuredMode;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.types.AbstractOperation;
+import org.opends.server.types.LDAPException;
+import org.opends.server.types.operation.PostOperationAddOperation;
+import org.opends.server.types.operation.PostOperationDeleteOperation;
+import org.opends.server.types.operation.PostOperationModifyDNOperation;
+import org.opends.server.types.operation.PostOperationModifyOperation;
+import org.opends.server.types.operation.PostOperationOperation;
+
+/**
+ * Abstract class that must be extended to define a message
+ * used for sending Updates between servers.
+ */
+public abstract class UpdateMsg extends ReplicationMsg
+ implements Comparable<UpdateMsg>
+{
+ /**
+ * Protocol version.
+ */
+ protected short protocolVersion;
+
+ /**
+ * The ChangeNumber of this update.
+ */
+ protected ChangeNumber changeNumber;
+
+ /**
+ * The DN on which the update was originally done.
+ */
+ protected String dn = null;
+
+ /**
+ * True when the update must use assured replication.
+ */
+ protected boolean assuredFlag = false;
+
+ /**
+ * When assuredFlag is true, defines the requested assured mode.
+ */
+ protected AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
+
+ /**
+ * When assured mode is safe data, gives the requested level.
+ */
+ protected byte safeDataLevel = (byte)-1;
+
+ /**
+ * The uniqueId of the entry that was updated.
+ */
+ protected String uniqueId;
+
+ /**
+ * Creates a new UpdateMsg.
+ */
+ public UpdateMsg()
+ {
+ }
+
+ /**
+ * Creates a new UpdateMsg with the given informations.
+ *
+ * @param ctx The replication Context of the operation for which the
+ * update message must be created,.
+ * @param dn The DN of the entry on which the change
+ * that caused the creation of this object happened
+ */
+ public UpdateMsg(OperationContext ctx, String dn)
+ {
+ this.protocolVersion = ProtocolVersion.getCurrentVersion();
+ this.changeNumber = ctx.getChangeNumber();
+ this.uniqueId = ctx.getEntryUid();
+ this.dn = dn;
+ }
+
+ /**
+ * Creates a new UpdateMessage with the given informations.
+ *
+ * @param cn The ChangeNumber of the operation for which the
+ * UpdateMessage is created.
+ * @param entryUUID The Unique identifier of the entry that is updated
+ * by the operation for which the UpdateMessage is created.
+ * @param dn The DN of the entry on which the change
+ * that caused the creation of this object happened
+ */
+ public UpdateMsg(ChangeNumber cn, String entryUUID, String dn)
+ {
+ this.protocolVersion = ProtocolVersion.getCurrentVersion();
+ this.changeNumber = cn;
+ this.uniqueId = entryUUID;
+ this.dn = dn;
+ }
+
+ /**
+ * Generates an Update Message with the provided information.
+ *
+ * @param op The operation for which the message must be created.
+ * @return The generated message.
+ */
+ public static UpdateMsg generateMsg(PostOperationOperation op)
+ {
+ UpdateMsg msg = null;
+ switch (op.getOperationType())
+ {
+ case MODIFY :
+ msg = new ModifyMsg((PostOperationModifyOperation) op);
+ break;
+
+ case ADD:
+ msg = new AddMsg((PostOperationAddOperation) op);
+ break;
+
+ case DELETE :
+ msg = new DeleteMsg((PostOperationDeleteOperation) op);
+ break;
+
+ case MODIFY_DN :
+ msg = new ModifyDNMsg( (PostOperationModifyDNOperation) op);
+ break;
+ }
+
+ return msg;
+ }
+
+ /**
+ * Get the ChangeNumber from the message.
+ * @return the ChangeNumber
+ */
+ public ChangeNumber getChangeNumber()
+ {
+ return changeNumber;
+ }
+
+ /**
+ * Get the DN on which the operation happened.
+ *
+ * @return The DN on which the operations happened.
+ */
+ public String getDn()
+ {
+ return dn;
+ }
+
+ /**
+ * Set the DN.
+ * @param dn The dn that must now be used for this message.
+ */
+ public void setDn(String dn)
+ {
+ this.dn = dn;
+ }
+
+ /**
+ * Get the Unique Identifier of the entry on which the operation happened.
+ *
+ * @return The Unique Identifier of the entry on which the operation happened.
+ */
+ public String getUniqueId()
+ {
+ return uniqueId;
+ }
+
+ /**
+ * Get a boolean indicating if the Update must be processed as an
+ * Asynchronous or as an assured replication.
+ *
+ * @return Returns the assuredFlag.
+ */
+ public boolean isAssured()
+ {
+ return assuredFlag;
+ }
+
+ /**
+ * Set the Update message as an assured message.
+ *
+ * @param assured If the message is assured or not. Using true implies
+ * setAssuredMode method must be called.
+ */
+ public void setAssured(boolean assured)
+ {
+ assuredFlag = assured;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj != null)
+ {
+ if (obj.getClass() != this.getClass())
+ return false;
+ return changeNumber.equals(((UpdateMsg) obj).changeNumber);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ return changeNumber.hashCode();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compareTo(UpdateMsg msg)
+ {
+ return changeNumber.compareTo(msg.getChangeNumber());
+ }
+
+ /**
+ * Create and Operation from the message.
+ *
+ * @param conn connection to use when creating the message
+ * @return the created Operation
+ * @throws LDAPException In case of LDAP decoding exception.
+ * @throws ASN1Exception In case of ASN1 decoding exception.
+ * @throws DataFormatException In case of bad msg format.
+ */
+ public AbstractOperation createOperation(InternalClientConnection conn)
+ throws LDAPException, ASN1Exception, DataFormatException
+ {
+ return createOperation(conn, dn);
+ }
+
+
+ /**
+ * Create and Operation from the message using the provided DN.
+ *
+ * @param conn connection to use when creating the message.
+ * @param newDn the DN to use when creating the operation.
+ * @return the created Operation.
+ * @throws LDAPException In case of LDAP decoding exception.
+ * @throws ASN1Exception In case of ASN1 decoding exception.
+ * @throws DataFormatException In case of bad msg format.
+ */
+ public abstract AbstractOperation createOperation(
+ InternalClientConnection conn, String newDn)
+ throws LDAPException, ASN1Exception, DataFormatException;
+
+ /**
+ * Encode the common header for all the UpdateMsg. This uses the current
+ * protocol version.
+ *
+ * @param type the type of UpdateMsg to encode.
+ * @param additionalLength additional length needed to encode the remaining
+ * part of the UpdateMsg.
+ * @return a byte array containing the common header and enough space to
+ * encode the remaining bytes of the UpdateMsg as was specified
+ * by the additionalLength.
+ * (byte array length = common header length + additionalLength)
+ * @throws UnsupportedEncodingException if UTF-8 is not supported.
+ */
+ public byte[] encodeHeader(byte type, int additionalLength)
+ throws UnsupportedEncodingException
+ {
+ byte[] byteDn = dn.getBytes("UTF-8");
+ byte[] changeNumberByte =
+ this.getChangeNumber().toString().getBytes("UTF-8");
+ byte[] byteEntryuuid = getUniqueId().getBytes("UTF-8");
+
+ /* The message header is stored in the form :
+ * <operation type><protocol version><changenumber><dn><entryuuid><assured>
+ * <assured mode> <safe data level>
+ * the length of result byte array is therefore :
+ * 1 + 1 + change number length + 1 + dn length + 1 + uuid length + 1 + 1
+ * + 1 + 1 + additional_length
+ */
+ int length = 8 + changeNumberByte.length + byteDn.length
+ + byteEntryuuid.length + additionalLength;
+
+ byte[] encodedMsg = new byte[length];
+
+ /* put the type of the operation */
+ encodedMsg[0] = type;
+
+ /* put the protocol version */
+ encodedMsg[1] = (byte)ProtocolVersion.getCurrentVersion();
+ int pos = 2;
+
+ /* Put the ChangeNumber */
+ pos = addByteArray(changeNumberByte, encodedMsg, pos);
+
+ /* Put the DN and a terminating 0 */
+ pos = addByteArray(byteDn, encodedMsg, pos);
+
+ /* Put the entry uuid and a terminating 0 */
+ pos = addByteArray(byteEntryuuid, encodedMsg, pos);
+
+ /* Put the assured flag */
+ encodedMsg[pos++] = (assuredFlag ? (byte) 1 : 0);
+
+ /* Put the assured mode */
+ encodedMsg[pos++] = assuredMode.getValue();
+
+ /* Put the safe data level */
+ encodedMsg[pos++] = safeDataLevel;
+
+ return encodedMsg;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes(short reqProtocolVersion)
+ throws UnsupportedEncodingException
+ {
+
+ // Using current protocol version should normally not be done as we would
+ // normally call the getBytes() method instead for that. So this check
+ // for security
+ if (reqProtocolVersion == ProtocolVersion.getCurrentVersion())
+ {
+ return getBytes();
+ }
+
+ switch (reqProtocolVersion)
+ {
+ case ProtocolVersion.REPLICATION_PROTOCOL_V1:
+ return getBytes_V1();
+ default:
+ // Unsupported requested version
+ throw new UnsupportedEncodingException(getClass().getSimpleName() +
+ " PDU does not support requested protocol version serialization: " +
+ reqProtocolVersion);
+ }
+ }
+
+ /**
+ * Get the byte array representation of this Message. This uses the version
+ * 1 of the replication protocol (used for compatibility purpose).
+ *
+ * @return The byte array representation of this Message.
+ *
+ * @throws UnsupportedEncodingException When the encoding of the message
+ * failed because the UTF-8 encoding is not supported.
+ */
+ public abstract byte[] getBytes_V1() throws UnsupportedEncodingException;
+
+ /**
+ * Encode the common header for all the UpdateMessage. This uses the version
+ * 1 of the replication protocol (used for compatibility purpose).
+ *
+ * @param type the type of UpdateMessage to encode.
+ * @param additionalLength additional length needed to encode the remaining
+ * part of the UpdateMessage.
+ * @return a byte array containing the common header and enough space to
+ * encode the remaining bytes of the UpdateMessage as was specified
+ * by the additionalLength.
+ * (byte array length = common header length + additionalLength)
+ * @throws UnsupportedEncodingException if UTF-8 is not supported.
+ */
+ public byte[] encodeHeader_V1(byte type, int additionalLength)
+ throws UnsupportedEncodingException
+ {
+ byte[] byteDn = dn.getBytes("UTF-8");
+ byte[] changeNumberByte =
+ this.getChangeNumber().toString().getBytes("UTF-8");
+ byte[] byteEntryuuid = getUniqueId().getBytes("UTF-8");
+
+ /* The message header is stored in the form :
+ * <operation type>changenumber><dn><assured><entryuuid><change>
+ * the length of result byte array is therefore :
+ * 1 + change number length + 1 + dn length + 1 + 1 +
+ * uuid length + 1 + additional_length
+ */
+ int length = 5 + changeNumberByte.length + byteDn.length
+ + byteEntryuuid.length + additionalLength;
+
+ byte[] encodedMsg = new byte[length];
+
+ /* put the type of the operation */
+ encodedMsg[0] = type;
+ int pos = 1;
+
+ /* put the ChangeNumber */
+ pos = addByteArray(changeNumberByte, encodedMsg, pos);
+
+ /* put the assured information */
+ encodedMsg[pos++] = (assuredFlag ? (byte) 1 : 0);
+
+ /* put the DN and a terminating 0 */
+ pos = addByteArray(byteDn, encodedMsg, pos);
+
+ /* put the entry uuid and a terminating 0 */
+ pos = addByteArray(byteEntryuuid, encodedMsg, pos);
+
+ return encodedMsg;
+ }
+
+ /**
+ * Decode the Header part of this Update Message, and check its type.
+ *
+ * @param types The allowed types of this Update Message.
+ * @param encodedMsg the encoded form of the UpdateMsg.
+ * @return the position at which the remaining part of the message starts.
+ * @throws DataFormatException if the encodedMsg does not contain a valid
+ * common header.
+ */
+ public int decodeHeader(byte[] types, byte[] encodedMsg)
+ throws DataFormatException
+ {
+ /* The message header is stored in the form :
+ * <operation type><protocol version><changenumber><dn><entryuuid><assured>
+ * <assured mode> <safe data level>
+ */
+
+ /* first byte is the type */
+ boolean foundMatchingType = false;
+ for (int i = 0; i < types.length; i++)
+ {
+ if (types[i] == encodedMsg[0])
+ {
+ foundMatchingType = true;
+ break;
+ }
+ }
+ if (!foundMatchingType)
+ throw new DataFormatException("byte[] is not a valid update msg: "
+ + encodedMsg[0]);
+
+ /*
+ * For older protocol version PDUs, decode the matching version header
+ * instead.
+ */
+ if ((encodedMsg[0] == MSG_TYPE_ADD_V1) ||
+ (encodedMsg[0] == MSG_TYPE_DELETE_V1) ||
+ (encodedMsg[0] == MSG_TYPE_MODIFYDN_V1) ||
+ (encodedMsg[0] == MSG_TYPE_MODIFY_V1))
+ {
+ return decodeHeader_V1(encodedMsg);
+ }
+
+ /* read the protocol version */
+ protocolVersion = (short)encodedMsg[1];
+
+ try
+ {
+ /* Read the changeNumber */
+ int pos = 2;
+ int length = getNextLength(encodedMsg, pos);
+ String changenumberStr = new String(encodedMsg, pos, length, "UTF-8");
+ pos += length + 1;
+ changeNumber = new ChangeNumber(changenumberStr);
+
+ /* Read the dn */
+ length = getNextLength(encodedMsg, pos);
+ dn = new String(encodedMsg, pos, length, "UTF-8");
+ pos += length + 1;
+
+ /* Read the entryuuid */
+ length = getNextLength(encodedMsg, pos);
+ uniqueId = new String(encodedMsg, pos, length, "UTF-8");
+ pos += length + 1;
+
+ /* Read the assured information */
+ if (encodedMsg[pos++] == 1)
+ assuredFlag = true;
+ else
+ assuredFlag = false;
+
+ /* Read the assured mode */
+ assuredMode = AssuredMode.valueOf(encodedMsg[pos++]);
+
+ /* Read the safe data level */
+ safeDataLevel = encodedMsg[pos++];
+
+ return pos;
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ } catch (IllegalArgumentException e)
+ {
+ throw new DataFormatException(e.getMessage());
+ }
+ }
+
+ /**
+ * Decode the Header part of this Update Message, and check its type. This
+ * uses the version 1 of the replication protocol (used for compatibility
+ * purpose).
+ *
+ * @param encodedMsg the encoded form of the UpdateMessage.
+ * @return the position at which the remaining part of the message starts.
+ * @throws DataFormatException if the encodedMsg does not contain a valid
+ * common header.
+ */
+ public int decodeHeader_V1(byte[] encodedMsg)
+ throws DataFormatException
+ {
+ if ((encodedMsg[0] != MSG_TYPE_ADD_V1) &&
+ (encodedMsg[0] != MSG_TYPE_DELETE_V1) &&
+ (encodedMsg[0] != MSG_TYPE_MODIFYDN_V1) &&
+ (encodedMsg[0] != MSG_TYPE_MODIFY_V1))
+ throw new DataFormatException("byte[] is not a valid update msg: expected"
+ + " a V1 PDU, received: " + encodedMsg[0]);
+
+ // Force version to V1 (other new parameters take their default values
+ // (assured stuff...))
+ protocolVersion = ProtocolVersion.REPLICATION_PROTOCOL_V1;
+
+ try
+ {
+ /* read the changeNumber */
+ int pos = 1;
+ int length = getNextLength(encodedMsg, pos);
+ String changenumberStr = new String(encodedMsg, pos, length, "UTF-8");
+ pos += length + 1;
+ changeNumber = new ChangeNumber(changenumberStr);
+
+ /* read the assured information */
+ if (encodedMsg[pos++] == 1)
+ assuredFlag = true;
+ else
+ assuredFlag = false;
+
+ /* read the dn */
+ length = getNextLength(encodedMsg, pos);
+ dn = new String(encodedMsg, pos, length, "UTF-8");
+ pos += length + 1;
+
+ /* read the entryuuid */
+ length = getNextLength(encodedMsg, pos);
+ uniqueId = new String(encodedMsg, pos, length, "UTF-8");
+ pos += length + 1;
+
+ return pos;
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * Get the assured mode in this message.
+ * @return The assured mode in this message
+ */
+ public AssuredMode getAssuredMode()
+ {
+ return assuredMode;
+ }
+
+ /**
+ * Get the safe data level in this message.
+ * @return The safe data level in this message
+ */
+ public byte getSafeDataLevel()
+ {
+ return safeDataLevel;
+ }
+
+ /**
+ * Set the assured mode. Assured boolean must be set to true for this field
+ * to mean something.
+ * @param assuredMode The chosen assured mode.
+ */
+ public void setAssuredMode(AssuredMode assuredMode)
+ {
+ this.assuredMode = assuredMode;
+ }
+
+ /**
+ * Set the safe data level. Assured mode should be set to safe data for this
+ * field to mean something.
+ * @param safeDataLevel The chosen safe data level.
+ */
+ public void setSafeDataLevel(byte safeDataLevel)
+ {
+ this.safeDataLevel = safeDataLevel;
+ }
+
+ /**
+ * Get the version included in the update message. Means the replication
+ * protocol version with which this update message was instantiated.
+ *
+ * @return The version with which this update message was instantiated.
+ */
+ public short getVersion()
+ {
+ return protocolVersion;
+ }
+
+ /**
+ * Return the number of bytes used by this message.
+ *
+ * @return The number of bytes used by this message.
+ */
+ public abstract int size();
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowMessage.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowMessage.java
deleted file mode 100644
index 88e5f93..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowMessage.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.zip.DataFormatException;
-
-
-/**
- * This message is used by LDAP server or by Replication Servers to
- * update the send window of the remote entities.
- *
- * A receiving entity should create such a message with a given credit
- * when it wants to open the send window of the remote entity.
- * A LDAP or Replication Server should increase its send window when receiving
- * such a message.
- */
-public class WindowMessage extends ReplicationMessage implements
- Serializable
-{
- private static final long serialVersionUID = 8442267608764026867L;
- private final int numAck;
-
-
- /**
- * Create a new WindowMessage.
- *
- * @param numAck The number of acknowledged messages.
- * The window will be increase by this credit number.
- */
- public WindowMessage(int numAck)
- {
- this.numAck = numAck;
- }
-
- /**
- * Creates a new WindowMessage from its encoded form.
- *
- * @param in The byte array containing the encoded form of the
- * WindowMessage.
- * @throws DataFormatException If the byte array does not contain a valid
- * encoded form of the WindowMessage.
- */
- public WindowMessage(byte[] in) throws DataFormatException
- {
- /* The WindowMessage is encoded in the form :
- * <numAck>
- */
- try
- {
- /* first byte is the type */
- if (in[0] != MSG_TYPE_WINDOW)
- throw new DataFormatException("input is not a valid Window Message");
- int pos = 1;
-
- /*
- * read the number of acks contained in this message.
- * first calculate the length then construct the string
- */
- int length = getNextLength(in, pos);
- String numAckStr = new String(in, pos, length, "UTF-8");
- pos += length +1;
- numAck = Integer.parseInt(numAckStr);
- } catch (UnsupportedEncodingException e)
- {
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- /*
- * WindowMessage contains.
- * <numAck>
- */
- try {
- byte[] byteNumAck = String.valueOf(numAck).getBytes("UTF-8");
-
- int length = 1 + byteNumAck.length + 1;
-
- byte[] resultByteArray = new byte[length];
-
- /* put the type of the operation */
- resultByteArray[0] = MSG_TYPE_WINDOW;
- int pos = 1;
-
- pos = addByteArray(byteNumAck, resultByteArray, pos);
-
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
- {
- return null;
- }
- }
-
-
- /**
- * Get the number of message acknowledged by the Window Message.
- *
- * @return the number of message acknowledged by the Window Message.
- */
- public int getNumAck()
- {
- return numAck;
- }
-
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowMsg.java
new file mode 100644
index 0000000..7407f1c
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowMsg.java
@@ -0,0 +1,143 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.DataFormatException;
+
+
+/**
+ * This message is used by LDAP server or by Replication Servers to
+ * update the send window of the remote entities.
+ *
+ * A receiving entity should create such a message with a given credit
+ * when it wants to open the send window of the remote entity.
+ * A LDAP or Replication Server should increase its send window when receiving
+ * such a message.
+ */
+public class WindowMsg extends ReplicationMsg
+{
+ private final int numAck;
+
+
+ /**
+ * Create a new WindowMsg.
+ *
+ * @param numAck The number of acknowledged messages.
+ * The window will be increase by this credit number.
+ */
+ public WindowMsg(int numAck)
+ {
+ this.numAck = numAck;
+ }
+
+ /**
+ * Creates a new WindowMsg from its encoded form.
+ *
+ * @param in The byte array containing the encoded form of the
+ * WindowMsg.
+ * @throws DataFormatException If the byte array does not contain a valid
+ * encoded form of the WindowMsg.
+ */
+ public WindowMsg(byte[] in) throws DataFormatException
+ {
+ /* The WindowMsg is encoded in the form :
+ * <numAck>
+ */
+ try
+ {
+ /* first byte is the type */
+ if (in[0] != MSG_TYPE_WINDOW)
+ throw new DataFormatException("input is not a valid Window Message");
+ int pos = 1;
+
+ /*
+ * read the number of acks contained in this message.
+ * first calculate the length then construct the string
+ */
+ int length = getNextLength(in, pos);
+ String numAckStr = new String(in, pos, length, "UTF-8");
+ pos += length +1;
+ numAck = Integer.parseInt(numAckStr);
+ } catch (UnsupportedEncodingException e)
+ {
+ throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ /*
+ * WindowMsg contains.
+ * <numAck>
+ */
+ try {
+ byte[] byteNumAck = String.valueOf(numAck).getBytes("UTF-8");
+
+ int length = 1 + byteNumAck.length + 1;
+
+ byte[] resultByteArray = new byte[length];
+
+ /* put the type of the operation */
+ resultByteArray[0] = MSG_TYPE_WINDOW;
+ int pos = 1;
+
+ pos = addByteArray(byteNumAck, resultByteArray, pos);
+
+ return resultByteArray;
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ return null;
+ }
+ }
+
+
+ /**
+ * Get the number of message acknowledged by the Window Message.
+ *
+ * @return the number of message acknowledged by the Window Message.
+ */
+ public int getNumAck()
+ {
+ return numAck;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return "ServerStartMsg content: " +
+ "\nnumAck: " + numAck;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowProbe.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowProbe.java
deleted file mode 100644
index e9b9bff..0000000
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowProbe.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.protocol;
-
-import java.io.Serializable;
-import java.util.zip.DataFormatException;
-
-
-/**
- * This message is used by LDAP or Replication Server that have been
- * out of credit for a while and want to check that the remote servers.
- *
- * A sending entity that is blocked because its send window is closed
- * for a while should create such a message to check that the window
- * closure is valid.
- *
- * An entity that received such a message should respond with a
- * WindowUpdate message indicating the curent credit available.
- */
-public class WindowProbe extends ReplicationMessage implements
- Serializable
-{
- private static final long serialVersionUID = 8442267608764026867L;
-
- /**
- * Create a new WindowProbe message.
- */
- public WindowProbe()
- {
- }
-
- /**
- * Creates a new WindowProbe from its encoded form.
- *
- * @param in The byte array containing the encoded form of the
- * WindowMessage.
- * @throws DataFormatException If the byte array does not contain a valid
- * encoded form of the WindowMessage.
- */
- public WindowProbe(byte[] in) throws DataFormatException
- {
- // WindowProbe Message only contains its type.
- if (in[0] != MSG_TYPE_WINDOW_PROBE)
- throw new DataFormatException("input is not a valid Window Message");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] getBytes()
- {
- // WindowProbe Message only contains its type.
-
- byte[] resultByteArray = new byte[1];
- resultByteArray[0] = MSG_TYPE_WINDOW_PROBE;
-
- return resultByteArray;
- }
-}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowProbeMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowProbeMsg.java
new file mode 100644
index 0000000..2f06913
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/WindowProbeMsg.java
@@ -0,0 +1,80 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.protocol;
+
+import java.util.zip.DataFormatException;
+
+
+/**
+ * This message is used by LDAP or Replication Server that have been
+ * out of credit for a while and want to check that the remote servers.
+ *
+ * A sending entity that is blocked because its send window is closed
+ * for a while should create such a message to check that the window
+ * closure is valid.
+ *
+ * An entity that received such a message should respond with a
+ * WindowUpdate message indicating the curent credit available.
+ */
+public class WindowProbeMsg extends ReplicationMsg
+{
+ /**
+ * Create a new WindowProbeMsg message.
+ */
+ public WindowProbeMsg()
+ {
+ }
+
+ /**
+ * Creates a new WindowProbeMsg from its encoded form.
+ *
+ * @param in The byte array containing the encoded form of the
+ * WindowMessage.
+ * @throws DataFormatException If the byte array does not contain a valid
+ * encoded form of the WindowMessage.
+ */
+ public WindowProbeMsg(byte[] in) throws DataFormatException
+ {
+ // WindowProbeMsg Message only contains its type.
+ if (in[0] != MSG_TYPE_WINDOW_PROBE)
+ throw new DataFormatException("input is not a valid Window Message");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public byte[] getBytes()
+ {
+ // WindowProbeMsg Message only contains its type.
+
+ byte[] resultByteArray = new byte[1];
+ resultByteArray[0] = MSG_TYPE_WINDOW_PROBE;
+
+ return resultByteArray;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/DbHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/DbHandler.java
index d27daca..b16aa28 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/DbHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/DbHandler.java
@@ -42,12 +42,13 @@
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.util.TimeThread;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.ReplicationDB.ReplServerDBCursor;
import com.sleepycat.je.DatabaseException;
@@ -79,8 +80,8 @@
// Changes are not read back by replicationServer threads that are responsible
// for pushing the changes to other replication server or to LDAP server
//
- private final LinkedList<UpdateMessage> msgQueue =
- new LinkedList<UpdateMessage>();
+ private final LinkedList<UpdateMsg> msgQueue =
+ new LinkedList<UpdateMsg>();
// The High and low water mark for the max size of the msgQueue.
// the threads calling add() method will be blocked if the size of
@@ -148,7 +149,8 @@
firstChange = db.readFirstChange();
lastChange = db.readLastChange();
thread = new DirectoryThread(this,
- "Replication Server db " + id + " " + baseDn);
+ "Replication Server db for DS " + id + " and " + baseDn + " in RS " +
+ replicationServer.getServerId());
thread.start();
DirectoryServer.deregisterMonitorProvider(
@@ -165,7 +167,7 @@
* @param update The update that must be saved to the db managed by this db
* handler.
*/
- public void add(UpdateMessage update)
+ public void add(UpdateMsg update)
{
synchronized (msgQueue)
{
@@ -199,17 +201,17 @@
* @param number the number of messages to extract.
* @return a List containing number changes extracted from the queue.
*/
- private List<UpdateMessage> getChanges(int number)
+ private List<UpdateMsg> getChanges(int number)
{
int current = 0;
- LinkedList<UpdateMessage> changes = new LinkedList<UpdateMessage>();
+ LinkedList<UpdateMsg> changes = new LinkedList<UpdateMsg>();
synchronized (msgQueue)
{
int size = msgQueue.size();
while ((current < number) && (current < size))
{
- UpdateMessage msg = msgQueue.get(current);
+ UpdateMsg msg = msgQueue.get(current);
current++;
changes.add(msg);
}
@@ -289,7 +291,7 @@
{
try
{
- UpdateMessage msg = msgQueue.getFirst();
+ UpdateMsg msg = msgQueue.getFirst();
recentChangeNumber = msg.getChangeNumber();
}
catch (NoSuchElementException e)
@@ -323,7 +325,7 @@
int current = 0;
while ((current < number) && (!msgQueue.isEmpty()))
{
- UpdateMessage msg = msgQueue.remove();
+ UpdateMsg msg = msgQueue.remove();
queueByteSize -= msg.size();
current++;
}
@@ -499,7 +501,7 @@
synchronized(flushLock)
{
// get N messages to save in the DB
- List<UpdateMessage> changes = getChanges(chunksize);
+ List<UpdateMsg> changes = getChanges(chunksize);
// if no more changes to save exit immediately.
if ((changes == null) || ((size = changes.size()) == 0))
@@ -532,25 +534,27 @@
public ArrayList<Attribute> getMonitorData()
{
ArrayList<Attribute> attributes = new ArrayList<Attribute>();
- attributes.add(new Attribute("replicationServer-database",
- String.valueOf(serverId)));
- attributes.add(new Attribute("base-dn", baseDn.toString()));
+ attributes.add(Attributes.create("replicationServer-database",
+ String.valueOf(serverId)));
+ attributes.add(Attributes.create("base-dn", baseDn.toString()));
if (firstChange != null)
{
Date firstTime = new Date(firstChange.getTime());
- attributes.add(new Attribute("first-change",
- firstChange.toString() + " " + firstTime.toString()));
+ attributes.add(Attributes.create("first-change", firstChange
+ .toString()
+ + " " + firstTime.toString()));
}
if (lastChange != null)
{
Date lastTime = new Date(lastChange.getTime());
- attributes.add(new Attribute("last-change",
- lastChange.toString() + " " + lastTime.toString()));
+ attributes.add(Attributes.create("last-change", lastChange
+ .toString()
+ + " " + lastTime.toString()));
}
attributes.add(
- new Attribute("queue-size", String.valueOf(msgQueue.size())));
+ Attributes.create("queue-size", String.valueOf(msgQueue.size())));
attributes.add(
- new Attribute("queue-size-bytes", String.valueOf(queueByteSize)));
+ Attributes.create("queue-size-bytes", String.valueOf(queueByteSize)));
return attributes;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/LightweightServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/LightweightServerHandler.java
index ea8ffc8..19a4671 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/LightweightServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/LightweightServerHandler.java
@@ -32,18 +32,20 @@
import java.util.ArrayList;
import java.util.Date;
-import java.util.LinkedHashSet;
+import java.util.List;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.replication.common.AssuredMode;
+import org.opends.server.replication.common.DSInfo;
import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.common.ServerStatus;
import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.DN;
+import org.opends.server.types.AttributeBuilder;
+import org.opends.server.types.Attributes;
import org.opends.server.types.InitializationException;
/**
@@ -62,27 +64,62 @@
// The tracer object for the debug logger.
private static final DebugTracer TRACER = getTracer();
- short serverId;
- ServerHandler replServerHandler;
- ReplicationServerDomain rsDomain;
- DN baseDn;
+ private ServerHandler replServerHandler;
+ private ReplicationServerDomain rsDomain;
+ // The id of the RS this DS is connected to
+ private short replicationServerId = -1;
+
+ // Server id of this DS
+ private short serverId = -1;
+ // Generation id of this DS
+ private long generationId = -1;
+ // Group id of the DS;
+ private byte groupId = (byte) -1;
+ // Status of this DS
+ private ServerStatus status = ServerStatus.INVALID_STATUS;
+ // Referrals URLs this DS is exporting
+ private List<String> refUrls = new ArrayList<String>();
+ // Assured replication enabled on DS or not
+ private boolean assuredFlag = false;
+ // DS assured mode (relevant if assured replication enabled)
+ private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
+ // DS safe data level (relevant if assured mode is safe data)
+ private byte safeDataLevel = (byte) -1;
/**
* Creates a new LighweightServerHandler with the provided serverid, connected
* to the remote Replication Server represented by replServerHandler.
*
- * @param serverId The serverId of this remote LDAP server.
- * @param replServerHandler The server handler of the Replication Server to
- * which this LDAP server is remotely connected.
+ * @param replServerHandler The server handler of the RS this remote DS is
+ * connected to
+ * @param replicationServerId The serverId of the RS this remote DS is
+ * connected to
+ * @param serverId The serverId of this remote DS.
+ * @param generationId The generation id of this remote DS.
+ * @param groupId The group id of the remote DS
+ * @param status The id of the remote DS
+ * @param refUrls The exported referral URLs of the remote DS
+ * @param assuredFlag The assured flag of the remote DS
+ * @param assuredMode The assured mode of the remote DS
+ * @param safeDataLevel The safe data level of the remote DS
*/
- public LightweightServerHandler(String serverId,
- ServerHandler replServerHandler)
+ public LightweightServerHandler(ServerHandler replServerHandler,
+ short replicationServerId, short serverId, long generationId, byte groupId,
+ ServerStatus status, List<String> refUrls, boolean assuredFlag,
+ AssuredMode assuredMode, byte safeDataLevel)
{
super("Server Handler");
- this.serverId = Short.valueOf(serverId);
this.replServerHandler = replServerHandler;
this.rsDomain = replServerHandler.getDomain();
- this.baseDn = rsDomain.getBaseDn();
+ this.replicationServerId = replicationServerId;
+ this.serverId = serverId;
+ this.generationId = generationId;
+ this.groupId = groupId;
+ this.status = status;
+ this.refUrls = refUrls;
+ this.assuredFlag = assuredFlag;
+ this.assuredMode = assuredMode;
+ this.safeDataLevel = safeDataLevel;
if (debugEnabled())
TRACER.debugInfo(
@@ -94,6 +131,18 @@
}
/**
+ * Creates a DSInfo structure representing this remote DS.
+ * @return The DSInfo structure representing this remote DS
+ */
+ public DSInfo toDSInfo()
+ {
+ DSInfo dsInfo = new DSInfo(serverId, replicationServerId, generationId,
+ status, assuredFlag, assuredMode, safeDataLevel, groupId, refUrls);
+
+ return dsInfo;
+ }
+
+ /**
* Get the serverID associated with this LDAP server.
* @return The serverId.
*/
@@ -154,7 +203,7 @@
public String getMonitorInstanceName()
{
String serverURL=""; // FIXME
- String str = baseDn.toString() + " " + serverURL + " "
+ String str = rsDomain.getBaseDn().toString() + " " + serverURL + " "
+ String.valueOf(serverId);
return "Undirect LDAP Server " + str;
}
@@ -202,11 +251,11 @@
{
ArrayList<Attribute> attributes = new ArrayList<Attribute>();
- attributes.add(new Attribute("server-id",
+ attributes.add(Attributes.create("server-id",
String.valueOf(serverId)));
- attributes.add(new Attribute("base-dn",
+ attributes.add(Attributes.create("base-dn",
rsDomain.getBaseDn().toNormalizedString()));
- attributes.add(new Attribute("connected-to",
+ attributes.add(Attributes.create("connected-to",
replServerHandler.getMonitorInstanceName()));
// Retrieves the topology counters
@@ -222,42 +271,37 @@
}
/* get the Server State */
- final String ATTR_SERVER_STATE = "server-state";
- AttributeType type =
- DirectoryServer.getDefaultAttributeType(ATTR_SERVER_STATE);
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder("server-state");
for (String str : remoteState.toStringSet())
{
- values.add(new AttributeValue(type,str));
+ builder.add(str);
}
- if (values.size() == 0)
+ if (builder.size() == 0)
{
- values.add(new AttributeValue(type,"unknown"));
+ builder.add("unknown");
}
- Attribute attr = new Attribute(type, ATTR_SERVER_STATE, values);
- attributes.add(attr);
+ attributes.add(builder.toAttribute());
// Oldest missing update
Long approxFirstMissingDate=md.getApproxFirstMissingDate(serverId);
if ((approxFirstMissingDate != null) && (approxFirstMissingDate>0))
{
Date date = new Date(approxFirstMissingDate);
- attributes.add(new Attribute("approx-older-change-not-synchronized",
- date.toString()));
- attributes.add(
- new Attribute("approx-older-change-not-synchronized-millis",
- String.valueOf(approxFirstMissingDate)));
+ attributes.add(Attributes.create(
+ "approx-older-change-not-synchronized", date.toString()));
+ attributes.add(Attributes.create(
+ "approx-older-change-not-synchronized-millis", String
+ .valueOf(approxFirstMissingDate)));
}
// Missing changes
long missingChanges = md.getMissingChanges(serverId);
- attributes.add(new Attribute("missing-changes",
+ attributes.add(Attributes.create("missing-changes",
String.valueOf(missingChanges)));
// Replication delay
long delay = md.getApproxDelay(serverId);
- attributes.add(new Attribute("approximate-delay",
+ attributes.add(Attributes.create("approximate-delay",
String.valueOf(delay)));
}
@@ -265,7 +309,7 @@
{
// TODO: improve the log
// We failed retrieving the remote monitor data.
- attributes.add(new Attribute("error",
+ attributes.add(Attributes.create("error",
stackTraceToSingleLineString(e)));
}
return attributes;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/MsgQueue.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/MsgQueue.java
index 3484633..c74ccbe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/MsgQueue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/MsgQueue.java
@@ -30,37 +30,37 @@
import java.util.TreeMap;
import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
/**
- * This class is used to build ordered lists of UpdateMessage.
- * The order is defined by the order of the ChangeNumber of the UpdateMessage.
+ * This class is used to build ordered lists of UpdateMsg.
+ * The order is defined by the order of the ChangeNumber of the UpdateMsg.
*/
public class MsgQueue
{
- private SortedMap<ChangeNumber, UpdateMessage> map =
- new TreeMap<ChangeNumber, UpdateMessage>();
+ private SortedMap<ChangeNumber, UpdateMsg> map =
+ new TreeMap<ChangeNumber, UpdateMsg>();
// The total number of bytes for all the message in the queue.
private int bytesCount = 0;
/**
- * Return the first UpdateMessage in the MsgQueue.
+ * Return the first UpdateMsg in the MsgQueue.
*
- * @return The first UpdateMessage in the MsgQueue.
+ * @return The first UpdateMsg in the MsgQueue.
*/
- public UpdateMessage first()
+ public UpdateMsg first()
{
return map.get(map.firstKey());
}
/**
- * Return the last UpdateMessage in the MsgQueue.
+ * Return the last UpdateMsg in the MsgQueue.
*
- * @return The last UpdateMessage in the MsgQueue.
+ * @return The last UpdateMsg in the MsgQueue.
*/
- public UpdateMessage last()
+ public UpdateMsg last()
{
return map.get(map.lastKey());
}
@@ -86,9 +86,9 @@
}
/**
- * Returns <tt>true</tt> if this MsgQueue contains no UpdateMessage.
+ * Returns <tt>true</tt> if this MsgQueue contains no UpdateMsg.
*
- * @return <tt>true</tt> if this MsgQueue contains no UpdateMessage.
+ * @return <tt>true</tt> if this MsgQueue contains no UpdateMsg.
*/
public boolean isEmpty()
{
@@ -97,46 +97,46 @@
/**
- * Add an UpdateMessage to this MessageQueue.
+ * Add an UpdateMsg to this MessageQueue.
*
- * @param update The UpdateMessage to add to this MessageQueue.
+ * @param update The UpdateMsg to add to this MessageQueue.
*/
- public void add(UpdateMessage update)
+ public void add(UpdateMsg update)
{
map.put(update.getChangeNumber(), update);
bytesCount += update.size();
}
/**
- * Get and remove the first UpdateMessage in this MessageQueue.
+ * Get and remove the first UpdateMsg in this MessageQueue.
*
- * @return The first UpdateMessage in this MessageQueue.
+ * @return The first UpdateMsg in this MessageQueue.
*/
- public UpdateMessage removeFirst()
+ public UpdateMsg removeFirst()
{
- UpdateMessage msg = map.get(map.firstKey());
+ UpdateMsg msg = map.get(map.firstKey());
map.remove(msg.getChangeNumber());
bytesCount -= msg.size();
return msg;
}
/**
- * Returns <tt>true</tt> if this map contains an UpdateMessage
- * with the same ChangeNumber as the given UpdateMessage.
+ * Returns <tt>true</tt> if this map contains an UpdateMsg
+ * with the same ChangeNumber as the given UpdateMsg.
*
- * @param msg UpdateMessage whose presence in this queue is to be tested.
+ * @param msg UpdateMsg whose presence in this queue is to be tested.
*
- * @return <tt>true</tt> if this map contains an UpdateMessage
- * with the same ChangeNumber as the given UpdateMessage.
+ * @return <tt>true</tt> if this map contains an UpdateMsg
+ * with the same ChangeNumber as the given UpdateMsg.
*
*/
- public boolean contains(UpdateMessage msg)
+ public boolean contains(UpdateMsg msg)
{
return map.containsKey(msg.getChangeNumber());
}
/**
- * Removes all UpdateMessage form this queue.
+ * Removes all UpdateMsg form this queue.
*/
public void clear()
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
index 0e8cd78..7f3f00a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
@@ -44,7 +44,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
@@ -72,18 +71,22 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.plugin.MultimasterReplication;
import org.opends.server.replication.plugin.ReplicationServerListener;
import org.opends.server.replication.protocol.AddMsg;
import org.opends.server.replication.protocol.DeleteMsg;
import org.opends.server.replication.protocol.ModifyDNMsg;
import org.opends.server.replication.protocol.ModifyMsg;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.CanceledOperationException;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
@@ -91,6 +94,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.Entry;
+import org.opends.server.types.FilterType;
import org.opends.server.types.IndexType;
import org.opends.server.types.InitializationException;
import org.opends.server.types.LDIFExportConfig;
@@ -131,6 +135,8 @@
public class ReplicationBackend
extends Backend
{
+ private static final String CHANGE_NUMBER = "replicationChangeNumber";
+
/**
* The tracer object for the debug logger.
*/
@@ -273,15 +279,11 @@
DirectoryServer.getObjectClass(ATTR_OBJECTCLASSES_LC, true);
rootObjectclasses.put(objectclassOC, ATTR_OBJECTCLASSES_LC);
attributes = new LinkedHashMap<AttributeType,List<Attribute>>();
- AttributeType changeType =
- DirectoryServer.getAttributeType("changetype", true);
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(new AttributeValue(changeType, "add"));
- Attribute a = new Attribute(changeType, "changetype", valueSet);
+
+ Attribute a = Attributes.create("changetype", "add");
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
attrList.add(a);
- attributes.put(changeType, attrList);
+ attributes.put(a.getAttributeType(), attrList);
operationalAttributes = new LinkedHashMap<AttributeType,List<Attribute>>();
}
@@ -465,7 +467,7 @@
* {@inheritDoc}
*/
@Override()
- public synchronized void replaceEntry(Entry entry,
+ public synchronized void replaceEntry(Entry oldEntry, Entry newEntry,
ModifyOperation modifyOperation)
throws DirectoryException
{
@@ -649,13 +651,11 @@
new HashMap<AttributeType,List<Attribute>>();
ArrayList<Attribute> ldapAttrList = new ArrayList<Attribute>();
- AttributeType ocType=
- DirectoryServer.getAttributeType("objectclass", true);
- LinkedHashSet<AttributeValue> ocValues =
- new LinkedHashSet<AttributeValue>();
- ocValues.add(new AttributeValue(ocType, "top"));
- ocValues.add(new AttributeValue(ocType, "domain"));
- Attribute ocAttr = new Attribute(ocType, "objectclass", ocValues);
+ AttributeType ocType = DirectoryServer.getObjectClassAttributeType();
+ AttributeBuilder builder = new AttributeBuilder(ocType);
+ builder.add("top");
+ builder.add("domain");
+ Attribute ocAttr = builder.toAttribute();
ldapAttrList.add(ocAttr);
attributes.put(ocType, ldapAttrList);
@@ -676,31 +676,25 @@
}
attributes.clear();
+
ldapAttrList.clear();
-
ldapAttrList.add(ocAttr);
+ attributes.put(ocType, ldapAttrList);
- AttributeType stateType=
- DirectoryServer.getAttributeType("state", true);
- LinkedHashSet<AttributeValue> stateValues =
- new LinkedHashSet<AttributeValue>();
- stateValues.add(new AttributeValue(stateType,
- exportContainer.getDbServerState().toString()));
TRACER.debugInfo("State=" +
exportContainer.getDbServerState().toString());
- Attribute stateAttr = new Attribute(ocType, "state", stateValues);
+ Attribute stateAttr = Attributes.create("state", exportContainer
+ .getDbServerState().toString());
+ ldapAttrList.clear();
ldapAttrList.add(stateAttr);
+ attributes.put(stateAttr.getAttributeType(), ldapAttrList);
- AttributeType genidType=
- DirectoryServer.getAttributeType("generation-id", true);
- LinkedHashSet<AttributeValue> genidValues =
- new LinkedHashSet<AttributeValue>();
- genidValues.add(new AttributeValue(genidType,
- String.valueOf(exportContainer.getGenerationId())+
- exportContainer.getBaseDn()));
- Attribute genidAttr = new Attribute(ocType, "generation-id", genidValues);
+ Attribute genidAttr = Attributes.create("generation-id", String
+ .valueOf(exportContainer.getGenerationId())
+ + exportContainer.getBaseDn());
+ ldapAttrList.clear();
ldapAttrList.add(genidAttr);
- attributes.put(genidType, ldapAttrList);
+ attributes.put(genidAttr.getAttributeType(), ldapAttrList);
try
{
@@ -739,13 +733,44 @@
break;
}
+ ChangeNumber previousChangeNumber = null;
+ if (searchOperation != null)
+ {
+ // Try to optimize for filters like replicationChangeNumber>=xxxxx
+ // or replicationChangeNumber=xxxxx :
+ // If the search filter is one of these 2 filters, move directly to
+ // ChangeNumber=xxxx before starting the iteration.
+ SearchFilter filter = searchOperation.getFilter();
+ previousChangeNumber = extractChangeNumber(filter);
+
+ if ((previousChangeNumber == null) &&
+ (filter.getFilterType().equals(FilterType.AND)))
+ {
+ for (SearchFilter filterComponents: filter.getFilterComponents())
+ {
+ previousChangeNumber = extractChangeNumber(filterComponents);
+ if (previousChangeNumber != null)
+ break;
+ }
+ }
+ }
+
+
ReplicationIterator ri = rsd.getChangelogIterator(serverId,
- null);
+ previousChangeNumber);
if (ri != null)
{
try
{
+ int lookthroughCount = 0;
+ int lookthroughLimit = 0;
+ if (searchOperation != null)
+ {
+ lookthroughLimit =
+ searchOperation.getClientConnection().getLookthroughLimit();
+ }
+
// Walk through the changes
while (ri.getChange() != null)
{
@@ -753,8 +778,32 @@
{
break;
}
- UpdateMessage msg = ri.getChange();
- processChange(msg, exportConfig, ldifWriter, searchOperation);
+ if (searchOperation != null)
+ {
+ try
+ {
+ if (lookthroughLimit > 0 && lookthroughCount > lookthroughLimit)
+ {
+ // Lookthrough limit exceeded
+ searchOperation.setResultCode(
+ ResultCode.ADMIN_LIMIT_EXCEEDED);
+ searchOperation.setErrorMessage(null);
+ break;
+ }
+
+ searchOperation.checkIfCanceled(false);
+ } catch (CanceledOperationException e)
+ {
+ searchOperation.setResultCode(ResultCode.CANCELED);
+ searchOperation.setErrorMessage(null);
+ break;
+ }
+ }
+ lookthroughCount++;
+ UpdateMsg msg = ri.getChange();
+ processChange(
+ msg, exportConfig, ldifWriter, searchOperation,
+ rsd.getBaseDn().toString());
if (!ri.next())
break;
}
@@ -768,17 +817,60 @@
}
/**
+ * Attempt to extract a ChangeNumber from searchFilter like
+ * ReplicationChangeNumber=xxxx or ReplicationChangeNumber>=xxxx.
+ *
+ * @param filter The filter to evaluate.
+ *
+ * @return The extracted ChangeNumber or null if no ChangeNumber
+ * was found.
+ */
+ private ChangeNumber extractChangeNumber(SearchFilter filter)
+ {
+ AttributeType changeNumberAttrType =
+ DirectoryServer.getDefaultAttributeType(CHANGE_NUMBER);
+
+ FilterType filterType = filter.getFilterType();
+
+ if ( (filterType.equals(FilterType.GREATER_OR_EQUAL) ||
+ filterType.equals(FilterType.EQUALITY) ) &&
+ (filter.getAttributeType().equals(changeNumberAttrType)))
+ {
+ try
+ {
+ ChangeNumber startingChangeNumber =
+ new ChangeNumber(filter.getAssertionValue().getStringValue());
+ return new ChangeNumber(
+ startingChangeNumber.getTime(),
+ startingChangeNumber.getSeqnum()-1,
+ startingChangeNumber.getServerId());
+ }
+ catch (Exception e)
+ {
+ // don't try to optimize the search if we the ChangeNumber is
+ // not a valid replication ChangeNumber.
+ }
+ }
+ return null;
+ }
+
+
+ /**
* Export one change.
*/
- private void processChange(UpdateMessage msg,
+ private void processChange(UpdateMsg msg,
LDIFExportConfig exportConfig, LDIFWriter ldifWriter,
- SearchOperation searchOperation)
+ SearchOperation searchOperation, String baseDN)
{
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
Entry entry = null;
DN dn = null;
+ ObjectClass objectclass =
+ DirectoryServer.getDefaultObjectClass("extensibleObject");
+
+
try
{
if (msg instanceof AddMsg)
@@ -786,43 +878,51 @@
AddMsg addMsg = (AddMsg)msg;
AddOperation addOperation = (AddOperation)msg.createOperation(conn);
- dn = DN.decode("puid=" + addMsg.getParentUid() + "," +
- "changeNumber=" + msg.getChangeNumber().toString() + "," +
- msg.getDn() +","+ BASE_DN);
+ dn = DN.decode("puid=" + addMsg.getParentUid() + "+" +
+ CHANGE_NUMBER + "=" + msg.getChangeNumber().toString() + "+" +
+ msg.getDn() + "," + BASE_DN);
Map<AttributeType,List<Attribute>> attributes =
new HashMap<AttributeType,List<Attribute>>();
+ Map<ObjectClass, String> objectclasses =
+ new HashMap<ObjectClass, String>();
for (RawAttribute a : addOperation.getRawAttributes())
{
Attribute attr = a.toAttribute();
- AttributeType attrType = attr.getAttributeType();
- List<Attribute> attrs = attributes.get(attrType);
- if (attrs == null)
+ if (attr.getAttributeType().isObjectClassType())
{
- attrs = new ArrayList<Attribute>(1);
- attrs.add(attr);
- attributes.put(attrType, attrs);
+ for (ByteString os : a.getValues())
+ {
+ String ocName = os.toString();
+ ObjectClass oc =
+ DirectoryServer.getObjectClass(toLowerCase(ocName));
+ if (oc == null)
+ {
+ oc = DirectoryServer.getDefaultObjectClass(ocName);
+ }
+
+ objectclasses.put(oc,ocName);
+ }
}
else
{
- attrs.add(attr);
+ addAttribute(attributes, attr);
}
}
- AddChangeRecordEntry changeRecord =
- new AddChangeRecordEntry(dn, attributes);
+ Attribute changetype = Attributes.create("changetype", "add");
+ addAttribute(attributes, changetype);
+
if (exportConfig != null)
{
+ AddChangeRecordEntry changeRecord =
+ new AddChangeRecordEntry(dn, attributes);
ldifWriter.writeChangeRecord(changeRecord);
}
else
{
- Writer writer = new Writer();
- LDIFWriter ldifWriter2 = writer.getLDIFWriter();
- ldifWriter2.writeChangeRecord(changeRecord);
- LDIFReader reader = writer.getLDIFReader();
- entry = reader.readEntry();
+ entry = new Entry(dn, objectclasses, attributes, null);
}
}
else if (msg instanceof DeleteMsg)
@@ -830,7 +930,7 @@
DeleteMsg delMsg = (DeleteMsg)msg;
dn = DN.decode("uuid=" + msg.getUniqueId() + "," +
- "changeNumber=" + delMsg.getChangeNumber().toString()+ "," +
+ CHANGE_NUMBER + "=" + delMsg.getChangeNumber().toString()+ "," +
msg.getDn() +","+ BASE_DN);
DeleteChangeRecordEntry changeRecord =
@@ -853,7 +953,7 @@
ModifyOperation op = (ModifyOperation)msg.createOperation(conn);
dn = DN.decode("uuid=" + msg.getUniqueId() + "," +
- "changeNumber=" + msg.getChangeNumber().toString()+ "," +
+ CHANGE_NUMBER + "=" + msg.getChangeNumber().toString()+ "," +
msg.getDn() +","+ BASE_DN);
op.setInternalOperation(true);
@@ -877,7 +977,7 @@
ModifyDNOperation op = (ModifyDNOperation)msg.createOperation(conn);
dn = DN.decode("uuid=" + msg.getUniqueId() + "," +
- "changeNumber=" + msg.getChangeNumber().toString()+ "," +
+ CHANGE_NUMBER + "=" + msg.getChangeNumber().toString()+ "," +
msg.getDn() +","+ BASE_DN);
op.setInternalOperation(true);
@@ -906,6 +1006,15 @@
}
else
{
+ // Add extensibleObject objectclass and the ChangeNumber
+ // in the entry.
+ entry.addObjectClass(objectclass);
+ Attribute changeNumber =
+ Attributes.create(CHANGE_NUMBER, msg.getChangeNumber().toStringUI());
+ addAttribute(entry.getUserAttributes(), changeNumber);
+ Attribute domain = Attributes.create("replicationDomain", baseDN);
+ addAttribute(entry.getUserAttributes(), domain);
+
// Get the base DN, scope, and filter for the search.
DN searchBaseDN = searchOperation.getBaseDN();
SearchScope scope = searchOperation.getScope();
@@ -941,7 +1050,28 @@
}
}
-
+ /**
+ * Add an attribute to a provided Map of attribute.
+ *
+ * @param attributes The Map that should be updated.
+ * @param attribute The attribute that should be added to the Map.
+ */
+ private void addAttribute(
+ Map<AttributeType,List<Attribute>> attributes, Attribute attribute)
+ {
+ AttributeType attrType = attribute.getAttributeType();
+ List<Attribute> attrs = attributes.get(attrType);
+ if (attrs == null)
+ {
+ attrs = new ArrayList<Attribute>(1);
+ attrs.add(attribute);
+ attributes.put(attrType, attrs);
+ }
+ else
+ {
+ attrs.add(attribute);
+ }
+ }
/**
* {@inheritDoc}
@@ -1189,17 +1319,6 @@
{
if (baseDNSet.contains(searchBaseDN))
{
- // Get the base DN, scope, and filter for the search.
- SearchScope scope = searchOperation.getScope();
- SearchFilter filter = searchOperation.getFilter();
- Entry re = new Entry(searchBaseDN, rootObjectclasses, attributes,
- operationalAttributes);
-
- if (re.matchesBaseAndScope(searchBaseDN, scope) &&
- filter.matchesEntry(re))
- {
- searchOperation.returnEntry(re, new LinkedList<Control>());
- }
return;
}
else
@@ -1212,18 +1331,6 @@
}
}
- // Get the base DN, scope, and filter for the search.
- SearchScope scope = searchOperation.getScope();
- SearchFilter filter = searchOperation.getFilter();
- Entry re = new Entry(searchBaseDN, rootObjectclasses, attributes,
- operationalAttributes);
-
- if (re.matchesBaseAndScope(searchBaseDN, scope) &&
- filter.matchesEntry(re))
- {
- searchOperation.returnEntry(re, new LinkedList<Control>());
- }
-
// Walk through all entries and send the ones that match.
Iterator<ReplicationServerDomain> rsdi = server.getCacheIterator();
if (rsdi != null)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
index e6e67bc..8a69489 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDB.java
@@ -36,7 +36,7 @@
import org.opends.server.types.DN;
import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import com.sleepycat.je.Cursor;
@@ -100,7 +100,7 @@
*
* @param changes The list of changes to add to the underlying db.
*/
- public void addEntries(List<UpdateMessage> changes)
+ public void addEntries(List<UpdateMsg> changes)
{
Transaction txn = null;
@@ -120,7 +120,7 @@
{
txn = dbenv.beginTransaction();
- for (UpdateMessage change : changes)
+ for (UpdateMsg change : changes)
{
DatabaseEntry key = new ReplicationKey(change.getChangeNumber());
DatabaseEntry data = new ReplicationData(change);
@@ -133,7 +133,8 @@
}
catch (DeadlockException e)
{
- txn.abort();
+ if (txn != null)
+ txn.abort();
txn = null;
}
finally
@@ -591,13 +592,13 @@
}
/**
- * Get the next UpdateMessage from this cursor.
+ * Get the next UpdateMsg from this cursor.
*
- * @return the next UpdateMessage.
+ * @return the next UpdateMsg.
*/
- public UpdateMessage next()
+ public UpdateMsg next()
{
- UpdateMessage currentChange = null;
+ UpdateMsg currentChange = null;
while (currentChange == null)
{
try
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationData.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationData.java
index 4f2f409..455a246 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationData.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationData.java
@@ -30,8 +30,8 @@
import com.sleepycat.je.DatabaseEntry;
-import org.opends.server.replication.protocol.ReplicationMessage;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.ReplicationMsg;
+import org.opends.server.replication.protocol.UpdateMsg;
/**
* SuperClass of DatabaseEntry used for data stored in the ReplicationServer
@@ -40,31 +40,31 @@
public class ReplicationData extends DatabaseEntry
{
/**
- * Creates a new ReplicationData object from an UpdateMessage.
+ * Creates a new ReplicationData object from an UpdateMsg.
*
- * @param change the UpdateMessage used to create the ReplicationData.
+ * @param change the UpdateMsg used to create the ReplicationData.
*
* @throws UnsupportedEncodingException When the encoding of the message
* failed because the UTF-8 encoding is not supported.
*/
- public ReplicationData(UpdateMessage change)
+ public ReplicationData(UpdateMsg change)
throws UnsupportedEncodingException
{
this.setData(change.getBytes());
}
/**
- * Generate an UpdateMessage from its byte[] form.
+ * Generate an UpdateMsg from its byte[] form.
*
- * @param data The DatabaseEntry used to generate the UpdateMessage.
+ * @param data The DatabaseEntry used to generate the UpdateMsg.
*
* @return The generated change.
*
* @throws Exception When the data was not a valid Update Message.
*/
- public static UpdateMessage generateChange(byte[] data)
+ public static UpdateMsg generateChange(byte[] data)
throws Exception
{
- return (UpdateMessage) ReplicationMessage.generateMsg(data);
+ return (UpdateMsg) ReplicationMsg.generateMsg(data);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDbEnv.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDbEnv.java
index cca4d50..01ba275 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDbEnv.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationDbEnv.java
@@ -52,7 +52,7 @@
import com.sleepycat.je.Transaction;
/**
- * This class is used to represent a Db environement that can be used
+ * This class is used to represent a Db environment that can be used
* to create ReplicationDB.
*/
public class ReplicationDbEnv
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationIterator.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationIterator.java
index 85b1733..0fa4b09 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationIterator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationIterator.java
@@ -27,7 +27,7 @@
package org.opends.server.replication.server;
import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.ReplicationDB.ReplServerDBCursor;
import com.sleepycat.je.DatabaseException;
@@ -38,7 +38,7 @@
*/
public class ReplicationIterator
{
- private UpdateMessage currentChange = null;
+ private UpdateMsg currentChange = null;
private ReplServerDBCursor cursor = null;
/**
@@ -71,10 +71,10 @@
}
/**
- * Get the UpdateMessage where the iterator is currently set.
- * @return The UpdateMessage where the iterator is currently set.
+ * Get the UpdateMsg where the iterator is currently set.
+ * @return The UpdateMsg where the iterator is currently set.
*/
- public UpdateMessage getChange()
+ public UpdateMsg getChange()
{
return currentChange;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 5fe6a1e..0175414 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -44,7 +44,6 @@
import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -66,8 +65,8 @@
import org.opends.server.replication.protocol.ProtocolSession;
import org.opends.server.replication.protocol.ReplSessionSecurity;
import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.AttributeBuilder;
+import org.opends.server.types.Attributes;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
@@ -114,7 +113,6 @@
private String localURL = "null";
private boolean shutdown = false;
- private short replicationServerId;
private ReplicationDbEnv dbEnv;
private int rcvWindow;
private int queueSize;
@@ -139,6 +137,19 @@
private boolean connectedInTopology = false;
private final Object connectedInTopologyLock = new Object();
+ /*
+ * Assured mode properties
+ */
+ // Timeout (in milliseconds) when waiting for acknowledgments
+ private long assuredTimeout = 1000;
+
+ // Group id
+ private byte groupId = (byte)1;
+
+ // Number of pending changes for a DS, considered as threshold value to put
+ // the DS in DEGRADED_STATUS. If value is 0, status analyzer is disabled
+ private int degradedStatusThreshold = 5000;
+
/**
* The tracer object for the debug logger.
*/
@@ -156,7 +167,7 @@
super("Replication Server" + configuration.getReplicationPort());
replicationPort = configuration.getReplicationPort();
- replicationServerId = (short) configuration.getReplicationServerId();
+ serverId = (short) configuration.getReplicationServerId();
replicationServers = configuration.getReplicationServer();
if (replicationServers == null)
replicationServers = new ArrayList<String>();
@@ -187,9 +198,12 @@
Message msg = ERR_FILE_CHECK_CREATE_FAILED.get(mb.toString());
throw new ConfigException(msg, e);
}
+ groupId = (byte)configuration.getGroupId();
+ assuredTimeout = configuration.getAssuredTimeout();
+ degradedStatusThreshold = configuration.getDegradedStatusThreshold();
replSessionSecurity = new ReplSessionSecurity(configuration);
- initialize(replicationServerId, replicationPort);
+ initialize(replicationPort);
configuration.addChangeListener(this);
DirectoryServer.registerMonitorProvider(this);
@@ -246,11 +260,11 @@
try
{
newSocket = listenSocket.accept();
- newSocket.setReceiveBufferSize(1000000);
newSocket.setTcpNoDelay(true);
newSocket.setKeepAlive(true);
ProtocolSession session =
- replSessionSecurity.createServerSession(newSocket);
+ replSessionSecurity.createServerSession(newSocket,
+ ReplSessionSecurity.HANDSHAKE_TIMEOUT);
if (session == null) // Error, go back to accept
continue;
ServerHandler handler = new ServerHandler(session, queueSize);
@@ -362,12 +376,12 @@
InetSocketAddress ServerAddr = new InetSocketAddress(
InetAddress.getByName(hostname), Integer.parseInt(port));
Socket socket = new Socket();
- socket.setReceiveBufferSize(1000000);
socket.setTcpNoDelay(true);
socket.connect(ServerAddr, 500);
ServerHandler handler = new ServerHandler(
- replSessionSecurity.createClientSession(serverURL, socket),
+ replSessionSecurity.createClientSession(serverURL, socket,
+ ReplSessionSecurity.HANDSHAKE_TIMEOUT),
queueSize);
handler.start(baseDn, serverId, this.serverURL, rcvWindow,
sslEncryption, this);
@@ -382,12 +396,11 @@
/**
* initialization function for the replicationServer.
*
- * @param changelogId The unique identifier for this replicationServer.
* @param changelogPort The port on which the replicationServer should
* listen.
*
*/
- private void initialize(short changelogId, int changelogPort)
+ private void initialize(int changelogPort)
{
shutdown = false;
@@ -400,11 +413,6 @@
this);
/*
- * create replicationServer replicationServerDomain
- */
- serverId = changelogId;
-
- /*
* Open replicationServer socket
*/
String localhostname = InetAddress.getLocalHost().getHostName();
@@ -412,7 +420,6 @@
serverURL = localhostname + ":" + String.valueOf(changelogPort);
localURL = localAdddress + ":" + String.valueOf(changelogPort);
listenSocket = new ServerSocket();
- listenSocket.setReceiveBufferSize(1000000);
listenSocket.bind(new InetSocketAddress(changelogPort));
/*
@@ -421,9 +428,10 @@
*/
if (debugEnabled())
TRACER.debugInfo("RS " +getMonitorInstanceName()+
- " creates connect threads");
+ " creates connect thread");
connectThread =
- new ReplicationServerConnectThread("Replication Server Connect", this);
+ new ReplicationServerConnectThread("Replication Server Connect " +
+ serverId , this);
connectThread.start();
// FIXME : Is it better to have the time to receive the ReplServerInfo
@@ -432,10 +440,11 @@
try { Thread.sleep(300);} catch(Exception e) {}
if (debugEnabled())
TRACER.debugInfo("RS " +getMonitorInstanceName()+
- " creates listen threads");
+ " creates listen thread");
listenThread =
- new ReplicationServerListenThread("Replication Server Listener", this);
+ new ReplicationServerListenThread("Replication Server Listener " +
+ serverId , this);
listenThread.start();
if (debugEnabled())
@@ -546,7 +555,7 @@
* DN given in parameter.
*
* @param id The serverId for which the dbHandler must be created.
- * @param baseDn The DN for which the dbHandler muste be created.
+ * @param baseDn The DN for which the dbHandler must be created.
* @return The new DB handler for this ReplicationServer and the serverId and
* DN given in parameter.
* @throws DatabaseException in case of underlying database problem.
@@ -594,7 +603,7 @@
* @param configuration The configuration to check.
* @param unacceptableReasons When the configuration is not acceptable, this
* table is use to return the reasons why this
- * configuration is not acceptbale.
+ * configuration is not acceptable.
*
* @return true if the configuration is acceptable, false other wise.
*/
@@ -666,7 +675,6 @@
serverURL = localhostname + ":" + String.valueOf(replicationPort);
localURL = localAdddress + ":" + String.valueOf(replicationPort);
listenSocket = new ServerSocket();
- listenSocket.setReceiveBufferSize(1000000);
listenSocket.bind(new InetSocketAddress(replicationPort));
listenThread =
@@ -690,6 +698,31 @@
}
}
+ // Update threshold value for status analyzers (stop them if requested
+ // value is 0)
+ if (degradedStatusThreshold != configuration.getDegradedStatusThreshold())
+ {
+ int oldThresholdValue = degradedStatusThreshold;
+ degradedStatusThreshold = configuration.getDegradedStatusThreshold();
+ for(ReplicationServerDomain rsd : baseDNs.values())
+ {
+ if (degradedStatusThreshold == 0)
+ {
+ // Requested to stop analyzers
+ rsd.stopStatusAnalyzer();
+ } else if (rsd.isRunningStatusAnalyzer())
+ {
+ // Update the threshold value for this running analyzer
+ rsd.updateStatusAnalyzer(degradedStatusThreshold);
+ } else if (oldThresholdValue == 0)
+ {
+ // Requested to start analyzers with provided threshold value
+ if (rsd.getConnectedDSs().size() > 0)
+ rsd.startStatusAnalyzer();
+ }
+ }
+ }
+
if ((configuration.getReplicationDBDirectory() != null) &&
(!dbDirname.equals(configuration.getReplicationDBDirectory())))
{
@@ -724,7 +757,7 @@
public String getMonitorInstanceName()
{
return "Replication Server " + this.replicationPort + " "
- + replicationServerId;
+ + serverId;
}
/**
@@ -757,31 +790,23 @@
* publish the server id and the port number.
*/
ArrayList<Attribute> attributes = new ArrayList<Attribute>();
- attributes.add(new Attribute("replication server id",
+ attributes.add(Attributes.create("replication server id",
String.valueOf(serverId)));
- attributes.add(new Attribute("replication server port",
+ attributes.add(Attributes.create("replication server port",
String.valueOf(replicationPort)));
/*
* Add all the base DNs that are known by this replication server.
*/
- AttributeType baseType=
- DirectoryServer.getAttributeType("base-dn", true);
- LinkedHashSet<AttributeValue> baseValues =
- new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder("base-dn");
for (DN base : baseDNs.keySet())
{
- baseValues.add(new AttributeValue(baseType, base. toString()));
+ builder.add(base.toString());
}
-
- Attribute bases = new Attribute(baseType, "base-dn", baseValues);
- attributes.add(bases);
+ attributes.add(builder.toAttribute());
// Publish to monitor the generation ID by replicationServerDomain
- AttributeType generationIdType=
- DirectoryServer.getAttributeType("base-dn-generation-id", true);
- LinkedHashSet<AttributeValue> generationIdValues =
- new LinkedHashSet<AttributeValue>();
+ builder = new AttributeBuilder("base-dn-generation-id");
for (DN base : baseDNs.keySet())
{
long generationId=-1;
@@ -789,12 +814,9 @@
getReplicationServerDomain(base, false);
if (replicationServerDomain != null)
generationId = replicationServerDomain.getGenerationId();
- generationIdValues.add(new AttributeValue(generationIdType,
- base.toString() + " " + generationId));
+ builder.add(base.toString() + " " + generationId);
}
- Attribute generationIds = new Attribute(generationIdType, "generation-id",
- generationIdValues);
- attributes.add(generationIds);
+ attributes.add(builder.toAttribute());
return attributes;
}
@@ -916,7 +938,7 @@
{
try
{
- if (!DirectoryServer.getConfigHandler().entryExists(backendConfigEntryDN))
+ if (DirectoryServer.getConfigHandler().entryExists(backendConfigEntryDN))
{
// Delete the replication backend
DirectoryServer.getConfigHandler().deleteEntry(backendConfigEntryDN,
@@ -964,7 +986,7 @@
boolean successful)
{
if (backend.getBackendID().equals(backendId))
- initialize(this.replicationServerId, this.replicationPort);
+ initialize(this.replicationPort);
}
/**
@@ -1041,6 +1063,33 @@
}
/**
+ * Get the assured mode timeout.
+ * @return The assured mode timeout.
+ */
+ public long getAssuredTimeout()
+ {
+ return assuredTimeout;
+ }
+
+ /**
+ * Get The replication server group id.
+ * @return The replication server group id.
+ */
+ public byte getGroupId()
+ {
+ return groupId;
+ }
+
+ /**
+ * Get the threshold value for status analyzer.
+ * @return The threshold value for status analyzer.
+ */
+ public int getDegradedStatusThreshold()
+ {
+ return degradedStatusThreshold;
+ }
+
+ /**
* Compute the list of replication servers that are not any
* more connected to this Replication Server and stop the
* corresponding handlers.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 1a0faa3..a7c3dae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -25,6 +25,7 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.replication.server;
+
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
@@ -49,19 +50,25 @@
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ServerState;
-import org.opends.server.replication.protocol.AckMessage;
-import org.opends.server.replication.protocol.ErrorMessage;
-import org.opends.server.replication.protocol.RoutableMessage;
-import org.opends.server.replication.protocol.UpdateMessage;
-import org.opends.server.replication.protocol.ReplServerInfoMessage;
-import org.opends.server.replication.protocol.MonitorMessage;
-import org.opends.server.replication.protocol.MonitorRequestMessage;
-import org.opends.server.replication.protocol.ResetGenerationId;
+import org.opends.server.replication.protocol.AckMsg;
+import org.opends.server.replication.protocol.ErrorMsg;
+import org.opends.server.replication.protocol.RoutableMsg;
+import org.opends.server.replication.protocol.UpdateMsg;
+import org.opends.server.replication.protocol.TopologyMsg;
+import org.opends.server.replication.protocol.MonitorMsg;
+import org.opends.server.replication.protocol.MonitorRequestMsg;
+import org.opends.server.replication.protocol.ResetGenerationIdMsg;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.TimeThread;
import com.sleepycat.je.DatabaseException;
+import java.util.concurrent.locks.ReentrantLock;
+import org.opends.server.replication.common.DSInfo;
+import org.opends.server.replication.common.RSInfo;
+import org.opends.server.replication.common.ServerStatus;
+import org.opends.server.replication.common.StatusMachineEvent;
+import org.opends.server.replication.protocol.ChangeStatusMsg;
/**
* This class define an in-memory cache that will be used to store
@@ -81,8 +88,12 @@
*/
public class ReplicationServerDomain
{
+
private final Object flowControlLock = new Object();
private final DN baseDn;
+ // The Status analyzer that periodically verifis if the connected DSs are
+ // late or not
+ private StatusAnalyzer statusAnalyzer = null;
/*
* The following map contains one balanced tree for each replica ID
@@ -94,7 +105,7 @@
* to this replication server.
*
*/
- private final Map<Short, ServerHandler> connectedServers =
+ private final Map<Short, ServerHandler> directoryServers =
new ConcurrentHashMap<Short, ServerHandler>();
/*
@@ -106,7 +117,6 @@
* We add new TreeSet in the HashMap when a new replication server register
* to this replication server.
*/
-
private final Map<Short, ServerHandler> replicationServers =
new ConcurrentHashMap<Short, ServerHandler>();
@@ -121,7 +131,6 @@
/* GenerationId management */
private long generationId = -1;
private boolean generationIdSavedStatus = false;
-
/**
* The tracer object for the debug logger.
*/
@@ -138,12 +147,11 @@
* The worker thread is awoke on this semaphore, or on timeout.
*/
Semaphore remoteMonitorResponsesSemaphore;
-
/**
* The monitor data consolidated over the topology.
*/
- private MonitorData monitorData = new MonitorData();
- private MonitorData wrkMonitorData;
+ private MonitorData monitorData = new MonitorData();
+ private MonitorData wrkMonitorData;
/**
* Creates a new ReplicationServerDomain associated to the DN baseDn.
@@ -168,8 +176,8 @@
* @throws IOException When an IO exception happens during the update
* processing.
*/
- public void put(UpdateMessage update, ServerHandler sourceHandler)
- throws IOException
+ public void put(UpdateMsg update, ServerHandler sourceHandler)
+ throws IOException
{
/*
* TODO : In case that the source server is a LDAP server this method
@@ -177,7 +185,7 @@
* other replication server before pushing it to the LDAP servers
*/
- short id = update.getChangeNumber().getServerId();
+ short id = update.getChangeNumber().getServerId();
sourceHandler.updateServerState(update);
sourceHandler.incrementInCount();
@@ -188,11 +196,10 @@
{
if (sourceHandler.isReplicationServer())
ServerHandler.addWaitingAck(update, sourceHandler.getServerId(),
- this, count - 1);
+ this, count - 1);
else
sourceHandler.addWaitingAck(update, count - 1);
- }
- else
+ } else
{
sourceHandler.sendAck(update.getChangeNumber());
}
@@ -208,15 +215,14 @@
DbHandler dbHandler = null;
synchronized (sourceDbHandlers)
{
- dbHandler = sourceDbHandlers.get(id);
+ dbHandler = sourceDbHandlers.get(id);
if (dbHandler == null)
{
try
{
dbHandler = replicationServer.newDbHandler(id, baseDn);
generationIdSavedStatus = true;
- }
- catch (DatabaseException e)
+ } catch (DatabaseException e)
{
/*
* Because of database problem we can't save any more changes
@@ -246,6 +252,26 @@
{
for (ServerHandler handler : replicationServers.values())
{
+ /**
+ * Ignore updates to RS with bad gen id
+ * (no system managed status for a RS)
+ */
+ if ( (generationId>0) && (generationId != handler.getGenerationId()) )
+ {
+ if (debugEnabled())
+ TRACER.debugInfo("In RS " +
+ replicationServer.getServerId() +
+ " for dn " + baseDn.toNormalizedString() + ", update " +
+ update.getChangeNumber().toString() +
+ " will not be sent to replication server " +
+ Short.toString(handler.getServerId()) + " with generation id " +
+ Long.toString(handler.getGenerationId()) +
+ " different from local " +
+ "generation id " + Long.toString(generationId));
+
+ continue;
+ }
+
handler.add(update, sourceHandler);
}
}
@@ -253,7 +279,7 @@
/*
* Push the message to the LDAP servers
*/
- for (ServerHandler handler : connectedServers.values())
+ for (ServerHandler handler : directoryServers.values())
{
// don't forward the change to the server that just sent it
if (handler == sourceHandler)
@@ -261,6 +287,46 @@
continue;
}
+ /**
+ * Ignore updates to DS in bad BAD_GENID_STATUS or FULL_UPDATE_STATUS
+ *
+ * The RSD lock should not be taken here as it is acceptable to have a
+ * delay between the time the server has a wrong status and the fact we
+ * detect it: the updates that succeed to pass during this time will have
+ * no impact on remote server. But it is interesting to not saturate
+ * uselessly the network if the updates are not necessary so this check to
+ * stop sending updates is interesting anyway. Not taking the RSD lock
+ * allows to have better performances in normal mode (most of the time).
+ */
+ ServerStatus dsStatus = handler.getStatus();
+ if ( (dsStatus == ServerStatus.BAD_GEN_ID_STATUS) ||
+ (dsStatus == ServerStatus.FULL_UPDATE_STATUS) )
+ {
+ if (debugEnabled())
+ {
+ if (dsStatus == ServerStatus.BAD_GEN_ID_STATUS)
+ TRACER.debugInfo("In RS " +
+ replicationServer.getServerId() +
+ " for dn " + baseDn.toNormalizedString() + ", update " +
+ update.getChangeNumber().toString() +
+ " will not be sent to directory server " +
+ Short.toString(handler.getServerId()) + " with generation id " +
+ Long.toString(handler.getGenerationId()) +
+ " different from local " +
+ "generation id " + Long.toString(generationId));
+ if (dsStatus == ServerStatus.FULL_UPDATE_STATUS)
+ TRACER.debugInfo("In RS " +
+ replicationServer.getServerId() +
+ " for dn " + baseDn.toNormalizedString() + ", update " +
+ update.getChangeNumber().toString() +
+ " will not be sent to directory server " +
+ Short.toString(handler.getServerId()) +
+ " as it is in full update");
+ }
+
+ continue;
+ }
+
handler.add(update, sourceHandler);
}
@@ -273,7 +339,7 @@
*/
public void waitDisconnection(short serverId)
{
- if (connectedServers.containsKey(serverId))
+ if (directoryServers.containsKey(serverId))
{
// try again
try
@@ -286,51 +352,6 @@
}
/**
- * Create initialize context necessary for finding the changes
- * that must be sent to a given LDAP or replication server.
- *
- * @param handler handler for the server that must be started
- * @throws Exception when method has failed
- * @return A boolean indicating if the start was successfull.
- */
- public boolean startServer(ServerHandler handler) throws Exception
- {
- /*
- * create the balanced tree that will be used to forward changes
- */
- synchronized (connectedServers)
- {
- ServerHandler oldHandler = connectedServers.get(handler.getServerId());
-
- if (connectedServers.containsKey(handler.getServerId()))
- {
- // looks like two LDAP servers have the same serverId
- // log an error message and drop this connection.
- Message message = ERR_DUPLICATE_SERVER_ID.get(
- oldHandler.toString(), handler.toString(), handler.getServerId());
- logError(message);
- return false;
- }
- connectedServers.put(handler.getServerId(), handler);
-
- // It can be that the server that connects here is the
- // first server connected for a domain.
- // In that case, we will establish the appriopriate connections
- // to the other repl servers for this domain and receive
- // their ReplServerInfo messages.
- // FIXME: Is it necessary to end this above processing BEFORE listening
- // to incoming messages for that domain ? But the replica
- // would raise Read Timeout for replica that connects.
-
- // Update the remote replication servers with our list
- // of connected LDAP servers
- sendReplServerInfo();
-
- return true;
- }
- }
-
- /**
* Stop operations with a list of servers.
*
* @param replServers the replication servers for which
@@ -346,43 +367,105 @@
}
/**
+ * Checks that a DS is not connected with same id.
+ *
+ * @param handler the DS we want to check
+ * @return true if this is not a duplicate server
+ */
+ public boolean checkForDuplicateDS(ServerHandler handler)
+ {
+ ServerHandler oldHandler = directoryServers.get(handler.getServerId());
+
+ if (directoryServers.containsKey(handler.getServerId()))
+ {
+ // looks like two LDAP servers have the same serverId
+ // log an error message and drop this connection.
+ Message message = ERR_DUPLICATE_SERVER_ID.get(
+ replicationServer.getMonitorInstanceName(), oldHandler.toString(),
+ handler.toString(), handler.getServerId());
+ logError(message);
+ return false;
+ }
+ return true;
+ }
+
+ /**
* Stop operations with a given server.
*
* @param handler the server for which we want to stop operations
*/
public void stopServer(ServerHandler handler)
{
- if (debugEnabled())
- TRACER.debugInfo(
- "In RS " + this.replicationServer.getMonitorInstanceName() +
- " for " + baseDn + " " +
- " stopServer " + handler.getMonitorInstanceName());
+ /*
+ * We must prevent deadlock on replication server domain lock, when for
+ * instance this code is called from dying ServerReader but also dying
+ * ServerWriter at the same time, or from a thread that wants to shut down
+ * the handler. So use a thread safe flag to know if the job must be done
+ * or not (is already being processed or not).
+ */
+ if (!handler.engageShutdown())
+ // Only do this once (prevent other thread to enter here again)
+ {
+ if (debugEnabled())
+ TRACER.debugInfo(
+ "In RS " + this.replicationServer.getMonitorInstanceName() +
+ " for " + baseDn + " " +
+ " stopServer " + handler.getMonitorInstanceName());
+ try
+ {
+ // Acquire lock on domain (see more details in comment of start()
+ // method of ServerHandler)
+ lock();
+ } catch (InterruptedException ex)
+ {
+ // Try doing job anyway...
+ }
if (handler.isReplicationServer())
{
if (replicationServers.containsValue(handler))
{
replicationServers.remove(handler.getServerId());
- handler.stopHandler();
+ handler.shutdown();
- // Update the remote replication servers with our list
- // of connected LDAP servers
- sendReplServerInfo();
+ // Check if generation id has to be resetted
+ mayResetGenerationId();
+ // Warn our DSs that a RS or DS has quit (does not use this
+ // handler as already removed from list)
+ sendTopoInfoToDSs(null);
}
- }
- else
+ } else
{
- if (connectedServers.containsValue(handler))
+ if (directoryServers.containsValue(handler))
{
- connectedServers.remove(handler.getServerId());
- handler.stopHandler();
+ // If this is the last DS for the domain, shutdown the status analyzer
+ if (directoryServers.size() == 1)
+ {
+ if (debugEnabled())
+ TRACER.debugInfo("In " +
+ replicationServer.getMonitorInstanceName() +
+ " remote server " + handler.getMonitorInstanceName() +
+ " is the last DS to be stopped: stopping status analyzer");
+ stopStatusAnalyzer();
+ }
+ directoryServers.remove(handler.getServerId());
+ handler.shutdown();
+
+ // Check if generation id has to be resetted
+ mayResetGenerationId();
// Update the remote replication servers with our list
// of connected LDAP servers
- sendReplServerInfo();
+ sendTopoInfoToRSs();
+ // Warn our DSs that a RS or DS has quit (does not use this
+ // handler as already removed from list)
+ sendTopoInfoToDSs(null);
}
}
+
+ release();
+ }
}
/**
@@ -403,7 +486,7 @@
// topology and the generationId has never been saved, then we can reset
// it and the next LDAP server to connect will become the new reference.
boolean lDAPServersConnectedInTheTopology = false;
- if (connectedServers.isEmpty())
+ if (directoryServers.isEmpty())
{
for (ServerHandler rsh : replicationServers.values())
{
@@ -411,12 +494,11 @@
{
if (debugEnabled())
TRACER.debugInfo(
- "In RS " + this.replicationServer.getMonitorInstanceName() +
- " for " + baseDn + " " +
- " mayResetGenerationId skip RS" + rsh.getMonitorInstanceName() +
- " thas different genId");
- }
- else
+ "In RS " + this.replicationServer.getMonitorInstanceName() +
+ " for " + baseDn + " " +
+ " mayResetGenerationId skip RS" + rsh.getMonitorInstanceName() +
+ " that has different genId");
+ } else
{
if (rsh.hasRemoteLDAPServers())
{
@@ -424,15 +506,15 @@
if (debugEnabled())
TRACER.debugInfo(
- "In RS " + this.replicationServer.getMonitorInstanceName() +
- " for " + baseDn + " " +
- " mayResetGenerationId RS" + rsh.getMonitorInstanceName() +
- " has servers connected to it - will not reset generationId");
+ "In RS " + this.replicationServer.getMonitorInstanceName() +
+ " for " + baseDn + " " +
+ " mayResetGenerationId RS" + rsh.getMonitorInstanceName() +
+ " has servers connected to it - will not reset generationId");
+ break;
}
}
}
- }
- else
+ } else
{
lDAPServersConnectedInTheTopology = true;
if (debugEnabled())
@@ -442,73 +524,59 @@
" has servers connected to it - will not reset generationId");
}
- if ((!lDAPServersConnectedInTheTopology) && (!this.generationIdSavedStatus)
- && (generationId != -1))
+ if ((!lDAPServersConnectedInTheTopology) &&
+ (!this.generationIdSavedStatus) &&
+ (generationId != -1))
{
setGenerationId(-1, false);
}
}
/**
- * Create initialize context necessary for finding the changes
- * that must be sent to a given replication server.
+ * Checks that a RS is not already connected.
*
- * @param handler the server ID to which we want to forward changes
- * @throws Exception in case of errors
- * @return A boolean indicating if the start was successfull.
+ * @param handler the RS we want to check
+ * @return true if this is not a duplicate server
*/
- public boolean startReplicationServer(ServerHandler handler) throws Exception
+ public boolean checkForDuplicateRS(ServerHandler handler)
{
- /*
- * create the balanced tree that will be used to forward changes
- */
- synchronized (replicationServers)
+ ServerHandler oldHandler = replicationServers.get(handler.getServerId());
+ if ((oldHandler != null))
{
- ServerHandler oldHandler = replicationServers.get(handler.getServerId());
- if ((oldHandler != null))
+ if (oldHandler.getServerAddressURL().equals(
+ handler.getServerAddressURL()))
{
- if (oldHandler.getServerAddressURL().equals(
- handler.getServerAddressURL()))
- {
- // this is the same server, this means that our ServerStart messages
- // have been sent at about the same time and 2 connections
- // have been established.
- // Silently drop this connection.
- }
- else
- {
- // looks like two replication servers have the same serverId
- // log an error message and drop this connection.
- Message message = ERR_DUPLICATE_REPLICATION_SERVER_ID.
- get(oldHandler.getServerAddressURL(),
- handler.getServerAddressURL(), handler.getServerId());
- logError(message);
- }
- return false;
+ // this is the same server, this means that our ServerStart messages
+ // have been sent at about the same time and 2 connections
+ // have been established.
+ // Silently drop this connection.
+ } else
+ {
+ // looks like two replication servers have the same serverId
+ // log an error message and drop this connection.
+ Message message = ERR_DUPLICATE_REPLICATION_SERVER_ID.get(
+ replicationServer.getMonitorInstanceName(), oldHandler.
+ getServerAddressURL(), handler.getServerAddressURL(),
+ handler.getServerId());
+ logError(message);
}
- replicationServers.put(handler.getServerId(), handler);
-
- // Update this server with the list of LDAP servers
- // already connected
- handler.sendInfo(
- new ReplServerInfoMessage(getConnectedLDAPservers(),generationId));
-
- return true;
+ return false;
}
+ return true;
}
-/**
- * Get the next update that need to be sent to a given LDAP server.
- * This call is blocking when no update is available or when dependencies
- * do not allow to send the next available change
- *
- * @param handler The server handler for the target directory server.
- *
- * @return the update that must be forwarded
- */
- public UpdateMessage take(ServerHandler handler)
+ /**
+ * Get the next update that need to be sent to a given LDAP server.
+ * This call is blocking when no update is available or when dependencies
+ * do not allow to send the next available change
+ *
+ * @param handler The server handler for the target directory server.
+ *
+ * @return the update that must be forwarded
+ */
+ public UpdateMsg take(ServerHandler handler)
{
- UpdateMessage msg;
+ UpdateMsg msg;
/*
* Get the balanced tree that we use to sort the changes to be
* sent to the replica from the cookie
@@ -547,7 +615,6 @@
return mySet;
}
-
/**
* Return a Set containing the servers known by this replicationServer.
* @return a set containing the servers known by this replicationServer.
@@ -567,7 +634,7 @@
{
List<String> mySet = new ArrayList<String>(0);
- for (ServerHandler handler : connectedServers.values())
+ for (ServerHandler handler : directoryServers.values())
{
mySet.add(String.valueOf(handler.getServerId()));
}
@@ -577,7 +644,7 @@
/**
* Creates and returns an iterator.
* When the iterator is not used anymore, the caller MUST call the
- * ReplicationIterator.releaseCursor() method to free the ressources
+ * ReplicationIterator.releaseCursor() method to free the resources
* and locks used by the ReplicationIterator.
*
* @param serverId Identifier of the server for which the iterator is created.
@@ -586,7 +653,7 @@
* for the provided server Id.
*/
public ReplicationIterator getChangelogIterator(short serverId,
- ChangeNumber changeNumber)
+ ChangeNumber changeNumber)
{
DbHandler handler = sourceDbHandlers.get(serverId);
if (handler == null)
@@ -595,10 +662,9 @@
try
{
return handler.generateIterator(changeNumber);
- }
- catch (Exception e)
+ } catch (Exception e)
{
- return null;
+ return null;
}
}
@@ -630,17 +696,17 @@
* Sets the provided DbHandler associated to the provided serverId.
*
* @param serverId the serverId for the server to which is
- * associated the Dbhandler.
+ * associated the DbHandler.
* @param dbHandler the dbHandler associated to the serverId.
*
* @throws DatabaseException If a database error happened.
*/
public void setDbHandler(short serverId, DbHandler dbHandler)
- throws DatabaseException
+ throws DatabaseException
{
synchronized (sourceDbHandlers)
{
- sourceDbHandlers.put(serverId , dbHandler);
+ sourceDbHandlers.put(serverId, dbHandler);
}
}
@@ -651,30 +717,29 @@
*/
private int NumServers()
{
- return replicationServers.size() + connectedServers.size();
+ return replicationServers.size() + directoryServers.size();
}
-
/**
* Add an ack to the list of ack received for a given change.
*
* @param message The ack message received.
* @param fromServerId The identifier of the server that sent the ack.
*/
- public void ack(AckMessage message, short fromServerId)
+ public void ack(AckMsg message, short fromServerId)
{
/*
* there are 2 possible cases here :
* - the message that was acked comes from a server to which
* we are directly connected.
- * In this case, we can find the handler from the connectedServers map
+ * In this case, we can find the handler from the directoryServers map
* - the message that was acked comes from a server to which we are not
* connected.
* In this case we need to find the replication server that forwarded
* the change and send back the ack to this server.
*/
- ServerHandler handler = connectedServers.get(
- message.getChangeNumber().getServerId());
+ ServerHandler handler = directoryServers.get(
+ message.getChangeNumber().getServerId());
if (handler != null)
handler.ack(message, fromServerId);
else
@@ -690,17 +755,16 @@
* @param senderHandler The handler of the server that published this message.
* @return The list of destination handlers.
*/
- protected List<ServerHandler> getDestinationServers(RoutableMessage msg,
- ServerHandler senderHandler)
+ protected List<ServerHandler> getDestinationServers(RoutableMsg msg,
+ ServerHandler senderHandler)
{
List<ServerHandler> servers =
new ArrayList<ServerHandler>();
- if (msg.getDestination() == RoutableMessage.THE_CLOSEST_SERVER)
+ if (msg.getDestination() == RoutableMsg.THE_CLOSEST_SERVER)
{
// TODO Import from the "closest server" to be implemented
- }
- else if (msg.getDestination() == RoutableMessage.ALL_SERVERS)
+ } else if (msg.getDestination() == RoutableMsg.ALL_SERVERS)
{
if (!senderHandler.isReplicationServer())
{
@@ -716,24 +780,22 @@
}
// Sends to all connected LDAP servers
- for (ServerHandler destinationHandler : connectedServers.values())
+ for (ServerHandler destinationHandler : directoryServers.values())
{
// Don't loop on the sender
if (destinationHandler == senderHandler)
continue;
servers.add(destinationHandler);
}
- }
- else
+ } else
{
// Destination is one server
ServerHandler destinationHandler =
- connectedServers.get(msg.getDestination());
+ directoryServers.get(msg.getDestination());
if (destinationHandler != null)
{
servers.add(destinationHandler);
- }
- else
+ } else
{
// the targeted server is NOT connected
// Let's search for THE changelog server that MAY
@@ -763,50 +825,49 @@
* @param senderHandler The server handler of the server that emitted
* the message.
*/
- public void process(RoutableMessage msg, ServerHandler senderHandler)
+ public void process(RoutableMsg msg, ServerHandler senderHandler)
{
// Test the message for which a ReplicationServer is expected
// to be the destination
if (msg.getDestination() == this.replicationServer.getServerId())
{
- if (msg instanceof ErrorMessage)
+ if (msg instanceof ErrorMsg)
{
- ErrorMessage errorMsg = (ErrorMessage)msg;
+ ErrorMsg errorMsg = (ErrorMsg) msg;
logError(ERR_ERROR_MSG_RECEIVED.get(
- errorMsg.getDetails()));
- }
- else if (msg instanceof MonitorRequestMessage)
+ errorMsg.getDetails()));
+ } else if (msg instanceof MonitorRequestMsg)
{
- MonitorRequestMessage replServerMonitorRequestMsg =
- (MonitorRequestMessage) msg;
+ MonitorRequestMsg replServerMonitorRequestMsg =
+ (MonitorRequestMsg) msg;
- MonitorMessage monitorMsg =
- new MonitorMessage(
- replServerMonitorRequestMsg.getDestination(),
- replServerMonitorRequestMsg.getsenderID());
+ MonitorMsg monitorMsg =
+ new MonitorMsg(
+ replServerMonitorRequestMsg.getDestination(),
+ replServerMonitorRequestMsg.getsenderID());
// Populate for each connected LDAP Server
// from the states stored in the serverHandler.
// - the server state
// - the older missing change
- for (ServerHandler lsh : this.connectedServers.values())
+ for (ServerHandler lsh : this.directoryServers.values())
{
monitorMsg.setServerState(
- lsh.getServerId(),
- lsh.getServerState(),
- lsh.getApproxFirstMissingDate(),
- true);
+ lsh.getServerId(),
+ lsh.getServerState(),
+ lsh.getApproxFirstMissingDate(),
+ true);
}
// Same for the connected RS
for (ServerHandler rsh : this.replicationServers.values())
{
monitorMsg.setServerState(
- rsh.getServerId(),
- rsh.getServerState(),
- rsh.getApproxFirstMissingDate(),
- false);
+ rsh.getServerId(),
+ rsh.getServerState(),
+ rsh.getApproxFirstMissingDate(),
+ false);
}
// Populate the RS state in the msg from the DbState
@@ -816,26 +877,23 @@
try
{
senderHandler.send(monitorMsg);
- }
- catch(Exception e)
+ } catch (Exception e)
{
// We log the error. The requestor will detect a timeout or
// any other failure on the connection.
logError(ERR_CHANGELOG_ERROR_SENDING_MSG.get(
- Short.toString((msg.getDestination()))));
+ Short.toString((msg.getDestination()))));
}
- }
- else if (msg instanceof MonitorMessage)
+ } else if (msg instanceof MonitorMsg)
{
- MonitorMessage monitorMsg =
- (MonitorMessage) msg;
+ MonitorMsg monitorMsg =
+ (MonitorMsg) msg;
receivesMonitorDataResponse(monitorMsg);
- }
- else
+ } else
{
logError(NOTE_ERR_ROUTING_TO_SERVER.get(
- msg.getClass().getCanonicalName()));
+ msg.getClass().getCanonicalName()));
}
return;
}
@@ -846,21 +904,20 @@
{
MessageBuilder mb = new MessageBuilder();
mb.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get());
- mb.append(" In Replication Server=" + this.replicationServer.
- getMonitorInstanceName());
+ mb.append(" In Replication Server=" +
+ this.replicationServer.getMonitorInstanceName());
mb.append(" domain =" + this.baseDn);
mb.append(" unroutable message =" + msg.toString());
mb.append(" routing table is empty");
- ErrorMessage errMsg = new ErrorMessage(
- this.replicationServer.getServerId(),
- msg.getsenderID(),
- mb.toMessage());
+ ErrorMsg errMsg = new ErrorMsg(
+ this.replicationServer.getServerId(),
+ msg.getsenderID(),
+ mb.toMessage());
logError(mb.toMessage());
try
{
senderHandler.send(errMsg);
- }
- catch(IOException ioe)
+ } catch (IOException ioe)
{
// TODO Handle error properly (sender timeout in addition)
/*
@@ -871,18 +928,16 @@
mb2.append(ERR_CHANGELOG_ERROR_SENDING_ERROR.get(this.toString()));
mb2.append(stackTraceToSingleLineString(ioe));
logError(mb2.toMessage());
- senderHandler.shutdown();
+ stopServer(senderHandler);
}
- }
- else
+ } else
{
for (ServerHandler targetHandler : servers)
{
try
{
targetHandler.send(msg);
- }
- catch(IOException ioe)
+ } catch (IOException ioe)
{
/*
* An error happened trying the send a routabled message
@@ -899,733 +954,1141 @@
MessageBuilder mb1 = new MessageBuilder();
mb1.append(ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get());
mb1.append("serverID:" + msg.getDestination());
- ErrorMessage errMsg = new ErrorMessage(
- msg.getsenderID(), mb1.toMessage());
+ ErrorMsg errMsg = new ErrorMsg(
+ msg.getsenderID(), mb1.toMessage());
try
{
senderHandler.send(errMsg);
- }
- catch(IOException ioe1)
+ } catch (IOException ioe1)
{
// an error happened on the sender session trying to recover
// from an error on the receiver session.
// We don't have much solution left beside closing the sessions.
- senderHandler.shutdown();
- targetHandler.shutdown();
+ stopServer(senderHandler);
+ stopServer(targetHandler);
}
- // TODO Handle error properly (sender timeout in addition)
+ // TODO Handle error properly (sender timeout in addition)
}
}
}
}
- /**
- * Send back an ack to the server that sent the change.
- *
- * @param changeNumber The ChangeNumber of the change that must be acked.
- * @param isLDAPserver This boolean indicates if the server that sent the
- * change was an LDAP server or a ReplicationServer.
- */
- public void sendAck(ChangeNumber changeNumber, boolean isLDAPserver)
+ /**
+ * Send back an ack to the server that sent the change.
+ *
+ * @param changeNumber The ChangeNumber of the change that must be acked.
+ * @param isLDAPserver This boolean indicates if the server that sent the
+ * change was an LDAP server or a ReplicationServer.
+ */
+ public void sendAck(ChangeNumber changeNumber, boolean isLDAPserver)
+ {
+ short serverId = changeNumber.getServerId();
+ sendAck(changeNumber, isLDAPserver, serverId);
+ }
+
+ /**
+ *
+ * Send back an ack to a server that sent the change.
+ *
+ * @param changeNumber The ChangeNumber of the change that must be acked.
+ * @param isLDAPserver This boolean indicates if the server that sent the
+ * change was an LDAP server or a ReplicationServer.
+ * @param serverId The identifier of the server from which we
+ * received the change..
+ */
+ public void sendAck(ChangeNumber changeNumber, boolean isLDAPserver,
+ short serverId)
+ {
+ ServerHandler handler;
+ if (isLDAPserver)
+ handler = directoryServers.get(serverId);
+ else
+ handler = replicationServers.get(serverId);
+
+ // TODO : check for null handler and log error
+ try
{
- short serverId = changeNumber.getServerId();
- sendAck(changeNumber, isLDAPserver, serverId);
+ handler.sendAck(changeNumber);
+ } catch (IOException e)
+ {
+ /*
+ * An error happened trying the send back an ack to this server.
+ * Log an error and close the connection to this server.
+ */
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(ERR_CHANGELOG_ERROR_SENDING_ACK.get(this.toString()));
+ mb.append(stackTraceToSingleLineString(e));
+ logError(mb.toMessage());
+ stopServer(handler);
+ }
+ }
+
+ /**
+ * Shutdown this ReplicationServerDomain.
+ */
+ public void shutdown()
+ {
+ // Close session with other changelogs
+ for (ServerHandler serverHandler : replicationServers.values())
+ {
+ stopServer(serverHandler);
}
- /**
- *
- * Send back an ack to a server that sent the change.
- *
- * @param changeNumber The ChangeNumber of the change that must be acked.
- * @param isLDAPserver This boolean indicates if the server that sent the
- * change was an LDAP server or a ReplicationServer.
- * @param serverId The identifier of the server from which we
- * received the change..
- */
- public void sendAck(ChangeNumber changeNumber, boolean isLDAPserver,
- short serverId)
+ // Close session with other LDAP servers
+ for (ServerHandler serverHandler : directoryServers.values())
{
- ServerHandler handler;
- if (isLDAPserver)
- handler = connectedServers.get(serverId);
- else
- handler = replicationServers.get(serverId);
+ stopServer(serverHandler);
+ }
- // TODO : check for null handler and log error
+ // Shutdown the dbHandlers
+ synchronized (sourceDbHandlers)
+ {
+ for (DbHandler dbHandler : sourceDbHandlers.values())
+ {
+ dbHandler.shutdown();
+ }
+ sourceDbHandlers.clear();
+ }
+ }
+
+ /**
+ * Returns the ServerState describing the last change from this replica.
+ *
+ * @return The ServerState describing the last change from this replica.
+ */
+ public ServerState getDbServerState()
+ {
+ ServerState serverState = new ServerState();
+ for (DbHandler db : sourceDbHandlers.values())
+ {
+ serverState.update(db.getLastChange());
+ }
+ return serverState;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return "ReplicationServerDomain " + baseDn;
+ }
+
+ /**
+ * Check if some server Handler should be removed from flow control state.
+ * @throws IOException If an error happened.
+ */
+ public void checkAllSaturation() throws IOException
+ {
+ for (ServerHandler handler : replicationServers.values())
+ {
+ handler.checkWindow();
+ }
+
+ for (ServerHandler handler : directoryServers.values())
+ {
+ handler.checkWindow();
+ }
+ }
+
+ /**
+ * Check if a server that was in flow control can now restart
+ * sending updates.
+ * @param sourceHandler The server that must be checked.
+ * @return true if the server can restart sending changes.
+ * false if the server can't restart sending changes.
+ */
+ public boolean restartAfterSaturation(ServerHandler sourceHandler)
+ {
+ for (ServerHandler handler : replicationServers.values())
+ {
+ if (!handler.restartAfterSaturation(sourceHandler))
+ return false;
+ }
+
+ for (ServerHandler handler : directoryServers.values())
+ {
+ if (!handler.restartAfterSaturation(sourceHandler))
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Send a TopologyMsg to all the connected directory servers in order to
+ * let.
+ * them know the topology (every known DSs and RSs)
+ * @param notThisOne If not null, the topology message will not be sent to
+ * this passed server.
+ */
+ public void sendTopoInfoToDSs(ServerHandler notThisOne)
+ {
+ for (ServerHandler handler : directoryServers.values())
+ {
+ if ((notThisOne == null) || // All DSs requested
+ ((notThisOne != null) && (handler != notThisOne)))
+ // All except passed one
+ {
+ TopologyMsg topoMsg = createTopologyMsgForDS(handler.getServerId());
+ try
+ {
+ handler.sendTopoInfo(topoMsg);
+ } catch (IOException e)
+ {
+ Message message = ERR_EXCEPTION_SENDING_TOPO_INFO.get(
+ baseDn.toString(),
+ "directory", Short.toString(handler.getServerId()), e.getMessage());
+ logError(message);
+ }
+ }
+ }
+ }
+
+ /**
+ * Send a TopologyMsg to all the connected replication servers
+ * in order to let them know our connected LDAP servers.
+ */
+ public void sendTopoInfoToRSs()
+ {
+ TopologyMsg topoMsg = createTopologyMsgForRS();
+ for (ServerHandler handler : replicationServers.values())
+ {
try
{
- handler.sendAck(changeNumber);
+ handler.sendTopoInfo(topoMsg);
} catch (IOException e)
{
- /*
- * An error happened trying the send back an ack to this server.
- * Log an error and close the connection to this server.
- */
- MessageBuilder mb = new MessageBuilder();
- mb.append(ERR_CHANGELOG_ERROR_SENDING_ACK.get(this.toString()));
- mb.append(stackTraceToSingleLineString(e));
- logError(mb.toMessage());
- handler.shutdown();
+ Message message = ERR_EXCEPTION_SENDING_TOPO_INFO.get(
+ baseDn.toString(),
+ "replication", Short.toString(handler.getServerId()),
+ e.getMessage());
+ logError(message);
+ }
+ }
+ }
+
+ /**
+ * Creates a TopologyMsg filled with information to be sent to a remote RS.
+ * We send remote RS the info of every DS that are directly connected to us
+ * plus our own info as RS.
+ * @return A suitable TopologyMsg PDU to be sent to a peer RS
+ */
+ public TopologyMsg createTopologyMsgForRS()
+ {
+ List<DSInfo> dsInfos = new ArrayList<DSInfo>();
+
+ // Go through every DSs
+ for (ServerHandler serverHandler : directoryServers.values())
+ {
+ dsInfos.add(serverHandler.toDSInfo());
+ }
+
+ // Create info for us (local RS)
+ List<RSInfo> rsInfos = new ArrayList<RSInfo>();
+ RSInfo localRSInfo = new RSInfo(replicationServer.getServerId(),
+ generationId, replicationServer.getGroupId());
+ rsInfos.add(localRSInfo);
+
+ return new TopologyMsg(dsInfos, rsInfos);
+ }
+
+ /**
+ * Creates a TopologyMsg filled with information to be sent to a DS.
+ * We send remote DS the info of every known DS and RS in the topology (our
+ * directly connected DSs plus the DSs connected to other RSs) except himself.
+ * Also put info related to local RS.
+ *
+ * @param destDsId The id of the DS the TopologyMsg PDU is to be sent to and
+ * that we must not include in the list DS list.
+ * @return A suitable TopologyMsg PDU to be sent to a peer DS
+ */
+ public TopologyMsg createTopologyMsgForDS(short destDsId)
+ {
+ List<DSInfo> dsInfos = new ArrayList<DSInfo>();
+ List<RSInfo> rsInfos = new ArrayList<RSInfo>();
+
+ // Go through every DSs (except recipient of msg)
+ for (ServerHandler serverHandler : directoryServers.values())
+ {
+ if (serverHandler.getServerId() == destDsId)
+ continue;
+ dsInfos.add(serverHandler.toDSInfo());
+ }
+
+ // Add our own info (local RS)
+ RSInfo localRSInfo = new RSInfo(replicationServer.getServerId(),
+ generationId, replicationServer.getGroupId());
+ rsInfos.add(localRSInfo);
+
+ // Go through every peer RSs (and get their connected DSs), also add info
+ // for RSs
+ for (ServerHandler serverHandler : replicationServers.values())
+ {
+ // Put RS info
+ rsInfos.add(serverHandler.toRSInfo());
+ // Put his DSs info
+ Map<Short, LightweightServerHandler> lsList =
+ serverHandler.getConnectedDSs();
+ for (LightweightServerHandler ls : lsList.values())
+ {
+ dsInfos.add(ls.toDSInfo());
}
}
- /**
- * Shutdown this ReplicationServerDomain.
- */
- public void shutdown()
+ return new TopologyMsg(dsInfos, rsInfos);
+ }
+
+ /**
+ * Get the generationId associated to this domain.
+ *
+ * @return The generationId
+ */
+ public long getGenerationId()
+ {
+ return generationId;
+ }
+
+ /**
+ * Get the generationId saved status.
+ *
+ * @return The generationId saved status.
+ */
+ public boolean getGenerationIdSavedStatus()
+ {
+ return generationIdSavedStatus;
+ }
+
+ /**
+ * Sets the provided value as the new in memory generationId.
+ *
+ * @param generationId The new value of generationId.
+ * @param savedStatus The saved status of the generationId.
+ * @return The old generation id
+ */
+ synchronized public long setGenerationId(long generationId,
+ boolean savedStatus)
+ {
+ if (debugEnabled())
+ TRACER.debugInfo(
+ "In " + this.replicationServer.getMonitorInstanceName() +
+ " baseDN=" + baseDn +
+ " RCache.set GenerationId=" + generationId);
+
+ long oldGenerationId = this.generationId;
+
+ if (this.generationId != generationId)
{
- // Close session with other changelogs
- for (ServerHandler serverHandler : replicationServers.values())
- {
- serverHandler.shutdown();
- }
+ // we are changing of genId
+ clearDbs();
- // Close session with other LDAP servers
- for (ServerHandler serverHandler : connectedServers.values())
- {
- serverHandler.shutdown();
- }
+ this.generationId = generationId;
+ this.generationIdSavedStatus = savedStatus;
+ }
- // Shutdown the dbHandlers
- synchronized (sourceDbHandlers)
+ return oldGenerationId;
+ }
+
+ /**
+ * Resets the generationID.
+ *
+ * @param senderHandler The handler associated to the server
+ * that requested to reset the generationId.
+ * @param genIdMsg The reset generation ID msg received.
+ */
+ public void resetGenerationId(ServerHandler senderHandler,
+ ResetGenerationIdMsg genIdMsg)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugInfo(
+ "In RS " + getReplicationServer().getServerId() +
+ " Receiving ResetGenerationIdMsg from " + senderHandler.getServerId() +
+ " for baseDn " + baseDn + ":\n" + genIdMsg);
+ }
+
+ try
+ {
+ // Acquire lock on domain (see more details in comment of start() method
+ // of ServerHandler)
+ lock();
+ } catch (InterruptedException ex)
+ {
+ // Try doing job anyway...
+ }
+
+ long newGenId = genIdMsg.getGenerationId();
+
+ if (newGenId != this.generationId)
+ {
+ setGenerationId(newGenId, false);
+ }
+ else
+ {
+ // Order to take a gen id we already have, just ignore
+ if (debugEnabled())
{
- for (DbHandler dbHandler : sourceDbHandlers.values())
+ TRACER.debugInfo(
+ "In RS " + getReplicationServer().getServerId()
+ + " Reset generation id requested for baseDn " + baseDn
+ + " but generation id was already " + this.generationId
+ + ":\n" + genIdMsg);
+ }
+ }
+
+ // If we are the first replication server warned,
+ // then forwards the reset message to the remote replication servers
+ for (ServerHandler rsHandler : replicationServers.values())
+ {
+ try
+ {
+ // After we'll have sent the message , the remote RS will adopt
+ // the new genId
+ rsHandler.setGenerationId(newGenId);
+ if (senderHandler.isLDAPserver())
{
- dbHandler.shutdown();
+ rsHandler.forwardGenerationIdToRS(genIdMsg);
}
- sourceDbHandlers.clear();
+ } catch (IOException e)
+ {
+ logError(ERR_EXCEPTION_FORWARDING_RESET_GEN_ID.get(baseDn.toString(),
+ e.getMessage()));
}
}
- /**
- * Returns the ServerState describing the last change from this replica.
- *
- * @return The ServerState describing the last change from this replica.
- */
- public ServerState getDbServerState()
+ // Change status of the connected DSs according to the requested new
+ // reference generation id
+ for (ServerHandler dsHandler : directoryServers.values())
{
- ServerState serverState = new ServerState();
- for (DbHandler db : sourceDbHandlers.values())
+ try
{
- serverState.update(db.getLastChange());
- }
- return serverState;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString()
- {
- return "ReplicationServerDomain " + baseDn;
- }
-
- /**
- * Check if some server Handler should be removed from flow control state.
- * @throws IOException If an error happened.
- */
- public void checkAllSaturation() throws IOException
- {
- for (ServerHandler handler : replicationServers.values())
+ dsHandler.changeStatusForResetGenId(newGenId);
+ } catch (IOException e)
{
- handler.checkWindow();
- }
-
- for (ServerHandler handler : connectedServers.values())
- {
- handler.checkWindow();
+ logError(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID.get(baseDn.
+ toString(),
+ Short.toString(dsHandler.getServerId()),
+ e.getMessage()));
}
}
- /**
- * Check if a server that was in flow control can now restart
- * sending updates.
- * @param sourceHandler The server that must be checked.
- * @return true if the server can restart sending changes.
- * false if the server can't restart sending changes.
- */
- public boolean restartAfterSaturation(ServerHandler sourceHandler)
- {
- for (ServerHandler handler : replicationServers.values())
- {
- if (!handler.restartAfterSaturation(sourceHandler))
- return false;
- }
+ // Update every peers (RS/DS) with potential topology changes (status
+ // change). Rather than doing that each time a DS has a status change
+ // (consecutive to reset gen id message), we prefer advertising once for
+ // all after changes (less packet sent), here at the end of the reset msg
+ // treatment.
+ sendTopoInfoToDSs(null);
+ sendTopoInfoToRSs();
- for (ServerHandler handler : connectedServers.values())
- {
- if (!handler.restartAfterSaturation(sourceHandler))
- return false;
- }
+ Message message = NOTE_RESET_GENERATION_ID.get(baseDn.toString(),
+ Long.toString(newGenId));
+ logError(message);
+
+ release();
+ }
+
+ /**
+ * Process message of a remote server changing his status.
+ * @param senderHandler The handler associated to the server
+ * that changed his status.
+ * @param csMsg The message containing the new status
+ */
+ public void processNewStatus(ServerHandler senderHandler,
+ ChangeStatusMsg csMsg)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugInfo(
+ "In RS " + getReplicationServer().getServerId() +
+ " Receiving ChangeStatusMsg from " + senderHandler.getServerId() +
+ " for baseDn " + baseDn + ":\n" + csMsg);
+ }
+
+ try
+ {
+ // Acquire lock on domain (see more details in comment of start() method
+ // of ServerHandler)
+ lock();
+ } catch (InterruptedException ex)
+ {
+ // Try doing job anyway...
+ }
+
+ ServerStatus newStatus = senderHandler.processNewStatus(csMsg);
+ if (newStatus == ServerStatus.INVALID_STATUS)
+ {
+ // Already logged an error in processNewStatus()
+ // just return not to forward a bad status to topology
+ release();
+ return;
+ }
+
+ // Update every peers (RS/DS) with topology changes
+ sendTopoInfoToDSs(senderHandler);
+ sendTopoInfoToRSs();
+
+ Message message = NOTE_DIRECTORY_SERVER_CHANGED_STATUS.get(
+ Short.toString(senderHandler.getServerId()),
+ baseDn.toString(),
+ newStatus.toString());
+ logError(message);
+
+ release();
+ }
+
+ /**
+ * Change the status of a directory server according to the event generated
+ * from the status analyzer.
+ * @param serverHandler The handler of the directory server to update
+ * @param event The event to be used for new status computation
+ * @return True if we have been interrupted (must stop), false otherwise
+ */
+ public boolean changeStatusFromStatusAnalyzer(ServerHandler serverHandler,
+ StatusMachineEvent event)
+ {
+ try
+ {
+ // Acquire lock on domain (see more details in comment of start() method
+ // of ServerHandler)
+ lock();
+ } catch (InterruptedException ex)
+ {
+ // We have been interrupted for dying, from stopStatusAnalyzer
+ // to prevent deadlock in this situation:
+ // RS is being shutdown, and stopServer will call stopStatusAnalyzer.
+ // Domain lock is taken by shutdown thread while status analyzer thread
+ // is willing to change the status of a server at the same time so is
+ // waiting for the domain lock at the same time. As shutdown thread is
+ // waiting for analyzer thread death, a deadlock occurs. So we force
+ // interruption of the status analyzer thread death after 2 seconds if
+ // it has not finished (see StatusAnalyzer.waitForShutdown). This allows
+ // to have the analyzer thread taking the domain lock only when the status
+ // of a DS has to be changed. See more comments in run method of
+ // StatusAnalyzer.
+ if (debugEnabled())
+ TRACER.debugInfo(
+ "Status analyzer for domain " + baseDn + " has been interrupted when"
+ + " trying to acquire domain lock for changing the status of DS " +
+ serverHandler.getServerId());
return true;
}
- /**
- * Send a ReplServerInfoMessage to all the connected replication servers
- * in order to let them know our connected LDAP servers.
- */
- private void sendReplServerInfo()
+ ServerStatus newStatus = ServerStatus.INVALID_STATUS;
+ ServerStatus oldStatus = serverHandler.getStatus();
+ try
{
- ReplServerInfoMessage info =
- new ReplServerInfoMessage(getConnectedLDAPservers(), generationId);
- for (ServerHandler handler : replicationServers.values())
+ newStatus = serverHandler.changeStatusFromStatusAnalyzer(event);
+ } catch (IOException e)
+ {
+ logError(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER.get(baseDn.
+ toString(),
+ Short.toString(serverHandler.getServerId()),
+ e.getMessage()));
+ }
+
+ if ( (newStatus == ServerStatus.INVALID_STATUS) ||
+ (newStatus == oldStatus) )
+ {
+ // Change was impossible or already occurred (see StatusAnalyzer comments)
+ release();
+ return false;
+ }
+
+ // Update every peers (RS/DS) with topology changes
+ sendTopoInfoToDSs(serverHandler);
+ sendTopoInfoToRSs();
+
+ release();
+ return false;
+ }
+
+ /**
+ * Clears the Db associated with that cache.
+ */
+ public void clearDbs()
+ {
+ // Reset the localchange and state db for the current domain
+ synchronized (sourceDbHandlers)
+ {
+ for (DbHandler dbHandler : sourceDbHandlers.values())
{
try
{
- handler.sendInfo(info);
- }
- catch (IOException e)
+ dbHandler.clear();
+ } catch (Exception e)
{
- /*
- * An error happened trying the send back an ack to this server.
- * Log an error and close the connection to this server.
- */
+ // TODO: i18n
MessageBuilder mb = new MessageBuilder();
- mb.append(ERR_CHANGELOG_ERROR_SENDING_INFO.get(this.toString()));
- mb.append(stackTraceToSingleLineString(e));
+ mb.append(ERR_ERROR_CLEARING_DB.get(dbHandler.toString(),
+ e.getMessage() + " " +
+ stackTraceToSingleLineString(e)));
logError(mb.toMessage());
- handler.shutdown();
}
}
- }
+ sourceDbHandlers.clear();
- /**
- * Get the generationId associated to this domain.
- *
- * @return The generationId
- */
- public long getGenerationId()
- {
- return generationId;
- }
-
- /**
- * Get the generationId saved status.
- *
- * @return The generationId saved status.
- */
- public boolean getGenerationIdSavedStatus()
- {
- return generationIdSavedStatus;
- }
-
- /**
- * Sets the provided value as the new in memory generationId.
- *
- * @param generationId The new value of generationId.
- * @param savedStatus The saved status of the generationId.
- */
- synchronized public void setGenerationId(long generationId,
- boolean savedStatus)
- {
if (debugEnabled())
TRACER.debugInfo(
"In " + this.replicationServer.getMonitorInstanceName() +
" baseDN=" + baseDn +
- " RCache.set GenerationId=" + generationId);
-
- if (this.generationId != generationId)
- {
- // we are changing of genId
- clearDbs();
-
- this.generationId = generationId;
- this.generationIdSavedStatus = savedStatus;
-
- // they have a generationId different from the reference one
- for (ServerHandler handler : connectedServers.values())
- {
- if (generationId != handler.getGenerationId())
- {
- // Notify our remote LS that from now on have a different genID
- handler.warnBadGenerationId();
- }
- }
- }
- }
-
- /**
- * Resets the generationID.
- *
- * @param senderHandler The handler associated to the server
- * that requested to reset the generationId.
- * @param genIdMsg The reset generation ID msg received.
- */
- public void resetGenerationId(ServerHandler senderHandler,
- ResetGenerationId genIdMsg)
- {
- long newGenId = genIdMsg.getGenerationId();
-
- if (newGenId != this.generationId)
- {
- this.setGenerationId(newGenId, false);
- }
-
- // If we are the first replication server warned,
- // then forwards the reset message to the remote replication servers
- for (ServerHandler rsHandler : replicationServers.values())
- {
- try
- {
- // After we'll have send the mssage , the remote RS will adopt
- // the new genId
- rsHandler.setGenerationId(newGenId);
- if (senderHandler.isLDAPserver())
- {
- rsHandler.forwardGenerationIdToRS(genIdMsg);
- }
- }
- catch (IOException e)
- {
- logError(ERR_CHANGELOG_ERROR_SENDING_INFO.
- get(rsHandler.getMonitorInstanceName()));
- }
- }
- }
-
- /**
- * Clears the Db associated with that cache.
- */
- public void clearDbs()
- {
- // Reset the localchange and state db for the current domain
- synchronized (sourceDbHandlers)
- {
- for (DbHandler dbHandler : sourceDbHandlers.values())
- {
- try
- {
- dbHandler.clear();
- }
- catch (Exception e)
- {
- // TODO: i18n
- MessageBuilder mb = new MessageBuilder();
- mb.append(ERR_ERROR_CLEARING_DB.get(dbHandler.toString(),
- e.getMessage() + " " +
- stackTraceToSingleLineString(e)));
- logError(mb.toMessage());
- }
- }
- sourceDbHandlers.clear();
-
- if (debugEnabled())
- TRACER.debugInfo(
- "In " + this.replicationServer.getMonitorInstanceName() +
- " baseDN=" + baseDn +
" The source db handler has been cleared");
- }
- try
- {
- replicationServer.clearGenerationId(baseDn);
- }
- catch (Exception e)
- {
- // TODO: i18n
- logError(Message.raw(
- "Exception caught while clearing generationId:" +
- e.getLocalizedMessage()));
- }
}
-
- /**
- * Returns whether the provided server is in degraded
- * state due to the fact that the peer server has an invalid
- * generationId for this domain.
- *
- * @param serverId The serverId for which we want to know the
- * the state.
- * @return Whether it is degraded or not.
- */
-
- public boolean isDegradedDueToGenerationId(short serverId)
+ try
{
- if (debugEnabled())
- TRACER.debugInfo(
- "In " + this.replicationServer.getMonitorInstanceName() +
- " baseDN=" + baseDn +
- " isDegraded serverId=" + serverId +
- " given local generation Id=" + this.generationId);
+ replicationServer.clearGenerationId(baseDn);
+ } catch (Exception e)
+ {
+ // TODO: i18n
+ logError(Message.raw(
+ "Exception caught while clearing generationId:" +
+ e.getLocalizedMessage()));
+ }
+ }
- ServerHandler handler = replicationServers.get(serverId);
+ /**
+ * Returns whether the provided server is in degraded
+ * state due to the fact that the peer server has an invalid
+ * generationId for this domain.
+ *
+ * @param serverId The serverId for which we want to know the
+ * the state.
+ * @return Whether it is degraded or not.
+ */
+ public boolean isDegradedDueToGenerationId(short serverId)
+ {
+ if (debugEnabled())
+ TRACER.debugInfo(
+ "In " + this.replicationServer.getMonitorInstanceName() +
+ " baseDN=" + baseDn +
+ " isDegraded serverId=" + serverId +
+ " given local generation Id=" + this.generationId);
+
+ ServerHandler handler = replicationServers.get(serverId);
+ if (handler == null)
+ {
+ handler = directoryServers.get(serverId);
if (handler == null)
{
- handler = connectedServers.get(serverId);
- if (handler == null)
- {
- return false;
- }
+ return false;
}
-
- if (debugEnabled())
- TRACER.debugInfo(
- "In " + this.replicationServer.getMonitorInstanceName() +
- " baseDN=" + baseDn +
- " Compute degradation of serverId=" + serverId +
- " LS server generation Id=" + handler.getGenerationId());
- return (handler.getGenerationId() != this.generationId);
}
- /**
- * Return the associated replication server.
- * @return The replication server.
- */
- public ReplicationServer getReplicationServer()
+ if (debugEnabled())
+ TRACER.debugInfo(
+ "In " + this.replicationServer.getMonitorInstanceName() +
+ " baseDN=" + baseDn +
+ " Compute degradation of serverId=" + serverId +
+ " LS server generation Id=" + handler.getGenerationId());
+ return (handler.getGenerationId() != this.generationId);
+ }
+
+ /**
+ * Return the associated replication server.
+ * @return The replication server.
+ */
+ public ReplicationServer getReplicationServer()
+ {
+ return replicationServer;
+ }
+
+ /**
+ * Process topology information received from a peer RS.
+ * @param topoMsg The just received topo message from remote RS
+ * @param handler The handler that received the message.
+ * @param allowResetGenId True for allowing to reset the generation id (
+ * when called after initial handshake)
+ * @throws IOException If an error occurred.
+ */
+ public void receiveTopoInfoFromRS(TopologyMsg topoMsg, ServerHandler handler,
+ boolean allowResetGenId)
+ throws IOException
+ {
+ if (debugEnabled())
{
- return replicationServer;
+ TRACER.debugInfo(
+ "In RS " + getReplicationServer().getServerId() +
+ " Receiving TopologyMsg from " + handler.getServerId() +
+ " for baseDn " + baseDn + ":\n" + topoMsg);
}
- /**
- * Process reception of a ReplServerInfoMessage.
- *
- * @param infoMsg The received message.
- * @param handler The handler that received the message.
- * @throws IOException when raised by the underlying session.
- */
- public void receiveReplServerInfo(
- ReplServerInfoMessage infoMsg, ServerHandler handler) throws IOException
+ try
{
- if (debugEnabled())
- {
- if (handler.isReplicationServer())
- TRACER.debugInfo(
- "In RS " + getReplicationServer().getServerId() +
- " Receiving replServerInfo from " + handler.getServerId() +
- " baseDn=" + baseDn +
- " genId=" + infoMsg.getGenerationId());
- }
+ // Acquire lock on domain (see more details in comment of start() method
+ // of ServerHandler)
+ lock();
+ } catch (InterruptedException ex)
+ {
+ // Try doing job anyway...
+ }
+ /*
+ * Store DS connected to remote RS and update information about the peer RS
+ */
+ handler.receiveTopoInfoFromRS(topoMsg);
+
+ /*
+ * Handle generation id
+ */
+ if (allowResetGenId)
+ {
+ // Check if generation id has to be resetted
mayResetGenerationId();
if (generationId < 0)
generationId = handler.getGenerationId();
- if (generationId > 0 && (generationId != infoMsg.getGenerationId()))
- {
- Message message = NOTE_BAD_GENERATION_ID.get(
- baseDn.toNormalizedString(),
- Short.toString(handler.getServerId()),
- Long.toString(infoMsg.getGenerationId()),
- Long.toString(generationId));
-
- ErrorMessage errorMsg = new ErrorMessage(
- getReplicationServer().getServerId(),
- handler.getServerId(),
- message);
- handler.sendError(errorMsg);
- }
}
- /* =======================
- * Monitor Data generation
- * =======================
- */
-
- /**
- * Retrieves the global monitor data.
- * @return The monitor data.
- * @throws DirectoryException When an error occurs.
- */
- synchronized protected MonitorData getMonitorData()
- throws DirectoryException
+ if (generationId > 0 && (generationId != handler.getGenerationId()))
{
- if (monitorData.getBuildDate() + monitorDataLifeTime
- > TimeThread.getTime())
- {
- if (debugEnabled())
- TRACER.debugInfo(
- "In " + this.replicationServer.getMonitorInstanceName() +
- " baseDn=" + baseDn + " getRemoteMonitorData in cache");
- // The current data are still valid. No need to renew them.
- return monitorData;
- }
+ Message message = NOTE_BAD_GENERATION_ID_FROM_RS.get(
+ baseDn.toNormalizedString(),
+ Short.toString(handler.getServerId()),
+ Long.toString(handler.getGenerationId()),
+ Long.toString(generationId));
+ logError(message);
- wrkMonitorData = new MonitorData();
- synchronized(wrkMonitorData)
- {
- if (debugEnabled())
- TRACER.debugInfo(
- "In " + this.replicationServer.getMonitorInstanceName() +
- " baseDn=" + baseDn + " Computing monitor data ");
-
- // Let's process our directly connected LSes
- // - in the ServerHandler for a given LS1, the stored state contains :
- // - the max CN produced by LS1
- // - the last CN consumed by LS1 from LS2..n
- // - in the RSdomain/dbHandler, the built-in state contains :
- // - the max CN produced by each server
- // So for a given LS connected we can take the state and the max from
- // the LS/state.
-
- for (ServerHandler directlsh : connectedServers.values())
- {
- short serverID = directlsh.getServerId();
-
- // the state comes from the state stored in the SH
- ServerState directlshState = directlsh.getServerState().duplicate();
-
- // the max CN sent by that LS also comes from the SH
- ChangeNumber maxcn = directlshState.getMaxChangeNumber(serverID);
- if (maxcn == null)
- {
- // This directly connected LS has never produced any change
- maxcn = new ChangeNumber(0, 0 , serverID);
- }
- wrkMonitorData.setMaxCN(serverID, maxcn);
- wrkMonitorData.setLDAPServerState(serverID, directlshState);
- wrkMonitorData.setFirstMissingDate(serverID, directlsh.
- getApproxFirstMissingDate());
- }
-
- // Then initialize the max CN for the LS that produced something
- // - from our own local db state
- // - whatever they are directly or undirectly connected
- ServerState dbServerState = getDbServerState();
- Iterator<Short> it = dbServerState.iterator();
- while (it.hasNext())
- {
- short sid = it.next();
- ChangeNumber storedCN = dbServerState.getMaxChangeNumber(sid);
- wrkMonitorData.setMaxCN(sid, storedCN);
- }
-
- // Now we have used all available local informations
- // and we need the remote ones.
- if (debugEnabled())
- TRACER.debugInfo(
- "In " + this.replicationServer.getMonitorInstanceName() +
- " baseDn=" + baseDn + " Local monitor data: " +
- wrkMonitorData.toString());
- }
-
- // Send Request to the other Replication Servers
- if (remoteMonitorResponsesSemaphore == null)
- {
- remoteMonitorResponsesSemaphore = new Semaphore(0);
- short requestCnt = sendMonitorDataRequest();
- // Wait reponses from them or timeout
- waitMonitorDataResponses(requestCnt);
- }
- else
- {
- // The processing of renewing the monitor cache is already running
- // We'll make it sleeping until the end
- // TODO: unit test for this case.
- while (remoteMonitorResponsesSemaphore!=null)
- {
- waitMonitorDataResponses(1);
- }
- }
-
- wrkMonitorData.completeComputing();
-
- // Store the new computed data as the reference
- synchronized(monitorData)
- {
- // Now we have the expected answers or an error occured
- monitorData = wrkMonitorData;
- wrkMonitorData = null;
- if (debugEnabled())
- TRACER.debugInfo(
- "In " + this.replicationServer.getMonitorInstanceName() +
- " baseDn=" + baseDn + " *** Computed MonitorData: " +
- monitorData.toString());
- }
- return monitorData;
+ ErrorMsg errorMsg = new ErrorMsg(
+ getReplicationServer().getServerId(),
+ handler.getServerId(),
+ message);
+ handler.sendError(errorMsg);
}
-
- /**
- * Sends a MonitorRequest message to all connected RS.
- * @return the number of requests sent.
- * @throws DirectoryException when a problem occurs.
+ /*
+ * Sends the currently known topology information to every connected
+ * DS we have.
*/
- protected short sendMonitorDataRequest()
- throws DirectoryException
- {
- short sent=0;
- try
- {
- for (ServerHandler rs : replicationServers.values())
- {
- MonitorRequestMessage msg = new
- MonitorRequestMessage(this.replicationServer.getServerId(),
- rs.getServerId());
- rs.send(msg);
- sent++;
- }
- }
- catch(Exception e)
- {
- Message message = ERR_SENDING_REMOTE_MONITOR_DATA_REQUEST.get();
- logError(message);
- throw new DirectoryException(ResultCode.OTHER,
- message, e);
- }
- return sent;
- }
+ sendTopoInfoToDSs(null);
- /**
- * Wait for the expected count of received MonitorMessage.
- * @param expectedResponses The number of expected answers.
- * @throws DirectoryException When an error occurs.
- */
- protected void waitMonitorDataResponses(int expectedResponses)
- throws DirectoryException
- {
- try
- {
- if (debugEnabled())
- TRACER.debugInfo(
- "In " + this.replicationServer.getMonitorInstanceName() +
- " baseDn=" + baseDn +
- " waiting for " + expectedResponses
- + " expected monitor messages");
+ release();
+ }
- boolean allPermitsAcquired =
- remoteMonitorResponsesSemaphore.tryAcquire(
- expectedResponses,
- (long) 5000, TimeUnit.MILLISECONDS);
-
- if (!allPermitsAcquired)
- {
- logError(ERR_MISSING_REMOTE_MONITOR_DATA.get());
- // let's go on in best effort even with limited data received.
- }
- else
- {
- if (debugEnabled())
- TRACER.debugInfo(
- "In " + this.replicationServer.getMonitorInstanceName() +
- " baseDn=" + baseDn +
- " Successfully received all " + expectedResponses
- + " expected monitor messages");
- }
- }
- catch(Exception e)
- {
- logError(ERR_PROCESSING_REMOTE_MONITOR_DATA.get(e.getMessage()));
- }
- finally
- {
- remoteMonitorResponsesSemaphore = null;
- }
- }
-
- /**
- * Processes a Monitor message receives from a remote Replication Server
- * and stores the data received.
- *
- * @param msg The message to be processed.
- */
- public void receivesMonitorDataResponse(MonitorMessage msg)
+ /* =======================
+ * Monitor Data generation
+ * =======================
+ */
+ /**
+ * Retrieves the global monitor data.
+ * @return The monitor data.
+ * @throws DirectoryException When an error occurs.
+ */
+ synchronized protected MonitorData getMonitorData()
+ throws DirectoryException
+ {
+ if (monitorData.getBuildDate() + monitorDataLifeTime > TimeThread.getTime())
{
if (debugEnabled())
TRACER.debugInfo(
+ "In " + this.replicationServer.getMonitorInstanceName() +
+ " baseDn=" + baseDn + " getRemoteMonitorData in cache");
+ // The current data are still valid. No need to renew them.
+ return monitorData;
+ }
+
+ wrkMonitorData = new MonitorData();
+ synchronized (wrkMonitorData)
+ {
+ if (debugEnabled())
+ TRACER.debugInfo(
+ "In " + this.replicationServer.getMonitorInstanceName() +
+ " baseDn=" + baseDn + " Computing monitor data ");
+
+ // Let's process our directly connected LSes
+ // - in the ServerHandler for a given LS1, the stored state contains :
+ // - the max CN produced by LS1
+ // - the last CN consumed by LS1 from LS2..n
+ // - in the RSdomain/dbHandler, the built-in state contains :
+ // - the max CN produced by each server
+ // So for a given LS connected we can take the state and the max from
+ // the LS/state.
+
+ for (ServerHandler directlsh : directoryServers.values())
+ {
+ short serverID = directlsh.getServerId();
+
+ // the state comes from the state stored in the SH
+ ServerState directlshState = directlsh.getServerState().duplicate();
+
+ // the max CN sent by that LS also comes from the SH
+ ChangeNumber maxcn = directlshState.getMaxChangeNumber(serverID);
+ if (maxcn == null)
+ {
+ // This directly connected LS has never produced any change
+ maxcn = new ChangeNumber(0, 0, serverID);
+ }
+ wrkMonitorData.setMaxCN(serverID, maxcn);
+ wrkMonitorData.setLDAPServerState(serverID, directlshState);
+ wrkMonitorData.setFirstMissingDate(serverID,
+ directlsh.getApproxFirstMissingDate());
+ }
+
+ // Then initialize the max CN for the LS that produced something
+ // - from our own local db state
+ // - whatever they are directly or undirectly connected
+ ServerState dbServerState = getDbServerState();
+ Iterator<Short> it = dbServerState.iterator();
+ while (it.hasNext())
+ {
+ short sid = it.next();
+ ChangeNumber storedCN = dbServerState.getMaxChangeNumber(sid);
+ wrkMonitorData.setMaxCN(sid, storedCN);
+ }
+
+ // Now we have used all available local informations
+ // and we need the remote ones.
+ if (debugEnabled())
+ TRACER.debugInfo(
+ "In " + this.replicationServer.getMonitorInstanceName() +
+ " baseDn=" + baseDn + " Local monitor data: " +
+ wrkMonitorData.toString());
+ }
+
+ // Send Request to the other Replication Servers
+ if (remoteMonitorResponsesSemaphore == null)
+ {
+ remoteMonitorResponsesSemaphore = new Semaphore(0);
+ short requestCnt = sendMonitorDataRequest();
+ // Wait reponses from them or timeout
+ waitMonitorDataResponses(requestCnt);
+ } else
+ {
+ // The processing of renewing the monitor cache is already running
+ // We'll make it sleeping until the end
+ // TODO: unit test for this case.
+ while (remoteMonitorResponsesSemaphore != null)
+ {
+ waitMonitorDataResponses(1);
+ }
+ }
+
+ wrkMonitorData.completeComputing();
+
+ // Store the new computed data as the reference
+ synchronized (monitorData)
+ {
+ // Now we have the expected answers or an error occurred
+ monitorData = wrkMonitorData;
+ wrkMonitorData = null;
+ if (debugEnabled())
+ TRACER.debugInfo(
+ "In " + this.replicationServer.getMonitorInstanceName() +
+ " baseDn=" + baseDn + " *** Computed MonitorData: " +
+ monitorData.toString());
+ }
+ return monitorData;
+ }
+
+ /**
+ * Sends a MonitorRequest message to all connected RS.
+ * @return the number of requests sent.
+ * @throws DirectoryException when a problem occurs.
+ */
+ protected short sendMonitorDataRequest()
+ throws DirectoryException
+ {
+ short sent = 0;
+ try
+ {
+ for (ServerHandler rs : replicationServers.values())
+ {
+ MonitorRequestMsg msg =
+ new MonitorRequestMsg(this.replicationServer.getServerId(),
+ rs.getServerId());
+ rs.send(msg);
+ sent++;
+ }
+ } catch (Exception e)
+ {
+ Message message = ERR_SENDING_REMOTE_MONITOR_DATA_REQUEST.get();
+ logError(message);
+ throw new DirectoryException(ResultCode.OTHER,
+ message, e);
+ }
+ return sent;
+ }
+
+ /**
+ * Wait for the expected count of received MonitorMsg.
+ * @param expectedResponses The number of expected answers.
+ * @throws DirectoryException When an error occurs.
+ */
+ protected void waitMonitorDataResponses(int expectedResponses)
+ throws DirectoryException
+ {
+ try
+ {
+ if (debugEnabled())
+ TRACER.debugInfo(
+ "In " + this.replicationServer.getMonitorInstanceName() +
+ " baseDn=" + baseDn +
+ " waiting for " + expectedResponses + " expected monitor messages");
+
+ boolean allPermitsAcquired =
+ remoteMonitorResponsesSemaphore.tryAcquire(
+ expectedResponses,
+ (long) 5000, TimeUnit.MILLISECONDS);
+
+ if (!allPermitsAcquired)
+ {
+ logError(ERR_MISSING_REMOTE_MONITOR_DATA.get());
+ // let's go on in best effort even with limited data received.
+ } else
+ {
+ if (debugEnabled())
+ TRACER.debugInfo(
+ "In " + this.replicationServer.getMonitorInstanceName() +
+ " baseDn=" + baseDn +
+ " Successfully received all " + expectedResponses +
+ " expected monitor messages");
+ }
+ } catch (Exception e)
+ {
+ logError(ERR_PROCESSING_REMOTE_MONITOR_DATA.get(e.getMessage()));
+ } finally
+ {
+ remoteMonitorResponsesSemaphore = null;
+ }
+ }
+
+ /**
+ * Processes a Monitor message receives from a remote Replication Server
+ * and stores the data received.
+ *
+ * @param msg The message to be processed.
+ */
+ public void receivesMonitorDataResponse(MonitorMsg msg)
+ {
+ if (debugEnabled())
+ TRACER.debugInfo(
"In " + this.replicationServer.getMonitorInstanceName() +
"Receiving " + msg + " from " + msg.getsenderID() +
remoteMonitorResponsesSemaphore);
- if (remoteMonitorResponsesSemaphore == null)
- {
- // Let's ignore the remote monitor data just received
- // since the computing processing has been ended.
- // An error - probably a timemout - occured that was already logged
- logError(NOTE_IGNORING_REMOTE_MONITOR_DATA.get(
- Short.toString(msg.getsenderID())));
- return;
- }
+ if (remoteMonitorResponsesSemaphore == null)
+ {
+ // Let's ignore the remote monitor data just received
+ // since the computing processing has been ended.
+ // An error - probably a timemout - occurred that was already logged
+ logError(NOTE_IGNORING_REMOTE_MONITOR_DATA.get(
+ Short.toString(msg.getsenderID())));
+ return;
+ }
- try
+ try
+ {
+ synchronized (wrkMonitorData)
{
- synchronized(wrkMonitorData)
+ // Here is the RS state : list <serverID, lastChangeNumber>
+ // For each LDAP Server, we keep the max CN accross the RSes
+ ServerState replServerState = msg.getReplServerDbState();
+ wrkMonitorData.setMaxCNs(replServerState);
+
+ // Store the remote LDAP servers states
+ Iterator<Short> lsidIterator = msg.ldapIterator();
+ while (lsidIterator.hasNext())
{
- // Here is the RS state : list <serverID, lastChangeNumber>
- // For each LDAP Server, we keep the max CN accross the RSes
- ServerState replServerState = msg.getReplServerDbState();
- wrkMonitorData.setMaxCNs(replServerState);
+ short sid = lsidIterator.next();
+ wrkMonitorData.setLDAPServerState(sid,
+ msg.getLDAPServerState(sid).duplicate());
+ wrkMonitorData.setFirstMissingDate(sid,
+ msg.getLDAPApproxFirstMissingDate(sid));
+ }
- // Store the remote LDAP servers states
- Iterator<Short> lsidIterator = msg.ldapIterator();
- while (lsidIterator.hasNext())
+ // Process the latency reported by the remote RSi on its connections
+ // to the other RSes
+ Iterator<Short> rsidIterator = msg.rsIterator();
+ while (rsidIterator.hasNext())
+ {
+ short rsid = rsidIterator.next();
+ if (rsid == replicationServer.getServerId())
{
- short sid = lsidIterator.next();
- wrkMonitorData.setLDAPServerState(sid,
- msg.getLDAPServerState(sid).duplicate());
- wrkMonitorData.setFirstMissingDate(sid,
- msg.getLDAPApproxFirstMissingDate(sid));
- }
-
- // Process the latency reported by the remote RSi on its connections
- // to the other RSes
- Iterator<Short> rsidIterator = msg.rsIterator();
- while (rsidIterator.hasNext())
- {
- short rsid = rsidIterator.next();
- if (rsid == replicationServer.getServerId())
+ // this is the latency of the remote RSi regarding the current RS
+ // let's update the fmd of my connected LS
+ for (ServerHandler connectedlsh : directoryServers.values())
{
- // this is the latency of the remote RSi regarding the current RS
- // let's update the fmd of my connected LS
- for (ServerHandler connectedlsh : connectedServers.values())
+ short connectedlsid = connectedlsh.getServerId();
+ Long newfmd = msg.getRSApproxFirstMissingDate(rsid);
+ wrkMonitorData.setFirstMissingDate(connectedlsid, newfmd);
+ }
+ } else
+ {
+ // this is the latency of the remote RSi regarding another RSj
+ // let's update the latency of the LSes connected to RSj
+ ServerHandler rsjHdr = replicationServers.get(rsid);
+ if (rsjHdr != null)
+ {
+ for (short remotelsid : rsjHdr.getConnectedDirectoryServerIds())
{
- short connectedlsid = connectedlsh.getServerId();
Long newfmd = msg.getRSApproxFirstMissingDate(rsid);
- wrkMonitorData.setFirstMissingDate(connectedlsid, newfmd);
- }
- }
- else
- {
- // this is the latency of the remote RSi regarding another RSj
- // let's update the latency of the LSes connected to RSj
- ServerHandler rsjHdr = replicationServers.get(rsid);
- if (rsjHdr != null)
- {
- for(short remotelsid : rsjHdr.getConnectedServerIds())
- {
- Long newfmd = msg.getRSApproxFirstMissingDate(rsid);
- wrkMonitorData.setFirstMissingDate(remotelsid, newfmd);
- }
+ wrkMonitorData.setFirstMissingDate(remotelsid, newfmd);
}
}
}
+ }
+ if (debugEnabled())
+ {
if (debugEnabled())
- {
- if (debugEnabled())
- TRACER.debugInfo(
+ TRACER.debugInfo(
"In " + this.replicationServer.getMonitorInstanceName() +
" baseDn=" + baseDn +
" Processed msg from " + msg.getsenderID() +
" New monitor data: " + wrkMonitorData.toString());
- }
}
-
- // Decreases the number of expected responses and potentially
- // wakes up the waiting requestor thread.
- remoteMonitorResponsesSemaphore.release();
-
}
- catch (Exception e)
- {
- logError(ERR_PROCESSING_REMOTE_MONITOR_DATA.get(e.getMessage() +
- stackTraceToSingleLineString(e)));
- // If an exception occurs while processing one of the expected message,
- // the processing is aborted and the waiting thread is awoke.
- remoteMonitorResponsesSemaphore.notifyAll();
- }
- }
+ // Decreases the number of expected responses and potentially
+ // wakes up the waiting requestor thread.
+ remoteMonitorResponsesSemaphore.release();
- /**
- * Set the purge delay on all the db Handlers for this Domain
- * of Replicaiton.
- *
- * @param delay The new purge delay to use.
- */
- void setPurgeDelay(long delay)
+ } catch (Exception e)
{
- for (DbHandler handler : sourceDbHandlers.values())
+ logError(ERR_PROCESSING_REMOTE_MONITOR_DATA.get(e.getMessage() +
+ stackTraceToSingleLineString(e)));
+
+ // If an exception occurs while processing one of the expected message,
+ // the processing is aborted and the waiting thread is awoke.
+ remoteMonitorResponsesSemaphore.notifyAll();
+ }
+ }
+
+ /**
+ * Set the purge delay on all the db Handlers for this Domain
+ * of Replicaiton.
+ *
+ * @param delay The new purge delay to use.
+ */
+ void setPurgeDelay(long delay)
+ {
+ for (DbHandler handler : sourceDbHandlers.values())
+ {
+ handler.setPurgeDelay(delay);
+ }
+ }
+
+ /**
+ * Get the map of connected DSs.
+ * @return The map of connected DSs
+ */
+ public Map<Short, ServerHandler> getConnectedDSs()
+ {
+ return directoryServers;
+ }
+
+ /**
+ * Get the map of connected RSs.
+ * @return The map of connected RSs
+ */
+ public Map<Short, ServerHandler> getConnectedRSs()
+ {
+ return replicationServers;
+ }
+ /**
+ * A synchronization mechanism is created to insure exclusive access to the
+ * domain. The goal is to have a consistent view of the topology by locking
+ * the structures holding the topology view of the domain: directoryServers
+ * and replicationServers. When a connection is established with a peer DS or
+ * RS, the lock should be taken before updating these structures, then
+ * released. The same mechanism should be used when updating any data related
+ * to the view of the topology: for instance if the status of a DS is changed,
+ * the lock should be taken before updating the matching server handler and
+ * sending the topology messages to peers and released after.... This allows
+ * every member of the topology to have a consistent view of the topology and
+ * to be sure it will not miss some information.
+ * So the locking system must be called (not exhaustive list):
+ * - when connection established with a DS or RS
+ * - when connection ended with a DS or RS
+ * - when receiving a TopologyMsg and updating structures
+ * - when creating and sending a TopologyMsg
+ * - when a DS status is changing (ChangeStatusMsg received or sent)...
+ */
+ private ReentrantLock lock = new ReentrantLock();
+
+ /**
+ * Tests if the current thread has the lock on this domain.
+ * @return True if the current thread has the lock.
+ */
+ public boolean hasLock()
+ {
+ return (lock.getHoldCount() > 0);
+ }
+
+ /**
+ * Takes the lock on this domain (blocking until lock can be acquired) or
+ * calling thread is interrupted.
+ * @throws java.lang.InterruptedException If interrupted.
+ */
+ public void lock() throws InterruptedException
+ {
+ lock.lockInterruptibly();
+ }
+
+ /**
+ * Releases the lock on this domain.
+ */
+ public void release()
+ {
+ lock.unlock();
+ }
+
+ /**
+ * Tries to acquire the lock on the domain within a given amount of time.
+ * @param timeout The amount of milliseconds to wait for acquiring the lock.
+ * @return True if the lock was acquired, false if timeout occurred.
+ * @throws java.lang.InterruptedException When call was interrupted.
+ */
+ public boolean tryLock(long timeout) throws InterruptedException
+ {
+ return lock.tryLock(timeout, TimeUnit.MILLISECONDS);
+ }
+
+ /**
+ * Starts the status analyzer for the domain.
+ */
+ public void startStatusAnalyzer()
+ {
+ if (statusAnalyzer == null)
+ {
+ int degradedStatusThreshold =
+ replicationServer.getDegradedStatusThreshold();
+ if (degradedStatusThreshold > 0) // 0 means no status analyzer
{
- handler.setPurgeDelay(delay);
+ statusAnalyzer = new StatusAnalyzer(this, degradedStatusThreshold);
+ statusAnalyzer.start();
}
}
+ }
+
+ /**
+ * Stops the status analyzer for the domain.
+ */
+ public void stopStatusAnalyzer()
+ {
+ if (statusAnalyzer != null)
+ {
+ statusAnalyzer.shutdown();
+ statusAnalyzer.waitForShutdown();
+ statusAnalyzer = null;
+ }
+ }
+
+ /**
+ * Tests if the status analyzer for this domain is running.
+ * @return True if the status analyzer is running, false otherwise.
+ */
+ public boolean isRunningStatusAnalyzer()
+ {
+ return (statusAnalyzer != null);
+ }
+
+ /**
+ * Update the status analyzer with the new threshold value.
+ * @param degradedStatusThreshold The new threshold value.
+ */
+ public void updateStatusAnalyzer(int degradedStatusThreshold)
+ {
+ if (statusAnalyzer != null)
+ {
+ statusAnalyzer.setDeradedStatusThreshold(degradedStatusThreshold);
+ }
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index f85e133..a8ac0c2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -30,6 +30,7 @@
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.replication.common.StatusMachine.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ReplicationMessages.*;
@@ -40,8 +41,8 @@
import java.util.List;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Random;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -49,47 +50,59 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.replication.common.AssuredMode;
import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.DSInfo;
+import org.opends.server.replication.common.RSInfo;
import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.common.ServerStatus;
+import org.opends.server.replication.common.StatusMachine;
+import org.opends.server.replication.common.StatusMachineEvent;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.AttributeBuilder;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.util.TimeThread;
/**
* This class defines a server handler, which handles all interaction with a
- * replication server.
+ * peer server (RS or DS).
*/
public class ServerHandler extends MonitorProvider<MonitorProviderCfg>
{
+
/**
* The tracer object for the debug logger.
*/
private static final DebugTracer TRACER = getTracer();
-
/**
* Time during which the server will wait for existing thread to stop
- * during the shutdown.
+ * during the shutdownWriter.
*/
private static final int SHUTDOWN_JOIN_TIMEOUT = 30000;
+ /*
+ * Properties, filled if remote server is either a DS or a RS
+ */
private short serverId;
private ProtocolSession session;
private final MsgQueue msgQueue = new MsgQueue();
private MsgQueue lateQueue = new MsgQueue();
- private final Map<ChangeNumber, AckMessageList> waitingAcks =
- new HashMap<ChangeNumber, AckMessageList>();
+ private final Map<ChangeNumber, AckMessageList> waitingAcks =
+ new HashMap<ChangeNumber, AckMessageList>();
private ReplicationServerDomain replicationServerDomain = null;
private String serverURL;
private int outCount = 0; // number of update sent to the server
+
private int inCount = 0; // number of updates received from the server
+
private int inAckCount = 0;
private int outAckCount = 0;
private int maxReceiveQueue = 0;
@@ -105,10 +118,9 @@
private boolean serverIsLDAPserver;
private boolean following = false;
private ServerState serverState;
- private boolean active = true;
+ private boolean activeWriter = true;
private ServerWriter writer = null;
private DN baseDn = null;
- private String serverAddressURL;
private int rcvWindow;
private int rcvWindowSizeHalf;
private int maxRcvWindow;
@@ -116,42 +128,63 @@
private Semaphore sendWindow;
private int sendWindowSize;
private boolean flowControl = false; // indicate that the server is
- // flow controlled and should
- // be stopped from sending messages.
+ // flow controlled and should
+ // be stopped from sending messages.
+
private int saturationCount = 0;
private short replicationServerId;
-
- private short protocolVersion;
+ private short protocolVersion = -1;
private long generationId = -1;
+ // Group id of this remote server
+ private byte groupId = (byte) -1;
+ /*
+ * Properties filled only if remote server is a DS
+ */
+
+ // Status of this DS
+ private ServerStatus status = ServerStatus.INVALID_STATUS;
+ // Referrals URLs this DS is exporting
+ private List<String> refUrls = new ArrayList<String>();
+ // Assured replication enabled on DS or not
+ private boolean assuredFlag = false;
+ // DS assured mode (relevant if assured replication enabled)
+ private AssuredMode assuredMode = AssuredMode.SAFE_DATA_MODE;
+ // DS safe data level (relevant if assured mode is safe data)
+ private byte safeDataLevel = (byte) -1;
+
+ /*
+ * Properties filled only if remote server is a RS
+ */
+ private String serverAddressURL;
/**
* When this Handler is related to a remote replication server
* this collection will contain as many elements as there are
* LDAP servers connected to the remote replication server.
*/
- private final Map<Short, LightweightServerHandler> connectedServers =
+ private final Map<Short, LightweightServerHandler> directoryServers =
new ConcurrentHashMap<Short, LightweightServerHandler>();
-
/**
* The time in milliseconds between heartbeats from the replication
* server. Zero means heartbeats are off.
*/
private long heartbeatInterval = 0;
-
/**
* The thread that will send heartbeats.
*/
HeartbeatThread heartbeatThread = null;
-
+ /**
+ * Set when ServerWriter is stopping.
+ */
+ private boolean shutdownWriter = false;
/**
* Set when ServerHandler is stopping.
*/
- private boolean shutdown = false;
-
+ private AtomicBoolean shuttingDown = new AtomicBoolean(false);
private static final Map<ChangeNumber, ReplServerAckMessageList>
- changelogsWaitingAcks =
- new HashMap<ChangeNumber, ReplServerAckMessageList>();
+ changelogsWaitingAcks =
+ new HashMap<ChangeNumber, ReplServerAckMessageList>();
/**
* Creates a new server handler instance with the provided socket.
@@ -167,13 +200,58 @@
this.session = session;
this.maxQueueSize = queueSize;
this.maxQueueBytesSize = queueSize * 100;
- this.protocolVersion = ProtocolVersion.currentVersion();
+ this.protocolVersion = ProtocolVersion.getCurrentVersion();
}
/**
- * Do the exchange of start messages to know if the remote
- * server is an LDAP or replication server and to exchange serverID.
- * Then create the reader and writer thread.
+ * Creates a DSInfo structure representing this remote DS.
+ * @return The DSInfo structure representing this remote DS
+ */
+ public DSInfo toDSInfo()
+ {
+ DSInfo dsInfo = new DSInfo(serverId, replicationServerId, generationId,
+ status, assuredFlag, assuredMode, safeDataLevel, groupId, refUrls);
+
+ return dsInfo;
+ }
+
+ /**
+ * Creates a RSInfo structure representing this remote RS.
+ * @return The RSInfo structure representing this remote RS
+ */
+ public RSInfo toRSInfo()
+ {
+ RSInfo rsInfo = new RSInfo(serverId, generationId, groupId);
+
+ return rsInfo;
+ }
+
+ /**
+ * Do the handshake with either the DS or RS and then create the reader and
+ * writer thread.
+ *
+ * There are 2 possible handshake sequences: DS<->RS and RS<->RS. Each one are
+ * divided into 2 logical consecutive phases (phase 1 and phase 2):
+ *
+ * DS<->RS (DS (always initiating connection) always sends first message):
+ * -------
+ *
+ * phase 1:
+ * DS --- ServerStartMsg ---> RS
+ * DS <--- ReplServerStartMsg --- RS
+ * phase 2:
+ * DS --- StartSessionMsg ---> RS
+ * DS <--- TopologyMsg --- RS
+ *
+ * RS<->RS (RS initiating connection always sends first message):
+ * -------
+ *
+ * phase 1:
+ * RS1 --- ReplServerStartMsg ---> RS2
+ * RS1 <--- ReplServerStartMsg --- RS2
+ * phase 2:
+ * RS1 --- TopologyMsg ---> RS2
+ * RS1 <--- TopologyMsg --- RS2
*
* @param baseDn baseDn of the ServerHandler when this is an outgoing conn.
* null if this is an incoming connection (listen).
@@ -189,94 +267,163 @@
* handler.
*/
public void start(DN baseDn, short replicationServerId,
- String replicationServerURL,
- int windowSize, boolean sslEncryption,
- ReplicationServer replicationServer)
+ String replicationServerURL,
+ int windowSize, boolean sslEncryption,
+ ReplicationServer replicationServer)
{
+
+ // The handshake phase must be done by blocking any access to structures
+ // keeping info on connected servers, so that one can safely check for
+ // pre-existence of a server, send a coherent snapshot of known topology
+ // to peers, update the local view of the topology...
+ //
+ // For instance a kind of problem could be that while we connect with a
+ // peer RS, a DS is connecting at the same time and we could publish the
+ // connected DSs to the peer RS forgetting this last DS in the TopologyMsg.
+ //
+ // This method and every others that need to read/make changes to the
+ // structures holding topology for the domain should:
+ // - call ReplicationServerDomain.lock()
+ // - read/modify structures
+ // - call ReplicationServerDomain.release()
+ //
+ // More information is provided in comment of ReplicationServerDomain.lock()
+
+ // If domain already exists, lock it until handshake is finished otherwise
+ // it will be created and locked later in the method
+ if (baseDn != null)
+ {
+ ReplicationServerDomain rsd =
+ replicationServer.getReplicationServerDomain(baseDn, false);
+ if (rsd != null)
+ {
+ try
+ {
+ rsd.lock();
+ } catch (InterruptedException ex)
+ {
+ // Thread interrupted, return.
+ return;
+ }
+ }
+ }
+
+ long oldGenerationId = -100;
+
if (debugEnabled())
TRACER.debugInfo("In " + replicationServer.getMonitorInstanceName() +
- " starts a new LS or RS " +
- ((baseDn == null)?"incoming connection":"outgoing connection"));
+ " starts a new LS or RS " +
+ ((baseDn == null) ? "incoming connection" : "outgoing connection"));
this.replicationServerId = replicationServerId;
- rcvWindowSizeHalf = windowSize/2;
+ rcvWindowSizeHalf = windowSize / 2;
maxRcvWindow = windowSize;
rcvWindow = windowSize;
long localGenerationId = -1;
- boolean handshakeOnly = false;
+ ReplServerStartMsg outReplServerStartMsg = null;
+
+ /**
+ * This boolean prevents from logging a polluting error when connection\
+ * aborted from a DS that wanted only to perform handshake phase 1 in order
+ * to determine the best suitable RS:
+ * 1) -> ServerStartMsg
+ * 2) <- ReplServerStartMsg
+ * 3) connection closure
+ */
+ boolean log_error_message = true;
try
{
- if (baseDn != null)
+ /*
+ * PROCEDE WITH FIRST PHASE OF HANDSHAKE:
+ * ServerStartMsg then ReplServerStartMsg (with a DS)
+ * OR
+ * ReplServerStartMsg then ReplServerStartMsg (with a RS)
+ */
+
+ if (baseDn != null) // Outgoing connection
+
{
// This is an outgoing connection. Publish our start message.
this.baseDn = baseDn;
// Get or create the ReplicationServerDomain
replicationServerDomain =
- replicationServer.getReplicationServerDomain(baseDn, true);
+ replicationServer.getReplicationServerDomain(baseDn, true);
+ if (!replicationServerDomain.hasLock())
+ {
+ try
+ {
+ replicationServerDomain.lock();
+ } catch (InterruptedException ex)
+ {
+ // Thread interrupted, return.
+ return;
+ }
+ }
localGenerationId = replicationServerDomain.getGenerationId();
ServerState localServerState =
- replicationServerDomain.getDbServerState();
- ReplServerStartMessage msg =
- new ReplServerStartMessage(replicationServerId, replicationServerURL,
- baseDn, windowSize, localServerState,
- protocolVersion, localGenerationId,
- sslEncryption);
+ replicationServerDomain.getDbServerState();
+ outReplServerStartMsg = new ReplServerStartMsg(replicationServerId,
+ replicationServerURL,
+ baseDn, windowSize, localServerState,
+ protocolVersion, localGenerationId,
+ sslEncryption,
+ replicationServer.getGroupId(),
+ replicationServerDomain.
+ getReplicationServer().getDegradedStatusThreshold());
- session.publish(msg);
+ session.publish(outReplServerStartMsg);
}
- // Wait and process ServerStart or ReplServerStart
- ReplicationMessage msg = session.receive();
- if (msg instanceof ServerStartMessage)
+ // Wait and process ServerStartMsg or ReplServerStartMsg
+ ReplicationMsg msg = session.receive();
+ if (msg instanceof ServerStartMsg)
{
// The remote server is an LDAP Server.
- ServerStartMessage receivedMsg = (ServerStartMessage) msg;
+ ServerStartMsg serverStartMsg = (ServerStartMsg) msg;
- generationId = receivedMsg.getGenerationId();
+ generationId = serverStartMsg.getGenerationId();
protocolVersion = ProtocolVersion.minWithCurrent(
- receivedMsg.getVersion());
- serverId = receivedMsg.getServerId();
- serverURL = receivedMsg.getServerURL();
- this.baseDn = receivedMsg.getBaseDn();
- this.serverState = receivedMsg.getServerState();
+ serverStartMsg.getVersion());
+ serverId = serverStartMsg.getServerId();
+ serverURL = serverStartMsg.getServerURL();
+ this.baseDn = serverStartMsg.getBaseDn();
+ this.serverState = serverStartMsg.getServerState();
+ this.groupId = serverStartMsg.getGroupId();
- maxReceiveDelay = receivedMsg.getMaxReceiveDelay();
- maxReceiveQueue = receivedMsg.getMaxReceiveQueue();
- maxSendDelay = receivedMsg.getMaxSendDelay();
- maxSendQueue = receivedMsg.getMaxSendQueue();
- heartbeatInterval = receivedMsg.getHeartbeatInterval();
-
- handshakeOnly = receivedMsg.isHandshakeOnly();
+ maxReceiveDelay = serverStartMsg.getMaxReceiveDelay();
+ maxReceiveQueue = serverStartMsg.getMaxReceiveQueue();
+ maxSendDelay = serverStartMsg.getMaxSendDelay();
+ maxSendQueue = serverStartMsg.getMaxSendQueue();
+ heartbeatInterval = serverStartMsg.getHeartbeatInterval();
// The session initiator decides whether to use SSL.
- sslEncryption = receivedMsg.getSSLEncryption();
+ sslEncryption = serverStartMsg.getSSLEncryption();
if (maxReceiveQueue > 0)
- restartReceiveQueue = (maxReceiveQueue > 1000 ?
- maxReceiveQueue - 200 :
- maxReceiveQueue*8/10);
+ restartReceiveQueue = (maxReceiveQueue > 1000 ? maxReceiveQueue -
+ 200 : maxReceiveQueue * 8 / 10);
else
restartReceiveQueue = 0;
if (maxSendQueue > 0)
- restartSendQueue = (maxSendQueue > 1000 ? maxSendQueue - 200 :
- maxSendQueue*8/10);
+ restartSendQueue =
+ (maxSendQueue > 1000 ? maxSendQueue - 200 : maxSendQueue * 8 /
+ 10);
else
restartSendQueue = 0;
if (maxReceiveDelay > 0)
- restartReceiveDelay = (maxReceiveDelay > 10 ? maxReceiveDelay -1 :
- maxReceiveDelay);
+ restartReceiveDelay = (maxReceiveDelay > 10 ? maxReceiveDelay - 1
+ : maxReceiveDelay);
else
restartReceiveDelay = 0;
if (maxSendDelay > 0)
- restartSendDelay = (maxSendDelay > 10 ?
- maxSendDelay -1 :
- maxSendDelay);
+ restartSendDelay =
+ (maxSendDelay > 10 ? maxSendDelay - 1 : maxSendDelay);
else
restartSendDelay = 0;
@@ -289,25 +436,53 @@
// Get or Create the ReplicationServerDomain
replicationServerDomain =
- replicationServer.getReplicationServerDomain(this.baseDn, true);
+ replicationServer.getReplicationServerDomain(this.baseDn, true);
- replicationServerDomain.waitDisconnection(receivedMsg.getServerId());
- replicationServerDomain.mayResetGenerationId();
+ // Hack to be sure that if a server disconnects and reconnect, we
+ // let the reader thread see the closure and cleanup any reference
+ // to old connection
+ replicationServerDomain.waitDisconnection(serverStartMsg.getServerId());
+
+ if (!replicationServerDomain.hasLock())
+ {
+ try
+ {
+ replicationServerDomain.lock();
+ } catch (InterruptedException ex)
+ {
+ // Thread interrupted, return.
+ return;
+ }
+ }
+
+ // Duplicate server ?
+ if (!replicationServerDomain.checkForDuplicateDS(this))
+ {
+ closeSession(null);
+ if ((replicationServerDomain != null) &&
+ replicationServerDomain.hasLock())
+ replicationServerDomain.release();
+ return;
+ }
localGenerationId = replicationServerDomain.getGenerationId();
ServerState localServerState =
- replicationServerDomain.getDbServerState();
+ replicationServerDomain.getDbServerState();
// This an incoming connection. Publish our start message
- ReplServerStartMessage myStartMsg =
- new ReplServerStartMessage(replicationServerId, replicationServerURL,
- this.baseDn, windowSize, localServerState,
- protocolVersion, localGenerationId,
- sslEncryption);
- session.publish(myStartMsg);
- sendWindowSize = receivedMsg.getWindowSize();
+ ReplServerStartMsg replServerStartMsg =
+ new ReplServerStartMsg(replicationServerId, replicationServerURL,
+ this.baseDn, windowSize, localServerState,
+ protocolVersion, localGenerationId,
+ sslEncryption,
+ replicationServer.getGroupId(),
+ replicationServerDomain.
+ getReplicationServer().getDegradedStatusThreshold());
+ session.publish(replServerStartMsg);
+ sendWindowSize = serverStartMsg.getWindowSize();
- /* Until here session is encrypted then it depends on the negotiation */
+ /* Until here session is encrypted then it depends on the
+ negotiation */
if (!sslEncryption)
{
session.stopEncryption();
@@ -315,309 +490,550 @@
if (debugEnabled())
{
- Set<String> ss = this.serverState.toStringSet();
- Set<String> lss =
- replicationServerDomain.getDbServerState().toStringSet();
- TRACER.debugInfo("In " + replicationServerDomain.
- getReplicationServer().getMonitorInstanceName() +
- ", SH received START from LS serverId=" + serverId +
- " baseDN=" + this.baseDn +
- " generationId=" + generationId +
- " localGenerationId=" + localGenerationId +
- " state=" + ss +
- " and sent ReplServerStart with state=" + lss);
+ TRACER.debugInfo("In " +
+ replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() + ":" +
+ "\nSH HANDSHAKE RECEIVED:\n" + serverStartMsg.toString() +
+ "\nAND REPLIED:\n" + replServerStartMsg.toString());
}
-
- /*
- * If we have already a generationID set for the domain
- * then
- * if the connecting replica has not the same
- * then it is degraded locally and notified by an error message
- * else
- * we set the generationID from the one received
- * (unsaved yet on disk . will be set with the 1rst change received)
- */
- if (localGenerationId>0)
- {
- if (generationId != localGenerationId)
- {
- Message message = NOTE_BAD_GENERATION_ID.get(
- receivedMsg.getBaseDn().toNormalizedString(),
- Short.toString(receivedMsg.getServerId()),
- Long.toString(generationId),
- Long.toString(localGenerationId));
-
- ErrorMessage errorMsg =
- new ErrorMessage(replicationServerId, serverId, message);
- session.publish(errorMsg);
- }
- }
- else
- {
- // We are an empty Replication Server
- if ((generationId>0)&&(!serverState.isEmpty()))
- {
- // If the LDAP server has already sent changes
- // it is not expected to connect to an empty RS
- Message message = NOTE_BAD_GENERATION_ID.get(
- receivedMsg.getBaseDn().toNormalizedString(),
- Short.toString(receivedMsg.getServerId()),
- Long.toString(generationId),
- Long.toString(localGenerationId));
-
- ErrorMessage errorMsg =
- new ErrorMessage(replicationServerId, serverId, message);
- session.publish(errorMsg);
- }
- else
- {
- replicationServerDomain.setGenerationId(generationId, false);
- }
- }
- }
- else if (msg instanceof ReplServerStartMessage)
+ } else if (msg instanceof ReplServerStartMsg)
{
// The remote server is a replication server
- ReplServerStartMessage receivedMsg = (ReplServerStartMessage) msg;
+ ReplServerStartMsg inReplServerStartMsg = (ReplServerStartMsg) msg;
protocolVersion = ProtocolVersion.minWithCurrent(
- receivedMsg.getVersion());
- generationId = receivedMsg.getGenerationId();
- serverId = receivedMsg.getServerId();
- serverURL = receivedMsg.getServerURL();
+ inReplServerStartMsg.getVersion());
+ generationId = inReplServerStartMsg.getGenerationId();
+ serverId = inReplServerStartMsg.getServerId();
+ serverURL = inReplServerStartMsg.getServerURL();
int separator = serverURL.lastIndexOf(':');
serverAddressURL =
- session.getRemoteAddress() + ":" + serverURL.substring(separator + 1);
+ session.getRemoteAddress() + ":" + serverURL.substring(separator +
+ 1);
serverIsLDAPserver = false;
- this.baseDn = receivedMsg.getBaseDn();
- if (baseDn == null)
+ if (protocolVersion > ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ {
+ // We support connection from a V1 RS
+ // Only V2 protocol has the group id in repl server start message
+ this.groupId = inReplServerStartMsg.getGroupId();
+ }
+ this.baseDn = inReplServerStartMsg.getBaseDn();
+
+ if (baseDn == null) // Reply to incoming RS
+
{
// Get or create the ReplicationServerDomain
- replicationServerDomain = replicationServer.
- getReplicationServerDomain(this.baseDn, true);
+ replicationServerDomain =
+ replicationServer.getReplicationServerDomain(this.baseDn, true);
+ if (!replicationServerDomain.hasLock())
+ {
+ try
+ {
+ /**
+ * Take the lock on the domain.
+ * WARNING: Here we try to acquire the lock with a timeout. This
+ * is for preventing a deadlock that may happen if there are cross
+ * connection attempts (for same domain) from this replication
+ * server and from a peer one:
+ * Here is the scenario:
+ * - RS1 connect thread takes the domain lock and starts
+ * connection to RS2
+ * - at the same time RS2 connect thread takes his domain lock and
+ * start connection to RS2
+ * - RS2 listen thread starts processing received
+ * ReplServerStartMsg from RS1 and wants to acquire the lock on
+ * the domain (here) but cannot as RS2 connect thread already has
+ * it
+ * - RS1 listen thread starts processing received
+ * ReplServerStartMsg from RS2 and wants to acquire the lock on
+ * the domain (here) but cannot as RS1 connect thread already has
+ * it
+ * => Deadlock: 4 threads are locked.
+ * So to prevent that in such situation, the listen threads here
+ * will both timeout trying to acquire the lock. The random time
+ * for the timeout should allow on connection attempt to be
+ * aborted whereas the other one should have time to finish in the
+ * same time.
+ * Warning: the minimum time (3s) should be big enough to allow
+ * normal situation connections to terminate. The added random
+ * time should represent a big enough range so that the chance to
+ * have one listen thread timing out a lot before the peer one is
+ * great. When the first listen thread times out, the remote
+ * connect thread should release the lock and allow the peer
+ * listen thread to take the lock it was waiting for and process
+ * the connection attempt.
+ */
+ Random random = new Random();
+ int randomTime = random.nextInt(6); // Random from 0 to 5
+ // Wait at least 3 seconds + (0 to 5 seconds)
+ long timeout = (long) (3000 + ( randomTime * 1000 ) );
+ boolean noTimeout = replicationServerDomain.tryLock(timeout);
+ if (!noTimeout)
+ {
+ // Timeout
+ Message message = NOTE_TIMEOUT_WHEN_CROSS_CONNECTION.get(
+ this.baseDn.toNormalizedString(),
+ Short.toString(serverId),
+ Short.toString(replicationServer.getServerId()));
+ closeSession(message);
+ return;
+ }
+ } catch (InterruptedException ex)
+ {
+ // Thread interrupted, return.
+ return;
+ }
+ }
localGenerationId = replicationServerDomain.getGenerationId();
- ServerState serverState = replicationServerDomain.getDbServerState();
+ ServerState domServerState =
+ replicationServerDomain.getDbServerState();
// The session initiator decides whether to use SSL.
- sslEncryption = receivedMsg.getSSLEncryption();
+ sslEncryption = inReplServerStartMsg.getSSLEncryption();
// Publish our start message
- ReplServerStartMessage outMsg =
- new ReplServerStartMessage(replicationServerId,
- replicationServerURL,
- this.baseDn, windowSize, serverState,
- protocolVersion,
- localGenerationId,
- sslEncryption);
- session.publish(outMsg);
- }
- else
- {
- this.baseDn = baseDn;
- }
- this.serverState = receivedMsg.getServerState();
- sendWindowSize = receivedMsg.getWindowSize();
+ outReplServerStartMsg = new ReplServerStartMsg(replicationServerId,
+ replicationServerURL,
+ this.baseDn, windowSize, domServerState,
+ protocolVersion,
+ localGenerationId,
+ sslEncryption,
+ replicationServer.getGroupId(),
+ replicationServerDomain.
+ getReplicationServer().getDegradedStatusThreshold());
- /* Until here session is encrypted then it depends on the negociation */
- if (!sslEncryption)
- {
- session.stopEncryption();
- }
+ if (protocolVersion > ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ {
+ session.publish(outReplServerStartMsg);
+ } else {
+ // We support connection from a V1 RS, send PDU with V1 form
+ session.publish(outReplServerStartMsg,
+ ProtocolVersion.REPLICATION_PROTOCOL_V1);
+ }
- if (debugEnabled())
- {
- Set<String> ss = this.serverState.toStringSet();
- Set<String> lss =
- replicationServerDomain.getDbServerState().toStringSet();
- TRACER.debugInfo("In " + replicationServerDomain.
- getReplicationServer().getMonitorInstanceName() +
- ", SH received START from RS serverId=" + serverId +
- " baseDN=" + this.baseDn +
- " generationId=" + generationId +
- " localGenerationId=" + localGenerationId +
- " state=" + ss +
- " and sent ReplServerStart with state=" + lss);
- }
-
- // if the remote RS and the local RS have the same genID
- // then it's ok and nothing else to do
- if (generationId == localGenerationId)
- {
if (debugEnabled())
{
TRACER.debugInfo("In " +
- replicationServerDomain.getReplicationServer().
- getMonitorInstanceName() + " RS with serverID=" + serverId +
- " is connected with the right generation ID");
+ replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() + ":" +
+ "\nSH HANDSHAKE RECEIVED:\n" + inReplServerStartMsg.toString() +
+ "\nAND REPLIED:\n" + outReplServerStartMsg.toString());
}
- }
- else
+ } else
{
- if (localGenerationId>0)
+ // Did the remote RS answer with the DN we provided him ?
+ if (!(this.baseDn.equals(baseDn)))
{
- // if the local RS is initialized
- if (generationId>0)
- {
- // if the remote RS is initialized
- if (generationId != localGenerationId)
- {
- // if the 2 RS have different generationID
- if (replicationServerDomain.getGenerationIdSavedStatus())
- {
- // it the present RS has received changes regarding its
- // gen ID and so won't change without a reset
- // then we are just degrading the peer.
- Message message = NOTE_BAD_GENERATION_ID.get(
- this.baseDn.toNormalizedString(),
- Short.toString(receivedMsg.getServerId()),
- Long.toString(generationId),
- Long.toString(localGenerationId));
-
- ErrorMessage errorMsg =
- new ErrorMessage(replicationServerId, serverId, message);
- session.publish(errorMsg);
- }
- else
- {
- // The present RS has never received changes regarding its
- // gen ID.
- //
- // Example case:
- // - we are in RS1
- // - RS2 has genId2 from LS2 (genId2 <=> no data in LS2)
- // - RS1 has genId1 from LS1 /genId1 comes from data in suffix
- // - we are in RS1 and we receive a START msg from RS2
- // - Each RS keeps its genID / is degraded and when LS2 will
- // be populated from LS1 everything will becomes ok.
- //
- // Issue:
- // FIXME : Would it be a good idea in some cases to just
- // set the gen ID received from the peer RS
- // specially if the peer has a non nul state and
- // we have a nul state ?
- // replicationServerDomain.
- // setGenerationId(generationId, false);
- Message message = NOTE_BAD_GENERATION_ID.get(
- this.baseDn.toNormalizedString(),
- Short.toString(receivedMsg.getServerId()),
- Long.toString(generationId),
- Long.toString(localGenerationId));
-
- ErrorMessage errorMsg =
- new ErrorMessage(replicationServerId, serverId, message);
- session.publish(errorMsg);
- }
- }
- }
- else
- {
- // The remote RS had no genId while the local one has one genID.
- // In our start msg, we have just sent our local genID to
- // the remote RS that will immediatly adopt it
- // So let's store our local genID as the genID of the remote RS.
- // It is necessary to do so, in order to not have a 'bad genID'
- // error when we will try to send updates to the remote RS
- // (before receiving the infoMsg from the remote RS !!!)
- generationId = localGenerationId;
- }
+ Message message = ERR_RS_DN_DOES_NOT_MATCH.get(
+ this.baseDn.toString(),
+ baseDn.toString());
+ closeSession(message);
+ if ((replicationServerDomain != null) &&
+ replicationServerDomain.hasLock())
+ replicationServerDomain.release();
+ return;
}
- else
+
+ if (debugEnabled())
{
- // The local RS is not initialized - take the one received
- replicationServerDomain.setGenerationId(generationId, false);
+ TRACER.debugInfo("In " +
+ replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() + ":" +
+ "\nSH HANDSHAKE SENT:\n" + outReplServerStartMsg.toString() +
+ "\nAND RECEIVED:\n" + inReplServerStartMsg.toString());
}
}
- }
- else
+ this.serverState = inReplServerStartMsg.getServerState();
+ sendWindowSize = inReplServerStartMsg.getWindowSize();
+
+ // Duplicate server ?
+ if (!replicationServerDomain.checkForDuplicateRS(this))
+ {
+ closeSession(null);
+ if ((replicationServerDomain != null) &&
+ replicationServerDomain.hasLock())
+ replicationServerDomain.release();
+ return;
+ }
+
+ /* Until here session is encrypted then it depends on the
+ negociation */
+ if (!sslEncryption)
+ {
+ session.stopEncryption();
+ }
+ } else
{
- // TODO : log error
- return; // we did not recognize the message, ignore it
+ // We did not recognize the message, close session as what
+ // can happen after is undetermined and we do not want the server to
+ // be disturbed
+ closeSession(null);
+ if ((replicationServerDomain != null) &&
+ replicationServerDomain.hasLock())
+ replicationServerDomain.release();
+ return;
}
- // Get or create the ReplicationServerDomain
- replicationServerDomain = replicationServer.
- getReplicationServerDomain(this.baseDn,true);
+ if (protocolVersion > ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ { // Only protocol version above V1 has a phase 2 handshake
- if (!handshakeOnly)
- {
- boolean started;
- if (serverIsLDAPserver)
+ /*
+ * NOW PROCEDE WITH SECOND PHASE OF HANDSHAKE:
+ * TopologyMsg then TopologyMsg (with a RS)
+ * OR
+ * StartSessionMsg then TopologyMsg (with a DS)
+ */
+
+ TopologyMsg outTopoMsg = null;
+
+ if (baseDn != null) // Outgoing connection to a RS
+
{
- started = replicationServerDomain.startServer(this);
- }
- else
- {
- started = replicationServerDomain.startReplicationServer(this);
+ // Send our own TopologyMsg to remote RS
+ outTopoMsg = replicationServerDomain.createTopologyMsgForRS();
+ session.publish(outTopoMsg);
}
- if (started)
+ // Wait and process TopologyMsg or StartSessionMsg
+ log_error_message = false;
+ ReplicationMsg msg2 = session.receive();
+ log_error_message = true;
+ if (msg2 instanceof TopologyMsg)
{
- // sendWindow MUST be created before starting the writer
- sendWindow = new Semaphore(sendWindowSize);
+ // Remote RS sent his topo msg
+ TopologyMsg inTopoMsg = (TopologyMsg) msg2;
- writer = new ServerWriter(session, serverId,
- this, replicationServerDomain);
- reader = new ServerReader(session, serverId,
- this, replicationServerDomain);
+ // CONNECTION WITH A RS
- reader.start();
- writer.start();
-
- // Create a thread to send heartbeat messages.
- if (heartbeatInterval > 0)
- {
- heartbeatThread = new HeartbeatThread(
- "replication Heartbeat to " + serverURL +
- " for " + this.baseDn,
- session, heartbeatInterval/3);
- heartbeatThread.start();
- }
-
- DirectoryServer.deregisterMonitorProvider(getMonitorInstanceName());
- DirectoryServer.registerMonitorProvider(this);
- }
- else
- {
- // the connection is not valid, close it.
- try
+ // if the remote RS and the local RS have the same genID
+ // then it's ok and nothing else to do
+ if (generationId == localGenerationId)
{
if (debugEnabled())
{
TRACER.debugInfo("In " +
- replicationServerDomain.getReplicationServer().
- getMonitorInstanceName() + " RS failed to start locally " +
- " the connection from serverID="+serverId);
+ replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() + " RS with serverID=" + serverId +
+ " is connected with the right generation ID");
}
- session.close();
- } catch (IOException e1)
+ } else
{
- // ignore
+ if (localGenerationId > 0)
+ {
+ // if the local RS is initialized
+ if (generationId > 0)
+ {
+ // if the remote RS is initialized
+ if (generationId != localGenerationId)
+ {
+ // if the 2 RS have different generationID
+ if (replicationServerDomain.getGenerationIdSavedStatus())
+ {
+ // it the present RS has received changes regarding its
+ // gen ID and so won't change without a reset
+ // then we are just degrading the peer.
+ Message message = NOTE_BAD_GENERATION_ID_FROM_RS.get(
+ this.baseDn.toNormalizedString(),
+ Short.toString(serverId),
+ Long.toString(generationId),
+ Long.toString(localGenerationId));
+ logError(message);
+ } else
+ {
+ // The present RS has never received changes regarding its
+ // gen ID.
+ //
+ // Example case:
+ // - we are in RS1
+ // - RS2 has genId2 from LS2 (genId2 <=> no data in LS2)
+ // - RS1 has genId1 from LS1 /genId1 comes from data in
+ // suffix
+ // - we are in RS1 and we receive a START msg from RS2
+ // - Each RS keeps its genID / is degraded and when LS2
+ // will be populated from LS1 everything will become ok.
+ //
+ // Issue:
+ // FIXME : Would it be a good idea in some cases to just
+ // set the gen ID received from the peer RS
+ // specially if the peer has a non null state and
+ // we have a nul state ?
+ // replicationServerDomain.
+ // setGenerationId(generationId, false);
+ Message message = NOTE_BAD_GENERATION_ID_FROM_RS.get(
+ this.baseDn.toNormalizedString(),
+ Short.toString(serverId),
+ Long.toString(generationId),
+ Long.toString(localGenerationId));
+ logError(message);
+ }
+ }
+ } else
+ {
+ // The remote RS has no genId. We don't change anything for the
+ // current RS.
+ }
+ } else
+ {
+ // The local RS is not initialized - take the one received
+ // WARNING: Must be done before computing topo message to send
+ // to peer server as topo message must embed valid generation id
+ // for our server
+ oldGenerationId =
+ replicationServerDomain.setGenerationId(generationId, false);
+ }
}
+
+ if (baseDn == null) // Reply to the RS (incoming connection)
+
+ {
+ // Send our own TopologyMsg to remote RS
+ outTopoMsg = replicationServerDomain.createTopologyMsgForRS();
+ session.publish(outTopoMsg);
+
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("In " +
+ replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() + ":" +
+ "\nSH HANDSHAKE RECEIVED:\n" + inTopoMsg.toString() +
+ "\nAND REPLIED:\n" + outTopoMsg.toString());
+ }
+ } else
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("In " +
+ replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() + ":" +
+ "\nSH HANDSHAKE SENT:\n" + outTopoMsg.toString() +
+ "\nAND RECEIVED:\n" + inTopoMsg.toString());
+ }
+ }
+
+ // Alright, connected with new RS (either outgoing or incoming
+ // connection): store handler.
+ Map<Short, ServerHandler> connectedRSs =
+ replicationServerDomain.getConnectedRSs();
+ connectedRSs.put(serverId, this);
+
+ // Process TopologyMsg sent by remote RS: store matching new info
+ // (this will also warn our connected DSs of the new received info)
+ replicationServerDomain.receiveTopoInfoFromRS(inTopoMsg, this, false);
+
+ } else if (msg2 instanceof StartSessionMsg)
+ {
+ // CONNECTION WITH A DS
+
+ // Process StartSessionMsg sent by remote DS
+ StartSessionMsg startSessionMsg = (StartSessionMsg) msg2;
+
+ this.status = startSessionMsg.getStatus();
+ // Sanity check: is it a valid initial status?
+ if (!isValidInitialStatus(this.status))
+ {
+ Message mesg = ERR_RS_INVALID_INIT_STATUS.get(
+ this.status.toString(), this.baseDn.toString(),
+ Short.toString(serverId));
+ closeSession(mesg);
+ if ((replicationServerDomain != null) &&
+ replicationServerDomain.hasLock())
+ replicationServerDomain.release();
+ return;
+ }
+ this.refUrls = startSessionMsg.getReferralsURLs();
+ this.assuredFlag = startSessionMsg.isAssured();
+ this.assuredMode = startSessionMsg.getAssuredMode();
+ this.safeDataLevel = startSessionMsg.getSafeDataLevel();
+
+ /*
+ * If we have already a generationID set for the domain
+ * then
+ * if the connecting replica has not the same
+ * then it is degraded locally and notified by an error message
+ * else
+ * we set the generationID from the one received
+ * (unsaved yet on disk . will be set with the 1rst change
+ * received)
+ */
+ if (localGenerationId > 0)
+ {
+ if (generationId != localGenerationId)
+ {
+ Message message = NOTE_BAD_GENERATION_ID_FROM_DS.get(
+ this.baseDn.toNormalizedString(),
+ Short.toString(serverId),
+ Long.toString(generationId),
+ Long.toString(localGenerationId));
+ logError(message);
+ }
+ } else
+ {
+ // We are an empty Replicationserver
+ if ((generationId > 0) && (!serverState.isEmpty()))
+ {
+ // If the LDAP server has already sent changes
+ // it is not expected to connect to an empty RS
+ Message message = NOTE_BAD_GENERATION_ID_FROM_DS.get(
+ this.baseDn.toNormalizedString(),
+ Short.toString(serverId),
+ Long.toString(generationId),
+ Long.toString(localGenerationId));
+ logError(message);
+ } else
+ {
+ // The local RS is not initialized - take the one received
+ // WARNING: Must be done before computing topo message to send
+ // to peer server as topo message must embed valid generation id
+ // for our server
+ oldGenerationId =
+ replicationServerDomain.setGenerationId(generationId, false);
+ }
+ }
+
+ // Send our own TopologyMsg to DS
+ outTopoMsg = replicationServerDomain.createTopologyMsgForDS(
+ this.serverId);
+ session.publish(outTopoMsg);
+
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("In " +
+ replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() + ":" +
+ "\nSH HANDSHAKE RECEIVED:\n" + startSessionMsg.toString() +
+ "\nAND REPLIED:\n" + outTopoMsg.toString());
+ }
+
+ // Alright, connected with new DS: store handler.
+ Map<Short, ServerHandler> connectedDSs =
+ replicationServerDomain.getConnectedDSs();
+ connectedDSs.put(serverId, this);
+
+ // Tell peer DSs a new DS just connected to us
+ // No need to resend topo msg to this just new DS so not null
+ // argument
+ replicationServerDomain.sendTopoInfoToDSs(this);
+ // Tell peer RSs a new DS just connected to us
+ replicationServerDomain.sendTopoInfoToRSs();
+ } else
+ {
+ // We did not recognize the message, close session as what
+ // can happen after is undetermined and we do not want the server to
+ // be disturbed
+ closeSession(null);
+ if ((replicationServerDomain != null) &&
+ replicationServerDomain.hasLock())
+ replicationServerDomain.release();
+ return;
}
}
- else
+
+ /*
+ * FINALIZE INITIALIZATION:
+ * CREATE READER AND WRITER, HEARTBEAT SYSTEM AND UPDATE MONITORING
+ * SYSTEM
+ */
+
+ // Disable timeout for next communications
+ session.setSoTimeout(0);
+ // sendWindow MUST be created before starting the writer
+ sendWindow = new Semaphore(sendWindowSize);
+
+ writer = new ServerWriter(session, serverId,
+ this, replicationServerDomain);
+ reader = new ServerReader(session, serverId,
+ this, replicationServerDomain);
+
+ reader.start();
+ writer.start();
+
+ // Create a thread to send heartbeat messages.
+ if (heartbeatInterval > 0)
{
- // For a hanshakeOnly connection, let's only create a reader
- // in order to detect the connection closure.
- reader = new ServerReader(session, serverId,
- this, replicationServerDomain);
- reader.start();
+ heartbeatThread = new HeartbeatThread(
+ "Replication Heartbeat to DS " + serverURL + " " + serverId +
+ " for " + this.baseDn + " in RS " + replicationServerId,
+ session, heartbeatInterval / 3);
+ heartbeatThread.start();
+ }
+
+ // Create the status analyzer for the domain if not already started
+ if (serverIsLDAPserver)
+ {
+ if (!replicationServerDomain.isRunningStatusAnalyzer())
+ {
+ if (debugEnabled())
+ TRACER.debugInfo("In " + replicationServerDomain.
+ getReplicationServer().
+ getMonitorInstanceName() +
+ " SH for remote server " + this.getMonitorInstanceName() +
+ " is starting status analyzer");
+ replicationServerDomain.startStatusAnalyzer();
+ }
+ }
+
+ DirectoryServer.deregisterMonitorProvider(getMonitorInstanceName());
+ DirectoryServer.registerMonitorProvider(this);
+ } catch (NotSupportedOldVersionPDUException e)
+ {
+ // We do not need to support DS V1 connection, we just accept RS V1
+ // connection:
+ // We just trash the message, log the event for debug purpose and close
+ // the connection
+ if (debugEnabled())
+ TRACER.debugInfo("In " + replicationServer.getMonitorInstanceName() + ":"
+ + e.getMessage());
+ closeSession(null);
+ } catch (Exception e)
+ {
+ // We do not want polluting error log if error is due to normal session
+ // aborted after handshake phase one from a DS that is searching for best
+ // suitable RS.
+ if ( log_error_message || (baseDn != null) )
+ {
+ // some problem happened, reject the connection
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(ERR_REPLICATION_SERVER_CONNECTION_ERROR.get(
+ this.getMonitorInstanceName()));
+ mb.append(": " + stackTraceToSingleLineString(e));
+ closeSession(mb.toMessage());
+ } else
+ {
+ closeSession(null);
+ }
+
+ // If generation id of domain was changed, set it back to old value
+ // We may have changed it as it was -1 and we received a value >0 from
+ // peer server and the last topo message sent may have failed being
+ // sent: in that case retrieve old value of generation id for
+ // replication server domain
+ if (oldGenerationId != -100)
+ {
+ replicationServerDomain.setGenerationId(oldGenerationId, false);
}
}
- catch (Exception e)
+
+ // Release domain
+ if ((replicationServerDomain != null) &&
+ replicationServerDomain.hasLock())
+ replicationServerDomain.release();
+ }
+
+ /*
+ * Close the session logging the passed error message
+ * Log nothing if message is null.
+ */
+ private void closeSession(Message msg)
+ {
+ if (msg != null)
{
- // some problem happened, reject the connection
- MessageBuilder mb = new MessageBuilder();
- mb.append(ERR_CHANGELOG_CONNECTION_ERROR.get(
- this.getMonitorInstanceName()));
- mb.append(stackTraceToSingleLineString(e));
- logError(mb.toMessage());
- try
- {
- session.close();
- } catch (IOException e1)
- {
- // ignore
- }
+ logError(msg);
+ }
+ try
+ {
+ session.close();
+ } catch (IOException ee)
+ {
+ // ignore
}
}
@@ -720,7 +1136,7 @@
* @return true is saturated false if not saturated.
*/
public boolean isSaturated(ChangeNumber changeNumber,
- ServerHandler sourceHandler)
+ ServerHandler sourceHandler)
{
synchronized (msgQueue)
{
@@ -730,23 +1146,23 @@
return true;
if ((sourceHandler.maxSendQueue > 0) &&
- (size >= sourceHandler.maxSendQueue))
+ (size >= sourceHandler.maxSendQueue))
return true;
if (!msgQueue.isEmpty())
{
- UpdateMessage firstUpdate = msgQueue.first();
+ UpdateMsg firstUpdate = msgQueue.first();
if (firstUpdate != null)
{
long timeDiff = changeNumber.getTimeSec() -
- firstUpdate.getChangeNumber().getTimeSec();
+ firstUpdate.getChangeNumber().getTimeSec();
if ((maxReceiveDelay > 0) && (timeDiff >= maxReceiveDelay))
return true;
if ((sourceHandler.maxSendDelay > 0) &&
- (timeDiff >= sourceHandler.maxSendDelay))
+ (timeDiff >= sourceHandler.maxSendDelay))
return true;
}
}
@@ -770,22 +1186,22 @@
if ((maxReceiveQueue > 0) && (queueSize >= restartReceiveQueue))
return false;
if ((source != null) && (source.maxSendQueue > 0) &&
- (queueSize >= source.restartSendQueue))
+ (queueSize >= source.restartSendQueue))
return false;
if (!msgQueue.isEmpty())
{
- UpdateMessage firstUpdate = msgQueue.first();
- UpdateMessage lastUpdate = msgQueue.last();
+ UpdateMsg firstUpdate = msgQueue.first();
+ UpdateMsg lastUpdate = msgQueue.last();
if ((firstUpdate != null) && (lastUpdate != null))
{
long timeDiff = lastUpdate.getChangeNumber().getTimeSec() -
- firstUpdate.getChangeNumber().getTimeSec();
+ firstUpdate.getChangeNumber().getTimeSec();
if ((maxReceiveDelay > 0) && (timeDiff >= restartReceiveDelay))
return false;
- if ((source != null) && (source.maxSendDelay > 0)
- && (timeDiff >= source.restartSendDelay))
+ if ((source != null) && (source.maxSendDelay > 0) && (timeDiff >=
+ source.restartSendDelay))
return false;
}
}
@@ -810,34 +1226,28 @@
*/
public int getRcvMsgQueueSize()
{
- synchronized (msgQueue)
- {
- /*
- * When the server is up to date or close to be up to date,
- * the number of updates to be sent is the size of the receive queue.
- */
- if (isFollowing())
- return msgQueue.count();
- else
- {
- /*
- * When the server is not able to follow, the msgQueue
- * may become too large and therefore won't contain all the
- * changes. Some changes may only be stored in the backing DB
- * of the servers.
- * The total size of teh receieve queue is calculated by doing
- * the sum of the number of missing changes for every dbHandler.
- */
- int totalCount = 0;
- ServerState dbState = replicationServerDomain.getDbServerState();
- for (short id : dbState)
- {
- totalCount = ChangeNumber.diffSeqNum(dbState.getMaxChangeNumber(id),
- serverState.getMaxChangeNumber(id));
- }
- return totalCount;
- }
- }
+ synchronized (msgQueue)
+ {
+ /*
+ * When the server is up to date or close to be up to date,
+ * the number of updates to be sent is the size of the receive queue.
+ */
+ if (isFollowing())
+ return msgQueue.count();
+ else
+ {
+ /*
+ * When the server is not able to follow, the msgQueue
+ * may become too large and therefore won't contain all the
+ * changes. Some changes may only be stored in the backing DB
+ * of the servers.
+ * The total size of teh receieve queue is calculated by doing
+ * the sum of the number of missing changes for every dbHandler.
+ */
+ ServerState dbState = replicationServerDomain.getDbServerState();
+ return ServerState.diffChanges(dbState, serverState);
+ }
+ }
}
/**
@@ -859,7 +1269,7 @@
return 0;
long currentTime = TimeThread.getTime();
- return ((currentTime - olderUpdateTime)/1000);
+ return ((currentTime - olderUpdateTime) / 1000);
}
/**
@@ -870,7 +1280,7 @@
*/
public Long getApproxFirstMissingDate()
{
- Long result = (long)0;
+ Long result = (long) 0;
// Get the older CN received
ChangeNumber olderUpdateCN = getOlderUpdateCN();
@@ -878,7 +1288,7 @@
{
// If not present in the local RS db,
// then approximate with the older update time
- result=olderUpdateCN.getTime();
+ result = olderUpdateCN.getTime();
}
return result;
}
@@ -892,7 +1302,7 @@
ChangeNumber olderUpdateCN = getOlderUpdateCN();
if (olderUpdateCN == null)
return 0;
- return olderUpdateCN.getTime();
+ return olderUpdateCN.getTime();
}
/**
@@ -909,15 +1319,13 @@
{
if (msgQueue.isEmpty())
{
- result=null;
- }
- else
+ result = null;
+ } else
{
- UpdateMessage msg = msgQueue.first();
+ UpdateMsg msg = msgQueue.first();
result = msg.getChangeNumber();
}
- }
- else
+ } else
{
if (lateQueue.isEmpty())
{
@@ -950,24 +1358,21 @@
iteratorSortedSet.add(iterator);
}
}
- UpdateMessage msg = iteratorSortedSet.first().getChange();
+ UpdateMsg msg = iteratorSortedSet.first().getChange();
result = msg.getChangeNumber();
- }
- catch(Exception e)
+ } catch (Exception e)
{
- result=null;
- }
- finally
+ result = null;
+ } finally
{
for (ReplicationIterator iterator : iteratorSortedSet)
{
iterator.releaseCursor();
}
}
- }
- else
+ } else
{
- UpdateMessage msg = lateQueue.first();
+ UpdateMsg msg = lateQueue.first();
result = msg.getChangeNumber();
}
}
@@ -995,33 +1400,14 @@
}
/**
- * Add an update the list of updates that must be sent to the server
+ * Add an update to the list of updates that must be sent to the server
* managed by this ServerHandler.
*
* @param update The update that must be added to the list of updates.
* @param sourceHandler The server that sent the update.
*/
- public void add(UpdateMessage update, ServerHandler sourceHandler)
+ public void add(UpdateMsg update, ServerHandler sourceHandler)
{
- /*
- * Ignore updates from a server that is degraded due to
- * its inconsistent generationId
- */
- long referenceGenerationId = replicationServerDomain.getGenerationId();
- if ((referenceGenerationId>0) &&
- (referenceGenerationId != generationId))
- {
- logError(ERR_IGNORING_UPDATE_TO.get(
- this.replicationServerDomain.getReplicationServer().
- getMonitorInstanceName(),
- update.getDn(),
- this.getMonitorInstanceName(),
- Long.toString(generationId),
- Long.toString(referenceGenerationId)));
-
- return;
- }
-
synchronized (msgQueue)
{
/*
@@ -1063,10 +1449,10 @@
* @return the next update that must be sent to the server managed by this
* ServerHandler.
*/
- public UpdateMessage take()
+ public UpdateMsg take()
{
boolean interrupted = true;
- UpdateMessage msg = getnextMessage();
+ UpdateMsg msg = getnextMessage();
/*
* When we remove a message from the queue we need to check if another
@@ -1080,8 +1466,7 @@
try
{
replicationServerDomain.checkAllSaturation();
- }
- catch (IOException e)
+ } catch (IOException e)
{
}
}
@@ -1090,13 +1475,13 @@
{
try
{
- acquired = sendWindow.tryAcquire((long)500, TimeUnit.MILLISECONDS);
+ acquired = sendWindow.tryAcquire((long) 500, TimeUnit.MILLISECONDS);
interrupted = false;
} catch (InterruptedException e)
{
// loop until not interrupted
}
- } while (((interrupted) || (!acquired )) && (!shutdown));
+ } while (((interrupted) || (!acquired)) && (!shutdownWriter));
this.incrementOutCount();
return msg;
}
@@ -1107,10 +1492,10 @@
*
* @return The next update that must be sent to the server.
*/
- private UpdateMessage getnextMessage()
+ private UpdateMsg getnextMessage()
{
- UpdateMessage msg;
- while (active == true)
+ UpdateMsg msg;
+ while (activeWriter == true)
{
if (following == false)
{
@@ -1157,8 +1542,7 @@
if (iterator.getChange() != null)
{
iteratorSortedSet.add(iterator);
- }
- else
+ } else
{
iterator.releaseCursor();
}
@@ -1201,8 +1585,7 @@
setFollowing(true);
}
}
- }
- else
+ } else
{
msg = lateQueue.first();
synchronized (msgQueue)
@@ -1212,7 +1595,7 @@
/* we finally catch up with the regular queue */
setFollowing(true);
lateQueue.clear();
- UpdateMessage msg1;
+ UpdateMsg msg1;
do
{
msg1 = msgQueue.removeFirst();
@@ -1222,8 +1605,7 @@
}
}
}
- }
- else
+ } else
{
/* get the next change from the lateQueue */
msg = lateQueue.removeFirst();
@@ -1240,7 +1622,7 @@
while (msgQueue.isEmpty())
{
msgQueue.wait(500);
- if (!active)
+ if (!activeWriter)
return null;
}
} catch (InterruptedException e)
@@ -1259,11 +1641,11 @@
}
}
}
- /*
- * Need to loop because following flag may have gone to false between
- * the first check at the beginning of this method
- * and the second check just above.
- */
+ /*
+ * Need to loop because following flag may have gone to false between
+ * the first check at the beginning of this method
+ * and the second check just above.
+ */
}
return null;
}
@@ -1274,7 +1656,7 @@
* @param msg the last update sent.
* @return boolean indicating if the update was meaningful.
*/
- public boolean updateServerState(UpdateMessage msg)
+ public boolean updateServerState(UpdateMsg msg)
{
return serverState.update(msg.getChangeNumber());
}
@@ -1290,45 +1672,6 @@
}
/**
- * Stop this server handler processing.
- */
- public void stopHandler()
- {
- active = false;
-
- // Stop the remote LSHandler
- for (LightweightServerHandler lsh : connectedServers.values())
- {
- lsh.stopHandler();
- }
- connectedServers.clear();
-
- try
- {
- session.close();
- } catch (IOException e)
- {
- // ignore.
- }
-
- synchronized (msgQueue)
- {
- /* wake up the writer thread on an empty queue so that it disappear */
- msgQueue.clear();
- msgQueue.notify();
- msgQueue.notifyAll();
- }
-
- // Stop the heartbeat thread.
- if (heartbeatThread != null)
- {
- heartbeatThread.shutdown();
- }
-
- DirectoryServer.deregisterMonitorProvider(getMonitorInstanceName());
- }
-
- /**
* Send the ack to the server that did the original modification.
*
* @param changeNumber The ChangeNumber of the update that is acked.
@@ -1336,7 +1679,7 @@
*/
public void sendAck(ChangeNumber changeNumber) throws IOException
{
- AckMessage ack = new AckMessage(changeNumber);
+ AckMsg ack = new AckMsg(changeNumber);
session.publish(ack);
outAckCount++;
}
@@ -1347,7 +1690,7 @@
* @param message The ack message that was received.
* @param ackingServerId The id of the server that acked the change.
*/
- public void ack(AckMessage message, short ackingServerId)
+ public void ack(AckMsg message, short ackingServerId)
{
ChangeNumber changeNumber = message.getChangeNumber();
AckMessageList ackList;
@@ -1377,7 +1720,7 @@
* @param message the ack message that was received.
* @param ackingServerId The id of the server that acked the change.
*/
- public static void ackChangelog(AckMessage message, short ackingServerId)
+ public static void ackChangelog(AckMsg message, short ackingServerId)
{
ChangeNumber changeNumber = message.getChangeNumber();
ReplServerAckMessageList ackList;
@@ -1397,9 +1740,9 @@
if (completedFlag)
{
ReplicationServerDomain replicationServerDomain =
- ackList.getChangelogCache();
+ ackList.getChangelogCache();
replicationServerDomain.sendAck(changeNumber, false,
- ackList.getReplicationServerId());
+ ackList.getReplicationServerId());
}
}
@@ -1410,11 +1753,11 @@
* @param nbWaitedAck The number of ack that must be received before
* the update is fully acked.
*/
- public void addWaitingAck(UpdateMessage update, int nbWaitedAck)
+ public void addWaitingAck(UpdateMsg update, int nbWaitedAck)
{
AckMessageList ackList = new AckMessageList(update.getChangeNumber(),
- nbWaitedAck);
- synchronized(waitingAcks)
+ nbWaitedAck);
+ synchronized (waitingAcks)
{
waitingAcks.put(update.getChangeNumber(), ackList);
}
@@ -1434,16 +1777,16 @@
* the update is fully acked.
*/
public static void addWaitingAck(
- UpdateMessage update,
- short ChangelogServerId, ReplicationServerDomain replicationServerDomain,
- int nbWaitedAck)
+ UpdateMsg update,
+ short ChangelogServerId, ReplicationServerDomain replicationServerDomain,
+ int nbWaitedAck)
{
ReplServerAckMessageList ackList =
- new ReplServerAckMessageList(update.getChangeNumber(),
- nbWaitedAck,
- ChangelogServerId,
- replicationServerDomain);
- synchronized(changelogsWaitingAcks)
+ new ReplServerAckMessageList(update.getChangeNumber(),
+ nbWaitedAck,
+ ChangelogServerId,
+ replicationServerDomain);
+ synchronized (changelogsWaitingAcks)
{
changelogsWaitingAcks.put(update.getChangeNumber(), ackList);
}
@@ -1486,7 +1829,7 @@
*/
@Override
public void initializeMonitorProvider(MonitorProviderCfg configuration)
- throws ConfigException,InitializationException
+ throws ConfigException, InitializationException
{
// Nothing to do for now
}
@@ -1501,12 +1844,12 @@
public String getMonitorInstanceName()
{
String str = baseDn.toString() +
- " " + serverURL + " " + String.valueOf(serverId);
+ " " + serverURL + " " + String.valueOf(serverId);
if (serverIsLDAPserver)
- return "Direct LDAP Server " + str;
+ return "Directory Server " + str;
else
- return "Remote Repl Server " + str;
+ return "Remote Replication Server " + str;
}
/**
@@ -1536,7 +1879,6 @@
public void updateMonitorData()
{
// As long as getUpdateInterval() returns 0, this will never get called
-
}
/**
@@ -1553,19 +1895,20 @@
ArrayList<Attribute> attributes = new ArrayList<Attribute>();
if (serverIsLDAPserver)
{
- attributes.add(new Attribute("LDAP-Server", serverURL));
- attributes.add(new Attribute("connected-to", this.replicationServerDomain.
- getReplicationServer().getMonitorInstanceName()));
+ attributes.add(Attributes.create("LDAP-Server", serverURL));
+ attributes.add(Attributes.create("connected-to",
+ this.replicationServerDomain.getReplicationServer()
+ .getMonitorInstanceName()));
}
else
{
- attributes.add(new Attribute("ReplicationServer-Server", serverURL));
+ attributes.add(Attributes.create("ReplicationServer-Server",
+ serverURL));
}
- attributes.add(new Attribute("server-id",
- String.valueOf(serverId)));
- attributes.add(new Attribute("base-dn",
- baseDn.toString()));
+ attributes.add(Attributes.create("server-id", String
+ .valueOf(serverId)));
+ attributes.add(Attributes.create("base-dn", baseDn.toString()));
if (serverIsLDAPserver)
{
@@ -1576,106 +1919,85 @@
// Oldest missing update
Long approxFirstMissingDate = md.getApproxFirstMissingDate(serverId);
- if ((approxFirstMissingDate != null) && (approxFirstMissingDate>0))
+ if ((approxFirstMissingDate != null) && (approxFirstMissingDate > 0))
{
Date date = new Date(approxFirstMissingDate);
- attributes.add(new Attribute("approx-older-change-not-synchronized",
- date.toString()));
- attributes.add(
- new Attribute("approx-older-change-not-synchronized-millis",
- String.valueOf(approxFirstMissingDate)));
+ attributes.add(Attributes.create(
+ "approx-older-change-not-synchronized", date.toString()));
+ attributes.add(Attributes.create(
+ "approx-older-change-not-synchronized-millis", String
+ .valueOf(approxFirstMissingDate)));
}
// Missing changes
long missingChanges = md.getMissingChanges(serverId);
- attributes.add(new Attribute("missing-changes",
- String.valueOf(missingChanges)));
+ attributes.add(Attributes.create("missing-changes", String
+ .valueOf(missingChanges)));
// Replication delay
long delay = md.getApproxDelay(serverId);
- attributes.add(new Attribute("approximate-delay",
- String.valueOf(delay)));
+ attributes.add(Attributes.create("approximate-delay", String
+ .valueOf(delay)));
}
- catch(Exception e)
+ catch (Exception e)
{
// TODO: improve the log
// We failed retrieving the remote monitor data.
- attributes.add(new Attribute("error",
+ attributes.add(Attributes.create("error",
stackTraceToSingleLineString(e)));
}
}
attributes.add(
- new Attribute("queue-size", String.valueOf(msgQueue.count())));
+ Attributes.create("queue-size", String.valueOf(msgQueue.count())));
attributes.add(
- new Attribute(
+ Attributes.create(
"queue-size-bytes", String.valueOf(msgQueue.bytesCount())));
attributes.add(
- new Attribute(
+ Attributes.create(
"following", String.valueOf(following)));
// Deprecated
- attributes.add(new Attribute("max-waiting-changes",
- String.valueOf(maxQueueSize)));
- attributes.add(new Attribute("update-sent",
- String.valueOf(getOutCount())));
- attributes.add(new Attribute("update-received",
- String.valueOf(getInCount())));
+ attributes.add(Attributes.create("max-waiting-changes", String
+ .valueOf(maxQueueSize)));
+ attributes.add(Attributes.create("update-sent", String
+ .valueOf(getOutCount())));
+ attributes.add(Attributes.create("update-received", String
+ .valueOf(getInCount())));
// Deprecated as long as assured is not exposed
- attributes.add(new Attribute("update-waiting-acks",
- String.valueOf(getWaitingAckSize())));
- attributes.add(new Attribute("ack-sent", String.valueOf(getOutAckCount())));
- attributes.add(new Attribute("ack-received",
- String.valueOf(getInAckCount())));
+ attributes.add(Attributes.create("update-waiting-acks", String
+ .valueOf(getWaitingAckSize())));
+ attributes.add(Attributes.create("ack-sent", String
+ .valueOf(getOutAckCount())));
+ attributes.add(Attributes.create("ack-received", String
+ .valueOf(getInAckCount())));
// Window stats
- attributes.add(new Attribute("max-send-window",
- String.valueOf(sendWindowSize)));
- attributes.add(new Attribute("current-send-window",
- String.valueOf(sendWindow.availablePermits())));
- attributes.add(new Attribute("max-rcv-window",
- String.valueOf(maxRcvWindow)));
- attributes.add(new Attribute("current-rcv-window",
- String.valueOf(rcvWindow)));
-
- /*
- * FIXME:PGB DEPRECATED
- *
- // Missing changes
- attributes.add(new Attribute("waiting-changes",
- String.valueOf(getRcvMsgQueueSize())));
- // Age of oldest missing change
-
- // Date of the oldest missing change
- long olderUpdateTime = getOlderUpdateTime();
- if (olderUpdateTime != 0)
- {
- Date date = new Date(getOlderUpdateTime());
- attributes.add(new Attribute("older-change-not-synchronized",
- String.valueOf(date.toString())));
- }
- */
+ attributes.add(Attributes.create("max-send-window", String
+ .valueOf(sendWindowSize)));
+ attributes.add(Attributes.create("current-send-window", String
+ .valueOf(sendWindow.availablePermits())));
+ attributes.add(Attributes.create("max-rcv-window", String
+ .valueOf(maxRcvWindow)));
+ attributes.add(Attributes.create("current-rcv-window", String
+ .valueOf(rcvWindow)));
/* get the Server State */
- final String ATTR_SERVER_STATE = "server-state";
- AttributeType type =
- DirectoryServer.getDefaultAttributeType(ATTR_SERVER_STATE);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder("server-state");
for (String str : serverState.toStringSet())
{
- values.add(new AttributeValue(type,str));
+ builder.add(str);
}
- Attribute attr = new Attribute(type, ATTR_SERVER_STATE, values);
- attributes.add(attr);
+ attributes.add(builder.toAttribute());
// Encryption
- attributes.add(new Attribute("ssl-encryption",
- String.valueOf(session.isEncrypted())));
+ attributes.add(Attributes.create("ssl-encryption", String
+ .valueOf(session.isEncrypted())));
// Data generation
- attributes.add(new Attribute("generation-id",
- String.valueOf(generationId)));
+ attributes.add(Attributes.create("generation-id", String
+ .valueOf(generationId)));
return attributes;
}
@@ -1685,23 +2007,63 @@
*/
public void shutdown()
{
- shutdown = true;
+ /*
+ * Shutdown ServerWriter
+ */
+ shutdownWriter = true;
+ activeWriter = false;
+ synchronized (msgQueue)
+ {
+ /* wake up the writer thread on an empty queue so that it disappear */
+ msgQueue.clear();
+ msgQueue.notify();
+ msgQueue.notifyAll();
+ }
+
+ /*
+ * Close session to end ServerReader or ServerWriter
+ */
try
{
session.close();
} catch (IOException e)
{
- // Service is closing.
+ // ignore.
}
- stopHandler();
+ /*
+ * Stop the remote LSHandler
+ */
+ for (LightweightServerHandler lsh : directoryServers.values())
+ {
+ lsh.stopHandler();
+ }
+ directoryServers.clear();
+ /*
+ * Stop the heartbeat thread.
+ */
+ if (heartbeatThread != null)
+ {
+ heartbeatThread.shutdown();
+ }
+
+ DirectoryServer.deregisterMonitorProvider(getMonitorInstanceName());
+
+ /*
+ * Be sure to wait for ServerWriter and ServerReader death
+ * It does not matter if we try to stop a thread which is us (reader
+ * or writer), but we must not wait for our own thread death.
+ */
try
{
- if (writer != null) {
+ if ((writer != null) && (!(Thread.currentThread().equals(writer))))
+ {
+
writer.join(SHUTDOWN_JOIN_TIMEOUT);
}
- if (reader != null) {
+ if ((reader != null) && (!(Thread.currentThread().equals(reader))))
+ {
reader.join(SHUTDOWN_JOIN_TIMEOUT);
}
} catch (InterruptedException e)
@@ -1726,8 +2088,7 @@
localString += serverId + " " + serverURL + " " + baseDn;
- }
- else
+ } else
localString = "Unknown server";
return localString;
@@ -1735,7 +2096,7 @@
/**
* Decrement the protocol window, then check if it is necessary
- * to send a WindowMessage and send it.
+ * to send a WindowMsg and send it.
*
* @throws IOException when the session becomes unavailable.
*/
@@ -1746,7 +2107,7 @@
}
/**
- * Check the protocol window and send WindowMessage if necessary.
+ * Check the protocol window and send WindowMsg if necessary.
*
* @throws IOException when the session becomes unavailable.
*/
@@ -1763,7 +2124,7 @@
}
if (!flowControl)
{
- WindowMessage msg = new WindowMessage(rcvWindowSizeHalf);
+ WindowMsg msg = new WindowMsg(rcvWindowSizeHalf);
session.publish(msg);
outAckCount++;
rcvWindow += rcvWindowSizeHalf;
@@ -1778,7 +2139,7 @@
* @param windowMsg The Window Message containing the information
* necessary for updating the window size.
*/
- public void updateWindow(WindowMessage windowMsg)
+ public void updateWindow(WindowMsg windowMsg)
{
sendWindow.release(windowMsg.getNumAck());
}
@@ -1797,107 +2158,204 @@
*
* @param msg The message to be processed.
*/
- public void process(RoutableMessage msg)
+ public void process(RoutableMsg msg)
{
if (debugEnabled())
- TRACER.debugInfo("In " + replicationServerDomain.getReplicationServer().
- getMonitorInstanceName() +
- " SH for remote server " + this.getMonitorInstanceName() +
- " processes received msg=" + msg);
+ TRACER.debugInfo("In " + replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() +
+ " SH for remote server " + this.getMonitorInstanceName() + ":" +
+ "\nprocesses received msg:\n" + msg);
replicationServerDomain.process(msg, this);
}
/**
- * Sends the provided ReplServerInfoMessage.
+ * Sends the provided TopologyMsg to the peer server.
*
- * @param info The ReplServerInfoMessage message to be sent.
+ * @param topoMsg The TopologyMsg message to be sent.
* @throws IOException When it occurs while sending the message,
*
*/
- public void sendInfo(ReplServerInfoMessage info)
- throws IOException
- {
- if (debugEnabled())
- TRACER.debugInfo("In " + replicationServerDomain.getReplicationServer().
- getMonitorInstanceName() +
- " SH for remote server " + this.getMonitorInstanceName() +
- " sends message=" + info);
+ public void sendTopoInfo(TopologyMsg topoMsg)
+ throws IOException
+ {
+ // V1 Rs do not support the TopologyMsg
+ if (protocolVersion > ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ {
+ if (debugEnabled())
+ TRACER.debugInfo("In " + replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() +
+ " SH for remote server " + this.getMonitorInstanceName() + ":" +
+ "\nsends message:\n" + topoMsg);
- session.publish(info);
- }
+ session.publish(topoMsg);
+ }
+ }
- /**
- *
- * Sets the replication server from the message provided.
- *
- * @param infoMsg The information message.
- */
- public void receiveReplServerInfo(ReplServerInfoMessage infoMsg)
- {
- if (debugEnabled())
- TRACER.debugInfo("In " + replicationServerDomain.getReplicationServer().
- getMonitorInstanceName() +
- " SH for remote server " + this.getMonitorInstanceName() +
- " sets replServerInfo " + "<" + infoMsg + ">");
+ /**
+ * Stores topology information received from a peer RS and that must be kept
+ * in RS handler.
+ *
+ * @param topoMsg The received topology message
+ */
+ public void receiveTopoInfoFromRS(TopologyMsg topoMsg)
+ {
+ // Store info for remote RS
+ List<RSInfo> rsInfos = topoMsg.getRsList();
+ // List should only contain RS info for sender
+ RSInfo rsInfo = rsInfos.get(0);
+ generationId = rsInfo.getGenerationId();
+ groupId = rsInfo.getGroupId();
- List<String> newRemoteLDAPservers = infoMsg.getConnectedServers();
- generationId = infoMsg.getGenerationId();
+ /**
+ * Store info for DSs connected to the peer RS
+ */
+ List<DSInfo> dsInfos = topoMsg.getDsList();
- synchronized(connectedServers)
- {
- // Removes the existing structures
- for (LightweightServerHandler lsh : connectedServers.values())
- {
- lsh.stopHandler();
- }
- connectedServers.clear();
+ // Removes the existing structures
+ for (LightweightServerHandler lsh : directoryServers.values())
+ {
+ lsh.stopHandler();
+ }
+ directoryServers.clear();
- // Creates the new structure according to the message received.
- for (String newConnectedServer : newRemoteLDAPservers)
- {
- LightweightServerHandler lsh
- = new LightweightServerHandler(newConnectedServer, this);
- lsh.startHandler();
- connectedServers.put(lsh.getServerId(), lsh);
- }
- }
- }
+ // Creates the new structure according to the message received.
+ for (DSInfo dsInfo : dsInfos)
+ {
+ LightweightServerHandler lsh = new LightweightServerHandler(this,
+ serverId, dsInfo.getDsId(), dsInfo.getGenerationId(),
+ dsInfo.getGroupId(), dsInfo.getStatus(), dsInfo.getRefUrls(),
+ dsInfo.isAssured(), dsInfo.getAssuredMode(),
+ dsInfo.getSafeDataLevel());
+ lsh.startHandler();
+ directoryServers.put(lsh.getServerId(), lsh);
+ }
+ }
- /**
- * When this handler is connected to a replication server, specifies if
- * a wanted server is connected to this replication server.
- *
- * @param wantedServer The server we want to know if it is connected
- * to the replication server represented by this handler.
- * @return boolean True is the wanted server is connected to the server
- * represented by this handler.
- */
- public boolean isRemoteLDAPServer(short wantedServer)
- {
- synchronized(connectedServers)
- {
- for (LightweightServerHandler server : connectedServers.values())
- {
- if (wantedServer == server.getServerId())
- {
- return true;
- }
- }
- return false;
- }
- }
+ /**
+ * Process message of a remote server changing his status.
+ * @param csMsg The message containing the new status
+ * @return The new server status of the DS
+ */
+ public ServerStatus processNewStatus(ChangeStatusMsg csMsg)
+ {
- /**
- * When the handler is connected to a replication server, specifies the
- * replication server has remote LDAP servers connected to it.
- *
- * @return boolean True is the replication server has remote LDAP servers
- * connected to it.
- */
- public boolean hasRemoteLDAPServers()
- {
- return !connectedServers.isEmpty();
- }
+ // Sanity check
+ if (!serverIsLDAPserver)
+ {
+ Message msg =
+ ERR_RECEIVED_CHANGE_STATUS_NOT_FROM_DS.get(baseDn.toString(),
+ Short.toString(serverId), csMsg.toString());
+ logError(msg);
+ return ServerStatus.INVALID_STATUS;
+ }
+
+ // Get the status the DS just entered
+ ServerStatus reqStatus = csMsg.getNewStatus();
+ // Translate new status to a state machine event
+ StatusMachineEvent event = StatusMachineEvent.statusToEvent(reqStatus);
+ if (event == StatusMachineEvent.INVALID_EVENT)
+ {
+ Message msg = ERR_RS_INVALID_NEW_STATUS.get(reqStatus.toString(),
+ baseDn.toString(), Short.toString(serverId));
+ logError(msg);
+ return ServerStatus.INVALID_STATUS;
+ }
+
+ // Check state machine allows this new status
+ ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
+ if (newStatus == ServerStatus.INVALID_STATUS)
+ {
+ Message msg = ERR_RS_CANNOT_CHANGE_STATUS.get(baseDn.toString(),
+ Short.toString(serverId), status.toString(), event.toString());
+ logError(msg);
+ return ServerStatus.INVALID_STATUS;
+ }
+
+ status = newStatus;
+
+ return status;
+ }
+
+ /**
+ * Change the status according to the event generated from the status
+ * analyzer.
+ * @param event The event to be used for new status computation
+ * @return The new status of the DS
+ * @throws IOException When raised by the underlying session
+ */
+ public ServerStatus changeStatusFromStatusAnalyzer(StatusMachineEvent event)
+ throws IOException
+ {
+ // Check state machine allows this new status (Sanity check)
+ ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
+ if (newStatus == ServerStatus.INVALID_STATUS)
+ {
+ Message msg = ERR_RS_CANNOT_CHANGE_STATUS.get(baseDn.toString(),
+ Short.toString(serverId), status.toString(), event.toString());
+ logError(msg);
+ // Status analyzer must only change from NORMAL_STATUS to DEGRADED_STATUS
+ // and vice versa. We may are being trying to change the status while for
+ // instance another status has just been entered: e.g a full update has
+ // just been engaged. In that case, just ignore attempt to change the
+ // status
+ return newStatus;
+ }
+
+ // Send message requesting to change the DS status
+ ChangeStatusMsg csMsg = new ChangeStatusMsg(newStatus,
+ ServerStatus.INVALID_STATUS);
+
+ if (debugEnabled())
+ {
+ TRACER.debugInfo(
+ "In RS " +
+ replicationServerDomain.getReplicationServer().getServerId() +
+ " Sending change status from status analyzer to " + getServerId() +
+ " for baseDn " + baseDn + ":\n" + csMsg);
+ }
+
+ session.publish(csMsg);
+
+ status = newStatus;
+
+ return newStatus;
+ }
+
+ /**
+ * When this handler is connected to a replication server, specifies if
+ * a wanted server is connected to this replication server.
+ *
+ * @param wantedServer The server we want to know if it is connected
+ * to the replication server represented by this handler.
+ * @return boolean True is the wanted server is connected to the server
+ * represented by this handler.
+ */
+ public boolean isRemoteLDAPServer(short wantedServer)
+ {
+ synchronized (directoryServers)
+ {
+ for (LightweightServerHandler server : directoryServers.values())
+ {
+ if (wantedServer == server.getServerId())
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ /**
+ * When the handler is connected to a replication server, specifies the
+ * replication server has remote LDAP servers connected to it.
+ *
+ * @return boolean True is the replication server has remote LDAP servers
+ * connected to it.
+ */
+ public boolean hasRemoteLDAPServers()
+ {
+ return !directoryServers.isEmpty();
+ }
/**
* Send an InitializeRequestMessage to the server connected through this
@@ -1906,36 +2364,36 @@
* @param msg The message to be processed
* @throws IOException when raised by the underlying session
*/
- public void send(RoutableMessage msg) throws IOException
+ public void send(RoutableMsg msg) throws IOException
{
if (debugEnabled())
- TRACER.debugInfo("In " +
- replicationServerDomain.getReplicationServer().
- getMonitorInstanceName() +
- " SH for remote server " + this.getMonitorInstanceName() +
- " sends message=" + msg);
+ TRACER.debugInfo("In " +
+ replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() +
+ " SH for remote server " + this.getMonitorInstanceName() + ":" +
+ "\nsends message:\n" + msg);
session.publish(msg);
}
/**
- * Send an ErrorMessage to the peer.
+ * Send an ErrorMsg to the peer.
*
* @param errorMsg The message to be sent
* @throws IOException when raised by the underlying session
*/
- public void sendError(ErrorMessage errorMsg) throws IOException
+ public void sendError(ErrorMsg errorMsg) throws IOException
{
session.publish(errorMsg);
}
/**
- * Process the reception of a WindowProbe message.
+ * Process the reception of a WindowProbeMsg message.
*
* @param windowProbeMsg The message to process.
*
* @throws IOException When the session becomes unavailable.
*/
- public void process(WindowProbe windowProbeMsg) throws IOException
+ public void process(WindowProbeMsg windowProbeMsg) throws IOException
{
if (rcvWindow > 0)
{
@@ -1945,11 +2403,10 @@
// lets update the LDAP server with out current window size and hope
// that everything will work better in the futur.
// TODO also log an error message.
- WindowMessage msg = new WindowMessage(rcvWindow);
+ WindowMsg msg = new WindowMsg(rcvWindow);
session.publish(msg);
outAckCount++;
- }
- else
+ } else
{
// Both the LDAP server and the replication server believes that the
// window is closed. Lets check the flowcontrol in case we
@@ -1968,27 +2425,6 @@
}
/**
- * Resets the generationId for this domain.
- */
- public void warnBadGenerationId()
- {
- // Notify the peer that it is now invalid regarding the generationId
- // We are now waiting a startServer message from this server with
- // a valid generationId.
- try
- {
- Message message = NOTE_RESET_GENERATION_ID.get(baseDn.toString());
- ErrorMessage errorMsg =
- new ErrorMessage(serverId, replicationServerId, message);
- session.publish(errorMsg);
- }
- catch (Exception e)
- {
- // FIXME Log exception when sending reset error message
- }
- }
-
- /**
* Sends a message containing a generationId to a peer server.
* The peer is expected to be a replication server.
*
@@ -1996,8 +2432,8 @@
* @throws IOException When it occurs while sending the message,
*
*/
- public void forwardGenerationIdToRS(ResetGenerationId msg)
- throws IOException
+ public void forwardGenerationIdToRS(ResetGenerationIdMsg msg)
+ throws IOException
{
session.publish(msg);
}
@@ -2027,8 +2463,166 @@
* Return a Set containing the servers known by this replicationServer.
* @return a set containing the servers known by this replicationServer.
*/
- public Set<Short> getConnectedServerIds()
+ public Set<Short> getConnectedDirectoryServerIds()
{
- return connectedServers.keySet();
+ return directoryServers.keySet();
+ }
+
+ /**
+ * Get the map of connected DSs
+ * (to the RS represented by this server handler).
+ * @return The map of connected DSs
+ */
+ public Map<Short, LightweightServerHandler> getConnectedDSs()
+ {
+ return directoryServers;
+ }
+
+ /**
+ * Order the peer DS server to change his status or close the connection
+ * according to the requested new generation id.
+ * @param newGenId The new generation id to take into account
+ * @throws IOException If IO error occurred.
+ */
+ public void changeStatusForResetGenId(long newGenId)
+ throws IOException
+ {
+ StatusMachineEvent event = null;
+
+ if (newGenId == -1)
+ {
+ // The generation id is being made invalid, let's put the DS
+ // into BAD_GEN_ID_STATUS
+ event = StatusMachineEvent.TO_BAD_GEN_ID_STATUS_EVENT;
+ } else
+ {
+ if (newGenId == generationId)
+ {
+ if (status == ServerStatus.BAD_GEN_ID_STATUS)
+ {
+ // This server has the good new reference generation id.
+ // Close connection with him to force his reconnection: DS will
+ // reconnect in NORMAL_STATUS or DEGRADED_STATUS.
+
+ if (debugEnabled())
+ {
+ TRACER.debugInfo(
+ "In RS " +
+ replicationServerDomain.getReplicationServer().getServerId() +
+ ". Closing connection to DS " + getServerId() +
+ " for baseDn " + baseDn + " to force reconnection as new local" +
+ " generation id and remote one match and DS is in bad gen id: " +
+ newGenId);
+ }
+
+ // Connection closure must not be done calling RSD.stopHandler() as it
+ // would rewait the RSD lock that we already must have entering this
+ // method. This would lead to a reentrant lock which we do not want.
+ // So simply close the session, this will make the hang up appear
+ // after the reader thread that took the RSD lock realeases it.
+ try
+ {
+ if (session != null)
+ session.close();
+ } catch (IOException e)
+ {
+ // ignore
+ }
+
+ // NOT_CONNECTED_STATUS is the last one in RS session life: handler
+ // will soon disappear after this method call...
+ status = ServerStatus.NOT_CONNECTED_STATUS;
+ return;
+ } else
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugInfo(
+ "In RS " +
+ replicationServerDomain.getReplicationServer().getServerId() +
+ ". DS " + getServerId() + " for baseDn " + baseDn +
+ " has already generation id " + newGenId +
+ " so no ChangeStatusMsg sent to him.");
+ }
+ return;
+ }
+ } else
+ {
+ // This server has a bad generation id compared to new reference one,
+ // let's put it into BAD_GEN_ID_STATUS
+ event = StatusMachineEvent.TO_BAD_GEN_ID_STATUS_EVENT;
+ }
+ }
+
+ if ((event == StatusMachineEvent.TO_BAD_GEN_ID_STATUS_EVENT) &&
+ (status == ServerStatus.FULL_UPDATE_STATUS))
+ {
+ // Prevent useless error message (full update status cannot lead to bad
+ // gen status)
+ Message message = NOTE_BAD_GEN_ID_IN_FULL_UPDATE.get(
+ Short.toString(replicationServerDomain.
+ getReplicationServer().getServerId()),
+ baseDn.toString(),
+ Short.toString(serverId),
+ Long.toString(generationId),
+ Long.toString(newGenId));
+ logError(message);
+ return;
+ }
+
+ ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
+
+ if (newStatus == ServerStatus.INVALID_STATUS)
+ {
+ Message msg = ERR_RS_CANNOT_CHANGE_STATUS.get(baseDn.toString(),
+ Short.toString(serverId), status.toString(), event.toString());
+ logError(msg);
+ return;
+ }
+
+ // Send message requesting to change the DS status
+ ChangeStatusMsg csMsg = new ChangeStatusMsg(newStatus,
+ ServerStatus.INVALID_STATUS);
+
+ if (debugEnabled())
+ {
+ TRACER.debugInfo(
+ "In RS " +
+ replicationServerDomain.getReplicationServer().getServerId() +
+ " Sending change status for reset gen id to " + getServerId() +
+ " for baseDn " + baseDn + ":\n" + csMsg);
+ }
+
+ session.publish(csMsg);
+
+ status = newStatus;
+ }
+
+ /**
+ * Set the shut down flag to true and returns the previous value of the flag.
+ * @return The previous value of the shut down flag
+ */
+ public boolean engageShutdown()
+ {
+ // Use thread safe boolean
+ return shuttingDown.getAndSet(true);
+ }
+
+ /**
+ * Gets the status of the connected DS.
+ * @return The status of the connected DS.
+ */
+ public ServerStatus getStatus()
+ {
+ return status;
+ }
+
+ /**
+ * Gets the protocol version used with this remote server.
+ * @return The protocol version used with this remote server.
+ */
+ public short getProtocolVersion()
+ {
+ return protocolVersion;
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java
index ef1b67c..7df0c87 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java
@@ -25,6 +25,7 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.replication.server;
+
import org.opends.messages.Message;
import static org.opends.server.loggers.ErrorLogger.logError;
@@ -36,23 +37,26 @@
import java.io.IOException;
import org.opends.server.api.DirectoryThread;
-import org.opends.server.replication.protocol.AckMessage;
-import org.opends.server.replication.protocol.DoneMessage;
-import org.opends.server.replication.protocol.EntryMessage;
-import org.opends.server.replication.protocol.ErrorMessage;
-import org.opends.server.replication.protocol.ResetGenerationId;
-import org.opends.server.replication.protocol.InitializeRequestMessage;
-import org.opends.server.replication.protocol.InitializeTargetMessage;
+import org.opends.server.replication.protocol.AckMsg;
+import org.opends.server.replication.protocol.DoneMsg;
+import org.opends.server.replication.protocol.EntryMsg;
+import org.opends.server.replication.protocol.ErrorMsg;
+import org.opends.server.replication.protocol.ResetGenerationIdMsg;
+import org.opends.server.replication.protocol.InitializeRequestMsg;
+import org.opends.server.replication.protocol.InitializeTargetMsg;
import org.opends.server.replication.protocol.ProtocolSession;
-import org.opends.server.replication.protocol.ReplicationMessage;
-import org.opends.server.replication.protocol.UpdateMessage;
-import org.opends.server.replication.protocol.WindowMessage;
-import org.opends.server.replication.protocol.WindowProbe;
-import org.opends.server.replication.protocol.ReplServerInfoMessage;
-import org.opends.server.replication.protocol.MonitorMessage;
-import org.opends.server.replication.protocol.MonitorRequestMessage;
+import org.opends.server.replication.protocol.ReplicationMsg;
+import org.opends.server.replication.protocol.UpdateMsg;
+import org.opends.server.replication.protocol.WindowMsg;
+import org.opends.server.replication.protocol.WindowProbeMsg;
+import org.opends.server.replication.protocol.TopologyMsg;
+import org.opends.server.replication.protocol.MonitorMsg;
+import org.opends.server.replication.protocol.MonitorRequestMsg;
import org.opends.server.loggers.debug.DebugTracer;
-
+import org.opends.server.replication.common.ServerStatus;
+import org.opends.server.replication.protocol.ChangeStatusMsg;
+import org.opends.server.replication.protocol.
+ NotSupportedOldVersionPDUException;
/**
* This class implement the part of the replicationServer that is reading
@@ -66,11 +70,11 @@
*/
public class ServerReader extends DirectoryThread
{
+
/**
* The tracer object for the debug logger.
*/
private static final DebugTracer TRACER = getTracer();
-
private short serverId;
private ProtocolSession session;
private ServerHandler handler;
@@ -86,10 +90,11 @@
* reader.
*/
public ServerReader(ProtocolSession session, short serverId,
- ServerHandler handler,
- ReplicationServerDomain replicationServerDomain)
+ ServerHandler handler,
+ ReplicationServerDomain replicationServerDomain)
{
- super(handler.toString() + " reader");
+ super("Replication Reader for " + handler.toString() + " in RS " +
+ replicationServerDomain.getReplicationServer().getServerId());
this.session = session;
this.serverId = serverId;
this.handler = handler;
@@ -104,10 +109,10 @@
if (debugEnabled())
{
TRACER.debugInfo(
- "In RS " + replicationServerDomain.getReplicationServer().
- getMonitorInstanceName() +
- (handler.isReplicationServer()?" RS ":" LS")+
- " reader starting for serverId=" + serverId);
+ "In RS " + replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() +
+ (handler.isReplicationServer() ? " RS " : " LS") +
+ " reader starting for serverId=" + serverId);
}
/*
* wait on input stream
@@ -118,103 +123,146 @@
{
while (true)
{
- ReplicationMessage msg = session.receive();
+ ReplicationMsg msg = session.receive();
/*
if (debugEnabled())
{
- TRACER.debugInfo(
- "In RS " + replicationServerDomain.getReplicationServer().
- getMonitorInstanceName() +
- (handler.isReplicationServer()?" From RS ":" From LS")+
- " with serverId=" + serverId + " receives " + msg);
+ TRACER.debugInfo(
+ "In RS " + replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() +
+ (handler.isReplicationServer()?" From RS ":" From LS")+
+ " with serverId=" + serverId + " receives " + msg);
}
- */
- if (msg instanceof AckMessage)
+ */
+ if (msg instanceof AckMsg)
{
- AckMessage ack = (AckMessage) msg;
+ AckMsg ack = (AckMsg) msg;
handler.checkWindow();
replicationServerDomain.ack(ack, serverId);
- }
- else if (msg instanceof UpdateMessage)
+ } else if (msg instanceof UpdateMsg)
{
- // Ignore update received from a replica with
- // a bad generation ID
- long referenceGenerationId =
- replicationServerDomain.getGenerationId();
- if ((referenceGenerationId>0) &&
+ boolean filtered = false;
+ /* Ignore updates in some cases */
+ if (handler.isLDAPserver())
+ {
+ /**
+ * Ignore updates from DS in bad BAD_GENID_STATUS or
+ * FULL_UPDATE_STATUS
+ *
+ * The RSD lock should not be taken here as it is acceptable to have
+ * a delay between the time the server has a wrong status and the
+ * fact we detect it: the updates that succeed to pass during this
+ * time will have no impact on remote server. But it is interesting
+ * to not saturate uselessly the network if the updates are not
+ * necessary so this check to stop sending updates is interesting
+ * anyway. Not taking the RSD lock allows to have better
+ * performances in normal mode (most of the time).
+ */
+ ServerStatus dsStatus = handler.getStatus();
+ if ((dsStatus == ServerStatus.BAD_GEN_ID_STATUS) ||
+ (dsStatus == ServerStatus.FULL_UPDATE_STATUS))
+ {
+ long referenceGenerationId =
+ replicationServerDomain.getGenerationId();
+ if (dsStatus == ServerStatus.BAD_GEN_ID_STATUS)
+ logError(ERR_IGNORING_UPDATE_FROM_DS_BADGENID.get(
+ Short.toString(replicationServerDomain.getReplicationServer().
+ getServerId()),
+ replicationServerDomain.getBaseDn().toNormalizedString(),
+ ((UpdateMsg) msg).getChangeNumber().toString(),
+ Short.toString(handler.getServerId()),
+ Long.toString(referenceGenerationId),
+ Long.toString(handler.getGenerationId())));
+ if (dsStatus == ServerStatus.FULL_UPDATE_STATUS)
+ logError(ERR_IGNORING_UPDATE_FROM_DS_FULLUP.get(
+ Short.toString(replicationServerDomain.getReplicationServer().
+ getServerId()),
+ replicationServerDomain.getBaseDn().toNormalizedString(),
+ ((UpdateMsg) msg).getChangeNumber().toString(),
+ Short.toString(handler.getServerId())));
+ filtered = true;
+ }
+ } else
+ {
+ /**
+ * Ignore updates from RS with bad gen id
+ * (no system managed status for a RS)
+ */
+ long referenceGenerationId =
+ replicationServerDomain.getGenerationId();
+ if ((referenceGenerationId > 0) &&
(referenceGenerationId != handler.getGenerationId()))
- {
- logError(ERR_IGNORING_UPDATE_FROM.get(
- msg.toString(),
- handler.getMonitorInstanceName()));
+ {
+ logError(ERR_IGNORING_UPDATE_FROM_RS.get(
+ Short.toString(replicationServerDomain.getReplicationServer().
+ getServerId()),
+ replicationServerDomain.getBaseDn().toNormalizedString(),
+ ((UpdateMsg) msg).getChangeNumber().toString(),
+ Short.toString(handler.getServerId()),
+ Long.toString(referenceGenerationId),
+ Long.toString(handler.getGenerationId())));
+ filtered = true;
+ }
}
- else
+
+ if (!filtered)
{
- UpdateMessage update = (UpdateMessage) msg;
+ UpdateMsg update = (UpdateMsg) msg;
handler.decAndCheckWindow();
replicationServerDomain.put(update, handler);
}
- }
- else if (msg instanceof WindowMessage)
+ } else if (msg instanceof WindowMsg)
{
- WindowMessage windowMsg = (WindowMessage) msg;
+ WindowMsg windowMsg = (WindowMsg) msg;
handler.updateWindow(windowMsg);
- }
- else if (msg instanceof InitializeRequestMessage)
+ } else if (msg instanceof InitializeRequestMsg)
{
- InitializeRequestMessage initializeMsg =
- (InitializeRequestMessage) msg;
+ InitializeRequestMsg initializeMsg =
+ (InitializeRequestMsg) msg;
handler.process(initializeMsg);
- }
- else if (msg instanceof InitializeTargetMessage)
+ } else if (msg instanceof InitializeTargetMsg)
{
- InitializeTargetMessage initializeMsg = (InitializeTargetMessage) msg;
+ InitializeTargetMsg initializeMsg = (InitializeTargetMsg) msg;
handler.process(initializeMsg);
- }
- else if (msg instanceof EntryMessage)
+ } else if (msg instanceof EntryMsg)
{
- EntryMessage entryMsg = (EntryMessage) msg;
+ EntryMsg entryMsg = (EntryMsg) msg;
handler.process(entryMsg);
- }
- else if (msg instanceof DoneMessage)
+ } else if (msg instanceof DoneMsg)
{
- DoneMessage doneMsg = (DoneMessage) msg;
+ DoneMsg doneMsg = (DoneMsg) msg;
handler.process(doneMsg);
- }
- else if (msg instanceof ErrorMessage)
+ } else if (msg instanceof ErrorMsg)
{
- ErrorMessage errorMsg = (ErrorMessage) msg;
+ ErrorMsg errorMsg = (ErrorMsg) msg;
handler.process(errorMsg);
- }
- else if (msg instanceof ResetGenerationId)
+ } else if (msg instanceof ResetGenerationIdMsg)
{
- ResetGenerationId genIdMsg = (ResetGenerationId) msg;
- replicationServerDomain.resetGenerationId(this.handler, genIdMsg);
- }
- else if (msg instanceof WindowProbe)
+ ResetGenerationIdMsg genIdMsg = (ResetGenerationIdMsg) msg;
+ replicationServerDomain.resetGenerationId(handler, genIdMsg);
+ } else if (msg instanceof WindowProbeMsg)
{
- WindowProbe windowProbeMsg = (WindowProbe) msg;
+ WindowProbeMsg windowProbeMsg = (WindowProbeMsg) msg;
handler.process(windowProbeMsg);
- }
- else if (msg instanceof ReplServerInfoMessage)
+ } else if (msg instanceof TopologyMsg)
{
- ReplServerInfoMessage infoMsg = (ReplServerInfoMessage)msg;
- handler.receiveReplServerInfo(infoMsg);
- replicationServerDomain.receiveReplServerInfo(infoMsg, handler);
- }
- else if (msg instanceof MonitorRequestMessage)
+ TopologyMsg topoMsg = (TopologyMsg) msg;
+ replicationServerDomain.receiveTopoInfoFromRS(topoMsg, handler, true);
+ } else if (msg instanceof ChangeStatusMsg)
{
- MonitorRequestMessage replServerMonitorRequestMsg =
- (MonitorRequestMessage) msg;
+ ChangeStatusMsg csMsg = (ChangeStatusMsg) msg;
+ replicationServerDomain.processNewStatus(handler, csMsg);
+ } else if (msg instanceof MonitorRequestMsg)
+ {
+ MonitorRequestMsg replServerMonitorRequestMsg =
+ (MonitorRequestMsg) msg;
handler.process(replServerMonitorRequestMsg);
- }
- else if (msg instanceof MonitorMessage)
+ } else if (msg instanceof MonitorMsg)
{
- MonitorMessage replServerMonitorMsg = (MonitorMessage) msg;
+ MonitorMsg replServerMonitorMsg = (MonitorMsg) msg;
handler.process(replServerMonitorMsg);
- }
- else if (msg == null)
+ } else if (msg == null)
{
/*
* The remote server has sent an unknown message,
@@ -236,9 +284,11 @@
TRACER.debugInfo(
"In RS " + replicationServerDomain.getReplicationServer().
getMonitorInstanceName() +
- " reader IO EXCEPTION for serverID=" + serverId
- + stackTraceToSingleLineString(e) + " " + e.getLocalizedMessage());
- Message message = NOTE_SERVER_DISCONNECT.get(handler.toString());
+ " reader IO EXCEPTION for serverID=" + serverId +
+ stackTraceToSingleLineString(e) + " " + e.getLocalizedMessage());
+ Message message = NOTE_SERVER_DISCONNECT.get(handler.toString(),
+ Short.toString(replicationServerDomain.
+ getReplicationServer().getServerId()));
logError(message);
} catch (ClassNotFoundException e)
{
@@ -246,30 +296,36 @@
TRACER.debugInfo(
"In RS <" + replicationServerDomain.getReplicationServer().
getMonitorInstanceName() +
- " reader CNF EXCEPTION serverID=" + serverId
- + stackTraceToSingleLineString(e));
+ " reader CNF EXCEPTION serverID=" + serverId +
+ stackTraceToSingleLineString(e));
/*
* The remote server has sent an unknown message,
* close the connection.
*/
Message message = ERR_UNKNOWN_MESSAGE.get(handler.toString());
logError(message);
+ } catch (NotSupportedOldVersionPDUException e)
+ {
+ // Received a V1 PDU we do not need to support:
+ // we just trash the message and log the event for debug purpose
+ if (debugEnabled())
+ TRACER.debugInfo("In " + replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() + ":" + e.getMessage());
} catch (Exception e)
{
if (debugEnabled())
TRACER.debugInfo(
"In RS <" + replicationServerDomain.getReplicationServer().
getMonitorInstanceName() +
- " server reader EXCEPTION serverID=" + serverId
- + stackTraceToSingleLineString(e));
+ " server reader EXCEPTION serverID=" + serverId +
+ stackTraceToSingleLineString(e));
/*
* The remote server has sent an unknown message,
* close the connection.
*/
Message message = NOTE_READER_EXCEPTION.get(handler.toString());
logError(message);
- }
- finally
+ } finally
{
/*
* The thread only exit the loop above is some error condition
@@ -287,15 +343,15 @@
session.close();
} catch (IOException e)
{
- // ignore
+ // ignore
}
replicationServerDomain.stopServer(handler);
}
if (debugEnabled())
TRACER.debugInfo(
- "In RS " + replicationServerDomain.getReplicationServer().
- getMonitorInstanceName() +
- (handler.isReplicationServer()?" RS":" LDAP") +
- " server reader stopped for serverID=" + serverId);
+ "In RS " + replicationServerDomain.getReplicationServer().
+ getMonitorInstanceName() +
+ (handler.isReplicationServer() ? " RS" : " LDAP") +
+ " server reader stopped for serverID=" + serverId);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerWriter.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerWriter.java
index f30edf3..60d06c8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerWriter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerWriter.java
@@ -39,8 +39,9 @@
import org.opends.server.api.DirectoryThread;
import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.protocol.ProtocolSession;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
/**
@@ -58,6 +59,7 @@
private ServerHandler handler;
private ReplicationServerDomain replicationServerDomain;
private short serverId;
+ private short protocolVersion = -1;
/**
* Create a ServerWriter.
@@ -74,12 +76,15 @@
ServerHandler handler,
ReplicationServerDomain replicationServerDomain)
{
- super(handler.toString() + " writer");
+ super("Replication Writer for " + handler.toString() + " in RS " +
+ replicationServerDomain.getReplicationServer().getServerId());
this.serverId = serverId;
this.session = session;
this.handler = handler;
this.replicationServerDomain = replicationServerDomain;
+ // Keep protocol version locally for efficiency
+ this.protocolVersion = handler.getProtocolVersion();
}
/**
@@ -104,24 +109,70 @@
{
while (true)
{
- UpdateMessage update = replicationServerDomain.take(this.handler);
+ UpdateMsg update = replicationServerDomain.take(this.handler);
if (update == null)
return; /* this connection is closing */
- // Ignore update to be sent to a replica with a bad generation ID
- long referenceGenerationId = replicationServerDomain.getGenerationId();
- if ((referenceGenerationId != handler.getGenerationId())
- || (referenceGenerationId == -1)
- || (handler.getGenerationId() == -1))
+ /* Ignore updates in some cases */
+ if (handler.isLDAPserver())
{
- logError(ERR_IGNORING_UPDATE_TO.get(
- this.replicationServerDomain.getReplicationServer().
- getMonitorInstanceName(),
- update.getDn(),
- this.handler.getMonitorInstanceName(),
+ /**
+ * Ignore updates to DS in bad BAD_GENID_STATUS or FULL_UPDATE_STATUS
+ *
+ * The RSD lock should not be taken here as it is acceptable to have a
+ * delay between the time the server has a wrong status and the fact
+ * we detect it: the updates that succeed to pass during this time
+ * will have no impact on remote server. But it is interesting to not
+ * saturate uselessly the network if the updates are not necessary so
+ * this check to stop sending updates is interesting anyway. Not
+ * taking the RSD lock allows to have better performances in normal
+ * mode (most of the time).
+ */
+ ServerStatus dsStatus = handler.getStatus();
+ if ((dsStatus == ServerStatus.BAD_GEN_ID_STATUS) ||
+ (dsStatus == ServerStatus.FULL_UPDATE_STATUS))
+ {
+ long referenceGenerationId =
+ replicationServerDomain.getGenerationId();
+ if (dsStatus == ServerStatus.BAD_GEN_ID_STATUS)
+ logError(ERR_IGNORING_UPDATE_TO_DS_BADGENID.get(
+ Short.toString(replicationServerDomain.getReplicationServer().
+ getServerId()),
+ replicationServerDomain.getBaseDn().toNormalizedString(),
+ update.getChangeNumber().toString(),
+ Short.toString(handler.getServerId()),
+ Long.toString(handler.getGenerationId()),
+ Long.toString(referenceGenerationId)));
+ if (dsStatus == ServerStatus.FULL_UPDATE_STATUS)
+ logError(ERR_IGNORING_UPDATE_TO_DS_FULLUP.get(
+ Short.toString(replicationServerDomain.getReplicationServer().
+ getServerId()),
+ replicationServerDomain.getBaseDn().toNormalizedString(),
+ update.getChangeNumber().toString(),
+ Short.toString(handler.getServerId())));
+ continue;
+ }
+ } else
+ {
+ /**
+ * Ignore updates to RS with bad gen id
+ * (no system managed status for a RS)
+ */
+ long referenceGenerationId =
+ replicationServerDomain.getGenerationId();
+ if ((referenceGenerationId != handler.getGenerationId()) ||
+ (referenceGenerationId == -1) || (handler.getGenerationId() == -1))
+ {
+ logError(ERR_IGNORING_UPDATE_TO_RS.get(
+ Short.toString(replicationServerDomain.getReplicationServer().
+ getServerId()),
+ replicationServerDomain.getBaseDn().toNormalizedString(),
+ update.getChangeNumber().toString(),
+ Short.toString(handler.getServerId()),
Long.toString(handler.getGenerationId()),
Long.toString(referenceGenerationId)));
- continue;
+ continue;
+ }
}
/*
@@ -137,7 +188,17 @@
" generationId=" + handler.getGenerationId());
}
*/
- session.publish(update);
+
+ // Publish the update to the remote server using a protocol version he
+ // it supports
+ short pduProtocolVersion = update.getVersion();
+ if (protocolVersion < pduProtocolVersion)
+ { // The remote server wants a lower protocol version than the PDU one,
+ // send it the PDU, serializing it with the supported older version
+ session.publish(update, protocolVersion);
+ } else {
+ session.publish(update);
+ }
}
}
catch (NoSuchElementException e)
@@ -146,7 +207,9 @@
* The remote host has disconnected and this particular Tree is going to
* be removed, just ignore the exception and let the thread die as well
*/
- Message message = NOTE_SERVER_DISCONNECT.get(handler.toString());
+ Message message = NOTE_SERVER_DISCONNECT.get(handler.toString(),
+ Short.toString(replicationServerDomain.
+ getReplicationServer().getServerId()));
logError(message);
}
catch (SocketException e)
@@ -155,7 +218,9 @@
* The remote host has disconnected and this particular Tree is going to
* be removed, just ignore the exception and let the thread die as well
*/
- Message message = NOTE_SERVER_DISCONNECT.get(handler.toString());
+ Message message = NOTE_SERVER_DISCONNECT.get(handler.toString(),
+ Short.toString(replicationServerDomain.
+ getReplicationServer().getServerId()));
logError(message);
}
catch (Exception e)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/StatusAnalyzer.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/StatusAnalyzer.java
new file mode 100644
index 0000000..547f23c
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/StatusAnalyzer.java
@@ -0,0 +1,252 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.server;
+
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import static org.opends.server.loggers.debug.DebugLogger.getTracer;
+
+
+import org.opends.server.api.DirectoryThread;
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.replication.common.ServerStatus;
+import org.opends.server.replication.common.StatusMachineEvent;
+
+/**
+ * This thread is in charge of periodically determining if the connected
+ * directory servers of the domain it is associated with are late or not
+ * regarding the changes they have to replay. A threshold is set for the maximum
+ * allowed number of pending changes. When the threshold for a DS is crossed,
+ * the status analyzer must make the DS status change to DEGRADED_STATUS. When
+ * the threshold is uncrossed, the status analyzer must make the DS status
+ * change back to NORMAL_STATUS. To have meaning of status, please refer to
+ * ServerStatus class.
+ */
+public class StatusAnalyzer extends DirectoryThread
+{
+
+ private boolean finished = false;
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
+ private ReplicationServerDomain replicationServerDomain;
+ private int degradedStatusThreshold = -1;
+
+ // Sleep time for the thread, in ms.
+ private int STATUS_ANALYZER_SLEEP_TIME = 5000;
+
+ private boolean done = false;
+
+ private Object sleeper = new Object();
+
+ /**
+ * Create a StatusAnalyzer.
+ * @param replicationServerDomain The ReplicationServerDomain the status
+ * analyzer is for.
+ * @param degradedStatusThreshold The pending changes threshold value to be
+ * used for putting a DS in DEGRADED_STATUS.
+ */
+ public StatusAnalyzer(ReplicationServerDomain replicationServerDomain,
+ int degradedStatusThreshold)
+ {
+ super("Replication Server Status Analyzer for " +
+ replicationServerDomain.getBaseDn().toNormalizedString() + " in RS " +
+ replicationServerDomain.getReplicationServer().getServerId());
+
+ this.replicationServerDomain = replicationServerDomain;
+ this.degradedStatusThreshold = degradedStatusThreshold;
+ }
+
+ /**
+ * Run method for the StatusAnalyzer.
+ * Analyzes if servers are late or not, and change their status accordingly.
+ */
+ @Override
+ public void run()
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("Directory server status analyzer starting for dn " +
+ replicationServerDomain.getBaseDn().toString());
+ }
+
+ boolean interrupted = false;
+ while (!finished && !interrupted)
+ {
+ try
+ {
+ synchronized (sleeper)
+ {
+ sleeper.wait(STATUS_ANALYZER_SLEEP_TIME);
+ }
+ } catch (InterruptedException ex)
+ {
+ TRACER.debugInfo("Status analyzer for dn " +
+ replicationServerDomain.getBaseDn().toString() + " in RS " +
+ replicationServerDomain.getReplicationServer().getServerId() +
+ " has been interrupted while sleeping.");
+ }
+
+ // Go through each connected DS, get the number of pending changes we have
+ // for it and change status accordingly if threshold value is
+ // crossed/uncrossed
+ for (ServerHandler serverHandler :
+ replicationServerDomain.getConnectedDSs(). values())
+ {
+ // Get number of pending changes for this server
+ int nChanges = serverHandler.getRcvMsgQueueSize();
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("Status analyzer for dn " +
+ replicationServerDomain.getBaseDn().toString() + " DS " +
+ Short.toString(serverHandler.getServerId()) + " has " + nChanges +
+ " message(s) in writer queue. This is in RS " +
+ replicationServerDomain.getReplicationServer().getServerId());
+ }
+
+ // Check status to know if it is relevant to change the status. Do not
+ // take RSD lock to test. If we attempt to change the status whereas
+ // we are in a status that do not allows that, this will be noticed by
+ // the changeStatusFromStatusAnalyzer method. This allows to take the
+ // lock roughly only when needed versus every sleep time timeout.
+ if (degradedStatusThreshold > 0)
+ // Threshold value = 0 means no status analyzer (no degrading system)
+ // we should not have that as the status analyzer thread should not be
+ // created if this is the case, but for sanity purpose, we add this
+ // test
+ {
+ if (nChanges >= degradedStatusThreshold)
+ {
+ if (serverHandler.getStatus() == ServerStatus.NORMAL_STATUS)
+ {
+ interrupted =
+ replicationServerDomain.changeStatusFromStatusAnalyzer(
+ serverHandler,
+ StatusMachineEvent.TO_DEGRADED_STATUS_EVENT);
+ if (interrupted)
+ {
+ // Finih job and let thread die
+ TRACER.debugInfo("Status analyzer for dn " +
+ replicationServerDomain.getBaseDn().toString() +
+ " has been interrupted and will die. This is in RS " +
+ replicationServerDomain.getReplicationServer().getServerId());
+ break;
+ }
+ }
+ } else
+ {
+ if (serverHandler.getStatus() == ServerStatus.DEGRADED_STATUS)
+ {
+ interrupted =
+ replicationServerDomain.changeStatusFromStatusAnalyzer(
+ serverHandler,
+ StatusMachineEvent.TO_NORMAL_STATUS_EVENT);
+ if (interrupted)
+ {
+ // Finih job and let thread die
+ TRACER.debugInfo("Status analyzer for dn " +
+ replicationServerDomain.getBaseDn().toString() +
+ " has been interrupted and will die. This is in RS " +
+ replicationServerDomain.getReplicationServer().getServerId());
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ done = true;
+ TRACER.debugInfo("Status analyzer for dn " +
+ replicationServerDomain.getBaseDn().toString() + " is terminated." +
+ " This is in RS " +
+ replicationServerDomain.getReplicationServer().getServerId());
+ }
+
+ /**
+ * Stops the thread.
+ */
+ public void shutdown()
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("Shutting down status analyzer for dn " +
+ replicationServerDomain.getBaseDn().toString() + " in RS " +
+ replicationServerDomain.getReplicationServer().getServerId());
+ }
+ finished = true;
+ synchronized (sleeper)
+ {
+ sleeper.notify();
+ }
+ }
+
+ /**
+ * Waits for analyzer death. If not finished within 2 seconds,
+ * forces interruption
+ */
+ public void waitForShutdown()
+ {
+ try
+ {
+ int FACTOR = 40; // Wait for 2 seconds before interrupting the thread
+ int n = 0;
+ while ((done == false) && (this.isAlive()))
+ {
+ Thread.sleep(50);
+ n++;
+ if (n >= FACTOR)
+ {
+ TRACER.debugInfo("Interrupting status analyzer for dn " +
+ replicationServerDomain.getBaseDn().toString() + " in RS " +
+ replicationServerDomain.getReplicationServer().getServerId());
+ this.interrupt();
+ }
+ }
+ } catch (InterruptedException e)
+ {
+ // exit the loop if this thread is interrupted.
+ }
+ }
+
+ /**
+ * Sets the threshold value.
+ * @param degradedStatusThreshold The new threshold value.
+ */
+ public void setDeradedStatusThreshold(int degradedStatusThreshold)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("Directory server status analyzer for dn " +
+ replicationServerDomain.getBaseDn().toString() + " changing threshold" +
+ " value to " + degradedStatusThreshold);
+ }
+
+ this.degradedStatusThreshold = degradedStatusThreshold;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/UpdateComparator.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/UpdateComparator.java
index 39763b8..7d5302e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/UpdateComparator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/UpdateComparator.java
@@ -29,12 +29,12 @@
import java.util.Comparator;
import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
/**
* Class to use for establishing an order within UpdateMessages.
*/
-public class UpdateComparator implements Comparator<UpdateMessage>
+public class UpdateComparator implements Comparator<UpdateMsg>
{
/**
* The UpdateComparator Singleton.
@@ -52,13 +52,13 @@
/**
* Compares two UpdateMessages.
*
- * @param msg1 first UpdateMessage to compare
- * @param msg2 second UpdateMessage to compare
+ * @param msg1 first UpdateMsg to compare
+ * @param msg2 second UpdateMsg to compare
* @return -1 if msg1 < msg2
* 0 if msg1 == msg2
* 1 if msg1 > msg2
*/
- public int compare(UpdateMessage msg1, UpdateMessage msg2)
+ public int compare(UpdateMsg msg1, UpdateMsg msg2)
{
return ChangeNumber.compare(msg1.getChangeNumber(), msg2.getChangeNumber());
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java
index 40e3d96..0372474 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java
@@ -242,4 +242,14 @@
return false;
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AciSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AciSyntax.java
index 6425ec6..cd2af43 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AciSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AciSyntax.java
@@ -252,5 +252,15 @@
}
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java
index a7011ab..2798880 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java
@@ -1471,5 +1471,13 @@
return stripMinimumUpperBound;
}
-}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java
index a6424d4..626b01d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java
@@ -493,5 +493,15 @@
return false;
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java
index a8b22f4..c608c86 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java
@@ -241,5 +241,15 @@
// All values will be acceptable for the binary syntax.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java
index b8adaf6..95e47d3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java
@@ -243,5 +243,15 @@
// If we've gotten here, then everything is fine.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java
index 19decb0..2130923 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java
@@ -304,5 +304,15 @@
message);
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java
index 036e5d4..5b549b6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java
@@ -227,5 +227,15 @@
// All values will be acceptable for the certificate list syntax.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return true;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java
index fc04c6c..3af559c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java
@@ -227,5 +227,15 @@
// All values will be acceptable for the certificate pair syntax.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return true;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java
index 866cd44..1a4b6ee 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java
@@ -226,5 +226,15 @@
// All values will be acceptable for the certificate syntax.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return true;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java
index 41f8256..0f0ef2e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java
@@ -256,5 +256,15 @@
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java
index ed5670d..f286458 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java
@@ -1448,5 +1448,15 @@
return startPos;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
index 8e9d27a..595f23a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
@@ -1192,5 +1192,15 @@
return startPos;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
index ee6eef1..af8074e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -302,5 +302,15 @@
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java
index bb2c2a9..b795b2d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java
@@ -349,5 +349,15 @@
return new ConfigChangeResult(ResultCode.SUCCESS, false);
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
index 94a1206..1d981b6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -273,5 +273,15 @@
return false;
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
index 2c56eac..7c0db07 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -303,5 +303,15 @@
return GuideSyntax.criteriaIsValid(criteria, valueStr, invalidReason);
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java
index e7caed2..7b08db5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java
@@ -358,5 +358,15 @@
// If we've gotten here, then the value must be valid.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java
index 280e9af..33d96ab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java
@@ -226,5 +226,15 @@
// All values will be acceptable for the fax syntax.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
index 6e07698..ec0ef9f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
@@ -1589,5 +1589,15 @@
// time zone by using "GMT" followed by the offset.
return TimeZone.getTimeZone("GMT" + offSetStr);
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java
index 3cad487..fb62e79 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java
@@ -547,5 +547,15 @@
}
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java
index 3957bae..a2e1176 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java
@@ -251,5 +251,15 @@
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java
index 5e28f7b..5d99577 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java
@@ -379,5 +379,15 @@
return true;
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java
index 44ba357..d9e56c5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java
@@ -226,5 +226,15 @@
// All values will be acceptable for the JPEG syntax.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index f9e1042..ae0f217 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -718,5 +718,15 @@
}
return pos;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java
index 5c98fe6..7d64204 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -1144,5 +1144,15 @@
return startPos;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
index 7b2dab2..1043fc0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
@@ -1137,5 +1137,15 @@
return startPos;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index 8231bc1..ef4cfb1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -288,5 +288,15 @@
// If we've gotten here, then the value is acceptable.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java
index fe3a70a..2abd70b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java
@@ -1255,5 +1255,15 @@
return startPos;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java
index f31ceef..b731dee 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java
@@ -253,5 +253,15 @@
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java
index 58d6932..98d7840 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java
@@ -217,5 +217,15 @@
return isValidSchemaElement(lowerValue, 0, lowerValue.length(),
invalidReason);
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
index 4e72aeb..10c2f5a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -1375,5 +1375,15 @@
return superiorChainIncludesTop(superiorClass.getSuperiorClass());
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java
index 4e93bd8..7d78f41 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java
@@ -226,5 +226,15 @@
// All values will be acceptable for the octet string syntax.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
index 92eb84f..25e413a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
@@ -293,5 +293,15 @@
// If we've gotten here, then the value is OK.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java
index 5c2e904..08d2f01 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java
@@ -218,5 +218,15 @@
// We'll allow any value.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java
index 8a2ef76..6c4cfbe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java
@@ -236,5 +236,15 @@
// We will accept any value for this syntax.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java
index 9b3cbe4..4afdd59 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java
@@ -275,5 +275,15 @@
// If we've gotten here, then the value is OK.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
index 535eca2..5c169d9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
@@ -236,5 +236,15 @@
// We will accept any value for this syntax.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java
index 9b00b13..798ab11 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java
@@ -272,4 +272,14 @@
return false;
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java
index 2ce6e79..c76a142 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java
@@ -275,4 +275,14 @@
return false;
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
index 8c0ed4a..77ee54e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
@@ -263,5 +263,15 @@
return true;
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
index 922f633..d36097f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
@@ -227,5 +227,15 @@
// All values will be acceptable for the supported algorithm syntax.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return true;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
index a4d68bc..b5db7a6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -377,5 +377,15 @@
return new ConfigChangeResult(ResultCode.SUCCESS, false);
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index 97cfa43..40fb5dd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -391,5 +391,15 @@
// If we've gotten here, then the value must be valid.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
index 1bb9464..3007731 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
@@ -347,5 +347,15 @@
// acceptable.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
index 0278003..cd5547e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
@@ -889,5 +889,15 @@
message, e);
}
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java
index eab81d3..87d4a1b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java
@@ -282,5 +282,15 @@
// If we've gotten here, then the value is acceptable.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java
index 4a1ff61..e69d4b7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java
@@ -336,5 +336,15 @@
// If we've gotten here, then it looks to be encoded.
return true;
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBinary()
+ {
+ return false;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/Registry.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/Registry.java
new file mode 100644
index 0000000..697bcf3
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/Registry.java
@@ -0,0 +1,436 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.types.DebugLogLevel;
+import static org.opends.server.servicetag.Util.*;
+import static org.opends.server.servicetag.ServiceTagDefinition.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+
+/**
+ * Allows to create / register/ remove / find ServiceTags calling the
+ * appropriated CLI stclient if available on the system.
+ */
+public class Registry {
+
+ // The tracer object for the debug logger.
+ private static final DebugTracer TRACER = getTracer();
+ // ServiceTag services are not relocatable
+ private static final String STCLIENT_SOLARIS
+ = "/usr/bin/stclient";
+ private static final String STCLIENT_LINUX
+ = "/opt/sun/servicetag/bin/stclient";
+ private static final int ST_ERR_NOT_AUTH = 245;
+ private static final int ST_ERR_REC_NOT_FOUND = 225;
+ private static final String INSTANCE_URN_DESC = "Product instance URN=";
+ private static File stclient = null;
+ private static String stclientPath = null;
+ private static Registry registry = null;
+
+ // Private contructor
+ private Registry() {
+ }
+
+ /**
+ * Returns the common service tag registry.
+ * @return the object for the common system service tag registry.
+ * @throws UnsupportedOperationException if the common registry is
+ * not supported.
+ */
+ public static Registry getSystemRegistry() throws
+ UnsupportedOperationException {
+ if ((registry == null) && (isSupported())) {
+ registry = new Registry();
+ } else {
+ throw new UnsupportedOperationException(
+ "Registry class is not supported");
+ }
+ return registry;
+ }
+
+ /**
+ * Returns true if the DsRegistry class is supported on this system.
+ * @return true if the DsRegistry class is supported,
+ * otherwise false.
+ */
+ public static boolean isSupported() {
+ return (getSTclientPath() != null);
+ }
+
+ /**
+ * Tests if the corresponding ServiceTag exists in common registry.
+ * @param productUrn of the product to look for.
+ * @param installedLocation identifying the installed product.
+ * @return true if at least corresponding ServiceTag exists, otherwise
+ * return false.
+ */
+ public boolean existServiceTag(String productUrn,
+ String installedLocation) {
+
+ boolean found = false;
+ Set<ServiceTag> tags;
+
+ try {
+ tags = this.findServiceTags(productUrn);
+ for (ServiceTag svcTag : tags) {
+ if (svcTag.getProductDefinedInstanceID().equals
+ (installedLocation)) {
+ found = true;
+ break;
+ }
+ }
+ } catch (IOException ex) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.WARNING, ex);
+ }
+ }
+ return found;
+ }
+
+ /**
+ * Tests if the corresponding ServiceTag exists in common registry.
+ * @param instanceUrn of the product to look for.
+ * @return true if at least corresponding ServiceTag exists, otherwise
+ * return false.
+ */
+ public boolean existServiceTag(String instanceUrn) {
+ try {
+ ServiceTag svcTag = getServiceTag(instanceUrn);
+ if (svcTag == null) {
+ return false;
+ } else {
+ return true;
+ }
+ } catch (IOException ex) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.WARNING, ex);
+ }
+ return false;
+ }
+ }
+
+ /**
+ * Adds a new ServiceTag in the common registry.
+ * @param st ServiceTag to add.
+ * @return the added serviceTag with updated field.
+ * @throws java.io.IOException if the serviceTag can not be added.
+ */
+ public ServiceTag addServiceTag(ServiceTag st) throws IOException {
+
+ // Parameter checking
+ if (st == null) {
+ throw new NullPointerException("st parameter cannot be null");
+ }
+
+ // If the ServiceTag already exists
+ if (existServiceTag(st.getInstanceURN())) {
+ throw new IOException("Instance_urn = " +
+ st.getInstanceURN() + " already exists");
+ }
+
+ List<String> command = new ArrayList<String>();
+ command.add(getSTclientPath());
+ command.add("-a");
+ command.add("-i");
+ command.add(st.getInstanceURN());
+ command.add("-p");
+ command.add(st.getProductName());
+ command.add("-e");
+ command.add(st.getProductVersion());
+ command.add("-t");
+ command.add(st.getProductURN());
+
+ if (st.getProductParentURN().length() > 0) {
+ command.add("-F");
+ command.add(st.getProductParentURN());
+ }
+
+ command.add("-P");
+ command.add(st.getProductParent());
+
+ if (st.getProductDefinedInstanceID().length() > 0) {
+ command.add("-I");
+ command.add(st.getProductDefinedInstanceID());
+ }
+ command.add("-m");
+ command.add(st.getProductVendor());
+ command.add("-A");
+ command.add(st.getPlatformArch());
+ command.add("-z");
+ command.add(st.getContainer());
+ command.add("-S");
+ command.add(st.getSource());
+
+ BufferedReader in = null;
+ try {
+ ProcessBuilder pb = new ProcessBuilder(command);
+ Process p = pb.start();
+ String output = commandOutput(p);
+ String urn = "";
+ if (p.exitValue() == 0) {
+ // Obtain the instance urn from the stclient output
+ in = new BufferedReader(new StringReader(output));
+ String line = null;
+ while ((line = in.readLine()) != null) {
+ line = line.trim();
+ if (line.startsWith(INSTANCE_URN_DESC)) {
+ urn = line.substring(INSTANCE_URN_DESC.length());
+ break;
+ }
+ }
+ if (urn.length() == 0) {
+ throw new IOException("Error in creating service tag:\n" +
+ output);
+ }
+ return getServiceTag(urn);
+ } else {
+ return checkReturnError(p.exitValue(), output, st);
+ }
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+
+ /**
+ * Removes the corresponding ServiceTag from the common registry.
+ * @param instanceURN of the ServiceTag to remove.
+ * @return the remove DsServiceTag, if null, the ServiceTag does not exist.
+ * @throws java.io.IOException if an error occured.
+ */
+ public ServiceTag removeServiceTag(String instanceURN) throws IOException {
+
+ ServiceTag st = getServiceTag(instanceURN);
+ if (st == null) {
+ return null;
+ }
+
+ List<String> command = new ArrayList<String>();
+ command.add(getSTclientPath());
+ command.add("-d");
+ command.add("-i");
+ command.add(instanceURN);
+
+ ProcessBuilder pb = new ProcessBuilder(command);
+ Process p = pb.start();
+ String output = commandOutput(p);
+ if (p.exitValue() == 0) {
+ return st;
+ } else {
+ return checkReturnError(p.exitValue(), output, st);
+ }
+ }
+
+ /**
+ * Returns the corresponding DsServiceTag object.
+ * @param instanceURN of the ServiceTag to look for.
+ * @return the corresponding DsServiceTag object.
+ * @throws java.io.IOException if the tag could not be retrieved.
+ */
+ public ServiceTag getServiceTag(String instanceURN) throws IOException {
+
+ List<String> command = new ArrayList<String>();
+ command.add(getSTclientPath());
+ command.add("-g");
+ command.add("-i");
+ command.add(instanceURN);
+
+ ProcessBuilder pb = new ProcessBuilder(command);
+ Process p = pb.start();
+ String output = commandOutput(p);
+ if (p.exitValue() == 0) {
+ return parseServiceTag(output);
+ } else {
+ return checkReturnError(p.exitValue(), output, null);
+ }
+ }
+
+ /**
+ * Returns a Set of ServiceTag where the product urn is productURN.
+ * @param productURN of the ServiceTags.
+ * @return a Set of ServiceTag where the product_urn is productURN.
+ * @throws java.io.IOException if error.
+ */
+ public Set<ServiceTag> findServiceTags(String productURN)
+ throws IOException {
+
+ List<String> command = new ArrayList<String>();
+ command.add(getSTclientPath());
+ command.add("-f");
+ command.add("-t");
+ command.add(productURN);
+
+ BufferedReader in = null;
+ try {
+ ProcessBuilder pb = new ProcessBuilder(command);
+ Process p = pb.start();
+ String output = commandOutput(p);
+
+ Set<ServiceTag> instances = new HashSet<ServiceTag>();
+ if (p.exitValue() == 0) {
+ // parse the service tag output from stclient
+ in = new BufferedReader(new StringReader(output));
+ String line = null;
+ while ((line = in.readLine()) != null) {
+ String s = line.trim();
+ if (s.startsWith("urn:st:")) {
+ instances.add(getServiceTag(s));
+ }
+ }
+ } else {
+ checkReturnError(p.exitValue(), output, null);
+ }
+ return instances;
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+
+ /**
+ * Returns the corrsponding error based on the process exit value <>0.
+ * @param exitValue return by the process.
+ * @param output return by the CLI execution.
+ * @param st returned by the CLI.
+ * @return st returned by the CLI.
+ * @throws java.io.IOException.
+ */
+ private static ServiceTag checkReturnError(int exitValue,
+ String output,
+ ServiceTag st) throws IOException {
+ switch (exitValue) {
+ case ST_ERR_REC_NOT_FOUND:
+ return null;
+ case ST_ERR_NOT_AUTH:
+ if (st != null) {
+ throw new IOException(
+ "Not authorized to access " + st.getInstanceURN() +
+ " installer_uid=" + st.getInstallerUID());
+ } else {
+ throw new IOException(
+ "Not authorized:" + output);
+ }
+ default:
+ throw new IOException("stclient exits with error" +
+ " (" + exitValue + ")\n" + output);
+ }
+ }
+
+ /**
+ * Parses the stclient output and return the corresponding DsServiceTag
+ * object.
+ * @param output to parse.
+ * @return the DsServiceTag.
+ * @throws java.io.IOException if an error occured during the parsing.
+ */
+ private ServiceTag parseServiceTag(String output) throws IOException {
+ BufferedReader in = null;
+ try {
+ Properties props = new Properties();
+ // parse the service tag output from stclient
+ in = new BufferedReader(new StringReader(output));
+ String line = null;
+ while ((line = in.readLine()) != null) {
+ if ((line = line.trim()).length() > 0) {
+ String[] ss = line.trim().split("=", 2);
+ if (ss.length == 2) {
+ props.setProperty(ss[0].trim(), ss[1].trim());
+ } else {
+ props.setProperty(ss[0].trim(), "");
+ }
+ }
+ }
+
+ String urn = props.getProperty(ST_NODE_INSTANCE_URN);
+ String productName = props.getProperty(ST_NODE_PRODUCT_NAME);
+ String productVersion = props.getProperty(ST_NODE_PRODUCT_VERSION);
+ String productURN = props.getProperty(ST_NODE_PRODUCT_URN);
+ String productParent = props.getProperty(ST_NODE_PRODUCT_PARENT);
+ String productParentURN = props.getProperty(
+ ST_NODE_PRODUCT_PARENT_URN);
+ String productDefinedInstanceID =
+ props.getProperty(ST_NODE_PRODUCT_DEFINED_INST_ID);
+ String productVendor = props.getProperty(ST_NODE_PRODUCT_VENDOR);
+ String platformArch = props.getProperty(ST_NODE_PLATFORM_ARCH);
+ String container = props.getProperty(ST_NODE_CONTAINER);
+ String source = props.getProperty(ST_NODE_SOURCE);
+ int installerUID =
+ Util.getIntValue(props.getProperty(ST_NODE_INSTALLER_UID));
+ Date timestamp =
+ Util.parseTimestamp(props.getProperty(ST_NODE_TIMESTAMP));
+
+ return new ServiceTag(urn,
+ productName,
+ productVersion,
+ productURN,
+ productParent,
+ productParentURN,
+ productDefinedInstanceID,
+ productVendor,
+ platformArch,
+ container,
+ source,
+ installerUID,
+ timestamp);
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+
+ }
+
+ private static String getSTclientPath() {
+ if (stclientPath == null) {
+ // Initialization to determine the platform's stclient pathname
+ String os = System.getProperty("os.name");
+ if (os.equals("SunOS")) {
+ stclient = new File(STCLIENT_SOLARIS);
+ } else if (os.equals("Linux")) {
+ stclient = new File(STCLIENT_LINUX);
+ } else if (os.startsWith("Windows")) {
+ stclient = getWindowsStClientFile();
+ }
+ }
+ if ((stclientPath == null) && (stclient != null) && (stclient.exists()))
+ {
+ stclientPath = stclient.getAbsolutePath();
+ }
+ return stclientPath;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTag.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTag.java
new file mode 100644
index 0000000..d9a539c
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTag.java
@@ -0,0 +1,554 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+import java.util.Date;
+
+import static org.opends.server.servicetag.ServiceTagDefinition.*;
+
+/**
+ * The ServiceTag class represents a ServiceTag of the common registry.
+ * The class allows to create new instance and retreive properties values.
+ */
+public class ServiceTag {
+
+ private String instanceURN;
+ private String productName;
+ private String productVersion;
+ private String productURN;
+ private String productParent;
+ private String productParentURN;
+ private String productDefinedInstanceID;
+ private String productVendor;
+ private String platformArch;
+ private String container;
+ private String source;
+ private int installerUID;
+ private Date timestamp;
+ // Service Tag Field Lengths (defined in sthelper.h)
+ // Since the constants defined in sthelper.h includes the null-terminated
+ // character, so minus 1 from the sthelper.h defined values.
+ private final int MAX_URN_LEN = 256 - 1;
+ private final int MAX_PRODUCT_NAME_LEN = 256 - 1;
+ private final int MAX_PRODUCT_VERSION_LEN = 64 - 1;
+ private final int MAX_PRODUCT_PARENT_LEN = 256 - 1;
+ private final int MAX_PRODUCT_VENDOR_LEN = 64 - 1;
+ private final int MAX_PLATFORM_ARCH_LEN = 64 - 1;
+ private final int MAX_CONTAINER_LEN = 64 - 1;
+ private final int MAX_SOURCE_LEN = 64 - 1;
+
+ // private constructors
+ private ServiceTag() {
+ }
+
+ /**
+ * Build a ServiceTag object.
+ * @param instanceURN the instanceUrn of the ServiceTag.
+ * @param productName the product name.
+ * @param productVersion the product version.
+ * @param productURN the product urn.
+ * @param productParent the product parent name.
+ * @param productParentURN the parent urn.
+ * @param productDefinedInstanceID the installed location of the product.
+ * @param productVendor the product vendor.
+ * @param platformArch the platform arch.
+ * @param container the container.
+ * @param source the source.
+ * @param installerUID the installed UID
+ * @param timestamp the timestamp of the ServiceTag.
+ */
+ public ServiceTag(String instanceURN,
+ String productName,
+ String productVersion,
+ String productURN,
+ String productParent,
+ String productParentURN,
+ String productDefinedInstanceID,
+ String productVendor,
+ String platformArch,
+ String container,
+ String source,
+ int installerUID,
+ Date timestamp) {
+ setInstanceURN(instanceURN);
+ setProductName(productName);
+ setProductVersion(productVersion);
+ setProductURN(productURN);
+ setProductParentURN(productParentURN);
+ setProductParent(productParent);
+ setProductDefinedInstanceID(productDefinedInstanceID);
+ setProductVendor(productVendor);
+ setPlatformArch(platformArch);
+ setContainer(container);
+ setSource(source);
+ setInstallerUID(installerUID);
+ setTimestamp(timestamp);
+ }
+
+ /**
+ * Creates a new instance of DsServiceTag.
+ * @param parser the properties provider.
+ * @param source the creator name.
+ * @param installedLocation the installed location of the product.
+ * @return DsServiceTag instance.
+ */
+ public static ServiceTag newInstance(SwordFishIDParser parser,
+ String source,
+ String installedLocation) {
+ return new ServiceTag("", /* empty instance_urn */
+ parser.getProductName(),
+ parser.getProductVersion(),
+ parser.getSwordFishID(),
+ parser.getProductParent(),
+ parser.getProductParentUrn(),
+ installedLocation,
+ parser.getProductVendor(),
+ SystemEnvironment.getSystemEnvironment().getOsArchitecture(),
+ PRODUCT_CONTAINER,
+ source,
+ -1,
+ null);
+ }
+
+ /**
+ * Creates a new service tag object with no instance_urn.
+ * @param productName the name of the product.
+ * @param productVersion the version of the product.
+ * @param productURN the uniform resource name of the product
+ * @param productParent the name of the product's parent.
+ * @param productParentURN the uniform resource name of the
+ * product's parent.
+ * @param productDefinedInstanceID the instance identifier.
+ * @param productVendor the vendor of the product.
+ * @param platformArch the operating system architecture.
+ * @param container the container of the product.
+ * @param source the source of the product.
+ *
+ * @return DsServiceTag instance.
+ */
+ public static ServiceTag newInstance(String productName,
+ String productVersion,
+ String productURN,
+ String productParent,
+ String productParentURN,
+ String productDefinedInstanceID,
+ String productVendor,
+ String platformArch,
+ String container,
+ String source) {
+ return new ServiceTag("", /* empty instance_urn */
+ productName,
+ productVersion,
+ productURN,
+ productParent,
+ productParentURN,
+ productDefinedInstanceID,
+ productVendor,
+ platformArch,
+ container,
+ source,
+ -1,
+ null);
+ }
+
+ /**
+ * Creates a service tag object with a specified <tt>instance_urn</tt>.
+ *
+ * @param instanceURN the uniform resource name of this
+ * instance.
+ * @param productName the name of the product.
+ * @param productVersion the version of the product.
+ * @param productURN the uniform resource name of the product
+ * @param productParent the name of the product's parent.
+ * @param productParentURN the uniform resource name of the
+ * product's parent.
+ * @param productDefinedInstanceID the instance identifier.
+ * @param productVendor the vendor of the product.
+ * @param platformArch the operating system architecture.
+ * @param container the container of the product.
+ * @param source the source of the product.
+ * @return the ServiceTag object
+ */
+ public static ServiceTag newInstance(String instanceURN,
+ String productName,
+ String productVersion,
+ String productURN,
+ String productParent,
+ String productParentURN,
+ String productDefinedInstanceID,
+ String productVendor,
+ String platformArch,
+ String container,
+ String source) {
+ return new ServiceTag(instanceURN,
+ productName,
+ productVersion,
+ productURN,
+ productParent,
+ productParentURN,
+ productDefinedInstanceID,
+ productVendor,
+ platformArch,
+ container,
+ source,
+ -1,
+ null);
+ }
+
+ /**
+ * Returns a uniform resource name (urn).
+ * @return a URN as a String.
+ */
+ public static String generateInstanceURN() {
+ return Util.generateURN();
+ }
+
+ /**
+ * Returns the uniform resource name of this service tag instance.
+ * @return the instance_urn of this service tag.
+ */
+ public String getInstanceURN() {
+ return instanceURN;
+ }
+
+ /**
+ * Returns the name of the product.
+ * @return the product name.
+ */
+ public String getProductName() {
+ return productName;
+ }
+
+ /**
+ * Returns the version of the product.
+ * @return the product version.
+ */
+ public String getProductVersion() {
+ return productVersion;
+ }
+
+ /**
+ * Returns the uniform resource name of the product.
+ * @return the product URN.
+ */
+ public String getProductURN() {
+ return productURN;
+ }
+
+ /**
+ * Returns the uniform resource name of the product's parent.
+ * @return the product's parent URN.
+ */
+ public String getProductParentURN() {
+ return productParentURN;
+ }
+
+ /**
+ * Returns the name of the product's parent.
+ * @return the product's parent name.
+ */
+ public String getProductParent() {
+ return productParent;
+ }
+
+ /**
+ * Returns the identifier defined for this product instance.
+ * @return the identifier defined for this product instance.
+ */
+ public String getProductDefinedInstanceID() {
+ return productDefinedInstanceID;
+ }
+
+ /**
+ * Returns the vendor of the product.
+ * @return the product vendor.
+ */
+ public String getProductVendor() {
+ return productVendor;
+ }
+
+ /**
+ * Returns the platform architecture on which the product
+ * is running on.
+ * @return the platform architecture on which the product is running on.
+ */
+ public String getPlatformArch() {
+ return platformArch;
+ }
+
+ /**
+ * Returns the timestamp. This timestamp is set when this service tag
+ * is added to or updated in the system service tag registry.
+ * @return timestamp when this service tag
+ * is added to or updated in a the system service tag registry.
+ */
+ public Date getTimestamp() {
+ if (timestamp != null) {
+ return (Date) timestamp.clone();
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Returns the container of the product.
+ * @return the container of the product.
+ */
+ public String getContainer() {
+ return container;
+ }
+
+ /**
+ * Returns the source of this service tag.
+ * @return source of this service tag.
+ */
+ public String getSource() {
+ return source;
+ }
+
+ /**
+ * Returns the UID. The UID is set when this service tag
+ * is added to or updated in the system service tag registry.
+ * @return the UID of whom this service tag
+ * is added to or updated in the system service tag registry.
+ */
+ public int getInstallerUID() {
+ return installerUID;
+ }
+
+ // The following setter methods are used to validate the
+ // input field when constructing a ServiceTag instance
+ private void setInstanceURN(String instanceURN) {
+ if (instanceURN == null) {
+ throw new NullPointerException(
+ "Parameter instanceURN cannot be null");
+ }
+ if (instanceURN.length() > MAX_URN_LEN) {
+ throw new IllegalArgumentException("instanceURN \"" + instanceURN +
+ "\" exceeds maximum length " + MAX_URN_LEN);
+ }
+ this.instanceURN = instanceURN;
+ }
+
+ private void setProductName(String productName) {
+ if (productName == null) {
+ throw new NullPointerException(
+ "Parameter productName cannot be null");
+ }
+ if (productName.length() == 0) {
+ throw new IllegalArgumentException("product name cannot be empty");
+ }
+ if (productName.length() > MAX_PRODUCT_NAME_LEN) {
+ throw new IllegalArgumentException("productName \"" + productName +
+ "\" exceeds maximum length " + MAX_PRODUCT_NAME_LEN);
+ }
+ this.productName = productName;
+ }
+
+ private void setProductVersion(String productVersion) {
+ if (productVersion == null) {
+ throw new NullPointerException(
+ "Parameter productVersion cannot be null");
+ }
+
+ if (productVersion.length() == 0) {
+ throw new IllegalArgumentException(
+ "product version cannot be empty");
+ }
+ if (productVersion.length() > MAX_PRODUCT_VERSION_LEN) {
+ throw new IllegalArgumentException("productVersion \"" +
+ productVersion + "\" exceeds maximum length " +
+ MAX_PRODUCT_VERSION_LEN);
+ }
+ this.productVersion = productVersion;
+ }
+
+ private void setProductURN(String productURN) {
+ if (productURN == null) {
+ throw new NullPointerException(
+ "Parameter productURN cannot be null");
+ }
+ if (productURN.length() == 0) {
+ throw new IllegalArgumentException(
+ "product URN cannot be empty");
+ }
+ if (productURN.length() > MAX_URN_LEN) {
+ throw new IllegalArgumentException("productURN \"" + productURN +
+ "\" exceeds maximum length " + MAX_URN_LEN);
+ }
+ this.productURN = productURN;
+ }
+
+ private void setProductParentURN(String productParentURN) {
+ if (productParentURN == null) {
+ throw new NullPointerException(
+ "Parameter productParentURN cannot be null");
+ }
+ // optional field - can be empty
+ if (productParentURN.length() > MAX_URN_LEN) {
+ throw new IllegalArgumentException("productParentURN \"" +
+ productParentURN + "\" exceeds maximum length " +
+ MAX_URN_LEN);
+ }
+ this.productParentURN = productParentURN;
+ }
+
+ private void setProductParent(String productParent) {
+ if (productParent == null) {
+ throw new NullPointerException(
+ "Parameter productParent cannot be null");
+ }
+ if (productParent.length() == 0) {
+ throw new IllegalArgumentException(
+ "product parent cannot be empty");
+ }
+ if (productParent.length() > MAX_PRODUCT_PARENT_LEN) {
+ throw new IllegalArgumentException("productParent \"" +
+ productParent + "\" exceeds maximum length " +
+ MAX_PRODUCT_PARENT_LEN);
+ }
+ this.productParent = productParent;
+ }
+
+ private void setProductDefinedInstanceID(String productDefinedInstanceID) {
+ if (productDefinedInstanceID == null) {
+ throw new NullPointerException(
+ "Parameter productDefinedInstanceID cannot be null");
+ }
+ if (productDefinedInstanceID.length() > MAX_URN_LEN) {
+ throw new IllegalArgumentException("productDefinedInstanceID \"" +
+ productDefinedInstanceID + "\" exceeds maximum length " +
+ MAX_URN_LEN);
+ }
+ // optional field - can be empty
+ this.productDefinedInstanceID = productDefinedInstanceID;
+ }
+
+ private void setProductVendor(String productVendor) {
+ if (productVendor == null) {
+ throw new NullPointerException(
+ "Parameter productVendor cannot be null");
+ }
+ if (productVendor.length() == 0) {
+ throw new IllegalArgumentException(
+ "product vendor cannot be empty");
+ }
+ if (productVendor.length() > MAX_PRODUCT_VENDOR_LEN) {
+ throw new IllegalArgumentException("productVendor \"" +
+ productVendor + "\" exceeds maximum length " +
+ MAX_PRODUCT_VENDOR_LEN);
+ }
+ this.productVendor = productVendor;
+ }
+
+ private void setPlatformArch(String platformArch) {
+ if (platformArch == null) {
+ throw new NullPointerException(
+ "Parameter platformArch cannot be null");
+ }
+ if (platformArch.length() == 0) {
+ throw new IllegalArgumentException(
+ "platform architecture cannot be empty");
+ }
+ if (platformArch.length() > MAX_PLATFORM_ARCH_LEN) {
+ throw new IllegalArgumentException("platformArch \"" +
+ platformArch + "\" exceeds maximum length " +
+ MAX_PLATFORM_ARCH_LEN);
+ }
+ this.platformArch = platformArch;
+ }
+
+ private void setTimestamp(Date timestamp) {
+ // can be null
+ this.timestamp = timestamp;
+ }
+
+ private void setContainer(String container) {
+ if (container == null) {
+ throw new NullPointerException(
+ "Parameter container cannot be null");
+ }
+ if (container.length() == 0) {
+ throw new IllegalArgumentException("container cannot be empty");
+ }
+ if (container.length() > MAX_CONTAINER_LEN) {
+ throw new IllegalArgumentException("container \"" +
+ container + "\" exceeds maximum length " +
+ MAX_CONTAINER_LEN);
+ }
+ this.container = container;
+ }
+
+ private void setSource(String source) {
+ if (source == null) {
+ throw new NullPointerException("Parameter source cannot be null");
+ }
+ if (source.length() == 0) {
+ throw new IllegalArgumentException("source cannot be empty");
+ }
+ if (source.length() > MAX_SOURCE_LEN) {
+ throw new IllegalArgumentException("source \"" + source +
+ "\" exceeds maximum length " + MAX_SOURCE_LEN);
+ }
+ this.source = source;
+ }
+
+ private void setInstallerUID(int installerUID) {
+ this.installerUID = installerUID;
+ }
+
+ /**
+ * Compares this service tag to the specified object.
+ * @param obj Object to test.
+ * @return true if this service tag is the same as
+ * the specified object.
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null || !(obj instanceof ServiceTag)) {
+ return false;
+ }
+ ServiceTag st = (ServiceTag) obj;
+ if (st == this) {
+ return true;
+ }
+ return st.getInstanceURN().equals(getInstanceURN());
+ }
+
+ /**
+ * Returns the hash code value for this service tag.
+ * @return the hash code value for this service tag.
+ */
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 19 * hash + (this.instanceURN != null ?
+ this.instanceURN.hashCode()
+ : 0);
+ return hash;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagAlreadyExistsException.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagAlreadyExistsException.java
new file mode 100644
index 0000000..c67c42c
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagAlreadyExistsException.java
@@ -0,0 +1,66 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+import org.opends.messages.Message;
+
+/**
+ * Exception class if the ServiceTag exists.
+ */
+public class ServiceTagAlreadyExistsException extends ServiceTagException {
+
+ /**
+ * The serial version identifier required to satisfy the compiler
+ * because this class extends <CODE>java.lang.Exception</CODE>,
+ * which implements the <CODE>java.io.Serializable</CODE> interface.
+ * This value was generated using the <CODE>serialver</CODE>
+ * command-line utility included with the Java SDK.
+ */
+ private static final long serialVersionUID = -7988596995323914139L;
+ /**
+ * Create a ServiceTag Exception with a message and cause.
+ *
+ * @param message
+ * The message.
+ */
+ protected ServiceTagAlreadyExistsException(Message message) {
+ super(message);
+ }
+
+ /**
+ * Create a ServiceTag Exception with a message and cause.
+ *
+ * @param message
+ * The message.
+ * @param cause
+ * The cause.
+ */
+ protected ServiceTagAlreadyExistsException(
+ Message message, Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagDefinition.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagDefinition.java
new file mode 100644
index 0000000..156ec08
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagDefinition.java
@@ -0,0 +1,121 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+/**
+ * Definitions of ServiceTag properties, fields and values.
+ */
+public class ServiceTagDefinition {
+
+ /**
+ * instance_urn tag field name in the servicetag dtd.
+ */
+ public final static String ST_NODE_INSTANCE_URN = "instance_urn";
+ /**
+ * product_name tag field name in the servicetag dtd.
+ */
+ public final static String ST_NODE_PRODUCT_NAME = "product_name";
+ /**
+ * product_version tag field name in the servicetag dtd.
+ */
+ public final static String ST_NODE_PRODUCT_VERSION = "product_version";
+ /**
+ * product_urn tag field name in the servicetag dtd.
+ */
+ public final static String ST_NODE_PRODUCT_URN = "product_urn";
+ /**
+ * product_parent_urn tag field name in the servicetag dtd.
+ */
+ public final static String ST_NODE_PRODUCT_PARENT_URN
+ = "product_parent_urn";
+ /**
+ * product_parent tag field name in the servicetag dtd.
+ */
+ public final static String ST_NODE_PRODUCT_PARENT = "product_parent";
+ /**
+ * product_defined_inst_id tag field name in the servicetag dtd.
+ */
+ public final static String ST_NODE_PRODUCT_DEFINED_INST_ID
+ = "product_defined_inst_id";
+ /**
+ * product_vendor tag field name in the servicetag dtd.
+ */
+ public final static String ST_NODE_PRODUCT_VENDOR = "product_vendor";
+ /**
+ * platform_arch tag field name in the servicetag dtd.
+ */
+ public final static String ST_NODE_PLATFORM_ARCH = "platform_arch";
+ /**
+ * timestamp tag field name in the servicetag dtd.
+ */
+ public final static String ST_NODE_TIMESTAMP = "timestamp";
+ /**
+ * container tag field name in the servicetag dtd.
+ */
+ final static String ST_NODE_CONTAINER = "container";
+ /**
+ * tag field name in the servicetag dtd.
+ */
+ final static String ST_NODE_SOURCE = "source";
+ /**
+ * tag field name in the servicetag dtd.
+ */
+ final static String ST_NODE_INSTALLER_UID = "installer_uid";
+ /**
+ * Product container value.
+ */
+ final static String PRODUCT_CONTAINER = "Global";
+ /**
+ * Product vendor property.
+ */
+ final static String PRODUCT_VENDOR = "org.opends.server.servicetag.vendor";
+ /**
+ * Product name property.
+ */
+ final static String PRODUCT_NAME =
+ "org.opends.server.servicetag.productname";
+ /**
+ * Product version property.
+ */
+ final static String PRODUCT_VERSION =
+ "org.opends.server.servicetag.version";
+ /**
+ * Product uuid property.
+ */
+ final static String PRODUCT_UUID =
+ "org.opends.server.servicetag.uuid";
+ /**
+ * Product parent property.
+ */
+ final static String PRODUCT_PARENT =
+ "org.opends.server.servicetag.parent";
+ /**
+ * Product parent urn property.
+ */
+ final static String PRODUCT_PARENT_URN =
+ "org.opends.server.servicetag.parenturn";
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagDoesNotExistException.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagDoesNotExistException.java
new file mode 100644
index 0000000..b6eb909
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagDoesNotExistException.java
@@ -0,0 +1,65 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+import org.opends.messages.Message;
+
+/**
+ * Exception thrown when the ServiceTag does not exist.
+ */
+public class ServiceTagDoesNotExistException extends ServiceTagException {
+
+ /**
+ * The serial version identifier required to satisfy the compiler
+ * because this class extends <CODE>java.lang.Exception</CODE>,
+ * which implements the <CODE>java.io.Serializable</CODE> interface.
+ * This value was generated using the <CODE>serialver</CODE>
+ * command-line utility included with the Java SDK.
+ */
+ private static final long serialVersionUID = -134526464852686155L;
+
+ /**
+ * Create a ServiceTag Exception with a message and cause.
+ * @param message
+ * The message.
+ */
+ protected ServiceTagDoesNotExistException(Message message) {
+ super(message);
+ }
+
+ /**
+ * Create a ServiceTag Exception with a message and cause.
+ * @param message
+ * The message.
+ * @param cause
+ * The cause.
+ */
+ protected ServiceTagDoesNotExistException(
+ Message message, Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagException.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagException.java
new file mode 100644
index 0000000..cab7608
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagException.java
@@ -0,0 +1,64 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+import org.opends.messages.Message;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * Common ServiceTag Exception.
+ */
+public class ServiceTagException extends OpenDsException {
+
+ /**
+ * The serial version identifier required to satisfy the compiler
+ * because this class extends <CODE>java.lang.Exception</CODE>,
+ * which implements the <CODE>java.io.Serializable</CODE> interface.
+ * This value was generated using the <CODE>serialver</CODE>
+ * command-line utility included with the Java SDK.
+ */
+ private static final long serialVersionUID = -6378920301282558293L;
+ /**
+ * Create a ServiceTag Exception with a message and cause.
+ * @param message
+ * The message.
+ */
+ protected ServiceTagException(Message message) {
+ super(message);
+ }
+
+ /**
+ * Create a ServiceTag Exception with a message and cause.
+ * @param message
+ * The message.
+ * @param cause
+ * The cause.
+ */
+ protected ServiceTagException(Message message, Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagRegistration.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagRegistration.java
new file mode 100644
index 0000000..2853466
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/ServiceTagRegistration.java
@@ -0,0 +1,449 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+import org.opends.server.core.DirectoryServer;
+
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.types.DebugLogLevel;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+
+import static org.opends.server.servicetag.ServiceTagDefinition.*;
+import static org.opends.messages.ServiceTagMessages.*;
+
+/**
+ * ServiceTagRegistration service is responsible to
+ * manage the Common and Active product registration : Only common registration
+ * is currently supported.
+ * Main class to register/delete ServiceTags.
+ */
+public class ServiceTagRegistration {
+
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
+
+ // Registration singleton service
+ private static ServiceTagRegistration registrationService = null;
+ // Configuration / properties files management
+ private SwordFishIdConfiguration configurationService = null;
+ // ServiceTag Registry which manage the stclient calls
+ private Registry registry = null;
+
+ /**
+ * Private service contructor.
+ */
+ private ServiceTagRegistration() {
+ // Get the configuration
+ this.configurationService = SwordFishIdConfiguration.getService();
+ // Get the common registry
+ if (Registry.isSupported()) {
+ this.registry = Registry.getSystemRegistry();
+ }
+ }
+
+ /**
+ * Gets the ServiceTag registration service.
+ * This registration service allow to register create and register
+ * ServiceTag for products.
+ * @return the service
+ */
+ public static ServiceTagRegistration getRegistrationService() {
+ if (ServiceTagRegistration.registrationService == null) {
+ ServiceTagRegistration.registrationService =
+ new ServiceTagRegistration();
+ }
+
+ return registrationService;
+ }
+
+ /**
+ * Tests if the stclient CLI is present on the filesystem.
+ * The serviceTag packages are not relocatable so the full path
+ * is well known if exists.
+ * @return true if stclient binary exists, false otherwise.
+ */
+ public boolean isCommonRegistrationSupported() {
+ return Registry.isSupported();
+ }
+
+ /**
+ * Create the defined serviceTags for OpenDS Based Servers if
+ * the native registration is supported
+ * If the system supports service tag, stclient will be used
+ * to create the OpenDS service tag.
+ * @param svcTag the ServiceTag to register.
+ * @throws org.opends.server.servicetag.ServiceTagException
+ * if the ServiceTag can not be registered
+ * @throws org.opends.server.servicetag.ServiceTagAlreadyExistsException
+ * if the ServiceTag already exists in the common registry based on
+ * the product_urn and product_defined_instanceid
+ * @throws java.lang.IllegalArgumentException if parameter is not valid.
+ */
+ public void registerServiceTag(ServiceTag svcTag) throws
+ ServiceTagException, IllegalArgumentException,
+ ServiceTagAlreadyExistsException {
+
+ // Test if the common registration is supported on the filesystem
+ // or not
+ if (!isCommonRegistrationSupported()) {
+ throw new ServiceTagException(
+ WARN_REGISTRY_NOT_SUPPORTED.get());
+ }
+
+ // Parameter checking
+ if (svcTag == null) {
+ throw new IllegalArgumentException(
+ WARN_PARAMETER_CANNOT_BE_NULL.get("svcTag").toString());
+ }
+
+ // Add the ServiceTag if it does not exist
+ if (this.registry.existServiceTag(
+ svcTag.getProductURN(),
+ svcTag.getProductDefinedInstanceID())) {
+ throw new ServiceTagAlreadyExistsException
+ (WARN_SERVICETAG_ALREADY_EXIST.get());
+ }
+
+ // Add the ServiceTag in the common registry
+ try {
+ this.registry.addServiceTag(svcTag);
+ } catch (IOException ex) {
+ throw new ServiceTagException(
+ WARN_SERVICETAG_CANNOT_BE_REGISTERED.get());
+ }
+ }
+
+ /**
+ * Create and register the defined serviceTags for OpenDS Based Servers if
+ * the common registration is supported.
+ * If the system supports service tag, stclient will be used
+ * to create the OpenDS service tag.
+ * @param source defining who is the creater
+ * @return a set of DsServiceTag which have NOT been registered
+ * due to registration errors.
+ * An empty Set means that no error occurs.
+ * @throws org.opends.server.servicetag.ServiceTagException if a pb
+ * occurs.
+ * @throws java.lang.IllegalArgumentException if parameter is not valid.
+ */
+ public Set<ServiceTag> registerServiceTags(String source)
+ throws ServiceTagException, IllegalArgumentException {
+
+ // Parameter checking
+ // Test if the common registration is supported on the filesystem
+ // or not
+ if (!isCommonRegistrationSupported()) {
+ throw new ServiceTagException(
+ WARN_REGISTRY_NOT_SUPPORTED.get());
+ }
+
+ if ((source == null) || (source.length() == 0)) {
+ throw new IllegalArgumentException(
+ WARN_PARAMETER_CANNOT_BE_NULL.get("source").toString());
+ }
+
+ // Errors Set
+ Set<ServiceTag> errors = new HashSet<ServiceTag>();
+
+ // Get the parsers
+ Set<SwordFishIDParser> parsers =
+ this.configurationService.getParsers();
+
+ // Throw exception id nothing to register
+ if (parsers.isEmpty()) {
+ throw new ServiceTagException(
+ WARN_NO_SERVICETAG_TO_REGISTER.get());
+ }
+
+ // Register ServiceTag
+ ServiceTag svcTag = null;
+ for (SwordFishIDParser parser : parsers) {
+
+ // create the serviceTag if the registration is supported
+ // and the tag does not already exist
+ svcTag = ServiceTag.newInstance(
+ parser,
+ source,
+ DirectoryServer.getServerRoot());
+ try {
+ registerServiceTag(svcTag);
+ } catch (Exception ex) {
+ errors.add(svcTag);
+ }
+ }
+ return errors;
+ }
+
+ /**
+ * Deletes from the common registry the defined ServiceTag.
+ * @param svcTag to delete.
+ * @throws java.lang.IllegalArgumentException if parameter is not valid.
+ * @throws org.opends.server.servicetag.ServiceTagException if a
+ * pb occurs.
+ * @throws org.opends.server.servicetag.ServiceTagDoesNotExistException
+ * if the ServiceTag to delete does not exist.
+ */
+ public void deleteServiceTag(ServiceTag svcTag) throws
+ IllegalArgumentException, ServiceTagException,
+ ServiceTagDoesNotExistException {
+
+ // Test if the common registration is supported on the filesystem
+ // or not
+ if (!isCommonRegistrationSupported()) {
+ throw new ServiceTagException(
+ WARN_REGISTRY_NOT_SUPPORTED.get());
+ }
+ // Parametr checking
+ if (svcTag == null) {
+ throw new IllegalArgumentException(
+ WARN_PARAMETER_CANNOT_BE_NULL.get("svcTag").toString());
+ }
+
+ if (!this.registry.existServiceTag(
+ svcTag.getProductURN(),
+ svcTag.getProductDefinedInstanceID())) {
+ throw new ServiceTagDoesNotExistException(
+ WARN_SERVICETAG_DOESNOT_EXIST.get());
+ }
+
+ try {
+ this.registry.removeServiceTag(svcTag.getInstanceURN());
+ } catch (IOException ex) {
+ throw new ServiceTagException(
+ WARN_NO_SERVICETAG_TO_REMOVE.get());
+ }
+ }
+
+ /**
+ * Delete the created tags defined in the properties files.
+ * @throws org.opends.server.servicetag.ServiceTagException.
+ */
+ private Set<ServiceTag> deleteServiceTags() throws ServiceTagException {
+
+ // Parameter checking
+ // Test if the common registration is supported on the filesystem
+ // or not
+ if (!isCommonRegistrationSupported()) {
+ throw new ServiceTagException(
+ WARN_REGISTRY_NOT_SUPPORTED.get());
+ }
+
+ Set<SwordFishIDParser> parsers =
+ this.configurationService.getParsers();
+
+ // Throw exception id nothing to register
+ if (parsers.isEmpty()) {
+ throw new ServiceTagException(
+ WARN_NO_SERVICETAG_TO_REMOVE.get());
+ }
+
+ Set<ServiceTag> errors = new HashSet<ServiceTag>();
+ for (SwordFishIDParser parser : parsers) {
+ Set<ServiceTag> removeTags = null;
+ try {
+ removeTags = this.registry.findServiceTags(
+ parser.getSwordFishID());
+ if ((removeTags == null) || (removeTags.isEmpty())) {
+ throw new ServiceTagException(
+ WARN_NO_SERVICETAG_TO_REMOVE.get());
+ }
+ } catch (Exception ex) {
+ throw new ServiceTagException(
+ WARN_NO_SERVICETAG_TO_REMOVE.get());
+ }
+
+ for (ServiceTag svcTag : removeTags) {
+ try {
+ deleteServiceTag(svcTag);
+ } catch (Exception ex) {
+ errors.add(svcTag);
+ }
+ }
+ }
+ return errors;
+ }
+
+ /**
+ * Creates and register a ServiceTag based on properties definitions
+ * and source.
+ * @param source defining the caller.
+ * @param properties where the following ones are defined
+ * <B>org.opends.server.servicetag.productname</B>
+ * <B>org.opends.server.servicetag.version</B>
+ * <B>org.opends.server.servicetag.uuid</B>
+ * <B>org.opends.server.servicetag.parent</B>
+ * <B>org.opends.server.servicetag.parenturn</B>
+ * <B>org.opends.server.servicetag.vendor</B>
+ * @return the corresponding registered ServiceTag object
+ * @throws org.opends.server.servicetag.ServiceTagException if a
+ * registration problem occurs.
+ * @throws org.opends.server.servicetag.ServiceTagAlreadyExistsException if
+ * the Service tag already exist.
+ * @throws java.lang.IllegalArgumentException if parameters are not valid.
+ */
+ public ServiceTag registerServiceTag(String source,
+ Properties properties)
+ throws ServiceTagException, IllegalArgumentException,
+ ServiceTagAlreadyExistsException {
+
+ if ((source == null) || (source.length() == 0)) {
+ throw new IllegalArgumentException(
+ WARN_PARAMETER_CANNOT_BE_NULL.get("source").toString());
+ }
+
+ if (properties == null) {
+ throw new IllegalArgumentException(
+ WARN_PARAMETER_CANNOT_BE_NULL.get("properties").toString());
+ }
+
+ if (!properties.containsKey(PRODUCT_NAME)) {
+ throw new IllegalArgumentException(
+ WARN_BAD_PROPERTIES.get(PRODUCT_NAME).toString());
+ }
+ String productName = properties.getProperty(PRODUCT_NAME);
+
+ if (!properties.containsKey(PRODUCT_VERSION)) {
+ throw new IllegalArgumentException(
+ WARN_BAD_PROPERTIES.get(PRODUCT_VERSION).toString());
+ }
+ String productVersion = properties.getProperty(PRODUCT_VERSION);
+
+ if (!properties.containsKey(PRODUCT_UUID)) {
+ throw new IllegalArgumentException(
+ WARN_BAD_PROPERTIES.get(PRODUCT_UUID).toString());
+ }
+ String productURN = properties.getProperty(PRODUCT_UUID);
+
+ if (!properties.containsKey(PRODUCT_PARENT)) {
+ throw new IllegalArgumentException(
+ WARN_BAD_PROPERTIES.get(PRODUCT_PARENT).toString());
+ }
+ String productParent = properties.getProperty(PRODUCT_PARENT);
+
+ if (!properties.containsKey(PRODUCT_PARENT_URN)) {
+ throw new IllegalArgumentException(
+ WARN_BAD_PROPERTIES.get(PRODUCT_PARENT_URN).toString());
+ }
+ String productParentURN = properties.getProperty(PRODUCT_PARENT_URN);
+
+ ServiceTag svcTag = ServiceTag.newInstance(
+ productName,
+ productVersion,
+ productURN,
+ productParent,
+ productParentURN,
+ DirectoryServer.getServerRoot(),
+ PRODUCT_VENDOR,
+ SystemEnvironment.getSystemEnvironment().getOsArchitecture(),
+ PRODUCT_CONTAINER,
+ source);
+
+ registerServiceTag(svcTag);
+
+ return svcTag;
+ }
+
+ /**
+ * Test purpose.
+ * @param args represents -register or -delete command.
+ */
+ public static void main(String[] args) {
+
+ String source = "Manual";
+
+ // Parse the options (arguments starting with "-" )
+ boolean delete = false;
+ boolean register = false;
+
+ int count = 0;
+ while (count < args.length) {
+ String arg = args[count];
+ if (arg.trim().length() == 0) {
+ // skip empty arguments
+ count++;
+ continue;
+ }
+
+ if (arg.equals("-delete")) {
+ delete = true;
+ } else if (arg.equals("-register")) {
+ register = true;
+ }
+ count++;
+ }
+
+ if ((register == false) && (delete == false)) {
+ usage();
+ return;
+ }
+
+ ServiceTagRegistration service =
+ ServiceTagRegistration.getRegistrationService();
+
+ if (delete) {
+ try {
+ service.deleteServiceTags();
+ } catch (ServiceTagException ex) {
+ // ServiceTags Registration errors do not prevent the server to
+ // start. WARNING logged in debug mode
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.WARNING, ex);
+ } }
+ } else {
+ try {
+ service.registerServiceTags(source);
+ } catch (Exception ex) {
+ // ServiceTags Registration errors do not prevent the server to
+ // start. WARNING logged in debug mode
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.WARNING, ex);
+ }
+ }
+ }
+ System.exit(0);
+ }
+
+ private static void usage() {
+ System.out.println("Usage:");
+ System.out.print(" " + ServiceTagRegistration.class.getName());
+ System.out.println(" [-delete|-register|-help]");
+ System.out.println(" to delete/register a OpenDS ServiceTags");
+ System.out.println("");
+ System.out.println("Options:");
+ System.out.println(" -delete : to delete the OpenDS ServiceTags");
+ System.out.println(" -register: to register the OpenDS ServiceTags");
+ System.out.println(" -help : to print this help message");
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/SwordFishIDParser.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/SwordFishIDParser.java
new file mode 100644
index 0000000..ded9c35
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/SwordFishIDParser.java
@@ -0,0 +1,118 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+import static org.opends.server.servicetag.ServiceTagDefinition.*;
+
+/**
+ * SwordFishIDParser parses a properties file where product's properties
+ * are
+ * <LI><B>org.opends.server.servicetag.productname</B></LI>
+ * <LI><B>org.opends.server.servicetag.version</B></LI>
+ * <LI><B>org.opends.server.servicetag.uuid</B></LI>
+ * <LI><B>org.opends.server.servicetag.parent</B></LI>
+ * <LI><B>org.opends.server.servicetag.parenturn</B></LI>
+ * <LI><B>org.opends.server.servicetag.vendor</B></LI>.
+ */
+public class SwordFishIDParser {
+
+ // List of properties
+ private Properties properties; // File propeties url to load
+ private final URL url; // Properties names
+
+ /**
+ * Creates a parser for the properties file.
+ * @param url to the properties file.
+ * @throws java.io.IOException if the stream could not be opened.
+ */
+ public SwordFishIDParser(URL url) throws IOException {
+ this.url = url;
+ this.properties = new Properties();
+ this.properties.load(url.openStream());
+ }
+
+ /**
+ * Gets the UUID defined in the properties file.
+ * @return the swordfish id.
+ */
+ public String getSwordFishID() {
+ return properties.getProperty(PRODUCT_UUID);
+ }
+
+ /**
+ * Gets the product name defined in the properties file.
+ * @return the product name.
+ */
+ public String getProductName() {
+ return properties.getProperty(PRODUCT_NAME);
+ }
+
+ /**
+ * Gets the version defined in the properties file.
+ * @return the version.
+ */
+ public String getProductVersion() {
+ return properties.getProperty(PRODUCT_VERSION);
+ }
+
+ /**
+ * Gets the vendor defined in the properties file.
+ * @return the product vendor.
+ */
+ public String getProductVendor() {
+ return properties.getProperty(PRODUCT_VENDOR);
+ }
+
+ /**
+ * Gets the parent product family defined in the properties file.
+ * @return the parent family name.
+ */
+ public String getProductParent() {
+ return properties.getProperty(PRODUCT_PARENT);
+ }
+
+ /**
+ * Gets the UUID of the parent family defined in the properties file.
+ * @return the UUID of the product's family.
+ */
+ public String getProductParentUrn() {
+ return properties.getProperty(PRODUCT_PARENT_URN);
+ }
+
+ /**
+ * Gets the defined properties in a properties object.
+ * @return the properties object.
+ */
+ public Properties getProperties() {
+ return this.properties;
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/SwordFishIdConfiguration.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/SwordFishIdConfiguration.java
new file mode 100644
index 0000000..1e0faaa
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/SwordFishIdConfiguration.java
@@ -0,0 +1,117 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+import org.opends.server.core.DirectoryServer;
+
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.types.DebugLogLevel;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+
+/**
+ * SwordFishIdConfiguration allows to read the properties file,
+ * This class allows to get the associated parsers.
+ */
+public class SwordFishIdConfiguration {
+
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
+ // Singleton
+ private static SwordFishIdConfiguration service = null;
+ // Parsers for the ServiceTag properties files
+ private Set<SwordFishIDParser> parsers = new HashSet<SwordFishIDParser>();
+ // Configuration properties files pattern
+ private String FILE_PATTERN = "opends.uuids";
+ private File[] listProperties;
+
+ // Private constructor
+ private SwordFishIdConfiguration() {
+ // Build the full path to the properties files
+ String confDir =
+ DirectoryServer.getServerRoot() +
+ File.separatorChar +
+ "config" +
+ File.separatorChar +
+ "servicetag";
+
+ File config = new File(confDir);
+ if (!config.exists() || (!config.isDirectory())) {
+ return;
+ }
+ if (config.isDirectory()) {
+
+ this.listProperties = config.listFiles();
+ for (int i = 0; i < listProperties.length; i++) {
+ try {
+ if (listProperties[i].getAbsolutePath().
+ contains(FILE_PATTERN)) {
+ parsers.add(new SwordFishIDParser(
+ listProperties[i].toURI().toURL()));
+ }
+ } catch (Throwable t) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.WARNING, t);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns the configuration object allowing to get parsers
+ * and properties files.
+ * @return the configuration service.
+ */
+ public static SwordFishIdConfiguration getService() {
+ if (service == null) {
+ service = new SwordFishIdConfiguration();
+ }
+ return service;
+ }
+
+ /**
+ * Returns the list of parsers.
+ * @return the list of parsers.
+ */
+ public Set<SwordFishIDParser> getParsers() {
+ return this.parsers;
+ }
+
+ /**
+ * Returns the list of processed properties files.
+ * @return an Array of File.
+ */
+ public File[] getPropertiesFiles() {
+ return this.listProperties;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/SystemEnvironment.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/SystemEnvironment.java
new file mode 100644
index 0000000..cff4db5
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/SystemEnvironment.java
@@ -0,0 +1,100 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * SystemEnvironment provides utilities to get System information :
+ * hostname, os.name, os.version, os.arch.
+ */
+public class SystemEnvironment {
+
+ private String hostname;
+ private String osName;
+ private String osVersion;
+ private String osArchitecture;
+
+ private static SystemEnvironment sysEnv = null;
+
+ // Private contructor
+ private SystemEnvironment() {
+ try {
+ this.hostname = InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException ex) {
+ this.hostname = "Unknown host";
+ }
+ this.osName = System.getProperty("os.name");
+ this.osVersion = System.getProperty("os.version");
+ this.osArchitecture = System.getProperty("os.arch");
+ }
+
+ /**
+ * Return the System Environment singleton object.
+ * @return the DsSystemEnvironment object.
+ */
+ public static synchronized SystemEnvironment getSystemEnvironment() {
+ if (sysEnv == null) {
+ sysEnv = new SystemEnvironment();
+ }
+ return sysEnv;
+ }
+
+ /**
+ * Returns the hostname.
+ * @return The hostname.
+ */
+ public String getHostname() {
+ return hostname;
+ }
+
+ /**
+ * Returns the osName.
+ * @return The osName.
+ */
+ public String getOsName() {
+ return osName;
+ }
+
+ /**
+ * Returns the osVersion.
+ * @return The osVersion.
+ */
+ public String getOsVersion() {
+ return osVersion;
+ }
+
+ /**
+ * Returns the osArchitecture.
+ * @return The osArchitecture.
+ */
+ public String getOsArchitecture() {
+ return osArchitecture;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/Util.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/Util.java
new file mode 100644
index 0000000..d6180a5
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/Util.java
@@ -0,0 +1,229 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.servicetag;
+
+import java.io.*;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+import java.util.TimeZone;
+import java.util.UUID;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.types.DebugLogLevel;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+
+/**
+ * Utility class for org.opends.server.servicetag package.
+ */
+class Util {
+
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
+ /**
+ * Returns a generated a random instance URN.
+ * @return a String "urn:st:....".
+ */
+ public static String generateURN() {
+ return "urn:st:" + UUID.randomUUID().toString();
+ }
+
+ /**
+ * Returns the int represntation of the String.
+ * @param value to tranform.
+ * @return the int value.
+ */
+ public static int getIntValue(String value) {
+ try {
+ return Integer.parseInt(value);
+ } catch (NumberFormatException e) {
+ throw new IllegalArgumentException("\"" + value + "\"" +
+ " expected to be an integer");
+ }
+ }
+
+
+ /**
+ * Parses a timestamp string in YYYY-MM-dd HH:mm:ss GMT format.
+ * @param timestamp Timestamp in the YYYY-MM-dd HH:mm:ss GMT format.
+ * @return Date.
+ */
+ public static Date parseTimestamp(String timestamp) {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
+ df.setTimeZone(TimeZone.getTimeZone("GMT"));
+ try {
+ return df.parse(timestamp);
+ } catch (ParseException e) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.WARNING, e);
+ }
+ return new Date();
+ }
+ }
+
+ /**
+ * Returns the output of the process execution.
+ * @param p process.
+ * @return the output of the process execution.
+ * @throws java.io.IOException if a problem occurs.
+ */
+ public static String commandOutput(Process p) throws IOException {
+ Reader r = null;
+ Reader err = null;
+ try {
+ r = new InputStreamReader(p.getInputStream());
+ err = new InputStreamReader(p.getErrorStream());
+ String output = commandOutput(r);
+ String errorMsg = commandOutput(err);
+ p.waitFor();
+ return output + errorMsg.trim();
+ } catch (InterruptedException e) {
+ return e.getMessage();
+ } finally {
+ if (r != null) {
+ r.close();
+ }
+ if (err != null) {
+ err.close();
+ }
+ }
+ }
+
+ /**
+ * Returns the reader content as a String.
+ * @param r Reader.
+ * @return the Reader content.
+ * @throws java.io.IOException if a problem occurs.
+ */
+ public static String commandOutput(Reader r) throws IOException {
+ StringBuilder sb = new StringBuilder();
+ int c;
+ while ((c = r.read()) > 0) {
+ if (c != '\r') {
+ sb.append((char) c);
+ }
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Returns this java string as a null-terminated byte array.
+ */
+ private static byte[] stringToByteArray(String str) {
+ return (str + "\u0000").getBytes();
+ }
+
+ /**
+ * Converts a null-terminated byte array to java string.
+ */
+ private static String byteArrayToString(byte[] array) {
+ return new String(array, 0, array.length -1);
+ }
+
+ /**
+ * Gets the stclient path using a well known location from
+ * the Windows platform Registry, otherwise it will return null.
+ * @return the File representation of the stclient on windows platform.
+ */
+ public static File getWindowsStClientFile() {
+ File out = null;
+ String regKey =
+ "software\\microsoft\\windows\\currentversion\\app paths\\stclient.exe";
+ String keyName = "" ; // use the default key
+ String path = getRegistryKey(regKey, keyName);
+
+ if (path != null && (new File(path)).exists()) {
+ out = new File(path);
+ }
+ return out;
+ }
+
+ /**
+ * This uses reflection to access a private java windows registry
+ * interface, any changes to that Class must be appropriately adjusted.
+ * Returns a null if unsuccessful.
+ */
+ private static String getRegistryKey(String regKey, String keyName) {
+ String out = null;
+ try {
+ Class<?> clazz = Class.forName(
+ "java.util.prefs.WindowsPreferences");
+
+ // Get the registry methods
+ Method winRegOpenKeyM = clazz.getDeclaredMethod(
+ "WindowsRegOpenKey",
+ int.class, byte[].class, int.class);
+ winRegOpenKeyM.setAccessible(true);
+
+ Method winRegCloseKeyM = clazz.getDeclaredMethod(
+ "WindowsRegCloseKey",
+ int.class);
+ winRegCloseKeyM.setAccessible(true);
+
+ Method winRegQueryValueM = clazz.getDeclaredMethod(
+ "WindowsRegQueryValueEx",
+ int.class, byte[].class);
+ winRegQueryValueM.setAccessible(true);
+
+ // Get all the constants we need
+ int HKLM = getValueFromStaticField("HKEY_LOCAL_MACHINE", clazz);
+ int KEY_READ = getValueFromStaticField("KEY_READ", clazz);
+ int ERROR_CODE = getValueFromStaticField("ERROR_CODE", clazz);
+ int NATIVE_HANDLE = getValueFromStaticField("NATIVE_HANDLE", clazz);
+ int ERROR_SUCCESS = getValueFromStaticField("ERROR_SUCCESS", clazz);
+
+ // Convert keys
+ byte[] reg = stringToByteArray(regKey);
+ byte[] key = stringToByteArray(keyName);
+
+ // Open the registry
+ int[] result = (int[]) winRegOpenKeyM.invoke(
+ null, HKLM, reg, KEY_READ);
+
+ if (result[ERROR_CODE] == ERROR_SUCCESS) {
+ byte[] stvalue = (byte[]) winRegQueryValueM.invoke(null,
+ result[NATIVE_HANDLE], key);
+ out = byteArrayToString(stvalue);
+ winRegCloseKeyM.invoke(null, result[NATIVE_HANDLE]);
+ }
+ } catch (Exception ex) {
+ }
+ return out;
+ }
+
+ private static int getValueFromStaticField(
+ String fldName, Class<?> klass) throws Exception {
+ Field f = klass.getDeclaredField(fldName);
+ f.setAccessible(true);
+ return f.getInt(null);
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/servicetag/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/servicetag/package-info.java
new file mode 100644
index 0000000..ba064c5
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/servicetag/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+/**
+ * This package manages the common registration of the defined ServiceTags.
+ * The ServiceTagRegistration class is the main class and entry point
+ * to manage ServiceTags : registration and removal.
+ */
+@org.opends.server.types.PublicAPI(
+ stability=org.opends.server.types.StabilityLevel.PRIVATE)
+package org.opends.server.servicetag;
+
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java
index 5efefe1..cd60148 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java
@@ -30,7 +30,6 @@
import java.io.File;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.TreeSet;
@@ -45,6 +44,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SchemaConfigManager;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DebugLogLevel;
@@ -131,7 +131,7 @@
filesToAdd = new TreeSet<String>();
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
String filename = v.getStringValue();
filesToAdd.add(filename);
@@ -240,9 +240,9 @@
for (Modification m : modList)
{
Attribute a = m.getAttribute();
- LinkedHashSet<AttributeValue> valuesWithFileElement =
- new LinkedHashSet<AttributeValue>();
- for (AttributeValue v : a.getValues())
+ AttributeBuilder builder = new AttributeBuilder(a
+ .getAttributeType(), a.getName());
+ for (AttributeValue v : a)
{
String s = v.getStringValue();
if (s.indexOf(SCHEMA_PROPERTY_FILENAME) < 0)
@@ -259,14 +259,11 @@
}
}
- valuesWithFileElement.add(new AttributeValue(a.getAttributeType(),
- s));
+ builder.add(new AttributeValue(a.getAttributeType(), s));
}
- Attribute attrWithFile = new Attribute(a.getAttributeType(),
- a.getName(),
- valuesWithFileElement);
- mods.add(new Modification(m.getModificationType(), attrWithFile));
+ mods.add(new Modification(m.getModificationType(), builder
+ .toAttribute()));
}
}
catch (ConfigException ce)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/DisconnectClientTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/DisconnectClientTask.java
index d1df748..f39500e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/DisconnectClientTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/DisconnectClientTask.java
@@ -109,7 +109,7 @@
connIDLoop:
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -147,7 +147,7 @@
notifyClientLoop:
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
String stringValue = toLowerCase(v.getStringValue());
if (stringValue.equals("true"))
@@ -181,7 +181,7 @@
disconnectMessageLoop:
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
disconnectMessage = Message.raw(v.getStringValue());
break disconnectMessageLoop;
@@ -199,7 +199,7 @@
{
// Get the specified client connection.
ClientConnection clientConnection = null;
- for (ConnectionHandler handler : DirectoryServer.getConnectionHandlers())
+ for (ConnectionHandler<?> handler : DirectoryServer.getConnectionHandlers())
{
ConnectionHandler<? extends ConnectionHandlerCfg> connHandler =
(ConnectionHandler<? extends ConnectionHandlerCfg>) handler;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
index 6a54a24..32c9af6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
@@ -30,7 +30,6 @@
import static org.opends.messages.TaskMessages.*;
import static org.opends.messages.ToolMessages.*;
-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.opends.server.tools.makeldif.TemplateFile;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java
index cfbbe99..22bf607 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java
@@ -25,30 +25,28 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.tasks;
-import org.opends.messages.Message;
-import java.util.LinkedHashSet;
+import static org.opends.messages.TaskMessages.*;
+import static org.opends.server.config.ConfigConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.util.List;
+import org.opends.messages.Message;
import org.opends.server.api.ClientConnection;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
import org.opends.server.types.ResultCode;
-import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.messages.TaskMessages.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
@@ -103,13 +101,13 @@
if ((attrList != null) && (attrList.size() > 0))
{
Attribute attr = attrList.get(0);
- LinkedHashSet<AttributeValue> values = attr.getValues();
- if ((values != null) && (! values.isEmpty()))
+ if (!attr.isEmpty())
{
- String valueString = values.iterator().next().getStringValue();
+ String valueString = attr.iterator().next()
+ .getStringValue();
- shutdownMessage = INFO_TASK_SHUTDOWN_CUSTOM_MESSAGE.get(
- String.valueOf(taskEntry.getDN()), String.valueOf(valueString));
+ shutdownMessage = INFO_TASK_SHUTDOWN_CUSTOM_MESSAGE.get(String
+ .valueOf(taskEntry.getDN()), String.valueOf(valueString));
}
}
@@ -119,14 +117,13 @@
if ((attrList != null) && (attrList.size() > 0))
{
Attribute attr = attrList.get(0);
- LinkedHashSet<AttributeValue> values = attr.getValues();
- if ((values != null) && (! values.isEmpty()))
+ if (!attr.isEmpty())
{
- String valueString =
- toLowerCase(values.iterator().next().getStringValue());
+ String valueString = toLowerCase(attr.iterator().next()
+ .getStringValue());
- restart = (valueString.equals("true") || valueString.equals("yes") ||
- valueString.equals("on") || valueString.equals("1"));
+ restart = (valueString.equals("true") || valueString.equals("yes")
+ || valueString.equals("on") || valueString.equals("1"));
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java
index 141189a..edd2bc4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java
@@ -26,45 +26,46 @@
*/
package org.opends.server.tasks;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
+
+
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.messages.ConfigMessages.
- INFO_CONFIG_BACKEND_ATTR_DESCRIPTION_BACKEND_ID;
+import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.opends.messages.Message;
+import org.opends.messages.TaskMessages;
+import org.opends.server.admin.server.ServerManagementContext;
+import org.opends.server.admin.std.server.BackendCfg;
+import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
-import org.opends.server.types.DebugLogLevel;
-
-import org.opends.messages.TaskMessages;
-import org.opends.messages.Message;
+import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1OctetString;
+import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPModification;
-import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
+import org.opends.server.types.DebugLogLevel;
+import org.opends.server.types.DirectoryException;
import org.opends.server.types.ModificationType;
import org.opends.server.types.RawModification;
import org.opends.server.types.ResultCode;
-import org.opends.server.admin.std.server.BackendCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.server.ServerManagementContext;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
+
/**
* This class defines a number of static utility methods for server tasks.
@@ -359,7 +360,7 @@
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
String valueString = toLowerCase(v.getStringValue());
if (valueString.equals("true") || valueString.equals("yes") ||
@@ -395,10 +396,9 @@
if (attrList != null && !attrList.isEmpty())
{
Attribute attr = attrList.get(0);
- LinkedHashSet<AttributeValue> values = attr.getValues();
- if ((values != null) && (! values.isEmpty()))
+ if (!attr.isEmpty())
{
- for (AttributeValue value : values)
+ for (AttributeValue value : attr)
{
valueStrings.add(value.getStringValue());
}
@@ -425,10 +425,9 @@
}
String valueString = null;
Attribute attr = attrList.get(0);
- LinkedHashSet<AttributeValue> values = attr.getValues();
- if ((values != null) && (! values.isEmpty()))
+ if (!attr.isEmpty())
{
- valueString = values.iterator().next().getStringValue();
+ valueString = attr.iterator().next().getStringValue();
}
return valueString;
}
@@ -451,10 +450,10 @@
if (attrList != null && !attrList.isEmpty())
{
Attribute attr = attrList.get(0);
- LinkedHashSet<AttributeValue> values = attr.getValues();
- if ((values != null) && (! values.isEmpty()))
+ if (!attr.isEmpty())
{
- String valueString = values.iterator().next().getStringValue();
+ String valueString = attr.iterator().next()
+ .getStringValue();
try
{
return Integer.parseInt(valueString);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java
index a63ed1b..a69a218 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java
@@ -119,6 +119,11 @@
private static final String DN_LDAP_CONNECTION_HANDLER =
"cn=LDAP Connection Handler," + DN_CONNHANDLER_BASE;
+ /**
+ * The DN of the configuration entry defining the Administration connector.
+ */
+ private static final String DN_ADMIN_CONNECTOR =
+ "cn=Administration Connector," + DN_CONFIG_ROOT;
/**
* The DN of the configuration entry defining the LDAPS connection handler.
@@ -179,6 +184,7 @@
BooleanArgument enableStartTLS;
FileBasedArgument rootPasswordFile;
IntegerArgument ldapPort;
+ IntegerArgument adminConnectorPort;
IntegerArgument ldapsPort;
IntegerArgument jmxPort;
StringArgument baseDNString;
@@ -221,6 +227,14 @@
INFO_CONFIGDS_DESCRIPTION_LDAP_PORT.get());
argParser.addArgument(ldapPort);
+ adminConnectorPort = new IntegerArgument(
+ "adminConnectorPort".toLowerCase(), null,
+ "adminConnectorPort", false, false,
+ true, INFO_PORT_PLACEHOLDER.get(), 4444,
+ "adminConnectorPort", true, 1, true, 65535,
+ INFO_INSTALLDS_DESCRIPTION_ADMINCONNECTORPORT.get());
+ argParser.addArgument(adminConnectorPort);
+
ldapsPort = new IntegerArgument("ldapsPort", 'P', "ldapsPort", false,
false, true, INFO_LDAPPORT_PLACEHOLDER.get(), 636, null, true, 1,
true, 65535,
@@ -373,6 +387,21 @@
{
ports.add(ldapPort.getIntValue());
}
+ if (adminConnectorPort.isPresent())
+ {
+ if (ports.contains(adminConnectorPort.getIntValue()))
+ {
+ Message message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(
+ String.valueOf(adminConnectorPort.getIntValue()));
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
+ System.err.println(argParser.getUsage());
+ return 1;
+ }
+ else
+ {
+ ports.add(adminConnectorPort.getIntValue());
+ }
+ }
if (ldapsPort.isPresent())
{
if (ports.contains(ldapsPort.getIntValue()))
@@ -753,6 +782,34 @@
}
}
+ // If an Admin Connector port was specified, then update the config
+ // accordingly.
+ if (adminConnectorPort.isPresent())
+ {
+ try
+ {
+ DN adminConnectorDN = DN.decode(DN_ADMIN_CONNECTOR);
+ ConfigEntry configEntry =
+ configHandler.getConfigEntry(adminConnectorDN);
+
+
+ IntegerConfigAttribute portAttr =
+ new IntegerConfigAttribute(ATTR_LISTEN_PORT,
+ INFO_LDAP_CONNHANDLER_DESCRIPTION_LISTEN_PORT.get(),
+ true, false, true, true, 1, true,
+ 65535,
+ adminConnectorPort.getIntValue());
+ configEntry.putConfigAttribute(portAttr);
+ }
+ catch (Exception e)
+ {
+ Message message = ERR_CONFIGDS_CANNOT_UPDATE_ADMIN_CONNECTOR_PORT.get(
+ String.valueOf(e));
+ System.err.println(wrapText(message, MAX_LINE_WIDTH));
+ return 1;
+ }
+ }
+
// If an LDAPS port was specified, then update the config accordingly.
if (ldapsPort.isPresent())
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
index 18068ad..9a142ea 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -726,6 +726,10 @@
{
int ldapPort = argParser.ldapPortArg.getIntValue();
uData.setServerPort(ldapPort);
+
+ int adminConnectorPort = argParser.adminConnectorPortArg.getIntValue();
+ uData.setAdminConnectorPort(adminConnectorPort);
+
if (!argParser.skipPortCheckArg.isPresent())
{
// Check if the port can be used.
@@ -743,6 +747,22 @@
}
errorMessages.add(message);
}
+
+// Check if the port can be used.
+ if (!SetupUtils.canUseAsPort(adminConnectorPort))
+ {
+ Message message;
+ if (SetupUtils.isPriviledgedPort(adminConnectorPort))
+ {
+ message = ERR_INSTALLDS_CANNOT_BIND_TO_PRIVILEGED_PORT.get(
+ adminConnectorPort);
+ }
+ else
+ {
+ message = ERR_INSTALLDS_CANNOT_BIND_TO_PORT.get(adminConnectorPort);
+ }
+ errorMessages.add(message);
+ }
}
if (argParser.jmxPortArg.isPresent())
{
@@ -1112,6 +1132,14 @@
INFO_INSTALLDS_PROMPT_LDAPPORT.get(), usedPorts, true);
uData.setServerPort(ldapPort);
usedPorts.add(ldapPort);
+
+ // Determine the Admin Connector port number.
+ int adminConnectorPort =
+ promptIfRequiredForPortData(argParser.adminConnectorPortArg,
+ INFO_INSTALLDS_PROMPT_ADMINCONNECTORPORT.get(), usedPorts, true);
+ uData.setAdminConnectorPort(adminConnectorPort);
+ usedPorts.add(adminConnectorPort);
+
if (argParser.jmxPortArg.isPresent())
{
int jmxPort = promptIfRequiredForPortData(argParser.jmxPortArg,
@@ -2394,6 +2422,7 @@
Message[] labels =
{
INFO_SERVER_PORT_LABEL.get(),
+ INFO_ADMIN_CONNECTOR_PORT_LABEL.get(),
INFO_INSTALLDS_SERVER_JMXPORT_LABEL.get(),
INFO_SERVER_SECURITY_LABEL.get(),
INFO_SERVER_DIRECTORY_MANAGER_DN_LABEL.get(),
@@ -2405,6 +2434,7 @@
Message[] values =
{
Message.raw(String.valueOf(uData.getServerPort())),
+ Message.raw(String.valueOf(uData.getAdminConnectorPort())),
Message.raw(jmxPort != -1 ? String.valueOf(jmxPort) : null),
Message.raw(
QuickSetupStepPanel.getSecurityOptionsString(
@@ -2517,6 +2547,8 @@
uData.getDirectoryManagerDn());
argParser.ldapPortArg.setDefaultValue(
String.valueOf(uData.getServerPort()));
+ argParser.adminConnectorPortArg.setDefaultValue(
+ String.valueOf(uData.getAdminConnectorPort()));
int jmxPort = uData.getServerJMXPort();
if (jmxPort != -1)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
index 5a0ed37..c6311eb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -78,6 +78,7 @@
FileBasedArgument directoryManagerPwdFileArg;
FileBasedArgument keyStorePasswordFileArg;
IntegerArgument ldapPortArg;
+ IntegerArgument adminConnectorPortArg;
IntegerArgument ldapsPortArg;
IntegerArgument jmxPortArg;
IntegerArgument sampleDataArg;
@@ -252,6 +253,19 @@
INFO_INSTALLDS_DESCRIPTION_LDAPPORT.get());
addArgument(ldapPortArg);
+ defaultPort = UserData.getDefaultAdminConnectorPort();
+ if (defaultPort == -1)
+ {
+ defaultPort = 4444;
+ }
+ adminConnectorPortArg = new IntegerArgument(
+ "adminConnectorPort".toLowerCase(), null,
+ "adminConnectorPort", false, false,
+ true, INFO_PORT_PLACEHOLDER.get(), defaultPort,
+ "adminConnectorPort", true, 1, true, 65535,
+ INFO_INSTALLDS_DESCRIPTION_ADMINCONNECTORPORT.get());
+ addArgument(adminConnectorPortArg);
+
jmxPortArg = new IntegerArgument(
"jmxPort".toLowerCase(), 'x', "jmxPort", false, false,
true, INFO_JMXPORT_PLACEHOLDER.get(),
@@ -537,6 +551,17 @@
Set<Integer> ports = new HashSet<Integer>();
ports.add(ldapPortArg.getIntValue());
+ if (ports.contains(adminConnectorPortArg.getIntValue()))
+ {
+ Message message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(
+ String.valueOf(adminConnectorPortArg.getIntValue()));
+ errorMessages.add(message);
+ }
+ else
+ {
+ ports.add(adminConnectorPortArg.getIntValue());
+ }
+
if (jmxPortArg.isPresent())
{
if (ports.contains(jmxPortArg.getIntValue()))
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
index ec5053d..44eb914 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
@@ -530,6 +530,12 @@
out.println(INFO_LDAPMODIFY_POSTREAD_ENTRY.get());
out.println(buffer);
}
+ else if (oid.equals(OID_CSN_CONTROL))
+ {
+ ASN1OctetString controlValue = c.getValue();
+ out.println(INFO_CHANGE_NUMBER_CONTROL_RESULT.get(operationType,
+ String.valueOf(controlValue)));
+ }
}
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java
index 1d9365f..a5ca4ec 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java
@@ -45,6 +45,7 @@
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DN;
@@ -282,7 +283,7 @@
{
// Bootstrap the Directory Server configuration for use as a client.
DirectoryServer directoryServer = DirectoryServer.getInstance();
- directoryServer.bootstrapClient();
+ DirectoryServer.bootstrapClient();
// If we're to use the configuration then initialize it, along with the
@@ -291,7 +292,7 @@
{
try
{
- directoryServer.initializeJMX();
+ DirectoryServer.initializeJMX();
}
catch (Exception e)
{
@@ -816,34 +817,32 @@
}
}
- if (! sourceClasses.isEmpty())
+ if (!sourceClasses.isEmpty())
{
// Whatever is left must have been deleted.
AttributeType attrType = DirectoryServer.getObjectClassAttributeType();
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(attrType);
for (ObjectClass oc : sourceClasses)
{
- values.add(new AttributeValue(attrType, oc.getNameOrOID()));
+ builder.add(new AttributeValue(attrType, oc.getNameOrOID()));
}
- Attribute attr = new Attribute(attrType, attrType.getNameOrOID(), values);
- modifications.add(new Modification(ModificationType.DELETE, attr));
+ modifications.add(new Modification(ModificationType.DELETE, builder
+ .toAttribute()));
}
if (! targetClasses.isEmpty())
{
// Whatever is left must have been added.
AttributeType attrType = DirectoryServer.getObjectClassAttributeType();
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(attrType);
for (ObjectClass oc : targetClasses)
{
- values.add(new AttributeValue(attrType, oc.getNameOrOID()));
+ builder.add(new AttributeValue(attrType, oc.getNameOrOID()));
}
- Attribute a = new Attribute(attrType, attrType.getNameOrOID(), values);
- modifications.add(new Modification(ModificationType.ADD, a));
+ modifications.add(new Modification(ModificationType.ADD, builder
+ .toAttribute()));
}
@@ -899,40 +898,25 @@
}
else
{
- // See if the value lists are equal.
- LinkedHashSet<AttributeValue> sourceValues = sourceAttr.getValues();
- LinkedHashSet<AttributeValue> targetValues = targetAttr.getValues();
- LinkedHashSet<AttributeValue> deletedValues =
- new LinkedHashSet<AttributeValue>();
- Iterator<AttributeValue> valueIterator = sourceValues.iterator();
- while (valueIterator.hasNext())
+ // Compare the values.
+ AttributeBuilder addedValuesBuilder = new AttributeBuilder(
+ targetAttr);
+ addedValuesBuilder.removeAll(sourceAttr);
+ Attribute addedValues = addedValuesBuilder.toAttribute();
+ if (!addedValues.isEmpty())
{
- AttributeValue v = valueIterator.next();
- valueIterator.remove();
-
- if (! targetValues.remove(v))
- {
- // This particular value has been deleted.
- deletedValues.add(v);
- }
+ modifications.add(new Modification(ModificationType.ADD,
+ addedValues));
}
- if (! deletedValues.isEmpty())
+ AttributeBuilder deletedValuesBuilder = new AttributeBuilder(
+ sourceAttr);
+ deletedValuesBuilder.removeAll(targetAttr);
+ Attribute deletedValues = deletedValuesBuilder.toAttribute();
+ if (!deletedValues.isEmpty())
{
- Attribute attr = new Attribute(type, sourceAttr.getName(),
- sourceAttr.getOptions(),
- deletedValues);
modifications.add(new Modification(ModificationType.DELETE,
- attr));
- }
-
- // Anything left in the target list has been added.
- if (! targetValues.isEmpty())
- {
- Attribute attr = new Attribute(type, sourceAttr.getName(),
- sourceAttr.getOptions(),
- targetValues);
- modifications.add(new Modification(ModificationType.ADD, attr));
+ deletedValues));
}
}
}
@@ -982,8 +966,7 @@
for (Modification m : modifications)
{
Attribute a = m.getAttribute();
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
LinkedList<Modification> attrMods = new LinkedList<Modification>();
attrMods.add(m);
@@ -992,14 +975,11 @@
else
{
LinkedList<Modification> attrMods = new LinkedList<Modification>();
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>();
- for (AttributeValue v : values)
+ for (AttributeValue v : a)
{
- valueSet.clear();
- valueSet.add(v);
- Attribute attr = new Attribute(a.getAttributeType(),
- a.getName(), valueSet);
+ AttributeBuilder builder = new AttributeBuilder(a, true);
+ builder.add(v);
+ Attribute attr = builder.toAttribute();
attrMods.clear();
attrMods.add(new Modification(m.getModificationType(), attr));
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java
index 6e12f91..63edb09 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java
@@ -330,7 +330,7 @@
AttributeType t = a.getAttributeType();
if (t.isObjectClassType())
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
String stringValue = v.getStringValue();
String lowerValue = toLowerCase(stringValue);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java
index b942bcb..73dca13 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java
@@ -37,6 +37,7 @@
import java.util.HashSet;
import java.util.concurrent.atomic.AtomicInteger;
+import javax.net.ssl.SSLException;
import org.opends.server.protocols.asn1.ASN1Element;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.asn1.ASN1Sequence;
@@ -829,8 +830,6 @@
BooleanArgument showUsage;
BooleanArgument trustAll;
- BooleanArgument useSSL;
- BooleanArgument useStartTLS;
FileBasedArgument bindPWFile;
FileBasedArgument keyStorePWFile;
FileBasedArgument trustStorePWFile;
@@ -861,17 +860,6 @@
true, 65535, INFO_PWPSTATE_DESCRIPTION_PORT.get());
argParser.addGlobalArgument(port);
- useSSL = new BooleanArgument("usessl", OPTION_SHORT_USE_SSL,
- OPTION_LONG_USE_SSL,
- INFO_PWPSTATE_DESCRIPTION_USESSL.get());
- argParser.addGlobalArgument(useSSL);
-
- useStartTLS = new BooleanArgument(
- "usestarttls", OPTION_SHORT_START_TLS,
- OPTION_LONG_START_TLS,
- INFO_PWPSTATE_DESCRIPTION_USESTARTTLS.get());
- argParser.addGlobalArgument(useStartTLS);
-
bindDN = new StringArgument("binddn", OPTION_SHORT_BINDDN,
OPTION_LONG_BINDDN, false, false, true,
INFO_BINDDN_PLACEHOLDER.get(), null, null,
@@ -1278,60 +1266,29 @@
return LDAPResultCode.CLIENT_SIDE_PARAM_ERROR;
}
- // See if we should use SSL or StartTLS when establishing the connection.
- // If so, then make sure only one of them was specified.
- if (useSSL.isPresent())
- {
- if (useStartTLS.isPresent())
- {
- Message message = ERR_PWPSTATE_MUTUALLY_EXCLUSIVE_ARGUMENTS.get(
- useSSL.getLongIdentifier(),
- useStartTLS.getLongIdentifier());
- err.println(wrapText(message, MAX_LINE_WIDTH));
- return LDAPResultCode.CLIENT_SIDE_PARAM_ERROR;
- }
- else
- {
- connectionOptions.setUseSSL(true);
- }
- }
- else if (useStartTLS.isPresent())
- {
- connectionOptions.setStartTLS(true);
- }
-
// If we should blindly trust any certificate, then install the appropriate
// SSL connection factory.
- if (useSSL.isPresent() || useStartTLS.isPresent())
- {
- try
- {
- String clientAlias;
- if (certNickname.isPresent())
- {
- clientAlias = certNickname.getValue();
- }
- else
- {
- clientAlias = null;
- }
-
- SSLConnectionFactory sslConnectionFactory = new SSLConnectionFactory();
- sslConnectionFactory.init(trustAll.isPresent(), keyStoreFile.getValue(),
- keyStorePW.getValue(), clientAlias,
- trustStoreFile.getValue(),
- trustStorePW.getValue());
-
- connectionOptions.setSSLConnectionFactory(sslConnectionFactory);
+ try {
+ String clientAlias;
+ if (certNickname.isPresent()) {
+ clientAlias = certNickname.getValue();
+ } else {
+ clientAlias = null;
}
- catch (SSLConnectionException sce)
- {
- Message message = ERR_PWPSTATE_CANNOT_INITIALIZE_SSL.get(
- sce.getMessage());
- err.println(wrapText(message, MAX_LINE_WIDTH));
- return LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR;
- }
+
+ SSLConnectionFactory sslConnectionFactory = new SSLConnectionFactory();
+ sslConnectionFactory.init(trustAll.isPresent(), keyStoreFile.getValue(),
+ keyStorePW.getValue(), clientAlias,
+ trustStoreFile.getValue(),
+ trustStorePW.getValue());
+
+ connectionOptions.setSSLConnectionFactory(sslConnectionFactory);
+ } catch (SSLConnectionException sce) {
+ Message message = ERR_PWPSTATE_CANNOT_INITIALIZE_SSL.get(
+ sce.getMessage());
+ err.println(wrapText(message, MAX_LINE_WIDTH));
+ return LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR;
}
@@ -1402,9 +1359,16 @@
}
catch (LDAPConnectionException lce)
{
- String hostPort = host.getValue() + ":" + port.getValue();
- Message message = ERR_PWPSTATE_CANNOT_CONNECT.get(hostPort,
+ Message message = null;
+ if ((lce.getCause() != null) && (lce.getCause().getCause() != null) &&
+ lce.getCause().getCause() instanceof SSLException) {
+ message = ERR_PWPSTATE_CANNOT_CONNECT_SSL.get(host.getValue(),
+ port.getValue());
+ } else {
+ String hostPort = host.getValue() + ":" + port.getValue();
+ message = ERR_PWPSTATE_CANNOT_CONNECT.get(hostPort,
lce.getMessage());
+ }
err.println(wrapText(message, MAX_LINE_WIDTH));
return LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ManageTasks.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ManageTasks.java
index e449ed3..a8f6429 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ManageTasks.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ManageTasks.java
@@ -70,6 +70,9 @@
private static ErrorLogPublisher errorLogPublisher = null;
+ // This CLI is always using the administration connector with SSL
+ private final boolean alwaysSSL = true;
+
/**
* The main method for TaskInfo tool.
*
@@ -173,7 +176,7 @@
LDAPConnectionArgumentParser argParser = new LDAPConnectionArgumentParser(
"org.opends.server.tools.TaskInfo",
INFO_TASKINFO_TOOL_DESCRIPTION.get(),
- false, null);
+ false, null, alwaysSSL);
// Initialize all the command-line argument types and register them with the
// parser.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
index bad879c..90b7f23 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
@@ -40,6 +40,7 @@
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
+import javax.net.ssl.SSLException;
import org.opends.server.controls.ProxiedAuthV2Control;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
@@ -215,8 +216,6 @@
BooleanArgument restart;
BooleanArgument showUsage;
BooleanArgument trustAll;
- BooleanArgument useSSL;
- BooleanArgument useStartTLS;
FileBasedArgument bindPWFile;
FileBasedArgument keyStorePWFile;
FileBasedArgument trustStorePWFile;
@@ -266,19 +265,6 @@
port.setPropertyName(OPTION_LONG_PORT);
argParser.addArgument(port);
- useSSL = new BooleanArgument("usessl", OPTION_SHORT_USE_SSL,
- OPTION_LONG_USE_SSL,
- INFO_STOPDS_DESCRIPTION_USESSL.get());
- useSSL.setPropertyName(OPTION_LONG_USE_SSL);
- argParser.addArgument(useSSL);
-
- useStartTLS = new BooleanArgument(
- "usestarttls", OPTION_SHORT_START_TLS,
- OPTION_LONG_START_TLS,
- INFO_STOPDS_DESCRIPTION_USESTARTTLS.get());
- useStartTLS.setPropertyName(OPTION_LONG_START_TLS);
- argParser.addArgument(useStartTLS);
-
bindDN = new StringArgument("binddn", OPTION_SHORT_BINDDN,
OPTION_LONG_BINDDN, false, false, true,
INFO_BINDDN_PLACEHOLDER.get(), null, null,
@@ -544,60 +530,26 @@
connectionOptions.setVersionNumber(3);
- // See if we should use SSL or StartTLS when establishing the connection.
- // If so, then make sure only one of them was specified.
- if (useSSL.isPresent())
- {
- if (useStartTLS.isPresent())
- {
- Message message = ERR_STOPDS_MUTUALLY_EXCLUSIVE_ARGUMENTS.get(
- useSSL.getLongIdentifier(),
- useStartTLS.getLongIdentifier());
- err.println(wrapText(message, MAX_LINE_WIDTH));
- return LDAPResultCode.CLIENT_SIDE_PARAM_ERROR;
+ try {
+ String clientAlias;
+ if (certNickname.isPresent()) {
+ clientAlias = certNickname.getValue();
+ } else {
+ clientAlias = null;
}
- else
- {
- connectionOptions.setUseSSL(true);
- }
- }
- else if (useStartTLS.isPresent())
- {
- connectionOptions.setStartTLS(true);
- }
+ SSLConnectionFactory sslConnectionFactory = new SSLConnectionFactory();
+ sslConnectionFactory.init(trustAll.isPresent(), keyStoreFile.getValue(),
+ keyStorePW.getValue(), clientAlias,
+ trustStoreFile.getValue(),
+ trustStorePW.getValue());
- // If we should blindly trust any certificate, then install the appropriate
- // SSL connection factory.
- if (useSSL.isPresent() || useStartTLS.isPresent())
- {
- try
- {
- String clientAlias;
- if (certNickname.isPresent())
- {
- clientAlias = certNickname.getValue();
- }
- else
- {
- clientAlias = null;
- }
-
- SSLConnectionFactory sslConnectionFactory = new SSLConnectionFactory();
- sslConnectionFactory.init(trustAll.isPresent(), keyStoreFile.getValue(),
- keyStorePW.getValue(), clientAlias,
- trustStoreFile.getValue(),
- trustStorePW.getValue());
-
- connectionOptions.setSSLConnectionFactory(sslConnectionFactory);
- }
- catch (SSLConnectionException sce)
- {
- Message message =
- ERR_STOPDS_CANNOT_INITIALIZE_SSL.get(sce.getMessage());
- err.println(wrapText(message, MAX_LINE_WIDTH));
- return LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR;
- }
+ connectionOptions.setSSLConnectionFactory(sslConnectionFactory);
+ } catch (SSLConnectionException sce) {
+ Message message =
+ ERR_STOPDS_CANNOT_INITIALIZE_SSL.get(sce.getMessage());
+ err.println(wrapText(message, MAX_LINE_WIDTH));
+ return LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR;
}
@@ -669,9 +621,16 @@
}
catch (LDAPConnectionException lce)
{
- String hostPort = host.getValue() + ":" + port.getValue();
- Message message = ERR_STOPDS_CANNOT_CONNECT.get(hostPort,
+ Message message = null;
+ if ((lce.getCause() != null) && (lce.getCause().getCause() != null) &&
+ lce.getCause().getCause() instanceof SSLException) {
+ message = ERR_STOPDS_CANNOT_CONNECT_SSL.get(host.getValue(),
+ port.getValue());
+ } else {
+ String hostPort = host.getValue() + ":" + port.getValue();
+ message = ERR_STOPDS_CANNOT_CONNECT.get(hostPort,
lce.getMessage());
+ }
err.println(wrapText(message, MAX_LINE_WIDTH));
return LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
index c9820c5..9514384 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -739,22 +739,19 @@
Message msg = INFO_DSCFG_CONFIRM_CREATE_SUCCESS.get(ufn);
app.printVerboseMessage(msg);
- for (PropertyEditorModification mod : editor.getModifications())
- {
- try
- {
- Argument arg = createArgument(mod);
- handler.getCommandBuilder().addArgument(arg);
+ if (handler != null) {
+ for (PropertyEditorModification mod : editor.getModifications()) {
+ try {
+ Argument arg = createArgument(mod);
+ handler.getCommandBuilder().addArgument(arg);
+ } catch (ArgumentException ae) {
+ // This is a bug
+ throw new RuntimeException(
+ "Unexpected error generating the command builder: " + ae, ae);
+ }
}
- catch (ArgumentException ae)
- {
- // This is a bug
- throw new RuntimeException(
- "Unexpected error generating the command builder: "+ae, ae);
- }
+ handler.setCommandBuilderUseful(true);
}
- handler.setCommandBuilderUseful(true);
-
return MenuResult.success();
} catch (MissingMandatoryPropertiesException e) {
if (app.isInteractive()) {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index 31c5675..077a9a8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -290,6 +290,8 @@
*/
private static final DebugTracer TRACER = getTracer();
+ // This CLI is always using the administration connector with SSL
+ private static final boolean alwaysSSL = true;
/**
@@ -330,7 +332,7 @@
public static int main(String[] args, boolean initializeServer,
OutputStream outStream, OutputStream errStream) {
DSConfig app = new DSConfig(System.in, outStream, errStream,
- new LDAPManagementContextFactory());
+ new LDAPManagementContextFactory(alwaysSSL));
// Only initialize the client environment when run as a standalone
// application.
if (initializeServer) {
@@ -1056,11 +1058,6 @@
CommandBuilder commandBuilder =
new CommandBuilder(commandName, subcommandName);
- if (advancedModeArgument.isPresent())
- {
- commandBuilder.addArgument(advancedModeArgument);
- }
-
if ((factory != null) && (factory.getContextCommandBuilder() != null))
{
commandBuilder.append(factory.getContextCommandBuilder());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
index 4c89e6d..6257fc3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
@@ -56,6 +56,8 @@
import javax.net.ssl.KeyManager;
import javax.net.ssl.TrustManager;
import java.util.LinkedHashSet;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
/**
@@ -73,11 +75,17 @@
// The connection parameters command builder.
private CommandBuilder contextCommandBuilder;
+ // This CLI is always using the administration connector with SSL
+ private boolean alwaysSSL = false;
+
/**
* Creates a new LDAP management context factory.
+ *
+ * @param alwaysSSL If true, always use the SSL connection type. In this case,
+ * the arguments useSSL and startTLS are not present.
*/
- public LDAPManagementContextFactory() {
- // No implementation required.
+ public LDAPManagementContextFactory(boolean alwaysSSL) {
+ this.alwaysSSL = alwaysSSL;
}
/**
@@ -194,18 +202,31 @@
continue ;
}
}
- else
- {
- Message message = ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(
+ }
+ if (e.getRootCause() != null) {
+ if (e.getRootCause().getCause() != null) {
+ if (((e.getRootCause().getCause()
+ instanceof OpendsCertificateException)) ||
+ (e.getRootCause() instanceof SSLHandshakeException)) {
+ Message message =
+ ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED.get(
hostName, String.valueOf(portNumber));
- throw new ClientException(
+ throw new ClientException(
LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
+ }
+ }
+ if (e.getRootCause() instanceof SSLException) {
+ Message message =
+ ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT.get(
+ hostName, String.valueOf(portNumber));
+ throw new ClientException(
+ LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
}
}
Message message = ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(
- hostName, String.valueOf(portNumber));
+ hostName, String.valueOf(portNumber));
throw new ClientException(
- LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
+ LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
}
}
}
@@ -309,7 +330,7 @@
public void registerGlobalArguments(SubCommandArgumentParser parser)
throws ArgumentException {
// Create the global arguments.
- secureArgsList = new SecureConnectionCliArgs();
+ secureArgsList = new SecureConnectionCliArgs(alwaysSSL);
LinkedHashSet<Argument> args = secureArgsList.createGlobalArguments();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java
index 326a41a..a3f0716 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java
@@ -300,7 +300,10 @@
children.put(child.getManagedObjectDefinition().getName(), child);
} else {
// Indicate that the managed object does not exist.
- throw new ManagedObjectNotFoundException();
+ Message msg = ERR_DSCFG_ERROR_FINDER_NO_CHILDREN.get(ufn);
+ app.println();
+ app.printVerboseMessage(msg);
+ return MenuResult.cancel();
}
} catch (AuthorizationException e) {
Message msg = ERR_DSCFG_ERROR_LIST_AUTHZ.get(ufn);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
index 9709e03..e506b6d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
@@ -701,8 +701,10 @@
Message msg = ERR_DSCFG_ERROR_MODIFY_CME.get(ufn);
throw new ClientException(LDAPResultCode.CONSTRAINT_VIOLATION, msg);
} catch (ManagedObjectNotFoundException e) {
- Message msg = ERR_DSCFG_ERROR_GET_CHILD_MONFE.get(ufn);
- throw new ClientException(LDAPResultCode.NO_SUCH_OBJECT, msg);
+ Message msg = ERR_DSCFG_ERROR_FINDER_NO_CHILDREN.get(ufn);
+ app.println();
+ app.printVerboseMessage(msg);
+ return MenuResult.cancel();
}
if (result.isQuit()) {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/DisableReplicationUserData.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/DisableReplicationUserData.java
new file mode 100644
index 0000000..051d9f1
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/DisableReplicationUserData.java
@@ -0,0 +1,161 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+/**
+ * This class is used to store the information provided by the user to
+ * disable replication. It is required because when we are in interactive
+ * mode the ReplicationCliArgumentParser is not enough.
+ *
+ */
+class DisableReplicationUserData extends ReplicationUserData
+{
+ private String hostName;
+ private int port;
+ private boolean useStartTLS;
+ private boolean useSSL;
+ private String bindDn;
+ private String bindPwd;
+
+ /**
+ * Returns the host name of the server.
+ * @return the host name of the server.
+ */
+ String getHostName()
+ {
+ return hostName;
+ }
+
+ /**
+ * Sets the host name of the server.
+ * @param hostName the host name of the server.
+ */
+ void setHostName(String hostName)
+ {
+ this.hostName = hostName;
+ }
+
+ /**
+ * Returns the port of the server.
+ * @return the port of the server.
+ */
+ int getPort()
+ {
+ return port;
+ }
+
+ /**
+ * Sets the port of the server.
+ * @param port the port of the server.
+ */
+ void setPort(int port)
+ {
+ this.port = port;
+ }
+ /**
+ * Returns <CODE>true</CODE> if we must use SSL to connect to the server and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if we must use SSL to connect to the server and
+ * <CODE>false</CODE> otherwise.
+ */
+ boolean useSSL()
+ {
+ return useSSL;
+ }
+
+ /**
+ * Sets whether we must use SSL to connect to the server or not.
+ * @param useSSL whether we must use SSL to connect to the server or not.
+ */
+ void setUseSSL(boolean useSSL)
+ {
+ this.useSSL = useSSL;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if we must use StartTLS to connect to the server
+ * and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if we must use StartTLS to connect to the server
+ * and <CODE>false</CODE> otherwise.
+ */
+ boolean useStartTLS()
+ {
+ return useStartTLS;
+ }
+
+ /**
+ * Sets whether we must use StartTLS to connect to the server or not.
+ * @param useStartTLS whether we must use SSL to connect to the server or not.
+ */
+ void setUseStartTLS(boolean useStartTLS)
+ {
+ this.useStartTLS = useStartTLS;
+ }
+
+ /**
+ * Returns the bind DN to be used to connect to the server if no Administrator
+ * has been defined.
+ * @return the bind DN to be used to connect to the server if no Administrator
+ * has been defined.
+ */
+ public String getBindDn()
+ {
+ return bindDn;
+ }
+
+ /**
+ * Sets the bind DN to be used to connect to the server if no Administrator
+ * has been defined.
+ * @param bindDn the bind DN to be used.
+ */
+ public void setBindDn(String bindDn)
+ {
+ this.bindDn = bindDn;
+ }
+
+ /**
+ * Returns the password to be used to connect to the server if no
+ * Administrator has been defined.
+ * @return the password to be used to connect to the server if no
+ * Administrator has been defined.
+ */
+ public String getBindPwd()
+ {
+ return bindPwd;
+ }
+
+ /**
+ * Sets the password to be used to connect to the server if no Administrator
+ * has been defined.
+ * @param bindPwd the password to be used.
+ */
+ public void setBindPwd(String bindPwd)
+ {
+ this.bindPwd = bindPwd;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/EnableReplicationUserData.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/EnableReplicationUserData.java
new file mode 100644
index 0000000..88a84dd
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/EnableReplicationUserData.java
@@ -0,0 +1,303 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+/**
+ * This class is used to store the information provided by the user to enable
+ * replication. It is required because when we are in interactive mode the
+ * ReplicationCliArgumentParser is not enough.
+ *
+ */
+class EnableReplicationUserData extends ReplicationUserData
+{
+ private String hostName1;
+ private int port1;
+ private String bindDn1;
+ private String pwd1;
+ private int replicationPort1;
+ private boolean secureReplication1;
+ private String hostName2;
+ private int port2;
+ private String pwd2;
+ private String bindDn2;
+ private int replicationPort2;
+ private boolean secureReplication2;
+ private boolean replicateSchema = true;
+
+ /**
+ * Returns the host name of the first server.
+ * @return the host name of the first server.
+ */
+ String getHostName1()
+ {
+ return hostName1;
+ }
+
+ /**
+ * Sets the host name of the first server.
+ * @param hostName1 the host name of the first server.
+ */
+ void setHostName1(String hostName1)
+ {
+ this.hostName1 = hostName1;
+ }
+
+ /**
+ * Returns the port of the first server.
+ * @return the port of the first server.
+ */
+ int getPort1()
+ {
+ return port1;
+ }
+
+ /**
+ * Sets the port of the first server.
+ * @param port1 the port of the first server.
+ */
+ void setPort1(int port1)
+ {
+ this.port1 = port1;
+ }
+
+ /**
+ * Returns the password for the first server.
+ * @return the password for the first server.
+ */
+ String getPwd1()
+ {
+ return pwd1;
+ }
+
+ /**
+ * Sets the password for the first server.
+ * @param pwd1 the password for the first server.
+ */
+ void setPwd1(String pwd1)
+ {
+ this.pwd1 = pwd1;
+ }
+
+ /**
+ * Returns the host name of the second server.
+ * @return the host name of the second server.
+ */
+ String getHostName2()
+ {
+ return hostName2;
+ }
+
+ /**
+ * Sets the host name of the second server.
+ * @param host2Name the host name of the second server.
+ */
+ void setHostName2(String host2Name)
+ {
+ this.hostName2 = host2Name;
+ }
+
+ /**
+ * Returns the port of the second server.
+ * @return the port of the second server.
+ */
+ int getPort2()
+ {
+ return port2;
+ }
+
+ /**
+ * Sets the port of the second server.
+ * @param port2 the port of the second server.
+ */
+ void setPort2(int port2)
+ {
+ this.port2 = port2;
+ }
+
+ /**
+ * Returns the password for the second server.
+ * @return the password for the second server.
+ */
+ String getPwd2()
+ {
+ return pwd2;
+ }
+
+ /**
+ * Sets the password for the second server.
+ * @param pwd2 the password for the second server.
+ */
+ void setPwd2(String pwd2)
+ {
+ this.pwd2 = pwd2;
+ }
+
+ /**
+ * Returns the dn to be used to bind to the first server.
+ * @return the dn to be used to bind to the first server.
+ */
+ String getBindDn1()
+ {
+ return bindDn1;
+ }
+
+ /**
+ * Sets the dn to be used to bind to the first server.
+ * @param bindDn1 the dn to be used to bind to the first server.
+ */
+ void setBindDn1(String bindDn1)
+ {
+ this.bindDn1 = bindDn1;
+ }
+
+ /**
+ * Returns the dn to be used to bind to the second server.
+ * @return the dn to be used to bind to the second server.
+ */
+ String getBindDn2()
+ {
+ return bindDn2;
+ }
+
+ /**
+ * Sets the dn to be used to bind to the second server.
+ * @param bindDn2 the dn to be used to bind to the second server.
+ */
+ void setBindDn2(String bindDn2)
+ {
+ this.bindDn2 = bindDn2;
+ }
+
+ /**
+ * Returns the replication port to be used on the first server if it is not
+ * defined yet.
+ * @return the replication port to be used on the first server if it is not
+ * defined yet.
+ */
+ int getReplicationPort1()
+ {
+ return replicationPort1;
+ }
+
+ /**
+ * Sets the replication port to be used on the first server if it is not
+ * defined yet.
+ * @param replicationPort1 the replication port to be used on the first server
+ * if it is not defined yet.
+ */
+ void setReplicationPort1(int replicationPort1)
+ {
+ this.replicationPort1 = replicationPort1;
+ }
+
+ /**
+ * Returns the replication port to be used on the second server if it is not
+ * defined yet.
+ * @return the replication port to be used on the second server if it is not
+ * defined yet.
+ */
+ int getReplicationPort2()
+ {
+ return replicationPort2;
+ }
+
+ /**
+ * Sets the replication port to be used on the second server if it is not
+ * defined yet.
+ * @param replicationPort2 the replication port to be used on the second
+ * server if it is not defined yet.
+ */
+ void setReplicationPort2(int replicationPort2)
+ {
+ this.replicationPort2 = replicationPort2;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the user asked to replicate schema and <CODE>
+ * false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the user asked to replicate schema and <CODE>
+ * false</CODE> otherwise.
+ */
+ public boolean replicateSchema()
+ {
+ return replicateSchema;
+ }
+
+ /**
+ * Sets whether to replicate schema or not.
+ * @param replicateSchema whether to replicate schema or not.
+ */
+ public void setReplicateSchema(boolean replicateSchema)
+ {
+ this.replicateSchema = replicateSchema;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the user asked to have secure replication
+ * communication with the first server and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the user asked to have secure replication
+ * communication with the first server and <CODE>false</CODE> otherwise.
+ */
+ public boolean isSecureReplication1()
+ {
+ return secureReplication1;
+ }
+
+ /**
+ * Sets whether to have secure replication communication with the first server
+ * or not.
+ * @param secureReplication1 whether to have secure replication communication
+ * with the first server or not.
+ */
+ public void setSecureReplication1(boolean secureReplication1)
+ {
+ this.secureReplication1 = secureReplication1;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if the user asked to have secure replication
+ * communication with the second server and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if the user asked to have secure replication
+ * communication with the second server and <CODE>false</CODE> otherwise.
+ */
+ public boolean isSecureReplication2()
+ {
+ return secureReplication2;
+ }
+
+ /**
+ * Sets whether to have secure replication communication with the second
+ * server or not.
+ * @param secureReplication2 whether to have secure replication communication
+ * with the second server or not.
+ */
+ public void setSecureReplication2(boolean secureReplication2)
+ {
+ this.secureReplication2 = secureReplication2;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/InitializeAllReplicationUserData.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/InitializeAllReplicationUserData.java
new file mode 100644
index 0000000..98a3bd8
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/InitializeAllReplicationUserData.java
@@ -0,0 +1,39 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+/**
+ * This class is used to store the information provided by the user to
+ * initialize a complete replication topology. It is required because when we
+ * are in interactive mode the ReplicationCliArgumentParser is not enough.
+ *
+ */
+class InitializeAllReplicationUserData extends MonoServerReplicationUserData
+{
+}
+
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/InitializeReplicationUserData.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/InitializeReplicationUserData.java
new file mode 100644
index 0000000..2ccef97
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/InitializeReplicationUserData.java
@@ -0,0 +1,115 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+/**
+ * This class is used to store the information provided by the user to
+ * initialize replication. It is required because when we are in interactive
+ * mode the ReplicationCliArgumentParser is not enough.
+ *
+ */
+class InitializeReplicationUserData extends ReplicationUserData
+{
+ private String hostNameSource;
+ private int portSource;
+ private String hostNameDestination;
+ private int portDestination;
+
+ /**
+ * Returns the host name of the source server.
+ * @return the host name of the source server.
+ */
+ String getHostNameSource()
+ {
+ return hostNameSource;
+ }
+
+ /**
+ * Sets the host name of the source server.
+ * @param hostNameSource the host name of the source server.
+ */
+ void setHostNameSource(String hostNameSource)
+ {
+ this.hostNameSource = hostNameSource;
+ }
+
+ /**
+ * Returns the port of the source server.
+ * @return the port of the source server.
+ */
+ int getPortSource()
+ {
+ return portSource;
+ }
+
+ /**
+ * Sets the port of the source server.
+ * @param portSource the port of the source server.
+ */
+ void setPortSource(int portSource)
+ {
+ this.portSource = portSource;
+ }
+
+ /**
+ * Returns the host name of the destination server.
+ * @return the host name of the destination server.
+ */
+ String getHostNameDestination()
+ {
+ return hostNameDestination;
+ }
+
+ /**
+ * Sets the host name of the destination server.
+ * @param hostNameDestination the host name of the destination server.
+ */
+ void setHostNameDestination(String hostNameDestination)
+ {
+ this.hostNameDestination = hostNameDestination;
+ }
+
+ /**
+ * Returns the port of the destination server.
+ * @return the port of the destination server.
+ */
+ int getPortDestination()
+ {
+ return portDestination;
+ }
+
+ /**
+ * Sets the port of the destination server.
+ * @param portDestination the port of the destination server.
+ */
+ void setPortDestination(int portDestination)
+ {
+ this.portDestination = portDestination;
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/MonoServerReplicationUserData.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/MonoServerReplicationUserData.java
new file mode 100644
index 0000000..916d003
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/MonoServerReplicationUserData.java
@@ -0,0 +1,117 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+/**
+ * This is an abstract class used for code refactorization.
+ *
+ */
+abstract class MonoServerReplicationUserData extends ReplicationUserData
+{
+ private String hostName;
+ private int port;
+ private boolean useStartTLS;
+ private boolean useSSL;
+
+ /**
+ * Returns the host name of the server.
+ * @return the host name of the server.
+ */
+ String getHostName()
+ {
+ return hostName;
+ }
+
+ /**
+ * Sets the host name of the server.
+ * @param hostName the host name of the server.
+ */
+ void setHostName(String hostName)
+ {
+ this.hostName = hostName;
+ }
+
+ /**
+ * Returns the port of the server.
+ * @return the port of the server.
+ */
+ int getPort()
+ {
+ return port;
+ }
+
+ /**
+ * Sets the port of the server.
+ * @param port the port of the server.
+ */
+ void setPort(int port)
+ {
+ this.port = port;
+ }
+ /**
+ * Returns <CODE>true</CODE> if we must use SSL to connect to the server and
+ * <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if we must use SSL to connect to the server and
+ * <CODE>false</CODE> otherwise.
+ */
+ boolean useSSL()
+ {
+ return useSSL;
+ }
+
+ /**
+ * Sets whether we must use SSL to connect to the server or not.
+ * @param useSSL whether we must use SSL to connect to the server or not.
+ */
+ void setUseSSL(boolean useSSL)
+ {
+ this.useSSL = useSSL;
+ }
+
+ /**
+ * Returns <CODE>true</CODE> if we must use StartTLS to connect to the server
+ * and <CODE>false</CODE> otherwise.
+ * @return <CODE>true</CODE> if we must use StartTLS to connect to the server
+ * and <CODE>false</CODE> otherwise.
+ */
+ boolean useStartTLS()
+ {
+ return useStartTLS;
+ }
+
+ /**
+ * Sets whether we must use StartTLS to connect to the server or not.
+ * @param useStartTLS whether we must use SSL to connect to the server or not.
+ */
+ void setUseStartTLS(boolean useStartTLS)
+ {
+ this.useStartTLS = useStartTLS;
+ }
+}
+
+
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/PostExternalInitializationUserData.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/PostExternalInitializationUserData.java
new file mode 100644
index 0000000..8f4727e
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/PostExternalInitializationUserData.java
@@ -0,0 +1,39 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+/**
+ * This class is used to store the information provided by the user to
+ * perform the operations required after doing an initialization using
+ * import-ldif of the binary copy. It is required because when we
+ * are in interactive mode the ReplicationCliArgumentParser is not enough.
+ *
+ */
+class PostExternalInitializationUserData extends MonoServerReplicationUserData
+{
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/PreExternalInitializationUserData.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/PreExternalInitializationUserData.java
new file mode 100644
index 0000000..4944f6d
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/PreExternalInitializationUserData.java
@@ -0,0 +1,61 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+/**
+ * This class is used to store the information provided by the user to
+ * perform the operations required before doing an initialization using
+ * import-ldif of the binary copy. It is required because when we
+ * are in interactive mode the ReplicationCliArgumentParser is not enough.
+ *
+ */
+class PreExternalInitializationUserData extends MonoServerReplicationUserData
+{
+ private boolean localOnly;
+
+ /**
+ * Whether the operation must be applied only on the local server or not.
+ * @return <CODE>true</CODE> if the operation must be applied only on the
+ * local server and <CODE>false</CODE> otherwise.
+ */
+ public boolean isLocalOnly()
+ {
+ return localOnly;
+ }
+
+ /**
+ * Sets whether the operation must be applied only on the local server or not.
+ * @param onlyLocal whether the operation must be applied only on the local
+ * server or not.
+ */
+ public void setLocalOnly(boolean onlyLocal)
+ {
+ this.localOnly = onlyLocal;
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
new file mode 100644
index 0000000..704ce53
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
@@ -0,0 +1,2230 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2007-2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.tools.ToolConstants.*;
+
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.LinkedList;
+
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.quicksetup.Constants;
+import org.opends.quicksetup.UserData;
+import org.opends.quicksetup.util.Utils;
+import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
+import org.opends.server.admin.client.cli.SecureConnectionCliParser;
+import org.opends.server.util.args.Argument;
+import org.opends.server.util.args.ArgumentException;
+import org.opends.server.util.args.BooleanArgument;
+import org.opends.server.util.args.FileBasedArgument;
+import org.opends.server.util.args.IntegerArgument;
+import org.opends.server.util.args.StringArgument;
+import org.opends.server.util.args.SubCommand;
+
+/**
+ * This class is used to parse the arguments passed to the replication CLI.
+ * It also checks the compatibility between the values and that all the
+ * required information has been provided. However it does not do any
+ * verification that require connection to any server.
+ */
+public class ReplicationCliArgumentParser extends SecureConnectionCliParser
+{
+ private SubCommand enableReplicationSubCmd;
+ private SubCommand disableReplicationSubCmd;
+ private SubCommand initializeReplicationSubCmd;
+ private SubCommand initializeAllReplicationSubCmd;
+ private SubCommand postExternalInitializationSubCmd;
+ private SubCommand preExternalInitializationSubCmd;
+ private SubCommand statusReplicationSubCmd;
+
+ private BooleanArgument noPromptArg;
+
+ private String defaultLocalHostValue;
+
+ /**
+ * The 'hostName' argument for the first server.
+ */
+ private StringArgument hostName1Arg = null;
+
+ /**
+ * The 'port' argument for the first server.
+ */
+ private IntegerArgument port1Arg = null;
+
+ /**
+ * The 'binDN' argument for the first server.
+ */
+ private StringArgument bindDn1Arg = null;
+
+ /**
+ * The 'bindPasswordFile' argument for the first server.
+ */
+ private FileBasedArgument bindPasswordFile1Arg = null;
+
+ /**
+ * The 'bindPassword' argument for the first server.
+ */
+ private StringArgument bindPassword1Arg = null;
+
+ /**
+ * The 'useSSLArg' argument for the first server.
+ */
+ private BooleanArgument useSSL1Arg = null;
+
+ /**
+ * The 'useStartTLS1Arg' argument for the first server.
+ */
+ private BooleanArgument useStartTLS1Arg = null;
+
+ /**
+ * The 'replicationPort' argument for the first server.
+ */
+ private IntegerArgument replicationPort1Arg = null;
+
+ /**
+ * The 'secureReplication' argument for the first server.
+ */
+ private BooleanArgument secureReplication1Arg = null;
+
+ /**
+ * The 'hostName' argument for the second server.
+ */
+ private StringArgument hostName2Arg = null;
+
+ /**
+ * The 'port' argument for the second server.
+ */
+ private IntegerArgument port2Arg = null;
+
+ /**
+ * The 'binDN' argument for the second server.
+ */
+ private StringArgument bindDn2Arg = null;
+
+ /**
+ * The 'bindPasswordFile' argument for the second server.
+ */
+ private FileBasedArgument bindPasswordFile2Arg = null;
+
+ /**
+ * The 'bindPassword' argument for the second server.
+ */
+ private StringArgument bindPassword2Arg = null;
+
+ /**
+ * The 'useSSLArg' argument for the second server.
+ */
+ private BooleanArgument useSSL2Arg = null;
+
+ /**
+ * The 'useStartTLS2Arg' argument for the second server.
+ */
+ private BooleanArgument useStartTLS2Arg = null;
+
+ /**
+ * The 'replicationPort' argument for the second server.
+ */
+ private IntegerArgument replicationPort2Arg = null;
+
+ /**
+ * The 'secureReplication' argument for the second server.
+ */
+ private BooleanArgument secureReplication2Arg = null;
+
+ /**
+ * The 'skipPortCheckArg' argument to not check replication ports.
+ */
+ private BooleanArgument skipPortCheckArg;
+
+ /**
+ * The 'noSchemaReplication' argument to not replicate schema.
+ */
+ private BooleanArgument noSchemaReplicationArg;
+
+ /**
+ * The 'useSecondServerAsSchemaSource' argument to not replicate schema.
+ */
+ private BooleanArgument useSecondServerAsSchemaSourceArg;
+
+ /**
+ * The 'hostName' argument for the source server.
+ */
+ private StringArgument hostNameSourceArg = null;
+
+ /**
+ * The 'port' argument for the source server.
+ */
+ private IntegerArgument portSourceArg = null;
+
+ /**
+ * The 'useSSLArg' for the source server.
+ */
+ private BooleanArgument useSSLSourceArg = null;
+
+ /**
+ * The 'useStartTLSSourceArg' for the source server.
+ */
+ private BooleanArgument useStartTLSSourceArg = null;
+
+ /**
+ * The 'hostName' argument for the destination server.
+ */
+ private StringArgument hostNameDestinationArg = null;
+
+ /**
+ * The 'port' argument for the destination server.
+ */
+ private IntegerArgument portDestinationArg = null;
+
+ /**
+ * The 'useSSLArg' argument for the destination server.
+ */
+ private BooleanArgument useSSLDestinationArg = null;
+
+ /**
+ * The 'useStartTLSDestinationArg' argument for the destination server.
+ */
+ private BooleanArgument useStartTLSDestinationArg = null;
+
+ /**
+ * The 'suffixes' global argument.
+ */
+ private StringArgument baseDNsArg = null;
+
+ /**
+ * The argument that specifies if the external initialization will be
+ * performed only on this server.
+ */
+ private BooleanArgument externalInitializationLocalOnlyArg;
+
+ /**
+ * The 'quiet' argument.
+ */
+ private BooleanArgument quietArg;
+
+ /**
+ * The 'scriptFriendly' argument.
+ */
+ private BooleanArgument scriptFriendlyArg;
+
+ /**
+ * The text of the enable replication subcommand.
+ */
+ public static final String ENABLE_REPLICATION_SUBCMD_NAME = "enable";
+
+ /**
+ * The text of the disable replication subcommand.
+ */
+ public static final String DISABLE_REPLICATION_SUBCMD_NAME = "disable";
+
+ /**
+ * The text of the initialize replication subcommand.
+ */
+ public static final String INITIALIZE_REPLICATION_SUBCMD_NAME = "initialize";
+
+ /**
+ * The text of the initialize all replication subcommand.
+ */
+ public static final String INITIALIZE_ALL_REPLICATION_SUBCMD_NAME =
+ "initialize-all";
+
+ /**
+ * The text of the pre external initialization subcommand.
+ */
+ public static final String PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME =
+ "pre-external-initialization";
+
+ /**
+ * The text of the initialize all replication subcommand.
+ */
+ public static final String POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME =
+ "post-external-initialization";
+
+ /**
+ * The text of the status replication subcommand.
+ */
+ public static final String STATUS_REPLICATION_SUBCMD_NAME = "status";
+
+ // This CLI is always using the administration connector with SSL
+ private final boolean alwaysSSL = true;
+
+ /**
+ * Creates a new instance of this argument parser with no arguments.
+ *
+ * @param mainClassName
+ * The fully-qualified name of the Java class that should
+ * be invoked to launch the program with which this
+ * argument parser is associated.
+ */
+ public ReplicationCliArgumentParser(String mainClassName)
+ {
+ super(mainClassName,
+ INFO_REPLICATION_TOOL_DESCRIPTION.get(ENABLE_REPLICATION_SUBCMD_NAME,
+ INITIALIZE_REPLICATION_SUBCMD_NAME),
+ false);
+ }
+
+ /**
+ * Initialize the parser with the Global options and subcommands.
+ *
+ * @param outStream
+ * The output stream to use for standard output, or <CODE>null</CODE>
+ * if standard output is not needed.
+ * @throws ArgumentException
+ * If there is a problem with any of the parameters used
+ * to create this argument.
+ */
+ public void initializeParser(OutputStream outStream)
+ throws ArgumentException
+ {
+ initializeGlobalArguments(outStream);
+ createEnableReplicationSubCommand();
+ createDisableReplicationSubCommand();
+ createInitializeReplicationSubCommand();
+ createInitializeAllReplicationSubCommand();
+ createPreExternalInitializationSubCommand();
+ createPostExternalInitializationSubCommand();
+ createStatusReplicationSubCommand();
+ }
+
+ /**
+ * Checks all the options parameters and updates the provided MessageBuilder
+ * with the errors that where encountered.
+ *
+ * This method assumes that the method parseArguments for the parser has
+ * already been called.
+ * @param buf the MessageBuilder object where we add the error messages
+ * describing the errors encountered.
+ */
+ public void validateOptions(MessageBuilder buf)
+ {
+ validateGlobalOptions(buf);
+ validateSubcommandOptions(buf);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int validateGlobalOptions(MessageBuilder buf)
+ {
+ int returnValue;
+ super.validateGlobalOptions(buf);
+ ArrayList<Message> errors = new ArrayList<Message>();
+ if (secureArgsList.bindPasswordArg.isPresent() &&
+ secureArgsList.bindPasswordFileArg.isPresent()) {
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ secureArgsList.bindPasswordArg.getLongIdentifier(),
+ secureArgsList.bindPasswordFileArg.getLongIdentifier());
+ errors.add(message);
+ }
+
+ if (!isInteractive())
+ {
+ // Check that we have the required data
+ if (!baseDNsArg.isPresent() && !isStatusReplicationSubcommand())
+ {
+ errors.add(ERR_REPLICATION_NO_BASE_DN_PROVIDED.get());
+ }
+ if (getBindPasswordAdmin() == null)
+ {
+ errors.add(ERR_REPLICATION_NO_ADMINISTRATOR_PASSWORD_PROVIDED.get(
+ "--"+secureArgsList.bindPasswordArg.getLongIdentifier(),
+ "--"+secureArgsList.bindPasswordFileArg.getLongIdentifier()));
+ }
+ }
+
+ if (baseDNsArg.isPresent())
+ {
+ LinkedList<String> baseDNs = baseDNsArg.getValues();
+ for (String dn : baseDNs)
+ {
+ if (!Utils.isDn(dn))
+ {
+ errors.add(ERR_REPLICATION_NOT_A_VALID_BASEDN.get(dn));
+ }
+ }
+ }
+ if (errors.size() > 0)
+ {
+ for (Message error : errors)
+ {
+ addMessage(buf, error);
+ }
+ }
+
+ if (buf.length() > 0)
+ {
+ returnValue = ReplicationCliReturnCode.CONFLICTING_ARGS.getReturnCode();
+ }
+ else
+ {
+ returnValue = ReplicationCliReturnCode.SUCCESSFUL_NOP.getReturnCode();
+ }
+ return returnValue;
+ }
+
+ /**
+ * Initialize Global option.
+ *
+ * @param outStream
+ * The output stream used for the usage.
+ * @throws ArgumentException
+ * If there is a problem with any of the parameters used
+ * to create this argument.
+ */
+ private void initializeGlobalArguments(OutputStream outStream)
+ throws ArgumentException
+ {
+ ArrayList<Argument> defaultArgs =
+ new ArrayList<Argument>(createGlobalArguments(outStream, alwaysSSL));
+
+ Argument[] argsToRemove = {
+ secureArgsList.hostNameArg,
+ secureArgsList.portArg,
+ secureArgsList.bindDnArg,
+ secureArgsList.bindPasswordFileArg,
+ secureArgsList.bindPasswordArg,
+ secureArgsList.useSSLArg,
+ secureArgsList.useStartTLSArg
+ };
+
+ for (int i=0; i<argsToRemove.length; i++)
+ {
+ defaultArgs.remove(argsToRemove[i]);
+ }
+ defaultArgs.remove(noPropertiesFileArg);
+ defaultArgs.remove(propertiesFileArg);
+ // Remove it from the default location and redefine it.
+ defaultArgs.remove(secureArgsList.adminUidArg);
+
+ int index = 0;
+
+ baseDNsArg = new StringArgument("baseDNs", OPTION_SHORT_BASEDN,
+ OPTION_LONG_BASEDN, false, true, true, INFO_BASEDN_PLACEHOLDER.get(),
+ null,
+ null, INFO_DESCRIPTION_REPLICATION_BASEDNS.get());
+ baseDNsArg.setPropertyName(OPTION_LONG_BASEDN);
+ defaultArgs.add(index++, baseDNsArg);
+
+ secureArgsList.adminUidArg = new StringArgument("adminUID", 'I',
+ "adminUID", false, false, true, INFO_ADMINUID_PLACEHOLDER.get(),
+ Constants.GLOBAL_ADMIN_UID, null,
+ INFO_DESCRIPTION_REPLICATION_ADMIN_UID.get(
+ ENABLE_REPLICATION_SUBCMD_NAME));
+ secureArgsList.adminUidArg.setPropertyName("adminUID");
+ secureArgsList.adminUidArg.setHidden(false);
+ defaultArgs.add(index++, secureArgsList.adminUidArg);
+
+ secureArgsList.bindPasswordArg = new StringArgument("adminPassword",
+ OPTION_SHORT_BINDPWD, "adminPassword", false, false, true,
+ INFO_BINDPWD_PLACEHOLDER.get(), null, null,
+ INFO_DESCRIPTION_REPLICATION_ADMIN_BINDPASSWORD.get());
+ defaultArgs.add(index++, secureArgsList.bindPasswordArg);
+
+ secureArgsList.bindPasswordFileArg = new FileBasedArgument(
+ "adminPasswordFile",
+ OPTION_SHORT_BINDPWD_FILE, "adminPasswordFile", false, false,
+ INFO_BINDPWD_FILE_PLACEHOLDER.get(), null, null,
+ INFO_DESCRIPTION_REPLICATION_ADMIN_BINDPASSWORDFILE.get());
+ defaultArgs.add(index++, secureArgsList.bindPasswordFileArg);
+
+ defaultArgs.remove(verboseArg);
+ noPromptArg = new BooleanArgument(
+ OPTION_LONG_NO_PROMPT,
+ OPTION_SHORT_NO_PROMPT,
+ OPTION_LONG_NO_PROMPT,
+ INFO_DESCRIPTION_NO_PROMPT.get());
+ defaultArgs.add(index++, noPromptArg);
+
+ for (int i=0; i<index; i++)
+ {
+ Argument arg = defaultArgs.get(i);
+ arg.setPropertyName(arg.getLongIdentifier());
+ }
+
+ quietArg = new BooleanArgument(
+ OPTION_LONG_QUIET,
+ OPTION_SHORT_QUIET,
+ OPTION_LONG_QUIET,
+ INFO_REPLICATION_DESCRIPTION_QUIET.get());
+ quietArg.setPropertyName(OPTION_LONG_QUIET);
+ defaultArgs.add(quietArg);
+
+ StringArgument propertiesFileArgument = new StringArgument(
+ "propertiesFilePath", null, OPTION_LONG_PROP_FILE_PATH, false, false,
+ true, INFO_PROP_FILE_PATH_PLACEHOLDER.get(), null, null,
+ INFO_DESCRIPTION_PROP_FILE_PATH.get());
+ defaultArgs.add(propertiesFileArgument);
+ setFilePropertiesArgument(propertiesFileArgument);
+
+ BooleanArgument noPropertiesFileArgument = new BooleanArgument(
+ "noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
+ INFO_DESCRIPTION_NO_PROP_FILE.get());
+ defaultArgs.add(noPropertiesFileArgument);
+ setNoPropertiesFileArgument(noPropertiesFileArgument);
+
+ initializeGlobalArguments(defaultArgs);
+ }
+
+ /**
+ * Creates the enable replication subcommand and all the specific options
+ * for the subcommand.
+ */
+ private void createEnableReplicationSubCommand()
+ throws ArgumentException
+ {
+
+ hostName1Arg = new StringArgument("host1", OPTION_SHORT_HOST,
+ "host1", false, false, true, INFO_HOST_PLACEHOLDER.get(),
+ getDefaultHostValue(),
+ null, INFO_DESCRIPTION_ENABLE_REPLICATION_HOST1.get());
+
+ port1Arg = new IntegerArgument("port1", OPTION_SHORT_PORT, "port1",
+ false, false, true, INFO_PORT_PLACEHOLDER.get(), 389, null,
+ INFO_DESCRIPTION_ENABLE_REPLICATION_SERVER_PORT1.get());
+
+ bindDn1Arg = new StringArgument("bindDN1", OPTION_SHORT_BINDDN,
+ "bindDN1", false, false, true, INFO_BINDDN_PLACEHOLDER.get(),
+ "cn=Directory Manager", null,
+ INFO_DESCRIPTION_ENABLE_REPLICATION_BINDDN1.get());
+
+ bindPassword1Arg = new StringArgument("bindPassword1",
+ null, "bindPassword1", false, false, true,
+ INFO_BINDPWD_PLACEHOLDER.get(), null, null,
+ INFO_DESCRIPTION_ENABLE_REPLICATION_BINDPASSWORD1.get());
+
+ bindPasswordFile1Arg = new FileBasedArgument("bindPasswordFile1",
+ null, "bindPasswordFile1", false, false,
+ INFO_BINDPWD_FILE_PLACEHOLDER.get(), null, null,
+ INFO_DESCRIPTION_ENABLE_REPLICATION_BINDPASSWORDFILE1.get());
+
+ useSSL1Arg = new BooleanArgument("useSSL1", OPTION_SHORT_USE_SSL,
+ "useSSL1", INFO_DESCRIPTION_ENABLE_REPLICATION_USE_SSL1.get());
+
+ useStartTLS1Arg = new BooleanArgument("startTLS1", OPTION_SHORT_START_TLS,
+ "startTLS1",
+ INFO_DESCRIPTION_ENABLE_REPLICATION_STARTTLS1.get());
+
+ replicationPort1Arg = new IntegerArgument("replicationPort1", 'r',
+ "replicationPort1", false, false, true, INFO_PORT_PLACEHOLDER.get(),
+ 8989, null,
+ INFO_DESCRIPTION_ENABLE_REPLICATION_PORT1.get());
+
+ secureReplication1Arg = new BooleanArgument("secureReplication1", null,
+ "secureReplication1",
+ INFO_DESCRIPTION_ENABLE_SECURE_REPLICATION1.get());
+
+ hostName2Arg = new StringArgument("host2", 'O',
+ "host2", false, false, true, INFO_HOST_PLACEHOLDER.get(),
+ getDefaultHostValue(),
+ null, INFO_DESCRIPTION_ENABLE_REPLICATION_HOST2.get());
+
+ port2Arg = new IntegerArgument("port2", null, "port2",
+ false, false, true, INFO_PORT_PLACEHOLDER.get(), 389, null,
+ INFO_DESCRIPTION_ENABLE_REPLICATION_SERVER_PORT2.get());
+
+ bindDn2Arg = new StringArgument("bindDN2", null,
+ "bindDN2", false, false, true, INFO_BINDDN_PLACEHOLDER.get(),
+ "cn=Directory Manager", null,
+ INFO_DESCRIPTION_ENABLE_REPLICATION_BINDDN2.get());
+
+ bindPassword2Arg = new StringArgument("bindPassword2",
+ null, "bindPassword2", false, false, true,
+ INFO_BINDPWD_PLACEHOLDER.get(), null, null,
+ INFO_DESCRIPTION_ENABLE_REPLICATION_BINDPASSWORD2.get());
+
+ bindPasswordFile2Arg = new FileBasedArgument("bindPasswordFile2",
+ 'F', "bindPasswordFile2", false, false,
+ INFO_BINDPWD_FILE_PLACEHOLDER.get(), null, null,
+ INFO_DESCRIPTION_ENABLE_REPLICATION_BINDPASSWORDFILE2.get());
+
+ useSSL2Arg = new BooleanArgument("useSSL2", 'z',
+ "useSSL2", INFO_DESCRIPTION_ENABLE_REPLICATION_USE_SSL2.get());
+
+ useStartTLS2Arg = new BooleanArgument("startTLS2", null,
+ "startTLS2",
+ INFO_DESCRIPTION_ENABLE_REPLICATION_STARTTLS2.get());
+
+ replicationPort2Arg = new IntegerArgument("replicationPort2", 'R',
+ "replicationPort2", false, false, true, INFO_PORT_PLACEHOLDER.get(),
+ 8989, null,
+ INFO_DESCRIPTION_ENABLE_REPLICATION_PORT2.get());
+
+ secureReplication2Arg = new BooleanArgument("secureReplication2", null,
+ "secureReplication2",
+ INFO_DESCRIPTION_ENABLE_SECURE_REPLICATION2.get());
+
+ skipPortCheckArg = new BooleanArgument(
+ "skipportcheck", 'S', "skipPortCheck",
+ INFO_DESCRIPTION_ENABLE_REPLICATION_SKIPPORT.get());
+
+ noSchemaReplicationArg = new BooleanArgument(
+ "noschemareplication", null, "noSchemaReplication",
+ INFO_DESCRIPTION_ENABLE_REPLICATION_NO_SCHEMA_REPLICATION.get());
+
+ useSecondServerAsSchemaSourceArg = new BooleanArgument(
+ "usesecondserverasschemasource", null, "useSecondServerAsSchemaSource",
+ INFO_DESCRIPTION_ENABLE_REPLICATION_USE_SECOND_AS_SCHEMA_SOURCE.get(
+ "--"+noSchemaReplicationArg.getLongIdentifier()));
+
+ enableReplicationSubCmd = new SubCommand(this,
+ ENABLE_REPLICATION_SUBCMD_NAME,
+ INFO_DESCRIPTION_SUBCMD_ENABLE_REPLICATION.get());
+
+ Argument[] argsToAdd = {
+ hostName1Arg, port1Arg, bindDn1Arg, bindPassword1Arg,
+ bindPasswordFile1Arg, useStartTLS1Arg, useSSL1Arg, replicationPort1Arg,
+ secureReplication1Arg,
+ hostName2Arg, port2Arg, bindDn2Arg, bindPassword2Arg,
+ bindPasswordFile2Arg, useStartTLS2Arg, useSSL2Arg, replicationPort2Arg,
+ secureReplication2Arg,
+ skipPortCheckArg, noSchemaReplicationArg,
+ useSecondServerAsSchemaSourceArg
+ };
+ for (int i=0; i<argsToAdd.length; i++)
+ {
+ argsToAdd[i].setPropertyName(argsToAdd[i].getLongIdentifier());
+ enableReplicationSubCmd.addArgument(argsToAdd[i]);
+ }
+ }
+
+ /**
+ * Creates the disable replication subcommand and all the specific options
+ * for the subcommand. Note: this method assumes that
+ * initializeGlobalArguments has already been called and that hostNameArg,
+ * portArg, startTLSArg and useSSLArg have been created.
+ */
+ private void createDisableReplicationSubCommand()
+ throws ArgumentException
+ {
+ disableReplicationSubCmd = new SubCommand(this,
+ DISABLE_REPLICATION_SUBCMD_NAME,
+ INFO_DESCRIPTION_SUBCMD_DISABLE_REPLICATION.get());
+ secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
+ secureArgsList.bindDnArg = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
+ OPTION_LONG_BINDDN, false, false, true, INFO_BINDDN_PLACEHOLDER.get(),
+ "cn=Directory Manager", OPTION_LONG_BINDDN,
+ INFO_DESCRIPTION_DISABLE_REPLICATION_BINDDN.get());
+ Argument[] argsToAdd = { secureArgsList.hostNameArg,
+ secureArgsList.portArg, secureArgsList.useSSLArg,
+ secureArgsList.useStartTLSArg, secureArgsList.bindDnArg };
+ for (int i=0; i<argsToAdd.length; i++)
+ {
+ disableReplicationSubCmd.addArgument(argsToAdd[i]);
+ }
+ }
+
+ /**
+ * Creates the initialize replication subcommand and all the specific options
+ * for the subcommand.
+ */
+ private void createInitializeReplicationSubCommand()
+ throws ArgumentException
+ {
+ hostNameSourceArg = new StringArgument("hostSource", OPTION_SHORT_HOST,
+ "hostSource", false, false, true, INFO_HOST_PLACEHOLDER.get(),
+ getDefaultHostValue(), null,
+ INFO_DESCRIPTION_INITIALIZE_REPLICATION_HOST_SOURCE.get());
+
+ portSourceArg = new IntegerArgument("portSource", OPTION_SHORT_PORT,
+ "portSource", false, false, true, INFO_PORT_PLACEHOLDER.get(), 389,
+ null,
+ INFO_DESCRIPTION_INITIALIZE_REPLICATION_SERVER_PORT_SOURCE.get());
+
+ useSSLSourceArg = new BooleanArgument("useSSLSource", OPTION_SHORT_USE_SSL,
+ "useSSLSource",
+ INFO_DESCRIPTION_INITIALIZE_REPLICATION_USE_SSL_SOURCE.get());
+
+ useStartTLSSourceArg = new BooleanArgument("startTLSSource",
+ OPTION_SHORT_START_TLS, "startTLSSource",
+ INFO_DESCRIPTION_INITIALIZE_REPLICATION_STARTTLS_SOURCE.get());
+
+ hostNameDestinationArg = new StringArgument("hostDestination", 'O',
+ "hostDestination", false, false, true, INFO_HOST_PLACEHOLDER.get(),
+ getDefaultHostValue(), null,
+ INFO_DESCRIPTION_INITIALIZE_REPLICATION_HOST_DESTINATION.get());
+
+ portDestinationArg = new IntegerArgument("portDestination", null,
+ "portDestination", false, false, true, INFO_PORT_PLACEHOLDER.get(), 389,
+ null,
+ INFO_DESCRIPTION_INITIALIZE_REPLICATION_SERVER_PORT_DESTINATION.get());
+
+ useSSLDestinationArg = new BooleanArgument("useSSLDestination", 'z',
+ "useSSLDestination",
+ INFO_DESCRIPTION_INITIALIZE_REPLICATION_USE_SSL_DESTINATION.get());
+
+ useStartTLSDestinationArg = new BooleanArgument("startTLSDestination", null,
+ "startTLSDestination",
+ INFO_DESCRIPTION_INITIALIZE_REPLICATION_STARTTLS_DESTINATION.get());
+
+ initializeReplicationSubCmd = new SubCommand(this,
+ INITIALIZE_REPLICATION_SUBCMD_NAME,
+ INFO_DESCRIPTION_SUBCMD_INITIALIZE_REPLICATION.get(
+ INITIALIZE_ALL_REPLICATION_SUBCMD_NAME));
+
+ Argument[] argsToAdd = {
+ hostNameSourceArg, portSourceArg, useSSLSourceArg, useStartTLSSourceArg,
+ hostNameDestinationArg, portDestinationArg, useSSLDestinationArg,
+ useStartTLSDestinationArg
+ };
+ for (int i=0; i<argsToAdd.length; i++)
+ {
+ argsToAdd[i].setPropertyName(argsToAdd[i].getLongIdentifier());
+ initializeReplicationSubCmd.addArgument(argsToAdd[i]);
+ }
+ }
+
+ /**
+ * Creates the initialize all replication subcommand and all the specific
+ * options for the subcommand. Note: this method assumes that
+ * initializeGlobalArguments has already been called and that hostNameArg,
+ * portArg, startTLSArg and useSSLArg have been created.
+ */
+ private void createInitializeAllReplicationSubCommand()
+ throws ArgumentException
+ {
+ initializeAllReplicationSubCmd = new SubCommand(this,
+ INITIALIZE_ALL_REPLICATION_SUBCMD_NAME,
+ INFO_DESCRIPTION_SUBCMD_INITIALIZE_ALL_REPLICATION.get(
+ INITIALIZE_REPLICATION_SUBCMD_NAME));
+ secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
+ Argument[] argsToAdd = { secureArgsList.hostNameArg,
+ secureArgsList.portArg, secureArgsList.useSSLArg,
+ secureArgsList.useStartTLSArg };
+ for (int i=0; i<argsToAdd.length; i++)
+ {
+ initializeAllReplicationSubCmd.addArgument(argsToAdd[i]);
+ }
+ }
+
+ /**
+ * Creates the subcommand that the user must launch before doing an external
+ * initialization of the topology ( and all the specific
+ * options for the subcommand. Note: this method assumes that
+ * initializeGlobalArguments has already been called and that hostNameArg,
+ * portArg, startTLSArg and useSSLArg have been created.
+ */
+ private void createPreExternalInitializationSubCommand()
+ throws ArgumentException
+ {
+ preExternalInitializationSubCmd = new SubCommand(this,
+ PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME,
+ INFO_DESCRIPTION_SUBCMD_PRE_EXTERNAL_INITIALIZATION.get(
+ POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME));
+ secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
+ externalInitializationLocalOnlyArg = new BooleanArgument(
+ "local-only",
+ 'l',
+ "local-only",
+ INFO_DESCRIPTION_EXTERNAL_INITIALIZATION_LOCAL.get());
+ externalInitializationLocalOnlyArg.setPropertyName(
+ externalInitializationLocalOnlyArg.getLongIdentifier());
+ Argument[] argsToAdd = { secureArgsList.hostNameArg,
+ secureArgsList.portArg, secureArgsList.useSSLArg,
+ secureArgsList.useStartTLSArg,
+ externalInitializationLocalOnlyArg};
+
+ for (int i=0; i<argsToAdd.length; i++)
+ {
+ preExternalInitializationSubCmd.addArgument(argsToAdd[i]);
+ }
+ }
+
+ /**
+ * Creates the subcommand that the user must launch after doing an external
+ * initialization of the topology ( and all the specific
+ * options for the subcommand. Note: this method assumes that
+ * initializeGlobalArguments has already been called and that hostNameArg,
+ * portArg, startTLSArg and useSSLArg have been created.
+ */
+ private void createPostExternalInitializationSubCommand()
+ throws ArgumentException
+ {
+ postExternalInitializationSubCmd = new SubCommand(this,
+ POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME,
+ INFO_DESCRIPTION_SUBCMD_POST_EXTERNAL_INITIALIZATION.get(
+ PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME));
+ secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
+ externalInitializationLocalOnlyArg.setPropertyName(
+ externalInitializationLocalOnlyArg.getLongIdentifier());
+ Argument[] argsToAdd = { secureArgsList.hostNameArg,
+ secureArgsList.portArg, secureArgsList.useSSLArg,
+ secureArgsList.useStartTLSArg};
+ for (int i=0; i<argsToAdd.length; i++)
+ {
+ postExternalInitializationSubCmd.addArgument(argsToAdd[i]);
+ }
+ }
+
+ /**
+ * Creates the status replication subcommand and all the specific options
+ * for the subcommand. Note: this method assumes that
+ * initializeGlobalArguments has already been called and that hostNameArg,
+ * portArg, startTLSArg and useSSLArg have been created.
+ */
+ private void createStatusReplicationSubCommand() throws ArgumentException
+ {
+ statusReplicationSubCmd = new SubCommand(this,
+ STATUS_REPLICATION_SUBCMD_NAME,
+ INFO_DESCRIPTION_SUBCMD_STATUS_REPLICATION.get());
+ scriptFriendlyArg = new BooleanArgument(
+ "script-friendly",
+ 's',
+ "script-friendly",
+ INFO_DESCRIPTION_SCRIPT_FRIENDLY.get());
+ scriptFriendlyArg.setPropertyName(scriptFriendlyArg.getLongIdentifier());
+ secureArgsList.hostNameArg.setDefaultValue(getDefaultHostValue());
+ Argument[] argsToAdd = { secureArgsList.hostNameArg,
+ secureArgsList.portArg, secureArgsList.useSSLArg,
+ secureArgsList.useStartTLSArg, scriptFriendlyArg };
+ for (int i=0; i<argsToAdd.length; i++)
+ {
+ statusReplicationSubCmd.addArgument(argsToAdd[i]);
+ }
+ }
+
+ /**
+ * Tells whether the user specified to have an interactive operation or not.
+ * This method must be called after calling parseArguments.
+ * @return <CODE>true</CODE> if the user specified to have an interactive
+ * operation and <CODE>false</CODE> otherwise.
+ */
+ public boolean isInteractive()
+ {
+ return !noPromptArg.isPresent();
+ }
+
+ /**
+ * Tells whether the user specified to have a quite operation or not.
+ * This method must be called after calling parseArguments.
+ * @return <CODE>true</CODE> if the user specified to have a quite operation
+ * and <CODE>false</CODE> otherwise.
+ */
+ public boolean isQuiet()
+ {
+ return quietArg.isPresent();
+ }
+
+ /**
+ * Tells whether the user specified to have a script-friendly output or not.
+ * This method must be called after calling parseArguments.
+ * @return <CODE>true</CODE> if the user specified to have a script-friendly
+ * output and <CODE>false</CODE> otherwise.
+ */
+ public boolean isScriptFriendly()
+ {
+ return scriptFriendlyArg.isPresent();
+ }
+
+ /**
+ * Get the password which has to be used for the command to connect to the
+ * first server without prompting the user in the enable replication
+ * subcommand. If no password was specified return null.
+ *
+ * @return the password which has to be used for the command to connect to the
+ * first server without prompting the user in the enable replication
+ * subcommand. If no password was specified return null.
+ */
+ public String getBindPassword1()
+ {
+ return getBindPassword(bindPassword1Arg, bindPasswordFile1Arg);
+ }
+
+ /**
+ * Get the password which has to be used for the command to connect to the
+ * second server without prompting the user in the enable replication
+ * subcommand. If no password was specified return null.
+ *
+ * @return the password which has to be used for the command to connect to the
+ * second server without prompting the user in the enable replication
+ * subcommand. If no password was specified return null.
+ */
+ public String getBindPassword2()
+ {
+ return getBindPassword(bindPassword2Arg, bindPasswordFile2Arg);
+ }
+
+ /**
+ * Get the global administrator password which has to be used for the command
+ * to connect to the server(s) without prompting the user. If no password was
+ * specified, return null.
+ *
+ * @return the global administrator password which has to be used for the
+ * command to connect to the server(s) without prompting the user. If no
+ * password was specified, return null.
+ */
+ public String getBindPasswordAdmin()
+ {
+ return getBindPassword(secureArgsList.bindPasswordArg,
+ secureArgsList.bindPasswordFileArg);
+ }
+
+ /**
+ * Get the password of the first server which has to be used in the
+ * enable replication subcommand.
+ *
+ * @param dn
+ * The user DN for which to password could be asked.
+ * @param out
+ * The input stream to used if we have to prompt to the
+ * user.
+ * @param err
+ * The error stream to used if we have to prompt to the
+ * user.
+ * @return the password of the first server which has to be used n the
+ * enable replication subcommand.
+ */
+ public String getBindPassword1(
+ String dn, OutputStream out, OutputStream err)
+ {
+ return getBindPassword(dn, out, err, bindPassword1Arg,
+ bindPasswordFile1Arg);
+ }
+
+ /**
+ * Get the password of the second server which has to be used in the
+ * enable replication subcommand.
+ *
+ * @param dn
+ * The user DN for which to password could be asked.
+ * @param out
+ * The input stream to used if we have to prompt to the
+ * user.
+ * @param err
+ * The error stream to used if we have to prompt to the
+ * user.
+ * @return the password of the second server which has to be used in the
+ * enable replication subcommand.
+ */
+ public String getBindPassword2(
+ String dn, OutputStream out, OutputStream err)
+ {
+ return getBindPassword(dn, out, err, bindPassword2Arg,
+ bindPasswordFile2Arg);
+ }
+
+ /**
+ * Get the password of the global administrator which has to be used for the
+ * command.
+ *
+ * @param dn
+ * The user DN for which to password could be asked.
+ * @param out
+ * The input stream to used if we have to prompt to the
+ * user.
+ * @param err
+ * The error stream to used if we have to prompt to the
+ * user.
+ * @return the password of the global administrator which has to be used for
+ * the command.
+ */
+ public String getBindPasswordAdmin(
+ String dn, OutputStream out, OutputStream err)
+ {
+ return getBindPassword(dn, out, err, secureArgsList.bindPasswordArg,
+ secureArgsList.bindPasswordFileArg);
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the first server in the enable
+ * replication subcommand.
+ *
+ * @return <CODE>true</CODE> if SSL mode is required for the first server in
+ * the enable replication subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useSSL1()
+ {
+ return useSSL1Arg.isPresent();
+ }
+
+ /**
+ * Indicate if the startTLS mode is required for the first server in the
+ * enable replication subcommand.
+ *
+ * @return <CODE>true</CODE> if startTLS mode is required for the first server
+ * in the enable replication subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useStartTLS1()
+ {
+ return useStartTLS1Arg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the second server in the enable
+ * replication subcommand.
+ *
+ * @return <CODE>true</CODE> if SSL mode is required for the second server in
+ * the enable replication subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useSSL2()
+ {
+ return useSSL2Arg.isPresent();
+ }
+
+ /**
+ * Indicate if the startTLS mode is required for the second server in the
+ * enable replication subcommand.
+ *
+ * @return <CODE>true</CODE> if startTLS mode is required for the second
+ * server in the enable replication subcommand and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean useStartTLS2()
+ {
+ return useStartTLS2Arg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the source server in the
+ * initialize replication subcommand.
+ *
+ * @return <CODE>true</CODE> if SSL mode is required for the source server
+ * in the initialize replication subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useSSLSource()
+ {
+ return useSSLSourceArg.isPresent();
+ }
+
+ /**
+ * Indicate if the StartTLS mode is required for the source server in the
+ * initialize replication subcommand.
+ *
+ * @return <CODE>true</CODE> if StartTLS mode is required for the source
+ * server in the initialize replication subcommand and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean useStartTLSSource()
+ {
+ return useStartTLSSourceArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the destinaton server in the
+ * initialize replication subcommand.
+ *
+ * @return <CODE>true</CODE> if SSL mode is required for the destination
+ * server in the initialize replication subcommand and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean useSSLDestination()
+ {
+ return useSSLDestinationArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the destination server in the
+ * initialize replication subcommand.
+ *
+ * @return <CODE>true</CODE> if StartTLS mode is required for the destination
+ * server in the initialize replication subcommand and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean useStartTLSDestination()
+ {
+ return useStartTLSDestinationArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the server in the disable
+ * replication subcommand.
+ *
+ * @return <CODE>true</CODE> if SSL mode is required for the server in the
+ * disable replication subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useSSLToDisable()
+ {
+ return secureArgsList.useSSLArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the server in the disable
+ * replication subcommand.
+ *
+ * @return <CODE>true</CODE> if StartTLS mode is required for the server in
+ * the disable replication subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useStartTLSToDisable()
+ {
+ return secureArgsList.useStartTLSArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the server in the initialize all
+ * replication subcommand.
+ *
+ * @return <CODE>true</CODE> if SSL mode is required for the server in the
+ * initialize all replication subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useSSLToInitializeAll()
+ {
+ return secureArgsList.useSSLArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the server in the initialize all
+ * replication subcommand.
+ *
+ * @return <CODE>true</CODE> if StartTLS mode is required for the server in
+ * the initialize all replication subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useStartTLSToInitializeAll()
+ {
+ return secureArgsList.useStartTLSArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the server in the pre external
+ * initialization subcommand.
+ *
+ * @return <CODE>true</CODE> if SSL mode is required for the server in the
+ * pre external initialization subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useSSLToPreExternalInitialization()
+ {
+ return secureArgsList.useSSLArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the server in the pre external
+ * initialization subcommand.
+ *
+ * @return <CODE>true</CODE> if StartTLS mode is required for the server in
+ * the pre external initialization subcommand and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean useStartTLSToPreExternalInitialization()
+ {
+ return secureArgsList.useStartTLSArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the server in the post external
+ * initialization subcommand.
+ *
+ * @return <CODE>true</CODE> if SSL mode is required for the server in the
+ * post external initialization subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useSSLToPostExternalInitialization()
+ {
+ return secureArgsList.useSSLArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the server in the post external
+ * initialization subcommand.
+ *
+ * @return <CODE>true</CODE> if StartTLS mode is required for the server in
+ * the post external initialization subcommand and <CODE>false</CODE>
+ * otherwise.
+ */
+ public boolean useStartTLSToPostExternalInitialization()
+ {
+ return secureArgsList.useStartTLSArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the server in the status
+ * replication subcommand.
+ *
+ * @return <CODE>true</CODE> if SSL mode is required for the server in the
+ * status replication subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useSSLToStatus()
+ {
+ return secureArgsList.useSSLArg.isPresent();
+ }
+
+ /**
+ * Indicate if the SSL mode is required for the server in the status
+ * replication subcommand.
+ *
+ * @return <CODE>true</CODE> if StartTLS mode is required for the server in
+ * the status replication subcommand and <CODE>false</CODE> otherwise.
+ */
+ public boolean useStartTLSToStatus()
+ {
+ return secureArgsList.useStartTLSArg.isPresent();
+ }
+
+ /**
+ * Returns the Administrator UID explicitly provided in the command-line.
+ * @return the Administrator UID explicitly provided in the command-line.
+ */
+ public String getAdministratorUID()
+ {
+ return getValue(secureArgsList.adminUidArg);
+ }
+
+ /**
+ * Returns the default Administrator UID value.
+ * @return the default Administrator UID value.
+ */
+ public String getDefaultAdministratorUID()
+ {
+ return getDefaultValue(secureArgsList.adminUidArg);
+ }
+
+ /**
+ * Returns the first host name explicitly provided in the enable replication
+ * subcommand.
+ * @return the first host name explicitly provided in the enable replication
+ * subcommand.
+ */
+ public String getHostName1()
+ {
+ return getValue(hostName1Arg);
+ }
+
+ /**
+ * Returns the first host name default value in the enable replication
+ * subcommand.
+ * @return the first host name default value in the enable replication
+ * subcommand.
+ */
+ public String getDefaultHostName1()
+ {
+ return getDefaultValue(hostName1Arg);
+ }
+
+ /**
+ * Returns the first server port explicitly provided in the enable replication
+ * subcommand.
+ * @return the first server port explicitly provided in the enable replication
+ * subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public int getPort1()
+ {
+ return getValue(port1Arg);
+ }
+
+ /**
+ * Returns the first server port default value in the enable replication
+ * subcommand.
+ * @return the first server port default value in the enable replication
+ * subcommand.
+ */
+ public int getDefaultPort1()
+ {
+ return getDefaultValue(port1Arg);
+ }
+
+ /**
+ * Returns the first server bind dn explicitly provided in the enable
+ * replication subcommand.
+ * @return the first server bind dn explicitly provided in the enable
+ * replication subcommand.
+ */
+ public String getBindDn1()
+ {
+ return getValue(bindDn1Arg);
+ }
+
+ /**
+ * Returns the first server bind dn default value in the enable replication
+ * subcommand.
+ * @return the first server bind dn default value in the enable replication
+ * subcommand.
+ */
+ public String getDefaultBindDn1()
+ {
+ return getDefaultValue(bindDn1Arg);
+ }
+
+ /**
+ * Returns the first server replication port explicitly provided in the enable
+ * replication subcommand.
+ * @return the first server replication port explicitly provided in the enable
+ * replication subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public int getReplicationPort1()
+ {
+ return getValue(replicationPort1Arg);
+ }
+
+ /**
+ * Returns the first server replication port default value in the enable
+ * replication subcommand.
+ * @return the first server replication port default value in the enable
+ * replication subcommand.
+ */
+ public int getDefaultReplicationPort1()
+ {
+ return getDefaultValue(replicationPort1Arg);
+ }
+
+ /**
+ * Returns whether the user asked to have replication communication with the
+ * first server or not.
+ * @return <CODE>true</CODE> the user asked to have replication communication
+ * with the first server and <CODE>false</CODE> otherwise.
+ */
+ public boolean isSecureReplication1()
+ {
+ return secureReplication1Arg.isPresent();
+ }
+
+ /**
+ * Returns the second host name explicitly provided in the enable replication
+ * subcommand.
+ * @return the second host name explicitly provided in the enable replication
+ * subcommand.
+ */
+ public String getHostName2()
+ {
+ return getValue(hostName2Arg);
+ }
+
+ /**
+ * Returns the second host name default value in the enable replication
+ * subcommand.
+ * @return the second host name default value in the enable replication
+ * subcommand.
+ */
+ public String getDefaultHostName2()
+ {
+ return getDefaultValue(hostName2Arg);
+ }
+
+ /**
+ * Returns the second server port explicitly provided in the enable
+ * replication subcommand.
+ * @return the second server port explicitly provided in the enable
+ * replication subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public int getPort2()
+ {
+ return getValue(port2Arg);
+ }
+
+ /**
+ * Returns the second server port default value in the enable replication
+ * subcommand.
+ * @return the second server port default value in the enable replication
+ * subcommand.
+ */
+ public int getDefaultPort2()
+ {
+ return getDefaultValue(port2Arg);
+ }
+
+ /**
+ * Returns the second server bind dn explicitly provided in the enable
+ * replication subcommand.
+ * @return the second server bind dn explicitly provided in the enable
+ * replication subcommand.
+ */
+ public String getBindDn2()
+ {
+ return getValue(bindDn2Arg);
+ }
+
+ /**
+ * Returns the second server bind dn default value in the enable replication
+ * subcommand.
+ * @return the second server bind dn default value in the enable replication
+ * subcommand.
+ */
+ public String getDefaultBindDn2()
+ {
+ return getDefaultValue(bindDn2Arg);
+ }
+
+ /**
+ * Returns the second server replication port explicitly provided in the
+ * enable replication subcommand.
+ * @return the second server replication port explicitly provided in the
+ * enable replication subcommand. Returns -1 if no port was explicitly
+ * provided.
+ */
+ public int getReplicationPort2()
+ {
+ return getValue(replicationPort2Arg);
+ }
+
+ /**
+ * Returns the second server replication port default value in the enable
+ * replication subcommand.
+ * @return the second server replication port default value in the enable
+ * replication subcommand.
+ */
+ public int getDefaultReplicationPort2()
+ {
+ return getDefaultValue(replicationPort2Arg);
+ }
+
+ /**
+ * Returns whether the user asked to have replication communication with the
+ * second server or not.
+ * @return <CODE>true</CODE> the user asked to have replication communication
+ * with the second server and <CODE>false</CODE> otherwise.
+ */
+ public boolean isSecureReplication2()
+ {
+ return secureReplication2Arg.isPresent();
+ }
+
+ /**
+ * Returns whether the user asked to skip the replication port checks (if the
+ * ports are free) or not.
+ * @return <CODE>true</CODE> the user asked to skip the replication port
+ * checks (if the ports are free) and <CODE>false</CODE> otherwise.
+ */
+ public boolean skipReplicationPortCheck()
+ {
+ return skipPortCheckArg.isPresent();
+ }
+
+ /**
+ * Returns whether the user asked to not replicate the schema between servers.
+ * @return <CODE>true</CODE> if the user asked to not replicate schema and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean noSchemaReplication()
+ {
+ return noSchemaReplicationArg.isPresent();
+ }
+
+ /**
+ * Returns whether the user asked to use the second server to initialize the
+ * schema of the first server.
+ * @return <CODE>true</CODE> if the user asked to use the second server to
+ * initialize the schema of the first server and <CODE>false</CODE> otherwise.
+ */
+ public boolean useSecondServerAsSchemaSource()
+ {
+ return useSecondServerAsSchemaSourceArg.isPresent();
+ }
+
+ /**
+ * Returns the host name explicitly provided in the disable replication
+ * subcommand.
+ * @return the host name explicitly provided in the disable replication
+ * subcommand.
+ */
+ public String getHostNameToDisable()
+ {
+ return getValue(secureArgsList.hostNameArg);
+ }
+
+ /**
+ * Returns the host name default value in the disable replication
+ * subcommand.
+ * @return the host name default value in the disable replication
+ * subcommand.
+ */
+ public String getDefaultHostNameToDisable()
+ {
+ return getDefaultValue(secureArgsList.hostNameArg);
+ }
+
+ /**
+ * Returns the server bind dn explicitly provided in the disable replication
+ * subcommand.
+ * @return the server bind dn explicitly provided in the disable replication
+ * subcommand.
+ */
+ public String getBindDNToDisable()
+ {
+ return getValue(secureArgsList.bindDnArg);
+ }
+
+ /**
+ * Returns the server bind dn default value in the disable replication
+ * subcommand.
+ * @return the server bind dn default value in the enable replication
+ * subcommand.
+ */
+ public String getDefaultBindDnToDisable()
+ {
+ return getDefaultValue(secureArgsList.bindDnArg);
+ }
+
+ /**
+ * Returns the host name explicitly provided in the status replication
+ * subcommand.
+ * @return the host name explicitly provided in the status replication
+ * subcommand.
+ */
+ public String getHostNameToStatus()
+ {
+ return getValue(secureArgsList.hostNameArg);
+ }
+
+ /**
+ * Returns the host name default value in the status replication subcommand.
+ * @return the host name default value in the status replication subcommand.
+ */
+ public String getDefaultHostNameToStatus()
+ {
+ return getDefaultValue(secureArgsList.hostNameArg);
+ }
+
+ /**
+ * Returns the host name explicitly provided in the initialize all replication
+ * subcommand.
+ * @return the host name explicitly provided in the initialize all replication
+ * subcommand.
+ */
+ public String getHostNameToInitializeAll()
+ {
+ return getValue(secureArgsList.hostNameArg);
+ }
+
+ /**
+ * Returns the host name default value in the initialize all replication
+ * subcommand.
+ * @return the host name default value in the initialize all replication
+ * subcommand.
+ */
+ public String getDefaultHostNameToInitializeAll()
+ {
+ return getDefaultValue(secureArgsList.hostNameArg);
+ }
+
+ /**
+ * Returns the host name explicitly provided in the pre external
+ * initialization subcommand.
+ * @return the host name explicitly provided in the pre external
+ * initialization subcommand.
+ */
+ public String getHostNameToPreExternalInitialization()
+ {
+ return getValue(secureArgsList.hostNameArg);
+ }
+
+ /**
+ * Returns the host name default value in the pre external initialization
+ * subcommand.
+ * @return the host name default value in the pre external initialization
+ * subcommand.
+ */
+ public String getDefaultHostNameToPreExternalInitialization()
+ {
+ return getDefaultValue(secureArgsList.hostNameArg);
+ }
+
+ /**
+ * Returns the host name explicitly provided in the post external
+ * initialization subcommand.
+ * @return the host name explicitly provided in the post external
+ * initialization subcommand.
+ */
+ public String getHostNameToPostExternalInitialization()
+ {
+ return getValue(secureArgsList.hostNameArg);
+ }
+
+ /**
+ * Returns the host name default value in the post external initialization
+ * subcommand.
+ * @return the host name default value in the post external initialization
+ * subcommand.
+ */
+ public String getDefaultHostNameToPostExternalInitialization()
+ {
+ return getDefaultValue(secureArgsList.hostNameArg);
+ }
+
+ /**
+ * Returns the source host name explicitly provided in the initialize
+ * replication subcommand.
+ * @return the source host name explicitly provided in the initialize
+ * replication subcommand.
+ */
+ public String getHostNameSource()
+ {
+ return getValue(hostNameSourceArg);
+ }
+
+ /**
+ * Returns the first host name default value in the initialize replication
+ * subcommand.
+ * @return the first host name default value in the initialize replication
+ * subcommand.
+ */
+ public String getDefaultHostNameSource()
+ {
+ return getDefaultValue(hostNameSourceArg);
+ }
+
+ /**
+ * Returns the destination host name explicitly provided in the initialize
+ * replication subcommand.
+ * @return the destination host name explicitly provided in the initialize
+ * replication subcommand.
+ */
+ public String getHostNameDestination()
+ {
+ return getValue(hostNameDestinationArg);
+ }
+
+ /**
+ * Returns the destination host name default value in the initialize
+ * replication subcommand.
+ * @return the destination host name default value in the initialize
+ * replication subcommand.
+ */
+ public String getDefaultHostNameDestination()
+ {
+ return getDefaultValue(hostNameDestinationArg);
+ }
+
+ /**
+ * Returns the source server port explicitly provided in the initialize
+ * replication subcommand.
+ * @return the source server port explicitly provided in the initialize
+ * replication subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public int getPortSource()
+ {
+ return getValue(portSourceArg);
+ }
+
+ /**
+ * Returns the source server port default value in the initialize replication
+ * subcommand.
+ * @return the source server port default value in the initialize replication
+ * subcommand.
+ */
+ public int getDefaultPortSource()
+ {
+ return getDefaultValue(portSourceArg);
+ }
+
+ /**
+ * Returns the destination server port explicitly provided in the initialize
+ * replication subcommand.
+ * @return the destination server port explicitly provided in the initialize
+ * replication subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public int getPortDestination()
+ {
+ return getValue(portDestinationArg);
+ }
+
+ /**
+ * Returns the destination server port default value in the initialize
+ * replication subcommand.
+ * @return the destination server port default value in the initialize
+ * replication subcommand.
+ */
+ public int getDefaultPortDestination()
+ {
+ return getDefaultValue(portDestinationArg);
+ }
+
+ /**
+ * Returns the server port explicitly provided in the disable replication
+ * subcommand.
+ * @return the server port explicitly provided in the disable replication
+ * subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public int getPortToDisable()
+ {
+ return getValue(secureArgsList.portArg);
+ }
+
+ /**
+ * Returns the server port default value in the disable replication
+ * subcommand.
+ * @return the server port default value in the disable replication
+ * subcommand.
+ */
+ public int getDefaultPortToDisable()
+ {
+ return getDefaultValue(secureArgsList.portArg);
+ }
+
+ /**
+ * Returns the server port explicitly provided in the initialize all
+ * replication subcommand.
+ * @return the server port explicitly provided in the initialize all
+ * replication subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public int getPortToInitializeAll()
+ {
+ return getValue(secureArgsList.portArg);
+ }
+
+ /**
+ * Returns the server port default value in the initialize all replication
+ * subcommand.
+ * @return the server port default value in the initialize all replication
+ * subcommand.
+ */
+ public int getDefaultPortToInitializeAll()
+ {
+ return getDefaultValue(secureArgsList.portArg);
+ }
+
+ /**
+ * Returns the server port explicitly provided in the pre external
+ * initialization subcommand.
+ * @return the server port explicitly provided in the pre external
+ * initialization subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public int getPortToPreExternalInitialization()
+ {
+ return getValue(secureArgsList.portArg);
+ }
+
+ /**
+ * Returns the server port default value in the pre external initialization
+ * subcommand.
+ * @return the server port default value in the pre external initialization
+ * subcommand.
+ */
+ public int getDefaultPortToPreExternalInitialization()
+ {
+ return getDefaultValue(secureArgsList.portArg);
+ }
+
+ /**
+ * Returns the server port explicitly provided in the post external
+ * initialization subcommand.
+ * @return the server port explicitly provided in the post external
+ * initialization subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public int getPortToPostExternalInitialization()
+ {
+ return getValue(secureArgsList.portArg);
+ }
+
+ /**
+ * Returns the server port default value in the post external initialization
+ * subcommand.
+ * @return the server port default value in the post external initialization
+ * subcommand.
+ */
+ public int getDefaultPortToPostExternalInitialization()
+ {
+ return getDefaultValue(secureArgsList.portArg);
+ }
+
+ /**
+ * Returns the server port explicitly provided in the status replication
+ * subcommand.
+ * @return the server port explicitly provided in the status replication
+ * subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public int getPortToStatus()
+ {
+ return getValue(secureArgsList.portArg);
+ }
+
+ /**
+ * Returns the server port default value in the status replication subcommand.
+ * @return the server port default value in the status replication subcommand.
+ */
+ public int getDefaultPortToStatus()
+ {
+ return getDefaultValue(secureArgsList.portArg);
+ }
+
+ /**
+ * Returns the list of base DNs provided by the user.
+ * @return the list of base DNs provided by the user.
+ */
+ public LinkedList<String> getBaseDNs()
+ {
+ return baseDNsArg.getValues();
+ }
+
+ /**
+ * Returns the value of the provided argument only if the user provided it
+ * explicitly.
+ * @param arg the StringArgument to be handled.
+ * @return the value of the provided argument only if the user provided it
+ * explicitly.
+ */
+ private String getValue(StringArgument arg)
+ {
+ String v = null;
+ if (arg.isPresent())
+ {
+ v = arg.getValue();
+ }
+ return v;
+ }
+
+ /**
+ * Returns the default value of the provided argument.
+ * @param arg the StringArgument to be handled.
+ * @return the default value of the provided argument.
+ */
+ private String getDefaultValue(StringArgument arg)
+ {
+ return arg.getDefaultValue();
+ }
+
+ /**
+ * Returns the value of the provided argument only if the user provided it
+ * explicitly.
+ * @param arg the StringArgument to be handled.
+ * @return the value of the provided argument only if the user provided it
+ * explicitly.
+ */
+ private int getValue(IntegerArgument arg)
+ {
+ int v = -1;
+ if (arg.isPresent())
+ {
+ try
+ {
+ v = arg.getIntValue();
+ }
+ catch (ArgumentException ae)
+ {
+ // This is a bug
+ throw new IllegalStateException(
+ "There was an argument exception calling "+
+ "ReplicationCliParser.getValue(). This appears to be a bug "+
+ "because this method should be called after calling "+
+ "parseArguments which should result in an error.", ae);
+ }
+ }
+ return v;
+ }
+
+ /**
+ * Returns the default value of the provided argument.
+ * @param arg the StringArgument to be handled.
+ * @return the default value of the provided argument.
+ */
+ private int getDefaultValue(IntegerArgument arg)
+ {
+ int returnValue = -1;
+ String defaultValue = arg.getDefaultValue();
+ if (defaultValue != null)
+ {
+ returnValue = Integer.parseInt(arg.getDefaultValue());
+ }
+ return returnValue;
+ }
+
+ /**
+ * Checks the subcommand options and updates the provided MessageBuilder
+ * with the errors that were encountered with the subcommand options.
+ *
+ * This method assumes that the method parseArguments for the parser has
+ * already been called.
+ * @param buf the MessageBuilder object where we add the error messages
+ * describing the errors encountered.
+ */
+ public void validateSubcommandOptions(MessageBuilder buf)
+ {
+ if (isEnableReplicationSubcommand())
+ {
+ validateEnableReplicationOptions(buf);
+ }
+ else if (isDisableReplicationSubcommand())
+ {
+ validateDisableReplicationOptions(buf);
+ }
+ else if (isStatusReplicationSubcommand())
+ {
+ validateStatusReplicationOptions(buf);
+ }
+ else if (isInitializeReplicationSubcommand())
+ {
+ validateInitializeReplicationOptions(buf);
+ }
+ else if (isInitializeAllReplicationSubcommand())
+ {
+ validateInitializeAllReplicationOptions(buf);
+ }
+ else if (isPreExternalInitializationSubcommand())
+ {
+ validatePreExternalInitializationOptions(buf);
+ }
+ else if (isPostExternalInitializationSubcommand())
+ {
+ validatePostExternalInitializationOptions(buf);
+ }
+
+ else
+ {
+ // This can occur if the user did not provide any subcommand. We assume
+ // that the error informing of this will be generated in
+ // validateGlobalOptions.
+ }
+ }
+
+ /**
+ * Returns whether the user provided subcommand is the enable replication
+ * or not.
+ * @return <CODE>true</CODE> if the user provided subcommand is the
+ * enable replication and <CODE>false</CODE> otherwise.
+ */
+ public boolean isEnableReplicationSubcommand()
+ {
+ return isSubcommand(ENABLE_REPLICATION_SUBCMD_NAME);
+ }
+
+ /**
+ * Returns whether the user provided subcommand is the disable replication
+ * or not.
+ * @return <CODE>true</CODE> if the user provided subcommand is the
+ * disable replication and <CODE>false</CODE> otherwise.
+ */
+ public boolean isDisableReplicationSubcommand()
+ {
+ return isSubcommand(DISABLE_REPLICATION_SUBCMD_NAME);
+ }
+
+ /**
+ * Returns whether the user provided subcommand is the status replication
+ * or not.
+ * @return <CODE>true</CODE> if the user provided subcommand is the
+ * status replication and <CODE>false</CODE> otherwise.
+ */
+ public boolean isStatusReplicationSubcommand()
+ {
+ return isSubcommand(STATUS_REPLICATION_SUBCMD_NAME);
+ }
+
+ /**
+ * Returns whether the user provided subcommand is the initialize all
+ * replication or not.
+ * @return <CODE>true</CODE> if the user provided subcommand is the
+ * initialize all replication and <CODE>false</CODE> otherwise.
+ */
+ public boolean isInitializeAllReplicationSubcommand()
+ {
+ return isSubcommand(INITIALIZE_ALL_REPLICATION_SUBCMD_NAME);
+ }
+
+ /**
+ * Returns whether the user provided subcommand is the pre external
+ * initialization or not.
+ * @return <CODE>true</CODE> if the user provided subcommand is the
+ * pre external initialization and <CODE>false</CODE> otherwise.
+ */
+ public boolean isPreExternalInitializationSubcommand()
+ {
+ return isSubcommand(PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME);
+ }
+
+ /**
+ * Returns whether the user provided subcommand is the post external
+ * initialization or not.
+ * @return <CODE>true</CODE> if the user provided subcommand is the
+ * post external initialization and <CODE>false</CODE> otherwise.
+ */
+ public boolean isPostExternalInitializationSubcommand()
+ {
+ return isSubcommand(POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME);
+ }
+
+ /**
+ * Returns whether the user provided subcommand is the initialize replication
+ * or not.
+ * @return <CODE>true</CODE> if the user provided subcommand is the
+ * initialize replication and <CODE>false</CODE> otherwise.
+ */
+ public boolean isInitializeReplicationSubcommand()
+ {
+ return isSubcommand(INITIALIZE_REPLICATION_SUBCMD_NAME);
+ }
+
+ /**
+ * Tells whether the user specified to apply the pre (or post) external
+ * initialization operations only on the local server.
+ * @return <CODE>true</CODE> if the user specified to apply the pre (or post)
+ * external initialization operations only on the local server and
+ * <CODE>false</CODE> otherwise.
+ */
+ public boolean isExternalInitializationLocalOnly()
+ {
+ return externalInitializationLocalOnlyArg.isPresent();
+ }
+
+ /**
+ * Returns whether the command-line subcommand has the name provided
+ * or not.
+ * @param name the name of the subcommand.
+ * @return <CODE>true</CODE> if command-line subcommand has the name provided
+ * and <CODE>false</CODE> otherwise.
+ */
+ private boolean isSubcommand(String name)
+ {
+ boolean isSubcommand = false;
+ SubCommand subCommand = getSubCommand();
+ if (subCommand != null)
+ {
+ isSubcommand = subCommand.getName().equalsIgnoreCase(name);
+ }
+ return isSubcommand;
+ }
+
+ /**
+ * Checks the enable replication subcommand options and updates the provided
+ * MessageBuilder with the errors that were encountered with the subcommand
+ * options.
+ *
+ * This method assumes that the method parseArguments for the parser has
+ * already been called.
+ * @param buf the MessageBuilder object where we add the error messages
+ * describing the errors encountered.
+ */
+ private void validateEnableReplicationOptions(MessageBuilder buf)
+ {
+ Argument[][] conflictingPairs =
+ {
+ {bindPassword1Arg, bindPasswordFile1Arg},
+ {useStartTLS1Arg, useSSL1Arg},
+ {bindPassword2Arg, bindPasswordFile2Arg},
+ {useStartTLS2Arg, useSSL2Arg},
+ {noSchemaReplicationArg, useSecondServerAsSchemaSourceArg}
+ };
+
+ for (int i=0; i< conflictingPairs.length; i++)
+ {
+ Argument arg1 = conflictingPairs[i][0];
+ Argument arg2 = conflictingPairs[i][1];
+ if (arg1.isPresent() && arg2.isPresent())
+ {
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ arg1.getLongIdentifier(), arg2.getLongIdentifier());
+ addMessage(buf, message);
+ }
+ }
+
+ if (hostName1Arg.getValue().equalsIgnoreCase(hostName2Arg.getValue()) &&
+ !isInteractive())
+ {
+ if (port1Arg.getValue() == port2Arg.getValue())
+ {
+ Message message = ERR_REPLICATION_ENABLE_SAME_SERVER_PORT.get(
+ hostName1Arg.getValue(), port1Arg.getValue());
+ addMessage(buf, message);
+ }
+ }
+ }
+
+ /**
+ * Checks the disable replication subcommand options and updates the provided
+ * MessageBuilder with the errors that were encountered with the subcommand
+ * options.
+ *
+ * This method assumes that the method parseArguments for the parser has
+ * already been called.
+ * @param buf the MessageBuilder object where we add the error messages
+ * describing the errors encountered.
+ */
+ private void validateDisableReplicationOptions(MessageBuilder buf)
+ {
+ Argument[][] conflictingPairs =
+ {
+ {secureArgsList.useStartTLSArg, secureArgsList.useSSLArg},
+ {secureArgsList.adminUidArg, secureArgsList.bindDnArg}
+ };
+
+ for (int i=0; i< conflictingPairs.length; i++)
+ {
+ Argument arg1 = conflictingPairs[i][0];
+ Argument arg2 = conflictingPairs[i][1];
+ if (arg1.isPresent() && arg2.isPresent())
+ {
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ arg1.getLongIdentifier(), arg2.getLongIdentifier());
+ addMessage(buf, message);
+ }
+ }
+ }
+
+ /**
+ * Checks the initialize all replication subcommand options and updates the
+ * provided MessageBuilder with the errors that were encountered with the
+ * subcommand options.
+ *
+ * This method assumes that the method parseArguments for the parser has
+ * already been called.
+ * @param buf the MessageBuilder object where we add the error messages
+ * describing the errors encountered.
+ */
+ private void validateInitializeAllReplicationOptions(MessageBuilder buf)
+ {
+ Argument[][] conflictingPairs =
+ {
+ {secureArgsList.useStartTLSArg, secureArgsList.useSSLArg}
+ };
+
+ for (int i=0; i< conflictingPairs.length; i++)
+ {
+ Argument arg1 = conflictingPairs[i][0];
+ Argument arg2 = conflictingPairs[i][1];
+ if (arg1.isPresent() && arg2.isPresent())
+ {
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ arg1.getLongIdentifier(), arg2.getLongIdentifier());
+ addMessage(buf, message);
+ }
+ }
+ }
+
+ /**
+ * Checks the pre external initialization subcommand options and updates the
+ * provided MessageBuilder with the errors that were encountered with the
+ * subcommand options.
+ *
+ * This method assumes that the method parseArguments for the parser has
+ * already been called.
+ * @param buf the MessageBuilder object where we add the error messages
+ * describing the errors encountered.
+ */
+ private void validatePreExternalInitializationOptions(MessageBuilder buf)
+ {
+ validateInitializeAllReplicationOptions(buf);
+ }
+
+ /**
+ * Checks the post external initialization subcommand options and updates the
+ * provided MessageBuilder with the errors that were encountered with the
+ * subcommand options.
+ *
+ * This method assumes that the method parseArguments for the parser has
+ * already been called.
+ * @param buf the MessageBuilder object where we add the error messages
+ * describing the errors encountered.
+ */
+ private void validatePostExternalInitializationOptions(MessageBuilder buf)
+ {
+ validateInitializeAllReplicationOptions(buf);
+ }
+
+ /**
+ * Checks the status replication subcommand options and updates the provided
+ * MessageBuilder with the errors that were encountered with the subcommand
+ * options.
+ *
+ * This method assumes that the method parseArguments for the parser has
+ * already been called.
+ * @param buf the MessageBuilder object where we add the error messages
+ * describing the errors encountered.
+ */
+ private void validateStatusReplicationOptions(MessageBuilder buf)
+ {
+ Argument[][] conflictingPairs =
+ {
+ {secureArgsList.useStartTLSArg, secureArgsList.useSSLArg}
+ };
+
+ for (int i=0; i< conflictingPairs.length; i++)
+ {
+ Argument arg1 = conflictingPairs[i][0];
+ Argument arg2 = conflictingPairs[i][1];
+ if (arg1.isPresent() && arg2.isPresent())
+ {
+ Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+ arg1.getLongIdentifier(), arg2.getLongIdentifier());
+ addMessage(buf, message);
+ }
+ }
+
+ if (quietArg.isPresent())
+ {
+ Message message = ERR_REPLICATION_STATUS_QUIET.get(
+ STATUS_REPLICATION_SUBCMD_NAME, "--"+quietArg.getLongIdentifier());
+ addMessage(buf, message);
+ }
+ }
+
+ /**
+ * Checks the initialize replication subcommand options and updates the
+ * provided MessageBuilder with the errors that were encountered with the
+ * subcommand options.
+ *
+ * This method assumes that the method parseArguments for the parser has
+ * already been called.
+ * @param buf the MessageBuilder object where we add the error messages
+ * describing the errors encountered.
+ */
+ private void validateInitializeReplicationOptions(MessageBuilder buf)
+ {
+ // The startTLS and useSSL arguments are already validated in
+ // SecureConnectionCliParser.validateGlobalOptions.
+ if (hostNameSourceArg.getValue().equalsIgnoreCase(
+ hostNameDestinationArg.getValue()) && !isInteractive())
+ {
+ if (portSourceArg.getValue() == portDestinationArg.getValue())
+ {
+ Message message = ERR_REPLICATION_INITIALIZE_SAME_SERVER_PORT.get(
+ hostNameSourceArg.getValue(), portSourceArg.getValue());
+ addMessage(buf, message);
+ }
+ }
+ }
+
+ /**
+ * Adds a message to the provided MessageBuilder.
+ * @param buf the MessageBuilder.
+ * @param message the message to be added.
+ */
+ private void addMessage(MessageBuilder buf, Message message)
+ {
+ if (buf.length() > 0)
+ {
+ buf.append(EOL);
+ }
+ buf.append(message);
+ }
+
+ /**
+ * Returns the default value to be used for the host.
+ * @return the default value to be used for the host.
+ */
+ private String getDefaultHostValue()
+ {
+ if (defaultLocalHostValue == null)
+ {
+ defaultLocalHostValue = UserData.getDefaultHostName();
+ if (defaultLocalHostValue == null)
+ {
+ defaultLocalHostValue = "localhost";
+ }
+ }
+ return defaultLocalHostValue;
+ }
+
+ /**
+ * Returns the SecureConnectionCliArgs object containing the arguments
+ * of this parser.
+ * @return the SecureConnectionCliArgs object containing the arguments
+ * of this parser.
+ */
+ SecureConnectionCliArgs getSecureArgsList()
+ {
+ return secureArgsList;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliException.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliException.java
new file mode 100644
index 0000000..dc2ecee
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliException.java
@@ -0,0 +1,63 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+import org.opends.messages.Message;
+import org.opends.server.types.OpenDsException;
+
+/**
+ * The exception that is thrown during the replication command-line execution.
+ *
+ */
+public class ReplicationCliException extends OpenDsException {
+ private static final long serialVersionUID = -8085682356609610678L;
+ private ReplicationCliReturnCode errorCode;
+
+ /**
+ * The constructor for the exception.
+ * @param message the localized message.
+ * @param errorCode the error code associated with this exception.
+ * @param cause the cause that generated this exception.
+ */
+ ReplicationCliException(Message message, ReplicationCliReturnCode errorCode,
+ Throwable cause)
+ {
+ super(message, cause);
+ this.errorCode = errorCode;
+ }
+
+ /**
+ * Returns the error code associated with this exception.
+ * @return the error code associated with this exception.
+ */
+ public ReplicationCliReturnCode getErrorCode()
+ {
+ return errorCode;
+ }
+}
+
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
new file mode 100644
index 0000000..9631da3
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -0,0 +1,7589 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2007-2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.QuickSetupMessages.*;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.quicksetup.util.Utils.getFirstValue;
+import static org.opends.quicksetup.util.Utils.getThrowableMsg;
+import static org.opends.server.tools.dsreplication.ReplicationCliReturnCode.*;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.naming.NameAlreadyBoundException;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.InitialLdapContext;
+import javax.net.ssl.TrustManager;
+
+import org.opends.admin.ads.ADSContext;
+import org.opends.admin.ads.ADSContextException;
+import org.opends.admin.ads.ReplicaDescriptor;
+import org.opends.admin.ads.ServerDescriptor;
+import org.opends.admin.ads.SuffixDescriptor;
+import org.opends.admin.ads.TopologyCache;
+import org.opends.admin.ads.TopologyCacheException;
+import org.opends.admin.ads.TopologyCacheFilter;
+import org.opends.admin.ads.ADSContext.ADSPropertySyntax;
+import org.opends.admin.ads.ADSContext.AdministratorProperty;
+import org.opends.admin.ads.util.ApplicationTrustManager;
+import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.admin.ads.util.PreferredConnection;
+import org.opends.admin.ads.util.ServerLoader;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.quicksetup.ApplicationException;
+import org.opends.quicksetup.Constants;
+import org.opends.quicksetup.QuickSetupLog;
+import org.opends.quicksetup.ReturnCode;
+import org.opends.quicksetup.event.ProgressUpdateEvent;
+import org.opends.quicksetup.event.ProgressUpdateListener;
+import org.opends.quicksetup.installer.Installer;
+import org.opends.quicksetup.installer.InstallerHelper;
+import org.opends.quicksetup.installer.PeerNotFoundException;
+import org.opends.quicksetup.installer.offline.OfflineInstaller;
+import org.opends.quicksetup.util.PlainTextProgressMessageFormatter;
+import org.opends.quicksetup.util.Utils;
+import org.opends.server.admin.AttributeTypePropertyDefinition;
+import org.opends.server.admin.ClassLoaderProvider;
+import org.opends.server.admin.ClassPropertyDefinition;
+import org.opends.server.admin.DefaultBehaviorException;
+import org.opends.server.admin.ManagedObjectNotFoundException;
+import org.opends.server.admin.client.ManagementContext;
+import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
+import org.opends.server.admin.client.ldap.LDAPManagementContext;
+import org.opends.server.admin.std.client.*;
+import org.opends.server.admin.std.meta.*;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.tools.ClientException;
+import org.opends.server.tools.ToolConstants;
+import org.opends.server.types.DN;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.NullOutputStream;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.SetupUtils;
+import org.opends.server.util.args.ArgumentException;
+import org.opends.server.util.cli.CLIException;
+import org.opends.server.util.cli.ConsoleApplication;
+import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
+import org.opends.server.util.cli.MenuBuilder;
+import org.opends.server.util.cli.MenuResult;
+import org.opends.server.util.table.TableBuilder;
+import org.opends.server.util.table.TextTablePrinter;
+
+/**
+ * This class provides a tool that can be used to enable and disable replication
+ * and also to initialize the contents of a replicated suffix with the contents
+ * of another suffix. It also allows to display the replicated status of the
+ * different base DNs of the servers that are registered in the ADS.
+ */
+public class ReplicationCliMain extends ConsoleApplication
+{
+ /**
+ * The fully-qualified name of this class.
+ */
+ private static final String CLASS_NAME = ReplicationCliMain.class.getName();
+
+ /** Prefix for log files. */
+ static public final String LOG_FILE_PREFIX = "opends-replication-";
+
+ /** Suffix for log files. */
+ static public final String LOG_FILE_SUFFIX = ".log";
+
+ private boolean forceNonInteractive;
+
+ private static final Logger LOG =
+ Logger.getLogger(ReplicationCliMain.class.getName());
+
+ // Always use SSL with the administration connector
+ private boolean useSSL = true;
+ private boolean useStartTLS = false;
+
+ /**
+ * The enumeration containing the different options we display when we ask
+ * the user to provide the subcommand interactively.
+ */
+ private enum SubcommandChoice
+ {
+ /**
+ * Enable replication.
+ */
+ ENABLE(INFO_REPLICATION_ENABLE_MENU_PROMPT.get()),
+ /**
+ * Disable replication.
+ */
+ DISABLE(INFO_REPLICATION_DISABLE_MENU_PROMPT.get()),
+ /**
+ * Initialize replication.
+ */
+ INITIALIZE(INFO_REPLICATION_INITIALIZE_MENU_PROMPT.get()),
+ /**
+ * Initialize All.
+ */
+ INITIALIZE_ALL(INFO_REPLICATION_INITIALIZE_ALL_MENU_PROMPT.get()),
+ /**
+ * Pre external initialization.
+ */
+ PRE_EXTERNAL_INITIALIZATION(
+ INFO_REPLICATION_PRE_EXTERNAL_INITIALIZATION_MENU_PROMPT.get()),
+ /**
+ * Post external initialization.
+ */
+ POST_EXTERNAL_INITIALIZATION(
+ INFO_REPLICATION_POST_EXTERNAL_INITIALIZATION_MENU_PROMPT.get()),
+ /**
+ * Replication status.
+ */
+ STATUS(INFO_REPLICATION_STATUS_MENU_PROMPT.get()),
+ /**
+ * Cancel operation.
+ */
+ CANCEL(null);
+ private Message prompt;
+ private SubcommandChoice(Message prompt)
+ {
+ this.prompt = prompt;
+ }
+ Message getPrompt()
+ {
+ return prompt;
+ }
+ };
+
+ // The argument parser to be used.
+ private ReplicationCliArgumentParser argParser;
+ private LDAPConnectionConsoleInteraction ci = null;
+ // The message formatter
+ PlainTextProgressMessageFormatter formatter =
+ new PlainTextProgressMessageFormatter();
+
+ /**
+ * Constructor for the ReplicationCliMain object.
+ *
+ * @param out the print stream to use for standard output.
+ * @param err the print stream to use for standard error.
+ * @param in the input stream to use for standard input.
+ */
+ public ReplicationCliMain(PrintStream out, PrintStream err, InputStream in)
+ {
+ super(in, out, err);
+ }
+
+ /**
+ * The main method for the replication tool.
+ *
+ * @param args the command-line arguments provided to this program.
+ */
+
+ public static void main(String[] args)
+ {
+ int retCode = mainCLI(args, true, System.out, System.err, System.in);
+
+ System.exit(retCode);
+ }
+
+ /**
+ * Parses the provided command-line arguments and uses that information to
+ * run the replication tool.
+ *
+ * @param args the command-line arguments provided to this program.
+ *
+ * @return The error code.
+ */
+
+ public static int mainCLI(String[] args)
+ {
+ return mainCLI(args, true, System.out, System.err, System.in);
+ }
+
+ /**
+ * Parses the provided command-line arguments and uses that information to
+ * run the replication tool.
+ *
+ * @param args The command-line arguments provided to this
+ * program.
+ * @param initializeServer Indicates whether to initialize the server.
+ * @param outStream The output stream to use for standard output, or
+ * <CODE>null</CODE> if standard output is not
+ * needed.
+ * @param errStream The output stream to use for standard error, or
+ * <CODE>null</CODE> if standard error is not
+ * needed.
+ * @param inStream The input stream to use for standard input.
+ * @return The error code.
+ */
+
+ public static int mainCLI(String[] args, boolean initializeServer,
+ OutputStream outStream, OutputStream errStream, InputStream inStream)
+ {
+ PrintStream out;
+ if (outStream == null)
+ {
+ out = NullOutputStream.printStream();
+ }
+ else
+ {
+ out = new PrintStream(outStream);
+ }
+
+ PrintStream err;
+ if (errStream == null)
+ {
+ err = NullOutputStream.printStream();
+ }
+ else
+ {
+ err = new PrintStream(errStream);
+ }
+
+ try {
+ QuickSetupLog.initLogFileHandler(
+ File.createTempFile(LOG_FILE_PREFIX, LOG_FILE_SUFFIX),
+ "org.opends.guitools.replicationcli");
+ QuickSetupLog.disableConsoleLogging();
+ } catch (Throwable t) {
+ System.err.println("Unable to initialize log");
+ t.printStackTrace();
+ }
+
+ ReplicationCliMain replicationCli = new ReplicationCliMain(out, err,
+ inStream);
+ return replicationCli.execute(args, initializeServer);
+ }
+
+ /**
+ * Parses the provided command-line arguments and uses that information to
+ * run the replication tool.
+ *
+ * @param args the command-line arguments provided to this program.
+ * @param initializeServer Indicates whether to initialize the server.
+ *
+ * @return The error code.
+ */
+ public int execute(String[] args, boolean initializeServer)
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ // Create the command-line argument parser for use with this
+ // program.
+ try
+ {
+ argParser = new ReplicationCliArgumentParser(CLASS_NAME);
+ argParser.initializeParser(getOutputStream());
+ }
+ catch (ArgumentException ae)
+ {
+ Message message =
+ ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
+ println(message);
+ LOG.log(Level.SEVERE, "Complete error stack:", ae);
+ returnValue = CANNOT_INITIALIZE_ARGS;
+ }
+
+ if (returnValue == SUCCESSFUL_NOP)
+ {
+ // Parse the command-line arguments provided to this program.
+ try
+ {
+ argParser.parseArguments(args);
+ }
+ catch (ArgumentException ae)
+ {
+ Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
+
+ println(message);
+ println();
+ println(Message.raw(argParser.getUsage()));
+ LOG.log(Level.SEVERE, "Complete error stack:", ae);
+ returnValue = ERROR_USER_DATA;
+ }
+ }
+
+ if (!argParser.usageOrVersionDisplayed())
+ {
+ if (returnValue == SUCCESSFUL_NOP)
+ {
+ /* Check that the provided parameters are compatible.
+ */
+ MessageBuilder buf = new MessageBuilder();
+ argParser.validateOptions(buf);
+ if (buf.length() > 0)
+ {
+ println(buf.toMessage());
+ println(Message.raw(argParser.getUsage()));
+ returnValue = ERROR_USER_DATA;
+ }
+ }
+ if (initializeServer)
+ {
+ DirectoryServer.bootstrapClient();
+
+ // Bootstrap definition classes.
+ try
+ {
+ ClassLoaderProvider.getInstance().enable();
+ // Switch off class name validation in client.
+ ClassPropertyDefinition.setAllowClassValidation(false);
+
+ // Switch off attribute type name validation in client.
+ AttributeTypePropertyDefinition.setCheckSchema(false);
+ }
+ catch (InitializationException ie)
+ {
+ println(ie.getMessageObject());
+ returnValue = ERROR_INITIALIZING_ADMINISTRATION_FRAMEWORK;
+ }
+ }
+
+ if (returnValue == SUCCESSFUL_NOP)
+ {
+ ci = new LDAPConnectionConsoleInteraction(this,
+ argParser.getSecureArgsList());
+ ci.setDisplayLdapIfSecureParameters(
+ !argParser.isInitializeAllReplicationSubcommand() &&
+ !argParser.isPreExternalInitializationSubcommand() ||
+ !argParser.isPostExternalInitializationSubcommand());
+ }
+ if (returnValue == SUCCESSFUL_NOP)
+ {
+ boolean subcommandLaunched = true;
+ if (argParser.isEnableReplicationSubcommand())
+ {
+ returnValue = enableReplication();
+ }
+ else if (argParser.isDisableReplicationSubcommand())
+ {
+ returnValue = disableReplication();
+ }
+ else if (argParser.isInitializeReplicationSubcommand())
+ {
+ returnValue = initializeReplication();
+ }
+ else if (argParser.isInitializeAllReplicationSubcommand())
+ {
+ returnValue = initializeAllReplication();
+ }
+ else if (argParser.isPreExternalInitializationSubcommand())
+ {
+ returnValue = preExternalInitialization();
+ }
+ else if (argParser.isPostExternalInitializationSubcommand())
+ {
+ returnValue = postExternalInitialization();
+ }
+ else if (argParser.isStatusReplicationSubcommand())
+ {
+ returnValue = statusReplication();
+ }
+ else
+ {
+ if (argParser.isInteractive())
+ {
+ String subCommand = null;
+ switch (promptForSubcommand())
+ {
+ case ENABLE:
+ subCommand =
+ ReplicationCliArgumentParser.ENABLE_REPLICATION_SUBCMD_NAME;
+ break;
+
+ case DISABLE:
+ subCommand =
+ ReplicationCliArgumentParser.DISABLE_REPLICATION_SUBCMD_NAME;
+ break;
+
+ case INITIALIZE:
+ subCommand =
+ ReplicationCliArgumentParser.INITIALIZE_REPLICATION_SUBCMD_NAME;
+ break;
+
+ case INITIALIZE_ALL:
+ subCommand =
+ ReplicationCliArgumentParser.
+ INITIALIZE_ALL_REPLICATION_SUBCMD_NAME;
+ break;
+
+ case PRE_EXTERNAL_INITIALIZATION:
+ subCommand = ReplicationCliArgumentParser.
+ PRE_EXTERNAL_INITIALIZATION_SUBCMD_NAME;
+ break;
+
+ case POST_EXTERNAL_INITIALIZATION:
+ subCommand = ReplicationCliArgumentParser.
+ POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME;
+ break;
+
+ case STATUS:
+ subCommand =
+ ReplicationCliArgumentParser.STATUS_REPLICATION_SUBCMD_NAME;
+ break;
+
+ default:
+ // User cancelled
+ returnValue = USER_CANCELLED;
+ }
+
+ if (subCommand != null)
+ {
+ String[] newArgs = new String[args.length + 1];
+ newArgs[0] = subCommand;
+ for (int i=0; i<args.length ; i++)
+ {
+ newArgs[i+1] = args[i];
+ }
+ // The server (if requested) has already been initialized.
+ return execute(newArgs, false);
+ }
+ }
+ else
+ {
+ println(ERR_REPLICATION_VALID_SUBCOMMAND_NOT_FOUND.get(
+ "--"+ToolConstants.OPTION_LONG_NO_PROMPT));
+ println(Message.raw(argParser.getUsage()));
+ returnValue = ERROR_USER_DATA;
+ subcommandLaunched = false;
+ }
+ }
+
+ // Display the log file only if the operation is successful (when there
+ // is a critical error this is already displayed).
+ if (subcommandLaunched && (returnValue == SUCCESSFUL_NOP))
+ {
+ File logFile = QuickSetupLog.getLogFile();
+ if (logFile != null)
+ {
+ println();
+ println(INFO_GENERAL_SEE_FOR_DETAILS.get(logFile.getPath()));
+ println();
+ }
+ }
+ }
+ }
+ return returnValue.getReturnCode();
+ }
+
+ /**
+ * Based on the data provided in the command-line it enables replication
+ * between two servers.
+ * @return the error code if the operation failed and 0 if it was successful.
+ */
+ private ReplicationCliReturnCode enableReplication()
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ EnableReplicationUserData uData = new EnableReplicationUserData();
+ if (argParser.isInteractive())
+ {
+ try
+ {
+ if (promptIfRequired(uData))
+ {
+ returnValue = enableReplication(uData);
+ }
+ else
+ {
+ returnValue = USER_CANCELLED;
+ }
+ }
+ catch (ReplicationCliException rce)
+ {
+ returnValue = rce.getErrorCode();
+ println();
+ println(getCriticalExceptionMessage(rce));
+ }
+ }
+ else
+ {
+ initializeWithArgParser(uData);
+ returnValue = enableReplication(uData);
+ }
+ return returnValue;
+ }
+
+ /**
+ * Based on the data provided in the command-line it disables replication
+ * in the server.
+ * @return the error code if the operation failed and SUCCESSFUL if it was
+ * successful.
+ */
+ private ReplicationCliReturnCode disableReplication()
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ DisableReplicationUserData uData = new DisableReplicationUserData();
+ if (argParser.isInteractive())
+ {
+ try
+ {
+ if (promptIfRequired(uData))
+ {
+ returnValue = disableReplication(uData);
+ }
+ else
+ {
+ returnValue = USER_CANCELLED;
+ }
+ }
+ catch (ReplicationCliException rce)
+ {
+ returnValue = rce.getErrorCode();
+ println();
+ println(getCriticalExceptionMessage(rce));
+ }
+ }
+ else
+ {
+ initializeWithArgParser(uData);
+ returnValue = disableReplication(uData);
+ }
+ return returnValue;
+ }
+
+ /**
+ * Based on the data provided in the command-line initialize the contents
+ * of the whole replication topology.
+ * @return the error code if the operation failed and SUCCESSFUL if it was
+ * successful.
+ */
+ private ReplicationCliReturnCode initializeAllReplication()
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ InitializeAllReplicationUserData uData =
+ new InitializeAllReplicationUserData();
+ if (argParser.isInteractive())
+ {
+ if (promptIfRequired(uData))
+ {
+ returnValue = initializeAllReplication(uData);
+ }
+ else
+ {
+ returnValue = USER_CANCELLED;
+ }
+ }
+ else
+ {
+ initializeWithArgParser(uData);
+ returnValue = initializeAllReplication(uData);
+ }
+ return returnValue;
+ }
+
+ /**
+ * Based on the data provided in the command-line execute the pre external
+ * initialization operation.
+ * @return the error code if the operation failed and SUCCESSFUL if it was
+ * successful.
+ */
+ private ReplicationCliReturnCode preExternalInitialization()
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ PreExternalInitializationUserData uData =
+ new PreExternalInitializationUserData();
+ if (argParser.isInteractive())
+ {
+ if (promptIfRequired(uData))
+ {
+ returnValue = preExternalInitialization(uData);
+ }
+ else
+ {
+ returnValue = USER_CANCELLED;
+ }
+ }
+ else
+ {
+ initializeWithArgParser(uData);
+ returnValue = preExternalInitialization(uData);
+ }
+ return returnValue;
+ }
+
+ /**
+ * Based on the data provided in the command-line execute the post external
+ * initialization operation.
+ * @return the error code if the operation failed and SUCCESSFUL if it was
+ * successful.
+ */
+ private ReplicationCliReturnCode postExternalInitialization()
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ PostExternalInitializationUserData uData =
+ new PostExternalInitializationUserData();
+ if (argParser.isInteractive())
+ {
+ if (promptIfRequired(uData))
+ {
+ returnValue = postExternalInitialization(uData);
+ }
+ else
+ {
+ returnValue = USER_CANCELLED;
+ }
+ }
+ else
+ {
+ initializeWithArgParser(uData);
+ returnValue = postExternalInitialization(uData);
+ }
+ return returnValue;
+ }
+
+ /**
+ * Based on the data provided in the command-line it displays replication
+ * status.
+ * @return the error code if the operation failed and SUCCESSFUL if it was
+ * successful.
+ */
+ private ReplicationCliReturnCode statusReplication()
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ StatusReplicationUserData uData = new StatusReplicationUserData();
+ if (argParser.isInteractive())
+ {
+ try
+ {
+ if (promptIfRequired(uData))
+ {
+ returnValue = statusReplication(uData);
+ }
+ else
+ {
+ returnValue = USER_CANCELLED;
+ }
+ }
+ catch (ReplicationCliException rce)
+ {
+ returnValue = rce.getErrorCode();
+ println();
+ println(getCriticalExceptionMessage(rce));
+ }
+ }
+ else
+ {
+ initializeWithArgParser(uData);
+ returnValue = statusReplication(uData);
+ }
+ return returnValue;
+ }
+
+ /**
+ * Based on the data provided in the command-line it initializes replication
+ * between two servers.
+ * @return the error code if the operation failed and SUCCESSFUL if it was
+ * successful.
+ */
+ private ReplicationCliReturnCode initializeReplication()
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ InitializeReplicationUserData uData = new InitializeReplicationUserData();
+ if (argParser.isInteractive())
+ {
+ if (promptIfRequired(uData))
+ {
+ returnValue = initializeReplication(uData);
+ }
+ else
+ {
+ returnValue = USER_CANCELLED;
+ }
+ }
+ else
+ {
+ initializeWithArgParser(uData);
+ returnValue = initializeReplication(uData);
+ }
+ return returnValue;
+ }
+
+ /**
+ * Updates the contents of the provided EnableReplicationUserData object
+ * with the information provided in the command-line. If some information
+ * is missing, ask the user to provide valid data.
+ * We assume that if this method is called we are in interactive mode.
+ * @param uData the object to be updated.
+ * @return <CODE>true</CODE> if the object was successfully updated and
+ * <CODE>false</CODE> if the user cancelled the operation.
+ * @throws ReplicationCliException if a critical error occurs reading the
+ * ADS.
+ */
+ private boolean promptIfRequired(EnableReplicationUserData uData)
+ throws ReplicationCliException
+ {
+ boolean cancelled = false;
+
+ boolean administratorDefined = false;
+
+ ci.setUseAdminOrBindDn(true);
+
+ String adminPwd = argParser.getBindPasswordAdmin();
+ String adminUid = argParser.getAdministratorUID();
+
+ /*
+ * Try to connect to the first server.
+ */
+ String host1 = argParser.getHostName1();
+ int port1 = argParser.getPort1();
+ String bindDn1 = argParser.getBindDn1();
+ String pwd1 = argParser.getBindPassword1();
+
+ String pwd = null;
+ if (pwd1 != null)
+ {
+ pwd = pwd1;
+ }
+ else if (bindDn1 != null)
+ {
+ pwd = null;
+ }
+ else
+ {
+ pwd = adminPwd;
+ }
+
+ initializeGlobalArguments(host1, port1, adminUid,
+ bindDn1, pwd);
+ InitialLdapContext ctx1 = null;
+
+ while ((ctx1 == null) && !cancelled)
+ {
+ try
+ {
+ ci.setHeadingMessage(
+ INFO_REPLICATION_ENABLE_HOST1_CONNECTION_PARAMETERS.get());
+ ci.run();
+ host1 = ci.getHostName();
+ port1 = ci.getPortNumber();
+ if (ci.getProvidedAdminUID() != null)
+ {
+ adminUid = ci.getProvidedAdminUID();
+ if (ci.getProvidedBindDN() == null)
+ {
+ // If the explicit bind DN is not null, the password corresponds
+ // to that bind DN. We are in the case where the user provides
+ // bind DN on first server and admin UID globally.
+ adminPwd = ci.getBindPassword();
+ }
+ }
+ bindDn1 = ci.getBindDN();
+ pwd1 = ci.getBindPassword();
+
+ ctx1 = createInitialLdapContextInteracting(ci);
+
+ if (ctx1 == null)
+ {
+ cancelled = true;
+ }
+ }
+ catch (ClientException ce)
+ {
+ LOG.log(Level.WARNING, "Client exception "+ce);
+ println();
+ println(ce.getMessageObject());
+ println();
+ resetConnectionArguments();
+ }
+ catch (ArgumentException ae)
+ {
+ LOG.log(Level.WARNING, "Argument exception "+ae);
+ println();
+ println(ae.getMessageObject());
+ println();
+ cancelled = true;
+ }
+ }
+
+ if (!cancelled)
+ {
+ uData.setHostName1(host1);
+ uData.setPort1(port1);
+ uData.setBindDn1(bindDn1);
+ uData.setPwd1(pwd1);
+ }
+ int replicationPort1 = -1;
+ boolean secureReplication1 = argParser.isSecureReplication1();
+ if (ctx1 != null)
+ {
+ // Try to get the replication port for server 1 only if it is required.
+ if (!hasReplicationPort(ctx1))
+ {
+ boolean tryWithDefault = argParser.getReplicationPort1() != -1;
+ while (replicationPort1 == -1)
+ {
+ if (tryWithDefault)
+ {
+ replicationPort1 = argParser.getReplicationPort1();
+ tryWithDefault = false;
+ }
+ else
+ {
+ replicationPort1 = askPort(
+ INFO_REPLICATION_ENABLE_REPLICATIONPORT1_PROMPT.get(),
+ argParser.getDefaultReplicationPort1());
+ println();
+ }
+ if (!argParser.skipReplicationPortCheck() && isLocalHost(host1))
+ {
+ if (!SetupUtils.canUseAsPort(replicationPort1))
+ {
+ println();
+ println(getCannotBindToPortError(replicationPort1));
+ println();
+ replicationPort1 = -1;
+ }
+ }
+ else
+ {
+ // This is something that we must do in any case... this test is
+ // already included when we call SetupUtils.canUseAsPort
+ if (replicationPort1 == port1)
+ {
+ println();
+ println(
+ ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
+ host1, String.valueOf(replicationPort1)));
+ println();
+ replicationPort1 = -1;
+ }
+ }
+ }
+ if (!secureReplication1)
+ {
+ try
+ {
+ secureReplication1 =
+ askConfirmation(INFO_REPLICATION_ENABLE_SECURE1_PROMPT.get(
+ String.valueOf(replicationPort1)), false, LOG);
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ println();
+ }
+ }
+ // If the server contains an ADS. Try to load it and only load it: if
+ // there are issues with the ADS they will be encountered in the
+ // enableReplication(EnableReplicationUserData) method. Here we have
+ // to load the ADS to ask the user to accept the certificates and
+ // eventually admin authentication data.
+ InitialLdapContext[] aux = new InitialLdapContext[] {ctx1};
+ cancelled = !loadADSAndAcceptCertificates(aux, uData, true);
+ ctx1 = aux[0];
+ if (!cancelled)
+ {
+ administratorDefined |= hasAdministrator(ctx1);
+ if (uData.getAdminPwd() != null)
+ {
+ adminPwd = uData.getAdminPwd();
+ }
+ }
+ }
+ uData.setReplicationPort1(replicationPort1);
+ uData.setSecureReplication1(secureReplication1);
+
+ /*
+ * Prompt for information on the second server.
+ */
+ String host2 = null;
+ int port2 = -1;
+ String bindDn2 = null;
+ String pwd2 = null;
+ ci.resetHeadingDisplayed();
+ if (!cancelled)
+ {
+ host2 = argParser.getHostName2();
+ port2 = argParser.getPort2();
+ bindDn2 = argParser.getBindDn2();
+ pwd2 = argParser.getBindPassword2();
+ if (pwd2 != null)
+ {
+ pwd = pwd2;
+ }
+ else if (bindDn2 != null)
+ {
+ pwd = null;
+ }
+ else
+ {
+ pwd = adminPwd;
+ }
+
+ initializeGlobalArguments(host2, port2, adminUid,
+ bindDn2, pwd);
+ }
+ InitialLdapContext ctx2 = null;
+
+ while ((ctx2 == null) && !cancelled)
+ {
+ try
+ {
+ ci.setHeadingMessage(
+ INFO_REPLICATION_ENABLE_HOST2_CONNECTION_PARAMETERS.get());
+ ci.run();
+ host2 = ci.getHostName();
+ port2 = ci.getPortNumber();
+ if (ci.getProvidedAdminUID() != null)
+ {
+ adminUid = ci.getProvidedAdminUID();
+ if (ci.getProvidedBindDN() == null)
+ {
+ // If the explicit bind DN is not null, the password corresponds
+ // to that bind DN. We are in the case where the user provides
+ // bind DN on first server and admin UID globally.
+ adminPwd = ci.getBindPassword();
+ }
+ }
+ bindDn2 = ci.getBindDN();
+ pwd2 = ci.getBindPassword();
+
+ boolean error = false;
+ if (host1.equalsIgnoreCase(host2))
+ {
+ if (port1 == port2)
+ {
+ port2 = -1;
+ Message message = ERR_REPLICATION_ENABLE_SAME_SERVER_PORT.get(
+ host1, String.valueOf(port1));
+ println();
+ println(message);
+ println();
+ error = true;
+ }
+ }
+
+ if (!error)
+ {
+ ctx2 = createInitialLdapContextInteracting(ci);
+
+ if (ctx2 == null)
+ {
+ cancelled = true;
+ }
+ }
+ }
+ catch (ClientException ce)
+ {
+ LOG.log(Level.WARNING, "Client exception "+ce);
+ println();
+ println(ce.getMessageObject());
+ println();
+ resetConnectionArguments();
+ }
+ catch (ArgumentException ae)
+ {
+ LOG.log(Level.WARNING, "Argument exception "+ae);
+ println();
+ println(ae.getMessageObject());
+ println();
+ cancelled = true;
+ }
+ }
+
+ if (!cancelled)
+ {
+ uData.setHostName2(host2);
+ uData.setPort2(port2);
+ uData.setBindDn2(bindDn2);
+ uData.setPwd2(pwd2);
+ }
+
+ int replicationPort2 = -1;
+ boolean secureReplication2 = argParser.isSecureReplication2();
+ if (ctx2 != null)
+ {
+ if (!hasReplicationPort(ctx2))
+ {
+ boolean tryWithDefault = argParser.getReplicationPort2() != -1;
+ while (replicationPort2 == -1)
+ {
+ if (tryWithDefault)
+ {
+ replicationPort2 = argParser.getReplicationPort2();
+ tryWithDefault = false;
+ }
+ else
+ {
+ replicationPort2 = askPort(
+ INFO_REPLICATION_ENABLE_REPLICATIONPORT2_PROMPT.get(),
+ argParser.getDefaultReplicationPort2());
+ println();
+ }
+ if (!argParser.skipReplicationPortCheck() && isLocalHost(host2))
+ {
+ if (!SetupUtils.canUseAsPort(replicationPort2))
+ {
+ println();
+ println(getCannotBindToPortError(replicationPort2));
+ println();
+ replicationPort2 = -1;
+ }
+ }
+ else
+ {
+ // This is something that we must do in any case... this test is
+ // already included when we call SetupUtils.canUseAsPort
+ if (replicationPort2 == port2)
+ {
+ println();
+ println(
+ ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
+ host2, String.valueOf(replicationPort2)));
+ replicationPort2 = -1;
+ }
+ }
+ if (host1.equalsIgnoreCase(host2))
+ {
+ if ((replicationPort1 > 0) &&
+ (replicationPort1 == replicationPort2))
+ {
+ println();
+ println(ERR_REPLICATION_SAME_REPLICATION_PORT.get(
+ String.valueOf(replicationPort2), host1));
+ println();
+ replicationPort2 = -1;
+ }
+ }
+ }
+ if (!secureReplication2)
+ {
+ try
+ {
+ secureReplication2 =
+ askConfirmation(INFO_REPLICATION_ENABLE_SECURE2_PROMPT.get(
+ String.valueOf(replicationPort2)), false, LOG);
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ println();
+ }
+ }
+ // If the server contains an ADS. Try to load it and only load it: if
+ // there are issues with the ADS they will be encountered in the
+ // enableReplication(EnableReplicationUserData) method. Here we have
+ // to load the ADS to ask the user to accept the certificates.
+ InitialLdapContext[] aux = new InitialLdapContext[] {ctx2};
+ cancelled = !loadADSAndAcceptCertificates(aux, uData, false);
+ ctx2 = aux[0];
+ if (!cancelled)
+ {
+ administratorDefined |= hasAdministrator(ctx2);
+ }
+ }
+ uData.setReplicationPort2(replicationPort2);
+ uData.setSecureReplication2(secureReplication2);
+
+ // If the adminUid and adminPwd are not set in the EnableReplicationUserData
+ // object, that means that there are no administrators and that they
+ // must be created. The adminUId and adminPwd are updated inside
+ // loadADSAndAcceptCertificates.
+ boolean promptedForAdmin = false;
+
+ // There is a case where we haven't had need for the administrator
+ // credentials even if the administrators are defined: where all the servers
+ // can be accessed with another user (for instance if all the server have
+ // defined cn=directory manager and all the entries have the same password).
+ if (!cancelled && (uData.getAdminUid() == null) && !administratorDefined)
+ {
+ if (adminUid == null)
+ {
+ println(INFO_REPLICATION_ENABLE_ADMINISTRATOR_MUST_BE_CREATED.get());
+ promptedForAdmin = true;
+ adminUid= askForAdministratorUID(
+ argParser.getDefaultAdministratorUID());
+ println();
+ }
+ uData.setAdminUid(adminUid);
+ }
+
+ if (uData.getAdminPwd() == null)
+ {
+ uData.setAdminPwd(adminPwd);
+ }
+ if (!cancelled && (uData.getAdminPwd() == null) && !administratorDefined)
+ {
+ adminPwd = null;
+ while (adminPwd == null)
+ {
+ if (!promptedForAdmin)
+ {
+ println();
+ println(INFO_REPLICATION_ENABLE_ADMINISTRATOR_MUST_BE_CREATED.get());
+ println();
+ }
+ while (adminPwd == null)
+ {
+ adminPwd = askForAdministratorPwd();
+ println();
+ }
+ String adminPwdConfirm = null;
+ while (adminPwdConfirm == null)
+ {
+ adminPwdConfirm =
+ readPassword(INFO_ADMINISTRATOR_PWD_CONFIRM_PROMPT.get(), LOG);
+ println();
+ }
+ if (!adminPwd.equals(adminPwdConfirm))
+ {
+ println();
+ println(ERR_ADMINISTRATOR_PWD_DO_NOT_MATCH.get());
+ println();
+ adminPwd = null;
+ }
+ }
+ uData.setAdminPwd(adminPwd);
+ }
+
+ if (!cancelled)
+ {
+ LinkedList<String> suffixes = argParser.getBaseDNs();
+ checkSuffixesForEnableReplication(suffixes, ctx1, ctx2, true);
+ cancelled = suffixes.isEmpty();
+
+ uData.setBaseDNs(suffixes);
+ }
+
+ if (ctx1 != null)
+ {
+ try
+ {
+ ctx1.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ if (ctx2 != null)
+ {
+ try
+ {
+ ctx2.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ uData.setReplicateSchema(!argParser.noSchemaReplication());
+
+ return !cancelled;
+ }
+
+ /**
+ * Updates the contents of the provided DisableReplicationUserData object
+ * with the information provided in the command-line. If some information
+ * is missing, ask the user to provide valid data.
+ * We assume that if this method is called we are in interactive mode.
+ * @param uData the object to be updated.
+ * @return <CODE>true</CODE> if the object was successfully updated and
+ * <CODE>false</CODE> if the user cancelled the operation.
+ * @throws ReplicationCliException if there is a critical error reading the
+ * ADS.
+ */
+ private boolean promptIfRequired(DisableReplicationUserData uData)
+ throws ReplicationCliException
+ {
+ boolean cancelled = false;
+
+ String adminPwd = argParser.getBindPasswordAdmin();
+ String adminUid = argParser.getAdministratorUID();
+ String bindDn = argParser.getBindDNToDisable();
+
+ // This is done because we want to ask explicitly for this
+
+ String host = argParser.getHostNameToDisable();
+ int port = argParser.getPortToDisable();
+
+ /*
+ * Try to connect to the server.
+ */
+ InitialLdapContext ctx = null;
+
+ while ((ctx == null) && !cancelled)
+ {
+ try
+ {
+ ci.setUseAdminOrBindDn(true);
+ ci.run();
+ host = ci.getHostName();
+ port = ci.getPortNumber();
+ bindDn = ci.getProvidedBindDN();
+ adminUid = ci.getProvidedAdminUID();
+ adminPwd = ci.getBindPassword();
+
+ ctx = createInitialLdapContextInteracting(ci);
+
+ if (ctx == null)
+ {
+ cancelled = true;
+ }
+ }
+ catch (ClientException ce)
+ {
+ LOG.log(Level.WARNING, "Client exception "+ce);
+ println();
+ println(ce.getMessageObject());
+ println();
+ resetConnectionArguments();
+ }
+ catch (ArgumentException ae)
+ {
+ LOG.log(Level.WARNING, "Argument exception "+ae);
+ println();
+ println(ae.getMessageObject());
+ println();
+ cancelled = true;
+ }
+ }
+
+ if (!cancelled)
+ {
+ uData.setHostName(host);
+ uData.setPort(port);
+ uData.setAdminUid(adminUid);
+ uData.setBindDn(bindDn);
+ uData.setAdminPwd(adminPwd);
+ }
+ if ((ctx != null) && (adminUid != null))
+ {
+ // If the server contains an ADS, try to load it and only load it: if
+ // there are issues with the ADS they will be encountered in the
+ // disableReplication(DisableReplicationUserData) method. Here we have
+ // to load the ADS to ask the user to accept the certificates and
+ // eventually admin authentication data.
+ InitialLdapContext[] aux = new InitialLdapContext[] {ctx};
+ cancelled = !loadADSAndAcceptCertificates(aux, uData, false);
+ ctx = aux[0];
+ }
+
+ if (!cancelled)
+ {
+ LinkedList<String> suffixes = argParser.getBaseDNs();
+ checkSuffixesForDisableReplication(suffixes, ctx, true);
+ cancelled = suffixes.isEmpty();
+
+ uData.setBaseDNs(suffixes);
+ }
+
+ if (!cancelled)
+ {
+ // Ask for confirmation to disable.
+ boolean disableADS = false;
+ boolean disableSchema = false;
+ for (String dn : uData.getBaseDNs())
+ {
+ if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn))
+ {
+ disableADS = true;
+ }
+ else if (Utils.areDnsEqual(Constants.SCHEMA_DN, dn))
+ {
+ disableSchema = true;
+ }
+ }
+ if (disableADS)
+ {
+ println();
+ try
+ {
+ cancelled = !askConfirmation(INFO_REPLICATION_CONFIRM_DISABLE_ADS.get(
+ ADSContext.getAdministrationSuffixDN()), true, LOG);
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ println();
+ }
+ if (disableSchema)
+ {
+ println();
+ try
+ {
+ cancelled = !askConfirmation(
+ INFO_REPLICATION_CONFIRM_DISABLE_SCHEMA.get(), true, LOG);
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ println();
+ }
+ if (!disableSchema && !disableADS)
+ {
+ println();
+ try
+ {
+ if (disableAllBaseDns(ctx, uData))
+ {
+ cancelled = !askConfirmation(
+ INFO_REPLICATION_CONFIRM_DISABLE_LAST_SUFFIXES.get(), true,
+ LOG);
+ }
+ else
+ {
+ cancelled = !askConfirmation(
+ INFO_REPLICATION_CONFIRM_DISABLE_GENERIC.get(), true, LOG);
+ }
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ println();
+ }
+ }
+
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ return !cancelled;
+ }
+
+ /**
+ * Updates the contents of the provided InitializeAllReplicationUserData
+ * object with the information provided in the command-line. If some
+ * information is missing, ask the user to provide valid data.
+ * We assume that if this method is called we are in interactive mode.
+ * @param uData the object to be updated.
+ * @return <CODE>true</CODE> if the object was successfully updated and
+ * <CODE>false</CODE> if the user cancelled the operation.
+ */
+ private boolean promptIfRequired(InitializeAllReplicationUserData uData)
+ {
+ boolean cancelled = false;
+
+ String adminPwd = argParser.getBindPasswordAdmin();
+ String adminUid = argParser.getAdministratorUID();
+
+ String host = argParser.getHostNameToInitializeAll();
+ int port = argParser.getPortToInitializeAll();
+
+ /*
+ * Try to connect to the server.
+ */
+ InitialLdapContext ctx = null;
+
+ while ((ctx == null) && !cancelled)
+ {
+ try
+ {
+ ci.setHeadingMessage(
+ INFO_REPLICATION_INITIALIZE_SOURCE_CONNECTION_PARAMETERS.get());
+ ci.run();
+ host = ci.getHostName();
+ port = ci.getPortNumber();
+ adminUid = ci.getAdministratorUID();
+ adminPwd = ci.getBindPassword();
+
+ ctx = createInitialLdapContextInteracting(ci);
+
+ if (ctx == null)
+ {
+ cancelled = true;
+ }
+ }
+ catch (ClientException ce)
+ {
+ LOG.log(Level.WARNING, "Client exception "+ce);
+ println();
+ println(ce.getMessageObject());
+ println();
+ resetConnectionArguments();
+ }
+ catch (ArgumentException ae)
+ {
+ LOG.log(Level.WARNING, "Argument exception "+ae);
+ println();
+ println(ae.getMessageObject());
+ println();
+ cancelled = true;
+ }
+ }
+ if (!cancelled)
+ {
+ uData.setHostName(host);
+ uData.setPort(port);
+ uData.setAdminUid(adminUid);
+ uData.setAdminPwd(adminPwd);
+ }
+
+ if (!cancelled)
+ {
+ LinkedList<String> suffixes = argParser.getBaseDNs();
+ checkSuffixesForInitializeReplication(suffixes, ctx, true);
+ cancelled = suffixes.isEmpty();
+
+ uData.setBaseDNs(suffixes);
+ }
+
+ if (!cancelled)
+ {
+ // Ask for confirmation to initialize.
+ boolean initializeADS = false;
+ for (String dn : uData.getBaseDNs())
+ {
+ if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn))
+ {
+ initializeADS = true;
+ }
+ }
+ String hostPortSource = ConnectionUtils.getHostPort(ctx);
+ if (initializeADS)
+ {
+ println();
+ try
+ {
+ cancelled = !askConfirmation(
+ INFO_REPLICATION_CONFIRM_INITIALIZE_ALL_ADS.get(
+ ADSContext.getAdministrationSuffixDN(), hostPortSource), true,
+ LOG);
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ println();
+ }
+ else
+ {
+ println();
+ try
+ {
+ cancelled = !askConfirmation(
+ INFO_REPLICATION_CONFIRM_INITIALIZE_ALL_GENERIC.get(
+ hostPortSource), true, LOG);
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ println();
+ }
+ }
+
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ return !cancelled;
+ }
+
+ /**
+ * Updates the contents of the provided PreExternalInitializationUserData
+ * object with the information provided in the command-line. If some
+ * information is missing, ask the user to provide valid data.
+ * We assume that if this method is called we are in interactive mode.
+ * @param uData the object to be updated.
+ * @return <CODE>true</CODE> if the object was successfully updated and
+ * <CODE>false</CODE> if the user cancelled the operation.
+ */
+ private boolean promptIfRequired(PreExternalInitializationUserData uData)
+ {
+ boolean cancelled = false;
+
+ String adminPwd = argParser.getBindPasswordAdmin();
+ String adminUid = argParser.getAdministratorUID();
+
+ String host = argParser.getHostNameToInitializeAll();
+ int port = argParser.getPortToInitializeAll();
+
+ /*
+ * Try to connect to the server.
+ */
+ InitialLdapContext ctx = null;
+
+ while ((ctx == null) && !cancelled)
+ {
+ try
+ {
+ ci.run();
+ host = ci.getHostName();
+ port = ci.getPortNumber();
+ adminUid = ci.getAdministratorUID();
+ adminPwd = ci.getBindPassword();
+
+ ctx = createInitialLdapContextInteracting(ci);
+
+ if (ctx == null)
+ {
+ cancelled = true;
+ }
+ }
+ catch (ClientException ce)
+ {
+ LOG.log(Level.WARNING, "Client exception "+ce);
+ println();
+ println(ce.getMessageObject());
+ println();
+ resetConnectionArguments();
+ }
+ catch (ArgumentException ae)
+ {
+ LOG.log(Level.WARNING, "Argument exception "+ae);
+ println();
+ println(ae.getMessageObject());
+ println();
+ cancelled = true;
+ }
+ }
+ if (!cancelled)
+ {
+ boolean localOnly = false;
+ if (!argParser.isExternalInitializationLocalOnly())
+ {
+ println();
+ try
+ {
+ localOnly = askConfirmation(
+ INFO_REPLICATION_PRE_EXTERNAL_INITIALIZATION_LOCAL_PROMPT.get(
+ ConnectionUtils.getHostPort(ctx)), false, LOG);
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ }
+ else
+ {
+ localOnly = true;
+ }
+ uData.setLocalOnly(localOnly);
+
+ uData.setHostName(host);
+ uData.setPort(port);
+ uData.setAdminUid(adminUid);
+ uData.setAdminPwd(adminPwd);
+ }
+
+ if (!cancelled)
+ {
+ LinkedList<String> suffixes = argParser.getBaseDNs();
+ checkSuffixesForInitializeReplication(suffixes, ctx, true);
+ cancelled = suffixes.isEmpty();
+
+ uData.setBaseDNs(suffixes);
+ }
+
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ return !cancelled;
+ }
+
+ /**
+ * Updates the contents of the provided PostExternalInitializationUserData
+ * object with the information provided in the command-line. If some
+ * information is missing, ask the user to provide valid data.
+ * We assume that if this method is called we are in interactive mode.
+ * @param uData the object to be updated.
+ * @return <CODE>true</CODE> if the object was successfully updated and
+ * <CODE>false</CODE> if the user cancelled the operation.
+ */
+ private boolean promptIfRequired(PostExternalInitializationUserData uData)
+ {
+ boolean cancelled = false;
+
+ String adminPwd = argParser.getBindPasswordAdmin();
+ String adminUid = argParser.getAdministratorUID();
+
+ String host = argParser.getHostNameToInitializeAll();
+ int port = argParser.getPortToInitializeAll();
+
+ /*
+ * Try to connect to the server.
+ */
+ InitialLdapContext ctx = null;
+
+ while ((ctx == null) && !cancelled)
+ {
+ try
+ {
+ ci.run();
+ host = ci.getHostName();
+ port = ci.getPortNumber();
+ adminUid = ci.getAdministratorUID();
+ adminPwd = ci.getBindPassword();
+
+ ctx = createInitialLdapContextInteracting(ci);
+
+ if (ctx == null)
+ {
+ cancelled = true;
+ }
+ }
+ catch (ClientException ce)
+ {
+ LOG.log(Level.WARNING, "Client exception "+ce);
+ println();
+ println(ce.getMessageObject());
+ println();
+ resetConnectionArguments();
+ }
+ catch (ArgumentException ae)
+ {
+ LOG.log(Level.WARNING, "Argument exception "+ae);
+ println();
+ println(ae.getMessageObject());
+ println();
+ cancelled = true;
+ }
+ }
+ if (!cancelled)
+ {
+ uData.setHostName(host);
+ uData.setPort(port);
+ uData.setAdminUid(adminUid);
+ uData.setAdminPwd(adminPwd);
+ }
+
+ if (!cancelled)
+ {
+ LinkedList<String> suffixes = argParser.getBaseDNs();
+ checkSuffixesForInitializeReplication(suffixes, ctx, true);
+ cancelled = suffixes.isEmpty();
+
+ uData.setBaseDNs(suffixes);
+ }
+
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ return !cancelled;
+ }
+
+ /**
+ * Updates the contents of the provided StatusReplicationUserData object
+ * with the information provided in the command-line. If some information
+ * is missing, ask the user to provide valid data.
+ * We assume that if this method is called we are in interactive mode.
+ * @param uData the object to be updated.
+ * @return <CODE>true</CODE> if the object was successfully updated and
+ * <CODE>false</CODE> if the user cancelled the operation.
+ * @throws ReplicationCliException if a critical error occurs reading the
+ * ADS.
+ */
+ private boolean promptIfRequired(StatusReplicationUserData uData)
+ throws ReplicationCliException
+ {
+ boolean cancelled = false;
+
+ String adminPwd = argParser.getBindPasswordAdmin();
+ String adminUid = argParser.getAdministratorUID();
+
+ String host = argParser.getHostNameToStatus();
+ int port = argParser.getPortToStatus();
+
+ /*
+ * Try to connect to the server.
+ */
+ InitialLdapContext ctx = null;
+
+ while ((ctx == null) && !cancelled)
+ {
+ try
+ {
+ ci.run();
+ host = ci.getHostName();
+ port = ci.getPortNumber();
+ adminUid = ci.getAdministratorUID();
+ adminPwd = ci.getBindPassword();
+
+ ctx = createInitialLdapContextInteracting(ci);
+
+ if (ctx == null)
+ {
+ cancelled = true;
+ }
+ }
+ catch (ClientException ce)
+ {
+ LOG.log(Level.WARNING, "Client exception "+ce);
+ println();
+ println(ce.getMessageObject());
+ println();
+ resetConnectionArguments();
+ }
+ catch (ArgumentException ae)
+ {
+ LOG.log(Level.WARNING, "Argument exception "+ae);
+ println();
+ println(ae.getMessageObject());
+ println();
+ cancelled = true;
+ }
+ }
+ if (!cancelled)
+ {
+ uData.setHostName(host);
+ uData.setPort(port);
+ uData.setAdminUid(adminUid);
+ uData.setAdminPwd(adminPwd);
+ uData.setScriptFriendly(argParser.isScriptFriendly());
+ }
+ if (ctx != null)
+ {
+ // If the server contains an ADS, try to load it and only load it: if
+ // there are issues with the ADS they will be encountered in the
+ // statusReplication(StatusReplicationUserData) method. Here we have
+ // to load the ADS to ask the user to accept the certificates and
+ // eventually admin authentication data.
+ InitialLdapContext[] aux = new InitialLdapContext[] {ctx};
+ cancelled = !loadADSAndAcceptCertificates(aux, uData, false);
+ ctx = aux[0];
+ }
+
+ if (!cancelled)
+ {
+ LinkedList<String> suffixes = argParser.getBaseDNs();
+ uData.setBaseDNs(suffixes);
+ }
+
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ return !cancelled;
+ }
+
+ /**
+ * Updates the contents of the provided InitializeReplicationUserData object
+ * with the information provided in the command-line. If some information
+ * is missing, ask the user to provide valid data.
+ * We assume that if this method is called we are in interactive mode.
+ * @param uData the object to be updated.
+ * @return <CODE>true</CODE> if the object was successfully updated and
+ * <CODE>false</CODE> if the user cancelled the operation.
+ */
+ private boolean promptIfRequired(InitializeReplicationUserData uData)
+ {
+ boolean cancelled = false;
+
+ String adminPwd = argParser.getBindPasswordAdmin();
+ String adminUid = argParser.getAdministratorUID();
+
+ String hostSource = argParser.getHostNameSource();
+ int portSource = argParser.getPortSource();
+
+ initializeGlobalArguments(hostSource, portSource, adminUid, null, adminPwd);
+ /*
+ * Try to connect to the source server.
+ */
+ InitialLdapContext ctxSource = null;
+
+ while ((ctxSource == null) && !cancelled)
+ {
+ try
+ {
+ ci.setHeadingMessage(
+ INFO_REPLICATION_INITIALIZE_SOURCE_CONNECTION_PARAMETERS.get());
+ ci.run();
+ hostSource = ci.getHostName();
+ portSource = ci.getPortNumber();
+ adminUid = ci.getAdministratorUID();
+ adminPwd = ci.getBindPassword();
+
+ ctxSource = createInitialLdapContextInteracting(ci);
+
+ if (ctxSource == null)
+ {
+ cancelled = true;
+ }
+ }
+ catch (ClientException ce)
+ {
+ LOG.log(Level.WARNING, "Client exception "+ce);
+ println();
+ println(ce.getMessageObject());
+ println();
+ resetConnectionArguments();
+ }
+ catch (ArgumentException ae)
+ {
+ LOG.log(Level.WARNING, "Argument exception "+ae);
+ println();
+ println(ae.getMessageObject());
+ println();
+ cancelled = true;
+ }
+ }
+ if (!cancelled)
+ {
+ uData.setHostNameSource(hostSource);
+ uData.setPortSource(portSource);
+ uData.setAdminUid(adminUid);
+ uData.setAdminPwd(adminPwd);
+ }
+
+ /* Prompt for destination server credentials */
+ String hostDestination = argParser.getHostNameDestination();
+ int portDestination = argParser.getPortDestination();
+
+ initializeGlobalArguments(hostDestination, portDestination,
+ adminUid, null, adminPwd);
+ /*
+ * Try to connect to the destination server.
+ */
+ InitialLdapContext ctxDestination = null;
+
+ ci.resetHeadingDisplayed();
+ while ((ctxDestination == null) && !cancelled)
+ {
+ try
+ {
+ ci.setHeadingMessage(
+ INFO_REPLICATION_INITIALIZE_DESTINATION_CONNECTION_PARAMETERS.get());
+ ci.run();
+ hostDestination = ci.getHostName();
+ portDestination = ci.getPortNumber();
+
+ ctxDestination = createInitialLdapContextInteracting(ci);
+
+ if (ctxDestination == null)
+ {
+ cancelled = true;
+ }
+ }
+ catch (ClientException ce)
+ {
+ LOG.log(Level.WARNING, "Client exception "+ce);
+ println();
+ println(ce.getMessageObject());
+ println();
+ resetConnectionArguments();
+ }
+ catch (ArgumentException ae)
+ {
+ LOG.log(Level.WARNING, "Argument exception "+ae);
+ println();
+ println(ae.getMessageObject());
+ println();
+ cancelled = true;
+ }
+ } if (!cancelled)
+ {
+ uData.setHostNameDestination(hostDestination);
+ uData.setPortDestination(portDestination);
+ }
+
+ if (!cancelled)
+ {
+ LinkedList<String> suffixes = argParser.getBaseDNs();
+ checkSuffixesForInitializeReplication(suffixes, ctxSource, ctxDestination,
+ true);
+ cancelled = suffixes.isEmpty();
+
+ uData.setBaseDNs(suffixes);
+ }
+
+ if (!cancelled)
+ {
+ // Ask for confirmation to initialize.
+ boolean initializeADS = false;
+ for (String dn : uData.getBaseDNs())
+ {
+ if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn))
+ {
+ initializeADS = true;
+ break;
+ }
+ }
+ String hostPortSource = ConnectionUtils.getHostPort(ctxSource);
+ String hostPortDestination = ConnectionUtils.getHostPort(ctxDestination);
+
+ if (initializeADS)
+ {
+ println();
+ try
+ {
+ cancelled = !askConfirmation(
+ INFO_REPLICATION_CONFIRM_INITIALIZE_ADS.get(
+ ADSContext.getAdministrationSuffixDN(), hostPortDestination,
+ hostPortSource), true, LOG);
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ println();
+ }
+ else
+ {
+ println();
+ try
+ {
+ cancelled = !askConfirmation(
+ INFO_REPLICATION_CONFIRM_INITIALIZE_GENERIC.get(
+ hostPortDestination, hostPortSource), true, LOG);
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ println();
+ }
+ }
+
+ if (ctxSource != null)
+ {
+ try
+ {
+ ctxSource.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ if (ctxDestination != null)
+ {
+ try
+ {
+ ctxDestination.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ return !cancelled;
+ }
+
+ /**
+ * Commodity method that simply checks if a provided value is null or not,
+ * if it is not <CODE>null</CODE> returns it and if it is <CODE>null</CODE>
+ * returns the provided default value.
+ * @param v the value to analyze.
+ * @param defaultValue the default value.
+ * @return if the provided value is not <CODE>null</CODE> returns it and if it
+ * is <CODE>null</CODE> returns the provided default value.
+ */
+ private String getValue(String v, String defaultValue)
+ {
+ if (v != null)
+ {
+ return v;
+ }
+ else
+ {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Commodity method that simply checks if a provided value is -1 or not,
+ * if it is not -1 returns it and if it is -1 returns the provided default
+ * value.
+ * @param v the value to analyze.
+ * @param defaultValue the default value.
+ * @return if the provided value is not -1 returns it and if it is -1 returns
+ * the provided default value.
+ */
+ private int getValue(int v, int defaultValue)
+ {
+ if (v != -1)
+ {
+ return v;
+ }
+ else
+ {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Returns the trust manager to be used by this application.
+ * @return the trust manager to be used by this application.
+ */
+ private ApplicationTrustManager getTrustManager()
+ {
+ ApplicationTrustManager trust;
+ if (isInteractive())
+ {
+ TrustManager t = ci.getTrustManager();
+ if (t == null)
+ {
+ trust = null;
+ }
+ else if (t instanceof ApplicationTrustManager)
+ {
+ trust = (ApplicationTrustManager)t;
+ }
+ else
+ {
+ trust = new ApplicationTrustManager(ci.getKeyStore());
+ }
+ }
+ else
+ {
+ trust = argParser.getTrustManager();
+ }
+ return trust;
+ }
+
+ /**
+ * Initializes the contents of the provided enable replication user data
+ * object with what was provided in the command-line without prompting to the
+ * user.
+ * @param uData the enable replication user data object to be initialized.
+ */
+ private void initializeWithArgParser(EnableReplicationUserData uData)
+ {
+ uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
+ String adminUid = getValue(argParser.getAdministratorUID(),
+ argParser.getDefaultAdministratorUID());
+ uData.setAdminUid(adminUid);
+ String adminPwd = argParser.getBindPasswordAdmin();
+ uData.setAdminPwd(adminPwd);
+
+ String host1Name = getValue(argParser.getHostName1(),
+ argParser.getDefaultHostName1());
+ uData.setHostName1(host1Name);
+ int port1 = getValue(argParser.getPort1(),
+ argParser.getDefaultPort1());
+ uData.setPort1(port1);
+ String pwd1 = argParser.getBindPassword1();
+ if (pwd1 == null)
+ {
+ uData.setBindDn1(ADSContext.getAdministratorDN(adminUid));
+ uData.setPwd1(adminPwd);
+ }
+ else
+ {
+ // Best-effort: try to use admin, if it does not work, use bind DN.
+ try
+ {
+ InitialLdapContext ctx = createAdministrativeContext(
+ uData.getHostName1(), uData.getPort1(), useSSL,
+ useStartTLS, ADSContext.getAdministratorDN(adminUid),
+ adminPwd, getTrustManager());
+ uData.setBindDn1(ADSContext.getAdministratorDN(adminUid));
+ uData.setPwd1(adminPwd);
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ String bindDn = getValue(argParser.getBindDn1(),
+ argParser.getDefaultBindDn1());
+ uData.setBindDn1(bindDn);
+ uData.setPwd1(pwd1);
+ }
+ }
+ int replicationPort1 = getValue(argParser.getReplicationPort1(),
+ argParser.getDefaultReplicationPort1());
+ uData.setReplicationPort1(replicationPort1);
+ uData.setSecureReplication1(argParser.isSecureReplication1());
+
+ String host2Name = getValue(argParser.getHostName2(),
+ argParser.getDefaultHostName2());
+ uData.setHostName2(host2Name);
+ int port2 = getValue(argParser.getPort2(),
+ argParser.getDefaultPort2());
+ uData.setPort2(port2);
+ String pwd2 = argParser.getBindPassword2();
+ if (pwd2 == null)
+ {
+ uData.setBindDn2(ADSContext.getAdministratorDN(adminUid));
+ uData.setPwd2(adminPwd);
+ }
+ else
+ {
+ // Best-effort: try to use admin, if it does not work, use bind DN.
+ try
+ {
+ InitialLdapContext ctx = createAdministrativeContext(
+ uData.getHostName2(), uData.getPort2(), useSSL,
+ useStartTLS, ADSContext.getAdministratorDN(adminUid),
+ adminPwd, getTrustManager());
+ uData.setBindDn2(ADSContext.getAdministratorDN(adminUid));
+ uData.setPwd2(adminPwd);
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ String bindDn = getValue(argParser.getBindDn2(),
+ argParser.getDefaultBindDn2());
+ uData.setBindDn2(bindDn);
+ uData.setPwd2(pwd2);
+ }
+ }
+ int replicationPort2 = getValue(argParser.getReplicationPort2(),
+ argParser.getDefaultReplicationPort2());
+ uData.setReplicationPort2(replicationPort2);
+ uData.setSecureReplication2(argParser.isSecureReplication2());
+ uData.setReplicateSchema(!argParser.noSchemaReplication());
+ }
+
+ /**
+ * Initializes the contents of the provided initialize replication user data
+ * object with what was provided in the command-line without prompting to the
+ * user.
+ * @param uData the initialize replication user data object to be initialized.
+ */
+ private void initializeWithArgParser(InitializeReplicationUserData uData)
+ {
+ uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
+ String adminUid = getValue(argParser.getAdministratorUID(),
+ argParser.getDefaultAdministratorUID());
+ uData.setAdminUid(adminUid);
+ String adminPwd = argParser.getBindPasswordAdmin();
+ uData.setAdminPwd(adminPwd);
+
+ String hostNameSource = getValue(argParser.getHostNameSource(),
+ argParser.getDefaultHostNameSource());
+ uData.setHostNameSource(hostNameSource);
+ int portSource = getValue(argParser.getPortSource(),
+ argParser.getDefaultPortSource());
+ uData.setPortSource(portSource);
+
+ String hostNameDestination = getValue(
+ argParser.getHostNameDestination(),
+ argParser.getDefaultHostNameDestination());
+ uData.setHostNameDestination(hostNameDestination);
+ int portDestination = getValue(argParser.getPortDestination(),
+ argParser.getDefaultPortDestination());
+ uData.setPortDestination(portDestination);
+ }
+
+ /**
+ * Initializes the contents of the provided disable replication user data
+ * object with what was provided in the command-line without prompting to the
+ * user.
+ * @param uData the disable replication user data object to be initialized.
+ */
+ private void initializeWithArgParser(DisableReplicationUserData uData)
+ {
+ uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
+ String adminUid = argParser.getAdministratorUID();
+ String bindDn = argParser.getBindDN();
+ if ((bindDn == null) && (adminUid == null))
+ {
+ adminUid = argParser.getDefaultAdministratorUID();
+ }
+ uData.setAdminUid(adminUid);
+ uData.setBindDn(bindDn);
+ String adminPwd = argParser.getBindPasswordAdmin();
+ uData.setAdminPwd(adminPwd);
+
+ String hostName = getValue(argParser.getHostNameToDisable(),
+ argParser.getDefaultHostNameToDisable());
+ uData.setHostName(hostName);
+ int port = getValue(argParser.getPortToDisable(),
+ argParser.getDefaultPortToDisable());
+ uData.setPort(port);
+ }
+
+ /**
+ * Initializes the contents of the provided initialize all replication user
+ * data object with what was provided in the command-line without prompting to
+ * the user.
+ * @param uData the initialize all replication user data object to be
+ * initialized.
+ */
+ private void initializeWithArgParser(InitializeAllReplicationUserData uData)
+ {
+ uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
+ String adminUid = getValue(argParser.getAdministratorUID(),
+ argParser.getDefaultAdministratorUID());
+ uData.setAdminUid(adminUid);
+ String adminPwd = argParser.getBindPasswordAdmin();
+ uData.setAdminPwd(adminPwd);
+
+ String hostName = getValue(argParser.getHostNameToInitializeAll(),
+ argParser.getDefaultHostNameToInitializeAll());
+ uData.setHostName(hostName);
+ int port = getValue(argParser.getPortToInitializeAll(),
+ argParser.getDefaultPortToInitializeAll());
+ uData.setPort(port);
+ }
+
+ /**
+ * Initializes the contents of the provided pre external replication user
+ * data object with what was provided in the command-line without prompting to
+ * the user.
+ * @param uData the pre external replication user data object to be
+ * initialized.
+ */
+ private void initializeWithArgParser(PreExternalInitializationUserData uData)
+ {
+ uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
+ String adminUid = getValue(argParser.getAdministratorUID(),
+ argParser.getDefaultAdministratorUID());
+ uData.setAdminUid(adminUid);
+ String adminPwd = argParser.getBindPasswordAdmin();
+ uData.setAdminPwd(adminPwd);
+
+ String hostName = getValue(argParser.getHostNameToInitializeAll(),
+ argParser.getDefaultHostNameToInitializeAll());
+ uData.setHostName(hostName);
+ int port = getValue(argParser.getPortToInitializeAll(),
+ argParser.getDefaultPortToInitializeAll());
+ uData.setPort(port);
+ uData.setLocalOnly(argParser.isExternalInitializationLocalOnly());
+ }
+
+ /**
+ * Initializes the contents of the provided post external replication user
+ * data object with what was provided in the command-line without prompting to
+ * the user.
+ * @param uData the pre external replication user data object to be
+ * initialized.
+ */
+ private void initializeWithArgParser(PostExternalInitializationUserData uData)
+ {
+ uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
+ String adminUid = getValue(argParser.getAdministratorUID(),
+ argParser.getDefaultAdministratorUID());
+ uData.setAdminUid(adminUid);
+ String adminPwd = argParser.getBindPasswordAdmin();
+ uData.setAdminPwd(adminPwd);
+
+ String hostName = getValue(argParser.getHostNameToInitializeAll(),
+ argParser.getDefaultHostNameToInitializeAll());
+ uData.setHostName(hostName);
+ int port = getValue(argParser.getPortToInitializeAll(),
+ argParser.getDefaultPortToInitializeAll());
+ uData.setPort(port);
+ }
+
+
+ /**
+ * Initializes the contents of the provided status replication user data
+ * object with what was provided in the command-line without prompting to the
+ * user.
+ * @param uData the disable replication user data object to be initialized.
+ */
+ private void initializeWithArgParser(StatusReplicationUserData uData)
+ {
+ uData.setBaseDNs(new LinkedList<String>(argParser.getBaseDNs()));
+ String adminUid = getValue(argParser.getAdministratorUID(),
+ argParser.getDefaultAdministratorUID());
+ uData.setAdminUid(adminUid);
+ String adminPwd = argParser.getBindPasswordAdmin();
+ uData.setAdminPwd(adminPwd);
+
+ String hostName = getValue(argParser.getHostNameToStatus(),
+ argParser.getDefaultHostNameToStatus());
+ uData.setHostName(hostName);
+ int port = getValue(argParser.getPortToStatus(),
+ argParser.getDefaultPortToStatus());
+ uData.setPort(port);
+
+ uData.setScriptFriendly(argParser.isScriptFriendly());
+ }
+
+ /**
+ * Tells whether the server to which the LdapContext is connected has a
+ * replication port or not.
+ * @param ctx the InitialLdapContext to be used.
+ * @return <CODE>true</CODE> if the replication port for the server could
+ * be found and <CODE>false</CODE> otherwise.
+ */
+ private boolean hasReplicationPort(InitialLdapContext ctx)
+ {
+ return getReplicationPort(ctx) != -1;
+ }
+
+ /**
+ * Returns the replication port of server to which the LdapContext is
+ * connected and -1 if the replication port could not be found.
+ * @param ctx the InitialLdapContext to be used.
+ * @return the replication port of server to which the LdapContext is
+ * connected and -1 if the replication port could not be found.
+ */
+ private int getReplicationPort(InitialLdapContext ctx)
+ {
+ int replicationPort = -1;
+ try
+ {
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+
+ ReplicationSynchronizationProviderCfgClient sync = null;
+ sync = (ReplicationSynchronizationProviderCfgClient)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+ if (sync.hasReplicationServer())
+ {
+ ReplicationServerCfgClient replicationServer =
+ sync.getReplicationServer();
+ replicationPort = replicationServer.getReplicationPort();
+ }
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING,
+ "Unexpected error retrieving the replication port: "+t, t);
+ }
+ return replicationPort;
+ }
+
+ /**
+ * Loads the ADS with the provided context. If there are certificates to
+ * be accepted we prompt them to the user. If there are errors loading the
+ * servers we display them to the user and we ask for confirmation. If the
+ * provided ctx is not using Global Administrator credentials, we prompt the
+ * user to provide them and update the provide ReplicationUserData
+ * accordingly.
+ * @param ctx the Ldap context to be used in an array: note the context
+ * may be modified with the new credentials provided by the user.
+ * @param uData the ReplicationUserData to be udpated.
+ * @param isFirstOrSourceServer whether this is the first server in the
+ * enable replication subcommand or the source server in the initialize server
+ * subcommand.
+ * @throws ReplicationCliException if a critical error occurred.
+ * @return <CODE>true</CODE> if everything went fine and the user accepted
+ * all the certificates and confirmed everything. Returns <CODE>false</CODE>
+ * if the user did not accept a certificate or any of the confirmation
+ * messages.
+ */
+ private boolean loadADSAndAcceptCertificates(InitialLdapContext[] ctx,
+ ReplicationUserData uData, boolean isFirstOrSourceServer)
+ throws ReplicationCliException
+ {
+ boolean cancelled = false;
+ boolean triedWithUserProvidedAdmin = false;
+ String host = ConnectionUtils.getHostName(ctx[0]);
+ int port = ConnectionUtils.getPort(ctx[0]);
+ boolean isSSL = ConnectionUtils.isSSL(ctx[0]);
+ boolean isStartTLS = ConnectionUtils.isStartTLS(ctx[0]);
+ if (getTrustManager() == null)
+ {
+ // This is required when the user did connect to the server using SSL or
+ // Start TLS. In this case LDAPConnectionInteraction.run does not
+ // initialize the keystore and the trust manager is null.
+ forceTrustManagerInitialization();
+ }
+ try
+ {
+ ADSContext adsContext = new ADSContext(ctx[0]);
+ if (adsContext.hasAdminData())
+ {
+ boolean reloadTopology = true;
+ LinkedList<Message> exceptionMsgs = new LinkedList<Message>();
+ while (reloadTopology && !cancelled)
+ {
+ // We must recreate the cache because the trust manager in the
+ // LDAPConnectionConsoleInteraction object might have changed.
+
+ TopologyCache cache = new TopologyCache(adsContext,
+ getTrustManager());
+ cache.getFilter().setSearchMonitoringInformation(false);
+ cache.getFilter().setSearchBaseDNInformation(false);
+ cache.setPreferredConnections(getPreferredConnections(ctx[0]));
+ cache.reloadTopology();
+
+ reloadTopology = false;
+ exceptionMsgs.clear();
+
+ /* Analyze if we had any exception while loading servers. For the
+ * moment only throw the exception found if the user did not provide
+ * the Administrator DN and this caused a problem authenticating in
+ * one server or if there is a certificate problem.
+ */
+ Set<TopologyCacheException> exceptions =
+ new HashSet<TopologyCacheException>();
+ Set<ServerDescriptor> servers = cache.getServers();
+ for (ServerDescriptor server : servers)
+ {
+ TopologyCacheException e = server.getLastException();
+ if (e != null)
+ {
+ exceptions.add(e);
+ }
+ }
+ /* Check the exceptions and see if we throw them or not. */
+ boolean notGlobalAdministratorError = false;
+ for (TopologyCacheException e : exceptions)
+ {
+ if (notGlobalAdministratorError)
+ {
+ break;
+ }
+ switch (e.getType())
+ {
+ case NOT_GLOBAL_ADMINISTRATOR:
+ notGlobalAdministratorError = true;
+ boolean connected = false;
+
+ String adminUid = uData.getAdminUid();
+ String adminPwd = uData.getAdminPwd();
+
+ boolean errorDisplayed = false;
+ while (!connected)
+ {
+ if ((!triedWithUserProvidedAdmin) && (adminPwd == null))
+ {
+ adminUid = getValue(argParser.getAdministratorUID(),
+ argParser.getDefaultAdministratorUID());
+ adminPwd = argParser.getBindPasswordAdmin();
+ triedWithUserProvidedAdmin = true;
+ }
+ if (adminPwd == null)
+ {
+ if (!errorDisplayed)
+ {
+ println();
+ println(
+ INFO_NOT_GLOBAL_ADMINISTRATOR_PROVIDED.get());
+ errorDisplayed = true;
+ }
+ adminUid = askForAdministratorUID(
+ argParser.getDefaultAdministratorUID());
+ println();
+ adminPwd = askForAdministratorPwd();
+ println();
+ }
+ try
+ {
+ ctx[0].close();
+ }
+ catch (Throwable t)
+ {
+ }
+ try
+ {
+ ctx[0] = createAdministrativeContext(host, port, isSSL,
+ isStartTLS, ADSContext.getAdministratorDN(adminUid),
+ adminPwd, getTrustManager());
+ adsContext = new ADSContext(ctx[0]);
+ cache = new TopologyCache(adsContext, getTrustManager());
+ cache.getFilter().setSearchMonitoringInformation(false);
+ cache.getFilter().setSearchBaseDNInformation(false);
+ cache.setPreferredConnections(
+ getPreferredConnections(ctx[0]));
+ connected = true;
+ }
+ catch (Throwable t)
+ {
+ println();
+ println(
+ ERR_ERROR_CONNECTING_TO_SERVER_PROMPT_AGAIN.get(
+ host+":"+port, t.getMessage()));
+ LOG.log(Level.WARNING, "Complete error stack:", t);
+ println();
+ }
+ }
+ uData.setAdminUid(adminUid);
+ uData.setAdminPwd(adminPwd);
+ if (uData instanceof EnableReplicationUserData)
+ {
+ EnableReplicationUserData enableData =
+ (EnableReplicationUserData)uData;
+ if (isFirstOrSourceServer)
+ {
+ enableData.setBindDn1(
+ ADSContext.getAdministratorDN(adminUid));
+ enableData.setPwd1(adminPwd);
+ }
+ else
+ {
+ enableData.setBindDn2(
+ ADSContext.getAdministratorDN(adminUid));
+ enableData.setPwd2(adminPwd);
+ }
+ }
+ reloadTopology = true;
+ break;
+ case GENERIC_CREATING_CONNECTION:
+ if ((e.getCause() != null) &&
+ Utils.isCertificateException(e.getCause()))
+ {
+ reloadTopology = true;
+ cancelled = !ci.promptForCertificateConfirmation(e.getCause(),
+ e.getTrustManager(), e.getLdapUrl(), true, LOG);
+ }
+ else
+ {
+ exceptionMsgs.add(Utils.getMessage(e));
+ }
+ break;
+ default:
+ exceptionMsgs.add(Utils.getMessage(e));
+ }
+ }
+ }
+ if ((exceptionMsgs.size() > 0) && !cancelled)
+ {
+ if (uData instanceof StatusReplicationUserData)
+ {
+ println(
+ ERR_REPLICATION_STATUS_READING_REGISTERED_SERVERS.get(
+ Utils.getMessageFromCollection(exceptionMsgs,
+ Constants.LINE_SEPARATOR).toString()));
+ println();
+ }
+ else
+ {
+ try
+ {
+ cancelled = !askConfirmation(
+ ERR_REPLICATION_READING_REGISTERED_SERVERS_CONFIRM_UPDATE_REMOTE.
+ get(Utils.getMessageFromCollection(exceptionMsgs,
+ Constants.LINE_SEPARATOR).toString()), true, LOG);
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ cancelled = true;
+ }
+ }
+ }
+ }
+ }
+ catch (ADSContextException ace)
+ {
+ LOG.log(Level.SEVERE, "Complete error stack:", ace);
+ throw new ReplicationCliException(
+ ERR_REPLICATION_READING_ADS.get(ace.getMessage()),
+ ERROR_READING_ADS, ace);
+ }
+ catch (TopologyCacheException tce)
+ {
+ LOG.log(Level.SEVERE, "Complete error stack:", tce);
+ throw new ReplicationCliException(
+ ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
+ ERROR_READING_TOPOLOGY_CACHE, tce);
+ }
+ return !cancelled;
+ }
+
+ /**
+ * Tells whether there is a Global Administrator defined in the server
+ * to which the InitialLdapContext is connected.
+ * @param ctx the InitialLdapContext.
+ * @return <CODE>true</CODE> if we could find an administrator and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean hasAdministrator(InitialLdapContext ctx)
+ {
+ boolean isAdminDefined = false;
+ try
+ {
+ ADSContext adsContext = new ADSContext(ctx);
+ if (adsContext.hasAdminData())
+ {
+ Set administrators = adsContext.readAdministratorRegistry();
+ isAdminDefined = administrators.size() > 0;
+ }
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING,
+ "Unexpected error retrieving the ADS data: "+t, t);
+ }
+ return isAdminDefined;
+ }
+
+ /**
+ * Tells whether there is a Global Administrator corresponding to the provided
+ * ReplicationUserData defined in the server to which the InitialLdapContext
+ * is connected.
+ * @param ctx the InitialLdapContext.
+ * @param uData the user data
+ * @return <CODE>true</CODE> if we could find an administrator and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean hasAdministrator(InitialLdapContext ctx,
+ ReplicationUserData uData)
+ {
+ boolean isAdminDefined = false;
+ String adminUid = uData.getAdminUid();
+ try
+ {
+ ADSContext adsContext = new ADSContext(ctx);
+ Set<Map<AdministratorProperty, Object>> administrators =
+ adsContext.readAdministratorRegistry();
+ for (Map<AdministratorProperty, Object> admin : administrators)
+ {
+ String uid = (String)admin.get(AdministratorProperty.UID);
+ if (uid != null)
+ {
+ // If the administrator UID is null it means that we are just
+ // checking for the existence of an administrator
+ isAdminDefined = uid.equalsIgnoreCase(adminUid) || (adminUid == null);
+ if (isAdminDefined)
+ {
+ break;
+ }
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING,
+ "Unexpected error retrieving the ADS data: "+t, t);
+ }
+ return isAdminDefined;
+ }
+
+ /**
+ * Helper type for the <CODE>getCommonSuffixes</CODE> method.
+ */
+ private enum SuffixRelationType
+ {
+ NOT_REPLICATED, FULLY_REPLICATED, REPLICATED, NOT_FULLY_REPLICATED, ALL
+ }
+
+ /**
+ * Returns a Collection containing a list of suffixes that are defined in
+ * two servers at the same time (depending on the value of the argument
+ * replicated this list contains only the suffixes that are replicated
+ * between the servers or the list of suffixes that are not replicated
+ * between the servers).
+ * @param ctx1 the connection to the first server.
+ * @param ctx2 the connection to the second server.
+ * @param type whether to return a list with the suffixes that are
+ * replicated, fully replicated (replicas have exactly the same list of
+ * replication servers), not replicated or all the common suffixes.
+ * @return a Collection containing a list of suffixes that are replicated
+ * (or those that can be replicated) in two servers.
+ */
+ private Collection<String> getCommonSuffixes(
+ InitialLdapContext ctx1, InitialLdapContext ctx2, SuffixRelationType type)
+ {
+ LinkedList<String> suffixes = new LinkedList<String>();
+ try
+ {
+ TopologyCacheFilter filter = new TopologyCacheFilter();
+ filter.setSearchMonitoringInformation(false);
+ ServerDescriptor server1 =
+ ServerDescriptor.createStandalone(ctx1, filter);
+ ServerDescriptor server2 =
+ ServerDescriptor.createStandalone(ctx2, filter);
+ Set<ReplicaDescriptor> replicas1 = server1.getReplicas();
+ Set<ReplicaDescriptor> replicas2 = server2.getReplicas();
+
+ for (ReplicaDescriptor rep1 : replicas1)
+ {
+ for (ReplicaDescriptor rep2 : replicas2)
+ {
+
+ switch (type)
+ {
+ case NOT_REPLICATED:
+ if (!areReplicated(rep1, rep2) &&
+ Utils.areDnsEqual(rep1.getSuffix().getDN(),
+ rep2.getSuffix().getDN()))
+ {
+ suffixes.add(rep1.getSuffix().getDN());
+ }
+ break;
+ case FULLY_REPLICATED:
+ if (areFullyReplicated(rep1, rep2))
+ {
+ suffixes.add(rep1.getSuffix().getDN());
+ }
+ break;
+ case REPLICATED:
+ if (areReplicated(rep1, rep2))
+ {
+ suffixes.add(rep1.getSuffix().getDN());
+ }
+ break;
+ case NOT_FULLY_REPLICATED:
+ if (!areFullyReplicated(rep1, rep2) &&
+ Utils.areDnsEqual(rep1.getSuffix().getDN(),
+ rep2.getSuffix().getDN()))
+ {
+ suffixes.add(rep1.getSuffix().getDN());
+ }
+ break;
+ case ALL:
+ if (Utils.areDnsEqual(rep1.getSuffix().getDN(),
+ rep2.getSuffix().getDN()))
+ {
+ suffixes.add(rep1.getSuffix().getDN());
+ }
+ break;
+ default:
+ throw new IllegalStateException("Unknown type: "+type);
+ }
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING,
+ "Unexpected error retrieving the server configuration: "+t, t);
+ }
+ return suffixes;
+ }
+
+ /**
+ * Tells whether the two provided replicas are fully replicated or not. The
+ * code in fact checks that both replicas have the same DN that they are
+ * replicated if both servers are replication servers and that both replicas
+ * make reference to the other replication server.
+ * @param rep1 the first replica.
+ * @param rep2 the second replica.
+ * @return <CODE>true</CODE> if we can assure that the two replicas are
+ * replicated using the replication server and replication port information
+ * and <CODE>false</CODE> otherwise.
+ */
+ private boolean areFullyReplicated(ReplicaDescriptor rep1,
+ ReplicaDescriptor rep2)
+ {
+ boolean areFullyReplicated = false;
+ if (Utils.areDnsEqual(rep1.getSuffix().getDN(), rep2.getSuffix().getDN()) &&
+ rep1.isReplicated() && rep2.isReplicated() &&
+ rep1.getServer().isReplicationServer() &&
+ rep2.getServer().isReplicationServer())
+ {
+ Set<String> servers1 = rep1.getReplicationServers();
+ Set<String> servers2 = rep2.getReplicationServers();
+ String server1 = rep1.getServer().getReplicationServerHostPort();
+ String server2 = rep2.getServer().getReplicationServerHostPort();
+ areFullyReplicated = servers1.contains(server2) &&
+ servers2.contains(server1);
+ }
+ return areFullyReplicated;
+ }
+
+ /**
+ * Tells whether the two provided replicas are replicated or not. The
+ * code in fact checks that both replicas have the same DN and that they
+ * have at least one common replication server referenced.
+ * @param rep1 the first replica.
+ * @param rep2 the second replica.
+ * @return <CODE>true</CODE> if we can assure that the two replicas are
+ * replicated and <CODE>false</CODE> otherwise.
+ */
+ private boolean areReplicated(ReplicaDescriptor rep1, ReplicaDescriptor rep2)
+ {
+ boolean areReplicated = false;
+ if (Utils.areDnsEqual(rep1.getSuffix().getDN(), rep2.getSuffix().getDN()) &&
+ rep1.isReplicated() && rep2.isReplicated())
+ {
+ Set<String> servers1 = rep1.getReplicationServers();
+ Set<String> servers2 = rep2.getReplicationServers();
+ servers1.retainAll(servers2);
+ areReplicated = !servers1.isEmpty();
+ }
+ return areReplicated;
+ }
+
+ /**
+ * Returns a Collection containing a list of replicas in a server.
+ * @param ctx the connection to the server.
+ * @return a Collection containing a list of replicas in a server.
+ */
+ private Collection<ReplicaDescriptor> getReplicas(InitialLdapContext ctx)
+ {
+ LinkedList<ReplicaDescriptor> suffixes =
+ new LinkedList<ReplicaDescriptor>();
+ TopologyCacheFilter filter = new TopologyCacheFilter();
+ filter.setSearchMonitoringInformation(false);
+ try
+ {
+ ServerDescriptor server = ServerDescriptor.createStandalone(ctx, filter);
+ suffixes.addAll(server.getReplicas());
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING,
+ "Unexpected error retrieving the server configuration: "+t, t);
+ }
+ return suffixes;
+ }
+
+ /**
+ * Enables the replication between two servers using the parameters in the
+ * provided EnableReplicationUserData. This method does not prompt to the
+ * user for information if something is missing.
+ * @param uData the EnableReplicationUserData object.
+ * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
+ * successful and the replication could be enabled and an error code
+ * otherwise.
+ */
+ private ReplicationCliReturnCode enableReplication(
+ EnableReplicationUserData uData)
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ InitialLdapContext ctx1 = null;
+ InitialLdapContext ctx2 = null;
+
+ String host1 = uData.getHostName1();
+ String host2 = uData.getHostName2();
+ int port1 = uData.getPort1();
+ int port2 = uData.getPort2();
+
+ LinkedList<Message> errorMessages = new LinkedList<Message>();
+
+ printlnProgress();
+ printProgress(
+ formatter.getFormattedWithPoints(INFO_REPLICATION_CONNECTING.get()));
+ try
+ {
+ ctx1 = createAdministrativeContext(host1, port1, useSSL,
+ useStartTLS, uData.getBindDn1(), uData.getPwd1(),
+ getTrustManager());
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = host1+":"+port1;
+ errorMessages.add(getMessageForException(ne, hostPort));
+
+ LOG.log(Level.SEVERE, "Complete error stack:", ne);
+ }
+ try
+ {
+ ctx2 = createAdministrativeContext(host2, port2, useSSL,
+ useStartTLS, uData.getBindDn2(), uData.getPwd2(),
+ getTrustManager());
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = host2+":"+port2;
+ errorMessages.add(getMessageForException(ne, hostPort));
+
+ LOG.log(Level.SEVERE, "Complete error stack:", ne);
+ }
+
+ if (errorMessages.size() > 0)
+ {
+ returnValue = ERROR_CONNECTING;
+ }
+
+ if (errorMessages.isEmpty())
+ {
+ // This done is for the message informing that we are connecting.
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+
+// If we are not in interactive mode do some checks...
+ if (!argParser.isInteractive())
+ {
+ boolean hasReplicationPort1 = hasReplicationPort(ctx1);
+ boolean hasReplicationPort2 = hasReplicationPort(ctx2);
+ int replPort1 = uData.getReplicationPort1();
+ int replPort2 = uData.getReplicationPort2();
+
+ if (!hasReplicationPort1)
+ {
+ if (!argParser.skipReplicationPortCheck() &&
+ isLocalHost(host1) &&
+ !SetupUtils.canUseAsPort(replPort1))
+ {
+ errorMessages.add(getCannotBindToPortError(replPort1));
+ }
+ }
+ if (!hasReplicationPort2)
+ {
+ if (!argParser.skipReplicationPortCheck() &&
+ isLocalHost(host2) &&
+ !SetupUtils.canUseAsPort(replPort2))
+ {
+ errorMessages.add(getCannotBindToPortError(replPort2));
+ }
+ }
+ if (!hasReplicationPort1 && !hasReplicationPort2 &&
+ (replPort1 == replPort2) &&
+ (host1.equalsIgnoreCase(host2)))
+ {
+ errorMessages.add(ERR_REPLICATION_SAME_REPLICATION_PORT.get(
+ String.valueOf(replPort1), host1));
+ }
+
+ if (argParser.skipReplicationPortCheck())
+ {
+ // This is something that we must do in any case... this test is
+ // already included when we call SetupUtils.canUseAsPort
+ if (replPort1 == port1)
+ {
+ errorMessages.add(
+ ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
+ host1, String.valueOf(replPort1)));
+ }
+
+ if (replPort2 == port2)
+ {
+ errorMessages.add(
+ ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
+ host2, String.valueOf(replPort2)));
+ }
+ }
+ }
+ if (errorMessages.size() > 0)
+ {
+ returnValue = ERROR_USER_DATA;
+ }
+ }
+
+ if (errorMessages.isEmpty())
+ {
+ LinkedList<String> suffixes = uData.getBaseDNs();
+ checkSuffixesForEnableReplication(suffixes, ctx1, ctx2, false);
+ if (!suffixes.isEmpty())
+ {
+ uData.setBaseDNs(suffixes);
+ try
+ {
+ updateConfiguration(ctx1, ctx2, uData);
+ returnValue = SUCCESSFUL;
+ }
+ catch (ReplicationCliException rce)
+ {
+ returnValue = rce.getErrorCode();
+ println();
+ println(getCriticalExceptionMessage(rce));
+ LOG.log(Level.SEVERE, "Complete error stack:", rce);
+ }
+ }
+ else
+ {
+ // The error messages are already displayed in the method
+ // checkSuffixesForEnableReplication.
+ returnValue = REPLICATION_CANNOT_BE_ENABLED_ON_BASEDN;
+ }
+ }
+
+ for (Message msg : errorMessages)
+ {
+ println();
+ println(msg);
+ }
+
+ if (returnValue == SUCCESSFUL)
+ {
+ long time1 = Utils.getServerClock(ctx1);
+ long time2 = Utils.getServerClock(ctx2);
+ if ((time1 != -1) && (time2 != -1))
+ {
+ if (Math.abs(time1 - time2) >
+ (Installer.WARNING_CLOCK_DIFFERENCE_THRESOLD_MINUTES * 60 * 1000))
+ {
+ println(INFO_WARNING_SERVERS_CLOCK_DIFFERENCE.get(
+ ConnectionUtils.getHostPort(ctx1),
+ ConnectionUtils.getHostPort(ctx2),
+ String.valueOf(
+ Installer.WARNING_CLOCK_DIFFERENCE_THRESOLD_MINUTES)));
+ }
+ }
+ printlnProgress();
+ printProgress(INFO_REPLICATION_POST_ENABLE_INFO.get("dsreplication",
+ ReplicationCliArgumentParser.INITIALIZE_REPLICATION_SUBCMD_NAME));
+ printlnProgress();
+ }
+
+ if (ctx1 != null)
+ {
+ try
+ {
+ ctx1.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ if (ctx2 != null)
+ {
+ try
+ {
+ ctx2.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ return returnValue;
+ }
+
+ /**
+ * Disbles the replication in the server for the provided suffixes using the
+ * data in the DisableReplicationUserData object. This method does not prompt
+ * to the user for information if something is missing.
+ * @param uData the DisableReplicationUserData object.
+ * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
+ * successful and an error code otherwise.
+ */
+ private ReplicationCliReturnCode disableReplication(
+ DisableReplicationUserData uData)
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ InitialLdapContext ctx = null;
+ printProgress(
+ formatter.getFormattedWithPoints(INFO_REPLICATION_CONNECTING.get()));
+ String bindDn = uData.getAdminUid() == null ? uData.getBindDn() :
+ ADSContext.getAdministratorDN(uData.getAdminUid());
+ try
+ {
+ ctx = createAdministrativeContext(uData.getHostName(), uData.getPort(),
+ useSSL, useStartTLS, bindDn, uData.getAdminPwd(),
+ getTrustManager());
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = uData.getHostName()+":"+uData.getPort();
+ println();
+ println(getMessageForException(ne, hostPort));
+ LOG.log(Level.SEVERE, "Complete error stack:", ne);
+ }
+
+ if (ctx != null)
+ {
+ // This done is for the message informing that we are connecting.
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ LinkedList<String> suffixes = uData.getBaseDNs();
+ checkSuffixesForDisableReplication(suffixes, ctx, false);
+ if (!suffixes.isEmpty())
+ {
+ uData.setBaseDNs(suffixes);
+ try
+ {
+ updateConfiguration(ctx, uData);
+ returnValue = SUCCESSFUL;
+ }
+ catch (ReplicationCliException rce)
+ {
+ returnValue = rce.getErrorCode();
+ println();
+ println(getCriticalExceptionMessage(rce));
+ LOG.log(Level.SEVERE, "Complete error stack:", rce);
+ }
+ }
+ else
+ {
+ returnValue = REPLICATION_CANNOT_BE_DISABLED_ON_BASEDN;
+ }
+ }
+ else
+ {
+ returnValue = ERROR_CONNECTING;
+ }
+
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ return returnValue;
+ }
+
+ /**
+ * Displays the replication status of the baseDNs specified in the
+ * StatusReplicationUserData object. This method does not prompt
+ * to the user for information if something is missing.
+ * @param uData the StatusReplicationUserData object.
+ * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
+ * successful and an error code otherwise.
+ */
+ private ReplicationCliReturnCode statusReplication(
+ StatusReplicationUserData uData)
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ InitialLdapContext ctx = null;
+ try
+ {
+ ctx = createAdministrativeContext(uData.getHostName(), uData.getPort(),
+ useSSL, useStartTLS,
+ ADSContext.getAdministratorDN(uData.getAdminUid()),
+ uData.getAdminPwd(), getTrustManager());
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = uData.getHostName()+":"+uData.getPort();
+ println();
+ println(getMessageForException(ne, hostPort));
+ LOG.log(Level.SEVERE, "Complete error stack:", ne);
+ }
+
+ if (ctx != null)
+ {
+ uData.setBaseDNs(uData.getBaseDNs());
+ try
+ {
+ displayStatus(ctx, uData);
+ returnValue = SUCCESSFUL;
+ }
+ catch (ReplicationCliException rce)
+ {
+ returnValue = rce.getErrorCode();
+ println();
+ println(getCriticalExceptionMessage(rce));
+ LOG.log(Level.SEVERE, "Complete error stack:", rce);
+ }
+ }
+ else
+ {
+ returnValue = ERROR_CONNECTING;
+ }
+
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ return returnValue;
+ }
+
+ /**
+ * Initializes the contents of one server with the contents of the other
+ * using the parameters in the provided InitializeReplicationUserData.
+ * This method does not prompt to the user for information if something is
+ * missing.
+ * @param uData the InitializeReplicationUserData object.
+ * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
+ * successful and an error code otherwise.
+ */
+ private ReplicationCliReturnCode initializeReplication(
+ InitializeReplicationUserData uData)
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ InitialLdapContext ctxSource = null;
+ InitialLdapContext ctxDestination = null;
+ try
+ {
+ ctxSource = createAdministrativeContext(uData.getHostNameSource(),
+ uData.getPortSource(), useSSL,
+ useStartTLS,
+ ADSContext.getAdministratorDN(uData.getAdminUid()),
+ uData.getAdminPwd(), getTrustManager());
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = uData.getHostNameSource()+":"+uData.getPortSource();
+ println();
+ println(getMessageForException(ne, hostPort));
+ LOG.log(Level.SEVERE, "Complete error stack:", ne);
+ }
+ try
+ {
+ ctxDestination = createAdministrativeContext(
+ uData.getHostNameDestination(),
+ uData.getPortDestination(), useSSL,
+ useStartTLS,
+ ADSContext.getAdministratorDN(uData.getAdminUid()),
+ uData.getAdminPwd(), getTrustManager());
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = uData.getHostNameDestination()+":"+
+ uData.getPortDestination();
+ println();
+ println(getMessageForException(ne, hostPort));
+ LOG.log(Level.SEVERE, "Complete error stack:", ne);
+ }
+ if ((ctxSource != null) && (ctxDestination != null))
+ {
+ LinkedList<String> baseDNs = uData.getBaseDNs();
+ checkSuffixesForInitializeReplication(baseDNs, ctxSource, ctxDestination,
+ false);
+ if (!baseDNs.isEmpty())
+ {
+ for (String baseDN : baseDNs)
+ {
+ try
+ {
+ printlnProgress();
+ Message msg = formatter.getFormattedProgress(
+ INFO_PROGRESS_INITIALIZING_SUFFIX.get(baseDN,
+ ConnectionUtils.getHostPort(ctxSource)));
+ printProgress(msg);
+ printlnProgress();
+ initializeSuffix(baseDN, ctxSource, ctxDestination, true);
+ }
+ catch (ReplicationCliException rce)
+ {
+ println();
+ println(getCriticalExceptionMessage(rce));
+ returnValue = rce.getErrorCode();
+ LOG.log(Level.SEVERE, "Complete error stack:", rce);
+ }
+ }
+ }
+ else
+ {
+ returnValue = REPLICATION_CANNOT_BE_INITIALIZED_ON_BASEDN;
+ }
+ }
+ else
+ {
+ returnValue = ERROR_CONNECTING;
+ }
+
+ if (ctxSource != null)
+ {
+ try
+ {
+ ctxSource.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ if (ctxDestination != null)
+ {
+ try
+ {
+ ctxDestination.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ return returnValue;
+ }
+
+ /**
+ * Initializes the contents of a whole topology with the contents of the other
+ * using the parameters in the provided InitializeAllReplicationUserData.
+ * This method does not prompt to the user for information if something is
+ * missing.
+ * @param uData the InitializeAllReplicationUserData object.
+ * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
+ * successful and an error code otherwise.
+ */
+ private ReplicationCliReturnCode initializeAllReplication(
+ InitializeAllReplicationUserData uData)
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ InitialLdapContext ctx = null;
+ try
+ {
+ ctx = createAdministrativeContext(uData.getHostName(), uData.getPort(),
+ useSSL, useStartTLS,
+ ADSContext.getAdministratorDN(uData.getAdminUid()),
+ uData.getAdminPwd(), getTrustManager());
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = uData.getHostName()+":"+uData.getPort();
+ println();
+ println(getMessageForException(ne, hostPort));
+ LOG.log(Level.SEVERE, "Complete error stack:", ne);
+ }
+ if (ctx != null)
+ {
+ LinkedList<String> baseDNs = uData.getBaseDNs();
+ checkSuffixesForInitializeReplication(baseDNs, ctx, false);
+ if (!baseDNs.isEmpty())
+ {
+ for (String baseDN : baseDNs)
+ {
+ try
+ {
+ printlnProgress();
+ Message msg = formatter.getFormattedProgress(
+ INFO_PROGRESS_INITIALIZING_SUFFIX.get(baseDN,
+ ConnectionUtils.getHostPort(ctx)));
+ printProgress(msg);
+ println();
+ initializeAllSuffix(baseDN, ctx, true);
+ }
+ catch (ReplicationCliException rce)
+ {
+ println();
+ println(getCriticalExceptionMessage(rce));
+ returnValue = rce.getErrorCode();
+ LOG.log(Level.SEVERE, "Complete error stack:", rce);
+ }
+ }
+ }
+ else
+ {
+ returnValue = REPLICATION_CANNOT_BE_INITIALIZED_ON_BASEDN;
+ }
+ }
+ else
+ {
+ returnValue = ERROR_CONNECTING;
+ }
+
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ return returnValue;
+ }
+
+ /**
+ * Performs the operation that must be made before initializing the topology
+ * using the import-ldif command or the binary copy. The operation uses
+ * the parameters in the provided InitializeAllReplicationUserData.
+ * This method does not prompt to the user for information if something is
+ * missing.
+ * @param uData the PreExternalInitializationUserData object.
+ * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
+ * successful and an error code otherwise.
+ */
+ private ReplicationCliReturnCode preExternalInitialization(
+ PreExternalInitializationUserData uData)
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ InitialLdapContext ctx = null;
+ try
+ {
+ ctx = createAdministrativeContext(uData.getHostName(), uData.getPort(),
+ useSSL, useStartTLS,
+ ADSContext.getAdministratorDN(uData.getAdminUid()),
+ uData.getAdminPwd(), getTrustManager());
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = uData.getHostName()+":"+uData.getPort();
+ println();
+ println(getMessageForException(ne, hostPort));
+ LOG.log(Level.SEVERE, "Complete error stack:", ne);
+ }
+ if (ctx != null)
+ {
+ LinkedList<String> baseDNs = uData.getBaseDNs();
+ checkSuffixesForInitializeReplication(baseDNs, ctx, false);
+ if (!baseDNs.isEmpty())
+ {
+ for (String baseDN : baseDNs)
+ {
+ try
+ {
+ printlnProgress();
+ Message msg = formatter.getFormattedWithPoints(
+ INFO_PROGRESS_PRE_EXTERNAL_INITIALIZATION.get(baseDN));
+ printProgress(msg);
+ preExternalInitialization(baseDN, ctx, uData.isLocalOnly(), false);
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ }
+ catch (ReplicationCliException rce)
+ {
+ println();
+ println(getCriticalExceptionMessage(rce));
+ returnValue = rce.getErrorCode();
+ LOG.log(Level.SEVERE, "Complete error stack:", rce);
+ }
+ }
+ if (uData.isLocalOnly())
+ {
+ printlnProgress();
+ printProgress(
+ INFO_PROGRESS_PRE_INITIALIZATION_LOCAL_FINISHED_PROCEDURE.get(
+ ConnectionUtils.getHostPort(ctx),
+ ReplicationCliArgumentParser.
+ POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME));
+ printlnProgress();
+ }
+ else
+ {
+ printlnProgress();
+ printProgress(
+ INFO_PROGRESS_PRE_INITIALIZATION_FINISHED_PROCEDURE.get(
+ ReplicationCliArgumentParser.
+ POST_EXTERNAL_INITIALIZATION_SUBCMD_NAME));
+ printlnProgress();
+ }
+ }
+ else
+ {
+ returnValue = REPLICATION_CANNOT_BE_INITIALIZED_ON_BASEDN;
+ }
+ }
+ else
+ {
+ returnValue = ERROR_CONNECTING;
+ }
+
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ return returnValue;
+ }
+
+ /**
+ * Performs the operation that must be made after initializing the topology
+ * using the import-ldif command or the binary copy. The operation uses
+ * the parameters in the provided InitializeAllReplicationUserData.
+ * This method does not prompt to the user for information if something is
+ * missing.
+ * @param uData the PostExternalInitializationUserData object.
+ * @return ReplicationCliReturnCode.SUCCESSFUL if the operation was
+ * successful and an error code otherwise.
+ */
+ private ReplicationCliReturnCode postExternalInitialization(
+ PostExternalInitializationUserData uData)
+ {
+ ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
+ InitialLdapContext ctx = null;
+ try
+ {
+ ctx = createAdministrativeContext(uData.getHostName(), uData.getPort(),
+ useSSL, useStartTLS,
+ ADSContext.getAdministratorDN(uData.getAdminUid()),
+ uData.getAdminPwd(), getTrustManager());
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = uData.getHostName()+":"+uData.getPort();
+ println();
+ println(getMessageForException(ne, hostPort));
+ LOG.log(Level.SEVERE, "Complete error stack:", ne);
+ }
+ if (ctx != null)
+ {
+ LinkedList<String> baseDNs = uData.getBaseDNs();
+ checkSuffixesForInitializeReplication(baseDNs, ctx, false);
+ if (!baseDNs.isEmpty())
+ {
+ for (String baseDN : baseDNs)
+ {
+ try
+ {
+ printlnProgress();
+ Message msg = formatter.getFormattedWithPoints(
+ INFO_PROGRESS_POST_EXTERNAL_INITIALIZATION.get(baseDN));
+ printProgress(msg);
+ postExternalInitialization(baseDN, ctx, false);
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ }
+ catch (ReplicationCliException rce)
+ {
+ println();
+ println(getCriticalExceptionMessage(rce));
+ returnValue = rce.getErrorCode();
+ LOG.log(Level.SEVERE, "Complete error stack:", rce);
+ }
+ }
+ printlnProgress();
+ printProgress(
+ INFO_PROGRESS_POST_INITIALIZATION_FINISHED_PROCEDURE.get());
+ printlnProgress();
+ }
+ else
+ {
+ returnValue = REPLICATION_CANNOT_BE_INITIALIZED_ON_BASEDN;
+ }
+ }
+ else
+ {
+ returnValue = ERROR_CONNECTING;
+ }
+
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+
+ return returnValue;
+ }
+
+
+ /**
+ * Checks that replication can actually be enabled in the provided baseDNs
+ * for the two servers.
+ * @param suffixes the suffixes provided by the user. This Collection is
+ * updated by removing the base DNs that cannot be enabled and with the
+ * base DNs that the user provided interactively.
+ * @param ctx1 connection to the first server.
+ * @param ctx2 connection to the second server.
+ * @param interactive whether to ask the user to provide interactively
+ * base DNs if none of the provided base DNs can be enabled.
+ */
+ private void checkSuffixesForEnableReplication(Collection<String> suffixes,
+ InitialLdapContext ctx1, InitialLdapContext ctx2,
+ boolean interactive)
+ {
+ TreeSet<String> availableSuffixes =
+ new TreeSet<String>(getCommonSuffixes(ctx1, ctx2,
+ SuffixRelationType.NOT_FULLY_REPLICATED));
+ TreeSet<String> alreadyReplicatedSuffixes =
+ new TreeSet<String>(getCommonSuffixes(ctx1, ctx2,
+ SuffixRelationType.FULLY_REPLICATED));
+
+ if (availableSuffixes.size() == 0)
+ {
+ println();
+ println(
+ ERR_NO_SUFFIXES_AVAILABLE_TO_ENABLE_REPLICATION.get());
+
+ LinkedList<String> userProvidedSuffixes = argParser.getBaseDNs();
+ TreeSet<String> userProvidedReplicatedSuffixes = new TreeSet<String>();
+
+ for (String s1 : userProvidedSuffixes)
+ {
+ for (String s2 : alreadyReplicatedSuffixes)
+ {
+ if (Utils.areDnsEqual(s1, s2))
+ {
+ userProvidedReplicatedSuffixes.add(s1);
+ }
+ }
+ }
+ if (userProvidedReplicatedSuffixes.size() > 0)
+ {
+ println();
+ println(
+ INFO_ALREADY_REPLICATED_SUFFIXES.get(
+ Utils.getStringFromCollection(userProvidedReplicatedSuffixes,
+ Constants.LINE_SEPARATOR)));
+ }
+ suffixes.clear();
+ }
+ else
+ {
+ // Verify that the provided suffixes are configured in the servers.
+ TreeSet<String> notFound = new TreeSet<String>();
+ TreeSet<String> alreadyReplicated = new TreeSet<String>();
+ for (String dn : suffixes)
+ {
+ boolean found = false;
+ for (String dn1 : availableSuffixes)
+ {
+ if (Utils.areDnsEqual(dn, dn1))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ boolean isReplicated = false;
+ for (String s : alreadyReplicatedSuffixes)
+ {
+ if (Utils.areDnsEqual(s, dn))
+ {
+ isReplicated = true;
+ break;
+ }
+ }
+ if (isReplicated)
+ {
+ alreadyReplicated.add(dn);
+ }
+ else
+ {
+ notFound.add(dn);
+ }
+ }
+ }
+ suffixes.removeAll(notFound);
+ suffixes.removeAll(alreadyReplicated);
+ if (notFound.size() > 0)
+ {
+ println();
+ println(ERR_REPLICATION_ENABLE_SUFFIXES_NOT_FOUND.get(
+ Utils.getStringFromCollection(notFound,
+ Constants.LINE_SEPARATOR)));
+ }
+ if (alreadyReplicated.size() > 0)
+ {
+ println();
+ println(INFO_ALREADY_REPLICATED_SUFFIXES.get(
+ Utils.getStringFromCollection(alreadyReplicated,
+ Constants.LINE_SEPARATOR)));
+ }
+ if (interactive)
+ {
+ boolean confirmationLimitReached = false;
+ while (suffixes.isEmpty())
+ {
+ boolean noSchemaOrAds = false;
+ for (String s: availableSuffixes)
+ {
+ if (!Utils.areDnsEqual(s, ADSContext.getAdministrationSuffixDN()) &&
+ !Utils.areDnsEqual(s, Constants.SCHEMA_DN) &&
+ !Utils.areDnsEqual(s, Constants.REPLICATION_CHANGES_DN))
+ {
+ noSchemaOrAds = true;
+ }
+ }
+ if (!noSchemaOrAds)
+ {
+ // In interactive mode we do not propose to manage the
+ // administration suffix.
+ println();
+ println(
+ ERR_NO_SUFFIXES_AVAILABLE_TO_ENABLE_REPLICATION.get());
+ break;
+ }
+ else
+ {
+ println();
+ println(ERR_NO_SUFFIXES_SELECTED_TO_REPLICATE.get());
+ for (String dn : availableSuffixes)
+ {
+ if (!Utils.areDnsEqual(dn,
+ ADSContext.getAdministrationSuffixDN()) &&
+ !Utils.areDnsEqual(dn, Constants.SCHEMA_DN) &&
+ !Utils.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN))
+ {
+ try
+ {
+ if (askConfirmation(
+ INFO_REPLICATION_ENABLE_SUFFIX_PROMPT.get(dn), true, LOG))
+ {
+ suffixes.add(dn);
+ }
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ confirmationLimitReached = true;
+ break;
+ }
+ }
+ }
+ }
+ if (confirmationLimitReached)
+ {
+ suffixes.clear();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Checks that replication can actually be disabled in the provided baseDNs
+ * for the server.
+ * @param suffixes the suffixes provided by the user. This Collection is
+ * updated by removing the base DNs that cannot be disabled and with the
+ * base DNs that the user provided interactively.
+ * @param ctx connection to the server.
+ * @param interactive whether to ask the user to provide interactively
+ * base DNs if none of the provided base DNs can be disabled.
+ */
+ private void checkSuffixesForDisableReplication(Collection<String> suffixes,
+ InitialLdapContext ctx, boolean interactive)
+ {
+ TreeSet<String> availableSuffixes = new TreeSet<String>();
+ TreeSet<String> notReplicatedSuffixes = new TreeSet<String>();
+
+ Collection<ReplicaDescriptor> replicas = getReplicas(ctx);
+ for (ReplicaDescriptor rep : replicas)
+ {
+ String dn = rep.getSuffix().getDN();
+ if (rep.isReplicated())
+ {
+ availableSuffixes.add(dn);
+ }
+ else
+ {
+ notReplicatedSuffixes.add(dn);
+ }
+ }
+ if (availableSuffixes.size() == 0)
+ {
+ println();
+ println(ERR_NO_SUFFIXES_AVAILABLE_TO_DISABLE_REPLICATION.get());
+ LinkedList<String> userProvidedSuffixes = argParser.getBaseDNs();
+ TreeSet<String> userProvidedNotReplicatedSuffixes =
+ new TreeSet<String>();
+ for (String s1 : userProvidedSuffixes)
+ {
+ for (String s2 : notReplicatedSuffixes)
+ {
+ if (Utils.areDnsEqual(s1, s2))
+ {
+ userProvidedNotReplicatedSuffixes.add(s1);
+ }
+ }
+ }
+ if (userProvidedNotReplicatedSuffixes.size() > 0)
+ {
+ println();
+ println(INFO_ALREADY_NOT_REPLICATED_SUFFIXES.get(
+ Utils.getStringFromCollection(
+ userProvidedNotReplicatedSuffixes,
+ Constants.LINE_SEPARATOR)));
+ }
+ suffixes.clear();
+ }
+ else
+ {
+ // Verify that the provided suffixes are configured in the servers.
+ TreeSet<String> notFound = new TreeSet<String>();
+ TreeSet<String> alreadyNotReplicated = new TreeSet<String>();
+ for (String dn : suffixes)
+ {
+ boolean found = false;
+ for (String dn1 : availableSuffixes)
+ {
+ if (Utils.areDnsEqual(dn, dn1))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ boolean notReplicated = false;
+ for (String s : notReplicatedSuffixes)
+ {
+ if (Utils.areDnsEqual(s, dn))
+ {
+ notReplicated = true;
+ break;
+ }
+ }
+ if (notReplicated)
+ {
+ alreadyNotReplicated.add(dn);
+ }
+ else
+ {
+ notFound.add(dn);
+ }
+ }
+ }
+ suffixes.removeAll(notFound);
+ suffixes.removeAll(alreadyNotReplicated);
+ if (notFound.size() > 0)
+ {
+ println();
+ println(ERR_REPLICATION_DISABLE_SUFFIXES_NOT_FOUND.get(
+ Utils.getStringFromCollection(notFound,
+ Constants.LINE_SEPARATOR)));
+ }
+ if (alreadyNotReplicated.size() > 0)
+ {
+ println();
+ println(INFO_ALREADY_NOT_REPLICATED_SUFFIXES.get(
+ Utils.getStringFromCollection(alreadyNotReplicated,
+ Constants.LINE_SEPARATOR)));
+ }
+ if (interactive)
+ {
+ boolean confirmationLimitReached = false;
+ while (suffixes.isEmpty())
+ {
+ boolean noSchemaOrAds = false;
+ for (String s: availableSuffixes)
+ {
+ if (!Utils.areDnsEqual(s, ADSContext.getAdministrationSuffixDN()) &&
+ !Utils.areDnsEqual(s, Constants.SCHEMA_DN) &&
+ !Utils.areDnsEqual(s, Constants.REPLICATION_CHANGES_DN))
+ {
+ noSchemaOrAds = true;
+ }
+ }
+ if (!noSchemaOrAds)
+ {
+ // In interactive mode we do not propose to manage the
+ // administration suffix.
+ println();
+ println(ERR_NO_SUFFIXES_AVAILABLE_TO_DISABLE_REPLICATION.get());
+ break;
+ }
+ else
+ {
+ println();
+ println(ERR_NO_SUFFIXES_SELECTED_TO_DISABLE.get());
+ for (String dn : availableSuffixes)
+ {
+ if (!Utils.areDnsEqual(dn,
+ ADSContext.getAdministrationSuffixDN()) &&
+ !Utils.areDnsEqual(dn, Constants.SCHEMA_DN) &&
+ !Utils.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN))
+ {
+ try
+ {
+ if (askConfirmation(
+ INFO_REPLICATION_DISABLE_SUFFIX_PROMPT.get(dn), true,LOG))
+ {
+ suffixes.add(dn);
+ }
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ confirmationLimitReached = true;
+ break;
+ }
+ }
+ }
+ }
+ if (confirmationLimitReached)
+ {
+ suffixes.clear();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Checks that replication can actually be initialized in the provided baseDNs
+ * for the server.
+ * @param suffixes the suffixes provided by the user. This Collection is
+ * updated by removing the base DNs that cannot be initialized and with the
+ * base DNs that the user provided interactively.
+ * @param ctx connection to the server.
+ * @param interactive whether to ask the user to provide interactively
+ * base DNs if none of the provided base DNs can be initialized.
+ */
+ private void checkSuffixesForInitializeReplication(
+ Collection<String> suffixes, InitialLdapContext ctx, boolean interactive)
+ {
+ TreeSet<String> availableSuffixes = new TreeSet<String>();
+ TreeSet<String> notReplicatedSuffixes = new TreeSet<String>();
+
+ Collection<ReplicaDescriptor> replicas = getReplicas(ctx);
+ for (ReplicaDescriptor rep : replicas)
+ {
+ String dn = rep.getSuffix().getDN();
+ if (rep.isReplicated())
+ {
+ availableSuffixes.add(dn);
+ }
+ else
+ {
+ notReplicatedSuffixes.add(dn);
+ }
+ }
+ if (availableSuffixes.size() == 0)
+ {
+ println();
+ if (argParser.isInitializeAllReplicationSubcommand())
+ {
+ println(ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_ALL_REPLICATION.get());
+ }
+ else
+ {
+ println(
+ ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_LOCAL_REPLICATION.get());
+ }
+ LinkedList<String> userProvidedSuffixes = argParser.getBaseDNs();
+ TreeSet<String> userProvidedNotReplicatedSuffixes =
+ new TreeSet<String>();
+ for (String s1 : userProvidedSuffixes)
+ {
+ for (String s2 : notReplicatedSuffixes)
+ {
+ if (Utils.areDnsEqual(s1, s2))
+ {
+ userProvidedNotReplicatedSuffixes.add(s1);
+ }
+ }
+ }
+ if (userProvidedNotReplicatedSuffixes.size() > 0)
+ {
+ println();
+ println(INFO_ALREADY_NOT_REPLICATED_SUFFIXES.get(
+ Utils.getStringFromCollection(
+ userProvidedNotReplicatedSuffixes,
+ Constants.LINE_SEPARATOR)));
+ }
+ suffixes.clear();
+ }
+ else
+ {
+ // Verify that the provided suffixes are configured in the servers.
+ TreeSet<String> notFound = new TreeSet<String>();
+ TreeSet<String> alreadyNotReplicated = new TreeSet<String>();
+ for (String dn : suffixes)
+ {
+ boolean found = false;
+ for (String dn1 : availableSuffixes)
+ {
+ if (Utils.areDnsEqual(dn, dn1))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ boolean notReplicated = false;
+ for (String s : notReplicatedSuffixes)
+ {
+ if (Utils.areDnsEqual(s, dn))
+ {
+ notReplicated = true;
+ break;
+ }
+ }
+ if (notReplicated)
+ {
+ alreadyNotReplicated.add(dn);
+ }
+ else
+ {
+ notFound.add(dn);
+ }
+ }
+ }
+ suffixes.removeAll(notFound);
+ suffixes.removeAll(alreadyNotReplicated);
+ if (notFound.size() > 0)
+ {
+ println();
+ println(ERR_REPLICATION_INITIALIZE_LOCAL_SUFFIXES_NOT_FOUND.get(
+ Utils.getStringFromCollection(notFound,
+ Constants.LINE_SEPARATOR)));
+ }
+ if (alreadyNotReplicated.size() > 0)
+ {
+ println();
+ println(INFO_ALREADY_NOT_REPLICATED_SUFFIXES.get(
+ Utils.getStringFromCollection(alreadyNotReplicated,
+ Constants.LINE_SEPARATOR)));
+ }
+ if (interactive)
+ {
+ boolean confirmationLimitReached = false;
+ while (suffixes.isEmpty())
+ {
+ boolean noSchemaOrAds = false;
+ for (String s: availableSuffixes)
+ {
+ if (!Utils.areDnsEqual(s, ADSContext.getAdministrationSuffixDN()) &&
+ !Utils.areDnsEqual(s, Constants.SCHEMA_DN) &&
+ !Utils.areDnsEqual(s, Constants.REPLICATION_CHANGES_DN))
+ {
+ noSchemaOrAds = true;
+ }
+ }
+ if (!noSchemaOrAds)
+ {
+ // In interactive mode we do not propose to manage the
+ // administration suffix.
+ println();
+ if (argParser.isInitializeAllReplicationSubcommand())
+ {
+ println(
+ ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_ALL_REPLICATION.get());
+ }
+ else
+ {
+ println(
+ ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_LOCAL_REPLICATION.get());
+ }
+ break;
+ }
+ else
+ {
+ println();
+ if (argParser.isInitializeAllReplicationSubcommand())
+ {
+ println(ERR_NO_SUFFIXES_SELECTED_TO_INITIALIZE_ALL.get());
+ }
+ else if (argParser.isPreExternalInitializationSubcommand())
+ {
+ println(
+ ERR_NO_SUFFIXES_SELECTED_TO_PRE_EXTERNAL_INITIALIZATION.get());
+ }
+ else if (argParser.isPostExternalInitializationSubcommand())
+ {
+ println(
+ ERR_NO_SUFFIXES_SELECTED_TO_POST_EXTERNAL_INITIALIZATION.get());
+ }
+ for (String dn : availableSuffixes)
+ {
+ if (!Utils.areDnsEqual(dn,
+ ADSContext.getAdministrationSuffixDN()) &&
+ !Utils.areDnsEqual(dn, Constants.SCHEMA_DN) &&
+ !Utils.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN))
+ {
+ boolean addSuffix;
+ try
+ {
+ if (argParser.isPreExternalInitializationSubcommand())
+ {
+ addSuffix = askConfirmation(
+ INFO_REPLICATION_PRE_EXTERNAL_INITIALIZATION_SUFFIX_PROMPT.
+ get(dn), true, LOG);
+ }
+ else if (argParser.isPostExternalInitializationSubcommand())
+ {
+ addSuffix = askConfirmation(
+ INFO_REPLICATION_POST_EXTERNAL_INITIALIZATION_SUFFIX_PROMPT.
+ get(dn), true, LOG);
+ }
+ else
+ {
+ addSuffix = askConfirmation(
+ INFO_REPLICATION_INITIALIZE_ALL_SUFFIX_PROMPT.get(dn),
+ true, LOG);
+ }
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ confirmationLimitReached = true;
+ break;
+ }
+ if (addSuffix)
+ {
+ suffixes.add(dn);
+ }
+ }
+ }
+ }
+ if (confirmationLimitReached)
+ {
+ suffixes.clear();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Checks that we can initialize the provided baseDNs between the two servers.
+ * @param suffixes the suffixes provided by the user. This Collection is
+ * updated by removing the base DNs that cannot be enabled and with the
+ * base DNs that the user provided interactively.
+ * @param ctxSource connection to the source server.
+ * @param ctxDestination connection to the destination server.
+ * @param interactive whether to ask the user to provide interactively
+ * base DNs if none of the provided base DNs can be initialized.
+ */
+ private void checkSuffixesForInitializeReplication(
+ Collection<String> suffixes, InitialLdapContext ctxSource,
+ InitialLdapContext ctxDestination, boolean interactive)
+ {
+ TreeSet<String> availableSuffixes = new TreeSet<String>(
+ getCommonSuffixes(ctxSource, ctxDestination,
+ SuffixRelationType.REPLICATED));
+ if (availableSuffixes.size() == 0)
+ {
+ println();
+ println(ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_REPLICATION.get());
+ suffixes.clear();
+ }
+ else
+ {
+ // Verify that the provided suffixes are configured in the servers.
+ LinkedList<String> notFound = new LinkedList<String>();
+ for (String dn : suffixes)
+ {
+ boolean found = false;
+ for (String dn1 : availableSuffixes)
+ {
+ if (Utils.areDnsEqual(dn, dn1))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ notFound.add(dn);
+ }
+ }
+ suffixes.removeAll(notFound);
+ if (notFound.size() > 0)
+ {
+ println();
+ println(ERR_SUFFIXES_CANNOT_BE_INITIALIZED.get(
+ Utils.getStringFromCollection(notFound,
+ Constants.LINE_SEPARATOR)));
+ }
+ if (interactive)
+ {
+ boolean confirmationLimitReached = false;
+ while (suffixes.isEmpty())
+ {
+ boolean noSchemaOrAds = false;
+ for (String s: availableSuffixes)
+ {
+ if (!Utils.areDnsEqual(s, ADSContext.getAdministrationSuffixDN()) &&
+ !Utils.areDnsEqual(s, Constants.SCHEMA_DN) &&
+ !Utils.areDnsEqual(s, Constants.REPLICATION_CHANGES_DN))
+ {
+ noSchemaOrAds = true;
+ }
+ }
+ if (!noSchemaOrAds)
+ {
+ // In interactive mode we do not propose to manage the
+ // administration suffix.
+ println();
+ println(ERR_NO_SUFFIXES_AVAILABLE_TO_INITIALIZE_REPLICATION.get());
+ break;
+ }
+ else
+ {
+ println();
+ println(ERR_NO_SUFFIXES_SELECTED_TO_INITIALIZE.get());
+
+ for (String dn : availableSuffixes)
+ {
+ if (!Utils.areDnsEqual(dn,
+ ADSContext.getAdministrationSuffixDN()) &&
+ !Utils.areDnsEqual(dn, Constants.SCHEMA_DN) &&
+ !Utils.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN))
+ {
+ try
+ {
+ if (askConfirmation(
+ INFO_REPLICATION_INITIALIZE_SUFFIX_PROMPT.get(dn), true,
+ LOG))
+ {
+ suffixes.add(dn);
+ }
+ }
+ catch (CLIException ce)
+ {
+ println(ce.getMessageObject());
+ confirmationLimitReached = true;
+ break;
+ }
+ }
+ }
+ }
+ if (confirmationLimitReached)
+ {
+ suffixes.clear();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Updates the configuration in the two servers (and in other servers if
+ * they are referenced) to enable replication.
+ * @param ctx1 the connection to the first server.
+ * @param ctx2 the connection to the second server.
+ * @param uData the EnableReplicationUserData object containing the required
+ * parameters to update the configuration.
+ * @throws ReplicationCliException if there is an error.
+ */
+ private void updateConfiguration(InitialLdapContext ctx1,
+ InitialLdapContext ctx2, EnableReplicationUserData uData)
+ throws ReplicationCliException
+ {
+ LinkedHashSet<String> twoReplServers = new LinkedHashSet<String>();
+ LinkedHashSet<String> allRepServers = new LinkedHashSet<String>();
+ HashMap<String, LinkedHashSet<String>> hmRepServers =
+ new HashMap<String, LinkedHashSet<String>>();
+ Set<Integer> usedReplicationServerIds = new HashSet<Integer>();
+ HashMap<String, Set<Integer>> hmUsedReplicationDomainIds =
+ new HashMap<String, Set<Integer>>();
+
+ ServerDescriptor server1;
+ TopologyCacheFilter filter = new TopologyCacheFilter();
+ filter.setSearchMonitoringInformation(false);
+ filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN());
+ for (String dn : uData.getBaseDNs())
+ {
+ filter.addBaseDNToSearch(dn);
+ }
+ try
+ {
+ server1 = ServerDescriptor.createStandalone(ctx1, filter);
+ }
+ catch (NamingException ne)
+ {
+ throw new ReplicationCliException(
+ getMessageForException(ne, ConnectionUtils.getHostPort(ctx1)),
+ ERROR_READING_CONFIGURATION, ne);
+ }
+ ServerDescriptor server2;
+ try
+ {
+ server2 = ServerDescriptor.createStandalone(ctx2, filter);
+ }
+ catch (NamingException ne)
+ {
+ throw new ReplicationCliException(
+ getMessageForException(ne, ConnectionUtils.getHostPort(ctx2)),
+ ERROR_READING_CONFIGURATION, ne);
+ }
+
+ ADSContext adsCtx1 = new ADSContext(ctx1);
+ ADSContext adsCtx2 = new ADSContext(ctx2);
+
+ if (!argParser.isInteractive())
+ {
+ // Inform the user of the potential errors that we found in the already
+ // registered servers.
+ LinkedHashSet<Message> messages = new LinkedHashSet<Message>();
+ try
+ {
+ LinkedHashSet<PreferredConnection> cnx =
+ new LinkedHashSet<PreferredConnection>();
+ cnx.addAll(getPreferredConnections(ctx1));
+ cnx.addAll(getPreferredConnections(ctx2));
+ if (adsCtx1.hasAdminData())
+ {
+ TopologyCache cache = new TopologyCache(adsCtx1, getTrustManager());
+ cache.setPreferredConnections(cnx);
+ cache.getFilter().setSearchMonitoringInformation(false);
+ for (String dn : uData.getBaseDNs())
+ {
+ cache.getFilter().addBaseDNToSearch(dn);
+ }
+ cache.reloadTopology();
+ messages.addAll(getErrorMessages(cache));
+ }
+
+ if (adsCtx2.hasAdminData())
+ {
+ TopologyCache cache = new TopologyCache(adsCtx2, getTrustManager());
+ cache.setPreferredConnections(cnx);
+ cache.getFilter().setSearchMonitoringInformation(false);
+ for (String dn : uData.getBaseDNs())
+ {
+ cache.getFilter().addBaseDNToSearch(dn);
+ }
+ cache.reloadTopology();
+ messages.addAll(getErrorMessages(cache));
+ }
+ }
+ catch (TopologyCacheException tce)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
+ ERROR_READING_TOPOLOGY_CACHE, tce);
+ }
+ catch (ADSContextException adce)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_READING_ADS.get(adce.getMessage()),
+ ERROR_READING_ADS, adce);
+ }
+ if (!messages.isEmpty())
+ {
+ println(ERR_REPLICATION_READING_REGISTERED_SERVERS_WARNING.get(
+ Utils.getMessageFromCollection(messages,
+ Constants.LINE_SEPARATOR).toString()));
+ }
+ }
+
+ // These are used to identify which server we use to initialize
+ // the contents of the other server (if any).
+ InitialLdapContext ctxSource = null;
+ InitialLdapContext ctxDestination = null;
+ ADSContext adsCtxSource = null;
+
+ boolean adsAlreadyReplicated = false;
+
+ printProgress(formatter.getFormattedWithPoints(
+ INFO_REPLICATION_ENABLE_UPDATING_ADS_CONTENTS.get()));
+ try
+ {
+ if (adsCtx1.hasAdminData() && adsCtx2.hasAdminData())
+ {
+ Set<Map<ADSContext.ServerProperty, Object>> registry1 =
+ adsCtx1.readServerRegistry();
+ Set<Map<ADSContext.ServerProperty, Object>> registry2 =
+ adsCtx2.readServerRegistry();
+ if (registry2.size() <= 1)
+ {
+ // Only the server itself registered.
+ if (!hasAdministrator(adsCtx1.getDirContext(), uData))
+ {
+ adsCtx1.createAdministrator(getAdministratorProperties(uData));
+ }
+ if (registry2.size() == 0)
+ {
+ server2.updateAdsPropertiesWithServerProperties();
+ registerServer(adsCtx1, server2.getAdsProperties());
+ }
+ else
+ {
+ registerServer(adsCtx1, registry2.iterator().next());
+ }
+
+ ctxSource = ctx1;
+ ctxDestination = ctx2;
+ adsCtxSource = adsCtx1;
+ }
+ else if (registry1.size() <= 1)
+ {
+ // Only the server itself registered.
+ if (!hasAdministrator(adsCtx2.getDirContext(), uData))
+ {
+ adsCtx2.createAdministrator(getAdministratorProperties(uData));
+ }
+ if (registry1.size() == 0)
+ {
+ server1.updateAdsPropertiesWithServerProperties();
+ registerServer(adsCtx2, server1.getAdsProperties());
+ }
+ else
+ {
+ registerServer(adsCtx2, registry1.iterator().next());
+ }
+
+ ctxSource = ctx2;
+ ctxDestination = ctx1;
+ adsCtxSource = adsCtx2;
+ }
+ else if (!areEqual(registry1, registry2))
+ {
+ // TO COMPLETE: we may want to merge the ADS but for the moment
+ // just say this is not supported.
+ throw new ReplicationCliException(
+ ERR_REPLICATION_ADS_MERGE_NOT_SUPPORTED.get(
+ ConnectionUtils.getHostPort(ctx1),
+ ConnectionUtils.getHostPort(ctx2)),
+ REPLICATION_ADS_MERGE_NOT_SUPPORTED, null);
+ }
+ else
+ {
+ // They are already replicated: nothing to do in terms of ADS
+ // initialization or ADS update data
+ adsAlreadyReplicated = true;
+ }
+ }
+ else if (!adsCtx1.hasAdminData() && adsCtx2.hasAdminData())
+ {
+// adsCtx1.createAdministrationSuffix(null);
+ if (!hasAdministrator(adsCtx2.getDirContext(), uData))
+ {
+ adsCtx2.createAdministrator(getAdministratorProperties(uData));
+ }
+ server1.updateAdsPropertiesWithServerProperties();
+ registerServer(adsCtx2, server1.getAdsProperties());
+
+ ctxSource = ctx2;
+ ctxDestination = ctx1;
+ adsCtxSource = adsCtx2;
+ }
+ else if (adsCtx1.hasAdminData() && !adsCtx2.hasAdminData())
+ {
+// adsCtx2.createAdministrationSuffix(null);
+ if (!hasAdministrator(adsCtx1.getDirContext(), uData))
+ {
+ adsCtx1.createAdministrator(getAdministratorProperties(uData));
+ }
+ server2.updateAdsPropertiesWithServerProperties();
+ registerServer(adsCtx1, server2.getAdsProperties());
+
+ ctxSource = ctx1;
+ ctxDestination = ctx2;
+ adsCtxSource = adsCtx1;
+ }
+ else
+ {
+ adsCtx1.createAdminData(null);
+ if (!hasAdministrator(ctx1, uData))
+ {
+ // This could occur if the user created an administrator without
+ // registering any server.
+ adsCtx1.createAdministrator(getAdministratorProperties(uData));
+ }
+ server1.updateAdsPropertiesWithServerProperties();
+ adsCtx1.registerServer(server1.getAdsProperties());
+ server2.updateAdsPropertiesWithServerProperties();
+ adsCtx1.registerServer(server2.getAdsProperties());
+// adsCtx2.createAdministrationSuffix(null);
+
+ ctxSource = ctx1;
+ ctxDestination = ctx2;
+ adsCtxSource = adsCtx1;
+ }
+ }
+ catch (ADSContextException adce)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_UPDATING_ADS.get(adce.getReason()),
+ ERROR_UPDATING_ADS, adce);
+ }
+ if (!adsAlreadyReplicated)
+ {
+ try
+ {
+ ServerDescriptor.seedAdsTrustStore(ctxDestination,
+ adsCtxSource.getTrustedCertificates());
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.SEVERE, "Error seeding truststores: "+t, t);
+ throw new ReplicationCliException(
+ ERR_REPLICATION_ENABLE_SEEDING_TRUSTSTORE.get(t.toString()),
+ ERROR_SEEDING_TRUSTORE, t);
+ }
+ }
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+
+ LinkedList<String> baseDNs = uData.getBaseDNs();
+ if (!adsAlreadyReplicated)
+ {
+ boolean found = false;
+ for (String dn : baseDNs)
+ {
+ if (Utils.areDnsEqual(dn, ADSContext.getAdministrationSuffixDN()))
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ baseDNs.add(ADSContext.getAdministrationSuffixDN());
+ uData.setBaseDNs(baseDNs);
+ }
+ }
+
+ if (uData.replicateSchema())
+ {
+ baseDNs = uData.getBaseDNs();
+ baseDNs.add(Constants.SCHEMA_DN);
+ uData.setBaseDNs(baseDNs);
+ }
+ TopologyCache cache1 = null;
+ TopologyCache cache2 = null;
+ try
+ {
+ LinkedHashSet<PreferredConnection> cnx =
+ new LinkedHashSet<PreferredConnection>();
+ cnx.addAll(getPreferredConnections(ctx1));
+ cnx.addAll(getPreferredConnections(ctx2));
+ if (adsCtx1.hasAdminData())
+ {
+ cache1 = new TopologyCache(adsCtx1, getTrustManager());
+ cache1.setPreferredConnections(cnx);
+ cache1.getFilter().setSearchMonitoringInformation(false);
+ for (String dn : uData.getBaseDNs())
+ {
+ cache1.getFilter().addBaseDNToSearch(dn);
+ }
+ cache1.reloadTopology();
+ usedReplicationServerIds.addAll(getReplicationServerIds(cache1));
+ }
+
+ if (adsCtx2.hasAdminData())
+ {
+ cache2 = new TopologyCache(adsCtx2, getTrustManager());
+ cache2.setPreferredConnections(cnx);
+ cache2.getFilter().setSearchMonitoringInformation(false);
+ for (String dn : uData.getBaseDNs())
+ {
+ cache2.getFilter().addBaseDNToSearch(dn);
+ }
+ cache2.reloadTopology();
+ usedReplicationServerIds.addAll(getReplicationServerIds(cache2));
+ }
+ }
+ catch (ADSContextException adce)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_READING_ADS.get(adce.getMessage()),
+ ERROR_READING_ADS, adce);
+ }
+ catch (TopologyCacheException tce)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
+ ERROR_READING_TOPOLOGY_CACHE, tce);
+ }
+
+ if (server1.isReplicationServer())
+ {
+ twoReplServers.add(server1.getReplicationServerHostPort());
+ usedReplicationServerIds.add(server1.getReplicationServerId());
+ }
+ else
+ {
+ twoReplServers.add(
+ ConnectionUtils.getHostName(ctx1)+":"+uData.getReplicationPort1());
+ }
+ if (server2.isReplicationServer())
+ {
+ twoReplServers.add(server2.getReplicationServerHostPort());
+ usedReplicationServerIds.add(server2.getReplicationServerId());
+ }
+ else
+ {
+ twoReplServers.add(
+ ConnectionUtils.getHostName(ctx2)+":"+uData.getReplicationPort2());
+ }
+
+ for (String baseDN : uData.getBaseDNs())
+ {
+ LinkedHashSet<String> repServersForBaseDN = new LinkedHashSet<String>();
+ repServersForBaseDN.addAll(getReplicationServers(baseDN, cache1,
+ server1));
+ repServersForBaseDN.addAll(getReplicationServers(baseDN, cache2,
+ server2));
+ repServersForBaseDN.addAll(twoReplServers);
+ hmRepServers.put(baseDN, repServersForBaseDN);
+
+ Set<Integer> ids = new HashSet<Integer>();
+ ids.addAll(getReplicationDomainIds(baseDN, server1));
+ ids.addAll(getReplicationDomainIds(baseDN, server2));
+ if (cache1 != null)
+ {
+ for (ServerDescriptor server : cache1.getServers())
+ {
+ ids.addAll(getReplicationDomainIds(baseDN, server));
+ }
+ }
+ if (cache2 != null)
+ {
+ for (ServerDescriptor server : cache2.getServers())
+ {
+ ids.addAll(getReplicationDomainIds(baseDN, server));
+ }
+ }
+ hmUsedReplicationDomainIds.put(baseDN, ids);
+ }
+ for (LinkedHashSet<String> v : hmRepServers.values())
+ {
+ allRepServers.addAll(v);
+ }
+
+ Set<String> alreadyConfiguredReplicationServers = new HashSet<String>();
+ if (!server1.isReplicationServer())
+ {
+ try
+ {
+ configureAsReplicationServer(ctx1, uData.getReplicationPort1(),
+ uData.isSecureReplication1(), allRepServers,
+ usedReplicationServerIds);
+ }
+ catch (OpenDsException ode)
+ {
+ throw new ReplicationCliException(
+ getMessageForReplicationServerException(ode,
+ ConnectionUtils.getHostPort(ctx1)),
+ ERROR_CONFIGURING_REPLICATIONSERVER, ode);
+ }
+ }
+ else
+ {
+ try
+ {
+ updateReplicationServer(ctx1, allRepServers);
+ }
+ catch (OpenDsException ode)
+ {
+ throw new ReplicationCliException(
+ getMessageForReplicationServerException(ode,
+ ConnectionUtils.getHostPort(ctx1)),
+ ERROR_CONFIGURING_REPLICATIONSERVER, ode);
+ }
+ }
+ alreadyConfiguredReplicationServers.add(server1.getId());
+ if (!server2.isReplicationServer())
+ {
+ try
+ {
+ configureAsReplicationServer(ctx2, uData.getReplicationPort2(),
+ uData.isSecureReplication2(), allRepServers,
+ usedReplicationServerIds);
+ }
+ catch (OpenDsException ode)
+ {
+ throw new ReplicationCliException(
+ getMessageForReplicationServerException(ode,
+ ConnectionUtils.getHostPort(ctx1)),
+ ERROR_CONFIGURING_REPLICATIONSERVER, ode);
+ }
+ }
+ else
+ {
+ try
+ {
+ updateReplicationServer(ctx2, allRepServers);
+ }
+ catch (OpenDsException ode)
+ {
+ throw new ReplicationCliException(
+ getMessageForReplicationServerException(ode,
+ ConnectionUtils.getHostPort(ctx1)),
+ ERROR_CONFIGURING_REPLICATIONSERVER, ode);
+ }
+ }
+ alreadyConfiguredReplicationServers.add(server2.getId());
+
+ for (String baseDN : uData.getBaseDNs())
+ {
+ LinkedHashSet<String> repServers = hmRepServers.get(baseDN);
+ Set<Integer> usedIds = hmUsedReplicationDomainIds.get(baseDN);
+ Set<String> alreadyConfiguredServers = new HashSet<String>();
+
+ try
+ {
+ configureToReplicateBaseDN(ctx1, baseDN, repServers, usedIds);
+ }
+ catch (OpenDsException ode)
+ {
+ Message msg = getMessageForEnableException(ode,
+ ConnectionUtils.getHostPort(ctx1), baseDN);
+ throw new ReplicationCliException(msg,
+ ERROR_ENABLING_REPLICATION_ON_BASEDN, ode);
+ }
+ alreadyConfiguredServers.add(server1.getId());
+ try
+ {
+ configureToReplicateBaseDN(ctx2, baseDN, repServers, usedIds);
+ }
+ catch (OpenDsException ode)
+ {
+ Message msg = getMessageForEnableException(ode,
+ ConnectionUtils.getHostPort(ctx2), baseDN);
+ throw new ReplicationCliException(msg,
+ ERROR_ENABLING_REPLICATION_ON_BASEDN, ode);
+ }
+ alreadyConfiguredServers.add(server2.getId());
+
+ if (cache1 != null)
+ {
+ configureToReplicateBaseDN(baseDN, repServers, usedIds, cache1, server1,
+ alreadyConfiguredServers, allRepServers,
+ alreadyConfiguredReplicationServers);
+ }
+ if (cache2 != null)
+ {
+ configureToReplicateBaseDN(baseDN, repServers, usedIds, cache2, server2,
+ alreadyConfiguredServers, allRepServers,
+ alreadyConfiguredReplicationServers);
+ }
+ }
+
+ // Now that replication is configured in all servers, simply try to
+ // initialize the contents of one ADS with the other (in the case where
+ // already both servers were replicating the same ADS there is nothing to be
+ // done).
+ if ((ctxSource != null) && (ctxDestination != null))
+ {
+ printProgress(formatter.getFormattedWithPoints(
+ INFO_ENABLE_REPLICATION_INITIALIZING_ADS.get(
+ ConnectionUtils.getHostPort(ctxDestination),
+ ConnectionUtils.getHostPort(ctxSource))));
+
+ initializeSuffix(ADSContext.getAdministrationSuffixDN(), ctxSource,
+ ctxDestination, false);
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ }
+
+ // If we must initialize the schema do so.
+ if (mustInitializeSchema(server1, server2))
+ {
+ if (argParser.useSecondServerAsSchemaSource())
+ {
+ ctxSource = ctx2;
+ ctxDestination = ctx1;
+ }
+ else
+ {
+ ctxSource = ctx1;
+ ctxDestination = ctx2;
+ }
+ printProgress(formatter.getFormattedWithPoints(
+ INFO_ENABLE_REPLICATION_INITIALIZING_SCHEMA.get(
+ ConnectionUtils.getHostPort(ctxDestination),
+ ConnectionUtils.getHostPort(ctxSource))));
+ initializeSuffix(Constants.SCHEMA_DN, ctxSource,
+ ctxDestination, false);
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ }
+ }
+
+ /**
+ * Updates the configuration in the server (and in other servers if
+ * they are referenced) to disable replication.
+ * @param ctx the connection to the server.
+ * @param uData the DisableReplicationUserData object containing the required
+ * parameters to update the configuration.
+ * @throws ReplicationCliException if there is an error.
+ */
+ private void updateConfiguration(InitialLdapContext ctx,
+ DisableReplicationUserData uData) throws ReplicationCliException
+ {
+ ServerDescriptor server;
+ TopologyCacheFilter filter = new TopologyCacheFilter();
+ filter.setSearchMonitoringInformation(false);
+ filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN());
+ for (String dn : uData.getBaseDNs())
+ {
+ filter.addBaseDNToSearch(dn);
+ }
+ try
+ {
+ server = ServerDescriptor.createStandalone(ctx, filter);
+ }
+ catch (NamingException ne)
+ {
+ throw new ReplicationCliException(
+ getMessageForException(ne, ConnectionUtils.getHostPort(ctx)),
+ ERROR_READING_CONFIGURATION, ne);
+ }
+
+ ADSContext adsCtx = new ADSContext(ctx);
+
+ TopologyCache cache = null;
+ // Only try to update remote server if the user provided a Global
+ // Administrator to authenticate.
+ boolean tryToUpdateRemote = uData.getAdminUid() != null;
+ try
+ {
+ if (adsCtx.hasAdminData() && tryToUpdateRemote)
+ {
+ cache = new TopologyCache(adsCtx, getTrustManager());
+ cache.setPreferredConnections(getPreferredConnections(ctx));
+ cache.getFilter().setSearchMonitoringInformation(false);
+ for (String dn : uData.getBaseDNs())
+ {
+ cache.getFilter().addBaseDNToSearch(dn);
+ }
+ cache.reloadTopology();
+ }
+ }
+ catch (ADSContextException adce)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_READING_ADS.get(adce.getMessage()),
+ ERROR_READING_ADS, adce);
+ }
+ catch (TopologyCacheException tce)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
+ ERROR_READING_TOPOLOGY_CACHE, tce);
+ }
+ if (!argParser.isInteractive())
+ {
+ // Inform the user of the potential errors that we found.
+ LinkedHashSet<Message> messages = new LinkedHashSet<Message>();
+ if (cache != null)
+ {
+ messages.addAll(getErrorMessages(cache));
+ }
+ if (!messages.isEmpty())
+ {
+ println(
+ ERR_REPLICATION_READING_REGISTERED_SERVERS_WARNING.get(
+ Utils.getMessageFromCollection(messages,
+ Constants.LINE_SEPARATOR).toString()));
+ }
+ }
+
+ /**
+ * Try to figure out if we must explicitly disable replication on
+ * cn=admin data and cn=schema.
+ */
+ boolean forceDisableSchema = false;
+ boolean forceDisableADS = false;
+ boolean schemaReplicated = false;
+ boolean adsReplicated = false;
+ boolean disableAllBaseDns = disableAllBaseDns(ctx, uData);
+
+ Collection<ReplicaDescriptor> replicas = getReplicas(ctx);
+ for (ReplicaDescriptor rep : replicas)
+ {
+ String dn = rep.getSuffix().getDN();
+ if (rep.isReplicated())
+ {
+ if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn))
+ {
+ adsReplicated = true;
+ }
+ else if (Utils.areDnsEqual(Constants.SCHEMA_DN, dn))
+ {
+ schemaReplicated = true;
+ }
+ }
+ }
+
+ if (disableAllBaseDns)
+ {
+ // Unregister the server from the ADS
+ server.updateAdsPropertiesWithServerProperties();
+ try
+ {
+ adsCtx.unregisterServer(server.getAdsProperties());
+ try
+ {
+ // To be sure that the change gets propagated
+ Thread.sleep(2000);
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ catch (ADSContextException adce)
+ {
+ LOG.log(Level.INFO, "Error unregistering server: "+
+ server.getAdsProperties(), adce);
+ println();
+ println(
+ ERR_REPLICATION_UPDATING_ADS.get(adce.getMessage()));
+ println();
+ }
+ }
+
+ if (disableAllBaseDns)
+ {
+ forceDisableSchema = schemaReplicated;
+ forceDisableADS = adsReplicated;
+ for (String dn : uData.getBaseDNs())
+ {
+ if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn))
+ {
+ // The user already asked this to be explicitly disabled
+ forceDisableADS = false;
+ }
+ else if (Utils.areDnsEqual(Constants.SCHEMA_DN, dn))
+ {
+ // The user already asked this to be explicitly disabled
+ forceDisableSchema = false;
+ }
+ }
+ }
+ Set<String> suffixesToDisable = new HashSet<String>(uData.getBaseDNs());
+ if (forceDisableSchema)
+ {
+ suffixesToDisable.add(Constants.SCHEMA_DN);
+ }
+ if (forceDisableADS)
+ {
+ suffixesToDisable.add(ADSContext.getAdministrationSuffixDN());
+ }
+
+ String replicationServerHostPort = server.getReplicationServerHostPort();
+ for (String baseDN : suffixesToDisable)
+ {
+ try
+ {
+ deleteReplicationDomain(ctx, baseDN);
+ }
+ catch (OpenDsException ode)
+ {
+ Message msg = getMessageForDisableException(ode,
+ ConnectionUtils.getHostPort(ctx), baseDN);
+ throw new ReplicationCliException(msg,
+ ERROR_DISABLING_REPLICATION_ON_BASEDN, ode);
+ }
+ }
+
+ if ((replicationServerHostPort != null) && (cache != null))
+ {
+ Set<ServerDescriptor> serversToUpdate =
+ new LinkedHashSet<ServerDescriptor>();
+ for (String baseDN : suffixesToDisable)
+ {
+ SuffixDescriptor suffix = getSuffix(baseDN, cache, server);
+ if (suffix != null)
+ {
+ for (ReplicaDescriptor replica : suffix.getReplicas())
+ {
+ serversToUpdate.add(replica.getServer());
+ }
+ }
+ }
+ String bindDn = ConnectionUtils.getBindDN(ctx);
+ String pwd = ConnectionUtils.getBindPassword(ctx);
+ for (ServerDescriptor s : serversToUpdate)
+ {
+ removeReferencesInServer(s, replicationServerHostPort, bindDn, pwd,
+ suffixesToDisable, disableAllBaseDns, getPreferredConnections(ctx));
+ }
+
+ if (disableAllBaseDns)
+ {
+ // Disable replication server
+ disableReplicationServer(ctx);
+ // Wait to be sure that changes are taken into account and reset the
+ // contents of the ADS.
+ try
+ {
+ Thread.sleep(2000);
+ }
+ catch (Throwable t)
+ {
+ }
+ for (ServerDescriptor s: serversToUpdate)
+ {
+ try
+ {
+ adsCtx.unregisterServer(s.getAdsProperties());
+ }
+ catch (ADSContextException adce)
+ {
+ LOG.log(Level.INFO, "Error unregistering server: "+
+ s.getAdsProperties(), adce);
+ println();
+ println(
+ ERR_REPLICATION_UPDATING_ADS.get(adce.getMessage()));
+ println();
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Displays the replication status of the different base DNs in the servers
+ * registered in the ADS.
+ * @param ctx the connection to the server.
+ * @param uData the StatusReplicationUserData object containing the required
+ * parameters to update the configuration.
+ * @throws ReplicationCliException if there is an error.
+ */
+ private void displayStatus(InitialLdapContext ctx,
+ StatusReplicationUserData uData) throws ReplicationCliException
+ {
+ ADSContext adsCtx = new ADSContext(ctx);
+
+ TopologyCache cache = null;
+ try
+ {
+ cache = new TopologyCache(adsCtx, getTrustManager());
+ cache.setPreferredConnections(getPreferredConnections(ctx));
+ for (String dn : uData.getBaseDNs())
+ {
+ cache.getFilter().addBaseDNToSearch(dn);
+ }
+ cache.reloadTopology();
+ }
+ catch (TopologyCacheException tce)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
+ ERROR_READING_TOPOLOGY_CACHE, tce);
+ }
+ if (!argParser.isInteractive())
+ {
+ // Inform the user of the potential errors that we found.
+ LinkedHashSet<Message> messages = new LinkedHashSet<Message>();
+ if (cache != null)
+ {
+ messages.addAll(getErrorMessages(cache));
+ }
+ if (!messages.isEmpty())
+ {
+ Message msg =
+ ERR_REPLICATION_STATUS_READING_REGISTERED_SERVERS.get(
+ Utils.getMessageFromCollection(messages,
+ Constants.LINE_SEPARATOR).toString());
+ println(msg);
+ }
+ }
+
+ LinkedList<String> userBaseDNs = uData.getBaseDNs();
+ LinkedList<Set<ReplicaDescriptor>> replicaLists =
+ new LinkedList<Set<ReplicaDescriptor>>();
+
+ boolean oneReplicated = false;
+ for (SuffixDescriptor suffix : cache.getSuffixes())
+ {
+ String dn = suffix.getDN();
+
+ // If no base DNs where specified display all the base DNs but the schema
+ // and cn=admin data.
+ boolean found = userBaseDNs.isEmpty() &&
+ !Utils.areDnsEqual(dn, ADSContext.getAdministrationSuffixDN()) &&
+ !Utils.areDnsEqual(dn, Constants.SCHEMA_DN) &&
+ !Utils.areDnsEqual(dn, Constants.REPLICATION_CHANGES_DN);
+ for (String baseDN : userBaseDNs)
+ {
+ found = Utils.areDnsEqual(baseDN, dn);
+ if (found)
+ {
+ break;
+ }
+ }
+ if (found)
+ {
+ boolean replicated = false;
+ for (ReplicaDescriptor replica : suffix.getReplicas())
+ {
+ if (replica.isReplicated())
+ {
+ replicated = true;
+ break;
+ }
+ }
+ if (replicated)
+ {
+ oneReplicated = true;
+ replicaLists.add(suffix.getReplicas());
+ }
+ else
+ {
+ // Check if there are already some non replicated base DNs.
+ found = false;
+ for (Set<ReplicaDescriptor> replicas : replicaLists)
+ {
+ ReplicaDescriptor replica = replicas.iterator().next();
+ if (!replica.isReplicated() &&
+ Utils.areDnsEqual(dn, replica.getSuffix().getDN()))
+ {
+ replicas.addAll(suffix.getReplicas());
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ replicaLists.add(suffix.getReplicas());
+ }
+ }
+ }
+ }
+
+ if (replicaLists.isEmpty())
+ {
+ printProgress(INFO_REPLICATION_STATUS_NO_BASEDNS.get());
+ printlnProgress();
+ }
+ else
+ {
+ LinkedList<Set<ReplicaDescriptor>> orderedReplicaLists =
+ new LinkedList<Set<ReplicaDescriptor>>();
+ for (Set<ReplicaDescriptor> replicas1 : replicaLists)
+ {
+ String dn1 = replicas1.iterator().next().getSuffix().getDN();
+ boolean inserted = false;
+ for (int i=0; i<orderedReplicaLists.size() && !inserted; i++)
+ {
+ String dn2 =
+ orderedReplicaLists.get(i).iterator().next().getSuffix().getDN();
+ if (dn1.compareTo(dn2) < 0)
+ {
+ orderedReplicaLists.add(i, replicas1);
+ inserted = true;
+ }
+ }
+ if (!inserted)
+ {
+ orderedReplicaLists.add(replicas1);
+ }
+ }
+ for (Set<ReplicaDescriptor> replicas : orderedReplicaLists)
+ {
+ printlnProgress();
+ displayStatus(replicas, uData.isScriptFriendly(),
+ getPreferredConnections(ctx));
+ }
+ if (oneReplicated && !uData.isScriptFriendly())
+ {
+ printlnProgress();
+ printProgress(INFO_REPLICATION_STATUS_REPLICATED_LEGEND.get());
+ printlnProgress();
+ }
+ }
+ }
+
+ /**
+ * Displays the replication status of the replicas provided. The code assumes
+ * that all the replicas have the same baseDN and that if they are replicated
+ * all the replicas are replicated with each other.
+ * @param replicas the list of replicas that we are trying to display.
+ * @param cnx the preferred connections used to connect to the server.
+ * @param scriptFriendly wheter to display it on script-friendly mode or not.
+ */
+ private void displayStatus(Set<ReplicaDescriptor> replicas,
+ boolean scriptFriendly, LinkedHashSet<PreferredConnection> cnx)
+ {
+
+ boolean isReplicated = false;
+ Set<ReplicaDescriptor> orderedReplicas =
+ new LinkedHashSet<ReplicaDescriptor>();
+ Set<String> hostPorts = new TreeSet<String>();
+ for (ReplicaDescriptor replica : replicas)
+ {
+ if (replica.isReplicated())
+ {
+ isReplicated = true;
+ }
+ hostPorts.add(getHostPort(replica.getServer(), cnx));
+ }
+ for (String hostPort : hostPorts)
+ {
+ for (ReplicaDescriptor replica : replicas)
+ {
+ if (getHostPort(replica.getServer(), cnx).equals(hostPort))
+ {
+ orderedReplicas.add(replica);
+ }
+ }
+ }
+ final int SERVERPORT = 0;
+ final int NUMBER_ENTRIES = 1;
+ final int MISSING_CHANGES = 2;
+ final int AGE_OF_OLDEST_MISSING_CHANGE = 3;
+ final int REPLICATION_PORT = 4;
+ final int SECURE = 5;
+ Message[] headers;
+ if (scriptFriendly)
+ {
+ if (isReplicated)
+ {
+ headers = new Message[] {
+ INFO_REPLICATION_STATUS_LABEL_SERVERPORT.get(),
+ INFO_REPLICATION_STATUS_LABEL_NUMBER_ENTRIES.get(),
+ INFO_REPLICATION_STATUS_LABEL_MISSING_CHANGES.get(),
+ INFO_REPLICATION_STATUS_LABEL_AGE_OF_OLDEST_MISSING_CHANGE.get(),
+ INFO_REPLICATION_STATUS_LABEL_REPLICATION_PORT.get(),
+ INFO_REPLICATION_STATUS_LABEL_SECURE.get()
+ };
+ }
+ else
+ {
+ headers = new Message[] {
+ INFO_REPLICATION_STATUS_LABEL_SERVERPORT.get(),
+ INFO_REPLICATION_STATUS_LABEL_NUMBER_ENTRIES.get()
+ };
+ }
+ }
+ else
+ {
+ if (isReplicated)
+ {
+ headers = new Message[] {
+ INFO_REPLICATION_STATUS_HEADER_SERVERPORT.get(),
+ INFO_REPLICATION_STATUS_HEADER_NUMBER_ENTRIES.get(),
+ INFO_REPLICATION_STATUS_HEADER_MISSING_CHANGES.get(),
+ INFO_REPLICATION_STATUS_HEADER_AGE_OF_OLDEST_MISSING_CHANGE.get(),
+ INFO_REPLICATION_STATUS_HEADER_REPLICATION_PORT.get(),
+ INFO_REPLICATION_STATUS_HEADER_SECURE.get()
+ };
+ }
+ else
+ {
+ headers = new Message[] {
+ INFO_REPLICATION_STATUS_HEADER_SERVERPORT.get(),
+ INFO_REPLICATION_STATUS_HEADER_NUMBER_ENTRIES.get()
+ };
+ }
+ }
+ Message[][] values = new Message[orderedReplicas.size()][headers.length];
+
+ int i = 0;
+ for (ReplicaDescriptor replica : orderedReplicas)
+ {
+ Message v;
+ for (int j=0; j<headers.length; j++)
+ {
+ switch (j)
+ {
+ case SERVERPORT:
+ v = Message.raw(getHostPort(replica.getServer(), cnx));
+ break;
+ case NUMBER_ENTRIES:
+ int nEntries = replica.getEntries();
+ if (nEntries >= 0)
+ {
+ v = Message.raw(String.valueOf(nEntries));
+ }
+ else
+ {
+ v = INFO_NOT_AVAILABLE_SHORT_LABEL.get();
+ }
+ break;
+ case MISSING_CHANGES:
+ int missingChanges = replica.getMissingChanges();
+ if (missingChanges >= 0)
+ {
+ v = Message.raw(String.valueOf(missingChanges));
+ }
+ else
+ {
+ v = INFO_NOT_AVAILABLE_SHORT_LABEL.get();
+ }
+ break;
+ case AGE_OF_OLDEST_MISSING_CHANGE:
+ long ageOfOldestMissingChange = replica.getAgeOfOldestMissingChange();
+ if (ageOfOldestMissingChange > 0)
+ {
+ Date date = new Date(ageOfOldestMissingChange);
+ v = Message.raw(date.toString());
+ }
+ else
+ {
+ v = INFO_NOT_AVAILABLE_SHORT_LABEL.get();
+ }
+ break;
+ case REPLICATION_PORT:
+ int replicationPort = replica.getServer().getReplicationServerPort();
+ if (replicationPort >= 0)
+ {
+ v = Message.raw(String.valueOf(replicationPort));
+ }
+ else
+ {
+ v = INFO_NOT_AVAILABLE_SHORT_LABEL.get();
+ }
+ break;
+ case SECURE:
+ if (replica.getServer().isReplicationSecure())
+ {
+ v = INFO_REPLICATION_STATUS_SECURITY_ENABLED.get();
+ }
+ else
+ {
+ v = INFO_REPLICATION_STATUS_SECURITY_DISABLED.get();
+ }
+ break;
+ default:
+ throw new IllegalStateException("Unknown index: "+j);
+ }
+ values[i][j] = v;
+ }
+ i++;
+ }
+
+ String dn = replicas.iterator().next().getSuffix().getDN();
+ if (scriptFriendly)
+ {
+ Message[] labels = {
+ INFO_REPLICATION_STATUS_BASEDN.get(),
+ INFO_REPLICATION_STATUS_IS_REPLICATED.get()
+ };
+ Message[] vs = {
+ Message.raw(dn),
+ isReplicated ? INFO_BASEDN_REPLICATED_LABEL.get() :
+ INFO_BASEDN_NOT_REPLICATED_LABEL.get()
+ };
+ for (i=0; i<labels.length; i++)
+ {
+ printProgress(Message.raw(labels[i]+" "+vs[i]));
+ printlnProgress();
+ }
+
+ for (i=0; i<values.length; i++)
+ {
+ printProgress(Message.raw("-"));
+ printlnProgress();
+ for (int j=0; j<values[i].length; j++)
+ {
+ printProgress(Message.raw(headers[j]+" "+values[i][j]));
+ printlnProgress();
+ }
+ }
+ }
+ else
+ {
+ Message msg;
+ if (isReplicated)
+ {
+ msg = INFO_REPLICATION_STATUS_REPLICATED.get(dn);
+ }
+ else
+ {
+ msg = INFO_REPLICATION_STATUS_NOT_REPLICATED.get(dn);
+ }
+ printProgressMessageNoWrap(msg);
+ printlnProgress();
+ int length = msg.length();
+ StringBuffer buf = new StringBuffer();
+ for (i=0; i<length; i++)
+ {
+ buf.append("=");
+ }
+ printProgressMessageNoWrap(Message.raw(buf.toString()));
+ printlnProgress();
+
+ TableBuilder table = new TableBuilder();
+ for (i=0; i< headers.length; i++)
+ {
+ table.appendHeading(headers[i]);
+ }
+ for (i=0; i<values.length; i++)
+ {
+ table.startRow();
+ for (int j=0; j<headers.length; j++)
+ {
+ table.appendCell(values[i][j]);
+ }
+ }
+ TextTablePrinter printer = new TextTablePrinter(getOutputStream());
+ printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
+ table.print(printer);
+ }
+ }
+
+ /**
+ * Retrieves all the replication servers for a given baseDN. The
+ * ServerDescriptor is used to identify the server where the suffix is
+ * defined and it cannot be null. The TopologyCache is used to retrieve
+ * replication servers defined in other replicas but not in the one we
+ * get in the ServerDescriptor.
+ * @param baseDN the base DN.
+ * @param cache the TopologyCache (might be null).
+ * @param server the ServerDescriptor.
+ * @return a Set containing the replication servers currently being used
+ * to replicate the baseDN defined in the server described by the
+ * ServerDescriptor.
+ */
+ private LinkedHashSet<String> getReplicationServers(String baseDN,
+ TopologyCache cache, ServerDescriptor server)
+ {
+ LinkedHashSet<String> servers = new LinkedHashSet<String>();
+ for (ReplicaDescriptor replica : server.getReplicas())
+ {
+ if (Utils.areDnsEqual(replica.getSuffix().getDN(), baseDN))
+ {
+ servers.addAll(replica.getReplicationServers());
+ break;
+ }
+ }
+ if (cache != null)
+ {
+ Set<SuffixDescriptor> suffixes = cache.getSuffixes();
+ for (SuffixDescriptor suffix : suffixes)
+ {
+ if (Utils.areDnsEqual(suffix.getDN(), baseDN))
+ {
+ Set<String> s = suffix.getReplicationServers();
+ // Test that at least we share one of the replication servers.
+ // If we do: we are dealing with the same replication topology
+ // (we must consider the case of disjoint replication topologies
+ // replicating the same base DN).
+ HashSet<String> copy = new HashSet<String>(s);
+ copy.retainAll(servers);
+ if (!copy.isEmpty())
+ {
+ servers.addAll(s);
+ break;
+ }
+ }
+ }
+ }
+ return servers;
+ }
+
+ /**
+ * Retrieves the suffix in the TopologyCache for a given baseDN. The
+ * ServerDescriptor is used to identify the server where the suffix is
+ * defined.
+ * @param baseDN the base DN.
+ * @param cache the TopologyCache.
+ * @param server the ServerDescriptor.
+ * @return the suffix in the TopologyCache for a given baseDN.
+ */
+ private SuffixDescriptor getSuffix(String baseDN, TopologyCache cache,
+ ServerDescriptor server)
+ {
+ SuffixDescriptor returnValue = null;
+ Set<String> servers = new LinkedHashSet<String>();
+ for (ReplicaDescriptor replica : server.getReplicas())
+ {
+ if (Utils.areDnsEqual(replica.getSuffix().getDN(), baseDN))
+ {
+ servers.addAll(replica.getReplicationServers());
+ break;
+ }
+ }
+
+ Set<SuffixDescriptor> suffixes = cache.getSuffixes();
+ for (SuffixDescriptor suffix : suffixes)
+ {
+ if (Utils.areDnsEqual(suffix.getDN(), baseDN))
+ {
+ Set<String> s = suffix.getReplicationServers();
+ // Test that at least we share one of the replication servers.
+ // If we do: we are dealing with the same replication topology
+ // (we must consider the case of disjoint replication topologies
+ // replicating the same base DN).
+ HashSet<String> copy = new HashSet<String>(s);
+ copy.retainAll(servers);
+ if (!copy.isEmpty())
+ {
+ returnValue = suffix;
+ break;
+ }
+ }
+ }
+ return returnValue;
+ }
+
+ /**
+ * Retrieves all the replication domain IDs for a given baseDN in the
+ * ServerDescriptor.
+ * @param baseDN the base DN.
+ * @param server the ServerDescriptor.
+ * @return a Set containing the replication domain IDs for a given baseDN in
+ * the ServerDescriptor.
+ */
+ private Set<Integer> getReplicationDomainIds(String baseDN,
+ ServerDescriptor server)
+ {
+ Set<Integer> ids = new HashSet<Integer>();
+ for (ReplicaDescriptor replica : server.getReplicas())
+ {
+ if ((replica.isReplicated()) &&
+ Utils.areDnsEqual(replica.getSuffix().getDN(), baseDN))
+ {
+ ids.add(replica.getReplicationId());
+ break;
+ }
+ }
+ return ids;
+ }
+
+ /**
+ * Configures the server to which the provided InitialLdapContext is connected
+ * as a replication server. The replication server listens in the provided
+ * port.
+ * @param ctx the context connected to the server that we want to configure.
+ * @param replicationPort the replication port of the replication server.
+ * @param useSecureReplication whether to have encrypted communication with
+ * the replication port or not.
+ * @param replicationServers the list of replication servers to which the
+ * replication server will communicate with.
+ * @param usedReplicationServerIds the set of replication server IDs that
+ * are already in use. The set will be updated with the replication ID
+ * that will be used by the newly configured replication server.
+ * @throws OpenDsException if there is an error updating the configuration.
+ */
+ private void configureAsReplicationServer(InitialLdapContext ctx,
+ int replicationPort, boolean useSecureReplication,
+ LinkedHashSet<String> replicationServers,
+ Set<Integer> usedReplicationServerIds) throws OpenDsException
+ {
+ printProgress(formatter.getFormattedWithPoints(
+ INFO_REPLICATION_ENABLE_CONFIGURING_REPLICATION_SERVER.get(
+ ConnectionUtils.getHostPort(ctx))));
+
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+
+ /*
+ * Configure Synchronization plugin.
+ */
+ ReplicationSynchronizationProviderCfgClient sync = null;
+ try
+ {
+ sync = (ReplicationSynchronizationProviderCfgClient)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+ }
+ catch (ManagedObjectNotFoundException monfe)
+ {
+ LOG.log(Level.INFO, "Synchronization server does not exist in "+
+ ConnectionUtils.getHostPort(ctx));
+ }
+ if (sync == null)
+ {
+ ReplicationSynchronizationProviderCfgDefn provider =
+ ReplicationSynchronizationProviderCfgDefn.getInstance();
+ sync = root.createSynchronizationProvider(provider,
+ "Multimaster Synchronization",
+ new ArrayList<DefaultBehaviorException>());
+ sync.setJavaClass(
+ org.opends.server.replication.plugin.MultimasterReplication.class.
+ getName());
+ sync.setEnabled(Boolean.TRUE);
+ }
+ else
+ {
+ if (!sync.isEnabled())
+ {
+ sync.setEnabled(Boolean.TRUE);
+ }
+ }
+ sync.commit();
+
+ /*
+ * Configure the replication server.
+ */
+ ReplicationServerCfgClient replicationServer = null;
+
+ boolean mustCommit = false;
+
+ if (!sync.hasReplicationServer())
+ {
+ CryptoManagerCfgClient crypto = root.getCryptoManager();
+ if (useSecureReplication != crypto.isSSLEncryption())
+ {
+ crypto.setSSLEncryption(useSecureReplication);
+ crypto.commit();
+ }
+ int id = InstallerHelper.getReplicationId(usedReplicationServerIds);
+ usedReplicationServerIds.add(id);
+ replicationServer = sync.createReplicationServer(
+ ReplicationServerCfgDefn.getInstance(),
+ new ArrayList<DefaultBehaviorException>());
+ replicationServer.setReplicationServerId(id);
+ replicationServer.setReplicationPort(replicationPort);
+ replicationServer.setReplicationServer(replicationServers);
+ mustCommit = true;
+ }
+ else
+ {
+ replicationServer = sync.getReplicationServer();
+ usedReplicationServerIds.add(
+ replicationServer.getReplicationServerId());
+ Set<String> servers = replicationServer.getReplicationServer();
+ if (servers == null)
+ {
+ replicationServer.setReplicationServer(replicationServers);
+ mustCommit = true;
+ }
+ else if (!areReplicationServersEqual(servers, replicationServers))
+ {
+ replicationServers.addAll(servers);
+ replicationServer.setReplicationServer(
+ mergeReplicationServers(replicationServers, servers));
+ mustCommit = true;
+ }
+ }
+ if (mustCommit)
+ {
+ replicationServer.commit();
+ }
+
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ }
+
+ /**
+ * Updates the configuration of the replication server with the list of
+ * replication servers provided.
+ * @param ctx the context connected to the server that we want to update.
+ * @param replicationServers the list of replication servers to which the
+ * replication server will communicate with.
+ * @throws OpenDsException if there is an error updating the configuration.
+ */
+ private void updateReplicationServer(InitialLdapContext ctx,
+ LinkedHashSet<String> replicationServers) throws OpenDsException
+ {
+ printProgress(formatter.getFormattedWithPoints(
+ INFO_REPLICATION_ENABLE_UPDATING_REPLICATION_SERVER.get(
+ ConnectionUtils.getHostPort(ctx))));
+
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+
+ ReplicationSynchronizationProviderCfgClient sync =
+ (ReplicationSynchronizationProviderCfgClient)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+ boolean mustCommit = false;
+ ReplicationServerCfgClient replicationServer = sync.getReplicationServer();
+ Set<String> servers = replicationServer.getReplicationServer();
+ if (servers == null)
+ {
+ replicationServer.setReplicationServer(replicationServers);
+ mustCommit = true;
+ }
+ else if (!areReplicationServersEqual(servers, replicationServers))
+ {
+ replicationServers.addAll(servers);
+ replicationServer.setReplicationServer(
+ mergeReplicationServers(replicationServers, servers));
+ mustCommit = true;
+ }
+ if (mustCommit)
+ {
+ replicationServer.commit();
+ }
+
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ }
+
+ /**
+ * Returns a Set containing all the replication server ids found in the
+ * servers of a given TopologyCache object.
+ * @param cache the TopologyCache object to use.
+ * @return a Set containing all the replication server ids found in a given
+ * TopologyCache object.
+ */
+ private Set<Integer> getReplicationServerIds(TopologyCache cache)
+ {
+ Set<Integer> ids = new HashSet<Integer>();
+ for (ServerDescriptor server : cache.getServers())
+ {
+ if (server.isReplicationServer())
+ {
+ ids.add(server.getReplicationServerId());
+ }
+ }
+ return ids;
+ }
+
+ /**
+ * Configures a replication domain for a given base DN in the server to which
+ * the provided InitialLdapContext is connected.
+ * @param ctx the context connected to the server that we want to configure.
+ * @param baseDN the base DN of the replication domain to configure.
+ * @param replicationServers the list of replication servers to which the
+ * replication domain will communicate with.
+ * @param usedReplicationDomainIds the set of replication domain IDs that
+ * are already in use. The set will be updated with the replication ID
+ * that will be used by the newly configured replication server.
+ * @throws OpenDsException if there is an error updating the configuration.
+ */
+ private void configureToReplicateBaseDN(InitialLdapContext ctx,
+ String baseDN,
+ LinkedHashSet<String> replicationServers,
+ Set<Integer> usedReplicationDomainIds) throws OpenDsException
+ {
+ boolean userSpecifiedAdminBaseDN = false;
+ LinkedList<String> l = argParser.getBaseDNs();
+ if (l != null)
+ {
+ for (String dn : l)
+ {
+ if (Utils.areDnsEqual(dn, ADSContext.getAdministrationSuffixDN()))
+ {
+ userSpecifiedAdminBaseDN = true;
+ break;
+ }
+ }
+ }
+ if (!userSpecifiedAdminBaseDN && Utils.areDnsEqual(baseDN,
+ ADSContext.getAdministrationSuffixDN()))
+ {
+ printProgress(formatter.getFormattedWithPoints(
+ INFO_REPLICATION_ENABLE_CONFIGURING_ADS.get(
+ ConnectionUtils.getHostPort(ctx))));
+ }
+ else
+ {
+ printProgress(formatter.getFormattedWithPoints(
+ INFO_REPLICATION_ENABLE_CONFIGURING_BASEDN.get(baseDN,
+ ConnectionUtils.getHostPort(ctx))));
+ }
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+
+ ReplicationSynchronizationProviderCfgClient sync =
+ (ReplicationSynchronizationProviderCfgClient)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+
+ String[] domainNames = sync.listReplicationDomains();
+ if (domainNames == null)
+ {
+ domainNames = new String[]{};
+ }
+ ReplicationDomainCfgClient[] domains =
+ new ReplicationDomainCfgClient[domainNames.length];
+ for (int i=0; i<domains.length; i++)
+ {
+ domains[i] = sync.getReplicationDomain(domainNames[i]);
+ }
+ ReplicationDomainCfgClient domain = null;
+ String domainName = null;
+ for (int i=0; i<domains.length && (domain == null); i++)
+ {
+ if (Utils.areDnsEqual(baseDN, domains[i].getBaseDN().toString()))
+ {
+ domain = domains[i];
+ domainName = domainNames[i];
+ }
+ }
+ boolean mustCommit = false;
+ if (domain == null)
+ {
+ int domainId = InstallerHelper.getReplicationId(usedReplicationDomainIds);
+ usedReplicationDomainIds.add(domainId);
+ domainName = InstallerHelper.getDomainName(domainNames, domainId, baseDN);
+ domain = sync.createReplicationDomain(
+ ReplicationDomainCfgDefn.getInstance(), domainName,
+ new ArrayList<DefaultBehaviorException>());
+ domain.setServerId(domainId);
+ domain.setBaseDN(DN.decode(baseDN));
+ domain.setReplicationServer(replicationServers);
+ mustCommit = true;
+ }
+ else
+ {
+ Set<String> servers = domain.getReplicationServer();
+ if (servers == null)
+ {
+ domain.setReplicationServer(servers);
+ mustCommit = true;
+ }
+ else if (!areReplicationServersEqual(servers, replicationServers))
+ {
+ domain.setReplicationServer(mergeReplicationServers(replicationServers,
+ servers));
+ mustCommit = true;
+ }
+ }
+
+ if (mustCommit)
+ {
+ domain.commit();
+ }
+
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ }
+
+ /**
+ * Configures the baseDN to replicate in all the Replicas found in a Topology
+ * Cache that are replicated with the Replica of the same base DN in the
+ * provided ServerDescriptor object.
+ * @param baseDN the base DN to replicate.
+ * @param repServers the replication servers to be defined in the domain.
+ * @param usedIds the replication domain Ids already used. This Set is
+ * updated with the new domains that are used.
+ * @param cache the TopologyCache used to retrieve the different defined
+ * replicas.
+ * @param server the ServerDescriptor that is used to identify the
+ * replication topology that we are interested at (we only update the replicas
+ * that are already replicated with this server).
+ * @param alreadyConfiguredServers the list of already configured servers. If
+ * a server is in this list no updates are performed to the domain.
+ * @param alreadyConfiguredReplicationServers the list of already configured
+ * servers. If a server is in this list no updates are performed to the
+ * replication server.
+ * @throws ReplicationCliException if something goes wrong.
+ */
+ private void configureToReplicateBaseDN(String baseDN,
+ LinkedHashSet<String> repServers, Set<Integer> usedIds,
+ TopologyCache cache, ServerDescriptor server,
+ Set<String> alreadyConfiguredServers, LinkedHashSet<String> allRepServers,
+ Set<String> alreadyConfiguredReplicationServers)
+ throws ReplicationCliException
+ {
+ SuffixDescriptor suffix = getSuffix(baseDN, cache, server);
+ if (suffix != null)
+ {
+ for (ReplicaDescriptor replica: suffix.getReplicas())
+ {
+ ServerDescriptor s = replica.getServer();
+ if (!alreadyConfiguredServers.contains(s.getId()))
+ {
+ String dn = ConnectionUtils.getBindDN(
+ cache.getAdsContext().getDirContext());
+ String pwd = ConnectionUtils.getBindPassword(
+ cache.getAdsContext().getDirContext());
+ TopologyCacheFilter filter = new TopologyCacheFilter();
+ filter.setSearchMonitoringInformation(false);
+ filter.setSearchBaseDNInformation(false);
+ ServerLoader loader = new ServerLoader(s.getAdsProperties(),
+ dn, pwd, getTrustManager(), cache.getPreferredConnections(),
+ filter);
+ InitialLdapContext ctx = null;
+ try
+ {
+ ctx = loader.createContext();
+ configureToReplicateBaseDN(ctx, baseDN, repServers, usedIds);
+ if (!alreadyConfiguredReplicationServers.contains(s.getId()))
+ {
+ updateReplicationServer(ctx, allRepServers);
+ alreadyConfiguredReplicationServers.add(s.getId());
+ }
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = getHostPort(server,
+ cache.getPreferredConnections());
+ Message msg = getMessageForException(ne, hostPort);
+ throw new ReplicationCliException(msg, ERROR_CONNECTING, ne);
+ }
+ catch (OpenDsException ode)
+ {
+ String hostPort = getHostPort(server,
+ cache.getPreferredConnections());
+ Message msg = getMessageForEnableException(ode, hostPort, baseDN);
+ throw new ReplicationCliException(msg,
+ ERROR_ENABLING_REPLICATION_ON_BASEDN, ode);
+ }
+ finally
+ {
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ alreadyConfiguredServers.add(s.getId());
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns the Map of properties to be used to update the ADS.
+ * This map uses the data provided by the user.
+ * @return the Map of properties to be used to update the ADS.
+ * This map uses the data provided by the user
+ */
+ private Map<ADSContext.AdministratorProperty, Object>
+ getAdministratorProperties(ReplicationUserData uData)
+ {
+ Map<ADSContext.AdministratorProperty, Object> adminProperties =
+ new HashMap<ADSContext.AdministratorProperty, Object>();
+ adminProperties.put(ADSContext.AdministratorProperty.UID,
+ uData.getAdminUid());
+ adminProperties.put(ADSContext.AdministratorProperty.PASSWORD,
+ uData.getAdminPwd());
+ adminProperties.put(ADSContext.AdministratorProperty.DESCRIPTION,
+ INFO_GLOBAL_ADMINISTRATOR_DESCRIPTION.get().toString());
+ return adminProperties;
+ }
+
+ private void initializeSuffix(String baseDN, InitialLdapContext ctxSource,
+ InitialLdapContext ctxDestination, boolean displayProgress)
+ throws ReplicationCliException
+ {
+ int replicationId = -1;
+ try
+ {
+ TopologyCacheFilter filter = new TopologyCacheFilter();
+ filter.setSearchMonitoringInformation(false);
+ filter.addBaseDNToSearch(baseDN);
+ ServerDescriptor source = ServerDescriptor.createStandalone(ctxSource,
+ filter);
+ for (ReplicaDescriptor replica : source.getReplicas())
+ {
+ if (Utils.areDnsEqual(replica.getSuffix().getDN(), baseDN))
+ {
+ replicationId = replica.getReplicationId();
+ break;
+ }
+ }
+ }
+ catch (NamingException ne)
+ {
+ String hostPort = ConnectionUtils.getHostPort(ctxSource);
+ Message msg = getMessageForException(ne, hostPort);
+ throw new ReplicationCliException(msg, ERROR_READING_CONFIGURATION, ne);
+ }
+
+ if (replicationId == -1)
+ {
+ throw new ReplicationCliException(
+ ERR_INITIALIZING_REPLICATIONID_NOT_FOUND.get(
+ ConnectionUtils.getHostPort(ctxSource), baseDN),
+ REPLICATIONID_NOT_FOUND, null);
+ }
+
+ OfflineInstaller installer = new OfflineInstaller();
+ installer.setProgressMessageFormatter(formatter);
+ installer.addProgressUpdateListener(new ProgressUpdateListener()
+ {
+ public void progressUpdate(ProgressUpdateEvent ev)
+ {
+ Message newLogDetails = ev.getNewLogs();
+ if ((newLogDetails != null) &&
+ !newLogDetails.toString().trim().equals(""))
+ {
+ printProgress(newLogDetails);
+ printlnProgress();
+ }
+ }
+ });
+ int nTries = 5;
+ boolean initDone = false;
+ while (!initDone)
+ {
+ try
+ {
+ installer.initializeSuffix(ctxDestination, replicationId, baseDN,
+ displayProgress, ConnectionUtils.getHostPort(ctxSource));
+ initDone = true;
+ }
+ catch (PeerNotFoundException pnfe)
+ {
+ LOG.log(Level.INFO, "Peer could not be found");
+ if (nTries == 1)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_INITIALIZING_TRIES_COMPLETED.get(
+ pnfe.getMessageObject().toString()),
+ INITIALIZING_TRIES_COMPLETED, pnfe);
+ }
+ try
+ {
+ Thread.sleep((5 - nTries) * 3000);
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ catch (ApplicationException ae)
+ {
+ throw new ReplicationCliException(ae.getMessageObject(),
+ ERROR_INITIALIZING_BASEDN_GENERIC, ae);
+ }
+ nTries--;
+ }
+ }
+
+ private void initializeAllSuffix(String baseDN, InitialLdapContext ctx,
+ boolean displayProgress) throws ReplicationCliException
+ {
+ int nTries = 5;
+ boolean initDone = false;
+ while (!initDone)
+ {
+ try
+ {
+ initializeAllSuffixTry(baseDN, ctx, displayProgress);
+ postPreExternalInitialization(baseDN, ctx, false, displayProgress,
+ false);
+ initDone = true;
+ }
+ catch (PeerNotFoundException pnfe)
+ {
+ LOG.log(Level.INFO, "Peer could not be found");
+ if (nTries == 1)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_INITIALIZING_TRIES_COMPLETED.get(
+ pnfe.getMessageObject().toString()),
+ INITIALIZING_TRIES_COMPLETED, pnfe);
+ }
+ try
+ {
+ Thread.sleep((5 - nTries) * 3000);
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ catch (ApplicationException ae)
+ {
+ throw new ReplicationCliException(ae.getMessageObject(),
+ ERROR_INITIALIZING_BASEDN_GENERIC, ae);
+ }
+ nTries--;
+ }
+ }
+
+ /**
+ * Launches the pre external initialization operation using the provided
+ * connection on a given base DN.
+ * @param baseDN the base DN that we want to reset.
+ * @param ctx the connection to the server.
+ * @param localOnly whether the resetting internal operations must only apply
+ * to the server to which we are connected.
+ * @param displayProgress whether to display operation progress or not.
+ * @throws ReplicationCliException if there is an error performing the
+ * operation.
+ */
+ private void preExternalInitialization(String baseDN, InitialLdapContext ctx,
+ boolean localOnly, boolean displayProgress) throws ReplicationCliException
+ {
+ postPreExternalInitialization(baseDN, ctx, localOnly, displayProgress,
+ true);
+ }
+
+ /**
+ * Launches the post external initialization operation using the provided
+ * connection on a given base DN required for replication to work.
+ * @param baseDN the base DN that we want to reset.
+ * @param ctx the connection to the server.
+ * @param displayProgress whether to display operation progress or not.
+ * @throws ReplicationCliException if there is an error performing the
+ * operation.
+ */
+ private void postExternalInitialization(String baseDN, InitialLdapContext ctx,
+ boolean displayProgress) throws ReplicationCliException
+ {
+ postPreExternalInitialization(baseDN, ctx, false, displayProgress, false);
+ }
+
+ /**
+ * Launches the pre or post external initialization operation using the
+ * provided connection on a given base DN.
+ * @param baseDN the base DN that we want to reset.
+ * @param ctx the connection to the server.
+ * @param localOnly whether the resetting internal operations must only apply
+ * to the server to which we are connected.
+ * @param displayProgress whether to display operation progress or not.
+ * @param isPre whether this is the pre operation or the post operation.
+ * @throws ReplicationCliException if there is an error performing the
+ * operation.
+ */
+ private void postPreExternalInitialization(String baseDN,
+ InitialLdapContext ctx, boolean localOnly, boolean displayProgress,
+ boolean isPre) throws ReplicationCliException
+ {
+ boolean taskCreated = false;
+ int i = 1;
+ boolean isOver = false;
+ String dn = null;
+ BasicAttributes attrs = new BasicAttributes();
+ Attribute oc = new BasicAttribute("objectclass");
+ oc.add("top");
+ oc.add("ds-task");
+ oc.add("ds-task-reset-generation-id");
+ attrs.put(oc);
+ attrs.put("ds-task-class-name",
+ "org.opends.server.tasks.SetGenerationIdTask");
+ if (isPre)
+ {
+ if (!localOnly)
+ {
+ attrs.put("ds-task-reset-generation-id-new-value", "-1");
+ }
+ else
+ {
+ try
+ {
+ attrs.put("ds-task-reset-generation-id-new-value",
+ String.valueOf(getReplicationDomainId(ctx, baseDN)));
+ }
+ catch (NamingException ne)
+ {
+ LOG.log(Level.SEVERE, "Error get replication domain id for base DN "+
+ baseDN+" on server "+ConnectionUtils.getHostPort(ctx), ne);
+
+ throw new ReplicationCliException(getThrowableMsg(
+ ERR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION.get(), ne),
+ ERROR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION, ne);
+ }
+ }
+ }
+ attrs.put("ds-task-reset-generation-id-domain-base-dn", baseDN);
+ while (!taskCreated)
+ {
+ String id = "dsreplication-reset-generation-id-"+i;
+ dn = "ds-task-id="+id+",cn=Scheduled Tasks,cn=Tasks";
+ attrs.put("ds-task-id", id);
+ try
+ {
+ DirContext dirCtx = ctx.createSubcontext(dn, attrs);
+ taskCreated = true;
+ LOG.log(Level.INFO, "created task entry: "+attrs);
+ dirCtx.close();
+ }
+ catch (NameAlreadyBoundException x)
+ {
+ }
+ catch (NamingException ne)
+ {
+ LOG.log(Level.SEVERE, "Error creating task "+attrs, ne);
+ Message msg = isPre ?
+ ERR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION.get():
+ ERR_LAUNCHING_POST_EXTERNAL_INITIALIZATION.get();
+ ReplicationCliReturnCode code = isPre?
+ ERROR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION:
+ ERROR_LAUNCHING_POST_EXTERNAL_INITIALIZATION;
+ throw new ReplicationCliException(
+ getThrowableMsg(msg, ne), code, ne);
+ }
+ i++;
+ }
+ // Wait until it is over
+ SearchControls searchControls = new SearchControls();
+ searchControls.setCountLimit(1);
+ searchControls.setSearchScope(
+ SearchControls. OBJECT_SCOPE);
+ String filter = "objectclass=*";
+ searchControls.setReturningAttributes(
+ new String[] {
+ "ds-task-log-message",
+ "ds-task-state"
+ });
+ String lastLogMsg = null;
+ while (!isOver)
+ {
+ try
+ {
+ Thread.sleep(500);
+ }
+ catch (Throwable t)
+ {
+ }
+ try
+ {
+ NamingEnumeration res = ctx.search(dn, filter, searchControls);
+ SearchResult sr = (SearchResult)res.next();
+ String logMsg = getFirstValue(sr, "ds-task-log-message");
+ if (logMsg != null)
+ {
+ if (!logMsg.equals(lastLogMsg))
+ {
+ LOG.log(Level.INFO, logMsg);
+ lastLogMsg = logMsg;
+ }
+ }
+ InstallerHelper helper = new InstallerHelper();
+ String state = getFirstValue(sr, "ds-task-state");
+
+ if (helper.isDone(state) || helper.isStoppedByError(state))
+ {
+ isOver = true;
+ Message errorMsg;
+ String server = ConnectionUtils.getHostPort(ctx);
+ if (lastLogMsg == null)
+ {
+ errorMsg = isPre ?
+ INFO_ERROR_DURING_PRE_EXTERNAL_INITIALIZATION_NO_LOG.get(
+ state, server) :
+ INFO_ERROR_DURING_POST_EXTERNAL_INITIALIZATION_NO_LOG.get(
+ state, server);
+ }
+ else
+ {
+ errorMsg = isPre ?
+ INFO_ERROR_DURING_PRE_EXTERNAL_INITIALIZATION_LOG.get(
+ lastLogMsg, state, server) :
+ INFO_ERROR_DURING_POST_EXTERNAL_INITIALIZATION_LOG.get(
+ lastLogMsg, state, server);
+ }
+
+ if (helper.isCompletedWithErrors(state))
+ {
+ LOG.log(Level.WARNING, "Completed with error: "+errorMsg);
+ println(errorMsg);
+ }
+ else if (!helper.isSuccessful(state) ||
+ helper.isStoppedByError(state))
+ {
+ LOG.log(Level.WARNING, "Error: "+errorMsg);
+ ReplicationCliReturnCode code = isPre?
+ ERROR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION:
+ ERROR_LAUNCHING_POST_EXTERNAL_INITIALIZATION;
+ throw new ReplicationCliException(errorMsg, code, null);
+ }
+ }
+ }
+ catch (NameNotFoundException x)
+ {
+ isOver = true;
+ }
+ catch (NamingException ne)
+ {
+ Message msg = isPre ?
+ ERR_POOLING_PRE_EXTERNAL_INITIALIZATION.get():
+ ERR_POOLING_POST_EXTERNAL_INITIALIZATION.get();
+ throw new ReplicationCliException(
+ getThrowableMsg(msg, ne), ERROR_CONNECTING, ne);
+ }
+ }
+ }
+
+ /**
+ * Initializes a suffix with the contents of a replica that has a given
+ * replication id.
+ * @param ctx the connection to the server whose suffix we want to initialize.
+ * @param baseDN the dn of the suffix.
+ * @param displayProgress whether we want to display progress or not.
+ * @throws ApplicationException if an unexpected error occurs.
+ * @throws PeerNotFoundException if the replication mechanism cannot find
+ * a peer.
+ */
+ public void initializeAllSuffixTry(String baseDN, InitialLdapContext ctx,
+ boolean displayProgress)
+ throws ApplicationException, PeerNotFoundException
+ {
+ boolean taskCreated = false;
+ int i = 1;
+ boolean isOver = false;
+ String dn = null;
+ String serverDisplay = ConnectionUtils.getHostPort(ctx);
+ BasicAttributes attrs = new BasicAttributes();
+ Attribute oc = new BasicAttribute("objectclass");
+ oc.add("top");
+ oc.add("ds-task");
+ oc.add("ds-task-initialize-remote-replica");
+ attrs.put(oc);
+ attrs.put("ds-task-class-name",
+ "org.opends.server.tasks.InitializeTargetTask");
+ attrs.put("ds-task-initialize-domain-dn", baseDN);
+ attrs.put("ds-task-initialize-replica-server-id", "all");
+ while (!taskCreated)
+ {
+ String id = "quicksetup-initialize"+i;
+ dn = "ds-task-id="+id+",cn=Scheduled Tasks,cn=Tasks";
+ attrs.put("ds-task-id", id);
+ try
+ {
+ DirContext dirCtx = ctx.createSubcontext(dn, attrs);
+ taskCreated = true;
+ LOG.log(Level.INFO, "created task entry: "+attrs);
+ dirCtx.close();
+ }
+ catch (NameAlreadyBoundException x)
+ {
+ LOG.log(Level.WARNING, "A task with dn: "+dn+" already existed.");
+ }
+ catch (NamingException ne)
+ {
+ LOG.log(Level.SEVERE, "Error creating task "+attrs, ne);
+ throw new ApplicationException(
+ ReturnCode.APPLICATION_ERROR,
+ getThrowableMsg(INFO_ERROR_LAUNCHING_INITIALIZATION.get(
+ serverDisplay), ne), ne);
+ }
+ i++;
+ }
+ // Wait until it is over
+ SearchControls searchControls = new SearchControls();
+ searchControls.setCountLimit(1);
+ searchControls.setSearchScope(
+ SearchControls. OBJECT_SCOPE);
+ String filter = "objectclass=*";
+ searchControls.setReturningAttributes(
+ new String[] {
+ "ds-task-unprocessed-entry-count",
+ "ds-task-processed-entry-count",
+ "ds-task-log-message",
+ "ds-task-state"
+ });
+ Message lastDisplayedMsg = null;
+ String lastLogMsg = null;
+ long lastTimeMsgDisplayed = -1;
+ long lastTimeMsgLogged = -1;
+ int totalEntries = 0;
+ while (!isOver)
+ {
+ try
+ {
+ Thread.sleep(500);
+ }
+ catch (Throwable t)
+ {
+ }
+ try
+ {
+ NamingEnumeration res = ctx.search(dn, filter, searchControls);
+ SearchResult sr = (SearchResult)res.next();
+
+ // Get the number of entries that have been handled and
+ // a percentage...
+ Message msg;
+ String sProcessed = getFirstValue(sr,
+ "ds-task-processed-entry-count");
+ String sUnprocessed = getFirstValue(sr,
+ "ds-task-unprocessed-entry-count");
+ int processed = -1;
+ int unprocessed = -1;
+ if (sProcessed != null)
+ {
+ processed = Integer.parseInt(sProcessed);
+ }
+ if (sUnprocessed != null)
+ {
+ unprocessed = Integer.parseInt(sUnprocessed);
+ }
+ totalEntries = Math.max(totalEntries, processed+unprocessed);
+
+ if ((processed != -1) && (unprocessed != -1))
+ {
+ if (processed + unprocessed > 0)
+ {
+ int perc = (100 * processed) / (processed + unprocessed);
+ msg = INFO_INITIALIZE_PROGRESS_WITH_PERCENTAGE.get(sProcessed,
+ String.valueOf(perc));
+ }
+ else
+ {
+ //msg = INFO_NO_ENTRIES_TO_INITIALIZE.get();
+ msg = null;
+ }
+ }
+ else if (processed != -1)
+ {
+ msg = INFO_INITIALIZE_PROGRESS_WITH_PROCESSED.get(sProcessed);
+ }
+ else if (unprocessed != -1)
+ {
+ msg = INFO_INITIALIZE_PROGRESS_WITH_UNPROCESSED.get(sUnprocessed);
+ }
+ else
+ {
+ msg = lastDisplayedMsg;
+ }
+
+ if (msg != null)
+ {
+ long currentTime = System.currentTimeMillis();
+ /* Refresh period: to avoid having too many lines in the log */
+ long minRefreshPeriod;
+ if (totalEntries < 100)
+ {
+ minRefreshPeriod = 0;
+ }
+ else if (totalEntries < 1000)
+ {
+ minRefreshPeriod = 1000;
+ }
+ else if (totalEntries < 10000)
+ {
+ minRefreshPeriod = 5000;
+ }
+ else
+ {
+ minRefreshPeriod = 10000;
+ }
+ if (((currentTime - minRefreshPeriod) > lastTimeMsgLogged))
+ {
+ lastTimeMsgLogged = currentTime;
+ LOG.log(Level.INFO, "Progress msg: "+msg);
+ }
+ if (displayProgress)
+ {
+ if (((currentTime - minRefreshPeriod) > lastTimeMsgDisplayed) &&
+ !msg.equals(lastDisplayedMsg))
+ {
+ printProgress(msg);
+ lastDisplayedMsg = msg;
+ printlnProgress();
+ lastTimeMsgDisplayed = currentTime;
+ }
+ }
+ }
+
+ String logMsg = getFirstValue(sr, "ds-task-log-message");
+ if (logMsg != null)
+ {
+ if (!logMsg.equals(lastLogMsg))
+ {
+ LOG.log(Level.INFO, logMsg);
+ lastLogMsg = logMsg;
+ }
+ }
+ InstallerHelper helper = new InstallerHelper();
+ String state = getFirstValue(sr, "ds-task-state");
+
+ if (helper.isDone(state) || helper.isStoppedByError(state))
+ {
+ isOver = true;
+ Message errorMsg;
+ LOG.log(Level.INFO, "Last task entry: "+sr);
+ if (displayProgress && (msg != null) && !msg.equals(lastDisplayedMsg))
+ {
+ printProgress(msg);
+ lastDisplayedMsg = msg;
+ printlnProgress();
+ }
+ if (lastLogMsg == null)
+ {
+ errorMsg = INFO_ERROR_DURING_INITIALIZATION_NO_LOG.get(
+ serverDisplay, state, serverDisplay);
+ }
+ else
+ {
+ errorMsg = INFO_ERROR_DURING_INITIALIZATION_LOG.get(
+ serverDisplay, lastLogMsg, state, serverDisplay);
+ }
+
+ if (helper.isCompletedWithErrors(state))
+ {
+ LOG.log(Level.WARNING, "Processed errorMsg: "+errorMsg);
+ if (displayProgress)
+ {
+ println(errorMsg);
+ }
+ }
+ else if (!helper.isSuccessful(state) ||
+ helper.isStoppedByError(state))
+ {
+ LOG.log(Level.WARNING, "Processed errorMsg: "+errorMsg);
+ ApplicationException ae = new ApplicationException(
+ ReturnCode.APPLICATION_ERROR, errorMsg,
+ null);
+ if ((lastLogMsg == null) ||
+ helper.isPeersNotFoundError(lastLogMsg))
+ {
+ LOG.log(Level.WARNING, "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.");
+ throw ae;
+ }
+ }
+ else
+ {
+ if (displayProgress)
+ {
+ printProgress(INFO_SUFFIX_INITIALIZED_SUCCESSFULLY.get());
+ printlnProgress();
+ }
+ LOG.log(Level.INFO, "Processed msg: "+errorMsg);
+ LOG.log(Level.INFO, "Initialization completed successfully.");
+ }
+ }
+ }
+ catch (NameNotFoundException x)
+ {
+ isOver = true;
+ LOG.log(Level.INFO, "Initialization entry not found.");
+ if (displayProgress)
+ {
+ printProgress(INFO_SUFFIX_INITIALIZED_SUCCESSFULLY.get());
+ printlnProgress();
+ }
+ }
+ catch (NamingException ne)
+ {
+ throw new ApplicationException(
+ ReturnCode.APPLICATION_ERROR,
+ getThrowableMsg(INFO_ERROR_POOLING_INITIALIZATION.get(
+ serverDisplay), ne), ne);
+ }
+ }
+ }
+
+ /**
+ * Returns a set of error messages encountered in the provided TopologyCache.
+ * @param cache the topology cache.
+ * @return a set of error messages encountered in the provided TopologyCache.
+ */
+ private LinkedHashSet<Message> getErrorMessages(TopologyCache cache)
+ {
+ Set<TopologyCacheException> exceptions =
+ new HashSet<TopologyCacheException>();
+ Set<ServerDescriptor> servers = cache.getServers();
+ LinkedHashSet<Message> exceptionMsgs = new LinkedHashSet<Message>();
+ for (ServerDescriptor server : servers)
+ {
+ TopologyCacheException e = server.getLastException();
+ if (e != null)
+ {
+ exceptions.add(e);
+ }
+ }
+ /* Check the exceptions and see if we throw them or not. */
+ for (TopologyCacheException e : exceptions)
+ {
+ switch (e.getType())
+ {
+ case NOT_GLOBAL_ADMINISTRATOR:
+ exceptionMsgs.add(INFO_NOT_GLOBAL_ADMINISTRATOR_PROVIDED.get());
+
+ break;
+ case GENERIC_CREATING_CONNECTION:
+ if ((e.getCause() != null) &&
+ Utils.isCertificateException(e.getCause()))
+ {
+ exceptionMsgs.add(
+ INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE_SERVER.get(
+ e.getHostPort(), e.getCause().getMessage()));
+ }
+ else
+ {
+ exceptionMsgs.add(Utils.getMessage(e));
+ }
+ break;
+ default:
+ exceptionMsgs.add(Utils.getMessage(e));
+ }
+ }
+ return exceptionMsgs;
+ }
+
+ /**
+ * Removes the references to a replication server in the base DNs of a
+ * given server.
+ * @param server the server that we want to update.
+ * @param replicationServer the replication server whose references we want
+ * to remove.
+ * @param bindDn the bindDn that must be used to log to the server.
+ * @param pwd the password that must be used to log to the server.
+ * @param baseDNs the list of base DNs where we want to remove the references
+ * to the provided replication server.
+ * @param removeFromReplicationServers if references must be removed from
+ * the replication servers.
+ * @param preferredURLs the preferred LDAP URLs to be used to connect to the
+ * server.
+ * @throws ReplicationCliException if there is an error updating the
+ * configuration.
+ */
+ private void removeReferencesInServer(ServerDescriptor server,
+ String replicationServer, String bindDn, String pwd,
+ Collection<String> baseDNs, boolean updateReplicationServers,
+ LinkedHashSet<PreferredConnection> cnx)
+ throws ReplicationCliException
+ {
+ TopologyCacheFilter filter = new TopologyCacheFilter();
+ filter.setSearchMonitoringInformation(false);
+ filter.setSearchBaseDNInformation(false);
+ ServerLoader loader = new ServerLoader(server.getAdsProperties(), bindDn,
+ pwd, getTrustManager(), cnx, filter);
+ InitialLdapContext ctx = null;
+ String lastBaseDN = null;
+ String hostPort = null;
+ try
+ {
+ ctx = loader.createContext();
+ hostPort = ConnectionUtils.getHostPort(ctx);
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ ReplicationSynchronizationProviderCfgClient sync = null;
+ try
+ {
+ sync = (ReplicationSynchronizationProviderCfgClient)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+ }
+ catch (ManagedObjectNotFoundException monfe)
+ {
+ // It does not exist.
+ LOG.log(Level.INFO, "No synchronization found on "+ hostPort +".",
+ monfe);
+ }
+ if (sync != null)
+ {
+ String[] domainNames = sync.listReplicationDomains();
+ if (domainNames != null)
+ {
+ for (int i=0; i<domainNames.length; i++)
+ {
+ ReplicationDomainCfgClient domain =
+ sync.getReplicationDomain(domainNames[i]);
+ for (String baseDN : baseDNs)
+ {
+ lastBaseDN = baseDN;
+ if (Utils.areDnsEqual(domain.getBaseDN().toString(),
+ baseDN))
+ {
+ printProgress(formatter.getFormattedWithPoints(
+ INFO_REPLICATION_REMOVING_REFERENCES_ON_REMOTE.get(baseDN,
+ hostPort)));
+ Set<String> replServers = domain.getReplicationServer();
+ if (replServers != null)
+ {
+ String replServer = null;
+ for (String o : replServers)
+ {
+ if (replicationServer.equalsIgnoreCase(o))
+ {
+ replServer = o;
+ break;
+ }
+ }
+ if (replServer != null)
+ {
+ LOG.log(Level.INFO, "Updating references in domain " +
+ domain.getBaseDN()+" on " + hostPort + ".");
+ replServers.remove(replServer);
+ if (replServers.size() > 0)
+ {
+ domain.setReplicationServer(replServers);
+ domain.commit();
+ }
+ else
+ {
+ sync.removeReplicationDomain(domainNames[i]);
+ sync.commit();
+ }
+ }
+ }
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ }
+ }
+ }
+ }
+ if (updateReplicationServers && sync.hasReplicationServer())
+ {
+ ReplicationServerCfgClient rServerObj = sync.getReplicationServer();
+ Set<String> replServers = rServerObj.getReplicationServer();
+ if (replServers != null)
+ {
+ String replServer = null;
+ for (String o : replServers)
+ {
+ if (replicationServer.equalsIgnoreCase(o))
+ {
+ replServer = o;
+ break;
+ }
+ }
+ if (replServer != null)
+ {
+ replServers.remove(replServer);
+ if (replServers.size() > 0)
+ {
+ rServerObj.setReplicationServer(replServers);
+ rServerObj.commit();
+ }
+ else
+ {
+ sync.removeReplicationServer();
+ sync.commit();
+ }
+ }
+ }
+ }
+ }
+ }
+ catch (NamingException ne)
+ {
+ hostPort = getHostPort(server, cnx);
+ Message msg = getMessageForException(ne, hostPort);
+ throw new ReplicationCliException(msg, ERROR_CONNECTING, ne);
+ }
+ catch (OpenDsException ode)
+ {
+ if (lastBaseDN != null)
+ {
+ Message msg = getMessageForDisableException(ode, hostPort, lastBaseDN);
+ throw new ReplicationCliException(msg,
+ ERROR_DISABLING_REPLICATION_REMOVE_REFERENCE_ON_BASEDN, ode);
+ }
+ else
+ {
+ Message msg = ERR_REPLICATION_ERROR_READING_CONFIGURATION.get(hostPort,
+ ode.getMessage());
+ throw new ReplicationCliException(msg, ERROR_CONNECTING, ode);
+ }
+ }
+ finally
+ {
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (Throwable t)
+ {
+ }
+ }
+ }
+ }
+
+ /**
+ * Deletes a replication domain in a server for a given base DN (disable
+ * replication of the base DN).
+ * @param ctx the connection to the server.
+ * @param baseDN the base DN of the replication domain that we want to
+ * delete.
+ * @throws ReplicationCliException if there is an error updating the
+ * configuration of the server.
+ */
+ private void deleteReplicationDomain(InitialLdapContext ctx,
+ String baseDN) throws ReplicationCliException
+ {
+ String hostPort = ConnectionUtils.getHostPort(ctx);
+ try
+ {
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ ReplicationSynchronizationProviderCfgClient sync = null;
+ try
+ {
+ sync = (ReplicationSynchronizationProviderCfgClient)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+ }
+ catch (ManagedObjectNotFoundException monfe)
+ {
+ // It does not exist.
+ LOG.log(Level.INFO, "No synchronization found on "+ hostPort +".",
+ monfe);
+ }
+ if (sync != null)
+ {
+ String[] domainNames = sync.listReplicationDomains();
+ if (domainNames != null)
+ {
+ for (int i=0; i<domainNames.length; i++)
+ {
+ ReplicationDomainCfgClient domain =
+ sync.getReplicationDomain(domainNames[i]);
+ if (Utils.areDnsEqual(domain.getBaseDN().toString(), baseDN))
+ {
+ printProgress(formatter.getFormattedWithPoints(
+ INFO_REPLICATION_DISABLING_BASEDN.get(baseDN,
+ hostPort)));
+ sync.removeReplicationDomain(domainNames[i]);
+ sync.commit();
+
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ }
+ }
+ }
+ }
+ }
+ catch (OpenDsException ode)
+ {
+ Message msg = getMessageForDisableException(ode, hostPort, baseDN);
+ throw new ReplicationCliException(msg,
+ ERROR_DISABLING_REPLICATION_REMOVE_REFERENCE_ON_BASEDN, ode);
+ }
+ }
+
+ /**
+ * Disables the replication server for a given server.
+ * @param ctx the connection to the server.
+ * @throws ReplicationCliException if there is an error updating the
+ * configuration of the server.
+ */
+ private void disableReplicationServer(InitialLdapContext ctx)
+ throws ReplicationCliException
+ {
+ String hostPort = ConnectionUtils.getHostPort(ctx);
+ try
+ {
+ ManagementContext mCtx = LDAPManagementContext.createFromContext(
+ JNDIDirContextAdaptor.adapt(ctx));
+ RootCfgClient root = mCtx.getRootConfiguration();
+ ReplicationSynchronizationProviderCfgClient sync = null;
+ ReplicationServerCfgClient replicationServer = null;
+ try
+ {
+ sync = (ReplicationSynchronizationProviderCfgClient)
+ root.getSynchronizationProvider("Multimaster Synchronization");
+ if (sync.hasReplicationServer())
+ {
+ replicationServer = sync.getReplicationServer();
+ }
+ }
+ catch (ManagedObjectNotFoundException monfe)
+ {
+ // It does not exist.
+ LOG.log(Level.INFO, "No synchronization found on "+ hostPort +".",
+ monfe);
+ }
+ if (replicationServer != null)
+ {
+
+ String s = String.valueOf(replicationServer.getReplicationPort());
+ printProgress(formatter.getFormattedWithPoints(
+ INFO_REPLICATION_DISABLING_REPLICATION_SERVER.get(s,
+ hostPort)));
+
+ sync.removeReplicationServer();
+ sync.commit();
+ printProgress(formatter.getFormattedDone());
+ printlnProgress();
+ }
+ }
+ catch (OpenDsException ode)
+ {
+ throw new ReplicationCliException(
+ ERR_REPLICATION_DISABLING_REPLICATIONSERVER.get(hostPort),
+ ERROR_DISABLING_REPLICATION_SERVER,
+ ode);
+ }
+ }
+
+ /**
+ * Returns a message object for the given NamingException.
+ * @param ne the NamingException.
+ * @param hostPort the hostPort representation of the server we were
+ * contacting when the NamingException occurred.
+ * @return a message object for the given NamingException.
+ */
+ private Message getMessageForException(NamingException ne, String hostPort)
+ {
+ Message msg;
+ if (Utils.isCertificateException(ne))
+ {
+ msg = INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE_SERVER.get(
+ hostPort, ne.toString(true));
+ }
+ else
+ {
+ msg = INFO_CANNOT_CONNECT_TO_REMOTE_GENERIC.get(
+ hostPort, ne.toString(true));
+ }
+ return msg;
+ }
+
+ /**
+ * Returns a message for a given OpenDsException (we assume that was an
+ * exception generated updating the configuration of the server) that
+ * occurred when we were configuring the replication server.
+ * @param ode the OpenDsException.
+ * @param hostPort the hostPort representation of the server we were
+ * contacting when the OpenDsException occurred.
+ * @return a message for a given OpenDsException (we assume that was an
+ * exception generated updating the configuration of the server) that
+ * occurred when we were configuring the replication server.
+ */
+ private Message getMessageForReplicationServerException(OpenDsException ode,
+ String hostPort)
+ {
+ return ERR_REPLICATION_CONFIGURING_REPLICATIONSERVER.get(hostPort);
+ }
+
+ /**
+ * Returns a message for a given OpenDsException (we assume that was an
+ * exception generated updating the configuration of the server) that
+ * occurred when we were configuring some replication domain (creating
+ * the replication domain or updating the list of replication servers of
+ * the replication domain).
+ * @param ode the OpenDsException.
+ * @param hostPort the hostPort representation of the server we were
+ * contacting when the OpenDsException occurred.
+ * @return a message for a given OpenDsException (we assume that was an
+ * exception generated updating the configuration of the server) that
+ * occurred when we were configuring some replication domain (creating
+ * the replication domain or updating the list of replication servers of
+ * the replication domain).
+ */
+ private Message getMessageForEnableException(OpenDsException ode,
+ String hostPort, String baseDN)
+ {
+ return ERR_REPLICATION_CONFIGURING_BASEDN.get(baseDN, hostPort);
+ }
+
+ /**
+ * Returns a message for a given OpenDsException (we assume that was an
+ * exception generated updating the configuration of the server) that
+ * occurred when we were configuring some replication domain (deleting
+ * the replication domain or updating the list of replication servers of
+ * the replication domain).
+ * @param ode the OpenDsException.
+ * @param hostPort the hostPort representation of the server we were
+ * contacting when the OpenDsException occurred.
+ * @return a message for a given OpenDsException (we assume that was an
+ * exception generated updating the configuration of the server) that
+ * occurred when we were configuring some replication domain (deleting
+ * the replication domain or updating the list of replication servers of
+ * the replication domain).
+ */
+ private Message getMessageForDisableException(OpenDsException ode,
+ String hostPort, String baseDN)
+ {
+ return ERR_REPLICATION_CONFIGURING_BASEDN.get(baseDN, hostPort);
+ }
+
+ /**
+ * Returns a message informing the user that the provided port cannot be used.
+ * @param port the port that cannot be used.
+ * @return a message informing the user that the provided port cannot be used.
+ */
+ private Message getCannotBindToPortError(int port)
+ {
+ Message message;
+ if (SetupUtils.isPriviledgedPort(port))
+ {
+ message = ERR_INSTALLDS_CANNOT_BIND_TO_PRIVILEGED_PORT.get(port);
+ }
+ else
+ {
+ message = ERR_INSTALLDS_CANNOT_BIND_TO_PORT.get(port);
+ }
+ return message;
+ }
+
+ /**
+ * Convenience method used to know if one Set of replication servers equals
+ * another set of replication servers.
+ * @param s1 the first set of replication servers.
+ * @param s2 the second set of replication servers.
+ * @return <CODE>true</CODE> if the two sets represent the same replication
+ * servers and <CODE>false</CODE> otherwise.
+ */
+ private boolean areReplicationServersEqual(Set<String> s1, Set<String> s2)
+ {
+ Set<String> c1 = new HashSet<String>();
+ for (String s : s1)
+ {
+ c1.add(s.toLowerCase());
+ }
+ Set<String> c2 = new HashSet<String>();
+ for (String s : s2)
+ {
+ c2.add(s.toLowerCase());
+ }
+ return c1.equals(c2);
+ }
+
+ /**
+ * Convenience method used to merge two Sets of replication servers.
+ * @param s1 the first set of replication servers.
+ * @param s2 the second set of replication servers.
+ * @return a Set of replication servers containing all the replication servers
+ * specified in the provided Sets.
+ */
+ private Set<String> mergeReplicationServers(Set<String> s1, Set<String> s2)
+ {
+ Set<String> c1 = new HashSet<String>();
+ for (String s : s1)
+ {
+ c1.add(s.toLowerCase());
+ }
+ for (String s : s2)
+ {
+ c1.add(s.toLowerCase());
+ }
+ return c1;
+ }
+
+ /**
+ * Returns the message that must be displayed to the user for a given
+ * exception. This is assumed to be a critical exception that stops all
+ * the processing.
+ * @param rce the ReplicationCliException.
+ * @return a message to be displayed to the user.
+ */
+ private Message getCriticalExceptionMessage(ReplicationCliException rce)
+ {
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(rce.getMessageObject());
+ File logFile = QuickSetupLog.getLogFile();
+ if (logFile != null)
+ {
+ mb.append(Constants.LINE_SEPARATOR);
+ mb.append(INFO_GENERAL_SEE_FOR_DETAILS.get(logFile.getPath()));
+ }
+ // Check if the cause has already been included in the message
+ Throwable c = rce.getCause();
+ if (c != null)
+ {
+ String s;
+ if (c instanceof NamingException)
+ {
+ s = ((NamingException)c).toString(true);
+ }
+ else
+ {
+ s = c.toString();
+ }
+ if (mb.toString().indexOf(s) == -1)
+ {
+ mb.append(Constants.LINE_SEPARATOR);
+ mb.append(INFO_REPLICATION_CRITICAL_ERROR_DETAILS.get(s));
+ }
+ }
+ return mb.toMessage();
+ }
+
+ /**
+ * Basic method to know if the host is local or not. This is only used to
+ * know if we can perform a port check or not.
+ * @param host the host to analyze.
+ * @return <CODE>true</CODE> if it is the local host and <CODE>false</CODE>
+ * otherwise.
+ */
+ private boolean isLocalHost(String host)
+ {
+ boolean isLocalHost = false;
+ if (!"localhost".equalsIgnoreCase(host))
+ {
+ try
+ {
+ InetAddress localAddress = InetAddress.getLocalHost();
+ InetAddress[] addresses = InetAddress.getAllByName(host);
+ for (int i=0; i<addresses.length && !isLocalHost; i++)
+ {
+ isLocalHost = localAddress.equals(addresses[i]);
+ }
+ }
+ catch (Throwable t)
+ {
+ LOG.log(Level.WARNING, "Failing checking host names: "+t, t);
+ }
+ }
+ else
+ {
+ isLocalHost = true;
+ }
+ return isLocalHost;
+ }
+
+ private boolean mustInitializeSchema(ServerDescriptor server1,
+ ServerDescriptor server2)
+ {
+ boolean mustInitializeSchema = false;
+ if (!argParser.noSchemaReplication())
+ {
+ String id1 = server1.getSchemaReplicationID();
+ String id2 = server2.getSchemaReplicationID();
+ if (id1 != null)
+ {
+ mustInitializeSchema = id1.equals(id2);
+ }
+ else
+ {
+ mustInitializeSchema = true;
+ }
+ }
+ return mustInitializeSchema;
+ }
+
+ /**
+ * This method registers a server in a given ADSContext. If the server was
+ * already registered it unregisters it and registers again (some properties
+ * might have changed).
+ * @param adsContext the ADS Context to be used.
+ * @param server the server to be registered.
+ * @throws ADSContextException if an error occurs during the registration or
+ * unregistration of the server.
+ */
+ private void registerServer(ADSContext adsContext,
+ Map<ADSContext.ServerProperty, Object> serverProperties)
+ throws ADSContextException
+ {
+ try
+ {
+ adsContext.registerServer(serverProperties);
+ }
+ catch (ADSContextException ade)
+ {
+ if (ade.getError() ==
+ ADSContextException.ErrorType.ALREADY_REGISTERED)
+ {
+ LOG.log(Level.WARNING, "The server was already registered: "+
+ serverProperties);
+ adsContext.unregisterServer(serverProperties);
+ adsContext.registerServer(serverProperties);
+ }
+ else
+ {
+ throw ade;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isAdvancedMode() {
+ return false;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isInteractive() {
+ if (forceNonInteractive)
+ {
+ return false;
+ }
+ else
+ {
+ return argParser.isInteractive();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isMenuDrivenMode() {
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isQuiet()
+ {
+ return argParser.isQuiet();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isScriptFriendly() {
+ return argParser.isScriptFriendly();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isVerbose() {
+ return true;
+ }
+
+ /**
+ * Commodity method used to repeatidly ask the user to provide a port value.
+ * @param prompt the prompt message.
+ * @param defaultValue the default value of the port to be proposed to the
+ * user.
+ * @return the port value provided by the user.
+ */
+ private int askPort(Message prompt, int defaultValue)
+ {
+ int port = -1;
+ while (port == -1)
+ {
+ try
+ {
+ port = readPort(prompt, defaultValue);
+ }
+ catch (CLIException ce)
+ {
+ port = -1;
+ LOG.log(Level.WARNING, "Error reading input: "+ce, ce);
+ }
+ }
+ return port;
+ }
+
+ /**
+ * Prompts the user to give the Global Administrator UID.
+ * @param defaultValue the default value that will be proposed in the prompt
+ * message.
+ * @return the Global Administrator UID as provided by the user.
+ */
+ private String askForAdministratorUID(String defaultValue)
+ {
+ String s = defaultValue;
+ try
+ {
+ s = readInput(INFO_ADMINISTRATOR_UID_PROMPT.get(), defaultValue);
+ }
+ catch (CLIException ce)
+ {
+ LOG.log(Level.WARNING, "Error reading input: "+ce, ce);
+ }
+ return s;
+ }
+
+ /**
+ * Prompts the user to give the Global Administrator password.
+ * @return the Global Administrator password as provided by the user.
+ */
+ private String askForAdministratorPwd()
+ {
+ String pwd = readPassword(INFO_ADMINISTRATOR_PWD_PROMPT.get(), LOG);
+ return pwd;
+ }
+
+ /**
+ * Prints a message to the output with no wrapping if we are not in quiet
+ * mode.
+ * @param msg the message to be displayed.
+ */
+ private void printProgressMessageNoWrap(Message msg)
+ {
+ if (!isQuiet())
+ {
+ getOutputStream().print(msg.toString());
+ }
+ }
+
+ /**
+ * Resets the connection parameters for the LDAPConsoleInteraction object.
+ * The reset does not apply to the certificate parameters. This is called
+ * in order the LDAPConnectionConsoleInteraction object to ask for all this
+ * connection parameters next time we call
+ * LDAPConnectionConsoleInteraction.run().
+ */
+ private void resetConnectionArguments()
+ {
+ argParser.getSecureArgsList().hostNameArg.clearValues();
+ argParser.getSecureArgsList().hostNameArg.setPresent(false);
+ argParser.getSecureArgsList().portArg.clearValues();
+ argParser.getSecureArgsList().portArg.setPresent(false);
+ // This is done to be able to call IntegerArgument.getIntValue()
+ argParser.getSecureArgsList().portArg.addValue(
+ argParser.getSecureArgsList().portArg.getDefaultValue());
+ argParser.getSecureArgsList().bindDnArg.clearValues();
+ argParser.getSecureArgsList().bindDnArg.setPresent(false);
+ argParser.getSecureArgsList().bindPasswordArg.clearValues();
+ argParser.getSecureArgsList().bindPasswordArg.setPresent(false);
+ argParser.getSecureArgsList().bindPasswordFileArg.clearValues();
+ argParser.getSecureArgsList().bindPasswordFileArg.setPresent(false);
+ argParser.getSecureArgsList().adminUidArg.clearValues();
+ argParser.getSecureArgsList().adminUidArg.setPresent(false);
+ }
+
+ /**
+ * Initializes the global arguments in the parser with the provided values.
+ */
+ private void initializeGlobalArguments(String hostName, int port,
+ String adminUid, String bindDn,
+ String bindPwd)
+ {
+ resetConnectionArguments();
+ if (hostName != null)
+ {
+ argParser.getSecureArgsList().hostNameArg.addValue(hostName);
+ argParser.getSecureArgsList().hostNameArg.setPresent(true);
+ }
+ // resetConnectionArguments does not clear the values for the port
+ argParser.getSecureArgsList().portArg.clearValues();
+ if (port != -1)
+ {
+ argParser.getSecureArgsList().portArg.addValue(String.valueOf(port));
+ argParser.getSecureArgsList().portArg.setPresent(true);
+ }
+ else
+ {
+ // This is done to be able to call IntegerArgument.getIntValue()
+ argParser.getSecureArgsList().portArg.addValue(
+ argParser.getSecureArgsList().portArg.getDefaultValue());
+ }
+ argParser.getSecureArgsList().useSSLArg.setPresent(useSSL);
+ argParser.getSecureArgsList().useStartTLSArg.setPresent(useStartTLS);
+ if (adminUid != null)
+ {
+ argParser.getSecureArgsList().adminUidArg.addValue(adminUid);
+ argParser.getSecureArgsList().adminUidArg.setPresent(true);
+ }
+ if (bindDn != null)
+ {
+ argParser.getSecureArgsList().bindDnArg.addValue(bindDn);
+ argParser.getSecureArgsList().bindDnArg.setPresent(true);
+ }
+ if (bindPwd != null)
+ {
+ argParser.getSecureArgsList().bindPasswordArg.addValue(bindPwd);
+ argParser.getSecureArgsList().bindPasswordArg.setPresent(true);
+ }
+ }
+
+
+ /**
+ * Forces the initialization of the trust manager in the
+ * LDAPConnectionInteraction object.
+ */
+ private void forceTrustManagerInitialization()
+ {
+ forceNonInteractive = true;
+ try
+ {
+ ci.initializeTrustManagerIfRequired();
+ }
+ catch (ArgumentException ae)
+ {
+ LOG.log(Level.WARNING, "Error initializing trust store: "+ae, ae);
+ }
+ forceNonInteractive = false;
+ }
+
+ /**
+ * Returns the replication domain ID for a given baseDN on the server.
+ * @param ctx the connection to the server.
+ * @param baseDN the baseDN for which we want the replication domain ID.
+ * @return the replication domain ID or -1 if the replication domain ID
+ * could not be found.
+ * @throws NamingException if an error occurred reading the configuration
+ * information.
+ */
+ private int getReplicationDomainId(InitialLdapContext ctx, String baseDN)
+ throws NamingException
+ {
+ int domainId = -1;
+ TopologyCacheFilter filter = new TopologyCacheFilter();
+ filter.setSearchMonitoringInformation(false);
+ filter.addBaseDNToSearch(baseDN);
+ ServerDescriptor server = ServerDescriptor.createStandalone(ctx, filter);
+ for (ReplicaDescriptor replica : server.getReplicas())
+ {
+ if (Utils.areDnsEqual(replica.getSuffix().getDN(), baseDN))
+ {
+ domainId = replica.getReplicationId();
+ break;
+ }
+ }
+ return domainId;
+ }
+
+ /**
+ * Method used to compare two server registries.
+ * @param registry1 the first registry to compare.
+ * @param registry2 the second registry to compare.
+ * @return <CODE>true</CODE> if the registries are equal and
+ * <CODE>false</CODE> otherwise.
+ */
+ private boolean areEqual(
+ Set<Map<ADSContext.ServerProperty, Object>> registry1,
+ Set<Map<ADSContext.ServerProperty, Object>> registry2)
+ {
+ boolean areEqual = registry1.size() == registry2.size();
+ if (areEqual)
+ {
+ Set<ADSContext.ServerProperty> propertiesToCompare =
+ new HashSet<ADSContext.ServerProperty>();
+ ADSContext.ServerProperty[] properties =
+ ADSContext.ServerProperty.values();
+ for (int i=0; i<properties.length; i++)
+ {
+ if (properties[i].getAttributeSyntax() !=
+ ADSPropertySyntax.CERTIFICATE_BINARY)
+ {
+ propertiesToCompare.add(properties[i]);
+ }
+ }
+ for (Map<ADSContext.ServerProperty, Object> server1 : registry1)
+ {
+ boolean found = false;
+
+ for (Map<ADSContext.ServerProperty, Object> server2 : registry2)
+ {
+ found = true;
+ for (ADSContext.ServerProperty prop : propertiesToCompare)
+ {
+ Object v1 = server1.get(prop);
+ Object v2 = server2.get(prop);
+ if (v1 != null)
+ {
+ found = v1.equals(v2);
+ }
+ else if (v2 != null)
+ {
+ found = false;
+ }
+ if (!found)
+ {
+ break;
+ }
+ }
+ if (found)
+ {
+ break;
+ }
+ }
+
+ areEqual = found;
+ if (!areEqual)
+ {
+ break;
+ }
+ }
+ }
+ return areEqual;
+ }
+
+ /**
+ * Tells whether we are trying to disable all the replicated suffixes.
+ * @param uData the disable replication data provided by the user.
+ * @return <CODE>true</CODE> if we want to disable all the replicated suffixes
+ * and <CODE>false</CODE> otherwise.
+ */
+ private boolean disableAllBaseDns(InitialLdapContext ctx,
+ DisableReplicationUserData uData)
+ {
+ boolean returnValue = true;
+ Collection<ReplicaDescriptor> replicas = getReplicas(ctx);
+ Set<String> replicatedSuffixes = new HashSet<String>();
+ for (ReplicaDescriptor rep : replicas)
+ {
+ String dn = rep.getSuffix().getDN();
+ if (rep.isReplicated())
+ {
+ replicatedSuffixes.add(dn);
+ }
+ }
+
+ for (String dn1 : replicatedSuffixes)
+ {
+ if (!Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(), dn1) &&
+ !Utils.areDnsEqual(Constants.SCHEMA_DN, dn1))
+ {
+ boolean found = false;
+ for (String dn2 : uData.getBaseDNs())
+ {
+ found = Utils.areDnsEqual(dn1, dn2);
+ break;
+ }
+ if (!found)
+ {
+ returnValue = false;
+ }
+ }
+ }
+ return returnValue;
+ }
+
+ /**
+ * Commodity method that generates a list of preferred connection (of just
+ * one) with the information on a given InitialLdapContext.
+ * @param ctx the connection we retrieve the inforamtion from.
+ * @return a list containing the preferred connection object.
+ */
+ private LinkedHashSet<PreferredConnection> getPreferredConnections(
+ InitialLdapContext ctx)
+ {
+ PreferredConnection cnx = PreferredConnection.getPreferredConnection(ctx);
+ LinkedHashSet<PreferredConnection> returnValue =
+ new LinkedHashSet<PreferredConnection>();
+ returnValue.add(cnx);
+ return returnValue;
+ }
+
+ /**
+ * Returns the host port representation of the server to be used in progress,
+ * status and error messages. It takes into account the fact the host and
+ * port provided by the user.
+ * @param server the ServerDescriptor.
+ * @param cnx the preferred connections list.
+ * @return the host port string representation of the provided server.
+ */
+ protected String getHostPort(ServerDescriptor server,
+ Collection<PreferredConnection> cnx)
+ {
+ String hostPort = null;
+
+ for (PreferredConnection connection : cnx)
+ {
+ String url = connection.getLDAPURL();
+ if (url.equals(server.getLDAPURL()))
+ {
+ hostPort = server.getHostPort(false);
+ }
+ else if (url.equals(server.getLDAPsURL()))
+ {
+ hostPort = server.getHostPort(true);
+ }
+ }
+ if (hostPort == null)
+ {
+ hostPort = server.getHostPort(true);
+ }
+ return hostPort;
+ }
+
+ /**
+ * Prompts the user for the subcommand that should be executed.
+ * @return the subcommand choice of the user.
+ */
+ private SubcommandChoice promptForSubcommand()
+ {
+ SubcommandChoice returnValue;
+ MenuBuilder<SubcommandChoice> builder =
+ new MenuBuilder<SubcommandChoice>(this);
+ builder.setPrompt(INFO_REPLICATION_SUBCOMMAND_PROMPT.get());
+ builder.addCancelOption(false);
+ for (SubcommandChoice choice : SubcommandChoice.values())
+ {
+ if (choice != SubcommandChoice.CANCEL)
+ {
+ builder.addNumberedOption(choice.getPrompt(),
+ MenuResult.success(choice));
+ }
+ }
+ try
+ {
+ MenuResult<SubcommandChoice> m = builder.toMenu().run();
+ if (m.isSuccess())
+ {
+ returnValue = m.getValue();
+ }
+ else
+ {
+ // The user cancelled
+ returnValue = SubcommandChoice.CANCEL;
+ }
+ }
+ catch (CLIException ce)
+ {
+ returnValue = SubcommandChoice.CANCEL;
+ LOG.log(Level.WARNING, "Error reading input: "+ce, ce);
+ }
+ return returnValue;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java
new file mode 100644
index 0000000..968ce15
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java
@@ -0,0 +1,216 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2007-2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+import static org.opends.messages.AdminToolMessages.*;
+
+import org.opends.messages.Message;
+
+/**
+ *
+ * The enumeration which defines the return code.
+ *
+ */
+public enum ReplicationCliReturnCode
+{
+ /**
+ * successful.
+ */
+ SUCCESSFUL(0, INFO_REPLICATION_SUCCESSFUL.get()),
+
+ /**
+ * successful but no operation was performed.
+ */
+ SUCCESSFUL_NOP(SUCCESSFUL.getReturnCode(),
+ INFO_REPLICATION_SUCCESSFUL_NOP.get()),
+
+ /**
+ * Unable to initialize arguments.
+ */
+ CANNOT_INITIALIZE_ARGS(1, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Cannot parse arguments because the user provided arguments are not valid
+ * or there was an error checking the user data.
+ */
+ ERROR_USER_DATA(2, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * The user cancelled the operation in interactive mode.
+ */
+ USER_CANCELLED(3, ERR_REPLICATION_USER_CANCELLED.get()),
+
+ /**
+ * Unexpected error (potential bug).
+ */
+ CONFLICTING_ARGS(4, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * The provided base DNs cannot be used to enable replication.
+ */
+ REPLICATION_CANNOT_BE_ENABLED_ON_BASEDN(5, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * The provided base DNs cannot be used to disable replication.
+ */
+ REPLICATION_CANNOT_BE_DISABLED_ON_BASEDN(6, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * The provided base DNs cannot be used to initialize the contents of the
+ * replicas.
+ */
+ REPLICATION_CANNOT_BE_INITIALIZED_ON_BASEDN(7,
+ ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error connecting with the provided credentials.
+ */
+ ERROR_CONNECTING(8, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Could not find the replication ID of the domain to be used to initialize
+ * the replica.
+ */
+ REPLICATIONID_NOT_FOUND(9, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * The number of tries we perform to start the initialization are over.
+ * We systematically receive a peer not found error.
+ */
+ INITIALIZING_TRIES_COMPLETED(10, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error enabling replication on a base DN.
+ */
+ ERROR_ENABLING_REPLICATION_ON_BASEDN(11, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error initializing base DN.
+ */
+ ERROR_INITIALIZING_BASEDN_GENERIC(12, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error reading configuration.
+ */
+ ERROR_READING_CONFIGURATION(13, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error updating ADS.
+ */
+ ERROR_UPDATING_ADS(14, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error reading ADS.
+ */
+ ERROR_READING_ADS(15, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error reading TopologyCache.
+ */
+ ERROR_READING_TOPOLOGY_CACHE(16, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error configuring replication server.
+ */
+ ERROR_CONFIGURING_REPLICATIONSERVER(17, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Unsupported ADS scenario.
+ */
+ REPLICATION_ADS_MERGE_NOT_SUPPORTED(18, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error disabling replication on base DN.
+ */
+ ERROR_DISABLING_REPLICATION_ON_BASEDN(19, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error removing replication port reference on base DN.
+ */
+ ERROR_DISABLING_REPLICATION_REMOVE_REFERENCE_ON_BASEDN(20,
+ ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error initializing Administration Framework.
+ */
+ ERROR_INITIALIZING_ADMINISTRATION_FRAMEWORK(21,
+ ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error seeding trustore.
+ */
+ ERROR_SEEDING_TRUSTORE(22, ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error launching pre external initialization.
+ */
+ ERROR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION(23,
+ ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error launching pre external initialization.
+ */
+ ERROR_LAUNCHING_POST_EXTERNAL_INITIALIZATION(24,
+ ERR_REPLICATION_NO_MESSAGE.get()),
+
+ /**
+ * Error disabling replication server.
+ */
+ ERROR_DISABLING_REPLICATION_SERVER(25, ERR_REPLICATION_NO_MESSAGE.get());
+
+
+ private Message message;
+ private int returnCode;
+
+ // Private constructor.
+ private ReplicationCliReturnCode(int returnCode, Message message)
+ {
+ this.returnCode = returnCode;
+ this.message = message;
+ }
+
+ /**
+ * Get the corresponding message.
+ *
+ * @return The corresponding message.
+ */
+ public Message getMessage()
+ {
+ return message;
+ }
+
+ /**
+ * Get the corresponding return code value.
+ *
+ * @return The corresponding return code value.
+ */
+ public int getReturnCode()
+ {
+ return returnCode;
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationUserData.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationUserData.java
new file mode 100644
index 0000000..bbb710c
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationUserData.java
@@ -0,0 +1,98 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+import java.util.LinkedList;
+
+/**
+ * This class is used to store the information provided by the user in the
+ * replication command line. It is required because when we are in interactive
+ * mode the ReplicationCliArgumentParser is not enough.
+ *
+ */
+abstract class ReplicationUserData
+{
+ private LinkedList<String> baseDNs = new LinkedList<String>();
+ private String adminUid;
+ private String adminPwd;
+
+ /**
+ * Returns the Global Administrator password.
+ * @return the Global Administrator password.
+ */
+ String getAdminPwd()
+ {
+ return adminPwd;
+ }
+
+ /**
+ * Sets the Global Administrator password.
+ * @param adminPwd the Global Administrator password.
+ */
+ void setAdminPwd(String adminPwd)
+ {
+ this.adminPwd = adminPwd;
+ }
+
+ /**
+ * Returns the Global Administrator UID.
+ * @return the Global Administrator UID.
+ */
+ String getAdminUid()
+ {
+ return adminUid;
+ }
+
+ /**
+ * Sets the Global Administrator UID.
+ * @param adminUid the Global Administrator UID.
+ */
+ void setAdminUid(String adminUid)
+ {
+ this.adminUid = adminUid;
+ }
+
+ /**
+ * Returns the Base DNs to replicate.
+ * @return the Base DNs to replicate.
+ */
+ LinkedList<String> getBaseDNs()
+ {
+ return new LinkedList<String>(baseDNs);
+ }
+
+ /**
+ * Sets the Base DNs to replicate.
+ * @param baseDNs the Base DNs to replicate.
+ */
+ void setBaseDNs(LinkedList<String> baseDNs)
+ {
+ this.baseDNs.clear();
+ this.baseDNs.addAll(baseDNs);
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/StatusReplicationUserData.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/StatusReplicationUserData.java
new file mode 100644
index 0000000..d83f72e
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/StatusReplicationUserData.java
@@ -0,0 +1,60 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.dsreplication;
+
+/**
+ * This class is used to store the information provided by the user to
+ * show replication configuration. It is required because when we are in
+ * interactive mode the ReplicationCliArgumentParser is not enough.
+ *
+ */
+class StatusReplicationUserData extends InitializeAllReplicationUserData
+{
+ private boolean scriptFriendly;
+
+ /**
+ * Whether we must display information in a script-friendly mode or not.
+ * @return <CODE>true</CODE> if we must display the information in a
+ * script-friendly mode and <CODE>false</CODE> otherwise.
+ */
+ public boolean isScriptFriendly()
+ {
+ return scriptFriendly;
+ }
+
+ /**
+ * Sets whether we must display information in a script-friendly mode or not.
+ * @param scriptFriendly whether we must display information in a
+ * script-friendly mode or not.
+ */
+ public void setScriptFriendly(boolean scriptFriendly)
+ {
+ this.scriptFriendly = scriptFriendly;
+ }
+}
+
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/package-info.java
new file mode 100644
index 0000000..75ee9b6
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/package-info.java
@@ -0,0 +1,40 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Defines the classes that are you used by the replication
+ * command lines. This includes the command line parsers
+ * (ReplicationCliParser), the classes that actually execute the configuration
+ * operations (ReplicationCliMain), the enumeration that defines the return
+ * codes of the command-line (ReplicationCliReturnCode), a particular exception
+ * used only for the package (ReplicationCliException) and the different data
+ * models that represent the data provided by the user directly as command-line
+ * parameters and also interactively.
+ * */
+package org.opends.server.tools.dsreplication;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java
index cf2b0ac..7248e8f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java
@@ -65,9 +65,6 @@
// The set of subordinate templates for this branch.
private Template[] subordinateTemplates;
- // The template file in which this branch appears.
- private TemplateFile templateFile;
-
// The set of template lines that correspond to the RDN components.
private TemplateLine[] rdnLines;
@@ -109,7 +106,6 @@
String[] subordinateTemplateNames, int[] numEntriesPerTemplate,
TemplateLine[] extraLines)
{
- this.templateFile = templateFile;
this.branchDN = branchDN;
this.subordinateTemplateNames = subordinateTemplateNames;
this.numEntriesPerTemplate = numEntriesPerTemplate;
@@ -150,7 +146,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -174,7 +170,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
index 1a3721c..d54d1c0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
@@ -30,11 +30,11 @@
import java.util.ArrayList;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DN;
@@ -309,28 +309,26 @@
}
else if (t.isOperational())
{
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(t, t.getNameOrOID());
for (TemplateValue v : valueList)
{
- values.add(new AttributeValue(t, v.getValue().toString()));
+ builder.add(new AttributeValue(t, v.getValue().toString()));
}
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), values));
+ attrList.add(builder.toAttribute());
operationalAttributes.put(t, attrList);
}
else
{
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(t, t.getNameOrOID());
for (TemplateValue v : valueList)
{
- values.add(new AttributeValue(t, v.getValue().toString()));
+ builder.add(new AttributeValue(t, v.getValue().toString()));
}
ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(t, t.getNameOrOID(), values));
+ attrList.add(builder.toAttribute());
userAttributes.put(t, attrList);
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCli.java b/opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCli.java
new file mode 100644
index 0000000..99b9de1
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCli.java
@@ -0,0 +1,1246 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2007-2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.status;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.InitialLdapContext;
+import javax.swing.table.TableModel;
+
+import org.opends.admin.ads.util.ApplicationTrustManager;
+import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
+import org.opends.guitools.controlpanel.datamodel.BaseDNTableModel;
+import org.opends.guitools.controlpanel.datamodel.ConfigReadException;
+import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerDescriptor;
+import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerTableModel;
+import org.opends.guitools.controlpanel.datamodel.ConnectionProtocolPolicy;
+import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
+import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
+import org.opends.guitools.controlpanel.util.ControlPanelLog;
+import org.opends.guitools.controlpanel.util.Utilities;
+
+import static org.opends.quicksetup.util.Utils.*;
+
+import org.opends.server.admin.client.ManagementContext;
+import org.opends.server.admin.client.cli.DsFrameworkCliReturnCode;
+import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
+import org.opends.server.core.DirectoryServer;
+
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
+import org.opends.server.admin.AdministrationConnector;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.QuickSetupMessages.*;
+
+import org.opends.server.tools.ClientException;
+import org.opends.server.tools.ToolConstants;
+import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
+import org.opends.server.types.DN;
+import org.opends.server.types.NullOutputStream;
+import org.opends.server.types.OpenDsException;
+import org.opends.server.util.StaticUtils;
+import org.opends.server.util.args.ArgumentException;
+import org.opends.server.util.cli.ConsoleApplication;
+import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
+import org.opends.server.util.table.TableBuilder;
+import org.opends.server.util.table.TextTablePrinter;
+
+/**
+ * The class used to provide some CLI interface to display status.
+ *
+ * This class basically is in charge of parsing the data provided by the user
+ * in the command line.
+ *
+ */
+class StatusCli extends ConsoleApplication
+{
+
+ private boolean displayMustAuthenticateLegend;
+ private boolean displayMustStartLegend;
+
+ /** Prefix for log files. */
+ static public final String LOG_FILE_PREFIX = "opends-status-";
+
+ /** Suffix for log files. */
+ static public final String LOG_FILE_SUFFIX = ".log";
+
+ private ApplicationTrustManager interactiveTrustManager;
+
+ private boolean useInteractiveTrustManager;
+
+ // This CLI is always using the administration connector with SSL
+ private final boolean alwaysSSL = true;
+ private boolean useSSL = true;
+ private boolean useStartTLS = false;
+
+ /**
+ * The enumeration containing the different return codes that the command-line
+ * can have.
+ *
+ */
+ enum ErrorReturnCode
+ {
+ /**
+ * Successful display of the status.
+ */
+ SUCCESSFUL(0),
+ /**
+ * We did no have an error but the status was not displayed (displayed
+ * version or usage).
+ */
+ SUCCESSFUL_NOP(0),
+ /**
+ * Unexpected error (potential bug).
+ */
+ ERROR_UNEXPECTED(1),
+ /**
+ * Cannot parse arguments.
+ */
+ ERROR_PARSING_ARGS(2),
+ /**
+ * User cancelled (for instance not accepting the certificate proposed) or
+ * could not use the provided connection parameters in interactive mode.
+ */
+ USER_CANCELLED_OR_DATA_ERROR(3),
+ /**
+ * This occurs for instance when the authentication provided by the user is
+ * not valid.
+ */
+ ERROR_READING_CONFIGURATION_WITH_LDAP(4);
+
+ private int returnCode;
+ private ErrorReturnCode(int returnCode)
+ {
+ this.returnCode = returnCode;
+ }
+
+ /**
+ * Get the corresponding return code value.
+ *
+ * @return The corresponding return code value.
+ */
+ public int getReturnCode()
+ {
+ return returnCode;
+ }
+ };
+
+ /**
+ * The Logger.
+ */
+ static private final Logger LOG = Logger.getLogger(StatusCli.class.getName());
+
+ // The argument parser
+ private StatusCliArgumentParser argParser;
+
+ /**
+ * Constructor for the StatusCli object.
+ *
+ * @param out the print stream to use for standard output.
+ * @param err the print stream to use for standard error.
+ * @param in the input stream to use for standard input.
+ */
+ public StatusCli(PrintStream out, PrintStream err, InputStream in)
+ {
+ super(in, out, err);
+ }
+
+ /**
+ * The main method for the status CLI tool.
+ *
+ * @param args the command-line arguments provided to this program.
+ */
+
+ public static void main(String[] args)
+ {
+ int retCode = mainCLI(args, true, System.out, System.err, System.in);
+
+ if(retCode != 0)
+ {
+ System.exit(retCode);
+ }
+ }
+
+ /**
+ * Parses the provided command-line arguments and uses that information to
+ * run the status tool.
+ *
+ * @param args the command-line arguments provided to this program.
+ *
+ * @return The error code.
+ */
+
+ public static int mainCLI(String[] args)
+ {
+ return mainCLI(args, true, System.out, System.err, System.in);
+ }
+
+ /**
+ * Parses the provided command-line arguments and uses that information to
+ * run the status tool.
+ *
+ * @param args The command-line arguments provided to this
+ * program.
+ * @param initializeServer Indicates whether to initialize the server.
+ * @param outStream The output stream to use for standard output, or
+ * <CODE>null</CODE> if standard output is not
+ * needed.
+ * @param errStream The output stream to use for standard error, or
+ * <CODE>null</CODE> if standard error is not
+ * needed.
+ * @param inStream The input stream to use for standard input.
+ * @return The error code.
+ */
+
+ public static int mainCLI(String[] args, boolean initializeServer,
+ OutputStream outStream, OutputStream errStream, InputStream inStream)
+ {
+ PrintStream out;
+ if (outStream == null)
+ {
+ out = NullOutputStream.printStream();
+ }
+ else
+ {
+ out = new PrintStream(outStream);
+ }
+
+ PrintStream err;
+ if (errStream == null)
+ {
+ err = NullOutputStream.printStream();
+ }
+ else
+ {
+ err = new PrintStream(errStream);
+ }
+
+ try {
+ ControlPanelLog.initLogFileHandler(
+ File.createTempFile(LOG_FILE_PREFIX, LOG_FILE_SUFFIX));
+ ControlPanelLog.initPackage("org.opends.server.tools.status");
+ } catch (Throwable t) {
+ System.err.println("Unable to initialize log");
+ t.printStackTrace();
+ }
+
+ StatusCli statusCli = new StatusCli(out, err, inStream);
+
+ return statusCli.execute(args, initializeServer);
+ }
+
+ /**
+ * Parses the provided command-line arguments and uses that information to
+ * run the status CLI.
+ *
+ * @param args the command-line arguments provided to this program.
+ * @param initializeServer Indicates whether to initialize the server.
+ *
+ * @return the return code (SUCCESSFUL, USER_DATA_ERROR or BUG.
+ */
+ public int execute(String[] args, boolean initializeServer) {
+ if (initializeServer) {
+ DirectoryServer.bootstrapClient();
+ }
+
+ argParser = new StatusCliArgumentParser(StatusCli.class.getName());
+ try {
+ argParser.initializeGlobalArguments(getOutputStream());
+ } catch (ArgumentException ae) {
+ Message message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
+ println(message);
+ return ErrorReturnCode.ERROR_UNEXPECTED.getReturnCode();
+ }
+
+ // Validate user provided data
+ try {
+ argParser.parseArguments(args);
+ } catch (ArgumentException ae) {
+ Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
+ println(message);
+ println();
+ println(Message.raw(argParser.getUsage()));
+
+ return ErrorReturnCode.ERROR_PARSING_ARGS.getReturnCode();
+ }
+
+ // If we should just display usage or version information,
+ // then print it and exit.
+ if (argParser.usageOrVersionDisplayed()) {
+ return ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode();
+ }
+ int v = argParser.validateGlobalOptions(getErrorStream());
+
+ if (v != DsFrameworkCliReturnCode.SUCCESSFUL_NOP.getReturnCode()) {
+ println(Message.raw(argParser.getUsage()));
+ return v;
+ } else {
+ ControlPanelInfo controlInfo = ControlPanelInfo.getInstance();
+ controlInfo.setTrustManager(getTrustManager());
+ controlInfo.regenerateDescriptor();
+ boolean authProvided = false;
+ if (controlInfo.getServerDescriptor().getStatus() ==
+ ServerDescriptor.ServerStatus.STARTED) {
+ String bindDn;
+ String bindPwd;
+ if (argParser.isInteractive()) {
+ ManagementContext ctx = null;
+
+ // This is done because we do not need to ask the user about these
+ // parameters. If we force their presence the class
+ // LDAPConnectionConsoleInteraction will not prompt the user for
+ // them.
+ SecureConnectionCliArgs secureArgsList =
+ argParser.getSecureArgsList();
+
+ secureArgsList.hostNameArg.setPresent(true);
+ secureArgsList.portArg.setPresent(true);
+ secureArgsList.hostNameArg.addValue(
+ secureArgsList.hostNameArg.getDefaultValue());
+ secureArgsList.portArg.addValue(
+ secureArgsList.portArg.getDefaultValue());
+ // We already know if SSL or StartTLS can be used. If we cannot
+ // use them we will not propose them in the connection parameters
+ // and if none of them can be used we will just not ask for the
+ // protocol to be used.
+ LDAPConnectionConsoleInteraction ci =
+ new LDAPConnectionConsoleInteraction(
+ this, argParser.getSecureArgsList());
+ try {
+ ci.run(true, false);
+ bindDn = ci.getBindDN();
+ bindPwd = ci.getBindPassword();
+
+ int port =
+ AdministrationConnector.DEFAULT_ADMINISTRATION_CONNECTOR_PORT;
+ controlInfo.setConnectionPolicy(
+ ConnectionProtocolPolicy.USE_ADMIN);
+ String ldapUrl = controlInfo.getURLToConnect();
+ try {
+ URI uri = new URI(ldapUrl);
+ port = uri.getPort();
+ ci.setPortNumber(port);
+ } catch (Throwable t) {
+ LOG.log(Level.SEVERE, "Error parsing url: " + ldapUrl);
+ }
+ LDAPManagementContextFactory factory =
+ new LDAPManagementContextFactory(alwaysSSL);
+ ctx = factory.getManagementContext(this, ci);
+ interactiveTrustManager = ci.getTrustManager();
+ controlInfo.setTrustManager(interactiveTrustManager);
+ useInteractiveTrustManager = true;
+ } catch (ArgumentException e) {
+ println(e.getMessageObject());
+ return ErrorReturnCode.USER_CANCELLED_OR_DATA_ERROR.getReturnCode();
+ } catch (ClientException e) {
+ println(e.getMessageObject());
+ // Display the information in the config file
+ ServerDescriptor desc = controlInfo.getServerDescriptor();
+ writeStatus(desc);
+ return ErrorReturnCode.USER_CANCELLED_OR_DATA_ERROR.getReturnCode();
+ } finally {
+ if (ctx != null) {
+ try {
+ ctx.close();
+ } catch (Throwable t) {
+ }
+ }
+ }
+ } else {
+ bindDn = argParser.getBindDN();
+ bindPwd = argParser.getBindPassword();
+ }
+
+ authProvided = bindPwd != null;
+
+ if (bindDn == null) {
+ bindDn = "";
+ }
+ if (bindPwd == null) {
+ bindPwd = "";
+ }
+
+ if (authProvided) {
+ InitialLdapContext ctx = null;
+ try {
+ ctx = Utilities.getAdminDirContext(controlInfo, bindDn, bindPwd);
+ controlInfo.setDirContext(ctx);
+ controlInfo.regenerateDescriptor();
+ ServerDescriptor desc = controlInfo.getServerDescriptor();
+ writeStatus(desc);
+
+ if (!desc.getExceptions().isEmpty()) {
+ return ErrorReturnCode.ERROR_READING_CONFIGURATION_WITH_LDAP.
+ getReturnCode();
+ }
+ } catch (NamingException ne) {
+ // This should not happen but this is useful information to
+ // diagnose the error.
+ println();
+ println(INFO_ERROR_READING_SERVER_CONFIGURATION.get(
+ ne.toString()));
+ return ErrorReturnCode.ERROR_READING_CONFIGURATION_WITH_LDAP.
+ getReturnCode();
+ } catch (ConfigReadException cre) {
+ // This should not happen but this is useful information to
+ // diagnose the error.
+ println();
+ println(cre.getMessageObject());
+ return ErrorReturnCode.ERROR_READING_CONFIGURATION_WITH_LDAP.
+ getReturnCode();
+ } finally {
+ if (ctx != null) {
+ try {
+ ctx.close();
+ } catch (Throwable t) {
+ }
+ }
+ }
+ } else {
+ // The user did not provide authentication: just display the
+ // information we can get reading the config file.
+ ServerDescriptor desc = controlInfo.getServerDescriptor();
+ writeStatus(desc);
+ }
+ } else {
+ ServerDescriptor desc = controlInfo.getServerDescriptor();
+ writeStatus(desc);
+ }
+ }
+
+ return ErrorReturnCode.SUCCESSFUL.getReturnCode();
+ }
+
+ private void writeStatus(ServerDescriptor desc)
+ {
+ Message[] labels =
+ {
+ INFO_SERVER_STATUS_LABEL.get(),
+ INFO_CONNECTIONS_LABEL.get(),
+ INFO_HOSTNAME_LABEL.get(),
+ INFO_ADMINISTRATIVE_USERS_LABEL.get(),
+ INFO_INSTALLATION_PATH_LABEL.get(),
+ INFO_OPENDS_VERSION_LABEL.get(),
+ INFO_JAVA_VERSION_LABEL.get(),
+ INFO_CTRL_PANEL_ADMIN_CONNECTOR_LABEL.get()
+ };
+ int labelWidth = 0;
+ Message title = INFO_SERVER_STATUS_TITLE.get();
+ if (!isScriptFriendly())
+ {
+ for (int i=0; i<labels.length; i++)
+ {
+ labelWidth = Math.max(labelWidth, labels[i].length());
+ }
+ getOutputStream().println();
+ getOutputStream().println(centerTitle(title));
+ }
+ writeStatusContents(desc, labelWidth);
+ writeCurrentConnectionContents(desc, labelWidth);
+ if (!isScriptFriendly())
+ {
+ getOutputStream().println();
+ }
+
+ title = INFO_SERVER_DETAILS_TITLE.get();
+ if (!isScriptFriendly())
+ {
+ getOutputStream().println(centerTitle(title));
+ }
+ writeHostnameContents(desc, labelWidth);
+ writeAdministrativeUserContents(desc, labelWidth);
+ writeInstallPathContents(desc, labelWidth);
+ writeVersionContents(desc, labelWidth);
+ writeJavaVersionContents(desc, labelWidth);
+ writeAdminConnectorContents(desc, labelWidth);
+ if (!isScriptFriendly())
+ {
+ getOutputStream().println();
+ }
+
+ writeListenerContents(desc);
+ if (!isScriptFriendly())
+ {
+ getOutputStream().println();
+ }
+
+ writeBaseDNContents(desc);
+
+ writeErrorContents(desc);
+
+ if (!isScriptFriendly())
+ {
+ if (displayMustStartLegend)
+ {
+ getOutputStream().println();
+ getOutputStream().println(
+ wrapText(INFO_NOT_AVAILABLE_SERVER_DOWN_CLI_LEGEND.get()));
+ }
+ else if (displayMustAuthenticateLegend)
+ {
+ getOutputStream().println();
+ getOutputStream().println(
+ wrapText(
+ INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_CLI_LEGEND.get()));
+ }
+ }
+ getOutputStream().println();
+ }
+
+ /**
+ * Writes the status contents displaying with what is specified in the
+ * provided ServerDescriptor object.
+ * @param desc the ServerStatusDescriptor object.
+ */
+ private void writeStatusContents(ServerDescriptor desc,
+ int maxLabelWidth)
+ {
+ Message status;
+ switch (desc.getStatus())
+ {
+ case STARTED:
+ status = INFO_SERVER_STARTED_LABEL.get();
+ break;
+
+ case STOPPED:
+ status = INFO_SERVER_STOPPED_LABEL.get();
+ break;
+
+ case STARTING:
+ status = INFO_SERVER_STARTING_LABEL.get();
+ break;
+
+ case STOPPING:
+ status = INFO_SERVER_STOPPING_LABEL.get();
+ break;
+
+ case UNKNOWN:
+ status = INFO_SERVER_UNKNOWN_STATUS_LABEL.get();
+ break;
+
+ default:
+ throw new IllegalStateException("Unknown status: "+desc.getStatus());
+ }
+ writeLabelValue(INFO_SERVER_STATUS_LABEL.get(), status,
+ maxLabelWidth);
+ }
+
+ /**
+ * Writes the current connection contents displaying with what is specified
+ * in the provided ServerDescriptor object.
+ * @param desc the ServerDescriptor object.
+ */
+ private void writeCurrentConnectionContents(ServerDescriptor desc,
+ int maxLabelWidth)
+ {
+ Message text;
+ if (desc.getStatus() == ServerDescriptor.ServerStatus.STARTED)
+ {
+ int nConn = desc.getOpenConnections();
+ if (nConn >= 0)
+ {
+ text = Message.raw(String.valueOf(nConn));
+ }
+ else
+ {
+ if (!desc.isAuthenticated() || !desc.getExceptions().isEmpty())
+ {
+ text = getNotAvailableBecauseAuthenticationIsRequiredText();
+ }
+ else
+ {
+ text = getNotAvailableText();
+ }
+ }
+ }
+ else
+ {
+ text = getNotAvailableBecauseServerIsDownText();
+ }
+
+ writeLabelValue(INFO_CONNECTIONS_LABEL.get(), text, maxLabelWidth);
+ }
+
+ /**
+ * Writes the host name contents.
+ * @param desc the ServerDescriptor object.
+ * @param maxLabelWidth the maximum label width of the left label.
+ */
+ private void writeHostnameContents(ServerDescriptor desc,
+ int maxLabelWidth)
+ {
+ writeLabelValue(INFO_HOSTNAME_LABEL.get(),
+ Message.raw(desc.getHostname()),
+ maxLabelWidth);
+ }
+ /**
+ * Writes the administrative user contents displaying with what is specified
+ * in the provided ServerStatusDescriptor object.
+ * @param desc the ServerStatusDescriptor object.
+ * @param maxLabelWidth the maximum label width of the left label.
+ */
+ private void writeAdministrativeUserContents(ServerDescriptor desc,
+ int maxLabelWidth)
+ {
+ Set<DN> administrators = desc.getAdministrativeUsers();
+ Message text;
+ if (administrators.size() > 0)
+ {
+ TreeSet<DN> ordered = new TreeSet<DN>();
+ ordered.addAll(administrators);
+
+ DN first = ordered.iterator().next();
+ writeLabelValue(
+ INFO_ADMINISTRATIVE_USERS_LABEL.get(),
+ Message.raw(first.toString()),
+ maxLabelWidth);
+
+ Iterator<DN> it = ordered.iterator();
+ // First one already printed
+ it.next();
+ while (it.hasNext())
+ {
+ writeLabelValue(
+ INFO_ADMINISTRATIVE_USERS_LABEL.get(),
+ Message.raw(it.next().toString()),
+ maxLabelWidth);
+ }
+ }
+ else
+ {
+ if (desc.getStatus() == ServerDescriptor.ServerStatus.STARTED)
+ {
+ if (!desc.isAuthenticated() || !desc.getExceptions().isEmpty())
+ {
+ text = getNotAvailableBecauseAuthenticationIsRequiredText();
+ }
+ else
+ {
+ text = getNotAvailableText();
+ }
+ }
+ else
+ {
+ text = getNotAvailableText();
+ }
+ writeLabelValue(INFO_ADMINISTRATIVE_USERS_LABEL.get(), text,
+ maxLabelWidth);
+ }
+ }
+
+ /**
+ * Writes the install path contents displaying with what is specified in the
+ * provided ServerDescriptor object.
+ * @param desc the ServerDescriptor object.
+ * @param maxLabelWidth the maximum label width of the left label.
+ */
+ private void writeInstallPathContents(ServerDescriptor desc,
+ int maxLabelWidth)
+ {
+ File path = desc.getInstallPath();
+ writeLabelValue(INFO_INSTALLATION_PATH_LABEL.get(),
+ Message.raw(path.toString()),
+ maxLabelWidth);
+ }
+
+ /**
+ * Updates the server version contents displaying with what is specified in
+ * the provided ServerDescriptor object.
+ * This method must be called from the event thread.
+ * @param desc the ServerDescriptor object.
+ */
+ private void writeVersionContents(ServerDescriptor desc,
+ int maxLabelWidth)
+ {
+ String openDSVersion = desc.getOpenDSVersion();
+ writeLabelValue(INFO_OPENDS_VERSION_LABEL.get(),
+ Message.raw(openDSVersion),
+ maxLabelWidth);
+ }
+
+ /**
+ * Updates the java version contents displaying with what is specified in
+ * the provided ServerDescriptor object.
+ * This method must be called from the event thread.
+ * @param desc the ServerDescriptor object.
+ * @param maxLabelWidth the maximum label width of the left label.
+ */
+ private void writeJavaVersionContents(ServerDescriptor desc,
+ int maxLabelWidth)
+ {
+ Message text;
+ if (desc.getStatus() == ServerDescriptor.ServerStatus.STARTED)
+ {
+ text = Message.raw(desc.getJavaVersion());
+ if (text == null)
+ {
+ if (!desc.isAuthenticated() || !desc.getExceptions().isEmpty())
+ {
+ text = getNotAvailableBecauseAuthenticationIsRequiredText();
+ }
+ else
+ {
+ text = getNotAvailableText();
+ }
+ }
+ }
+ else
+ {
+ text = getNotAvailableBecauseServerIsDownText();
+ }
+ writeLabelValue(INFO_JAVA_VERSION_LABEL.get(), text, maxLabelWidth);
+ }
+
+ /**
+ * Updates the admin connector contents displaying with what is specified in
+ * the provided ServerDescriptor object.
+ * This method must be called from the event thread.
+ * @param desc the ServerDescriptor object.
+ * @param maxLabelWidth the maximum label width of the left label.
+ */
+ private void writeAdminConnectorContents(ServerDescriptor desc,
+ int maxLabelWidth)
+ {
+ ConnectionHandlerDescriptor adminConnector = desc.getAdminConnector();
+ if (adminConnector != null)
+ {
+ Message text = INFO_CTRL_PANEL_ADMIN_CONNECTOR_DESCRIPTION.get(
+ adminConnector.getPort());
+ writeLabelValue(INFO_CTRL_PANEL_ADMIN_CONNECTOR_LABEL.get(), text,
+ maxLabelWidth);
+ }
+ else
+ {
+ writeLabelValue(INFO_CTRL_PANEL_ADMIN_CONNECTOR_LABEL.get(),
+ INFO_NOT_AVAILABLE_SHORT_LABEL.get(),
+ maxLabelWidth);
+ }
+ }
+
+ /**
+ * Writes the listeners contents displaying with what is specified in
+ * the provided ServerDescriptor object.
+ * @param desc the ServerDescriptor object.
+ */
+ private void writeListenerContents(ServerDescriptor desc)
+ {
+ if (!isScriptFriendly())
+ {
+ Message title = INFO_LISTENERS_TITLE.get();
+ getOutputStream().println(centerTitle(title));
+ }
+
+ Set<ConnectionHandlerDescriptor> allHandlers = desc.getConnectionHandlers();
+
+ Set<ConnectionHandlerDescriptor> connectionHandlers =
+ new LinkedHashSet<ConnectionHandlerDescriptor>();
+ for (ConnectionHandlerDescriptor listener: allHandlers)
+ {
+ if (listener.getProtocol() != ConnectionHandlerDescriptor.Protocol.LDIF)
+ {
+ connectionHandlers.add(listener);
+ }
+ }
+
+ if (connectionHandlers.size() == 0)
+ {
+ if (desc.getStatus() == ServerDescriptor.ServerStatus.STARTED)
+ {
+ if (!desc.isAuthenticated())
+ {
+ getOutputStream().println(
+ wrapText(
+ INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_CLI_LABEL.get()));
+ }
+ else
+ {
+ getOutputStream().println(wrapText(INFO_NO_LISTENERS_FOUND.get()));
+ }
+ }
+ else
+ {
+ getOutputStream().println(wrapText(INFO_NO_LISTENERS_FOUND.get()));
+ }
+ }
+ else
+ {
+ ConnectionHandlerTableModel connHandlersTableModel =
+ new ConnectionHandlerTableModel(false);
+ connHandlersTableModel.setData(connectionHandlers);
+ writeTableModel(connHandlersTableModel, desc);
+ }
+ }
+
+ /**
+ * Writes the base DN contents displaying with what is specified in
+ * the provided ServerDescriptor object.
+ * @param desc the ServerDescriptor object.
+ */
+ private void writeBaseDNContents(ServerDescriptor desc)
+ {
+ Message title = INFO_DATABASES_TITLE.get();
+ if (!isScriptFriendly())
+ {
+ getOutputStream().println(centerTitle(title));
+ }
+
+ Set<BaseDNDescriptor> replicas = new HashSet<BaseDNDescriptor>();
+ Set<BackendDescriptor> bs = desc.getBackends();
+ for (BackendDescriptor backend: bs)
+ {
+ if (!backend.isConfigBackend())
+ {
+ replicas.addAll(backend.getBaseDns());
+ }
+ }
+ if (replicas.size() == 0)
+ {
+ if (desc.getStatus() == ServerDescriptor.ServerStatus.STARTED)
+ {
+ if (!desc.isAuthenticated())
+ {
+ getOutputStream().println(
+ wrapText(
+ INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_CLI_LABEL.get()));
+ }
+ else
+ {
+ getOutputStream().println(wrapText(INFO_NO_DBS_FOUND.get()));
+ }
+ }
+ else
+ {
+ getOutputStream().println(wrapText(INFO_NO_DBS_FOUND.get()));
+ }
+ }
+ else
+ {
+ BaseDNTableModel baseDNTableModel = new BaseDNTableModel(true, false);
+ baseDNTableModel.setData(replicas, desc.getStatus(),
+ desc.isAuthenticated());
+
+ writeBaseDNTableModel(baseDNTableModel, desc);
+ }
+ }
+
+ /**
+ * Writes the error label contents displaying with what is specified in
+ * the provided ServerDescriptor object.
+ * @param desc the ServerDescriptor object.
+ */
+ private void writeErrorContents(ServerDescriptor desc)
+ {
+ for (OpenDsException ex : desc.getExceptions())
+ {
+ Message errorMsg = ex.getMessageObject();
+ if (errorMsg != null)
+ {
+ getOutputStream().println();
+ getOutputStream().println(wrapText(errorMsg));
+ }
+ }
+ }
+
+ /**
+ * Returns the not available text explaining that the data is not available
+ * because the server is down.
+ * @return the text.
+ */
+ private Message getNotAvailableBecauseServerIsDownText()
+ {
+ displayMustStartLegend = true;
+ return INFO_NOT_AVAILABLE_SERVER_DOWN_CLI_LABEL.get();
+ }
+
+ /**
+ * Returns the not available text explaining that the data is not available
+ * because authentication is required.
+ * @return the text.
+ */
+ private Message getNotAvailableBecauseAuthenticationIsRequiredText()
+ {
+ displayMustAuthenticateLegend = true;
+ return INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_CLI_LABEL.get();
+ }
+
+ /**
+ * Returns the not available text explaining that the data is not available.
+ * @return the text.
+ */
+ private Message getNotAvailableText()
+ {
+ return INFO_NOT_AVAILABLE_LABEL.get();
+ }
+
+ /**
+ * Writes the contents of the provided table model simulating a table layout
+ * using text.
+ * @param tableModel the TableModel.
+ * @param desc the Server Status descriptor.
+ */
+ private void writeTableModel(TableModel tableModel,
+ ServerDescriptor desc)
+ {
+ if (isScriptFriendly())
+ {
+ for (int i=0; i<tableModel.getRowCount(); i++)
+ {
+ getOutputStream().println("-");
+ for (int j=0; j<tableModel.getColumnCount(); j++)
+ {
+ MessageBuilder line = new MessageBuilder();
+ line.append(tableModel.getColumnName(j)+": ");
+
+ line.append(getCellValue(tableModel.getValueAt(i, j), desc));
+
+ getOutputStream().println(wrapText(line.toMessage()));
+ }
+ }
+ }
+ else
+ {
+ TableBuilder table = new TableBuilder();
+ for (int i=0; i< tableModel.getColumnCount(); i++)
+ {
+ table.appendHeading(Message.raw(tableModel.getColumnName(i)));
+ }
+ for (int i=0; i<tableModel.getRowCount(); i++)
+ {
+ table.startRow();
+ for (int j=0; j<tableModel.getColumnCount(); j++)
+ {
+ table.appendCell(getCellValue(tableModel.getValueAt(i, j), desc));
+ }
+ }
+ TextTablePrinter printer = new TextTablePrinter(getOutputStream());
+ printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
+ table.print(printer);
+ }
+ }
+
+
+ private Message getCellValue(Object v, ServerDescriptor desc)
+ {
+ Message s = null;
+ if (v != null)
+ {
+ if (v instanceof String)
+ {
+ s = Message.raw((String)v);
+ }
+ else if (v instanceof Integer)
+ {
+ int nEntries = ((Integer)v).intValue();
+ if (nEntries >= 0)
+ {
+ s = Message.raw(String.valueOf(nEntries));
+ }
+ else
+ {
+ if (!desc.isAuthenticated() || !desc.getExceptions().isEmpty())
+ {
+ s = getNotAvailableBecauseAuthenticationIsRequiredText();
+ }
+ else
+ {
+ s = getNotAvailableText();
+ }
+ }
+ }
+ else
+ {
+ throw new IllegalStateException("Unknown object type: "+v);
+ }
+ }
+ else
+ {
+ s = getNotAvailableText();
+ }
+ return s;
+ }
+
+ /**
+ * Writes the contents of the provided base DN table model. Every base DN
+ * is written in a block containing pairs of labels and values.
+ * @param tableModel the TableModel.
+ * @param desc the Server Status descriptor.
+ */
+ private void writeBaseDNTableModel(BaseDNTableModel tableModel,
+ ServerDescriptor desc)
+ {
+ boolean isRunning =
+ desc.getStatus() == ServerDescriptor.ServerStatus.STARTED;
+
+ int labelWidth = 0;
+ int labelWidthWithoutReplicated = 0;
+ Message[] labels = new Message[tableModel.getColumnCount()];
+ for (int i=0; i<tableModel.getColumnCount(); i++)
+ {
+ Message header = Message.raw(tableModel.getColumnName(i));
+ labels[i] = new MessageBuilder(header).append(":").toMessage();
+ labelWidth = Math.max(labelWidth, labels[i].length());
+ if ((i != 4) && (i != 5))
+ {
+ labelWidthWithoutReplicated =
+ Math.max(labelWidthWithoutReplicated, labels[i].length());
+ }
+ }
+
+ Message replicatedLabel = INFO_BASEDN_REPLICATED_LABEL.get();
+ for (int i=0; i<tableModel.getRowCount(); i++)
+ {
+ if (isScriptFriendly())
+ {
+ getOutputStream().println("-");
+ }
+ else if (i > 0)
+ {
+ getOutputStream().println();
+ }
+ for (int j=0; j<tableModel.getColumnCount(); j++)
+ {
+ Message value;
+ Object v = tableModel.getValueAt(i, j);
+ if (v != null)
+ {
+ if (v == BaseDNTableModel.NOT_AVAILABLE_SERVER_DOWN)
+ {
+ value = getNotAvailableBecauseServerIsDownText();
+ }
+ else if (v == BaseDNTableModel.NOT_AVAILABLE_AUTHENTICATION_REQUIRED)
+ {
+ value = getNotAvailableBecauseAuthenticationIsRequiredText();
+ }
+ else if (v == BaseDNTableModel.NOT_AVAILABLE)
+ {
+ value = getNotAvailableText();
+ }
+ else if (v instanceof String)
+ {
+ value = Message.raw((String)v);
+ }
+ else if (v instanceof Message)
+ {
+ value = (Message)v;
+ }
+ else if (v instanceof Integer)
+ {
+ int nEntries = ((Integer)v).intValue();
+ if (nEntries >= 0)
+ {
+ value = Message.raw(String.valueOf(nEntries));
+ }
+ else
+ {
+ if (!isRunning)
+ {
+ value = getNotAvailableBecauseServerIsDownText();
+ }
+ if (!desc.isAuthenticated() || !desc.getExceptions().isEmpty())
+ {
+ value = getNotAvailableBecauseAuthenticationIsRequiredText();
+ }
+ else
+ {
+ value = getNotAvailableText();
+ }
+ }
+ }
+ else
+ {
+ throw new IllegalStateException("Unknown object type: "+v);
+ }
+ }
+ else
+ {
+ value = Message.EMPTY;
+ }
+
+ if (value.equals(getNotAvailableText()))
+ {
+ if (!isRunning)
+ {
+ value = getNotAvailableBecauseServerIsDownText();
+ }
+ if (!desc.isAuthenticated() || !desc.getExceptions().isEmpty())
+ {
+ value = getNotAvailableBecauseAuthenticationIsRequiredText();
+ }
+ }
+
+ boolean doWrite = true;
+ boolean isReplicated =
+ replicatedLabel.toString().equals(
+ String.valueOf(tableModel.getValueAt(i, 3)));
+ if ((j == 4) || (j == 5))
+ {
+ // If the suffix is not replicated we do not have to display these
+ // lines.
+ doWrite = isReplicated;
+ }
+ if (doWrite)
+ {
+ writeLabelValue(labels[j], value,
+ isReplicated?labelWidth:labelWidthWithoutReplicated);
+ }
+ }
+ }
+ }
+
+ private void writeLabelValue(Message label, Message value, int maxLabelWidth)
+ {
+ MessageBuilder buf = new MessageBuilder();
+ buf.append(label);
+
+ int extra = maxLabelWidth - label.length();
+ for (int i = 0; i<extra; i++)
+ {
+ buf.append(" ");
+ }
+ buf.append(" ").append(String.valueOf(value));
+ getOutputStream().println(wrapText(buf.toMessage()));
+ }
+
+ private Message centerTitle(Message text)
+ {
+ Message centered;
+ if (text.length() <= getCommandLineMaxLineWidth() - 8)
+ {
+ MessageBuilder buf = new MessageBuilder();
+ int extra = Math.min(10,
+ (getCommandLineMaxLineWidth() - 8 - text.length()) / 2);
+ for (int i=0; i<extra; i++)
+ {
+ buf.append(" ");
+ }
+ buf.append("--- "+text+" ---");
+ centered = buf.toMessage();
+ }
+ else
+ {
+ centered = text;
+ }
+ return centered;
+ }
+
+ /**
+ * Returns the trust manager to be used by this application.
+ * @return the trust manager to be used by this application.
+ */
+ private ApplicationTrustManager getTrustManager()
+ {
+ if (useInteractiveTrustManager)
+ {
+ return interactiveTrustManager;
+ }
+ else
+ {
+ return argParser.getTrustManager();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isAdvancedMode() {
+ return false;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isInteractive() {
+ return argParser.isInteractive();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isMenuDrivenMode() {
+ return true;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isQuiet() {
+ return false;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isScriptFriendly() {
+ return argParser.isScriptFriendly();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isVerbose() {
+ return true;
+ }
+
+
+
+ /**
+ * Wraps a message accoring to client tool console width.
+ * @param text to wrap
+ * @return raw message representing wrapped string
+ */
+ private Message wrapText(Message text)
+ {
+ return Message.raw(
+ StaticUtils.wrapText(text, getCommandLineMaxLineWidth()));
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCliArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCliArgumentParser.java
new file mode 100644
index 0000000..6d3c3dc
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCliArgumentParser.java
@@ -0,0 +1,183 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.tools.status;
+
+import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.tools.ToolConstants.OPTION_LONG_NO_PROP_FILE;
+import static org.opends.server.tools.ToolConstants.OPTION_LONG_PROP_FILE_PATH;
+
+import java.io.OutputStream;
+import java.util.ArrayList;
+
+import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
+import org.opends.server.admin.client.cli.SecureConnectionCliParser;
+import org.opends.server.tools.ToolConstants;
+import org.opends.server.util.args.Argument;
+import org.opends.server.util.args.ArgumentException;
+import org.opends.server.util.args.BooleanArgument;
+import org.opends.server.util.args.StringArgument;
+
+/**
+ * The class that is used to parse the arguments provided in the status command
+ * line.
+ *
+ */
+public class StatusCliArgumentParser extends SecureConnectionCliParser
+{
+ private BooleanArgument noPromptArg;
+
+ // This CLI is always using the administration connector with SSL
+ private final boolean alwaysSSL = true;
+
+ /**
+ * The 'scriptFriendly' argument.
+ */
+ private BooleanArgument scriptFriendlyArg;
+
+ /**
+ * Creates a new instance of this argument parser with no arguments.
+ *
+ * @param mainClassName
+ * The fully-qualified name of the Java class that should
+ * be invoked to launch the program with which this
+ * argument parser is associated.
+ */
+ public StatusCliArgumentParser(String mainClassName)
+ {
+ super(mainClassName, INFO_STATUS_CLI_USAGE_DESCRIPTION.get(), false);
+ }
+
+ /**
+ * Initialize Global option.
+ *
+ * @param outStream
+ * The output stream used for the usage.
+ * @throws ArgumentException
+ * If there is a problem with any of the parameters used
+ * to create this argument.
+ */
+ public void initializeGlobalArguments(OutputStream outStream)
+ throws ArgumentException
+ {
+ ArrayList<Argument> defaultArgs =
+ new ArrayList<Argument>(createGlobalArguments(outStream, alwaysSSL));
+ defaultArgs.remove(secureArgsList.portArg);
+ defaultArgs.remove(secureArgsList.hostNameArg);
+ defaultArgs.remove(verboseArg);
+ defaultArgs.remove(noPropertiesFileArg);
+ defaultArgs.remove(propertiesFileArg);
+ noPromptArg = new BooleanArgument(
+ ToolConstants.OPTION_LONG_NO_PROMPT,
+ ToolConstants.OPTION_SHORT_NO_PROMPT,
+ ToolConstants.OPTION_LONG_NO_PROMPT,
+ INFO_DESCRIPTION_NO_PROMPT.get());
+ defaultArgs.add(0, noPromptArg);
+
+ scriptFriendlyArg = new BooleanArgument(
+ "script-friendly",
+ 's',
+ "script-friendly",
+ INFO_DESCRIPTION_SCRIPT_FRIENDLY.get());
+ defaultArgs.add(1, scriptFriendlyArg);
+
+ StringArgument propertiesFileArgument = new StringArgument(
+ "propertiesFilePath", null, OPTION_LONG_PROP_FILE_PATH, false, false,
+ true, INFO_PROP_FILE_PATH_PLACEHOLDER.get(), null, null,
+ INFO_DESCRIPTION_PROP_FILE_PATH.get());
+ defaultArgs.add(propertiesFileArgument);
+ setFilePropertiesArgument(propertiesFileArgument);
+
+ BooleanArgument noPropertiesFileArgument = new BooleanArgument(
+ "noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
+ INFO_DESCRIPTION_NO_PROP_FILE.get());
+ defaultArgs.add(noPropertiesFileArgument);
+ setNoPropertiesFileArgument(noPropertiesFileArgument);
+
+ initializeGlobalArguments(defaultArgs);
+ }
+
+ /**
+ * Returns the SecureConnectionCliArgs object containing the arguments
+ * of this parser.
+ * @return the SecureConnectionCliArgs object containing the arguments
+ * of this parser.
+ */
+ SecureConnectionCliArgs getSecureArgsList()
+ {
+ return secureArgsList;
+ }
+ /**
+ * Tells whether the user specified to have an interactive uninstall or not.
+ * This method must be called after calling parseArguments.
+ * @return <CODE>true</CODE> if the user specified to have an interactive
+ * uninstall and <CODE>false</CODE> otherwise.
+ */
+ public boolean isInteractive()
+ {
+ return !noPromptArg.isPresent();
+ }
+
+ /**
+ * Tells whether the user specified to have a script-friendly output or not.
+ * This method must be called after calling parseArguments.
+ * @return <CODE>true</CODE> if the user specified to have a script-friendly
+ * output and <CODE>false</CODE> otherwise.
+ */
+ public boolean isScriptFriendly()
+ {
+ return scriptFriendlyArg.isPresent();
+ }
+
+ /**
+ * Returns the first server bind dn explicitly provided in the enable
+ * replication subcommand.
+ * @return the first server bind dn explicitly provided in the enable
+ * replication subcommand. Returns -1 if no port was explicitly provided.
+ */
+ public String getExplicitBindDn()
+ {
+ String dn = null;
+ if (secureArgsList.bindDnArg.isPresent())
+ {
+ dn = secureArgsList.bindDnArg.getValue();
+ }
+ return dn;
+ }
+
+ /**
+ * Returns the first server bind dn default value in the enable replication
+ * subcommand.
+ * @return the first server bind dn default value in the enable replication
+ * subcommand.
+ */
+ public String getDefaultBindDn()
+ {
+ return secureArgsList.bindDnArg.getDefaultValue();
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/status/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/tools/status/package-info.java
new file mode 100644
index 0000000..2a9c613
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/status/package-info.java
@@ -0,0 +1,36 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+
+
+/**
+ * Defines the classes that are you used by the status
+ * command line. This includes the command line parser
+ * (StatusCliArgumentParser), and the class that is called by the status scripts
+ * and displays the status information (StatusCLI).
+ */
+package org.opends.server.tools.status;
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskClient.java b/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskClient.java
index 44064c0..868bdce 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskClient.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskClient.java
@@ -60,7 +60,6 @@
import static org.opends.server.types.ResultCode.*;
import org.opends.server.backends.task.TaskState;
import org.opends.server.backends.task.FailedDependencyAction;
-import static org.opends.server.util.ServerConstants.*;
import org.opends.server.util.StaticUtils;
import java.io.IOException;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskEntry.java b/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskEntry.java
index 07242b9..e84e048 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskEntry.java
@@ -44,7 +44,6 @@
import java.util.Set;
import java.util.HashSet;
import java.util.List;
-import java.util.LinkedHashSet;
import java.util.ArrayList;
import java.util.TimeZone;
import java.util.Date;
@@ -140,8 +139,7 @@
type.getNormalizedPrimaryName());
List<Attribute> attrList = entry.getUserAttribute(type);
for (Attribute attr : attrList) {
- LinkedHashSet<AttributeValue> valuesSet = attr.getValues();
- for (AttributeValue av : valuesSet) {
+ for (AttributeValue av : attr) {
List<String> valueList = taskSpecificAttrValues.get(attrTypeName);
if (valueList == null) {
valueList = new ArrayList<String>();
@@ -372,9 +370,9 @@
private String getSingleStringValue(Entry entry, String attrName) {
List<Attribute> attrList = entry.getAttribute(attrName);
if (attrList != null && attrList.size() == 1) {
- Set<AttributeValue> values = attrList.get(0).getValues();
- if (values != null && values.size() == 1) {
- return values.iterator().next().getStringValue();
+ Attribute attr = attrList.get(0);
+ if (!attr.isEmpty()) {
+ return attr.iterator().next().getStringValue();
}
}
return "";
@@ -385,11 +383,8 @@
List<Attribute> attrList = entry.getAttribute(attrName);
if (attrList != null) {
for (Attribute attr : attrList) {
- Set<AttributeValue> values = attr.getValues();
- if (values != null) {
- for (AttributeValue value : values) {
- valuesList.add(value.getStringValue());
- }
+ for (AttributeValue value : attr) {
+ valuesList.add(value.getStringValue());
}
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskTool.java b/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskTool.java
index 8259ace..0b77a00 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskTool.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/tasks/TaskTool.java
@@ -48,6 +48,7 @@
import org.opends.server.backends.task.FailedDependencyAction;
import org.opends.messages.Message;
import static org.opends.messages.ToolMessages.*;
+import static org.opends.messages.TaskMessages.*;
import java.io.PrintStream;
import java.text.ParseException;
@@ -59,6 +60,7 @@
import java.util.EnumSet;
import java.util.Collections;
import java.io.IOException;
+import javax.net.ssl.SSLException;
/**
* Base class for tools that are capable of operating either by running
@@ -105,6 +107,9 @@
// mode.
BooleanArgument testIfOfflineArg;
+ // This CLI is always using the administration connector with SSL
+ private final boolean alwaysSSL = true;
+
/**
* Called when this utility should perform its actions locally in this
* JVM.
@@ -134,7 +139,7 @@
INFO_DESCRIPTION_TASK_LDAP_ARGS.get(), 1001);
argParser = new LDAPConnectionArgumentParser(className,
- toolDescription, false, ldapGroup);
+ toolDescription, false, ldapGroup, alwaysSSL);
ArgumentGroup taskGroup = new ArgumentGroup(
INFO_DESCRIPTION_TASK_TASK_ARGS.get(), 1000);
@@ -456,7 +461,15 @@
}
ret = 0;
} catch (LDAPConnectionException e) {
- Message message = ERR_TASK_TOOL_START_TIME_NO_LDAP.get(e.getMessage());
+ Message message = null;
+ if ((e.getCause() != null) && (e.getCause().getCause() != null) &&
+ e.getCause().getCause() instanceof SSLException) {
+ message = ERR_TASK_LDAP_FAILED_TO_CONNECT_WRONG_PORT.get(
+ argParser.getArguments().getHostName(),
+ argParser.getArguments().getPort());
+ } else {
+ message = ERR_TASK_TOOL_START_TIME_NO_LDAP.get(e.getMessage());
+ }
if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
ret = 1;
} catch (IOException ioe) {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AbstractAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/types/AbstractAttribute.java
new file mode 100644
index 0000000..816b0dd
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AbstractAttribute.java
@@ -0,0 +1,324 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.types;
+
+
+
+import static org.opends.server.util.StaticUtils.*;
+
+import java.util.Collection;
+import java.util.Set;
+
+
+
+/**
+ * An abstract base class for implementing new types of
+ * {@link Attribute}.
+ */
+@org.opends.server.types.PublicAPI(
+ stability = org.opends.server.types.StabilityLevel.UNCOMMITTED,
+ mayInstantiate = false,
+ mayExtend = false,
+ mayInvoke = true)
+public abstract class AbstractAttribute implements Attribute
+{
+
+ /**
+ * Creates a new abstract attribute.
+ */
+ protected AbstractAttribute()
+ {
+ // No implementation required.
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * This implementation iterates through each attribute value in the
+ * provided collection, checking to see if this attribute contains
+ * the value using {@link Attribute#contains(AttributeValue)}.
+ */
+ public boolean containsAll(Collection<AttributeValue> values)
+ {
+ for (AttributeValue value : values)
+ {
+ if (!contains(value))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final boolean equals(Object o)
+ {
+ if (this == o)
+ {
+ return true;
+ }
+ else if (o instanceof Attribute)
+ {
+ Attribute a = (Attribute) o;
+
+ if (!getAttributeType().equals(a.getAttributeType()))
+ {
+ return false;
+ }
+
+ if (size() != a.size())
+ {
+ return false;
+ }
+
+ for (AttributeValue v : a)
+ {
+ if (!contains(v))
+ {
+ return false;
+ }
+ }
+
+ return optionsEqual(a.getOptions());
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * This implementation returns the primary name associated with this
+ * attribute's attribute type or, if there is no primary name, the
+ * attribute type's OID.
+ */
+ public String getName()
+ {
+ return getAttributeType().getNameOrOID();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * This implementation returns this attribute's name if there are no
+ * attribute options, otherwise it constructs a string comprising of
+ * this attribute's name followed by a semi-colon and a semi-colon
+ * separated list of its attribute options.
+ */
+ public String getNameWithOptions()
+ {
+ if (!hasOptions())
+ {
+ return getName();
+ }
+ else
+ {
+ StringBuilder buffer = new StringBuilder();
+ buffer.append(getName());
+ for (String option : getOptions())
+ {
+ buffer.append(';');
+ buffer.append(option);
+ }
+ return buffer.toString();
+ }
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * This implementation returns <code>true</code> if the provided
+ * collection of options is <code>null</code> or empty. If the
+ * collection is non-empty and this attribute does not have any
+ * options then it returns <code>false</code>. Otherwise, each
+ * option in the provided collection is checked using
+ * {@link Attribute#hasOption(String)} and <code>true</code> is
+ * returned if all the provided options are present.
+ */
+ public boolean hasAllOptions(Collection<String> options)
+ {
+ if (options == null || options.isEmpty())
+ {
+ return true;
+ }
+
+ if (!hasOptions())
+ {
+ return false;
+ }
+
+ for (String option : options)
+ {
+ if (!hasOption(option))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final int hashCode()
+ {
+ int hashCode = getAttributeType().hashCode();
+
+ for (AttributeValue value : this)
+ {
+ hashCode += value.hashCode();
+ }
+
+ return hashCode;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * This implementation calls {@link Attribute#getOptions()} to
+ * retrieve this attribute's set of options and then compares them
+ * one at a time against the provided option. All comparisons are
+ * case insensitive (this is why we iterate through the set of
+ * options, rather than doing a simpler set membership test).
+ */
+ public boolean hasOption(String option)
+ {
+ String noption = toLowerCase(option);
+
+ // Cannot use Set.contains() because the options are not
+ // normalized.
+ for (String o : getOptions())
+ {
+ String no = toLowerCase(o);
+ if (no.equals(noption))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * This implementation retrieves the set of options associated with
+ * this attribute and tests to see if it is empty.
+ */
+ public boolean hasOptions()
+ {
+ return !getOptions().isEmpty();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * This implementation returns <code>true</code> if the
+ * {@link Attribute#size()} of this attribute is zero.
+ */
+ public boolean isEmpty()
+ {
+ return size() == 0;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * This implementation returns !{@link #hasOptions()} if the
+ * provided set of options is <code>null</code>. Otherwise it
+ * checks that the size of the provided set of options is equal to
+ * the size of this attribute's options, return <code>false</code>
+ * if the sizes differ. If the sizes are the same then each option
+ * in the provided set is checked using
+ * {@link Attribute#hasOption(String)} and <code>true</code> is
+ * returned if all the provided options are present.
+ */
+ public boolean optionsEqual(Set<String> options)
+ {
+ if (options == null)
+ {
+ return !hasOptions();
+ }
+
+ if (getOptions().size() != options.size())
+ {
+ return false;
+ }
+
+ // Cannot use Set.containsAll() because the set of options are
+ // not normalized.
+ for (String option : options)
+ {
+ if (!hasOption(option))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final String toString()
+ {
+ StringBuilder buffer = new StringBuilder();
+ toString(buffer);
+ return buffer.toString();
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java b/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java
index ac230a7..34303e9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java
@@ -28,413 +28,61 @@
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.LinkedHashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.opends.server.api.ApproximateMatchingRule;
-import org.opends.server.api.OrderingMatchingRule;
-import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.util.Base64;
-
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* This class defines a data structure for storing and interacting
* with an attribute that may be used in the Directory Server.
+ * <p>
+ * Attributes are immutable and therefore any attempts to modify them
+ * will result in an {@link UnsupportedOperationException}.
+ * <p>
+ * There are two types of attribute: real attributes and virtual
+ * attributes. Real attributes can be created using the
+ * {@link AttributeBuilder} class or by using the various static
+ * factory methods in the {@link Attributes} class, whereas virtual
+ * attributes are represented using the {@link VirtualAttribute}
+ * class. New attribute implementations can be implemented by either
+ * implementing this interface or by extending
+ * {@link AbstractAttribute}.
*/
@org.opends.server.types.PublicAPI(
- stability=org.opends.server.types.StabilityLevel.UNCOMMITTED,
- mayInstantiate=true,
- mayExtend=false,
- mayInvoke=true)
-public class Attribute
+ stability = org.opends.server.types.StabilityLevel.UNCOMMITTED,
+ mayInstantiate = false,
+ mayExtend = false,
+ mayInvoke = true)
+public interface Attribute extends Iterable<AttributeValue>
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
-
- // The attribute type for this attribute.
- private final AttributeType attributeType;
-
- // The set of values for this attribute.
- private LinkedHashSet<AttributeValue> values;
-
- // The set of options for this attribute.
- private final LinkedHashSet<String> options;
-
- // The set of options for this attribute, formatted in all lowercase
- // characters.
- private final LinkedHashSet<String> lowerOptions;
-
- // The name of this attribute as provided by the end user.
- private final String name;
-
-
/**
- * Creates a new attribute with the specified type. It will not
- * have any values.
+ * Indicates whether this attribute has any value(s) that are
+ * approximately equal to the provided value.
*
- * @param attributeType The attribute type for this attribute.
+ * @param value
+ * The value for which to make the determination.
+ * @return <CODE>UNDEFINED</CODE> if this attribute does not have
+ * an approximate matching rule, <CODE>TRUE</CODE> if at
+ * least one value is approximately equal to the provided
+ * value, or <CODE>false</CODE> otherwise.
*/
- public Attribute(AttributeType attributeType)
- {
- this.attributeType = attributeType;
- this.name = attributeType.getPrimaryName();
- this.options = new LinkedHashSet<String>(0);
- this.values = new LinkedHashSet<AttributeValue>();
-
- lowerOptions = options;
- }
-
-
-
- /**
- * Creates a new attribute with the specified type and user-provided
- * name. It will not have any values.
- *
- * @param attributeType The attribute type for this attribute.
- * @param name The user-provided name for this attribute.
- */
- public Attribute(AttributeType attributeType, String name)
- {
- this.attributeType = attributeType;
- this.name = name;
- this.options = new LinkedHashSet<String>(0);
- this.values = new LinkedHashSet<AttributeValue>();
-
- lowerOptions = options;
- }
-
-
-
- /**
- * Creates a new attribute with the specified type, user-provided
- * name, and set of values.
- *
- * @param attributeType The attribute type for this attribute.
- * @param name The user-provided name for this attribute.
- * @param values The set of values for this attribute.
- */
- public Attribute(AttributeType attributeType, String name,
- LinkedHashSet<AttributeValue> values)
- {
- this.attributeType = attributeType;
- this.name = name;
- this.options = new LinkedHashSet<String>(0);
-
- lowerOptions = options;
-
- if (values == null)
- {
- this.values = new LinkedHashSet<AttributeValue>();
- }
- else
- {
- this.values = values;
- }
- }
-
-
-
- /**
- * Creates a new attribute with the specified name and value.
- *
- * @param lowerName The name or OID of the attribute type for
- * this attribute, formatted in all lowercase
- * characters.
- * @param valueString The String representation of the attribute
- * value.
- */
- public Attribute(String lowerName, String valueString)
- {
- this.attributeType =
- DirectoryServer.getAttributeType(lowerName, true);
- this.name = lowerName;
- this.values = new LinkedHashSet<AttributeValue>();
- this.values.add(new AttributeValue(this.attributeType,
- valueString));
- this.options = new LinkedHashSet<String>(0);
-
- lowerOptions = options;
- }
-
-
-
- /**
- * Creates a new attribute with the specified type, user-provided
- * name, and set of values.
- *
- * @param attributeType The attribute type for this attribute.
- * @param name The user-provided name for this attribute.
- * @param options The set of options for this attribute.
- * @param values The set of values for this attribute.
- */
- public Attribute(AttributeType attributeType, String name,
- LinkedHashSet<String> options,
- LinkedHashSet<AttributeValue> values)
- {
- this.attributeType = attributeType;
- this.name = name;
-
- if ((options == null) || options.isEmpty())
- {
- this.options = new LinkedHashSet<String>(0);
- lowerOptions = options;
- }
- else
- {
- this.options = options;
- lowerOptions = new LinkedHashSet<String>(options.size());
- for (String option : options)
- {
- lowerOptions.add(toLowerCase(option));
- }
- }
-
- if (values == null)
- {
- this.values = new LinkedHashSet<AttributeValue>(0);
- }
- else
- {
- this.values = values;
- }
- }
-
-
-
- /**
- * Retrieves the attribute type for this attribute.
- *
- * @return The attribute type for this attribute.
- */
- public AttributeType getAttributeType()
- {
- return attributeType;
- }
-
-
-
- /**
- * Retrieves the user-provided name for this attribute.
- *
- * @return The user-provided name for this attribute.
- */
- public String getName()
- {
- return name;
- }
-
-
-
- /**
- * Retrieves the user-provided name of the attribute, along with any
- * options that might have been provided.
- *
- * @return The user-provided name of the attribute, along with any
- * options that might have been provided.
- */
- public String getNameWithOptions()
- {
- if (options.isEmpty())
- {
- return name;
- }
- else
- {
- StringBuilder buffer = new StringBuilder();
- buffer.append(name);
- for (String option : options)
- {
- buffer.append(';');
- buffer.append(option);
- }
- return buffer.toString();
- }
- }
-
-
-
- /**
- * Retrieves the set of attribute options for this attribute.
- *
- * @return The set of attribute options for this attribute.
- */
- public LinkedHashSet<String> getOptions()
- {
- return options;
- }
-
-
-
- /**
- * Indicates whether this attribute has the specified option.
- *
- * @param option The option for which to make the determination.
- *
- * @return <CODE>true</CODE> if this attribute has the specified
- * option, or <CODE>false</CODE> if not.
- */
- public boolean hasOption(String option)
- {
- return lowerOptions.contains(toLowerCase(option));
- }
-
-
-
- /**
- * Indicates whether this attribute has any options at all.
- *
- * @return <CODE>true</CODE> if this attribute has at least one
- * option, or <CODE>false</CODE> if not.
- */
- public boolean hasOptions()
- {
- return (! options.isEmpty());
- }
-
-
-
- /**
- * Indicates whether this attribute has all of the options in the
- * provided collection.
- *
- * @param options The collection of options for which to make the
- * determination.
- *
- * @return <CODE>true</CODE> if this attribute has all of the
- * specified options, or <CODE>false</CODE> if it does not
- * have at least one of them.
- */
- public boolean hasOptions(Collection<String> options)
- {
- if (options == null)
- {
- return true;
- }
-
- for (String option : options)
- {
- if (! lowerOptions.contains(toLowerCase(option)))
- {
- return false;
- }
- }
-
- return true;
- }
-
-
-
- /**
- * Indicates whether this attribute has exactly the set of options
- * in the provided set.
- *
- * @param options The set of options for which to make the
- * determination.
- *
- * @return <CODE>true</CODE> if this attribute has exactly the
- * specified set of options, or <CODE>false</CODE> if the
- * set of options is different in any way.
- */
- public boolean optionsEqual(Set<String> options)
- {
- if (options == null)
- {
- return this.options == null || this.options.isEmpty();
- }
-
- if (options.isEmpty() && this.options.isEmpty())
- {
- return true;
- }
-
- if (options.size() != this.options.size())
- {
- return false;
- }
-
- for (String s : options)
- {
- if (! lowerOptions.contains(toLowerCase(s)))
- {
- return false;
- }
- }
-
- return true;
- }
-
-
-
- /**
- * Retrieves the set of values for this attribute. The returned set
- * of values may be altered by the caller.
- *
- * @return The set of values for this attribute.
- */
- public LinkedHashSet<AttributeValue> getValues()
- {
- return values;
- }
-
-
-
- /**
- * Specifies the set of values for this attribute.
- *
- * @param values The set of values for this attribute.
- */
- public void setValues(LinkedHashSet<AttributeValue> values)
- {
- if (values == null)
- {
- this.values = new LinkedHashSet<AttributeValue>();
- }
- else
- {
- this.values = values;
- }
- }
-
-
-
- /**
- * Indicates whether this attribute contains one or more values.
- *
- * @return <CODE>true</CODE> if this attribute contains one or more
- * values, or <CODE>false</CODE> if it does not.
- */
- public boolean hasValue()
- {
- return (! getValues().isEmpty());
- }
+ ConditionResult approximatelyEqualTo(AttributeValue value);
/**
* Indicates whether this attribute contains the specified value.
*
- * @param value The value for which to make the determination.
- *
- * @return <CODE>true</CODE> if this attribute has the specified
- * value, or <CODE>false</CODE> if not.
+ * @param value
+ * The value for which to make the determination.
+ * @return <CODE>true</CODE> if this attribute has the specified
+ * value, or <CODE>false</CODE> if not.
*/
- public boolean hasValue(AttributeValue value)
- {
- return getValues().contains(value);
- }
+ boolean contains(AttributeValue value);
@@ -442,195 +90,68 @@
* Indicates whether this attribute contains all the values in the
* collection.
*
- * @param values The set of values for which to make the
- * determination.
- *
- * @return <CODE>true</CODE> if this attribute contains all the
- * values in the provided collection, or <CODE>false</CODE>
- * if it does not contain at least one of them.
+ * @param values
+ * The set of values for which to make the determination.
+ * @return <CODE>true</CODE> if this attribute contains all the
+ * values in the provided collection, or <CODE>false</CODE>
+ * if it does not contain at least one of them.
*/
- public boolean hasAllValues(Collection<AttributeValue> values)
- {
- for (AttributeValue value : values)
- {
- if (! getValues().contains(value))
- {
- return false;
- }
- }
-
- return true;
- }
+ boolean containsAll(Collection<AttributeValue> values);
/**
- * Indicates whether this attribute contains any of the values in
- * the collection.
+ * Indicates whether the provided object is an attribute that is
+ * equal to this attribute. It will be considered equal if the
+ * attribute type, set of values, and set of options are equal.
*
- * @param values The set of values for which to make the
- * determination.
- *
- * @return <CODE>true</CODE> if this attribute contains at least
- * one of the values in the provided collection, or
- * <CODE>false</CODE> if it does not contain any of the
- * values.
+ * @param o
+ * The object for which to make the determination.
+ * @return <CODE>true</CODE> if the provided object is an
+ * attribute that is equal to this attribute, or
+ * <CODE>false</CODE> if not.
*/
- public boolean hasAnyValue(Collection<AttributeValue> values)
- {
- for (AttributeValue value : values)
- {
- if (getValues().contains(value))
- {
- return true;
- }
- }
-
- return false;
- }
+ boolean equals(Object o);
/**
- * Indicates whether this attribute has any value(s) that match the
- * provided substring.
+ * Retrieves the attribute type for this attribute.
*
- * @param subInitial The subInitial component to use in the
- * determination.
- * @param subAny The subAny components to use in the
- * determination.
- * @param subFinal The subFinal component to use in the
- * determination.
- *
- * @return <CODE>UNDEFINED</CODE> if this attribute does not have a
- * substring matching rule, <CODE>TRUE</CODE> if at least
- * one value matches the provided substring, or
- * <CODE>FALSE</CODE> otherwise.
+ * @return The attribute type for this attribute.
*/
- public ConditionResult matchesSubstring(ByteString subInitial,
- List<ByteString> subAny,
- ByteString subFinal)
- {
- SubstringMatchingRule matchingRule =
- attributeType.getSubstringMatchingRule();
- if (matchingRule == null)
- {
- return ConditionResult.UNDEFINED;
- }
+ AttributeType getAttributeType();
- ByteString normalizedSubInitial;
- if (subInitial == null)
- {
- normalizedSubInitial = null;
- }
- else
- {
- try
- {
- normalizedSubInitial =
- matchingRule.normalizeSubstring(subInitial);
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
- // The substring couldn't be normalized. We have to return
- // "undefined".
- return ConditionResult.UNDEFINED;
- }
- }
+ /**
+ * Retrieves the user-provided name for this attribute.
+ *
+ * @return The user-provided name for this attribute.
+ */
+ String getName();
- ArrayList<ByteString> normalizedSubAny;
- if (subAny == null)
- {
- normalizedSubAny = null;
- }
- else
- {
- normalizedSubAny =
- new ArrayList<ByteString>(subAny.size());
- for (ByteString subAnyElement : subAny)
- {
- try
- {
- normalizedSubAny.add(matchingRule.normalizeSubstring(
- subAnyElement));
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
- // The substring couldn't be normalized. We have to return
- // "undefined".
- return ConditionResult.UNDEFINED;
- }
- }
- }
+ /**
+ * Retrieves the user-provided name of this attribute, along with
+ * any options that might have been provided.
+ *
+ * @return The user-provided name of this attribute, along with any
+ * options that might have been provided.
+ */
+ String getNameWithOptions();
- ByteString normalizedSubFinal;
- if (subFinal == null)
- {
- normalizedSubFinal = null;
- }
- else
- {
- try
- {
- normalizedSubFinal =
- matchingRule.normalizeSubstring(subFinal);
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
- // The substring couldn't be normalized. We have to return
- // "undefined".
- return ConditionResult.UNDEFINED;
- }
- }
-
-
- ConditionResult result = ConditionResult.FALSE;
- for (AttributeValue value : getValues())
- {
- try
- {
- if (matchingRule.valueMatchesSubstring(
- value.getNormalizedValue(),
- normalizedSubInitial,
- normalizedSubAny,
- normalizedSubFinal))
- {
- return ConditionResult.TRUE;
- }
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- // The value couldn't be normalized. If we can't find a
- // definite match, then we should return "undefined".
- result = ConditionResult.UNDEFINED;
- }
- }
-
- return result;
- }
+ /**
+ * Retrieves the unmodifiable set of attribute options for this
+ * attribute. The returned set of options are not normalized.
+ *
+ * @return The unmodifiable set of attribute options for this
+ * attribute.
+ */
+ Set<String> getOptions();
@@ -638,204 +159,73 @@
* Indicates whether this attribute has any value(s) that are
* greater than or equal to the provided value.
*
- * @param value The value for which to make the determination.
- *
- * @return <CODE>UNDEFINED</CODE> if this attribute does not have
- * an ordering matching rule, <CODE>TRUE</CODE> if at least
- * one value is greater than or equal to the provided
- * value, or <CODE>false</CODE> otherwise.
+ * @param value
+ * The value for which to make the determination.
+ * @return <CODE>UNDEFINED</CODE> if this attribute does not have
+ * an ordering matching rule, <CODE>TRUE</CODE> if at
+ * least one value is greater than or equal to the provided
+ * value, or <CODE>false</CODE> otherwise.
*/
- public ConditionResult greaterThanOrEqualTo(AttributeValue value)
- {
- OrderingMatchingRule matchingRule =
- attributeType.getOrderingMatchingRule();
- if (matchingRule == null)
- {
- return ConditionResult.UNDEFINED;
- }
-
- ByteString normalizedValue;
- try
- {
- normalizedValue = value.getNormalizedValue();
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- // We couldn't normalize the provided value. We should return
- // "undefined".
- return ConditionResult.UNDEFINED;
- }
-
- ConditionResult result = ConditionResult.FALSE;
- for (AttributeValue v : getValues())
- {
- try
- {
- ByteString nv = v.getNormalizedValue();
- int comparisonResult =
- matchingRule.compareValues(nv, normalizedValue);
- if (comparisonResult >= 0)
- {
- return ConditionResult.TRUE;
- }
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- // We couldn't normalize one of the attribute values. If we
- // can't find a definite match, then we should return
- // "undefined".
- result = ConditionResult.UNDEFINED;
- }
- }
-
- return result;
- }
+ ConditionResult greaterThanOrEqualTo(AttributeValue value);
/**
- * Indicates whether this attribute has any value(s) that are less
- * than or equal to the provided value.
+ * Indicates whether this attribute has all of the options in the
+ * provided collection.
*
- * @param value The value for which to make the determination.
- *
- * @return <CODE>UNDEFINED</CODE> if this attribute does not have
- * an ordering matching rule, <CODE>TRUE</CODE> if at least
- * one value is less than or equal to the provided value,
- * or <CODE>false</CODE> otherwise.
+ * @param options
+ * The collection of options for which to make the
+ * determination (may be <code>null</code>).
+ * @return <CODE>true</CODE> if this attribute has all of the
+ * specified options, or <CODE>false</CODE> if it does not
+ * have at least one of them.
*/
- public ConditionResult lessThanOrEqualTo(AttributeValue value)
- {
- OrderingMatchingRule matchingRule =
- attributeType.getOrderingMatchingRule();
- if (matchingRule == null)
- {
- return ConditionResult.UNDEFINED;
- }
-
- ByteString normalizedValue;
- try
- {
- normalizedValue = value.getNormalizedValue();
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- // We couldn't normalize the provided value. We should return
- // "undefined".
- return ConditionResult.UNDEFINED;
- }
-
- ConditionResult result = ConditionResult.FALSE;
- for (AttributeValue v : getValues())
- {
- try
- {
- ByteString nv = v.getNormalizedValue();
- int comparisonResult =
- matchingRule.compareValues(nv, normalizedValue);
- if (comparisonResult <= 0)
- {
- return ConditionResult.TRUE;
- }
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- // We couldn't normalize one of the attribute values. If we
- // can't find a definite match, then we should return
- // "undefined".
- result = ConditionResult.UNDEFINED;
- }
- }
-
- return result;
- }
+ boolean hasAllOptions(Collection<String> options);
/**
- * Indicates whether this attribute has any value(s) that are
- * approximately equal to the provided value.
+ * Retrieves the hash code for this attribute. It will be calculated
+ * as the sum of the hash code for the attribute type and all
+ * values.
*
- * @param value The value for which to make the determination.
- *
- * @return <CODE>UNDEFINED</CODE> if this attribute does not have
- * an approximate matching rule, <CODE>TRUE</CODE> if at
- * least one value is approximately equal to the provided
- * value, or <CODE>false</CODE> otherwise.
+ * @return The hash code for this attribute.
*/
- public ConditionResult approximatelyEqualTo(AttributeValue value)
- {
- ApproximateMatchingRule matchingRule =
- attributeType.getApproximateMatchingRule();
- if (matchingRule == null)
- {
- return ConditionResult.UNDEFINED;
- }
+ int hashCode();
- ByteString normalizedValue;
- try
- {
- normalizedValue = matchingRule.normalizeValue(value.getValue());
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
- // We couldn't normalize the provided value. We should return
- // "undefined".
- return ConditionResult.UNDEFINED;
- }
- ConditionResult result = ConditionResult.FALSE;
- for (AttributeValue v : getValues())
- {
- try
- {
- ByteString nv = matchingRule.normalizeValue(v.getValue());
- if (matchingRule.approximatelyMatch(nv, normalizedValue))
- {
- return ConditionResult.TRUE;
- }
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ /**
+ * Indicates whether this attribute has the specified option.
+ *
+ * @param option
+ * The option for which to make the determination.
+ * @return <CODE>true</CODE> if this attribute has the specified
+ * option, or <CODE>false</CODE> if not.
+ */
+ boolean hasOption(String option);
- // We couldn't normalize one of the attribute values. If we
- // can't find a definite match, then we should return
- // "undefined".
- result = ConditionResult.UNDEFINED;
- }
- }
- return result;
- }
+
+ /**
+ * Indicates whether this attribute has any options at all.
+ *
+ * @return <CODE>true</CODE> if this attribute has at least one
+ * option, or <CODE>false</CODE> if not.
+ */
+ boolean hasOptions();
+
+
+
+ /**
+ * Returns <code>true</code> if this attribute contains no
+ * attribute values.
+ *
+ * @return <CODE>true</CODE> if this attribute contains no
+ * attribute values.
+ */
+ boolean isEmpty();
@@ -843,134 +233,88 @@
* Indicates whether this is a virtual attribute rather than a real
* attribute.
*
- * @return {@code true} if this is a virtual attribute, or
- * {@code false} if it is a real attribute.
+ * @return {@code true} if this is a virtual attribute.
*/
- public boolean isVirtual()
- {
- return false;
- }
+ boolean isVirtual();
/**
- * Creates a duplicate of this attribute that can be modified
- * without impacting this attribute.
+ * Returns an iterator over the attribute values in this attribute.
+ * The attribute values are returned in the order in which they were
+ * added this attribute. The returned iterator does not support
+ * attribute value removals via its <code>remove</code> method.
*
- * @return A duplicate of this attribute that can be modified
- * without impacting this attribute.
+ * @return An iterator over the attribute values in this attribute.
*/
- public Attribute duplicate()
- {
- return duplicate(false);
- }
-
-
- /**
- * Creates a duplicate of this attribute that can be modified
- * without impacting this attribute.
- *
- * @param omitValues <CODE>true</CODE> if the values should be
- * omitted.
- *
- * @return A duplicate of this attribute that can be modified
- * without impacting this attribute.
- */
- public Attribute duplicate(boolean omitValues)
- {
- LinkedHashSet<String> optionsCopy =
- new LinkedHashSet<String>(options);
-
- if (omitValues)
- {
- return new Attribute(attributeType, name, optionsCopy, null);
- }
- else
- {
- LinkedHashSet<AttributeValue> valuesCopy =
- new LinkedHashSet<AttributeValue>(getValues());
-
- return new Attribute(attributeType, name, optionsCopy,
- valuesCopy);
- }
- }
-
-
- /**
- * Indicates whether the provided object is an attribute that is
- * equal to this attribute. It will be considered equal if the
- * attribute type, set of values, and set of options are equal.
- *
- * @param o The object for which to make the determination.
- *
- * @return <CODE>true</CODE> if the provided object is an attribute
- * that is equal to this attribute, or <CODE>false</CODE>
- * if not.
- */
- public boolean equals(Object o)
- {
- if (this == o)
- {
- return true;
- }
-
- if ((o == null) || (! (o instanceof Attribute)))
- {
- return false;
- }
-
- Attribute a = (Attribute) o;
- if (! attributeType.equals(a.attributeType))
- {
- return false;
- }
-
- if (getValues().size() != a.getValues().size())
- {
- return false;
- }
-
- if (! hasAllValues(a.getValues()))
- {
- return false;
- }
-
- return optionsEqual(a.options);
- }
+ Iterator<AttributeValue> iterator();
/**
- * Retrieves the hash code for this attribute. It will be
- * calculated as the sum of the hash code for the attribute type and
- * all values.
+ * Indicates whether this attribute has any value(s) that are less
+ * than or equal to the provided value.
*
- * @return The hash code for this attribute.
+ * @param value
+ * The value for which to make the determination.
+ * @return <CODE>UNDEFINED</CODE> if this attribute does not have
+ * an ordering matching rule, <CODE>TRUE</CODE> if at
+ * least one value is less than or equal to the provided
+ * value, or <CODE>false</CODE> otherwise.
*/
- public int hashCode()
- {
- int hashCode = attributeType.hashCode();
- for (AttributeValue value : getValues())
- {
- hashCode += value.hashCode();
- }
+ ConditionResult lessThanOrEqualTo(AttributeValue value);
- return hashCode;
- }
+
+
+ /**
+ * Indicates whether this attribute has any value(s) that match the
+ * provided substring.
+ *
+ * @param subInitial
+ * The subInitial component to use in the determination.
+ * @param subAny
+ * The subAny components to use in the determination.
+ * @param subFinal
+ * The subFinal component to use in the determination.
+ * @return <CODE>UNDEFINED</CODE> if this attribute does not have
+ * a substring matching rule, <CODE>TRUE</CODE> if at
+ * least one value matches the provided substring, or
+ * <CODE>FALSE</CODE> otherwise.
+ */
+ ConditionResult matchesSubstring(ByteString subInitial,
+ List<ByteString> subAny, ByteString subFinal);
+
+
+
+ /**
+ * Indicates whether this attribute has exactly the specified set of
+ * options.
+ *
+ * @param options
+ * The set of options for which to make the determination
+ * (may be <code>null</code>).
+ * @return <CODE>true</CODE> if this attribute has exactly the
+ * specified set of options.
+ */
+ boolean optionsEqual(Set<String> options);
+
+
+
+ /**
+ * Returns the number of attribute values in this attribute.
+ *
+ * @return The number of attribute values in this attribute.
+ */
+ int size();
/**
* Retrieves a one-line string representation of this attribute.
*
- * @return A one-line string representation of this attribute.
+ * @return A one-line string representation of this attribute.
*/
- public String toString()
- {
- StringBuilder buffer = new StringBuilder();
- toString(buffer);
- return buffer.toString();
- }
+ String toString();
@@ -978,72 +322,8 @@
* Appends a one-line string representation of this attribute to the
* provided buffer.
*
- * @param buffer The buffer to which the information should be
- * appended.
+ * @param buffer
+ * The buffer to which the information should be appended.
*/
- public void toString(StringBuilder buffer)
- {
- buffer.append("Attribute(");
- buffer.append(name);
- buffer.append(", {");
-
- boolean firstValue = true;
- for (AttributeValue value : getValues())
- {
- if (! firstValue)
- {
- buffer.append(", ");
- }
-
- value.toString(buffer);
- firstValue = false;
- }
-
- buffer.append("})");
- }
-
-
-
- /**
- * Retrieves a string representation of this attribute in LDIF form.
- *
- * @return A string representation of this attribute in LDIF form.
- */
- public String toLDIF()
- {
- StringBuilder buffer = new StringBuilder();
- toLDIF(buffer);
- return buffer.toString();
- }
-
-
-
- /**
- * Appends a string representation of this attribute in LDIF form to
- * the provided buffer.
- *
- * @param buffer The buffer to which the information should be
- * appended.
- */
- public void toLDIF(StringBuilder buffer)
- {
- for (AttributeValue value : getValues())
- {
- buffer.append(name);
-
- if (needsBase64Encoding(value.getValueBytes()))
- {
- buffer.append("::");
- buffer.append(Base64.encode(value.getValueBytes()));
- }
- else
- {
- buffer.append(": ");
- buffer.append(value.getStringValue());
- }
-
- buffer.append(EOL);
- }
- }
+ void toString(StringBuilder buffer);
}
-
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeBuilder.java b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeBuilder.java
new file mode 100644
index 0000000..6474b37
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeBuilder.java
@@ -0,0 +1,1829 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.types;
+
+
+
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.util.StaticUtils.*;
+
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.opends.server.api.ApproximateMatchingRule;
+import org.opends.server.api.OrderingMatchingRule;
+import org.opends.server.api.SubstringMatchingRule;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.util.Validator;
+
+
+
+/**
+ * This class provides an interface for creating new non-virtual
+ * {@link Attribute}s, or "real" attributes.
+ * <p>
+ * An attribute can be created incrementally using either
+ * {@link #AttributeBuilder(AttributeType)} or
+ * {@link #AttributeBuilder(AttributeType, String)}. The caller is
+ * then free to add new options using {@link #setOption(String)} and
+ * new values using {@link #add(AttributeValue)} or
+ * {@link #addAll(Collection)}. Once all the options and values have
+ * been added, the attribute can be retrieved using the
+ * {@link #toAttribute()} method.
+ * <p>
+ * A real attribute can also be created based on the values taken from
+ * another attribute using the {@link #AttributeBuilder(Attribute)}
+ * constructor. The caller is then free to modify the values within
+ * the attribute before retrieving the updated attribute using the
+ * {@link #toAttribute()} method.
+ * <p>
+ * The {@link Attributes} class contains convenience factory methods,
+ * e.g. {@link Attributes#empty(String)} for creating empty
+ * attributes, and {@link Attributes#create(String, String)} for
+ * creating single-valued attributes.
+ * <p>
+ * <code>AttributeBuilder</code>s can be re-used. Once an
+ * <code>AttributeBuilder</code> has been converted to an
+ * {@link Attribute} using {@link #toAttribute()}, its state is reset
+ * so that its attribute type, user-provided name, options, and values
+ * are all undefined:
+ *
+ * <pre>
+ * AttributeBuilder builder = new AttributeBuilder();
+ * for (int i = 0; i < 10; i++)
+ * {
+ * builder.setAttributeType("myAttribute" + i);
+ * builder.setOption("an-option");
+ * builder.add("a value");
+ * Attribute attribute = builder.toAttribute();
+ * // Do something with attribute...
+ * }
+ * </pre>
+ * <p>
+ * <b>Implementation Note:</b> this class is optimized for the common
+ * case where there is only a single value. By doing so, we avoid
+ * using unnecessary storage space and also performing any unnecessary
+ * normalization. In addition, this class is optimized for the common
+ * cases where there are zero or one attribute type options.
+ */
+@org.opends.server.types.PublicAPI(
+ stability = org.opends.server.types.StabilityLevel.UNCOMMITTED,
+ mayInstantiate = true,
+ mayExtend = false,
+ mayInvoke = true)
+public final class AttributeBuilder
+ implements Iterable<AttributeValue>
+{
+
+ /**
+ * A real attribute - options handled by sub-classes.
+ */
+ private static abstract class RealAttribute
+ extends AbstractAttribute
+ {
+
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
+ // The attribute type for this attribute.
+ private final AttributeType attributeType;
+
+ // The name of this attribute as provided by the end user.
+ private final String name;
+
+ // The unmodifiable set of values for this attribute.
+ private final Set<AttributeValue> values;
+
+
+
+ /**
+ * Creates a new real attribute.
+ *
+ * @param attributeType
+ * The attribute type.
+ * @param name
+ * The user-provided attribute name.
+ * @param values
+ * The attribute values.
+ */
+ private RealAttribute(
+ AttributeType attributeType,
+ String name,
+ Set<AttributeValue> values)
+ {
+ this.attributeType = attributeType;
+ this.name = name;
+ this.values = values;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public final ConditionResult approximatelyEqualTo(
+ AttributeValue value)
+ {
+ ApproximateMatchingRule matchingRule = attributeType
+ .getApproximateMatchingRule();
+ if (matchingRule == null)
+ {
+ return ConditionResult.UNDEFINED;
+ }
+
+ ByteString normalizedValue;
+ try
+ {
+ normalizedValue =
+ matchingRule.normalizeValue(value.getValue());
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ // We couldn't normalize the provided value. We should return
+ // "undefined".
+ return ConditionResult.UNDEFINED;
+ }
+
+ ConditionResult result = ConditionResult.FALSE;
+ for (AttributeValue v : values)
+ {
+ try
+ {
+ ByteString nv = matchingRule.normalizeValue(v.getValue());
+ if (matchingRule.approximatelyMatch(nv, normalizedValue))
+ {
+ return ConditionResult.TRUE;
+ }
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ // We couldn't normalize one of the attribute values. If we
+ // can't find a definite match, then we should return
+ // "undefined".
+ result = ConditionResult.UNDEFINED;
+ }
+ }
+
+ return result;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public final boolean contains(AttributeValue value)
+ {
+ return values.contains(value);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final boolean containsAll(
+ Collection<AttributeValue> values)
+ {
+ return this.values.containsAll(values);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public final AttributeType getAttributeType()
+ {
+ return attributeType;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final String getName()
+ {
+ return name;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public final ConditionResult greaterThanOrEqualTo(
+ AttributeValue value)
+ {
+ OrderingMatchingRule matchingRule = attributeType
+ .getOrderingMatchingRule();
+ if (matchingRule == null)
+ {
+ return ConditionResult.UNDEFINED;
+ }
+
+ ByteString normalizedValue;
+ try
+ {
+ normalizedValue = value.getNormalizedValue();
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ // We couldn't normalize the provided value. We should return
+ // "undefined".
+ return ConditionResult.UNDEFINED;
+ }
+
+ ConditionResult result = ConditionResult.FALSE;
+ for (AttributeValue v : values)
+ {
+ try
+ {
+ ByteString nv = v.getNormalizedValue();
+ int comparisonResult = matchingRule
+ .compareValues(nv, normalizedValue);
+ if (comparisonResult >= 0)
+ {
+ return ConditionResult.TRUE;
+ }
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ // We couldn't normalize one of the attribute values. If we
+ // can't find a definite match, then we should return
+ // "undefined".
+ result = ConditionResult.UNDEFINED;
+ }
+ }
+
+ return result;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public final boolean isVirtual()
+ {
+ return false;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public final Iterator<AttributeValue> iterator()
+ {
+ return values.iterator();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public final ConditionResult lessThanOrEqualTo(
+ AttributeValue value)
+ {
+ OrderingMatchingRule matchingRule = attributeType
+ .getOrderingMatchingRule();
+ if (matchingRule == null)
+ {
+ return ConditionResult.UNDEFINED;
+ }
+
+ ByteString normalizedValue;
+ try
+ {
+ normalizedValue = value.getNormalizedValue();
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ // We couldn't normalize the provided value. We should return
+ // "undefined".
+ return ConditionResult.UNDEFINED;
+ }
+
+ ConditionResult result = ConditionResult.FALSE;
+ for (AttributeValue v : values)
+ {
+ try
+ {
+ ByteString nv = v.getNormalizedValue();
+ int comparisonResult = matchingRule
+ .compareValues(nv, normalizedValue);
+ if (comparisonResult <= 0)
+ {
+ return ConditionResult.TRUE;
+ }
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ // We couldn't normalize one of the attribute values. If we
+ // can't find a definite match, then we should return
+ // "undefined".
+ result = ConditionResult.UNDEFINED;
+ }
+ }
+
+ return result;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public final ConditionResult matchesSubstring(
+ ByteString subInitial,
+ List<ByteString> subAny, ByteString subFinal)
+ {
+ SubstringMatchingRule matchingRule = attributeType
+ .getSubstringMatchingRule();
+ if (matchingRule == null)
+ {
+ return ConditionResult.UNDEFINED;
+ }
+
+ ByteString normalizedSubInitial;
+ if (subInitial == null)
+ {
+ normalizedSubInitial = null;
+ }
+ else
+ {
+ try
+ {
+ normalizedSubInitial =
+ matchingRule.normalizeSubstring(subInitial);
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ // The substring couldn't be normalized. We have to return
+ // "undefined".
+ return ConditionResult.UNDEFINED;
+ }
+ }
+
+ ArrayList<ByteString> normalizedSubAny;
+ if (subAny == null)
+ {
+ normalizedSubAny = null;
+ }
+ else
+ {
+ normalizedSubAny = new ArrayList<ByteString>(subAny.size());
+ for (ByteString subAnyElement : subAny)
+ {
+ try
+ {
+ normalizedSubAny
+ .add(matchingRule.normalizeSubstring(subAnyElement));
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ // The substring couldn't be normalized. We have to return
+ // "undefined".
+ return ConditionResult.UNDEFINED;
+ }
+ }
+ }
+
+ ByteString normalizedSubFinal;
+ if (subFinal == null)
+ {
+ normalizedSubFinal = null;
+ }
+ else
+ {
+ try
+ {
+ normalizedSubFinal =
+ matchingRule.normalizeSubstring(subFinal);
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ // The substring couldn't be normalized. We have to return
+ // "undefined".
+ return ConditionResult.UNDEFINED;
+ }
+ }
+
+ ConditionResult result = ConditionResult.FALSE;
+ for (AttributeValue value : values)
+ {
+ try
+ {
+ if (matchingRule.valueMatchesSubstring(
+ value.getNormalizedValue(),
+ normalizedSubInitial,
+ normalizedSubAny,
+ normalizedSubFinal))
+ {
+ return ConditionResult.TRUE;
+ }
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ // The value couldn't be normalized. If we can't find a
+ // definite match, then we should return "undefined".
+ result = ConditionResult.UNDEFINED;
+ }
+ }
+
+ return result;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public final int size()
+ {
+ return values.size();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public final void toString(StringBuilder buffer)
+ {
+ buffer.append("Attribute(");
+ buffer.append(getNameWithOptions());
+ buffer.append(", {");
+
+ boolean firstValue = true;
+ for (AttributeValue value : values)
+ {
+ if (!firstValue)
+ {
+ buffer.append(", ");
+ }
+
+ value.toString(buffer);
+ firstValue = false;
+ }
+
+ buffer.append("})");
+ }
+
+ }
+
+
+
+ /**
+ * A real attribute with a many options.
+ */
+ private static final class RealAttributeManyOptions
+ extends RealAttribute
+ {
+
+ // The normalized options.
+ private final SortedSet<String> normalizedOptions;
+
+ // The options.
+ private final Set<String> options;
+
+
+
+ /**
+ * Creates a new real attribute that has multiple options.
+ *
+ * @param attributeType
+ * The attribute type.
+ * @param name
+ * The user-provided attribute name.
+ * @param values
+ * The attribute values.
+ * @param options
+ * The attribute options.
+ * @param normalizedOptions
+ * The normalized attribute options.
+ */
+ private RealAttributeManyOptions(
+ AttributeType attributeType,
+ String name,
+ Set<AttributeValue> values,
+ Set<String> options,
+ SortedSet<String> normalizedOptions)
+ {
+ super(attributeType, name, values);
+ this.options = options;
+ this.normalizedOptions = normalizedOptions;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getOptions()
+ {
+ return options;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasOption(String option)
+ {
+ String s = toLowerCase(option);
+ return normalizedOptions.contains(s);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasOptions()
+ {
+ return true;
+ }
+
+ }
+
+
+
+ /**
+ * A real attribute with no options.
+ */
+ private static final class RealAttributeNoOptions
+ extends RealAttribute
+ {
+
+ /**
+ * Creates a new real attribute that has no options.
+ *
+ * @param attributeType
+ * The attribute type.
+ * @param name
+ * The user-provided attribute name.
+ * @param values
+ * The attribute values.
+ */
+ private RealAttributeNoOptions(
+ AttributeType attributeType,
+ String name,
+ Set<AttributeValue> values)
+ {
+ super(attributeType, name, values);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getNameWithOptions()
+ {
+ return getName();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getOptions()
+ {
+ return Collections.emptySet();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasAllOptions(Collection<String> options)
+ {
+ return (options == null || options.isEmpty());
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasOption(String option)
+ {
+ return false;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasOptions()
+ {
+ return false;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean optionsEqual(Set<String> options)
+ {
+ return (options == null || options.isEmpty());
+ }
+
+ }
+
+
+
+ /**
+ * A real attribute with a single option.
+ */
+ private static final class RealAttributeSingleOption
+ extends RealAttribute
+ {
+
+ // The normalized single option.
+ private final String normalizedOption;
+
+ // A singleton set containing the single option.
+ private final Set<String> option;
+
+
+
+ /**
+ * Creates a new real attribute that has a single option.
+ *
+ * @param attributeType
+ * The attribute type.
+ * @param name
+ * The user-provided attribute name.
+ * @param values
+ * The attribute values.
+ * @param option
+ * The attribute option.
+ */
+ private RealAttributeSingleOption(
+ AttributeType attributeType,
+ String name,
+ Set<AttributeValue> values,
+ String option)
+ {
+ super(attributeType, name, values);
+ this.option = Collections.singleton(option);
+ this.normalizedOption = toLowerCase(option);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getOptions()
+ {
+ return option;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasOption(String option)
+ {
+ String s = toLowerCase(option);
+ return normalizedOption.equals(s);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasOptions()
+ {
+ return true;
+ }
+
+ }
+
+
+
+ /**
+ * A small set of values. This set implementation is optimized to
+ * use as little memory as possible in the case where there zero or
+ * one elements. In addition, any normalization of elements is
+ * delayed until the second element is added (normalization may be
+ * triggered by invoking {@link Object#hashCode()} or
+ * {@link Object#equals(Object)}.
+ *
+ * @param <T>
+ * The type of elements to be contained in this small set.
+ */
+ private static final class SmallSet<T>
+ extends AbstractSet<T>
+ implements Set<T>
+ {
+
+ // The set of elements if there are more than one.
+ private LinkedHashSet<T> elements = null;
+
+ // The first element.
+ private T firstElement = null;
+
+
+
+ /**
+ * Creates a new small set which is initially empty.
+ */
+ public SmallSet()
+ {
+ // No implementation required.
+ }
+
+
+
+ /**
+ * Creates a new small set using the content of the provided
+ * collection.
+ *
+ * @param c
+ * The collection whose elements are to be placed into
+ * this set.
+ */
+ public SmallSet(Collection<T> c)
+ {
+ addAll(c);
+ }
+
+
+
+ /**
+ * Creates a new small set with the specified initial capacity.
+ *
+ * @param initialCapacity
+ * The initial capacity for this set.
+ */
+ public SmallSet(int initialCapacity)
+ {
+ setInitialCapacity(initialCapacity);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean add(T e)
+ {
+ // Special handling for the first value. This avoids potentially
+ // expensive normalization.
+ if (firstElement == null && elements == null)
+ {
+ firstElement = e;
+ return true;
+ }
+
+ // Create the value set if necessary.
+ if (elements == null)
+ {
+ if (firstElement.equals(e))
+ {
+ return false;
+ }
+
+ elements = new LinkedHashSet<T>(2);
+
+ // Move the first value into the set.
+ elements.add(firstElement);
+ firstElement = null;
+ }
+
+ return elements.add(e);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean addAll(Collection<? extends T> c)
+ {
+ if (elements != null)
+ {
+ return elements.addAll(c);
+ }
+
+ if (firstElement != null)
+ {
+ elements = new LinkedHashSet<T>(1 + c.size());
+ elements.add(firstElement);
+ firstElement = null;
+ return elements.addAll(c);
+ }
+
+ // Initially empty.
+ switch (c.size())
+ {
+ case 0:
+ // Do nothing.
+ return false;
+ case 1:
+ firstElement = c.iterator().next();
+ return true;
+ default:
+ elements = new LinkedHashSet<T>(c);
+ return true;
+ }
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void clear()
+ {
+ firstElement = null;
+ elements = null;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Iterator<T> iterator()
+ {
+ if (elements != null)
+ {
+ return elements.iterator();
+ }
+ else if (firstElement != null)
+ {
+ return new Iterator<T>()
+ {
+
+ private boolean hasNext = true;
+
+
+
+ public boolean hasNext()
+ {
+ return hasNext;
+ }
+
+
+
+ public T next()
+ {
+ if (!hasNext)
+ {
+ throw new NoSuchElementException();
+ }
+
+ hasNext = false;
+ return firstElement;
+ }
+
+
+
+ public void remove()
+ {
+ if (hasNext || firstElement == null)
+ {
+ throw new IllegalStateException();
+ }
+
+ firstElement = null;
+ }
+
+ };
+ }
+ else
+ {
+ return Collections.<T> emptySet().iterator();
+ }
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean remove(Object o)
+ {
+ if (elements != null)
+ {
+ // Note: if there is one or zero values left we could stop
+ // using the set. However, lets assume that if the set
+ // was multi-valued before then it may become multi-valued
+ // again.
+ return elements.remove(o);
+ }
+
+ if (firstElement != null && firstElement.equals(o))
+ {
+ firstElement = null;
+ return true;
+ }
+
+ return false;
+ }
+
+
+
+ /**
+ * Sets the initial capacity of this small set. If this small set
+ * already contains elements or if its capacity has already been
+ * defined then an {@link IllegalStateException} is thrown.
+ *
+ * @param initialCapacity
+ * The initial capacity of this small set.
+ * @throws IllegalStateException
+ * If this small set already contains elements or if its
+ * capacity has already been defined.
+ */
+ public void setInitialCapacity(int initialCapacity)
+ throws IllegalStateException
+ {
+ Validator.ensureTrue(initialCapacity >= 0);
+
+ if (elements != null)
+ {
+ throw new IllegalStateException();
+ }
+
+ if (initialCapacity > 1)
+ {
+ elements = new LinkedHashSet<T>(initialCapacity);
+ }
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int size()
+ {
+ if (elements != null)
+ {
+ return elements.size();
+ }
+ else if (firstElement != null)
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ }
+
+
+
+ /**
+ * Creates an attribute that has no options.
+ * <p>
+ * This method is only intended for use by the {@link Attributes}
+ * class.
+ *
+ * @param attributeType
+ * The attribute type.
+ * @param name
+ * The user-provided attribute name.
+ * @param values
+ * The attribute values.
+ * @return The new attribute.
+ */
+ static Attribute create(AttributeType attributeType, String name,
+ Set<AttributeValue> values)
+ {
+ return new RealAttributeNoOptions(attributeType, name, values);
+ }
+
+
+
+ /**
+ * Gets the named attribute type, creating a default attribute if
+ * necessary.
+ *
+ * @param attributeName
+ * The name of the attribute type.
+ * @return The attribute type associated with the provided attribute
+ * name.
+ */
+ private static AttributeType getAttributeType(String attributeName)
+ {
+ String lc = toLowerCase(attributeName);
+ AttributeType type = DirectoryServer.getAttributeType(lc);
+ if (type == null)
+ {
+ type = DirectoryServer.getDefaultAttributeType(attributeName);
+ }
+ return type;
+ }
+
+ // The attribute type for this attribute.
+ private AttributeType attributeType = null;
+
+ // The name of this attribute as provided by the end user.
+ private String name = null;
+
+ // The normalized set of options if there are more than one.
+ private SortedSet<String> normalizedOptions = null;
+
+ // The set of options.
+ private final SmallSet<String> options = new SmallSet<String>();
+
+ // The set of values for this attribute.
+ private final SmallSet<AttributeValue> values =
+ new SmallSet<AttributeValue>();
+
+
+
+ /**
+ * Creates a new attribute builder with an undefined attribute type
+ * and user-provided name. The attribute type, and optionally the
+ * user-provided name, must be defined using
+ * {@link #setAttributeType(AttributeType)} before the attribute
+ * builder can be converted to an {@link Attribute}. Failure to do
+ * so will yield an {@link IllegalStateException}.
+ */
+ public AttributeBuilder()
+ {
+ // No implementation required.
+ }
+
+
+
+ /**
+ * Creates a new attribute builder from an existing attribute.
+ * <p>
+ * Modifications to the attribute builder will not impact the
+ * provided attribute.
+ *
+ * @param attribute
+ * The attribute to be copied.
+ */
+ public AttributeBuilder(Attribute attribute)
+ {
+ this(attribute, false);
+ }
+
+
+
+ /**
+ * Creates a new attribute builder from an existing attribute,
+ * optionally omitting the values contained in the provided
+ * attribute.
+ * <p>
+ * Modifications to the attribute builder will not impact the
+ * provided attribute.
+ *
+ * @param attribute
+ * The attribute to be copied.
+ * @param omitValues
+ * <CODE>true</CODE> if the values should be omitted.
+ */
+ public AttributeBuilder(Attribute attribute, boolean omitValues)
+ {
+ this(attribute.getAttributeType(), attribute.getName());
+
+ for (String option : attribute.getOptions())
+ {
+ setOption(option);
+ }
+
+ if (!omitValues)
+ {
+ addAll(attribute);
+ }
+ }
+
+
+
+ /**
+ * Creates a new attribute builder with the specified type and no
+ * options and no values.
+ *
+ * @param attributeType
+ * The attribute type for this attribute builder.
+ */
+ public AttributeBuilder(AttributeType attributeType)
+ {
+ this(attributeType, attributeType.getNameOrOID());
+ }
+
+
+
+ /**
+ * Creates a new attribute builder with the specified type and
+ * user-provided name and no options and no values.
+ *
+ * @param attributeType
+ * The attribute type for this attribute builder.
+ * @param name
+ * The user-provided name for this attribute builder.
+ */
+ public AttributeBuilder(AttributeType attributeType, String name)
+ {
+ Validator.ensureNotNull(attributeType, name);
+
+ this.attributeType = attributeType;
+ this.name = name;
+ }
+
+
+
+ /**
+ * Creates a new attribute builder with the specified attribute name
+ * and no options and no values.
+ * <p>
+ * If the attribute name cannot be found in the schema, a new
+ * attribute type is created using the default attribute syntax.
+ *
+ * @param attributeName
+ * The attribute name for this attribute builder.
+ */
+ public AttributeBuilder(String attributeName)
+ {
+ this(getAttributeType(attributeName), attributeName);
+ }
+
+
+
+ /**
+ * Adds the specified attribute value to this attribute builder if
+ * it is not already present.
+ *
+ * @param value
+ * The attribute value to be added to this attribute
+ * builder.
+ * @return <code>true</code> if this attribute builder did not
+ * already contain the specified attribute value.
+ */
+ public boolean add(AttributeValue value)
+ {
+ return values.add(value);
+ }
+
+
+
+ /**
+ * Adds the specified attribute value to this attribute builder if
+ * it is not already present.
+ *
+ * @param valueString
+ * The string representation of the attribute value to be
+ * added to this attribute builder.
+ * @return <code>true</code> if this attribute builder did not
+ * already contain the specified attribute value.
+ */
+ public boolean add(String valueString)
+ {
+ AttributeValue value =
+ new AttributeValue(attributeType, valueString);
+ return add(value);
+ }
+
+
+
+ /**
+ * Adds all the values from the specified attribute to this
+ * attribute builder if they are not already present.
+ *
+ * @param attribute
+ * The attribute containing the values to be added to this
+ * attribute builder.
+ * @return <code>true</code> if this attribute builder was
+ * modified.
+ */
+ public boolean addAll(Attribute attribute)
+ {
+ boolean wasModified = false;
+ for (AttributeValue v : attribute)
+ {
+ wasModified |= add(v);
+ }
+ return wasModified;
+ }
+
+
+
+ /**
+ * Adds the specified attribute values to this attribute builder if
+ * they are not already present.
+ *
+ * @param values
+ * The attribute values to be added to this attribute
+ * builder.
+ * @return <code>true</code> if this attribute builder was
+ * modified.
+ */
+ public boolean addAll(Collection<AttributeValue> values)
+ {
+ return this.values.addAll(values);
+ }
+
+
+
+ /**
+ * Removes all attribute values from this attribute builder.
+ */
+ public void clear()
+ {
+ values.clear();
+ }
+
+
+
+ /**
+ * Indicates whether this attribute builder contains the specified
+ * value.
+ *
+ * @param value
+ * The value for which to make the determination.
+ * @return <CODE>true</CODE> if this attribute builder has the
+ * specified value, or <CODE>false</CODE> if not.
+ */
+ public boolean contains(AttributeValue value)
+ {
+ return values.contains(value);
+ }
+
+
+
+ /**
+ * Indicates whether this attribute builder contains all the values
+ * in the collection.
+ *
+ * @param values
+ * The set of values for which to make the determination.
+ * @return <CODE>true</CODE> if this attribute builder contains
+ * all the values in the provided collection, or
+ * <CODE>false</CODE> if it does not contain at least one
+ * of them.
+ */
+ public boolean containsAll(Collection<AttributeValue> values)
+ {
+ return this.values.containsAll(values);
+ }
+
+
+
+ /**
+ * Retrieves the attribute type for this attribute builder.
+ *
+ * @return The attribute type for this attribute builder, or
+ * <code>null</code> if one has not yet been specified.
+ */
+ public AttributeType getAttributeType()
+ {
+ return attributeType;
+ }
+
+
+
+ /**
+ * Returns <code>true</code> if this attribute builder contains no
+ * attribute values.
+ *
+ * @return <CODE>true</CODE> if this attribute builder contains no
+ * attribute values.
+ */
+ public boolean isEmpty()
+ {
+ return values.isEmpty();
+ }
+
+
+
+ /**
+ * Returns an iterator over the attribute values in this attribute
+ * builder. The attribute values are returned in the order in which
+ * they were added to this attribute builder. The returned iterator
+ * supports attribute value removals via its <code>remove</code>
+ * method.
+ *
+ * @return An iterator over the attribute values in this attribute
+ * builder.
+ */
+ public Iterator<AttributeValue> iterator()
+ {
+ return values.iterator();
+ }
+
+
+
+ /**
+ * Removes the specified attribute value from this attribute builder
+ * if it is present.
+ *
+ * @param value
+ * The attribute value to be removed from this attribute
+ * builder.
+ * @return <code>true</code> if this attribute builder contained
+ * the specified attribute value.
+ */
+ public boolean remove(AttributeValue value)
+ {
+ return values.remove(value);
+ }
+
+
+
+ /**
+ * Removes the specified attribute value from this attribute builder
+ * if it is present.
+ *
+ * @param valueString
+ * The string representation of the attribute value to be
+ * removed from this attribute builder.
+ * @return <code>true</code> if this attribute builder contained
+ * the specified attribute value.
+ */
+ public boolean remove(String valueString)
+ {
+ AttributeValue value =
+ new AttributeValue(attributeType, valueString);
+ return remove(value);
+ }
+
+
+
+ /**
+ * Removes all the values from the specified attribute from this
+ * attribute builder if they are not already present.
+ *
+ * @param attribute
+ * The attribute containing the values to be removed from
+ * this attribute builder.
+ * @return <code>true</code> if this attribute builder was
+ * modified.
+ */
+ public boolean removeAll(Attribute attribute)
+ {
+ boolean wasModified = false;
+ for (AttributeValue v : attribute)
+ {
+ wasModified |= remove(v);
+ }
+ return wasModified;
+ }
+
+
+
+ /**
+ * Removes the specified attribute values from this attribute
+ * builder if they are present.
+ *
+ * @param values
+ * The attribute values to be removed from this attribute
+ * builder.
+ * @return <code>true</code> if this attribute builder was
+ * modified.
+ */
+ public boolean removeAll(Collection<AttributeValue> values)
+ {
+ return this.values.removeAll(values);
+ }
+
+
+
+ /**
+ * Replaces all the values in this attribute value with the
+ * specified attribute value.
+ *
+ * @param value
+ * The attribute value to replace all existing values.
+ */
+ public void replace(AttributeValue value)
+ {
+ clear();
+ add(value);
+ }
+
+
+
+ /**
+ * Replaces all the values in this attribute value with the
+ * specified attribute value.
+ *
+ * @param valueString
+ * The string representation of the attribute value to
+ * replace all existing values.
+ */
+ public void replace(String valueString)
+ {
+ AttributeValue value =
+ new AttributeValue(attributeType, valueString);
+ replace(value);
+ }
+
+
+
+ /**
+ * Replaces all the values in this attribute value with the
+ * attributes from the specified attribute.
+ *
+ * @param attribute
+ * The attribute containing the values to replace all
+ * existing values.
+ */
+ public void replaceAll(Attribute attribute)
+ {
+ clear();
+ addAll(attribute);
+ }
+
+
+
+ /**
+ * Replaces all the values in this attribute value with the
+ * specified attribute values.
+ *
+ * @param values
+ * The attribute values to replace all existing values.
+ */
+ public void replaceAll(Collection<AttributeValue> values)
+ {
+ clear();
+ addAll(values);
+ }
+
+
+
+ /**
+ * Sets the attribute type associated with this attribute builder.
+ *
+ * @param attributeType
+ * The attribute type for this attribute builder.
+ */
+ public void setAttributeType(AttributeType attributeType)
+ {
+ setAttributeType(attributeType, attributeType.getNameOrOID());
+ }
+
+
+
+ /**
+ * Sets the attribute type and user-provided name associated with
+ * this attribute builder.
+ *
+ * @param attributeType
+ * The attribute type for this attribute builder.
+ * @param name
+ * The user-provided name for this attribute builder.
+ */
+ public void setAttributeType(
+ AttributeType attributeType,
+ String name)
+ {
+ Validator.ensureNotNull(attributeType, name);
+
+ this.attributeType = attributeType;
+ this.name = name;
+ }
+
+
+
+ /**
+ * Sets the attribute type associated with this attribute builder
+ * using the provided attribute type name.
+ * <p>
+ * If the attribute name cannot be found in the schema, a new
+ * attribute type is created using the default attribute syntax.
+ *
+ * @param attributeName
+ * The attribute name for this attribute builder.
+ */
+ public void setAttributeType(String attributeName)
+ {
+ setAttributeType(getAttributeType(attributeName), attributeName);
+ }
+
+
+
+ /**
+ * Sets the initial capacity of this attribute builders internal set
+ * of attribute values.
+ * <p>
+ * The initial capacity of an attribute builder defaults to one.
+ * Applications should override this default if the attribute being
+ * built is expected to contain many values.
+ * <p>
+ * This method should only be called before any attribute values
+ * have been added to this attribute builder. If it is called
+ * afterwards an {@link IllegalStateException} will be thrown.
+ *
+ * @param initialCapacity
+ * The initial capacity of this attribute builder.
+ * @return This attribute builder.
+ * @throws IllegalStateException
+ * If this attribute builder already contains attribute
+ * values.
+ */
+ public AttributeBuilder setInitialCapacity(int initialCapacity)
+ throws IllegalStateException
+ {
+ values.setInitialCapacity(initialCapacity);
+ return this;
+ }
+
+
+
+ /**
+ * Adds the specified option to this attribute builder if it is not
+ * already present.
+ *
+ * @param option
+ * The option to be added to this attribute builder.
+ * @return <code>true</code> if this attribute builder did not
+ * already contain the specified option.
+ */
+ public boolean setOption(String option)
+ {
+ switch (options.size())
+ {
+ case 0:
+ return options.add(option);
+ case 1:
+ // Normalize and add the first option to normalized set.
+ normalizedOptions = new TreeSet<String>();
+ normalizedOptions.add(toLowerCase(options.firstElement));
+
+ if (normalizedOptions.add(toLowerCase(option)))
+ {
+ options.add(option);
+ return true;
+ }
+ break;
+ default:
+ if (normalizedOptions.add(toLowerCase(option)))
+ {
+ options.add(option);
+ return true;
+ }
+ break;
+ }
+
+ return false;
+ }
+
+
+
+ /**
+ * Adds the specified options to this attribute builder if they are
+ * not already present.
+ *
+ * @param options
+ * The options to be added to this attribute builder.
+ * @return <code>true</code> if this attribute builder was
+ * modified.
+ */
+ public boolean setOptions(Collection<String> options)
+ {
+ boolean isModified = false;
+
+ for (String option : options)
+ {
+ isModified |= setOption(option);
+ }
+
+ return isModified;
+ }
+
+
+
+ /**
+ * Returns the number of attribute values in this attribute builder.
+ *
+ * @return The number of attribute values in this attribute builder.
+ */
+ public int size()
+ {
+ return values.size();
+ }
+
+
+
+ /**
+ * Returns an attribute representing the content of this attribute
+ * builder.
+ * <p>
+ * For efficiency purposes this method resets the content of this
+ * attribute builder so that it no longer contains any options or
+ * values and its attribute type is <code>null</code>.
+ *
+ * @return An attribute representing the content of this attribute
+ * builder.
+ * @throws IllegalStateException
+ * If this attribute builder has an undefined attribute
+ * type or name.
+ */
+ public Attribute toAttribute() throws IllegalStateException
+ {
+ if (attributeType == null)
+ {
+ throw new IllegalStateException(
+ "Undefined attribute type or name");
+ }
+
+ // First determine the minimum representation required for the set
+ // of values.
+ Set<AttributeValue> newValues;
+ if (values.elements != null)
+ {
+ newValues = Collections.unmodifiableSet(values.elements);
+ }
+ else if (values.firstElement != null)
+ {
+ newValues = Collections.singleton(values.firstElement);
+ }
+ else
+ {
+ newValues = Collections.emptySet();
+ }
+
+ // Now create the appropriate attribute based on the options.
+ Attribute attribute;
+ switch (options.size())
+ {
+ case 0:
+ attribute =
+ new RealAttributeNoOptions(attributeType, name, newValues);
+ break;
+ case 1:
+ attribute =
+ new RealAttributeSingleOption(attributeType, name, newValues,
+ options.firstElement);
+ break;
+ default:
+ attribute =
+ new RealAttributeManyOptions(attributeType, name, newValues,
+ Collections.unmodifiableSet(options.elements), Collections
+ .unmodifiableSortedSet(normalizedOptions));
+ break;
+ }
+
+ // Reset the state of this builder.
+ attributeType = null;
+ name = null;
+ normalizedOptions = null;
+ options.clear();
+ values.clear();
+
+ return attribute;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public final String toString()
+ {
+ StringBuilder builder = new StringBuilder();
+
+ builder.append("AttributeBuilder(");
+ builder.append(String.valueOf(name));
+
+ for (String option : options)
+ {
+ builder.append(';');
+ builder.append(option);
+ }
+
+ builder.append(", {");
+
+ boolean firstValue = true;
+ for (AttributeValue value : values)
+ {
+ if (!firstValue)
+ {
+ builder.append(", ");
+ }
+
+ value.toString(builder);
+ firstValue = false;
+ }
+
+ builder.append("})");
+
+ return builder.toString();
+ }
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java
index 3acd06c..4e9df4c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java
@@ -524,6 +524,18 @@
/**
+ * Indicates whether this attribute sytax is a binary one.
+ * @return {@code true} if it is a binary syntax rule
+ * , or {@code false} if not.
+ */
+ public boolean isBinary()
+ {
+ return syntax.isBinary();
+ }
+
+
+
+ /**
* Retrieves the OID for this syntax associated with this attribute
* type.
*
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java
index e966645..13a460b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java
@@ -190,8 +190,8 @@
while (attributeIterator.hasNext()) {
Attribute attribute = attributeIterator.next();
- if (attribute.hasOptions(options)) {
- valueIterator = attribute.getValues().iterator();
+ if (attribute.hasAllOptions(options)) {
+ valueIterator = attribute.iterator();
if (valueIterator.hasNext()) {
return true;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Attributes.java b/opendj-sdk/opends/src/server/org/opends/server/types/Attributes.java
new file mode 100644
index 0000000..b06d093
--- /dev/null
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Attributes.java
@@ -0,0 +1,415 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Portions Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.types;
+
+
+
+import static org.opends.server.util.StaticUtils.*;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.opends.server.core.DirectoryServer;
+
+
+
+/**
+ * This class contains various methods for manipulating
+ * {@link Attribute}s as well as static factory methods for
+ * facilitating common {@link Attribute} construction use-cases.
+ * <p>
+ * Of particular interest are the following three factory methods:
+ *
+ * <pre>
+ * empty(String);
+ *
+ * create(String, String);
+ *
+ * create(String, String, String...);
+ * </pre>
+ *
+ * These are provided in order to facilitate construction of empty,
+ * single-valued, and multi-valued attributes respectively, for
+ * example, in unit tests. The last factory method is not designed for
+ * performance critical functionality and, instead, an
+ * {@link AttributeBuilder} should be used in order to incrementally
+ * construct multi-valued attributes.
+ */
+public final class Attributes
+{
+
+ /**
+ * Creates a new single-valued attribute with the specified
+ * attribute type and value.
+ *
+ * @param attributeType
+ * The attribute type to use.
+ * @param value
+ * The attribute value.
+ * @return A new attribute with the attribute type and value.
+ */
+ public static Attribute create(AttributeType attributeType,
+ AttributeValue value)
+ {
+ return create(attributeType, attributeType.getNameOrOID(), value);
+ }
+
+
+
+ /**
+ * Creates a new single-valued attribute with the specified name and
+ * value.
+ *
+ * @param attributeType
+ * The attribute type to use.
+ * @param valueString
+ * The String representation of the attribute value.
+ * @return A new attribute with the specified name and value.
+ */
+ public static Attribute create(AttributeType attributeType,
+ String valueString)
+ {
+ return create(attributeType, attributeType.getNameOrOID(),
+ valueString);
+ }
+
+
+
+ /**
+ * Creates a new single-valued attribute with the specified
+ * attribute type and value.
+ *
+ * @param attributeType
+ * The attribute type to use.
+ * @param name
+ * The user-provided name for this attribute.
+ * @param value
+ * The attribute value.
+ * @return A new attribute with the attribute type and value.
+ */
+ public static Attribute create(AttributeType attributeType,
+ String name, AttributeValue value)
+ {
+ return AttributeBuilder.create(attributeType, name, Collections
+ .singleton(value));
+ }
+
+
+
+ /**
+ * Creates a new single-valued attribute with the attribute type and
+ * value.
+ *
+ * @param attributeType
+ * The attribute type to use.
+ * @param name
+ * The user-provided name for this attribute.
+ * @param valueString
+ * The String representation of the attribute value.
+ * @return A new attribute with the attribute type and value.
+ */
+ public static Attribute create(AttributeType attributeType,
+ String name, String valueString)
+ {
+ AttributeValue value = new AttributeValue(attributeType,
+ valueString);
+ return create(attributeType, name, value);
+ }
+
+
+
+ /**
+ * Creates a new single-valued attribute with the specified
+ * attribute name and attribute value.
+ * <p>
+ * If the attribute name cannot be found in the schema, a new
+ * attribute type is created using the default attribute syntax.
+ *
+ * @param attributeName
+ * The name or OID of the attribute type for this attribute
+ * (can be mixed case).
+ * @param valueString
+ * The String representation of the attribute value.
+ * @return A new attribute with the specified name and value.
+ */
+ public static Attribute create(String attributeName,
+ String valueString)
+ {
+ return create(getAttributeType(attributeName), attributeName,
+ valueString);
+ }
+
+
+
+ /**
+ * Creates a new multi-valued attribute with the specified attribute
+ * name and attribute values.
+ * <p>
+ * If the attribute name cannot be found in the schema, a new
+ * attribute type is created using the default attribute syntax.
+ * <p>
+ * <b>NOTE:</b> this method is provided as a convenience and should
+ * typically be reserved for use in unit tests and places where
+ * performance is not an issue. In particular, this method will
+ * construct a temporary array containing the attribute's values.
+ * For peformance critical purposes, incrementally construct an
+ * attribute using an {@link AttributeBuilder}.
+ *
+ * @param attributeName
+ * The name or OID of the attribute type for this attribute
+ * (can be mixed case).
+ * @param firstValueString
+ * The string representation of the first attribute value.
+ * @param otherValueStrings
+ * The string representation of the remaining attribute
+ * values.
+ * @return A new attribute with the specified name and values.
+ */
+ public static Attribute create(String attributeName,
+ String firstValueString, String... otherValueStrings)
+ {
+ AttributeBuilder builder = new AttributeBuilder(attributeName);
+
+ builder.add(firstValueString);
+
+ for (String value : otherValueStrings)
+ {
+ builder.add(value);
+ }
+
+ return builder.toAttribute();
+ }
+
+
+
+ /**
+ * Creates a new attribute which has the same attribute type and
+ * attribute options as the provided attribute but no attribute
+ * values.
+ *
+ * @param attribute
+ * The attribute to be copied.
+ * @return A new attribute which has the same attribute type and
+ * attribute options as the provided attribute but no
+ * attribute values.
+ */
+ public static Attribute empty(Attribute attribute)
+ {
+ return new AttributeBuilder(attribute, true).toAttribute();
+ }
+
+
+
+ /**
+ * Creates a new attribute with the provided attribute type and no
+ * values.
+ *
+ * @param attributeType
+ * The attribute type to use.
+ * @return A new attribute with the provided attribute type and no
+ * values.
+ */
+ public static Attribute empty(AttributeType attributeType)
+ {
+ return empty(attributeType, attributeType.getNameOrOID());
+ }
+
+
+
+ /**
+ * Creates a new attribute with the provided attribute type and no
+ * values.
+ *
+ * @param attributeType
+ * The attribute type to use.
+ * @param name
+ * The user-provided name for this attribute.
+ * @return A new attribute with the provided attribute type and no
+ * values.
+ */
+ public static Attribute empty(AttributeType attributeType,
+ String name)
+ {
+ return AttributeBuilder.create(attributeType, name, Collections
+ .<AttributeValue> emptySet());
+ }
+
+
+
+ /**
+ * Creates a new attribute with the specified attribute name and no
+ * attribute values.
+ * <p>
+ * If the attribute name cannot be found in the schema, a new
+ * attribute type is created using the default attribute syntax.
+ *
+ * @param attributeName
+ * The name or OID of the attribute type for this attribute
+ * (can be mixed case).
+ * @return A new attribute with the specified name and no values.
+ */
+ public static Attribute empty(String attributeName)
+ {
+ return empty(getAttributeType(attributeName), attributeName);
+ }
+
+
+
+ /**
+ * Creates a new attribute containing all the values from the two
+ * provided attributes.
+ * <p>
+ * This method is logically equivalent to:
+ *
+ * <pre>
+ * merge(a1, a2, null);
+ * </pre>
+ *
+ * @param a1
+ * The first attribute.
+ * @param a2
+ * The second attribute.
+ * @return A new attribute containing all the values from the two
+ * provided attributes.
+ */
+ public static Attribute merge(Attribute a1, Attribute a2)
+ {
+ return merge(a1, a2, null);
+ }
+
+
+
+ /**
+ * Creates a new attribute containing all the values from the two
+ * provided attributes and put any duplicate values into the
+ * provided collection.
+ *
+ * @param a1
+ * The first attribute.
+ * @param a2
+ * The second attribute.
+ * @param duplicateValues
+ * A collection which will be used to store any duplicate
+ * values, or <code>null</code> if duplicate values should
+ * not be stored.
+ * @return A new attribute containing all the values from the two
+ * provided attributes.
+ */
+ public static Attribute merge(Attribute a1, Attribute a2,
+ Collection<AttributeValue> duplicateValues)
+ {
+ AttributeBuilder builder = new AttributeBuilder(a1);
+ for (AttributeValue av : a2)
+ {
+ if (!builder.add(av) && duplicateValues != null)
+ {
+ duplicateValues.add(av);
+ }
+ }
+ return builder.toAttribute();
+ }
+
+
+
+ /**
+ * Creates a new attribute containing the values from the first
+ * attribute which are not in the second attribute.
+ * <p>
+ * This method is logically equivalent to:
+ *
+ * <pre>
+ * subtract(a1, a2, null);
+ * </pre>
+ *
+ * @param a1
+ * The first attribute.
+ * @param a2
+ * The second attribute.
+ * @return A new attribute containing the values from the first
+ * attribute which are not in the second attribute.
+ */
+ public static Attribute subtract(Attribute a1, Attribute a2)
+ {
+ return subtract(a1, a2, null);
+ }
+
+
+
+ /**
+ * Creates a new attribute containing the values from the first
+ * attribute which are not in the second attribute. Any values which
+ * were present in the second attribute but which were not present
+ * in the first attribute will be put into the provided collection.
+ *
+ * @param a1
+ * The first attribute.
+ * @param a2
+ * The second attribute.
+ * @param missingValues
+ * A collection which will be used to store any missing
+ * values, or <code>null</code> if missing values should
+ * not be stored.
+ * @return A new attribute containing the values from the first
+ * attribute which are not in the second attribute.
+ */
+ public static Attribute subtract(Attribute a1, Attribute a2,
+ Collection<AttributeValue> missingValues)
+ {
+ AttributeBuilder builder = new AttributeBuilder(a1);
+ for (AttributeValue av : a2)
+ {
+ if (!builder.remove(av) && missingValues != null)
+ {
+ missingValues.add(av);
+ }
+ }
+ return builder.toAttribute();
+ }
+
+
+
+ /**
+ * Gets the named attribute type, creating a default attribute if
+ * necessary.
+ *
+ * @param attributeName
+ * The name of the attribute type.
+ * @return The attribute type associated with the provided attribute
+ * name.
+ */
+ private static AttributeType getAttributeType(String attributeName)
+ {
+ String lc = toLowerCase(attributeName);
+ AttributeType type = DirectoryServer.getAttributeType(lc);
+ if (type == null)
+ {
+ type = DirectoryServer.getDefaultAttributeType(attributeName);
+ }
+ return type;
+ }
+
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java b/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
index b591bf5..b3214e7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
@@ -34,7 +34,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
@@ -356,52 +355,6 @@
/**
- * Adds the objectClass with the given name to this entry.
- *
- * @param objectClassName The value containing the name or OID of
- * the objectClass to add to this entry.
- *
- * @throws DirectoryException If a problem occurs while attempting
- * to add the objectclass to this
- * entry.
- */
- public void addObjectClass(AttributeValue objectClassName)
- throws DirectoryException
- {
- attachment = null;
-
- String name = objectClassName.getStringValue();
-
- String lowerName;
- try
- {
- lowerName = objectClassName.getNormalizedStringValue();
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- lowerName = toLowerCase(name);
- }
-
- ObjectClass oc = DirectoryServer.getObjectClass(lowerName, true);
- if (objectClasses.containsKey(oc))
- {
- Message message =
- ERR_ENTRY_ADD_DUPLICATE_OC.get(name, String.valueOf(dn));
- throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION,
- message);
- }
-
- objectClasses.put(oc, name);
- }
-
-
-
- /**
* Adds the provided objectClass to this entry.
*
* @param oc The objectClass to add to this entry.
@@ -429,90 +382,6 @@
/**
- * Adds the objectclasses corresponding to the provided set of names
- * to this entry.
- *
- * @param objectClassNames The values containing the names or OIDs
- * of the objectClasses to add to this
- * entry.
- *
- * @throws DirectoryException If a problem occurs while attempting
- * to add the set of objectclasses to
- * this entry.
- */
- public void addObjectClasses(
- Collection<AttributeValue> objectClassNames)
- throws DirectoryException
- {
- attachment = null;
-
-
- // Iterate through all the provided objectclass names and make
- // sure that they are names of valid objectclasses not already
- // assigned to the entry.
- LinkedHashMap<ObjectClass,String> tmpOCMap =
- new LinkedHashMap<ObjectClass,String>();
- for (AttributeValue v : objectClassNames)
- {
- String name = v.getStringValue();
-
- String lowerName;
- try
- {
- lowerName = v.getNormalizedStringValue();
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- lowerName = toLowerCase(v.getStringValue());
- }
-
- ObjectClass oc = DirectoryServer.getObjectClass(lowerName);
- if (oc == null)
- {
- Message message =
- ERR_ENTRY_ADD_UNKNOWN_OC.get(name, String.valueOf(dn));
- throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION,
- message);
- }
-
- if (objectClasses.containsKey(oc))
- {
- Message message =
- ERR_ENTRY_ADD_DUPLICATE_OC.get(name, String.valueOf(dn));
- throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION,
- message);
- }
-
- if (oc.isObsolete())
- {
- Message message =
- ERR_ENTRY_ADD_OBSOLETE_OC.get(name, String.valueOf(dn));
- throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION,
- message);
- }
-
- tmpOCMap.put(oc, name);
- }
-
-
- // If we've gotten here, then everything is OK, so add the new
- // classes.
- for (ObjectClass oc : tmpOCMap.keySet())
- {
- String name = tmpOCMap.get(oc);
-
- objectClasses.put(oc, name);
- }
- }
-
-
-
- /**
* Retrieves the entire set of attributes for this entry. This will
* include both user and operational attributes. The caller must
* not modify the contents of this list. Also note that this method
@@ -594,35 +463,33 @@
}
AttributeType ocType =
- DirectoryServer.getObjectClassAttributeType();
+ DirectoryServer.getObjectClassAttributeType();
+ AttributeBuilder builder =
+ new AttributeBuilder(ocType, ATTR_OBJECTCLASS);
- LinkedHashSet<AttributeValue> ocValues =
- new LinkedHashSet<AttributeValue>(objectClasses.size());
for (String s : objectClasses.values())
{
- ocValues.add(new AttributeValue(ocType,
- new ASN1OctetString(s)));
+ builder.add(new AttributeValue(ocType, new ASN1OctetString(s)));
}
- return new Attribute(ocType, ATTR_OBJECTCLASS, ocValues);
+ return builder.toAttribute();
}
+
/**
* Indicates whether this entry contains the specified attribute.
- * Any subordinate attribute of the specified attribute will also
- * be used in the determination.
+ * Any subordinate attribute of the specified attribute will also be
+ * used in the determination.
*
- *
- * @param attributeType The attribute type for which to
- * make the determination.
- *
- * @return <CODE>true</CODE> if this entry contains the specified
- * attribute, or <CODE>false</CODE> if not.
+ * @param attributeType
+ * The attribute type for which to make the determination.
+ * @return <CODE>true</CODE> if this entry contains the specified
+ * attribute, or <CODE>false</CODE> if not.
*/
public boolean hasAttribute(AttributeType attributeType)
{
- return hasAttribute(attributeType, true);
+ return hasAttribute(attributeType, null, true);
}
@@ -641,150 +508,146 @@
public boolean hasAttribute(AttributeType attributeType,
boolean includeSubordinates)
{
- if (userAttributes.containsKey(attributeType) ||
- operationalAttributes.containsKey(attributeType))
- {
- return true;
- }
-
- if (includeSubordinates &&
- attributeType.mayHaveSubordinateTypes())
- {
- for (AttributeType at : schema.getSubTypes(attributeType))
- {
- if (userAttributes.containsKey(at) ||
- operationalAttributes.containsKey(at))
- {
- return true;
- }
- }
- }
-
- return (attributeType.isObjectClassType() &&
- (! objectClasses.isEmpty()));
+ return hasAttribute(attributeType, null, includeSubordinates);
}
+
/**
* Indicates whether this entry contains the specified attribute
* with all of the options in the provided set. Any subordinate
- * attribute of the specified attribute will also be used in
- * the determination.
+ * attribute of the specified attribute will also be used in the
+ * determination.
*
- * @param attributeType The attribute type for which to
- * make the determination.
- * @param attributeOptions The set of options to use in the
- * determination.
- *
- * @return <CODE>true</CODE> if this entry contains the specified
- * attribute, or <CODE>false</CODE> if not.
+ * @param attributeType
+ * The attribute type for which to make the determination.
+ * @param options
+ * The set of options to use in the determination.
+ * @return <CODE>true</CODE> if this entry contains the specified
+ * attribute, or <CODE>false</CODE> if not.
*/
- public boolean hasAttribute(AttributeType attributeType,
- Set<String> attributeOptions)
+ public boolean hasAttribute(
+ AttributeType attributeType,
+ Set<String> options)
{
- return hasAttribute(attributeType, true, attributeOptions);
+ return hasAttribute(attributeType, options, true);
}
+
/**
* Indicates whether this entry contains the specified attribute
* with all of the options in the provided set.
*
- * @param attributeType The attribute type for which to
- * make the determination.
- * @param includeSubordinates Whether to include any subordinate
- * attributes of the attribute type
- * being retrieved.
- * @param attributeOptions The set of options to use in the
- * determination.
- *
- * @return <CODE>true</CODE> if this entry contains the specified
- * attribute, or <CODE>false</CODE> if not.
+ * @param attributeType
+ * The attribute type for which to make the determination.
+ * @param options
+ * The set of options to use in the determination.
+ * @param includeSubordinates
+ * Whether to include any subordinate attributes of the
+ * attribute type being retrieved.
+ * @return <CODE>true</CODE> if this entry contains the specified
+ * attribute, or <CODE>false</CODE> if not.
*/
- public boolean hasAttribute(AttributeType attributeType,
- boolean includeSubordinates,
- Set<String> attributeOptions)
+ public boolean hasAttribute(
+ AttributeType attributeType,
+ Set<String> options,
+ boolean includeSubordinates)
{
- List<Attribute> attributes;
- if (includeSubordinates &&
- attributeType.mayHaveSubordinateTypes())
+ // Handle object class.
+ if (attributeType.isObjectClassType())
{
- attributes = new LinkedList<Attribute>();
- List<Attribute> attrs = userAttributes.get(attributeType);
- if (attrs != null)
+ if (!objectClasses.isEmpty())
{
- attributes.addAll(attrs);
+ return (options == null || options.isEmpty());
}
- attrs = operationalAttributes.get(attributeType);
- if (attrs != null)
- {
- attributes.addAll(attrs);
- }
+ return false;
+ }
- for (AttributeType at : schema.getSubTypes(attributeType))
- {
- attrs = userAttributes.get(at);
- if (attrs != null)
- {
- attributes.addAll(attrs);
- }
+ if (!includeSubordinates)
+ {
+ // It's possible that there could be an attribute without any
+ // values, which we should treat as not having the requested
+ // attribute.
+ Attribute attribute = getExactAttribute(attributeType, options);
+ return attribute != null && !attribute.isEmpty();
+ }
- attrs = operationalAttributes.get(at);
- if (attrs != null)
- {
- attributes.addAll(attrs);
- }
- }
+ // Check all matching attributes.
+ List<Attribute> attributes;
+
+ if (attributeType.isOperational())
+ {
+ attributes = operationalAttributes.get(attributeType);
}
else
{
attributes = userAttributes.get(attributeType);
- if (attributes == null)
+ }
+
+ if (attributes != null)
+ {
+ for (Attribute attribute : attributes)
{
- attributes = operationalAttributes.get(attributeType);
- if (attributes == null)
+ // It's possible that there could be an attribute without any
+ // values, which we should treat as not having the requested
+ // attribute.
+ if (!attribute.isEmpty() && attribute.hasAllOptions(options))
{
- if (attributeType.isObjectClassType() &&
- (! objectClasses.isEmpty()))
- {
- return ((attributeOptions == null) ||
- attributeOptions.isEmpty());
- }
- else
- {
- return false;
- }
+ return true;
}
}
}
- // It's possible that there could be an attribute without any
- // values, which we should treat as not having the requested
- // attribute.
- for (Attribute a : attributes)
+ // Check sub-types.
+ if (attributeType.mayHaveSubordinateTypes())
{
- if (a.hasValue() && a.hasOptions(attributeOptions))
+ for (AttributeType subType : schema.getSubTypes(attributeType))
{
- return true;
+ if (subType.isOperational())
+ {
+ attributes = operationalAttributes.get(subType);
+ }
+ else
+ {
+ attributes = userAttributes.get(subType);
+ }
+
+ if (attributes != null)
+ {
+ for (Attribute attribute : attributes)
+ {
+ // It's possible that there could be an attribute without
+ // any values, which we should treat as not having the
+ // requested attribute.
+ if (!attribute.isEmpty()
+ && attribute.hasAllOptions(options))
+ {
+ return true;
+ }
+ }
+ }
}
}
return false;
}
+
+
/**
* Retrieves the requested attribute element(s) for the specified
- * attribute type. The list returned may include multiple elements
+ * attribute type. The list returned may include multiple elements
* if the same attribute exists in the entry multiple times with
* different sets of options. It may also include any subordinate
* attributes of the attribute being retrieved.
*
- * @param attributeType The attribute type to retrieve.
- *
- * @return The requested attribute element(s) for the specified
- * attribute type, or <CODE>null</CODE> if the specified
- * attribute type is not present in this entry.
+ * @param attributeType
+ * The attribute type to retrieve.
+ * @return The requested attribute element(s) for the specified
+ * attribute type, or <CODE>null</CODE> if the specified
+ * attribute type is not present in this entry.
*/
public List<Attribute> getAttribute(AttributeType attributeType)
{
@@ -1047,7 +910,7 @@
while (iterator.hasNext())
{
Attribute a = iterator.next();
- if (! a.hasOptions(options))
+ if (! a.hasAllOptions(options))
{
iterator.remove();
}
@@ -1332,7 +1195,7 @@
while (iterator.hasNext())
{
Attribute a = iterator.next();
- if (! a.hasOptions(options))
+ if (! a.hasAllOptions(options))
{
iterator.remove();
}
@@ -1351,57 +1214,6 @@
/**
- * Retrieves a duplicate of the user attribute list for the
- * specified type.
- *
- * @param attributeType The attribute type for which to retrieve a
- * duplicate attribute list.
- *
- * @return A duplicate of the requested attribute list, or
- * <CODE>null</CODE> if there is no such user attribute.
- */
- public List<Attribute> duplicateUserAttribute(
- AttributeType attributeType)
- {
- LinkedList<Attribute> attributes = new LinkedList<Attribute>();
-
- List<Attribute> attrs = userAttributes.get(attributeType);
- if (attrs != null)
- {
- for (Attribute a : attrs)
- {
- attributes.add(a.duplicate());
- }
- }
-
- if (attributeType.mayHaveSubordinateTypes())
- {
- for (AttributeType at : schema.getSubTypes(attributeType))
- {
- attrs = userAttributes.get(at);
- if (attrs != null)
- {
- for (Attribute a : attrs)
- {
- attributes.add(a.duplicate());
- }
- }
- }
- }
-
- if (attributes.isEmpty())
- {
- return null;
- }
- else
- {
- return attributes;
- }
- }
-
-
-
- /**
* Makes a copy of attributes matching the specified options.
*
* @param attrList The attributes to be copied.
@@ -1428,9 +1240,16 @@
new ArrayList<Attribute>(attrList.size());
for (Attribute a : attrList)
{
- if (a.hasOptions(options))
+ if (a.hasAllOptions(options))
{
- duplicateList.add(a.duplicate(omitValues));
+ if (omitValues)
+ {
+ duplicateList.add(Attributes.empty(a));
+ }
+ else
+ {
+ duplicateList.add(a);
+ }
}
}
@@ -1628,7 +1447,7 @@
while (iterator.hasNext())
{
Attribute a = iterator.next();
- if (! a.hasOptions(options))
+ if (! a.hasAllOptions(options))
{
iterator.remove();
}
@@ -1647,57 +1466,6 @@
/**
- * Retrieves a duplicate of the operational attribute list for the
- * specified type.
- *
- * @param attributeType The attribute type for which to retrieve a
- * duplicate attribute list.
- *
- * @return A duplicate of the requested attribute list, or
- * <CODE>null</CODE> if there is no such operational
- * attribute.
- */
- public List<Attribute> duplicateOperationalAttribute(
- AttributeType attributeType)
- {
- LinkedList<Attribute> attributes = new LinkedList<Attribute>();
-
- List<Attribute> attrs = operationalAttributes.get(attributeType);
- if (attrs != null)
- {
- for (Attribute a : attrs)
- {
- attributes.add(a.duplicate());
- }
- }
-
- if (attributeType.mayHaveSubordinateTypes())
- {
- for (AttributeType at : schema.getSubTypes(attributeType))
- {
- attrs = operationalAttributes.get(at);
- if (attrs != null)
- {
- for (Attribute a : attrs)
- {
- attributes.add(a.duplicate());
- }
- }
- }
- }
-
- if (attributes.isEmpty())
- {
- return null;
- }
- else
- {
- return attributes;
- }
- }
-
-
- /**
* Puts the provided attribute in this entry. If an attribute
* already exists with the provided type, it will be overwritten.
* Otherwise, a new attribute will be added. Note that no
@@ -1746,89 +1514,159 @@
/**
- * Adds the provided attribute to this entry. If an attribute with
- * the provided type already exists, then the values will be merged.
+ * Ensures that this entry contains the provided attribute and its
+ * values. If an attribute with the provided type already exists,
+ * then its attribute values will be merged.
+ * <p>
+ * This method handles object class additions but will not perform
+ * any object class validation. In particular, it will create
+ * default object classes when an object class is unknown.
+ * <p>
+ * This method implements LDAP modification add semantics, with the
+ * exception that it allows empty attributes to be added.
*
- * @param attribute The attribute to add or merge with this
- * entry.
- * @param duplicateValues A list to which any duplicate values
- * will be added.
+ * @param attribute
+ * The attribute to add or merge with this entry.
+ * @param duplicateValues
+ * A list to which any duplicate values will be added.
*/
public void addAttribute(Attribute attribute,
- List<AttributeValue> duplicateValues)
+ List<AttributeValue> duplicateValues)
{
- attachment = null;
+ setAttribute(attribute, duplicateValues, false /* merge */);
+ }
- List<Attribute> attrList =
- getAttribute(attribute.getAttributeType(), false);
- if (attrList == null)
+
+
+ /**
+ * Puts the provided attribute into this entry. If an attribute with
+ * the provided type and options already exists, then it will be
+ * replaced. If the provided attribute is empty then any existing
+ * attribute will be completely removed.
+ * <p>
+ * This method handles object class replacements but will not
+ * perform any object class validation. In particular, it will
+ * create default object classes when an object class is unknown.
+ * <p>
+ * This method implements LDAP modification replace semantics.
+ *
+ * @param attribute
+ * The attribute to replace in this entry.
+ */
+ public void replaceAttribute(Attribute attribute)
+ {
+ // There can never be duplicate values for a replace.
+ setAttribute(attribute, null, true /* replace */);
+ }
+
+
+
+ /**
+ * Increments an attribute in this entry by the amount specified in
+ * the provided attribute.
+ *
+ * @param attribute
+ * The attribute identifying the attribute to be increment
+ * and the amount it is to be incremented by. The attribute
+ * must contain a single value.
+ * @throws DirectoryException
+ * If a problem occurs while attempting to increment the
+ * provided attribute. This may occur if the provided
+ * attribute was not single valued or if it could not be
+ * parsed as an integer of if the existing attribute
+ * values could not be parsed as integers.
+ */
+ public void incrementAttribute(
+ Attribute attribute) throws DirectoryException
+ {
+ // Get the attribute that is to be incremented.
+ AttributeType attributeType = attribute.getAttributeType();
+ Attribute a =
+ getExactAttribute(attributeType, attribute.getOptions());
+
+ if (a == null)
{
- // There are no instances of the specified attribute in this
- // entry, so simply add it.
- attrList = new ArrayList<Attribute>(1);
- attrList.add(attribute);
-
- AttributeType attrType = attribute.getAttributeType();
- if (attrType.isOperational())
- {
- operationalAttributes.put(attrType, attrList);
- }
- else
- {
- userAttributes.put(attrType, attrList);
- }
-
- return;
+ Message message = ERR_ENTRY_INCREMENT_NO_SUCH_ATTRIBUTE.get(
+ attribute.getName());
+ throw new DirectoryException(
+ ResultCode.NO_SUCH_ATTRIBUTE, message);
}
- else
+
+ // Decode the increment.
+ Iterator<AttributeValue> i = attribute.iterator();
+ if (!i.hasNext())
{
- // There are some instances of this attribute, but they may not
- // have exactly the same set of options. See if we can find an
- // attribute with the same set of options to merge in the
- // values. If not, then add the new attribute to the list.
- HashSet<String> options = attribute.getOptions();
- for (Attribute a : attrList)
- {
- if (a.optionsEqual(options))
- {
- // There is an attribute with the same set of options.
- // Merge the value lists together.
- LinkedHashSet<AttributeValue> existingValues =
- a.getValues();
- LinkedHashSet<AttributeValue> newValues =
- attribute.getValues();
- for (AttributeValue v : newValues)
- {
- if (! existingValues.add(v))
- {
- duplicateValues.add(v);
- }
- }
+ Message message = ERR_ENTRY_INCREMENT_INVALID_VALUE_COUNT.get(
+ attribute.getName());
+ throw new DirectoryException(
+ ResultCode.CONSTRAINT_VIOLATION, message);
+ }
- return;
- }
+ String incrementValue = i.next().getStringValue();
+ long increment;
+ try
+ {
+ increment = Long.parseLong(incrementValue);
+ }
+ catch (NumberFormatException e)
+ {
+ Message message = ERR_ENTRY_INCREMENT_CANNOT_PARSE_AS_INT.get(
+ attribute.getName());
+ throw new DirectoryException(
+ ResultCode.CONSTRAINT_VIOLATION, message);
+ }
+
+ if (i.hasNext())
+ {
+ Message message = ERR_ENTRY_INCREMENT_INVALID_VALUE_COUNT.get(
+ attribute.getName());
+ throw new DirectoryException(
+ ResultCode.CONSTRAINT_VIOLATION, message);
+ }
+
+ // Increment each attribute value by the specified amount.
+ AttributeBuilder builder = new AttributeBuilder(a, true);
+
+ for (AttributeValue v : a)
+ {
+ String s = v.getStringValue();
+ long currentValue;
+ try
+ {
+ currentValue = Long.parseLong(s);
+ }
+ catch (NumberFormatException e)
+ {
+ Message message = ERR_ENTRY_INCREMENT_CANNOT_PARSE_AS_INT.get(
+ attribute.getName());
+ throw new DirectoryException(
+ ResultCode.CONSTRAINT_VIOLATION, message);
}
- attrList.add(attribute);
+ long newValue = currentValue + increment;
+ builder.add(new AttributeValue(attributeType, String
+ .valueOf(newValue)));
}
+
+ replaceAttribute(builder.toAttribute());
}
/**
* Removes all instances of the specified attribute type from this
- * entry, including any instances with options. If the provided
+ * entry, including any instances with options. If the provided
* attribute type is the objectclass type, then all objectclass
- * values will be removed (but must be replaced for the entry to
- * be valid). If the specified attribute type is not present in
- * this entry, then this method will have no effect.
+ * values will be removed (but must be replaced for the entry to be
+ * valid). If the specified attribute type is not present in this
+ * entry, then this method will have no effect.
*
- * @param attributeType The attribute type for the attribute to
- * remove from this entry.
- *
- * @return <CODE>true</CODE> if the attribute was found and
- * removed, or <CODE>false</CODE> if it was not present in
- * the entry.
+ * @param attributeType
+ * The attribute type for the attribute to remove from this
+ * entry.
+ * @return <CODE>true</CODE> if the attribute was found and
+ * removed, or <CODE>false</CODE> if it was not present in
+ * the entry.
*/
public boolean removeAttribute(AttributeType attributeType)
{
@@ -1849,93 +1687,37 @@
/**
- * Removes the attribute with the provided type and set of options
- * from this entry. Only the instance with the exact set of
- * options provided will be removed. This has no effect if the
- * specified attribute is not present in this entry with the given
- * set of options.
+ * Ensures that this entry does not contain the provided attribute
+ * values. If the provided attribute is empty, then all values of
+ * the associated attribute type will be removed. Otherwise, only
+ * the specified values will be removed.
+ * <p>
+ * This method handles object class deletions.
+ * <p>
+ * This method implements LDAP modification delete semantics.
*
- * @param attributeType The attribute type for the attribute to
- * remove from this entry.
- * @param options The set of attribute options to use when
- * determining which attribute to remove.
- *
- * @return <CODE>true</CODE> if the attribute was found and
- * removed, or <CODE>false</CODE> if it was not present in
- * the entry.
- */
- public boolean removeAttribute(AttributeType attributeType,
- Set<String> options)
- {
- attachment = null;
-
- List<Attribute> attrList = userAttributes.get(attributeType);
- if (attrList == null)
- {
- attrList = operationalAttributes.get(attributeType);
- if (attrList == null)
- {
- return false;
- }
- }
-
- boolean removed = false;
-
- Iterator<Attribute> iterator = attrList.iterator();
- while (iterator.hasNext())
- {
- Attribute a = iterator.next();
- if (a.optionsEqual(options))
- {
- iterator.remove();
- removed = true;
- break;
- }
- }
-
- if (attrList.isEmpty())
- {
- userAttributes.remove(attributeType);
- operationalAttributes.remove(attributeType);
- }
-
- return removed;
- }
-
-
-
- /**
- * Removes the provided attribute from this entry. If the given
- * attribute does not have any values, then all values of the
- * associated attribute type (taking into account the options in the
- * provided type) will be removed. Otherwise, only the specified
- * values will be removed.
- *
- * @param attribute The attribute containing the information
- * to use to perform the removal.
- * @param missingValues A list to which any values contained in
- * the provided attribute but not present in
- * the entry will be added.
- *
- * @return <CODE>true</CODE> if the attribute type was present and
- * the specified values that were present were removed, or
- * <CODE>false</CODE> if the attribute type was not present
- * in the entry. If the attribute type was present but
- * only contained some of the values in the provided
- * attribute, then this method will return
- * <CODE>true</CODE> but will add those values to the
- * provided list.
+ * @param attribute
+ * The attribute containing the information to use to
+ * perform the removal.
+ * @param missingValues
+ * A list to which any values contained in the provided
+ * attribute but not present in the entry will be added.
+ * @return <CODE>true</CODE> if the attribute type was present and
+ * the specified values that were present were removed, or
+ * <CODE>false</CODE> if the attribute type was not
+ * present in the entry. If the attribute type was present
+ * but only contained some of the values in the provided
+ * attribute, then this method will return <CODE>true</CODE>
+ * but will add those values to the provided list.
*/
public boolean removeAttribute(Attribute attribute,
- List<AttributeValue> missingValues)
+ List<AttributeValue> missingValues)
{
attachment = null;
-
if (attribute.getAttributeType().isObjectClassType())
{
- LinkedHashSet<AttributeValue> valueSet = attribute.getValues();
- if ((valueSet == null) || valueSet.isEmpty())
+ if (attribute.isEmpty())
{
objectClasses.clear();
return true;
@@ -1943,7 +1725,7 @@
boolean allSuccessful = true;
- for (AttributeValue v : attribute.getValues())
+ for (AttributeValue v : attribute)
{
String ocName;
try
@@ -1972,7 +1754,7 @@
}
}
- if (! matchFound)
+ if (!matchFound)
{
allSuccessful = false;
missingValues.add(v);
@@ -1982,144 +1764,81 @@
return allSuccessful;
}
+ AttributeType attributeType = attribute.getAttributeType();
+ List<Attribute> attributes;
- if (attribute.hasOptions())
+ if (attributeType.isOperational())
{
- HashSet<String> options = attribute.getOptions();
-
- LinkedHashSet<AttributeValue> valueSet = attribute.getValues();
- if ((valueSet == null) || valueSet.isEmpty())
- {
- return removeAttribute(attribute.getAttributeType(), options);
- }
-
- List<Attribute> attrList =
- getAttribute(attribute.getAttributeType(), false);
- if (attrList == null)
- {
- return false;
- }
-
- for (Attribute a : attrList)
- {
- if (a.optionsEqual(options))
- {
- LinkedHashSet<AttributeValue> existingValueSet =
- a.getValues();
-
- for (AttributeValue v : valueSet)
- {
- if (! existingValueSet.remove(v))
- {
- missingValues.add(v);
- }
- }
-
- if (existingValueSet.isEmpty())
- {
- return removeAttribute(attribute.getAttributeType(),
- options);
- }
-
- return true;
- }
- }
-
- return false;
+ attributes = operationalAttributes.get(attributeType);
}
else
{
- LinkedHashSet<AttributeValue> valueSet = attribute.getValues();
- if ((valueSet == null) || valueSet.isEmpty())
- {
- return removeAttribute(attribute.getAttributeType(), null);
- }
+ attributes = userAttributes.get(attributeType);
+ }
- List<Attribute> attrList =
- getAttribute(attribute.getAttributeType(), false);
- if (attrList == null)
+ if (attributes == null)
+ {
+ // There are no attributes with the same attribute type.
+ for (AttributeValue v : attribute)
{
- return false;
+ missingValues.add(v);
}
+ return false;
+ }
- for (Attribute a : attrList)
+ // There are already attributes with the same attribute type.
+ Set<String> options = attribute.getOptions();
+ for (int i = 0; i < attributes.size(); i++)
+ {
+ Attribute a = attributes.get(i);
+ if (a.optionsEqual(options))
{
- if (! a.hasOptions())
+ if (attribute.isEmpty())
{
- LinkedHashSet<AttributeValue> existingValueSet =
- a.getValues();
-
- for (AttributeValue v : valueSet)
+ // Remove the entire attribute.
+ attributes.remove(i);
+ }
+ else
+ {
+ // Remove Specified values.
+ AttributeBuilder builder = new AttributeBuilder(a);
+ for (AttributeValue v : attribute)
{
- if (! existingValueSet.remove(v))
+ if (!builder.remove(v))
{
missingValues.add(v);
}
}
- if (existingValueSet.isEmpty())
+ // Remove / replace the attribute as necessary.
+ if (!builder.isEmpty())
{
- return removeAttribute(attribute.getAttributeType(),
- null);
+ attributes.set(i, builder.toAttribute());
}
-
- return true;
+ else
+ {
+ attributes.remove(i);
+ }
}
- }
- return false;
- }
- }
+ // If the attribute list is now empty remove it.
+ if (attributes.isEmpty())
+ {
+ if (attributeType.isOperational())
+ {
+ operationalAttributes.remove(attributeType);
+ }
+ else
+ {
+ userAttributes.remove(attributeType);
+ }
+ }
-
-
- /**
- * Indicates whether the specified attribute type is allowed by any
- * of the objectclasses associated with this entry.
- *
- * @param attributeType The attribute type for which to make the
- * determination.
- *
- * @return <CODE>true</CODE> if the specified attribute is allowed
- * by any of the objectclasses associated with this entry,
- * or <CODE>false</CODE> if it is not.
- */
- public boolean allowsAttribute(AttributeType attributeType)
- {
- for (ObjectClass o : objectClasses.keySet())
- {
- if (o.isRequiredOrOptional(attributeType))
- {
return true;
}
}
- return false;
- }
-
-
-
- /**
- * Indicates whether the specified attribute type is required by any
- * of the objectclasses associated with this entry.
- *
- * @param attributeType The attribute type for which to make the
- * determination.
- *
- * @return <CODE>true</CODE> if the specified attribute is required
- * by any of the objectclasses associated with this entry,
- * o r<CODE>false</CODE> if it is not.
- */
- public boolean requiresAttribute(AttributeType attributeType)
- {
- for (ObjectClass o : objectClasses.keySet())
- {
- if (o.isRequired(attributeType))
- {
- return true;
- }
- }
-
+ // No matching attribute found.
return false;
}
@@ -2149,7 +1868,7 @@
{
if (a.optionsEqual(options))
{
- return a.hasValue(value);
+ return a.contains(value);
}
}
@@ -2182,7 +1901,7 @@
{
LinkedHashMap<ObjectClass,String> ocs = new
LinkedHashMap<ObjectClass,String>();
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
String ocName = v.getStringValue();
String lowerName = toLowerCase(ocName);
@@ -2273,81 +1992,11 @@
break;
case REPLACE:
- removeAttribute(t, a.getOptions());
-
- if (a.hasValue())
- {
- // We know that we won't have any duplicate values, so we
- // don't kneed to worry about checking for them.
- duplicateValues = new LinkedList<AttributeValue>();
- addAttribute(a, duplicateValues);
- }
+ replaceAttribute(a);
break;
case INCREMENT:
- List<Attribute> attrList = getAttribute(t, false);
- if ((attrList == null) || attrList.isEmpty())
- {
- Message message =
- ERR_ENTRY_INCREMENT_NO_SUCH_ATTRIBUTE.get(a.getName());
- throw new DirectoryException(ResultCode.NO_SUCH_ATTRIBUTE,
- message);
- }
- else if (attrList.size() != 1)
- {
- Message message =
- ERR_ENTRY_INCREMENT_MULTIPLE_VALUES.get(a.getName());
- throw new DirectoryException(
- ResultCode.CONSTRAINT_VIOLATION, message);
- }
-
- LinkedHashSet<AttributeValue> values =
- attrList.get(0).getValues();
- if (values.isEmpty())
- {
- Message message =
- ERR_ENTRY_INCREMENT_NO_SUCH_ATTRIBUTE.get(a.getName());
- throw new DirectoryException(ResultCode.NO_SUCH_ATTRIBUTE,
- message);
- }
- else if (values.size() > 1)
- {
- Message message =
- ERR_ENTRY_INCREMENT_MULTIPLE_VALUES.get(a.getName());
- throw new DirectoryException(
- ResultCode.CONSTRAINT_VIOLATION, message);
- }
-
- LinkedHashSet<AttributeValue> newValues = a.getValues();
- if (newValues.size() != 1)
- {
- Message message = ERR_ENTRY_INCREMENT_INVALID_VALUE_COUNT.
- get(a.getName());
- throw new DirectoryException(
- ResultCode.CONSTRAINT_VIOLATION, message);
- }
-
- long newValue;
- try
- {
- String s = values.iterator().next().getStringValue();
- long currentValue = Long.parseLong(s);
-
- s = a.getValues().iterator().next().getStringValue();
- long increment = Long.parseLong(s);
-
- newValue = currentValue+increment;
- }
- catch (NumberFormatException nfe)
- {
- Message message = ERR_ENTRY_INCREMENT_CANNOT_PARSE_AS_INT.
- get(a.getName());
- throw new DirectoryException(
- ResultCode.CONSTRAINT_VIOLATION, message);
- }
-
- values.clear();
- values.add(new AttributeValue(t, String.valueOf(newValue)));
+ incrementAttribute(a);
break;
default:
@@ -2681,8 +2330,7 @@
{
for (Attribute a : attrList)
{
- LinkedHashSet<AttributeValue> values = a.getValues();
- if (values.isEmpty())
+ if (a.isEmpty())
{
Message message = ERR_ENTRY_SCHEMA_ATTR_NO_VALUES.get(
String.valueOf(dn),
@@ -2691,7 +2339,7 @@
invalidReason.append(message);
return false;
}
- else if (t.isSingleValue() && (values.size() != 1))
+ else if (t.isSingleValue() && (a.size() != 1))
{
Message message = ERR_ENTRY_SCHEMA_ATTR_SINGLE_VALUED.get(
String.valueOf(dn),
@@ -2716,7 +2364,7 @@
{
for (Attribute a : attrList)
{
- if (a.getValues().size() > 1)
+ if (a.size() > 1)
{
Message message =
ERR_ENTRY_SCHEMA_ATTR_SINGLE_VALUED.get(
@@ -3388,7 +3036,7 @@
AttributeType ocType =
DirectoryServer.getObjectClassAttributeType();
ArrayList<Attribute> ocList = new ArrayList<Attribute>(1);
- ocList.add(new Attribute(ocType));
+ ocList.add(Attributes.empty(ocType));
userAttrsCopy.put(ocType, ocList);
}
@@ -3449,7 +3097,14 @@
continue;
}
- targetList.add(a.duplicate(omitValues));
+ if (omitValues)
+ {
+ targetList.add(Attributes.empty(a));
+ }
+ else
+ {
+ targetList.add(a);
+ }
}
if (! targetList.isEmpty())
@@ -3588,7 +3243,7 @@
LinkedHashSet<String> referralURLs = new LinkedHashSet<String>();
for (Attribute a : refAttrs)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
referralURLs.add(v.getStringValue());
}
@@ -3706,20 +3361,18 @@
{
// There should only be a single alias attribute in an entry,
// and we'll skip the check for others for performance reasons.
- // We would just end up taking the first one anyway. The same
+ // We would just end up taking the first one anyway. The same
// is true with the set of values, since it should be a
// single-valued attribute.
Attribute aliasAttr = aliasAttrs.get(0);
- LinkedHashSet<AttributeValue> attrValues =
- aliasAttr.getValues();
- if (attrValues.isEmpty())
+ if (aliasAttr.isEmpty())
{
return null;
}
else
{
- return
- DN.decode(attrValues.iterator().next().getStringValue());
+ return DN.decode(
+ aliasAttr.iterator().next().getStringValue());
}
}
}
@@ -4118,7 +3771,7 @@
{
for (Attribute a : attrList)
{
- if (a.isVirtual() || (! a.hasValue()))
+ if (a.isVirtual() || a.isEmpty())
{
continue;
}
@@ -4130,7 +3783,7 @@
int numValues = 0;
int totalValueBytes = 0;
LinkedList<byte[]> valueBytes = new LinkedList<byte[]>();
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
numValues++;
byte[] vBytes = v.getValueBytes();
@@ -4177,7 +3830,7 @@
{
for (Attribute a : attrList)
{
- if (a.isVirtual() || (! a.hasValue()))
+ if (a.isVirtual() || a.isEmpty())
{
continue;
}
@@ -4189,7 +3842,7 @@
int numValues = 0;
int totalValueBytes = 0;
LinkedList<byte[]> valueBytes = new LinkedList<byte[]>();
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
numValues++;
byte[] vBytes = v.getValueBytes();
@@ -4356,7 +4009,7 @@
{
for (Attribute a : attrList)
{
- if (a.isVirtual() || (! a.hasValue()))
+ if (a.isVirtual() || a.isEmpty())
{
continue;
}
@@ -4387,7 +4040,7 @@
{
for (Attribute a : attrList)
{
- if (a.isVirtual() || (! a.hasValue()))
+ if (a.isVirtual() || a.isEmpty())
{
continue;
}
@@ -4399,7 +4052,7 @@
int numValues = 0;
int totalValueBytes = 0;
LinkedList<byte[]> valueBytes = new LinkedList<byte[]>();
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
numValues++;
byte[] vBytes = v.getValueBytes();
@@ -4447,7 +4100,7 @@
{
for (Attribute a : attrList)
{
- if (a.isVirtual() || (! a.hasValue()))
+ if (a.isVirtual() || a.isEmpty())
{
continue;
}
@@ -4473,7 +4126,7 @@
{
for (Attribute a : attrList)
{
- if (a.isVirtual() || (! a.hasValue()))
+ if (a.isVirtual() || a.isEmpty())
{
continue;
}
@@ -4485,7 +4138,7 @@
int numValues = 0;
int totalValueBytes = 0;
LinkedList<byte[]> valueBytes = new LinkedList<byte[]>();
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
numValues++;
byte[] vBytes = v.getValueBytes();
@@ -4769,8 +4422,11 @@
// each one.
LinkedHashMap<AttributeType,List<Attribute>> userAttributes =
new LinkedHashMap<AttributeType,List<Attribute>>();
+ AttributeBuilder builder = new AttributeBuilder();
for (int i=0; i < numUserAttrs; i++)
{
+ AttributeType attributeType;
+
// First, we have the zero-terminated attribute name.
startPos = pos;
while (entryBytes[pos] != 0x00)
@@ -4779,13 +4435,11 @@
}
name = new String(entryBytes, startPos, pos-startPos,
"UTF-8");
- LinkedHashSet<String> options;
int semicolonPos = name.indexOf(';');
if (semicolonPos > 0)
{
- String baseName = name.substring(0, semicolonPos);
- lowerName = toLowerCase(baseName);
- options = new LinkedHashSet<String>();
+ builder.setAttributeType(name.substring(0, semicolonPos));
+ attributeType = builder.getAttributeType();
int nextPos = name.indexOf(';', semicolonPos+1);
while (nextPos > 0)
@@ -4793,7 +4447,7 @@
String option = name.substring(semicolonPos+1, nextPos);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
semicolonPos = nextPos;
@@ -4803,19 +4457,14 @@
String option = name.substring(semicolonPos+1);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
-
- name = baseName;
}
else
{
- lowerName = toLowerCase(name);
- options = new LinkedHashSet<String>(0);
+ builder.setAttributeType(name);
+ attributeType = builder.getAttributeType();
}
- AttributeType attributeType =
- DirectoryServer.getAttributeType(lowerName, true);
-
// Next, we have the number of values.
@@ -4831,8 +4480,7 @@
}
// Next, we have the sequence of length-value pairs.
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(numValues);
+ builder.setInitialCapacity(numValues);
for (int j=0; j < numValues; j++)
{
int valueLength = entryBytes[pos] & 0x7F;
@@ -4850,16 +4498,15 @@
byte[] valueBytes = new byte[valueLength];
System.arraycopy(entryBytes, pos, valueBytes, 0,
valueLength);
- values.add(new AttributeValue(attributeType,
- new ASN1OctetString(valueBytes)));
+ builder.add(new AttributeValue(attributeType,
+ new ASN1OctetString(valueBytes)));
pos += valueLength;
}
// Create the attribute and add it to the set of user
// attributes.
- Attribute a = new Attribute(attributeType, name, options,
- values);
+ Attribute a = builder.toAttribute();
List<Attribute> attrList = userAttributes.get(attributeType);
if (attrList == null)
{
@@ -4896,6 +4543,8 @@
new LinkedHashMap<AttributeType,List<Attribute>>();
for (int i=0; i < numOperationalAttrs; i++)
{
+ AttributeType attributeType;
+
// First, we have the zero-terminated attribute name.
startPos = pos;
while (entryBytes[pos] != 0x00)
@@ -4904,13 +4553,11 @@
}
name = new String(entryBytes, startPos, pos-startPos,
"UTF-8");
- LinkedHashSet<String> options;
int semicolonPos = name.indexOf(';');
if (semicolonPos > 0)
{
- String baseName = name.substring(0, semicolonPos);
- lowerName = toLowerCase(baseName);
- options = new LinkedHashSet<String>();
+ builder.setAttributeType(name.substring(0, semicolonPos));
+ attributeType = builder.getAttributeType();
int nextPos = name.indexOf(';', semicolonPos+1);
while (nextPos > 0)
@@ -4918,7 +4565,7 @@
String option = name.substring(semicolonPos+1, nextPos);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
semicolonPos = nextPos;
@@ -4928,18 +4575,14 @@
String option = name.substring(semicolonPos+1);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
-
- name = baseName;
}
else
{
- lowerName = toLowerCase(name);
- options = new LinkedHashSet<String>(0);
+ builder.setAttributeType(name);
+ attributeType = builder.getAttributeType();
}
- AttributeType attributeType =
- DirectoryServer.getAttributeType(lowerName, true);
// Next, we have the number of values.
@@ -4955,8 +4598,7 @@
}
// Next, we have the sequence of length-value pairs.
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(numValues);
+ builder.setInitialCapacity(numValues);
for (int j=0; j < numValues; j++)
{
int valueLength = entryBytes[pos] & 0x7F;
@@ -4972,20 +4614,19 @@
}
byte[] valueBytes = new byte[valueLength];
- System.arraycopy(entryBytes, pos, valueBytes, 0,
- valueLength);
- values.add(new AttributeValue(attributeType,
- new ASN1OctetString(valueBytes)));
+ System.arraycopy(
+ entryBytes, pos, valueBytes, 0, valueLength);
+ builder.add(new AttributeValue(attributeType,
+ new ASN1OctetString(valueBytes)));
pos += valueLength;
}
// Create the attribute and add it to the set of operational
// attributes.
- Attribute a = new Attribute(attributeType, name, options,
- values);
+ Attribute a = builder.toAttribute();
List<Attribute> attrList =
- operationalAttributes.get(attributeType);
+ operationalAttributes.get(attributeType);
if (attrList == null)
{
attrList = new ArrayList<Attribute>(1);
@@ -5218,8 +4859,11 @@
}
else
{
+ AttributeBuilder builder = new AttributeBuilder();
for (int i=0; i < numUserAttrs; i++)
{
+ AttributeType attributeType;
+
// First, we have the zero-terminated attribute name.
int startPos = pos;
while (entryBytes[pos] != 0x00)
@@ -5227,16 +4871,13 @@
pos++;
}
- String lowerName;
String name = new String(entryBytes, startPos, pos-startPos,
"UTF-8");
- LinkedHashSet<String> options;
int semicolonPos = name.indexOf(';');
if (semicolonPos > 0)
{
- String baseName = name.substring(0, semicolonPos);
- lowerName = toLowerCase(baseName);
- options = new LinkedHashSet<String>();
+ builder.setAttributeType(name.substring(0, semicolonPos));
+ attributeType = builder.getAttributeType();
int nextPos = name.indexOf(';', semicolonPos+1);
while (nextPos > 0)
@@ -5244,7 +4885,7 @@
String option = name.substring(semicolonPos+1, nextPos);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
semicolonPos = nextPos;
@@ -5254,19 +4895,14 @@
String option = name.substring(semicolonPos+1);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
-
- name = baseName;
}
else
{
- lowerName = toLowerCase(name);
- options = new LinkedHashSet<String>(0);
+ builder.setAttributeType(name);
+ attributeType = builder.getAttributeType();
}
- AttributeType attributeType =
- DirectoryServer.getAttributeType(lowerName, true);
-
// Next, we have the number of values.
@@ -5282,8 +4918,7 @@
}
// Next, we have the sequence of length-value pairs.
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(numValues);
+ builder.setInitialCapacity(numValues);
for (int j=0; j < numValues; j++)
{
int valueLength = entryBytes[pos] & 0x7F;
@@ -5301,18 +4936,17 @@
byte[] valueBytes = new byte[valueLength];
System.arraycopy(entryBytes, pos, valueBytes, 0,
valueLength);
- values.add(new AttributeValue(attributeType,
- new ASN1OctetString(valueBytes)));
+ builder.add(new AttributeValue(attributeType,
+ new ASN1OctetString(valueBytes)));
pos += valueLength;
}
// Create the attribute and add it to the set of user
// attributes.
- Attribute a = new Attribute(attributeType, name, options,
- values);
+ Attribute a = builder.toAttribute();
List<Attribute> attrList =
- userAttributes.get(attributeType);
+ userAttributes.get(attributeType);
if (attrList == null)
{
attrList = new ArrayList<Attribute>(1);
@@ -5381,24 +5015,24 @@
}
else
{
+ AttributeBuilder builder = new AttributeBuilder();
for (int i=0; i < numOperationalAttrs; i++)
{
+ AttributeType attributeType;
+
// First, we have the zero-terminated attribute name.
int startPos = pos;
while (entryBytes[pos] != 0x00)
{
pos++;
}
- String lowerName;
String name = new String(entryBytes, startPos, pos-startPos,
"UTF-8");
- LinkedHashSet<String> options;
int semicolonPos = name.indexOf(';');
if (semicolonPos > 0)
{
- String baseName = name.substring(0, semicolonPos);
- lowerName = toLowerCase(baseName);
- options = new LinkedHashSet<String>();
+ builder.setAttributeType(name.substring(0, semicolonPos));
+ attributeType = builder.getAttributeType();
int nextPos = name.indexOf(';', semicolonPos+1);
while (nextPos > 0)
@@ -5406,7 +5040,7 @@
String option = name.substring(semicolonPos+1, nextPos);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
semicolonPos = nextPos;
@@ -5416,18 +5050,14 @@
String option = name.substring(semicolonPos+1);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
-
- name = baseName;
}
else
{
- lowerName = toLowerCase(name);
- options = new LinkedHashSet<String>(0);
+ builder.setAttributeType(name);
+ attributeType = builder.getAttributeType();
}
- AttributeType attributeType =
- DirectoryServer.getAttributeType(lowerName, true);
// Next, we have the number of values.
@@ -5443,8 +5073,7 @@
}
// Next, we have the sequence of length-value pairs.
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>(numValues);
+ builder.setInitialCapacity(numValues);
for (int j=0; j < numValues; j++)
{
int valueLength = entryBytes[pos] & 0x7F;
@@ -5460,20 +5089,19 @@
}
byte[] valueBytes = new byte[valueLength];
- System.arraycopy(entryBytes, pos, valueBytes, 0,
- valueLength);
- values.add(new AttributeValue(attributeType,
- new ASN1OctetString(valueBytes)));
+ System.arraycopy(
+ entryBytes, pos, valueBytes, 0, valueLength);
+ builder.add(new AttributeValue(attributeType,
+ new ASN1OctetString(valueBytes)));
pos += valueLength;
}
// Create the attribute and add it to the set of operational
// attributes.
- Attribute a = new Attribute(attributeType, name, options,
- values);
+ Attribute a = builder.toAttribute();
List<Attribute> attrList =
- operationalAttributes.get(attributeType);
+ operationalAttributes.get(attributeType);
if (attrList == null)
{
attrList = new ArrayList<Attribute>(1);
@@ -5491,7 +5119,7 @@
// We've got everything that we need, so create and return the
// entry.
return new Entry(dn, objectClasses, userAttributes,
- operationalAttributes);
+ operationalAttributes);
}
catch (DirectoryException de)
{
@@ -5555,7 +5183,7 @@
attrName.append(o);
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
StringBuilder attrLine = new StringBuilder();
attrLine.append(attrName);
@@ -5578,7 +5206,7 @@
attrName.append(o);
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
StringBuilder attrLine = new StringBuilder();
attrLine.append(attrName);
@@ -5735,7 +5363,7 @@
attrName.append(o);
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
StringBuilder attrLine = new StringBuilder();
attrLine.append(attrName);
@@ -5797,7 +5425,7 @@
attrName.append(o);
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
StringBuilder attrLine = new StringBuilder();
attrLine.append(attrName);
@@ -5865,7 +5493,7 @@
attrName.append(o);
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
StringBuilder attrLine = new StringBuilder();
attrLine.append(attrName);
@@ -6205,8 +5833,7 @@
}
buffer.append("={");
- Iterator<AttributeValue> valueIterator =
- a.getValues().iterator();
+ Iterator<AttributeValue> valueIterator = a.iterator();
if (valueIterator.hasNext())
{
buffer.append(valueIterator.next().getStringValue());
@@ -6248,8 +5875,7 @@
}
buffer.append("={");
- Iterator<AttributeValue> valueIterator =
- a.getValues().iterator();
+ Iterator<AttributeValue> valueIterator = a.iterator();
if (valueIterator.hasNext())
{
buffer.append(valueIterator.next().getStringValue());
@@ -6267,5 +5893,216 @@
buffer.append("})");
}
+
+
+
+ /**
+ * Retrieves the requested attribute element for the specified
+ * attribute type and options or <code>null</code> if this entry
+ * does not contain an attribute with the specified attribute type
+ * and options.
+ *
+ * @param attributeType
+ * The attribute type to retrieve.
+ * @param options
+ * The set of attribute options.
+ * @return The requested attribute element for the specified
+ * attribute type and options, or <code>null</code> if the
+ * specified attribute type is not present in this entry
+ * with the provided set of options.
+ */
+ public Attribute getExactAttribute(AttributeType attributeType,
+ Set<String> options)
+ {
+ List<Attribute> attributes;
+
+ if (attributeType.isOperational())
+ {
+ attributes = operationalAttributes.get(attributeType);
+ }
+ else
+ {
+ attributes = userAttributes.get(attributeType);
+ }
+
+ if (attributes != null)
+ {
+ for (Attribute attribute : attributes)
+ {
+ if (attribute.optionsEqual(options))
+ {
+ return attribute;
+ }
+ }
+ }
+
+ return null;
+ }
+
+
+
+ /**
+ * Adds the provided attribute to this entry. If an attribute with
+ * the provided type and options already exists, then it will be
+ * either merged or replaced depending on the value of
+ * <code>replace</code>.
+ *
+ * @param attribute
+ * The attribute to add/replace in this entry.
+ * @param duplicateValues
+ * A list to which any duplicate values will be added.
+ * @param replace
+ * <code>true</code> if the attribute should replace any
+ * existing attribute.
+ */
+ private void setAttribute(Attribute attribute,
+ List<AttributeValue> duplicateValues, boolean replace)
+ {
+ attachment = null;
+
+ AttributeType attributeType = attribute.getAttributeType();
+
+ if (attribute.getAttributeType().isObjectClassType())
+ {
+ // We will not do any validation of the object classes - this is
+ // left to the caller.
+ if (replace)
+ {
+ objectClasses.clear();
+ }
+
+ for (AttributeValue v : attribute)
+ {
+ String name = v.getStringValue();
+
+ String lowerName;
+ try
+ {
+ lowerName = v.getNormalizedStringValue();
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+
+ lowerName = toLowerCase(v.getStringValue());
+ }
+
+ // Create a default object class if necessary.
+ ObjectClass oc =
+ DirectoryServer.getObjectClass(lowerName, true);
+
+ if (replace)
+ {
+ objectClasses.put(oc, name);
+ }
+ else
+ {
+ if (objectClasses.containsKey(oc))
+ {
+ duplicateValues.add(v);
+ }
+ else
+ {
+ objectClasses.put(oc, name);
+ }
+ }
+ }
+
+ return;
+ }
+
+ List<Attribute> attributes;
+
+ if (attributeType.isOperational())
+ {
+ attributes = operationalAttributes.get(attributeType);
+ }
+ else
+ {
+ attributes = userAttributes.get(attributeType);
+ }
+
+ if (attributes == null)
+ {
+ // Do nothing if we are deleting a non-existing attribute.
+ if (replace && attribute.isEmpty())
+ {
+ return;
+ }
+
+ // We are adding the first attribute with this attribute type.
+ attributes = new ArrayList<Attribute>(1);
+ attributes.add(attribute);
+
+ if (attributeType.isOperational())
+ {
+ operationalAttributes.put(attributeType, attributes);
+ }
+ else
+ {
+ userAttributes.put(attributeType, attributes);
+ }
+
+ return;
+ }
+
+ // There are already attributes with the same attribute type.
+ Set<String> options = attribute.getOptions();
+ for (int i = 0; i < attributes.size(); i++)
+ {
+ Attribute a = attributes.get(i);
+ if (a.optionsEqual(options))
+ {
+ if (replace)
+ {
+ if (!attribute.isEmpty())
+ {
+ attributes.set(i, attribute);
+ }
+ else
+ {
+ attributes.remove(i);
+
+ if (attributes.isEmpty())
+ {
+ if (attributeType.isOperational())
+ {
+ operationalAttributes.remove(attributeType);
+ }
+ else
+ {
+ userAttributes.remove(attributeType);
+ }
+ }
+ }
+ }
+ else
+ {
+ AttributeBuilder builder = new AttributeBuilder(a);
+ for (AttributeValue v : attribute)
+ {
+ if (!builder.add(v))
+ {
+ duplicateValues.add(v);
+ }
+ }
+ attributes.set(i, builder.toAttribute());
+ }
+ return;
+ }
+ }
+
+ // There were no attributes with the same options.
+ if (replace && attribute.isEmpty())
+ {
+ // Do nothing.
+ return;
+ }
+
+ attributes.add(attribute);
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java b/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java
index c80f0d2..288dc85 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java
@@ -28,10 +28,6 @@
-import static org.opends.server.util.ServerConstants.*;
-
-
-
/**
* This class defines a data structure for storing and interacting
* with a modification that may be requested of an entry in the
@@ -264,40 +260,5 @@
buffer.append(", ");
buffer.append(attribute.toString());
}
-
-
-
- /**
- * Retrieves a string representation of this modification in LDIF
- * form.
- *
- * @return A string representation of this modification in LDIF
- * form.
- */
- public String toLDIF()
- {
- StringBuilder buffer = new StringBuilder();
- toLDIF(buffer);
- return buffer.toString();
- }
-
-
-
- /**
- * Appends a string representation of this modification in LDIF form
- * to the provided buffer.
- *
- * @param buffer The buffer to which the information should be
- * appended.
- */
- public void toLDIF(StringBuilder buffer)
- {
- buffer.append(modificationType.toString());
- buffer.append(": ");
- buffer.append(attribute.getName());
- buffer.append(EOL);
-
- attribute.toLDIF(buffer);
- }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java b/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java
index 920b22a..3e8f61d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java
@@ -3354,43 +3354,36 @@
LinkedList<Modification> mods)
{
AttributeType attributeTypesType =
- DirectoryServer.getAttributeType(ATTR_ATTRIBUTE_TYPES_LC,
- true);
+ DirectoryServer.getAttributeType(ATTR_ATTRIBUTE_TYPES_LC, true);
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(elementType);
for (String s : oldElements)
{
- if (! newElements.contains(s))
+ if (!newElements.contains(s))
{
- values.add(new AttributeValue(attributeTypesType, s));
+ builder.add(new AttributeValue(attributeTypesType, s));
}
}
- if (! values.isEmpty())
+ if (!builder.isEmpty())
{
mods.add(new Modification(ModificationType.DELETE,
- new Attribute(elementType,
- elementType.getNameOrOID(),
- values)));
+ builder.toAttribute()));
}
-
- values.clear();
+ builder.clear();
for (String s : newElements)
{
- if (! oldElements.contains(s))
+ if (!oldElements.contains(s))
{
- values.add(new AttributeValue(attributeTypesType, s));
+ builder.add(new AttributeValue(attributeTypesType, s));
}
}
- if (! values.isEmpty())
+ if (!builder.isEmpty())
{
mods.add(new Modification(ModificationType.ADD,
- new Attribute(elementType,
- elementType.getNameOrOID(),
- values)));
+ builder.toAttribute()));
}
}
@@ -3398,7 +3391,7 @@
/**
* Destroys the structures maintained by the schema so that they are
- * no longer usable. This should only be called at the end of the
+ * no longer usable. This should only be called at the end of the
* server shutdown process, and it can help detect inappropriate
* cached references.
*/
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java b/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java
index 6e15451..d69bafe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java
@@ -2110,7 +2110,7 @@
}
else
{
- MatchingRule mr = DirectoryServer.getMatchingRule(
+ MatchingRule<?> mr = DirectoryServer.getMatchingRule(
toLowerCase(matchingRuleID));
if (mr == null)
{
@@ -2766,7 +2766,7 @@
// match.
for (Attribute a : attrs)
{
- if (a.hasValue(assertionValue))
+ if (a.contains(assertionValue))
{
if (debugEnabled())
{
@@ -3307,7 +3307,7 @@
// We must have a matching rule to use in the determination.
- MatchingRule matchingRule = null;
+ MatchingRule<?> matchingRule = null;
if (matchingRuleID != null)
{
matchingRule =
@@ -3410,7 +3410,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -3458,7 +3458,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -3502,7 +3502,7 @@
}
Attribute a = entry.getObjectClassAttribute();
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -3548,7 +3548,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -3895,7 +3895,7 @@
}
else
{
- MatchingRule mr =
+ MatchingRule<?> mr =
DirectoryServer.getMatchingRule(
toLowerCase(matchingRuleID));
if (mr == null)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/VirtualAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/types/VirtualAttribute.java
index 8b73f88..ef11179 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/VirtualAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/VirtualAttribute.java
@@ -29,10 +29,11 @@
import java.util.Collection;
-import java.util.LinkedHashSet;
+import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
-import org.opends.server.admin.std.server.VirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
@@ -43,19 +44,23 @@
* but rather are computed or otherwise obtained dynamically.
*/
@org.opends.server.types.PublicAPI(
- stability=org.opends.server.types.StabilityLevel.VOLATILE,
- mayInstantiate=false,
- mayExtend=false,
- mayInvoke=true)
+ stability = org.opends.server.types.StabilityLevel.VOLATILE,
+ mayInstantiate = false,
+ mayExtend = false,
+ mayInvoke = true)
public final class VirtualAttribute
- extends Attribute
+ extends AbstractAttribute
+ implements Attribute
{
+
+ // The attribute type.
+ private final AttributeType attributeType;
+
// The entry with which this virtual attribute is associated.
private final Entry entry;
// The virtual attribute provider for this virtual attribute.
- private final VirtualAttributeProvider<
- ? extends VirtualAttributeCfg> provider;
+ private final VirtualAttributeProvider<?> provider;
// The virtual attribute rule for this virtual attribute.
private final VirtualAttributeRule rule;
@@ -65,22 +70,62 @@
/**
* Creates a new virtual attribute with the provided information.
*
- * @param attributeType The attribute type for this virtual
- * attribute.
- * @param entry The entry in which this virtual attribute
- * exists.
-* @param rule The virutal attribute rule that governs
- * the behavior of this virtual attribute.
+ * @param attributeType
+ * The attribute type for this virtual attribute.
+ * @param entry
+ * The entry in which this virtual attribute exists.
+ * @param rule
+ * The virtual attribute rule that governs the behavior of
+ * this virtual attribute.
*/
public VirtualAttribute(AttributeType attributeType, Entry entry,
- VirtualAttributeRule rule)
+ VirtualAttributeRule rule)
{
- super(attributeType);
-
+ this.attributeType = attributeType;
this.entry = entry;
- this.rule = rule;
+ this.rule = rule;
+ this.provider = rule.getProvider();
+ }
- provider = rule.getProvider();
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConditionResult approximatelyEqualTo(AttributeValue value)
+ {
+ return provider.approximatelyEqualTo(entry, rule, value);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean contains(AttributeValue value)
+ {
+ return provider.hasValue(entry, rule, value);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean containsAll(Collection<AttributeValue> values)
+ {
+ return provider.hasAllValues(entry, rule, values);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public AttributeType getAttributeType()
+ {
+ return attributeType;
}
@@ -88,7 +133,7 @@
/**
* Retrieves the entry in which this virtual attribute exists.
*
- * @return The entry in which this virtual attribute exists.
+ * @return The entry in which this virtual attribute exists.
*/
public Entry getEntry()
{
@@ -98,11 +143,32 @@
/**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getNameWithOptions()
+ {
+ return getName();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set<String> getOptions()
+ {
+ return Collections.emptySet();
+ }
+
+
+
+ /**
* Retrieves the virtual attribute rule that governs the behavior of
* this virtual attribute.
*
- * @return The virtual attribute rule that governs the behavior of
- * this virtual attribute.
+ * @return The virtual attribute rule that governs the behavior of
+ * this virtual attribute.
*/
public VirtualAttributeRule getVirtualAttributeRule()
{
@@ -112,127 +178,8 @@
/**
- * Retrieves the set of values for this attribute. The returned set
- * of values may be altered by the caller.
- *
- * @return The set of values for this attribute.
+ * {@inheritDoc}
*/
- @Override()
- public LinkedHashSet<AttributeValue> getValues()
- {
- return provider.getValues(entry, rule);
- }
-
-
-
- /**
- * Indicates whether this attribute contains one or more values.
- *
- * @return <CODE>true</CODE> if this attribute contains one or more
- * values, or <CODE>false</CODE> if it does not.
- */
- @Override()
- public boolean hasValue()
- {
- return provider.hasValue(entry, rule);
- }
-
-
-
- /**
- * Indicates whether this attribute contains the specified value.
- *
- * @param value The value for which to make the determination.
- *
- * @return <CODE>true</CODE> if this attribute has the specified
- * value, or <CODE>false</CODE> if not.
- */
- @Override()
- public boolean hasValue(AttributeValue value)
- {
- return provider.hasValue(entry, rule, value);
- }
-
-
-
- /**
- * Indicates whether this attribute contains all the values in the
- * collection.
- *
- * @param values The set of values for which to make the
- * determination.
- *
- * @return <CODE>true</CODE> if this attribute contains all the
- * values in the provided collection, or <CODE>false</CODE>
- * if it does not contain at least one of them.
- */
- @Override()
- public boolean hasAllValues(Collection<AttributeValue> values)
- {
- return provider.hasAllValues(entry, rule, values);
- }
-
-
-
- /**
- * Indicates whether this attribute contains any of the values in
- * the collection.
- *
- * @param values The set of values for which to make the
- * determination.
- *
- * @return <CODE>true</CODE> if this attribute contains at least
- * one of the values in the provided collection, or
- * <CODE>false</CODE> if it does not contain any of the
- * values.
- */
- @Override()
- public boolean hasAnyValue(Collection<AttributeValue> values)
- {
- return provider.hasAnyValue(entry, rule, values);
- }
-
-
-
- /**
- * Indicates whether this attribute has any value(s) that match the
- * provided substring.
- *
- * @param subInitial The subInitial component to use in the
- * determination.
- * @param subAny The subAny components to use in the
- * determination.
- * @param subFinal The subFinal component to use in the
- * determination.
- *
- * @return <CODE>UNDEFINED</CODE> if this attribute does not have a
- * substring matching rule, <CODE>TRUE</CODE> if at least
- * one value matches the provided substring, or
- * <CODE>FALSE</CODE> otherwise.
- */
- @Override()
- public ConditionResult matchesSubstring(ByteString subInitial,
- List<ByteString> subAny,
- ByteString subFinal)
- {
- return provider.matchesSubstring(entry, rule, subInitial, subAny,
- subFinal);
- }
-
-
-
- /**
- * Indicates whether this attribute has any value(s) that are
- * greater than or equal to the provided value.
- *
- * @param value The value for which to make the determination.
- *
- * @return <CODE>UNDEFINED</CODE> if this attribute does not have
- * an ordering matching rule, <CODE>TRUE</CODE> if at least
- * one value is greater than or equal to the provided
- * value, or <CODE>false</CODE> otherwise.
- */
- @Override()
public ConditionResult greaterThanOrEqualTo(AttributeValue value)
{
return provider.greaterThanOrEqualTo(entry, rule, value);
@@ -241,51 +188,52 @@
/**
- * Indicates whether this attribute has any value(s) that are less
- * than or equal to the provided value.
- *
- * @param value The value for which to make the determination.
- *
- * @return <CODE>UNDEFINED</CODE> if this attribute does not have
- * an ordering matching rule, <CODE>TRUE</CODE> if at least
- * one value is less than or equal to the provided value,
- * or <CODE>false</CODE> otherwise.
+ * {@inheritDoc}
*/
- @Override()
- public ConditionResult lessThanOrEqualTo(AttributeValue value)
+ @Override
+ public boolean hasAllOptions(Collection<String> options)
{
- return provider.lessThanOrEqualTo(entry, rule, value);
+ return (options == null || options.isEmpty());
}
/**
- * Indicates whether this attribute has any value(s) that are
- * approximately equal to the provided value.
- *
- * @param value The value for which to make the determination.
- *
- * @return <CODE>UNDEFINED</CODE> if this attribute does not have
- * an approximate matching rule, <CODE>TRUE</CODE> if at
- * least one value is approximately equal to the provided
- * value, or <CODE>false</CODE> otherwise.
+ * {@inheritDoc}
*/
- @Override()
- public ConditionResult approximatelyEqualTo(AttributeValue value)
+ @Override
+ public boolean hasOption(String option)
{
- return provider.approximatelyEqualTo(entry, rule, value);
+ return false;
}
/**
- * Indicates whether this is a virtual attribute rather than a real
- * attribute.
- *
- * @return {@code true} if this is a virtual attribute, or
- * {@code false} if it is a real attribute.
+ * {@inheritDoc}
*/
- @Override()
+ @Override
+ public boolean hasOptions()
+ {
+ return false;
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isEmpty()
+ {
+ return !provider.hasValue(entry, rule);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
public boolean isVirtual()
{
return true;
@@ -294,31 +242,62 @@
/**
- * Creates a duplicate of this attribute that can be modified
- * without impacting this attribute.
- *
- * @param omitValues <CODE>true</CODE> if the values should be
- * omitted.
- *
- * @return A duplicate of this attribute that can be modified
- * without impacting this attribute.
+ * {@inheritDoc}
*/
- @Override()
- public Attribute duplicate(boolean omitValues)
+ public Iterator<AttributeValue> iterator()
{
- return new VirtualAttribute(getAttributeType(), entry, rule);
+ Set<AttributeValue> values = provider.getValues(entry, rule);
+ return Collections.unmodifiableSet(values).iterator();
}
/**
- * Appends a one-line string representation of this attribute to the
- * provided buffer.
- *
- * @param buffer The buffer to which the information should be
- * appended.
+ * {@inheritDoc}
*/
- @Override()
+ public ConditionResult lessThanOrEqualTo(AttributeValue value)
+ {
+ return provider.lessThanOrEqualTo(entry, rule, value);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ConditionResult matchesSubstring(ByteString subInitial,
+ List<ByteString> subAny, ByteString subFinal)
+ {
+ return provider.matchesSubstring(entry, rule, subInitial, subAny,
+ subFinal);
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean optionsEqual(Set<String> options)
+ {
+ return (options == null || options.isEmpty());
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public int size()
+ {
+ return provider.getValues(entry, rule).size();
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
public void toString(StringBuilder buffer)
{
buffer.append("VirtualAttribute(");
@@ -326,9 +305,9 @@
buffer.append(", {");
boolean firstValue = true;
- for (AttributeValue value : getValues())
+ for (AttributeValue value : this)
{
- if (! firstValue)
+ if (!firstValue)
{
buffer.append(", ");
}
@@ -339,5 +318,5 @@
buffer.append("})");
}
-}
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/EmbeddedUtils.java b/opendj-sdk/opends/src/server/org/opends/server/util/EmbeddedUtils.java
index efb0850..57fd82c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/EmbeddedUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/EmbeddedUtils.java
@@ -35,7 +35,6 @@
import static org.opends.messages.UtilityMessages.*;
import org.opends.messages.Message;
-import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
index 73581b8..123feca 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
@@ -44,7 +44,6 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -55,6 +54,7 @@
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.types.AcceptRejectWarn;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DirectoryException;
@@ -852,10 +852,9 @@
// Parse the attribute type description.
int colonPos = parseColonPosition(lines, line);
String attrDescr = line.substring(0, colonPos);
- Attribute attribute = parseAttrDescription(attrDescr);
- String attrName = attribute.getName();
- String lowerName = toLowerCase(attrName);
- LinkedHashSet<String> options = attribute.getOptions();
+ final Attribute attribute = parseAttrDescription(attrDescr);
+ final String attrName = attribute.getName();
+ final String lowerName = toLowerCase(attrName);
// Now parse the attribute value.
ASN1OctetString value = parseSingleValue(lines, line, entryDN,
@@ -913,6 +912,17 @@
return;
}
+ //The attribute is not being ignored so check for binary option.
+ if(!attrType.isBinary())
+ {
+ if(attribute.hasOption("binary"))
+ {
+ Message message = ERR_LDIF_INVALID_ATTR_OPTION.get(
+ String.valueOf(entryDN),lastEntryLineNumber, attrName);
+ logToRejectWriter(lines, message);
+ throw new LDIFException(message, lastEntryLineNumber,true);
+ }
+ }
if (checkSchema &&
(DirectoryServer.getSyntaxEnforcementPolicy() !=
AcceptRejectWarn.ACCEPT))
@@ -945,12 +955,10 @@
attrList = operationalAttributes.get(attrType);
if (attrList == null)
{
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>();
- valueSet.add(attributeValue);
-
+ AttributeBuilder builder = new AttributeBuilder(attribute, true);
+ builder.add(attributeValue);
attrList = new ArrayList<Attribute>();
- attrList.add(new Attribute(attrType, attrName, options, valueSet));
+ attrList.add(builder.toAttribute());
operationalAttributes.put(attrType, attrList);
return;
}
@@ -960,12 +968,10 @@
attrList = userAttributes.get(attrType);
if (attrList == null)
{
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>();
- valueSet.add(attributeValue);
-
+ AttributeBuilder builder = new AttributeBuilder(attribute, true);
+ builder.add(attributeValue);
attrList = new ArrayList<Attribute>();
- attrList.add(new Attribute(attrType, attrName, options, valueSet));
+ attrList.add(builder.toAttribute());
userAttributes.put(attrType, attrList);
return;
}
@@ -974,12 +980,12 @@
// Check to see if any of the attributes in the list have the same set of
// options. If so, then try to add a value to that attribute.
- for (Attribute a : attrList)
- {
- if (a.optionsEqual(options))
+ for (int i = 0; i < attrList.size(); i++) {
+ Attribute a = attrList.get(i);
+
+ if (a.optionsEqual(attribute.getOptions()))
{
- LinkedHashSet<AttributeValue> valueSet = a.getValues();
- if (valueSet.contains(attributeValue))
+ if (a.contains(attributeValue))
{
if (! checkSchema)
{
@@ -988,7 +994,7 @@
// values differ in capitalization. Only reject the proposed
// value if we find another value that is exactly the same as the
// one that was provided.
- for (AttributeValue v : valueSet)
+ for (AttributeValue v : a)
{
if (v.getValue().equals(attributeValue.getValue()))
{
@@ -1014,7 +1020,7 @@
}
}
- if (attrType.isSingleValue() && (! valueSet.isEmpty()) && checkSchema)
+ if (attrType.isSingleValue() && !a.isEmpty() && checkSchema)
{
Message message = ERR_LDIF_MULTIPLE_VALUES_FOR_SINGLE_VALUED_ATTR
.get(String.valueOf(entryDN),
@@ -1023,18 +1029,19 @@
throw new LDIFException(message, lastEntryLineNumber, true);
}
- valueSet.add(attributeValue);
+ AttributeBuilder builder = new AttributeBuilder(a);
+ builder.add(attributeValue);
+ attrList.set(i, builder.toAttribute());
return;
}
}
- // No set of matching options was found, so create a new one and add it to
- // the list.
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>();
- valueSet.add(attributeValue);
- attrList.add(new Attribute(attrType, attrName, options, valueSet));
+ // No set of matching options was found, so create a new one and
+ // add it to the list.
+ AttributeBuilder builder = new AttributeBuilder(attribute, true);
+ builder.add(attributeValue);
+ attrList.add(builder.toAttribute());
return;
}
}
@@ -1084,11 +1091,11 @@
ASN1OctetString value = parseSingleValue(lines, line, entryDN,
colonPos, attrName);
+ AttributeBuilder builder = new AttributeBuilder(attribute, true);
AttributeType attrType = attribute.getAttributeType();
- AttributeValue attributeValue = new AttributeValue(attrType, value);
- attribute.getValues().add(attributeValue);
+ builder.add(new AttributeValue(attrType, value));
- return attribute;
+ return builder.toAttribute();
}
@@ -1168,53 +1175,51 @@
/**
- * Parse an AttributeDescription (an attribute type name and its options).
- * @param attrDescr The attribute description to be parsed.
- * @return A new attribute with no values, representing the attribute type
- * and its options.
+ * Parse an AttributeDescription (an attribute type name and its
+ * options).
+ *
+ * @param attrDescr
+ * The attribute description to be parsed.
+ * @return A new attribute with no values, representing the
+ * attribute type and its options.
*/
private static Attribute parseAttrDescription(String attrDescr)
{
- String attrName;
- String lowerName;
- LinkedHashSet<String> options;
+ AttributeBuilder builder;
int semicolonPos = attrDescr.indexOf(';');
if (semicolonPos > 0)
{
- attrName = attrDescr.substring(0, semicolonPos);
- options = new LinkedHashSet<String>();
- int nextPos = attrDescr.indexOf(';', semicolonPos+1);
+ builder = new AttributeBuilder(attrDescr.substring(0, semicolonPos));
+ int nextPos = attrDescr.indexOf(';', semicolonPos + 1);
while (nextPos > 0)
{
- String option = attrDescr.substring(semicolonPos+1, nextPos);
+ String option = attrDescr.substring(semicolonPos + 1, nextPos);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
semicolonPos = nextPos;
- nextPos = attrDescr.indexOf(';', semicolonPos+1);
+ nextPos = attrDescr.indexOf(';', semicolonPos + 1);
}
}
- String option = attrDescr.substring(semicolonPos+1);
+ String option = attrDescr.substring(semicolonPos + 1);
if (option.length() > 0)
{
- options.add(option);
+ builder.setOption(option);
}
}
else
{
- attrName = attrDescr;
- options = null;
+ builder = new AttributeBuilder(attrDescr);
}
- lowerName = toLowerCase(attrName);
- AttributeType attrType = DirectoryServer.getAttributeType(lowerName);
- if (attrType == null)
+ if(builder.getAttributeType().isBinary())
{
- attrType = DirectoryServer.getDefaultAttributeType(attrName);
+ //resetting doesn't hurt and returns false.
+ builder.setOption("binary");
}
- return new Attribute(attrType, attrName, options, null);
+ return builder.toAttribute();
}
@@ -1401,11 +1406,7 @@
{
Attribute attr =
readSingleValueAttribute(lines, line, entryDN, attributeName);
- LinkedHashSet<AttributeValue> values = attr.getValues();
-
- // Get the attribute value
- Object[] vals = values.toArray();
- return (((AttributeValue)vals[0]).getStringValue());
+ return attr.iterator().next().getStringValue();
}
@@ -1433,35 +1434,39 @@
Attribute attr =
readSingleValueAttribute(lines, line, entryDN, null);
String name = attr.getName();
- LinkedHashSet<AttributeValue> values = attr.getValues();
// Get the attribute description
- String attrDescr = values.iterator().next().getStringValue();
+ String attrDescr = attr.iterator().next().getStringValue();
String lowerName = toLowerCase(name);
- if(lowerName.equals("add"))
+ if (lowerName.equals("add"))
{
modType = ModificationType.ADD;
- } else if(lowerName.equals("delete"))
+ }
+ else if (lowerName.equals("delete"))
{
modType = ModificationType.DELETE;
- } else if(lowerName.equals("replace"))
+ }
+ else if (lowerName.equals("replace"))
{
modType = ModificationType.REPLACE;
- } else if(lowerName.equals("increment"))
+ }
+ else if (lowerName.equals("increment"))
{
modType = ModificationType.INCREMENT;
- } else
+ }
+ else
{
// Invalid attribute name.
- Message message = ERR_LDIF_INVALID_MODIFY_ATTRIBUTE.get(
- name, "add, delete, replace, increment");
+ Message message = ERR_LDIF_INVALID_MODIFY_ATTRIBUTE.get(name,
+ "add, delete, replace, increment");
throw new LDIFException(message, lineNumber, true);
}
// Now go through the rest of the attributes till the "-" line is
// reached.
Attribute modAttr = LDIFReader.parseAttrDescription(attrDescr);
+ AttributeBuilder builder = new AttributeBuilder(modAttr, true);
while (! lines.isEmpty())
{
line = lines.remove();
@@ -1469,12 +1474,11 @@
{
break;
}
- Attribute a =
- readSingleValueAttribute(lines, line, entryDN, attrDescr);
- modAttr.getValues().addAll(a.getValues());
+ Attribute a = readSingleValueAttribute(lines, line, entryDN, attrDescr);
+ builder.addAll(a);
}
- LDAPAttribute ldapAttr = new LDAPAttribute(modAttr);
+ LDAPAttribute ldapAttr = new LDAPAttribute(builder.toAttribute());
LDAPModification mod = new LDAPModification(modType, ldapAttr);
modifications.add(mod);
}
@@ -1535,15 +1539,13 @@
// Reconstruct the object class attribute.
AttributeType ocType = DirectoryServer.getObjectClassAttributeType();
- LinkedHashSet<AttributeValue> ocValues =
- new LinkedHashSet<AttributeValue>(objectClasses.size());
+ AttributeBuilder builder = new AttributeBuilder(ocType, "objectClass");
for (String value : objectClasses.values()) {
AttributeValue av = new AttributeValue(ocType, value);
- ocValues.add(av);
+ builder.add(av);
}
- Attribute ocAttr = new Attribute(ocType, "objectClass", ocValues);
List<Attribute> ocAttrList = new ArrayList<Attribute>(1);
- ocAttrList.add(ocAttr);
+ ocAttrList.add(builder.toAttribute());
attributes.put(ocType, ocAttrList);
return new AddChangeRecordEntry(entryDN, attributes);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java
index 33097ab..1bdcde3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java
@@ -296,7 +296,7 @@
AddChangeRecordEntry addRecord = (AddChangeRecordEntry) changeRecord;
for (Attribute a : addRecord.getAttributes())
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
StringBuilder line = new StringBuilder();
line.append(a.getNameWithOptions());
@@ -466,7 +466,7 @@
attrName.append(o);
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
StringBuilder attrLine = new StringBuilder();
attrLine.append(attrName);
@@ -545,7 +545,7 @@
attrName.append(o);
}
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
StringBuilder attrLine = new StringBuilder();
attrLine.append(attrName);
@@ -642,7 +642,7 @@
}
writeLDIFLine(modTypeLine, writer, wrapLines, wrapColumn);
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
StringBuilder valueLine = new StringBuilder();
valueLine.append(name);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java b/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java
index abb6e4b..b93944f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java
@@ -2181,8 +2181,11 @@
public static final String OID_VLV_RESPONSE_CONTROL =
"2.16.840.1.113730.3.4.10";
-
-
+ /**
+ * The OID for the CSN control.
+ */
+ public static final String OID_CSN_CONTROL =
+ "1.3.6.1.4.1.42.2.27.9.5.9";
/**
* The block length in bytes used when generating an HMAC-MD5 digest.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java b/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
index 83af11b..31fd13c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
@@ -30,13 +30,18 @@
import java.io.BufferedWriter;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.security.KeyStoreException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateEncodingException;
import java.util.LinkedList;
+import java.util.Random;
import org.opends.server.types.OperatingSystem;
@@ -409,5 +414,98 @@
}
return s;
}
+
+ /**
+ * Returns a randomly generated password for a self-signed certificate
+ * keystore.
+ * @return a randomly generated password for a self-signed certificate
+ * keystore.
+ */
+ public static char[] createSelfSignedCertificatePwd() {
+ int pwdLength = 50;
+ char[] pwd = new char[pwdLength];
+ Random random = new Random();
+ for (int pos=0; pos < pwdLength; pos++) {
+ int type = getRandomInt(random,3);
+ char nextChar = getRandomChar(random,type);
+ pwd[pos] = nextChar;
+ }
+ return pwd;
+ }
+
+
+ /**
+ * Export a certificate in a file.
+ *
+ * @param certManager Certificate manager to use.
+ * @param alias Certificate alias to export.
+ * @param path Path of the output file.
+ *
+ * @throws CertificateEncodingException If the certificate manager cannot
+ * encode the certificate.
+ * @throws IOException If a problem occurs while creating or writing in the
+ * output file.
+ * @throws KeyStoreException If the certificate manager cannot retrieve the
+ * certificate to be exported.
+ */
+ public static void exportCertificate(
+ CertificateManager certManager, String alias, String path)
+ throws CertificateEncodingException, IOException, KeyStoreException
+ {
+ Certificate certificate = certManager.getCertificate(alias);
+
+ byte[] certificateBytes = certificate.getEncoded();
+
+ FileOutputStream outputStream = new FileOutputStream(path, false);
+ outputStream.write(certificateBytes);
+ outputStream.close();
+ }
+
+ /* The next two methods are used to generate the random password for the
+ * self-signed certificate. */
+ private static char getRandomChar(Random random, int type)
+ {
+ char generatedChar;
+ int next = random.nextInt();
+ int d;
+
+ switch (type)
+ {
+ case 0:
+ // Will return a digit
+ d = next % 10;
+ if (d < 0)
+ {
+ d = d * (-1);
+ }
+ generatedChar = (char) (d+48);
+ break;
+ case 1:
+ // Will return a lower case letter
+ d = next % 26;
+ if (d < 0)
+ {
+ d = d * (-1);
+ }
+ generatedChar = (char) (d + 97);
+ break;
+ default:
+ // Will return a capital letter
+ d = (next % 26);
+ if (d < 0)
+ {
+ d = d * (-1);
+ }
+ generatedChar = (char) (d + 65) ;
+ }
+
+ return generatedChar;
+ }
+
+ private static int getRandomInt(Random random,int modulo)
+ {
+ return (random.nextInt() & modulo);
+ }
+
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java b/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java
index ea01ec5..0cbb9ac 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java
@@ -49,7 +49,6 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.RandomAccess;
@@ -66,6 +65,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DN;
@@ -3700,23 +3700,22 @@
// Create the attribute and add it to the appropriate map.
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(attrValue);
-
if (attrType.isOperational())
{
List<Attribute> attrList = operationalAttributes.get(attrType);
if ((attrList == null) || attrList.isEmpty())
{
+ AttributeBuilder builder = new AttributeBuilder(attrType, attrName);
+ builder.add(attrValue);
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(attrType, attrName, valueSet));
+ attrList.add(builder.toAttribute());
operationalAttributes.put(attrType, attrList);
}
else
{
- Attribute attr = attrList.get(0);
- attr.getValues().add(attrValue);
+ AttributeBuilder builder = new AttributeBuilder(attrList.get(0));
+ builder.add(attrValue);
+ attrList.set(0, builder.toAttribute());
}
}
else
@@ -3724,14 +3723,17 @@
List<Attribute> attrList = userAttributes.get(attrType);
if ((attrList == null) || attrList.isEmpty())
{
+ AttributeBuilder builder = new AttributeBuilder(attrType, attrName);
+ builder.add(attrValue);
attrList = new ArrayList<Attribute>(1);
- attrList.add(new Attribute(attrType, attrName, valueSet));
+ attrList.add(builder.toAttribute());
userAttributes.put(attrType, attrList);
}
else
{
- Attribute attr = attrList.get(0);
- attr.getValues().add(attrValue);
+ AttributeBuilder builder = new AttributeBuilder(attrList.get(0));
+ builder.add(attrValue);
+ attrList.set(0, builder.toAttribute());
}
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java
index e5789ac..7590cec 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java
@@ -44,6 +44,7 @@
import java.util.LinkedHashSet;
import java.util.concurrent.atomic.AtomicInteger;
import java.io.PrintStream;
+import javax.net.ssl.SSLException;
/**
* Creates an argument parser pre-populated with arguments for specifying
@@ -69,13 +70,16 @@
* added to the parser. May be null to
* indicate that arguments should be
* added to the default group
- */
+ * @param alwaysSSL If true, always use the SSL connection type. In this case,
+ * the arguments useSSL and startTLS are not present.
+ */
public LDAPConnectionArgumentParser(String mainClassName,
Message toolDescription,
boolean longArgumentsCaseSensitive,
- ArgumentGroup argumentGroup) {
+ ArgumentGroup argumentGroup,
+ boolean alwaysSSL) {
super(mainClassName, toolDescription, longArgumentsCaseSensitive);
- addLdapConnectionArguments(argumentGroup);
+ addLdapConnectionArguments(argumentGroup, alwaysSSL);
}
/**
@@ -112,7 +116,9 @@
* added to the parser. May be null to
* indicate that arguments should be
* added to the default group
- */
+ * @param alwaysSSL If true, always use the SSL connection type. In this case,
+ * the arguments useSSL and startTLS are not present.
+ */
public LDAPConnectionArgumentParser(String mainClassName,
Message toolDescription,
boolean longArgumentsCaseSensitive,
@@ -120,11 +126,12 @@
int minTrailingArguments,
int maxTrailingArguments,
String trailingArgsDisplayName,
- ArgumentGroup argumentGroup) {
+ ArgumentGroup argumentGroup,
+ boolean alwaysSSL) {
super(mainClassName, toolDescription, longArgumentsCaseSensitive,
allowsTrailingArguments, minTrailingArguments, maxTrailingArguments,
trailingArgsDisplayName);
- addLdapConnectionArguments(argumentGroup);
+ addLdapConnectionArguments(argumentGroup, alwaysSSL);
}
/**
@@ -359,7 +366,13 @@
ui.getBindPassword(),
ui.populateLDAPOptions(options), out, err);
} catch (OpenDsException e) {
- err.println(e.getMessageObject());
+ if ((e.getCause() != null) && (e.getCause().getCause() != null) &&
+ e.getCause().getCause() instanceof SSLException) {
+ err.println(ERR_TASKINFO_LDAP_EXCEPTION_SSL.get(ui.getHostName(),
+ String.valueOf(ui.getPortNumber())));
+ } else {
+ err.println(e.getMessageObject());
+ }
}
return connection;
}
@@ -426,8 +439,9 @@
return pwd;
}
- private void addLdapConnectionArguments(ArgumentGroup argGroup) {
- args = new SecureConnectionCliArgs();
+ private void addLdapConnectionArguments(ArgumentGroup argGroup,
+ boolean alwaysSSL) {
+ args = new SecureConnectionCliArgs(alwaysSSL);
try {
LinkedHashSet<Argument> argSet = args.createGlobalArguments();
for (Argument arg : argSet) {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/cli/CommandBuilder.java b/opendj-sdk/opends/src/server/org/opends/server/util/cli/CommandBuilder.java
index a75b3aa..650a22a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/cli/CommandBuilder.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/cli/CommandBuilder.java
@@ -159,6 +159,11 @@
}
for (Argument arg : args)
{
+ // This CLI is always using SSL, and the argument has been removed from
+ // the user interface
+ if (arg.getName().equals("useSSL") ) {
+ continue;
+ }
String argName;
if (arg.getLongIdentifier() != null)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java b/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
index ed40839..4295ce3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
@@ -50,6 +50,8 @@
import javax.naming.NoPermissionException;
import javax.naming.ldap.InitialLdapContext;
import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.TrustManager;
import org.opends.admin.ads.util.ApplicationTrustManager;
@@ -860,12 +862,25 @@
return null;
}
}
- else
- {
- Message message = ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(
+ }
+ if (e.getRootCause() != null) {
+ if (e.getRootCause().getCause() != null) {
+ if (((e.getRootCause().getCause()
+ instanceof OpendsCertificateException)) ||
+ (e.getRootCause() instanceof SSLHandshakeException)) {
+ Message message =
+ ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED.get(
hostName, String.valueOf(portNumber));
- throw new ClientException(
+ throw new ClientException(
LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
+ }
+ }
+ if (e.getRootCause() instanceof SSLException) {
+ Message message =
+ ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT.get(
+ hostName, String.valueOf(portNumber));
+ throw new ClientException(
+ LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
}
}
Message message = ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index d3ee4ad..ed2d41c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -47,7 +47,6 @@
import org.opends.admin.ads.util.ApplicationKeyManager;
import javax.net.ssl.KeyManager;
-import javax.net.ssl.TrustManager;
import java.net.InetAddress;
import java.net.URI;
import java.net.UnknownHostException;
@@ -61,6 +60,7 @@
import java.util.Enumeration;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.opends.server.admin.AdministrationConnector;
/**
* Supports interacting with a user through the command line to
@@ -281,7 +281,7 @@
this.app = app;
this.secureArgsList = secureArgs;
this.commandBuilder = new CommandBuilder(null);
- copySecureArgsList = new SecureConnectionCliArgs();
+ copySecureArgsList = new SecureConnectionCliArgs(secureArgs.alwaysSSL());
try
{
copySecureArgsList.createGlobalArguments();
@@ -507,7 +507,12 @@
}
else
{
- portNumber = 636;
+ if (secureArgsList.alwaysSSL()) {
+ portNumber =
+ AdministrationConnector.DEFAULT_ADMINISTRATION_CONNECTOR_PORT;
+ } else {
+ portNumber = 636;
+ }
}
}
final int tmpPortNumber = portNumber;
@@ -553,8 +558,13 @@
try
{
app.println();
- portNumber = app.readValidatedInput(INFO_LDAP_CONN_PROMPT_PORT_NUMBER
- .get(portNumber), callback);
+ Message askPortNumber = null;
+ if (secureArgsList.alwaysSSL()) {
+ askPortNumber = INFO_ADMIN_CONN_PROMPT_PORT_NUMBER.get(portNumber);
+ } else {
+ askPortNumber = INFO_LDAP_CONN_PROMPT_PORT_NUMBER.get(portNumber);
+ }
+ portNumber = app.readValidatedInput(askPortNumber, callback);
}
catch (CLIException e)
{
@@ -1358,7 +1368,7 @@
*
* @return trust manager for connections
*/
- public TrustManager getTrustManager() {
+ public ApplicationTrustManager getTrustManager() {
return this.trustManager;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/WorkflowElement.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/WorkflowElement.java
index 9911ff7..7b8a29b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/WorkflowElement.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/WorkflowElement.java
@@ -26,7 +26,6 @@
*/
package org.opends.server.workflowelement;
-import static org.opends.messages.ConfigMessages.*;
import java.util.List;
import org.opends.server.admin.std.server.WorkflowElementCfg;
@@ -37,13 +36,13 @@
/**
* This class defines the super class for all the workflow elements. A workflow
* element is a task in a workflow. A workflow element can wrap a physical
- * repository such as a local backend, a remote LDAP server or a local ldif
+ * repository such as a local backend, a remote LDAP server or a local LDIF
* file. A workflow element can also be used to route operations. This is the
* case for load balancing and distribution. And workflow element can be used
* in a virtual environment to transform data (DN and attribute renaming,
* attribute value renaming...).
*
- * @param <T> The type of configuration handled by this workflow elelemnt.
+ * @param <T> The type of configuration handled by this workflow element.
*/
public abstract class WorkflowElement
<T extends WorkflowElementCfg>
@@ -53,13 +52,14 @@
private boolean isPrivate = false;
+ // An information indicating the type of the current workflow element.
+ // This information is for debug and tooling purpose only.
+ private String workflowElementTypeInfo = "not defined";
+
+
// The workflow element identifier.
private String workflowElementID = null;
- // The parent of the workflow element (null if the workflow element is
- // the root of the processing tree).
- private WorkflowElement<?> parent = null;
-
/**
* Creates a new instance of the workflow element.
@@ -74,27 +74,36 @@
*
* @param workflowElementID the workflow element identifier as defined
* in the configuration.
+ * @param workflowElementTypeInfo an information to indicate the type of
+ * the current workflow element. For example
+ * "Backend" if the current workflow element
+ * is a local backend workflow element.
*/
- public void initialize(String workflowElementID)
+ public void initialize(
+ String workflowElementID,
+ String workflowElementTypeInfo)
{
this.workflowElementID = workflowElementID;
+ this.workflowElementTypeInfo = workflowElementTypeInfo;
}
/**
- * Set the parent of the current workflow element.
+ * Get the type of the workflow element. The type is a string information
+ * indicating which type is the current workflow element. This information
+ * is intended to be used by tools for trace and debug purpose.
*
- * @param parent the parent of the workflow element
+ * @return the type of the workflow element.
*/
- protected void setParent(WorkflowElement<?> parent)
+ public String getWorkflowElementTypeInfo()
{
- this.parent = parent;
+ return this.workflowElementTypeInfo;
}
/**
* Indicates whether the provided configuration is acceptable for
- * this workflow elelement.
+ * this workflow element.
*
* @param configuration The workflow element configuration for
* which to make the determination.
@@ -132,7 +141,7 @@
* @param operation the operation to execute
*
* @throws CanceledOperationException if this operation should be
- * cancelled
+ * canceled
*/
public abstract void execute(Operation operation)
throws CanceledOperationException;
@@ -167,7 +176,7 @@
/**
* Provides the workflow element identifier.
*
- * @return the worflow element identifier
+ * @return the workflow element identifier
*/
public String getWorkflowElementID()
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java
index 411a4e7..2d43211 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java
@@ -233,7 +233,8 @@
WorkflowElement workflowElement =
- DirectoryServer.getWorkflowElement(configuration.dn().toString());
+ DirectoryServer.getWorkflowElement(
+ configuration.getWorkflowElementId());
if (workflowElement != null)
{
DirectoryServer.deregisterWorkflowElement(workflowElement);
@@ -291,7 +292,8 @@
// Get the existing workflow element if it's already enabled.
WorkflowElement existingWorkflowElement =
- DirectoryServer.getWorkflowElement(configuration.dn().toString());
+ DirectoryServer.getWorkflowElement(
+ configuration.getWorkflowElementId());
// If the new configuration has the workflow element disabled,
// then disable it if it is enabled, or do nothing if it's already disabled.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
index f4b3069..985e55c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
@@ -28,10 +28,16 @@
+import static org.opends.messages.CoreMessages.*;
+import static org.opends.server.config.ConfigConstants.*;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -61,19 +67,19 @@
import org.opends.server.core.PasswordPolicy;
import org.opends.server.core.PluginConfigManager;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.schema.AuthPasswordSyntax;
-import org.opends.server.schema.BooleanSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteString;
import org.opends.server.types.CanceledOperationException;
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.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.LDAPException;
import org.opends.server.types.LockManager;
@@ -86,17 +92,10 @@
import org.opends.server.types.SynchronizationProviderResult;
import org.opends.server.types.operation.PostOperationAddOperation;
import org.opends.server.types.operation.PostResponseAddOperation;
-import org.opends.server.types.operation.PreOperationAddOperation;
import org.opends.server.types.operation.PostSynchronizationAddOperation;
+import org.opends.server.types.operation.PreOperationAddOperation;
import org.opends.server.util.TimeThread;
-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.config.ConfigConstants.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
@@ -887,13 +886,8 @@
if (isSynchronizationOperation() ||
DirectoryServer.addMissingRDNAttributes())
{
- LinkedHashSet<AttributeValue> valueList =
- new LinkedHashSet<AttributeValue>(1);
- valueList.add(v);
-
attrList = new ArrayList<Attribute>();
- attrList.add(new Attribute(t, n, valueList));
-
+ attrList.add(Attributes.create(t, n, v));
operationalAttributes.put(t, attrList);
}
else
@@ -906,33 +900,31 @@
else
{
boolean found = false;
- for (Attribute a : attrList)
- {
+ for (int j = 0; j < attrList.size(); j++) {
+ Attribute a = attrList.get(j);
+
if (a.hasOptions())
{
continue;
}
- else
- {
- if (! a.hasValue(v))
- {
- a.getValues().add(v);
- }
- found = true;
- break;
+ if (!a.contains(v))
+ {
+ AttributeBuilder builder = new AttributeBuilder(a);
+ builder.add(v);
+ attrList.set(j, builder.toAttribute());
}
+
+ found = true;
+ break;
}
- if (! found)
+ if (!found)
{
if (isSynchronizationOperation() ||
DirectoryServer.addMissingRDNAttributes())
{
- LinkedHashSet<AttributeValue> valueList =
- new LinkedHashSet<AttributeValue>(1);
- valueList.add(v);
- attrList.add(new Attribute(t, n, valueList));
+ attrList.add(Attributes.create(t, n, v));
}
else
{
@@ -951,13 +943,8 @@
if (isSynchronizationOperation() ||
DirectoryServer.addMissingRDNAttributes())
{
- LinkedHashSet<AttributeValue> valueList =
- new LinkedHashSet<AttributeValue>(1);
- valueList.add(v);
-
attrList = new ArrayList<Attribute>();
- attrList.add(new Attribute(t, n, valueList));
-
+ attrList.add(Attributes.create(t, n, v));
userAttributes.put(t, attrList);
}
else
@@ -970,33 +957,31 @@
else
{
boolean found = false;
- for (Attribute a : attrList)
- {
+ for (int j = 0; j < attrList.size(); j++) {
+ Attribute a = attrList.get(j);
+
if (a.hasOptions())
{
continue;
}
- else
- {
- if (! a.hasValue(v))
- {
- a.getValues().add(v);
- }
- found = true;
- break;
+ if (!a.contains(v))
+ {
+ AttributeBuilder builder = new AttributeBuilder(a);
+ builder.add(v);
+ attrList.set(j, builder.toAttribute());
}
+
+ found = true;
+ break;
}
- if (! found)
+ if (!found)
{
if (isSynchronizationOperation() ||
DirectoryServer.addMissingRDNAttributes())
{
- LinkedHashSet<AttributeValue> valueList =
- new LinkedHashSet<AttributeValue>(1);
- valueList.add(v);
- attrList.add(new Attribute(t, n, valueList));
+ attrList.add(Attributes.create(t, n, v));
}
else
{
@@ -1057,8 +1042,7 @@
if ((pwAttrList != null) && (! pwAttrList.isEmpty()))
{
Attribute a = pwAttrList.get(0);
- LinkedHashSet<AttributeValue> valueSet = a.getValues();
- Iterator<AttributeValue> iterator = valueSet.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
if (iterator.hasNext())
{
DN policyDN;
@@ -1120,28 +1104,29 @@
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
- LinkedHashSet<AttributeValue> values = passwordAttr.getValues();
- if (values.isEmpty())
+ if (passwordAttr.isEmpty())
{
// This will be treated the same as not having a password.
return;
}
- if ((! passwordPolicy.allowMultiplePasswordValues()) && (values.size() > 1))
+ if ((!passwordPolicy.allowMultiplePasswordValues())
+ && (passwordAttr.size() > 1))
{
- // FIXME -- What if they're pre-encoded and might all be the same?
+ // FIXME -- What if they're pre-encoded and might all be the
+ // same?
addPWPolicyControl(PasswordPolicyErrorType.PASSWORD_MOD_NOT_ALLOWED);
- Message message = ERR_PWPOLICY_MULTIPLE_PW_VALUES_NOT_ALLOWED.get(
- passwordAttribute.getNameOrOID());
+ Message message = ERR_PWPOLICY_MULTIPLE_PW_VALUES_NOT_ALLOWED
+ .get(passwordAttribute.getNameOrOID());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
- CopyOnWriteArrayList<PasswordStorageScheme> defaultStorageSchemes =
+ CopyOnWriteArrayList<PasswordStorageScheme<?>> defaultStorageSchemes =
passwordPolicy.getDefaultStorageSchemes();
- LinkedHashSet<AttributeValue> newValues =
- new LinkedHashSet<AttributeValue>(defaultStorageSchemes.size());
- for (AttributeValue v : values)
+ AttributeBuilder builder = new AttributeBuilder(passwordAttr, true);
+ builder.setInitialCapacity(defaultStorageSchemes.size());
+ for (AttributeValue v : passwordAttr)
{
ByteString value = v.getValue();
@@ -1152,7 +1137,7 @@
{
if (passwordPolicy.allowPreEncodedPasswords())
{
- newValues.add(v);
+ builder.add(v);
continue;
}
else
@@ -1173,7 +1158,7 @@
{
if (passwordPolicy.allowPreEncodedPasswords())
{
- newValues.add(v);
+ builder.add(v);
continue;
}
else
@@ -1222,7 +1207,7 @@
for (PasswordStorageScheme s : defaultStorageSchemes)
{
ByteString encodedValue = s.encodeAuthPassword(value);
- newValues.add(new AttributeValue(passwordAttribute, encodedValue));
+ builder.add(new AttributeValue(passwordAttribute, encodedValue));
}
}
else
@@ -1230,37 +1215,22 @@
for (PasswordStorageScheme s : defaultStorageSchemes)
{
ByteString encodedValue = s.encodePasswordWithScheme(value);
- newValues.add(new AttributeValue(passwordAttribute, encodedValue));
+ builder.add(new AttributeValue(passwordAttribute, encodedValue));
}
}
}
// Put the new encoded values in the entry.
- passwordAttr.setValues(newValues);
+ entry.replaceAttribute(builder.toAttribute());
// Set the password changed time attribute.
- ByteString timeString =
- new ASN1OctetString(TimeThread.getGeneralizedTime());
- AttributeType changedTimeType =
- DirectoryServer.getAttributeType(OP_ATTR_PWPOLICY_CHANGED_TIME_LC);
- if (changedTimeType == null)
- {
- changedTimeType = DirectoryServer.getDefaultAttributeType(
- OP_ATTR_PWPOLICY_CHANGED_TIME);
- }
-
- LinkedHashSet<AttributeValue> changedTimeValues =
- new LinkedHashSet<AttributeValue>(1);
- changedTimeValues.add(new AttributeValue(changedTimeType, timeString));
-
ArrayList<Attribute> changedTimeList = new ArrayList<Attribute>(1);
- changedTimeList.add(new Attribute(changedTimeType,
- OP_ATTR_PWPOLICY_CHANGED_TIME,
- changedTimeValues));
-
- entry.putAttribute(changedTimeType, changedTimeList);
+ Attribute changedTime = Attributes.create(
+ OP_ATTR_PWPOLICY_CHANGED_TIME, TimeThread.getGeneralizedTime());
+ changedTimeList.add(changedTime);
+ entry.putAttribute(changedTime.getAttributeType(), changedTimeList);
// If we should force change on add, then set the appropriate flag.
@@ -1268,22 +1238,11 @@
{
addPWPolicyControl(PasswordPolicyErrorType.CHANGE_AFTER_RESET);
- AttributeType resetType =
- DirectoryServer.getAttributeType(OP_ATTR_PWPOLICY_RESET_REQUIRED_LC);
- if (resetType == null)
- {
- resetType = DirectoryServer.getDefaultAttributeType(
- OP_ATTR_PWPOLICY_RESET_REQUIRED);
- }
-
- LinkedHashSet<AttributeValue> resetValues = new
- LinkedHashSet<AttributeValue>(1);
- resetValues.add(BooleanSyntax.createBooleanValue(true));
-
ArrayList<Attribute> resetList = new ArrayList<Attribute>(1);
- resetList.add(new Attribute(resetType, OP_ATTR_PWPOLICY_RESET_REQUIRED,
- resetValues));
- entry.putAttribute(resetType, resetList);
+ Attribute reset = Attributes.create(
+ OP_ATTR_PWPOLICY_RESET_REQUIRED, "TRUE");
+ resetList.add(reset);
+ entry.putAttribute(reset.getAttributeType(), resetList);
}
}
@@ -1336,10 +1295,10 @@
{
for (Attribute a : attrList)
{
- AttributeSyntax syntax = a.getAttributeType().getSyntax();
+ AttributeSyntax<?> syntax = a.getAttributeType().getSyntax();
if (syntax != null)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (! syntax.valueIsAcceptable(v.getValue(), invalidReason))
{
@@ -1363,10 +1322,10 @@
{
for (Attribute a : attrList)
{
- AttributeSyntax syntax = a.getAttributeType().getSyntax();
+ AttributeSyntax<?> syntax = a.getAttributeType().getSyntax();
if (syntax != null)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (! syntax.valueIsAcceptable(v.getValue(),
invalidReason))
@@ -1395,10 +1354,10 @@
{
for (Attribute a : attrList)
{
- AttributeSyntax syntax = a.getAttributeType().getSyntax();
+ AttributeSyntax<?> syntax = a.getAttributeType().getSyntax();
if (syntax != null)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (! syntax.valueIsAcceptable(v.getValue(),
invalidReason))
@@ -1418,10 +1377,10 @@
{
for (Attribute a : attrList)
{
- AttributeSyntax syntax = a.getAttributeType().getSyntax();
+ AttributeSyntax<?> syntax = a.getAttributeType().getSyntax();
if (syntax != null)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (! syntax.valueIsAcceptable(v.getValue(),
invalidReason))
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
index 0e15a35..191b614 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
@@ -29,7 +29,6 @@
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.concurrent.locks.Lock;
@@ -127,10 +126,6 @@
// The bind DN provided by the client.
private DN bindDN;
- // The entry of the user that successfully authenticated during processing for
- // this bind operation.
- private Entry authenticatedUserEntry;
-
// The lookthrough limit that should be enforced for the user.
private int lookthroughLimit;
@@ -208,7 +203,6 @@
mustChangePassword = false;
pwPolicyWarningType = null;
pwPolicyWarningValue = -1 ;
- authenticatedUserEntry = null;
pluginConfigManager = DirectoryServer.getPluginConfigManager();
@@ -358,7 +352,6 @@
AuthenticationInfo authInfo = getAuthenticationInfo();
if ((getResultCode() == ResultCode.SUCCESS) && (authInfo != null))
{
- authenticatedUserEntry = authInfo.getAuthenticationEntry();
clientConnection.setAuthenticationInfo(authInfo);
clientConnection.setSizeLimit(sizeLimit);
clientConnection.setTimeLimit(timeLimit);
@@ -738,7 +731,7 @@
{
// Get the appropriate authentication handler for this request based
// on the SASL mechanism. If there is none, then fail.
- SASLMechanismHandler saslHandler =
+ SASLMechanismHandler<?> saslHandler =
DirectoryServer.getSASLMechanismHandler(saslMechanism);
if (saslHandler == null)
{
@@ -910,7 +903,7 @@
* to fail.
*/
private void checkPasswordPolicyState(Entry userEntry,
- SASLMechanismHandler saslHandler)
+ SASLMechanismHandler<?> saslHandler)
throws DirectoryException
{
boolean isSASLBind = (saslHandler != null);
@@ -1130,8 +1123,7 @@
if ((attrList != null) && (attrList.size() == 1))
{
Attribute a = attrList.get(0);
- LinkedHashSet<AttributeValue> values = a.getValues();
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
if (iterator.hasNext())
{
AttributeValue v = iterator.next();
@@ -1168,8 +1160,7 @@
if ((attrList != null) && (attrList.size() == 1))
{
Attribute a = attrList.get(0);
- LinkedHashSet<AttributeValue> values = a.getValues();
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
if (iterator.hasNext())
{
AttributeValue v = iterator.next();
@@ -1207,8 +1198,7 @@
if ((attrList != null) && (attrList.size() == 1))
{
Attribute a = attrList.get(0);
- LinkedHashSet<AttributeValue> values = a.getValues();
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
if (iterator.hasNext())
{
AttributeValue v = iterator.next();
@@ -1246,8 +1236,7 @@
if ((attrList != null) && (attrList.size() == 1))
{
Attribute a = attrList.get(0);
- LinkedHashSet<AttributeValue> values = a.getValues();
- Iterator<AttributeValue> iterator = values.iterator();
+ Iterator<AttributeValue> iterator = a.iterator();
if (iterator.hasNext())
{
AttributeValue v = iterator.next();
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
index 057bac0..950e7f6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
@@ -354,7 +354,7 @@
boolean matchFound = false;
for (Attribute a : attrList)
{
- if (a.hasValue(value))
+ if (a.contains(value))
{
matchFound = true;
break;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
index b76a2d9..3e8571a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
@@ -241,38 +241,8 @@
break deleteProcessing;
}
-
- // Invoke any conflict resolution processing that might be needed by the
- // synchronization provider.
- for (SynchronizationProvider provider :
- DirectoryServer.getSynchronizationProviders())
- {
- try
- {
- SynchronizationProviderResult result =
- provider.handleConflictResolution(this);
- if (! result.continueProcessing())
- {
- setResultCode(result.getResultCode());
- appendErrorMessage(result.getErrorMessage());
- setMatchedDN(result.getMatchedDN());
- setReferralURLs(result.getReferralURLs());
- break deleteProcessing;
- }
- }
- catch (DirectoryException de)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
-
- logError(ERR_DELETE_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
- getConnectionID(), getOperationID(),
- getExceptionMessage(de)));
- setResponseData(de);
+ if(!handleConflictResolution()) {
break deleteProcessing;
- }
}
// Check to see if the client has permission to perform the
@@ -418,37 +388,10 @@
}
else
{
- for (SynchronizationProvider provider :
- DirectoryServer.getSynchronizationProviders())
- {
- try
- {
- SynchronizationProviderResult result =
- provider.doPreOperation(this);
- if (! result.continueProcessing())
- {
- setResultCode(result.getResultCode());
- appendErrorMessage(result.getErrorMessage());
- setMatchedDN(result.getMatchedDN());
- setReferralURLs(result.getReferralURLs());
+ if(!processPreOperation()) {
break deleteProcessing;
- }
}
- catch (DirectoryException de)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
-
- logError(ERR_DELETE_SYNCH_PREOP_FAILED.get(getConnectionID(),
- getOperationID(), getExceptionMessage(de)));
- setResponseData(de);
- break deleteProcessing;
- }
- }
-
- backend.deleteEntry(entryDN, this);
+ backend.deleteEntry(entryDN, this);
}
@@ -473,27 +416,7 @@
}
finally
{
- for (SynchronizationProvider provider :
- DirectoryServer.getSynchronizationProviders())
- {
- try
- {
- provider.doPostOperation(this);
- }
- catch (DirectoryException de)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
-
- logError(ERR_DELETE_SYNCH_POSTOP_FAILED.get(getConnectionID(),
- getOperationID(), getExceptionMessage(de)));
- setResponseData(de);
- break;
- }
- }
-
+ processPostOperation();
LockManager.unlock(entryDN, entryLock);
}
}
@@ -828,5 +751,86 @@
addResponseControl(responseControl);
}
}
+
+ private boolean handleConflictResolution() {
+ boolean returnVal = true;
+
+ for (SynchronizationProvider<?> provider :
+ DirectoryServer.getSynchronizationProviders()) {
+ try {
+ SynchronizationProviderResult result =
+ provider.handleConflictResolution(this);
+ if (! result.continueProcessing()) {
+ setResultCode(result.getResultCode());
+ appendErrorMessage(result.getErrorMessage());
+ setMatchedDN(result.getMatchedDN());
+ setReferralURLs(result.getReferralURLs());
+ returnVal = false;
+ break;
+ }
+ } catch (DirectoryException de) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ }
+ logError(ERR_DELETE_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
+ getConnectionID(), getOperationID(),
+ getExceptionMessage(de)));
+ setResponseData(de);
+ returnVal = false;
+ break;
+ }
+ }
+ return returnVal;
+ }
+
+ private void processPostOperation() {
+
+ for (SynchronizationProvider<?> provider :
+ DirectoryServer.getSynchronizationProviders()) {
+ try {
+ provider.doPostOperation(this);
+ } catch (DirectoryException de) {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ }
+ logError(ERR_DELETE_SYNCH_POSTOP_FAILED.get(getConnectionID(),
+ getOperationID(), getExceptionMessage(de)));
+ setResponseData(de);
+ break;
+ }
+ }
+ }
+
+ private boolean processPreOperation() {
+ boolean returnVal = true;
+
+ for (SynchronizationProvider<?> provider :
+ DirectoryServer.getSynchronizationProviders()) {
+ try {
+ SynchronizationProviderResult result =
+ provider.doPreOperation(this);
+ if (! result.continueProcessing()) {
+ setResultCode(result.getResultCode());
+ appendErrorMessage(result.getErrorMessage());
+ setMatchedDN(result.getMatchedDN());
+ setReferralURLs(result.getReferralURLs());
+ returnVal = false;
+ break;
+ }
+ } catch (DirectoryException de) {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ }
+ logError(ERR_DELETE_SYNCH_PREOP_FAILED.get(getConnectionID(),
+ getOperationID(), getExceptionMessage(de)));
+ setResponseData(de);
+ returnVal = false;
+ break;
+ }
+ }
+ return returnVal;
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
index cf66541..d23006f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
@@ -28,9 +28,7 @@
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.locks.Lock;
@@ -55,11 +53,10 @@
import org.opends.server.core.ModifyDNOperationWrapper;
import org.opends.server.core.PluginConfigManager;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
+import org.opends.server.types.Attributes;
import org.opends.server.types.CanceledOperationException;
import org.opends.server.types.Control;
import org.opends.server.types.DebugLogLevel;
@@ -404,39 +401,8 @@
break modifyDNProcessing;
}
-
- // Invoke any conflict resolution processing that might be needed by the
- // synchronization provider.
- for (SynchronizationProvider provider :
- DirectoryServer.getSynchronizationProviders())
- {
- try
- {
- SynchronizationProviderResult result =
- provider.handleConflictResolution(this);
- if (! result.continueProcessing())
- {
- setResultCode(result.getResultCode());
- appendErrorMessage(result.getErrorMessage());
- setMatchedDN(result.getMatchedDN());
- setReferralURLs(result.getReferralURLs());
- break modifyDNProcessing;
- }
- }
- catch (DirectoryException de)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
-
- logError(ERR_MODDN_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
- getConnectionID(), getOperationID(),
- getExceptionMessage(de)));
-
- setResponseData(de);
+ if(!handleConflictResolution()) {
break modifyDNProcessing;
- }
}
@@ -608,37 +574,10 @@
}
else
{
- for (SynchronizationProvider provider :
- DirectoryServer.getSynchronizationProviders())
- {
- try
- {
- SynchronizationProviderResult result =
- provider.doPreOperation(this);
- if (! result.continueProcessing())
- {
- setResultCode(result.getResultCode());
- appendErrorMessage(result.getErrorMessage());
- setMatchedDN(result.getMatchedDN());
- setReferralURLs(result.getReferralURLs());
+ if(!processPreOperation()) {
break modifyDNProcessing;
- }
}
- catch (DirectoryException de)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
-
- logError(ERR_MODDN_SYNCH_PREOP_FAILED.get(getConnectionID(),
- getOperationID(), getExceptionMessage(de)));
- setResponseData(de);
- break modifyDNProcessing;
- }
- }
-
- currentBackend.renameEntry(entryDN, newEntry, this);
+ currentBackend.renameEntry(entryDN, newEntry, this);
}
@@ -665,28 +604,7 @@
}
finally
{
-
- for (SynchronizationProvider provider :
- DirectoryServer.getSynchronizationProviders())
- {
- try
- {
- provider.doPostOperation(this);
- }
- catch (DirectoryException de)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
-
- logError(ERR_MODDN_SYNCH_POSTOP_FAILED.get(getConnectionID(),
- getOperationID(), getExceptionMessage(de)));
- setResponseData(de);
- break;
- }
- }
-
+ processPostOperation();
LockManager.unlock(entryDN, currentLock);
LockManager.unlock(newDN, newLock);
}
@@ -1012,12 +930,10 @@
int numValues = currentRDN.getNumValues();
for (int i=0; i < numValues; i++)
{
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(currentRDN.getAttributeValue(i));
-
- Attribute a = new Attribute(currentRDN.getAttributeType(i),
- currentRDN.getAttributeName(i), valueSet);
+ Attribute a = Attributes.create(
+ currentRDN.getAttributeType(i),
+ currentRDN.getAttributeName(i),
+ currentRDN.getAttributeValue(i));
// If the associated attribute type is marked NO-USER-MODIFICATION, then
// refuse the update.
@@ -1047,12 +963,10 @@
int newRDNValues = newRDN.getNumValues();
for (int i=0; i < newRDNValues; i++)
{
- LinkedHashSet<AttributeValue> valueSet =
- new LinkedHashSet<AttributeValue>(1);
- valueSet.add(newRDN.getAttributeValue(i));
-
- Attribute a = new Attribute(newRDN.getAttributeType(i),
- newRDN.getAttributeName(i), valueSet);
+ Attribute a = Attributes.create(
+ newRDN.getAttributeType(i),
+ newRDN.getAttributeName(i),
+ newRDN.getAttributeValue(i));
LinkedList<AttributeValue> duplicateValues =
new LinkedList<AttributeValue>();
@@ -1145,108 +1059,11 @@
break;
case REPLACE:
- duplicateValues = new LinkedList<AttributeValue>();
- newEntry.removeAttribute(a.getAttributeType(), a.getOptions());
- newEntry.addAttribute(a, duplicateValues);
+ newEntry.replaceAttribute(a);
break;
case INCREMENT:
- List<Attribute> attrList =
- newEntry.getAttribute(a.getAttributeType(),
- a.getOptions());
- if ((attrList == null) || attrList.isEmpty())
- {
- throw new DirectoryException(ResultCode.NO_SUCH_ATTRIBUTE,
- ERR_MODDN_PREOP_INCREMENT_NO_ATTR.get(
- String.valueOf(entryDN),
- a.getName()));
- }
- else if (attrList.size() > 1)
- {
- throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- ERR_MODDN_PREOP_INCREMENT_MULTIPLE_VALUES.get(
- String.valueOf(entryDN), a.getName()));
- }
-
- LinkedHashSet<AttributeValue> values =
- attrList.get(0).getValues();
- if ((values == null) || values.isEmpty())
- {
- throw new DirectoryException(ResultCode.NO_SUCH_ATTRIBUTE,
- ERR_MODDN_PREOP_INCREMENT_NO_ATTR.get(
- String.valueOf(entryDN),
- a.getName()));
- }
- else if (values.size() > 1)
- {
- throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- ERR_MODDN_PREOP_INCREMENT_MULTIPLE_VALUES.get(
- String.valueOf(entryDN), a.getName()));
- }
-
- long currentLongValue;
- try
- {
- AttributeValue v = values.iterator().next();
- currentLongValue = Long.parseLong(v.getStringValue());
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- ERR_MODDN_PREOP_INCREMENT_VALUE_NOT_INTEGER.get(
- String.valueOf(entryDN), a.getName()));
- }
-
- LinkedHashSet<AttributeValue> newValues = a.getValues();
- if ((newValues == null) || newValues.isEmpty())
- {
- throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- ERR_MODDN_PREOP_INCREMENT_NO_AMOUNT.get(
- String.valueOf(entryDN), a.getName()));
- }
- else if (newValues.size() > 1)
- {
- throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- ERR_MODDN_PREOP_INCREMENT_MULTIPLE_AMOUNTS.get(
- String.valueOf(entryDN), a.getName()));
- }
-
- long incrementAmount;
- try
- {
- AttributeValue v = values.iterator().next();
- incrementAmount = Long.parseLong(v.getStringValue());
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- ERR_MODDN_PREOP_INCREMENT_AMOUNT_NOT_INTEGER.get(
- String.valueOf(entryDN), a.getName()));
- }
-
- long newLongValue = currentLongValue + incrementAmount;
- ByteString newValueOS =
- new ASN1OctetString(String.valueOf(newLongValue));
-
- newValues = new LinkedHashSet<AttributeValue>(1);
- newValues.add(new AttributeValue(a.getAttributeType(),
- newValueOS));
-
- List<Attribute> newAttrList = new ArrayList<Attribute>(1);
- newAttrList.add(new Attribute(a.getAttributeType(),
- a.getName(), newValues));
- newEntry.putAttribute(a.getAttributeType(), newAttrList);
-
+ newEntry.incrementAttribute(a);
break;
}
}
@@ -1378,5 +1195,84 @@
addResponseControl(responseControl);
}
}
+
+ private boolean handleConflictResolution() {
+ boolean returnVal = true;
+
+ for (SynchronizationProvider<?> provider :
+ DirectoryServer.getSynchronizationProviders()) {
+ try {
+ SynchronizationProviderResult result =
+ provider.handleConflictResolution(this);
+ if (!result.continueProcessing()) {
+ setResultCode(result.getResultCode());
+ appendErrorMessage(result.getErrorMessage());
+ setMatchedDN(result.getMatchedDN());
+ setReferralURLs(result.getReferralURLs());
+ returnVal = false;
+ break;
+ }
+ } catch (DirectoryException de) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ }
+ logError(ERR_MODDN_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
+ getConnectionID(), getOperationID(),
+ getExceptionMessage(de)));
+
+ setResponseData(de);
+ returnVal = false;
+ break;
+ }
+ }
+ return returnVal;
+ }
+
+ private boolean processPreOperation() {
+ boolean returnVal = true;
+
+ for (SynchronizationProvider<?> provider :
+ DirectoryServer.getSynchronizationProviders()) {
+ try {
+ SynchronizationProviderResult result =
+ provider.doPreOperation(this);
+ if (! result.continueProcessing()) {
+ setResultCode(result.getResultCode());
+ appendErrorMessage(result.getErrorMessage());
+ setMatchedDN(result.getMatchedDN());
+ setReferralURLs(result.getReferralURLs());
+ returnVal = false;
+ break;
+ }
+ } catch (DirectoryException de) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ }
+ logError(ERR_MODDN_SYNCH_PREOP_FAILED.get(getConnectionID(),
+ getOperationID(), getExceptionMessage(de)));
+ setResponseData(de);
+ returnVal = false;
+ break;
+ }
+ }
+ return returnVal;
+ }
+
+ private void processPostOperation() {
+ for (SynchronizationProvider<?> provider : DirectoryServer
+ .getSynchronizationProviders()) {
+ try {
+ provider.doPostOperation(this);
+ } catch (DirectoryException de) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ }
+ logError(ERR_MODDN_SYNCH_POSTOP_FAILED.get(getConnectionID(),
+ getOperationID(), getExceptionMessage(de)));
+ setResponseData(de);
+ break;
+ }
+ }
+ }
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
index 59a1fc0..0f903f0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
@@ -28,11 +28,16 @@
-import java.util.ArrayList;
+import static org.opends.messages.CoreMessages.*;
+import static org.opends.server.config.ConfigConstants.*;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.locks.Lock;
@@ -66,24 +71,26 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.BooleanSyntax;
import org.opends.server.schema.UserPasswordSyntax;
+import org.opends.server.types.AcceptRejectWarn;
import org.opends.server.types.AccountStatusNotification;
import org.opends.server.types.AccountStatusNotificationType;
-import org.opends.server.types.AcceptRejectWarn;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AuthenticationInfo;
import org.opends.server.types.ByteString;
import org.opends.server.types.CanceledOperationException;
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.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.LDAPException;
import org.opends.server.types.LockManager;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
+import org.opends.server.types.ObjectClass;
import org.opends.server.types.Privilege;
import org.opends.server.types.RDN;
import org.opends.server.types.ResultCode;
@@ -92,16 +99,10 @@
import org.opends.server.types.SynchronizationProviderResult;
import org.opends.server.types.operation.PostOperationModifyOperation;
import org.opends.server.types.operation.PostResponseModifyOperation;
-import org.opends.server.types.operation.PreOperationModifyOperation;
import org.opends.server.types.operation.PostSynchronizationModifyOperation;
+import org.opends.server.types.operation.PreOperationModifyOperation;
import org.opends.server.util.TimeThread;
-
-import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
+import org.opends.server.util.Validator;
@@ -463,38 +464,9 @@
if (! noOp)
{
- // Invoke any conflict resolution processing that might be needed by
- // the synchronization provider.
- for (SynchronizationProvider provider :
- DirectoryServer.getSynchronizationProviders())
- {
- try
- {
- SynchronizationProviderResult result =
- provider.handleConflictResolution(this);
- if (! result.continueProcessing())
- {
- setResultCode(result.getResultCode());
- appendErrorMessage(result.getErrorMessage());
- setMatchedDN(result.getMatchedDN());
- setReferralURLs(result.getReferralURLs());
+ if(!handleConflictResolution()) {
break modifyProcessing;
- }
}
- catch (DirectoryException de)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
-
- logError(ERR_MODIFY_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
- getConnectionID(), getOperationID(),
- getExceptionMessage(de)));
- setResponseData(de);
- break modifyProcessing;
- }
- }
}
@@ -641,37 +613,11 @@
}
else
{
- for (SynchronizationProvider provider :
- DirectoryServer.getSynchronizationProviders())
- {
- try
- {
- SynchronizationProviderResult result =
- provider.doPreOperation(this);
- if (! result.continueProcessing())
- {
- setResultCode(result.getResultCode());
- appendErrorMessage(result.getErrorMessage());
- setMatchedDN(result.getMatchedDN());
- setReferralURLs(result.getReferralURLs());
+ if(!processPreOperation()) {
break modifyProcessing;
- }
}
- catch (DirectoryException de)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
- logError(ERR_MODIFY_SYNCH_PREOP_FAILED.get(getConnectionID(),
- getOperationID(), getExceptionMessage(de)));
- setResponseData(de);
- break modifyProcessing;
- }
- }
-
- backend.replaceEntry(modifiedEntry, this);
+ backend.replaceEntry(currentEntry, modifiedEntry, this);
@@ -707,27 +653,7 @@
}
finally
{
- for (SynchronizationProvider provider :
- DirectoryServer.getSynchronizationProviders())
- {
- try
- {
- provider.doPostOperation(this);
- }
- catch (DirectoryException de)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
-
- logError(ERR_MODIFY_SYNCH_POSTOP_FAILED.get(getConnectionID(),
- getOperationID(), getExceptionMessage(de)));
- setResponseData(de);
- break;
- }
- }
-
+ processPostOperation();
LockManager.unlock(entryDN, entryLock);
}
}
@@ -1060,7 +986,7 @@
// is related to synchronization in some way.
if (t.isObsolete())
{
- if (a.hasValue() &&
+ if (!a.isEmpty() &&
(m.getModificationType() != ModificationType.DELETE))
{
if (! (isInternalOperation() || isSynchronizationOperation() ||
@@ -1100,7 +1026,7 @@
if (t.equals(disabledAttr))
{
enabledStateChanged = true;
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
try
{
@@ -1259,27 +1185,26 @@
// password values (increment doesn't make any sense for passwords).
// Then perform the appropriate type of processing for that kind of
// modification.
- boolean isAdd = (m.getModificationType() == ModificationType.ADD);
- LinkedHashSet<AttributeValue> pwValues = a.getValues();
- LinkedHashSet<AttributeValue> encodedValues =
- new LinkedHashSet<AttributeValue>();
switch (m.getModificationType())
{
case ADD:
case REPLACE:
- processInitialAddOrReplacePW(isAdd, pwValues, encodedValues, a);
+ processInitialAddOrReplacePW(m);
break;
case DELETE:
- processInitialDeletePW(pwValues, encodedValues, a);
+ processInitialDeletePW(m);
break;
default:
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- ERR_MODIFY_INVALID_MOD_TYPE_FOR_PASSWORD.get(
- String.valueOf(m.getModificationType()),
- a.getName()));
+ ERR_MODIFY_INVALID_MOD_TYPE_FOR_PASSWORD.get(String.valueOf(m
+ .getModificationType()), a.getName()));
}
+
+ // Password processing may have changed the attribute in
+ // this modification.
+ a = m.getAttribute();
}
switch (m.getModificationType())
@@ -1309,24 +1234,19 @@
/**
* Performs the initial password policy add or replace processing.
*
- * @param isAdd Indicates whether it is an add or replace update.
- * @param pwValues The set of password values as included in the
- * request.
- * @param encodedValues The set of encoded password values.
- * @param pwAttr The attribute involved in the password change.
- *
- * @throws DirectoryException If a problem occurs that should cause the
- * modify operation to fail.
+ * @param m
+ * The modification involved in the password change.
+ * @throws DirectoryException
+ * If a problem occurs that should cause the modify
+ * operation to fail.
*/
- private void processInitialAddOrReplacePW(boolean isAdd,
- LinkedHashSet<AttributeValue> pwValues,
- LinkedHashSet<AttributeValue> encodedValues,
- Attribute pwAttr)
- throws DirectoryException
+ private void processInitialAddOrReplacePW(Modification m)
+ throws DirectoryException
{
- int passwordsToAdd = pwValues.size();
+ Attribute pwAttr = m.getAttribute();
+ int passwordsToAdd = pwAttr.size();
- if (isAdd)
+ if (m.getModificationType() == ModificationType.ADD)
{
numPasswords += passwordsToAdd;
}
@@ -1335,48 +1255,48 @@
numPasswords = passwordsToAdd;
}
-
- // If there were multiple password values, then make sure that's OK.
- if ((! isInternalOperation()) &&
- (! pwPolicyState.getPolicy().allowMultiplePasswordValues()) &&
- (passwordsToAdd > 1))
+ // If there were multiple password values, then make sure that's
+ // OK.
+ if ((!isInternalOperation())
+ && (!pwPolicyState.getPolicy().allowMultiplePasswordValues())
+ && (passwordsToAdd > 1))
{
pwpErrorType = PasswordPolicyErrorType.PASSWORD_MOD_NOT_ALLOWED;
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- ERR_MODIFY_MULTIPLE_VALUES_NOT_ALLOWED.get());
+ ERR_MODIFY_MULTIPLE_VALUES_NOT_ALLOWED.get());
}
-
// Iterate through the password values and see if any of them are
- // pre-encoded. If so, then check to see if we'll allow it. Otherwise,
- // store the clear-text values for later validation and update the attribute
- // with the encoded values.
- for (AttributeValue v : pwValues)
+ // pre-encoded. If so, then check to see if we'll allow it.
+ // Otherwise, store the clear-text values for later validation and
+ // update the attribute with the encoded values.
+ AttributeBuilder builder = new AttributeBuilder(pwAttr, true);
+ for (AttributeValue v : pwAttr)
{
if (pwPolicyState.passwordIsPreEncoded(v.getValue()))
{
- if ((! isInternalOperation()) &&
- ! pwPolicyState.getPolicy().allowPreEncodedPasswords())
+ if ((!isInternalOperation())
+ && !pwPolicyState.getPolicy().allowPreEncodedPasswords())
{
pwpErrorType = PasswordPolicyErrorType.INSUFFICIENT_PASSWORD_QUALITY;
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- ERR_MODIFY_NO_PREENCODED_PASSWORDS.get());
+ ERR_MODIFY_NO_PREENCODED_PASSWORDS.get());
}
else
{
- encodedValues.add(v);
+ builder.add(v);
}
}
else
{
- if (isAdd)
+ if (m.getModificationType() == ModificationType.ADD)
{
// Make sure that the password value doesn't already exist.
if (pwPolicyState.passwordMatches(v.getValue()))
{
pwpErrorType = PasswordPolicyErrorType.PASSWORD_IN_HISTORY;
throw new DirectoryException(ResultCode.ATTRIBUTE_OR_VALUE_EXISTS,
- ERR_MODIFY_PASSWORD_EXISTS.get());
+ ERR_MODIFY_PASSWORD_EXISTS.get());
}
}
@@ -1389,12 +1309,12 @@
for (ByteString s : pwPolicyState.encodePassword(v.getValue()))
{
- encodedValues.add(new AttributeValue(pwAttr.getAttributeType(), s));
+ builder.add(new AttributeValue(pwAttr.getAttributeType(), s));
}
}
}
- pwAttr.setValues(encodedValues);
+ m.setAttribute(builder.toAttribute());
}
@@ -1402,69 +1322,65 @@
/**
* Performs the initial password policy delete processing.
*
- * @param pwValues The set of password values as included in the
- * request.
- * @param encodedValues The set of encoded password values.
- * @param pwAttr The attribute involved in the password change.
- *
- * @throws DirectoryException If a problem occurs that should cause the
- * modify operation to fail.
+ * @param m
+ * The modification involved in the password change.
+ * @throws DirectoryException
+ * If a problem occurs that should cause the modify
+ * operation to fail.
*/
- private void processInitialDeletePW(LinkedHashSet<AttributeValue> pwValues,
- LinkedHashSet<AttributeValue> encodedValues,
- Attribute pwAttr)
- throws DirectoryException
+ private void processInitialDeletePW(Modification m) throws DirectoryException
{
// Iterate through the password values and see if any of them are
- // pre-encoded. We will never allow pre-encoded passwords for user password
- // changes, but we will allow them for administrators. For each clear-text
- // value, verify that at least one value in the entry matches and replace
- // the clear-text value with the appropriate encoded forms.
- for (AttributeValue v : pwValues)
+ // pre-encoded. We will never allow pre-encoded passwords for user
+ // password changes, but we will allow them for administrators.
+ // For each clear-text value, verify that at least one value in the
+ // entry matches and replace the clear-text value with the appropriate
+ // encoded forms.
+ Attribute pwAttr = m.getAttribute();
+ AttributeBuilder builder = new AttributeBuilder(pwAttr, true);
+ for (AttributeValue v : pwAttr)
{
if (pwPolicyState.passwordIsPreEncoded(v.getValue()))
{
- if ((! isInternalOperation()) && selfChange)
+ if ((!isInternalOperation()) && selfChange)
{
pwpErrorType = PasswordPolicyErrorType.INSUFFICIENT_PASSWORD_QUALITY;
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- ERR_MODIFY_NO_PREENCODED_PASSWORDS.get());
+ ERR_MODIFY_NO_PREENCODED_PASSWORDS.get());
}
else
{
- encodedValues.add(v);
+ builder.add(v);
}
}
else
{
- List<Attribute> attrList =
- currentEntry.getAttribute(pwAttr.getAttributeType());
+ List<Attribute> attrList = currentEntry.getAttribute(pwAttr
+ .getAttributeType());
if ((attrList == null) || (attrList.isEmpty()))
{
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- ERR_MODIFY_NO_EXISTING_VALUES.get());
+ ERR_MODIFY_NO_EXISTING_VALUES.get());
}
boolean found = false;
for (Attribute attr : attrList)
{
- for (AttributeValue av : attr.getValues())
+ for (AttributeValue av : attr)
{
if (pwPolicyState.getPolicy().usesAuthPasswordSyntax())
{
if (AuthPasswordSyntax.isEncoded(av.getValue()))
{
- StringBuilder[] compoenents =
- AuthPasswordSyntax.decodeAuthPassword(av.getStringValue());
- PasswordStorageScheme scheme =
- DirectoryServer.getAuthPasswordStorageScheme(
- compoenents[0].toString());
+ StringBuilder[] components = AuthPasswordSyntax
+ .decodeAuthPassword(av.getStringValue());
+ PasswordStorageScheme<?> scheme = DirectoryServer
+ .getAuthPasswordStorageScheme(components[0].toString());
if (scheme != null)
{
- if (scheme.authPasswordMatches(v.getValue(),
- compoenents[1].toString(),
- compoenents[2].toString()))
+ if (scheme.authPasswordMatches(v.getValue(), components[1]
+ .toString(), components[2].toString()))
{
- encodedValues.add(av);
+ builder.add(av);
found = true;
}
}
@@ -1473,7 +1389,7 @@
{
if (av.equals(v))
{
- encodedValues.add(v);
+ builder.add(v);
found = true;
}
}
@@ -1482,17 +1398,16 @@
{
if (UserPasswordSyntax.isEncoded(av.getValue()))
{
- String[] compoenents = UserPasswordSyntax.decodeUserPassword(
- av.getStringValue());
- PasswordStorageScheme scheme =
- DirectoryServer.getPasswordStorageScheme(
- toLowerCase(compoenents[0]));
+ String[] components = UserPasswordSyntax.decodeUserPassword(av
+ .getStringValue());
+ PasswordStorageScheme<?> scheme = DirectoryServer
+ .getPasswordStorageScheme(toLowerCase(components[0]));
if (scheme != null)
{
- if (scheme.passwordMatches(v.getValue(),
- new ASN1OctetString(compoenents[1])))
+ if (scheme.passwordMatches(v.getValue(), new ASN1OctetString(
+ components[1])))
{
- encodedValues.add(av);
+ builder.add(av);
found = true;
}
}
@@ -1501,7 +1416,7 @@
{
if (av.equals(v))
{
- encodedValues.add(v);
+ builder.add(v);
found = true;
}
}
@@ -1521,105 +1436,156 @@
else
{
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
- ERR_MODIFY_INVALID_PASSWORD.get());
+ ERR_MODIFY_INVALID_PASSWORD.get());
}
currentPasswordProvided = true;
}
}
- pwAttr.setValues(encodedValues);
+ m.setAttribute(builder.toAttribute());
}
/**
- * Performs the initial schema processing for an add modification and updates
- * the entry appropriately.
+ * Performs the initial schema processing for an add modification
+ * and updates the entry appropriately.
*
- * @param attr The attribute being added.
- *
- * @throws DirectoryException If a problem occurs that should cause the
- * modify operation to fail.
+ * @param attr
+ * The attribute being added.
+ * @throws DirectoryException
+ * If a problem occurs that should cause the modify
+ * operation to fail.
*/
private void processInitialAddSchema(Attribute attr)
- throws DirectoryException
+ throws DirectoryException
{
- // Make sure that one or more values have been provided for the attribute.
- LinkedHashSet<AttributeValue> newValues = attr.getValues();
- if ((newValues == null) || newValues.isEmpty())
+ // Make sure that one or more values have been provided for the
+ // attribute.
+ if (attr.isEmpty())
{
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
- ERR_MODIFY_ADD_NO_VALUES.get(String.valueOf(entryDN),
- attr.getName()));
+ ERR_MODIFY_ADD_NO_VALUES.get(String.valueOf(entryDN),
+ attr.getName()));
}
- // If the server is configured to check schema and the operation is not a
- // synchronization operation, make sure that all the new values are valid
- // according to the associated syntax.
- if ((DirectoryServer.checkSchema()) && (! isSynchronizationOperation()))
+ // If the server is configured to check schema and the operation
+ // is not a synchronization operation, make sure that all the new
+ // values are valid according to the associated syntax.
+ if ((DirectoryServer.checkSchema()) && (!isSynchronizationOperation()))
{
- AcceptRejectWarn syntaxPolicy =
- DirectoryServer.getSyntaxEnforcementPolicy();
- AttributeSyntax syntax = attr.getAttributeType().getSyntax();
+ AcceptRejectWarn syntaxPolicy = DirectoryServer
+ .getSyntaxEnforcementPolicy();
+ AttributeSyntax<?> syntax = attr.getAttributeType().getSyntax();
if (syntaxPolicy == AcceptRejectWarn.REJECT)
{
MessageBuilder invalidReason = new MessageBuilder();
- for (AttributeValue v : newValues)
+ for (AttributeValue v : attr)
{
- if (! syntax.valueIsAcceptable(v.getValue(), invalidReason))
+ if (!syntax.valueIsAcceptable(v.getValue(), invalidReason))
{
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- ERR_MODIFY_ADD_INVALID_SYNTAX.get(
- String.valueOf(entryDN), attr.getName(),
- v.getStringValue(), invalidReason));
+ ERR_MODIFY_ADD_INVALID_SYNTAX.get(String.valueOf(entryDN), attr
+ .getName(), v.getStringValue(), invalidReason));
}
}
}
else if (syntaxPolicy == AcceptRejectWarn.WARN)
{
MessageBuilder invalidReason = new MessageBuilder();
- for (AttributeValue v : newValues)
+ for (AttributeValue v : attr)
{
- if (! syntax.valueIsAcceptable(v.getValue(), invalidReason))
+ if (!syntax.valueIsAcceptable(v.getValue(), invalidReason))
{
setResultCode(ResultCode.INVALID_ATTRIBUTE_SYNTAX);
logError(ERR_MODIFY_ADD_INVALID_SYNTAX.get(String.valueOf(entryDN),
- attr.getName(), v.getStringValue(), invalidReason));
+ attr.getName(), v.getStringValue(), invalidReason));
invalidReason = new MessageBuilder();
}
}
}
}
-
- // Add the provided attribute or merge an existing attribute with
- // the values of the new attribute. If there are any duplicates,
- // then fail.
+ // If the attribute to be added is the object class attribute then
+ // make sure that all the object classes are known and not
+ // obsoleted.
if (attr.getAttributeType().isObjectClassType())
{
- modifiedEntry.addObjectClasses(newValues);
+ validateObjectClasses(attr);
}
- else
+
+ // Add the provided attribute or merge an existing attribute with
+ // the values of the new attribute. If there are any duplicates,
+ // then fail.
+ LinkedList<AttributeValue> duplicateValues =
+ new LinkedList<AttributeValue>();
+ modifiedEntry.addAttribute(attr, duplicateValues);
+ if (!duplicateValues.isEmpty())
{
- LinkedList<AttributeValue> duplicateValues =
- new LinkedList<AttributeValue>();
- modifiedEntry.addAttribute(attr, duplicateValues);
- if (! duplicateValues.isEmpty())
+ StringBuilder buffer = new StringBuilder();
+ Iterator<AttributeValue> iterator = duplicateValues.iterator();
+ buffer.append(iterator.next().getStringValue());
+ while (iterator.hasNext())
{
- StringBuilder buffer = new StringBuilder();
- Iterator<AttributeValue> iterator = duplicateValues.iterator();
+ buffer.append(", ");
buffer.append(iterator.next().getStringValue());
- while (iterator.hasNext())
+ }
+
+ throw new DirectoryException(ResultCode.ATTRIBUTE_OR_VALUE_EXISTS,
+ ERR_MODIFY_ADD_DUPLICATE_VALUE.get(String.valueOf(entryDN), attr
+ .getName(), buffer));
+ }
+ }
+
+
+
+ /**
+ * Ensures that the provided object class attribute contains known
+ * non-obsolete object classes.
+ *
+ * @param attr
+ * The object class attribute to validate.
+ * @throws DirectoryException
+ * If the attribute contained unknown or obsolete object
+ * classes.
+ */
+ private void validateObjectClasses(Attribute attr) throws DirectoryException
+ {
+ Validator.ensureTrue(attr.getAttributeType().isObjectClassType());
+ for (AttributeValue v : attr)
+ {
+ String name = v.getStringValue();
+
+ String lowerName;
+ try
+ {
+ lowerName = v.getNormalizedStringValue();
+ }
+ catch (Exception e)
+ {
+ if (debugEnabled())
{
- buffer.append(", ");
- buffer.append(iterator.next().getStringValue());
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- throw new DirectoryException(ResultCode.ATTRIBUTE_OR_VALUE_EXISTS,
- ERR_MODIFY_ADD_DUPLICATE_VALUE.get(
- String.valueOf(entryDN), attr.getName(), buffer));
+ lowerName = toLowerCase(v.getStringValue());
+ }
+
+ ObjectClass oc = DirectoryServer.getObjectClass(lowerName);
+ if (oc == null)
+ {
+ Message message = ERR_ENTRY_ADD_UNKNOWN_OC.get(name, String
+ .valueOf(entryDN));
+ throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
+ }
+
+ if (oc.isObsolete())
+ {
+ Message message = ERR_ENTRY_ADD_OBSOLETE_OC.get(name, String
+ .valueOf(entryDN));
+ throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
}
}
@@ -1627,13 +1593,14 @@
/**
- * Performs the initial schema processing for a delete modification and
- * updates the entry appropriately.
+ * Performs the initial schema processing for a delete modification
+ * and updates the entry appropriately.
*
- * @param attr The attribute being deleted.
- *
- * @throws DirectoryException If a problem occurs that should cause the
- * modify operation to fail.
+ * @param attr
+ * The attribute being deleted.
+ * @throws DirectoryException
+ * If a problem occurs that should cause the modify
+ * operation to fail.
*/
private void processInitialDeleteSchema(Attribute attr)
throws DirectoryException
@@ -1688,209 +1655,124 @@
/**
- * Performs the initial schema processing for a replace modification and
- * updates the entry appropriately.
+ * Performs the initial schema processing for a replace modification
+ * and updates the entry appropriately.
*
- * @param attr The attribute being replaced.
- *
- * @throws DirectoryException If a problem occurs that should cause the
- * modify operation to fail.
+ * @param attr
+ * The attribute being replaced.
+ * @throws DirectoryException
+ * If a problem occurs that should cause the modify
+ * operation to fail.
*/
private void processInitialReplaceSchema(Attribute attr)
- throws DirectoryException
+ throws DirectoryException
{
- // If it is the objectclass attribute, then treat that separately.
- if (attr.getAttributeType().isObjectClassType())
+ // If the server is configured to check schema and the operation
+ // is not a synchronization operation, make sure that all the
+ // new values are valid according to the associated syntax.
+ if ((DirectoryServer.checkSchema()) && (!isSynchronizationOperation()))
{
- modifiedEntry.setObjectClasses(attr.getValues());
- return;
- }
-
-
- // If the provided attribute does not have any values, then we will simply
- // remove the attribute from the entry (if it exists).
- AttributeType t = attr.getAttributeType();
- if (! attr.hasValue())
- {
- modifiedEntry.removeAttribute(t, attr.getOptions());
- RDN rdn = modifiedEntry.getDN().getRDN();
- if ((rdn != null) && rdn.hasAttributeType(t) &&
- (! modifiedEntry.hasValue(t, attr.getOptions(),
- rdn.getAttributeValue(t))))
- {
- throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_RDN,
- ERR_MODIFY_DELETE_RDN_ATTR.get(String.valueOf(entryDN),
- attr.getName()));
- }
-
- return;
- }
-
- // If the server is configured to check schema and the operation is not a
- // synchronization operation, make sure that all the new values are valid
- // according to the associated syntax.
- LinkedHashSet<AttributeValue> newValues = attr.getValues();
- if ((DirectoryServer.checkSchema()) && (! isSynchronizationOperation()))
- {
- AcceptRejectWarn syntaxPolicy =
- DirectoryServer.getSyntaxEnforcementPolicy();
- AttributeSyntax syntax = t.getSyntax();
+ AcceptRejectWarn syntaxPolicy = DirectoryServer
+ .getSyntaxEnforcementPolicy();
+ AttributeSyntax<?> syntax = attr.getAttributeType().getSyntax();
if (syntaxPolicy == AcceptRejectWarn.REJECT)
{
MessageBuilder invalidReason = new MessageBuilder();
- for (AttributeValue v : newValues)
+ for (AttributeValue v : attr)
{
- if (! syntax.valueIsAcceptable(v.getValue(), invalidReason))
+ if (!syntax.valueIsAcceptable(v.getValue(), invalidReason))
{
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(
- String.valueOf(entryDN), attr.getName(),
- v.getStringValue(), invalidReason));
+ ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(String.valueOf(entryDN),
+ attr.getName(), v.getStringValue(), invalidReason));
}
}
}
else if (syntaxPolicy == AcceptRejectWarn.WARN)
{
MessageBuilder invalidReason = new MessageBuilder();
- for (AttributeValue v : newValues)
+ for (AttributeValue v : attr)
{
- if (! syntax.valueIsAcceptable(v.getValue(), invalidReason))
+ if (!syntax.valueIsAcceptable(v.getValue(), invalidReason))
{
setResultCode(ResultCode.INVALID_ATTRIBUTE_SYNTAX);
- logError(ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(
- String.valueOf(entryDN), attr.getName(),
- v.getStringValue(), invalidReason));
+ logError(ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(String
+ .valueOf(entryDN), attr.getName(), v.getStringValue(),
+ invalidReason));
invalidReason = new MessageBuilder();
}
}
}
}
-
- // If the provided attribute does not have any options, then we will simply
- // use it in place of any existing attribute of the provided type (or add it
- // if it doesn't exist).
- if (! attr.hasOptions())
+ // If the attribute to be replaced is the object class attribute
+ // then make sure that all the object classes are known and not
+ // obsoleted.
+ if (attr.getAttributeType().isObjectClassType())
{
- List<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(attr);
- modifiedEntry.putAttribute(t, attrList);
-
- RDN rdn = modifiedEntry.getDN().getRDN();
- if ((rdn != null) && rdn.hasAttributeType(t) &&
- (! modifiedEntry.hasValue(t, attr.getOptions(),
- rdn.getAttributeValue(t))))
- {
- throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_RDN,
- ERR_MODIFY_DELETE_RDN_ATTR.get(
- String.valueOf(entryDN),
- attr.getName()));
- }
-
- return;
+ validateObjectClasses(attr);
}
+ // Replace the provided attribute.
+ modifiedEntry.replaceAttribute(attr);
- // See if there is an existing attribute of the provided type. If not, then
- // we'll use the new one.
- List<Attribute> attrList = modifiedEntry.getAttribute(t);
- if ((attrList == null) || attrList.isEmpty())
- {
- attrList = new ArrayList<Attribute>(1);
- attrList.add(attr);
- modifiedEntry.putAttribute(t, attrList);
-
- RDN rdn = modifiedEntry.getDN().getRDN();
- if ((rdn != null) && rdn.hasAttributeType(t) &&
- (! modifiedEntry.hasValue(t, attr.getOptions(),
- rdn.getAttributeValue(t))))
- {
- throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_RDN,
- ERR_MODIFY_DELETE_RDN_ATTR.get(
- String.valueOf(entryDN),
- attr.getName()));
- }
-
- return;
- }
-
-
- // There must be an existing occurrence of the provided attribute in the
- // entry. If there is a version with exactly the set of options provided,
- // then replace it. Otherwise, add a new one.
- boolean found = false;
- for (int i=0; i < attrList.size(); i++)
- {
- if (attrList.get(i).optionsEqual(attr.getOptions()))
- {
- attrList.set(i, attr);
- found = true;
- break;
- }
- }
-
- if (! found)
- {
- attrList.add(attr);
- }
-
+ // Make sure that the RDN attribute value(s) has not been removed.
+ AttributeType t = attr.getAttributeType();
RDN rdn = modifiedEntry.getDN().getRDN();
- if ((rdn != null) && rdn.hasAttributeType(t) &&
- (! modifiedEntry.hasValue(t, attr.getOptions(),
- rdn.getAttributeValue(t))))
+ if ((rdn != null)
+ && rdn.hasAttributeType(t)
+ && (!modifiedEntry.hasValue(t, attr.getOptions(), rdn
+ .getAttributeValue(t))))
{
throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_RDN,
- ERR_MODIFY_DELETE_RDN_ATTR.get(
- String.valueOf(entryDN),
- attr.getName()));
+ ERR_MODIFY_DELETE_RDN_ATTR.get(String.valueOf(entryDN), attr
+ .getName()));
}
}
/**
- * Performs the initial schema processing for an increment modification and
- * updates the entry appropriately.
+ * Performs the initial schema processing for an increment
+ * modification and updates the entry appropriately.
*
- * @param attr The attribute being incremented.
- *
- * @throws DirectoryException If a problem occurs that should cause the
- * modify operation to fail.
+ * @param attr
+ * The attribute being incremented.
+ * @throws DirectoryException
+ * If a problem occurs that should cause the modify
+ * operation to fail.
*/
private void processInitialIncrementSchema(Attribute attr)
- throws DirectoryException
+ throws DirectoryException
{
// The specified attribute type must not be an RDN attribute.
AttributeType t = attr.getAttributeType();
RDN rdn = modifiedEntry.getDN().getRDN();
- if ((rdn != null) && rdn.hasAttributeType(t))
+ if ((rdn != null) && rdn.hasAttributeType(t))
{
throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_RDN,
- ERR_MODIFY_INCREMENT_RDN.get(
- String.valueOf(entryDN),
- attr.getName()));
+ ERR_MODIFY_INCREMENT_RDN.get(String.valueOf(entryDN),
+ attr.getName()));
}
-
- // The provided attribute must have a single value, and it must be an
- // integer.
- LinkedHashSet<AttributeValue> values = attr.getValues();
- if ((values == null) || values.isEmpty())
+ // The provided attribute must have a single value, and it must be
+ // an integer.
+ if (attr.isEmpty())
{
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
- ERR_MODIFY_INCREMENT_REQUIRES_VALUE.get(
- String.valueOf(entryDN),
- attr.getName()));
- }
- else if (values.size() > 1)
- {
- throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
- ERR_MODIFY_INCREMENT_REQUIRES_SINGLE_VALUE.get(
- String.valueOf(entryDN), attr.getName()));
+ ERR_MODIFY_INCREMENT_REQUIRES_VALUE.get(String.valueOf(entryDN), attr
+ .getName()));
}
- AttributeValue v = values.iterator().next();
+ if (attr.size() > 1)
+ {
+ throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
+ ERR_MODIFY_INCREMENT_REQUIRES_SINGLE_VALUE.get(String
+ .valueOf(entryDN), attr.getName()));
+ }
+
+ AttributeValue v = attr.iterator().next();
long incrementValue;
try
@@ -1905,79 +1787,60 @@
}
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- ERR_MODIFY_INCREMENT_PROVIDED_VALUE_NOT_INTEGER.get(
- String.valueOf(entryDN), attr.getName(),
- v.getStringValue()), e);
+ ERR_MODIFY_INCREMENT_PROVIDED_VALUE_NOT_INTEGER.get(String
+ .valueOf(entryDN), attr.getName(), v.getStringValue()), e);
}
-
- // Get the corresponding attribute from the entry and make sure that it has
- // a single integer value.
- List<Attribute> attrList = modifiedEntry.getAttribute(t, attr.getOptions());
- if ((attrList == null) || attrList.isEmpty())
+ // Get the attribute that is to be incremented.
+ Attribute a = modifiedEntry.getExactAttribute(t, attr.getOptions());
+ if (a == null)
{
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- ERR_MODIFY_INCREMENT_REQUIRES_EXISTING_VALUE.get(
- String.valueOf(entryDN), attr.getName()));
+ ERR_MODIFY_INCREMENT_REQUIRES_EXISTING_VALUE.get(String
+ .valueOf(entryDN), attr.getName()));
}
- boolean updated = false;
- for (Attribute a : attrList)
+ // Increment each attribute value by the specified amount.
+ AttributeBuilder builder = new AttributeBuilder(a, true);
+ for (AttributeValue existingValue : a)
{
- LinkedHashSet<AttributeValue> valueList = a.getValues();
- if ((valueList == null) || valueList.isEmpty())
+ String s = existingValue.getStringValue();
+ long currentValue;
+ try
{
- continue;
+ currentValue = Long.parseLong(s);
}
-
- LinkedHashSet<AttributeValue> newValueList =
- new LinkedHashSet<AttributeValue>(valueList.size());
- for (AttributeValue existingValue : valueList)
+ catch (Exception e)
{
- long newIntValue;
- try
+ if (debugEnabled())
{
- long existingIntValue =
- Long.parseLong(existingValue.getStringValue());
- newIntValue = existingIntValue + incrementValue;
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- ERR_MODIFY_INCREMENT_REQUIRES_INTEGER_VALUE.get(
- String.valueOf(entryDN), a.getName(),
- existingValue.getStringValue()), e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- ByteString newValue = new ASN1OctetString(String.valueOf(newIntValue));
- newValueList.add(new AttributeValue(t, newValue));
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX,
+ ERR_MODIFY_INCREMENT_REQUIRES_INTEGER_VALUE.get(String
+ .valueOf(entryDN), a.getName(), existingValue.getStringValue()),
+ e);
}
- a.setValues(newValueList);
- updated = true;
+ long newValue = currentValue + incrementValue;
+ builder.add(new AttributeValue(t, String.valueOf(newValue)));
}
- if (! updated)
- {
- throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- ERR_MODIFY_INCREMENT_REQUIRES_EXISTING_VALUE.get(
- String.valueOf(entryDN), attr.getName()));
- }
+ // Replace the existing attribute with the incremented version.
+ modifiedEntry.replaceAttribute(builder.toAttribute());
}
/**
- * Performs additional preliminary processing that is required for a password
- * change.
+ * Performs additional preliminary processing that is required for a
+ * password change.
*
- * @throws DirectoryException If a problem occurs that should cause the
- * modify operation to fail.
+ * @throws DirectoryException
+ * If a problem occurs that should cause the modify
+ * operation to fail.
*/
public void performAdditionalPasswordChangedProcessing()
throws DirectoryException
@@ -2390,5 +2253,83 @@
}
}
}
+
+ private boolean handleConflictResolution() {
+ boolean returnVal = true;
+
+ for (SynchronizationProvider<?> provider :
+ DirectoryServer.getSynchronizationProviders()) {
+ try {
+ SynchronizationProviderResult result =
+ provider.handleConflictResolution(this);
+ if (! result.continueProcessing()) {
+ setResultCode(result.getResultCode());
+ appendErrorMessage(result.getErrorMessage());
+ setMatchedDN(result.getMatchedDN());
+ setReferralURLs(result.getReferralURLs());
+ returnVal = false;
+ break;
+ }
+ } catch (DirectoryException de) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ }
+ logError(ERR_MODIFY_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
+ getConnectionID(), getOperationID(),
+ getExceptionMessage(de)));
+ setResponseData(de);
+ returnVal = false;
+ break;
+ }
+ }
+ return returnVal;
+ }
+
+ private boolean processPreOperation() {
+ boolean returnVal = true;
+ for (SynchronizationProvider<?> provider :
+ DirectoryServer.getSynchronizationProviders()) {
+ try {
+ SynchronizationProviderResult result =
+ provider.doPreOperation(this);
+ if (! result.continueProcessing()) {
+ setResultCode(result.getResultCode());
+ appendErrorMessage(result.getErrorMessage());
+ setMatchedDN(result.getMatchedDN());
+ setReferralURLs(result.getReferralURLs());
+ returnVal = false;
+ break;
+ }
+ } catch (DirectoryException de) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ }
+ logError(ERR_MODIFY_SYNCH_PREOP_FAILED.get(getConnectionID(),
+ getOperationID(), getExceptionMessage(de)));
+ setResponseData(de);
+ returnVal = false;
+ break;
+ }
+ }
+ return returnVal;
+ }
+
+ private void processPostOperation() {
+ for (SynchronizationProvider<?> provider :
+ DirectoryServer.getSynchronizationProviders()) {
+ try {
+ provider.doPostOperation(this);
+ } catch (DirectoryException de) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.ERROR, de);
+ }
+ logError(ERR_MODIFY_SYNCH_POSTOP_FAILED.get(getConnectionID(),
+ getOperationID(), getExceptionMessage(de)));
+ setResponseData(de);
+ break;
+ }
+ }
+ }
}
+
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
index 6f39879..e1093f0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
@@ -34,7 +34,10 @@
import org.opends.messages.Message;
import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.opends.server.admin.server.ServerManagementContext;
+import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.admin.std.server.LocalBackendWorkflowElementCfg;
+import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
@@ -48,11 +51,14 @@
import org.opends.server.types.*;
import org.opends.server.workflowelement.LeafWorkflowElement;
+import static org.opends.server.config.ConfigConstants.*;
+
+
/**
* This class defines a local backend workflow element; e-g an entity that
- * handle the processing of an operation aginst a local backend.
+ * handle the processing of an operation against a local backend.
*/
public class LocalBackendWorkflowElement extends
LeafWorkflowElement<LocalBackendWorkflowElementCfg>
@@ -73,6 +79,10 @@
private static Object registeredLocalBackendsLock = new Object();
+ // A string indicating the type of the workflow element.
+ private final String BACKEND_WORKFLOW_ELEMENT = "Backend";
+
+
/**
* Creates a new instance of the local backend workflow element.
*/
@@ -95,7 +105,7 @@
private void initialize(String workflowElementID, Backend backend)
{
// Initialize the workflow ID
- super.initialize(workflowElementID);
+ super.initialize(workflowElementID, BACKEND_WORKFLOW_ELEMENT);
this.backend = backend;
@@ -142,7 +152,7 @@
{
// null all fields so that any use of the finalized object will raise
// an NPE
- super.initialize(null);
+ super.initialize(null, null);
backend = null;
}
@@ -197,17 +207,35 @@
boolean isAcceptable = true;
// If the workflow element is disabled then do nothing. Note that the
- // config manager could have finalized the object right before.
+ // configuration manager could have finalized the object right before.
if (configuration.isEnabled())
{
// Read configuration.
String newBackendID = configuration.getBackend();
Backend newBackend = DirectoryServer.getBackend(newBackendID);
- // Get the new config
+ // If the backend is null (i.e. not found in the list of
+ // registered backends, this is probably because we are looking
+ // for the config backend
+ if (newBackend == null) {
+ ServerManagementContext context = ServerManagementContext.getInstance();
+ RootCfg root = context.getRootConfiguration();
+ try {
+ BackendCfg backendCfg = root.getBackend(newBackendID);
+ if (backendCfg.getBaseDN().contains(DN.decode(DN_CONFIG_ROOT))) {
+ newBackend = DirectoryServer.getConfigHandler();
+ }
+ } catch (Exception ex) {
+ // Unable to find the backend
+ newBackend = null;
+ }
+ }
+
+ // Get the new configuration
if (applyChanges)
{
- super.initialize(configuration.getWorkflowElementId());
+ super.initialize(
+ configuration.getWorkflowElementId(), BACKEND_WORKFLOW_ELEMENT);
backend = newBackend;
}
}
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/3server_topology.txt b/opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/3server_topology.txt
index 222f1f0..bcd4e3b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/3server_topology.txt
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/3server_topology.txt
@@ -26,6 +26,7 @@
Hostname: localhost
Directory: /var/tmp/opends-synchro-tests/server1
Port: 11389
+Adminport: 14444
Sslport: 11636
Jmxport: 11689
RootDn: cn=directory manager
@@ -40,6 +41,7 @@
Hostname: localhost
Directory: /var/tmp/opends-synchro-tests/server2
Port: 22389
+Adminport: 24444
Sslport: 22636
Jmxport: 22689
RootDn: cn=directory manager
@@ -54,6 +56,7 @@
Hostname: localhost
Directory: /var/tmp/opends-synchro-tests/server3
Port: 33389
+Adminport: 34444
Sslport: 33636
Jmxport: 33689
RootDn: cn=directory manager
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/basic_topology.txt b/opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/basic_topology.txt
index feaf8b1..51eeb04 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/basic_topology.txt
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/config/replication/basic_topology.txt
@@ -26,6 +26,7 @@
Hostname: localhost
Directory: /var/tmp/opends-synchro-tests/server1
Port: 11389
+Adminport: 14444
Sslport: 11636
Jmxport: 11689
RootDn: cn=directory manager
@@ -39,6 +40,7 @@
Hostname: localhost
Directory: /var/tmp/opends-synchro-tests/server2
Port: 22389
+Adminport: 24444
Sslport: 22636
Jmxport: 22689
RootDn: cn=directory manager
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml
index 9a873be..40af67b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml
@@ -90,7 +90,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -5185,7 +5184,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_cleanup.xml
index 3811a9a..96ebe31 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_cleanup.xml
@@ -46,11 +46,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml
index 5430ed4..b7a843a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml
@@ -82,7 +82,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -1781,7 +1780,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml
index 744eb8a..d710e91 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml
@@ -81,7 +81,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -2614,7 +2613,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml
index f62b970..4f930ef 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml
@@ -82,7 +82,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -2481,7 +2480,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml
index 181d22e..0869100 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml
@@ -84,7 +84,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -1647,7 +1646,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml
index 1f86ed8..09b99b4 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml
@@ -85,7 +85,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -3845,7 +3844,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml
index 23e9203..d52c89b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -82,7 +82,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -1490,7 +1489,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml
index 0263646..499a2f9 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml
@@ -82,7 +82,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -680,7 +679,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml
index abc24bf..fed9be1 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml
@@ -82,7 +82,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -2998,7 +2997,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml
index aedffbd..f593af2 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml
@@ -85,7 +85,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -1054,7 +1053,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml
index 4369b35..2716596 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml
@@ -101,7 +101,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -4033,7 +4032,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backend_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backend_cleanup.xml
index 53cb11b..1d15bad 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backend_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backend_cleanup.xml
@@ -54,11 +54,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml
index d098fae..5476b12 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml
@@ -62,18 +62,18 @@
<script>
DsInstancePort = int(DIRECTORY_INSTANCE_PORT)+1
- DsInstanceSSLPort = int(DIRECTORY_INSTANCE_SSL_PORT)+1
+ DsInstanceAdminPort = int(DIRECTORY_INSTANCE_ADMIN_PORT)+1
DsInstanceDir = '%s/server2' % DIRECTORY_INSTANCE_DIR
</script>
<call function="'createInstance'">
- { 'dsHost' : '%s' % DIRECTORY_INSTANCE_HOST,
- 'dsDir' : DsInstanceDir,
- 'dsPort' : DsInstancePort,
- 'dsSslPort' : DsInstanceSSLPort,
- 'dsBindDN' : '%s' % DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : '%s' % DIRECTORY_INSTANCE_PSWD,
- 'dsBaseDN' : '%s' % DIRECTORY_INSTANCE_SFX
+ { 'dsHost' : '%s' % DIRECTORY_INSTANCE_HOST,
+ 'dsDir' : DsInstanceDir,
+ 'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : '%s' % DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : '%s' % DIRECTORY_INSTANCE_PSWD,
+ 'dsBaseDN' : '%s' % DIRECTORY_INSTANCE_SFX
}
</call>
@@ -145,19 +145,20 @@
{ 'expectedEntries' : ['uid=tmorris,ou=People,dc=example,dc=com',
'uid=kvaughan,ou=People,dc=example,dc=com',
'uid=kwinters,ou=People,dc=example,dc=com'],
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'startDS' : 'no'
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -274,19 +275,20 @@
{ 'expectedEntries' : ['uid=tmorris,ou=People,dc=example,dc=com',
'uid=kvaughan,ou=People,dc=example,dc=com',
'uid=kwinters,ou=People,dc=example,dc=com'],
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'startDS' : 'no'
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -356,17 +358,18 @@
'uid=kwinters,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -438,17 +441,18 @@
'expectedEntries' : ['dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -520,17 +524,18 @@
'expectedEntries' : ['dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -599,16 +604,17 @@
'expectedEntries' : ['dc=com','dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -679,17 +685,18 @@
'missingEntries' : ['ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -761,17 +768,18 @@
'missingAttributes' : ['userpassword'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -840,19 +848,20 @@
<call function="'checkImport'">
{ 'expectedEntries' : ['uid=tmorris,ou=People,dc=example,dc=com'],
'missingAttributes' : ['userpassword'],
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'startDS' : 'no'
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -925,17 +934,18 @@
'missingAttributes' : ['userpassword','mail','roomnumber'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -1008,17 +1018,18 @@
'missingAttributes' : ['userpassword'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -1090,17 +1101,18 @@
'uid=kwinters,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -1173,16 +1185,17 @@
'uid=rhunt,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -1254,19 +1267,20 @@
'missingEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
'uid=dmiller,ou=People,dc=example,dc=com',
'uid=rhunt,ou=People,dc=example,dc=com'],
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'startDS' : 'no'
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -1339,17 +1353,18 @@
'uid=rhunt,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -1417,18 +1432,19 @@
'missingEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
'uid=dmiller,ou=People,dc=example,dc=com',
'uid=rhunt,ou=People,dc=example,dc=com'],
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'startDS' : 'no'}
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'startDS' : 'no'}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd}
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd}
</call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1497,17 +1513,18 @@
'uid=kwinters,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd}
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd}
</call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1578,17 +1595,18 @@
'uid=kwinters,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -1660,17 +1678,18 @@
'uid=kwinters,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -1742,17 +1761,18 @@
'uid=kwinters,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
@@ -1824,17 +1844,18 @@
'uid=kwinters,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -1901,16 +1922,17 @@
'uid=kwinters,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
@@ -1987,16 +2009,17 @@
'uid=kwinters,ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
+ 'dsAdminPort' : DsInstanceAdminPort,
'startDS' : 'no'
}
</call>
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : mylocation,
- 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
- 'dsPort' : DsInstancePort,
- 'dsBindDN' : mydn,
- 'dsBindPwd' : mypswd
+ { 'location' : mylocation,
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
+ 'dsAdminPort' : DsInstanceAdminPort,
+ 'dsBindDN' : mydn,
+ 'dsBindPwd' : mypswd
}
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
index 1a68f93..2ba0ff7 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
@@ -88,11 +88,11 @@
<!-- Stop DS -->
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
@@ -158,11 +158,11 @@
<!-- Stop DS -->
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_cleanup.xml
index 46a773b..0c13b17 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_cleanup.xml
@@ -74,11 +74,11 @@
<call function="'StopDsWithScript'">
{
- 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
index 9dcb59f..e172a14 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
@@ -162,7 +162,6 @@
<call function="'dsconfigSet'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'backend' ,
@@ -297,7 +296,6 @@
<call function="'dsconfigSet'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'root-dse-backend' ,
@@ -342,7 +340,6 @@
<call function="'dsconfigSet'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'root-dse-backend' ,
@@ -387,7 +384,6 @@
<call function="'dsconfigSet'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'root-dse-backend' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
index 39f6774..f36cdd0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
@@ -98,7 +98,6 @@
<call function="'manage-tasks'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsSummary' : 'True' ,
@@ -160,7 +159,6 @@
<call function="'manage-tasks'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsInfo' : 125 ,
@@ -211,7 +209,6 @@
<call function="'manage-tasks'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsInfo' : 126 ,
@@ -289,7 +286,6 @@
<call function="'manage-tasks'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsCancel' : 125 ,
@@ -316,7 +312,6 @@
<call function="'manage-tasks'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsCancel' : 126 ,
@@ -370,7 +365,6 @@
<call function="'manage-tasks'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsCancel' : 124 ,
@@ -399,7 +393,6 @@
<call function="'manage-tasks'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsCancel' : 124 ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
index 22d311c..e4b61cd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
@@ -113,7 +113,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'create-local-db-index' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml
index 6f830d8..066d88c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml
@@ -98,7 +98,7 @@
<call function="'checktestString'">
{
'returnString' : Result ,
- 'expectedString' : 'Administrative Users: %s' \
+ 'expectedString' : 'Administrative Users: %s' \
% DIRECTORY_INSTANCE_DN
}
</call>
@@ -106,7 +106,7 @@
<call function="'checktestString'">
{
'returnString' : Result ,
- 'expectedString' : 'Server Run Status: Started'
+ 'expectedString' : 'Server Run Status: Started'
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
index 328f2c0..545c318 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
@@ -92,7 +92,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -136,7 +135,6 @@
<!-- reset password policy -->
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -179,7 +177,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml
index 499efff..3f96a97 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml
@@ -38,11 +38,11 @@
'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml
index 336ff8c..b6ee7d2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml
@@ -104,7 +104,6 @@
</script>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-entry-cache-prop',
@@ -118,7 +117,6 @@
</script>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'get-entry-cache-prop',
@@ -162,7 +160,6 @@
</script>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-entry-cache-prop',
@@ -199,7 +196,6 @@
</script>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-entry-cache-prop',
@@ -243,7 +239,6 @@
</script>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-entry-cache',
@@ -257,7 +252,6 @@
</script>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'get-entry-cache-prop',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml
index 9eeaa49..e8df720 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -97,7 +97,6 @@
</message>
<call function="'modifyGlobal'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'attributeName' : 'size-limit',
@@ -141,7 +140,6 @@
</message>
<call function="'modifyGlobal'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'attributeName' : 'size-limit',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml
index 993b5bb..da616db 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -47,7 +47,6 @@
</message>
<call function="'modifyGlobal'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'attributeName' : 'size-limit',
@@ -118,7 +117,6 @@
</message>
<call function="'modifyGlobal'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'attributeName' : 'time-limit',
@@ -162,7 +160,6 @@
</message>
<call function="'modifyGlobal'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'attributeName' : 'time-limit',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_cleanup.xml
index c70e350..83b9011 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_cleanup.xml
@@ -46,11 +46,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
index 08018fd..531bba8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
@@ -85,7 +85,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : '%s' % componentList[componentNumber][0] ,
@@ -99,7 +98,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : '%s' % componentList[componentNumber][0] ,
@@ -165,7 +163,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : '%s' % componentList2[componentNumber][0] ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
index 2fd8b8a..ced0462 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
@@ -78,7 +78,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : '%s' % componentList[componentNumber][0] ,
@@ -91,7 +90,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : '%s' % componentList[componentNumber][0] ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
index 404a3d4..194a0dd 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
@@ -63,11 +63,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
index 5ac7332..24d5df7 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
@@ -175,7 +175,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-backend',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml
index ff51e10..4fd11f0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml
@@ -54,11 +54,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml
index cfebd44..26cf6a5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml
@@ -113,7 +113,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-backend',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml
index f57e61b..51ce981 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml
@@ -54,11 +54,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
index 9fa54c0..9463d8c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
@@ -40,14 +40,11 @@
{ 'parent' : STAXParentID }
</call>
<script>
- CurrentTestPath={'group':'indexes','suite':'indexes'}
+ CurrentTestPath['group'] = 'indexes'
envAlreadyLoaded='true'
- _setupSteps=['testGroup_Preamble','testSuite_Preamble',
- 'indexes_setup']
- _testSteps=['indexes_search', 'indexes_dynamic_modify',
- 'indexes_dynamic_add', 'indexes_remove', 'indexes_add']
- _cleanupSteps=['indexes_cleanup','testSuite_Postamble',
- 'testGroup_Postamble']
+ _testSteps=['indexes_setup','indexes_search','indexes_dynamic_modify',
+ 'indexes_dynamic_add','indexes_remove', 'indexes_add',
+ 'indexes_cleanup']
</script>
<!---
#@TestSuiteName Indexes
@@ -59,11 +56,9 @@
<try>
<!-- the pre-requisites are in a separate iteration -->
<sequence>
- <iterate in="_setupSteps" var="_setupStep">
- <call function="_setupStep" />
- </iterate>
+ <call function="'testGroup_Preamble'"/>
<iterate in="_testSteps" var="_testStep" indexvar="_testStepNumber">
- <call function="_testStep" />
+ <call function="_testStep"/>
</iterate>
</sequence>
<catch exception="'STAXException.Topology.CreationException'">
@@ -77,9 +72,7 @@
</message>
</catch>
<finally>
- <iterate in="_cleanupSteps" var="_cleanupStep">
- <call function="_cleanupStep" />
- </iterate>
+ <call function="'testGroup_Postamble'"/>
</finally>
</try>
</sequence>
@@ -99,14 +92,21 @@
#@TestPostamble none
#@TestResult Success if entry are indexed correctly
-->
- <block name="'Search'">
+ <block name="'indexes_search'">
<sequence>
+ <script>
+ CurrentTestPath['suite'] = STAXCurrentBlock
+ </script>
+ <call function="'testSuite_Preamble'"/>
+
<message log="1" level="'info'">
'starting the search tests'
</message>
<call function="'loopThroughFilters'">
{ 'filters' : 'search' }
</call>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
</block>
</function>
@@ -125,8 +125,13 @@
#@TestPostamble none
#@TestResult Success if entry are indexed correctly
-->
- <block name="'Modify'">
+ <block name="'indexes_modify'">
<sequence>
+ <script>
+ CurrentTestPath['suite'] = STAXCurrentBlock
+ </script>
+ <call function="'testSuite_Preamble'"/>
+
<try>
<sequence>
<call function="'loopThroughFilters'">
@@ -150,11 +155,11 @@
{ 'functionName' : 'StopDsWithScript',
'functionException' : 'CLI.stop-ds',
'functionFailureTC' : 'Indexes - Modify' ,
- 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
}
</call>
<call function="'runFunction'">
@@ -188,6 +193,8 @@
</message>
</catch>
</try>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
</block>
</function>
@@ -207,8 +214,13 @@
#@TestPostamble none
#@TestResult Success if entry are indexed correctly
-->
- <block name="'Modify'">
+ <block name="'indexes_dynamic_modify'">
<sequence>
+ <script>
+ CurrentTestPath['suite'] = STAXCurrentBlock
+ </script>
+ <call function="'testSuite_Preamble'"/>
+
<try>
<sequence>
<call function="'loopThroughFilters'">
@@ -259,6 +271,8 @@
</message>
</catch>
</try>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
</block>
</function>
@@ -280,8 +294,13 @@
#@TestPostamble none
#@TestResult Success if entry are indexed correctly
-->
- <block name="'Add'">
+ <block name="'indexes_add'">
<sequence>
+ <script>
+ CurrentTestPath['suite'] = STAXCurrentBlock
+ </script>
+ <call function="'testSuite_Preamble'"/>
+
<try>
<sequence>
<call function="'loopThroughFilters'">
@@ -306,11 +325,11 @@
'functionFailureTC' : '%s: %s: %s' % (CurrentTestPath['group'],
CurrentTestPath['suite'],
STAXCurrentBlock ) ,
- 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
}
</call>
@@ -345,6 +364,8 @@
</message>
</catch>
</try>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
</block>
</function>
@@ -367,8 +388,13 @@
#@TestPostamble none
#@TestResult Success if entry are indexed correctly
-->
- <block name="'Add'">
+ <block name="'indexes_dynamic_add'">
<sequence>
+ <script>
+ CurrentTestPath['suite'] = STAXCurrentBlock
+ </script>
+ <call function="'testSuite_Preamble'"/>
+
<try>
<sequence>
<call function="'loopThroughFilters'">
@@ -417,6 +443,8 @@
</message>
</catch>
</try>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
</block>
</function>
@@ -437,8 +465,13 @@
#@TestPostamble none
#@TestResult Success if entry are indexed as expected
-->
- <block name="'Remove'">
+ <block name="'indexes_remove'">
<sequence>
+ <script>
+ CurrentTestPath['suite'] = STAXCurrentBlock
+ </script>
+ <call function="'testSuite_Preamble'"/>
+
<try>
<sequence>
<call function="'loopThroughFilters'">
@@ -464,6 +497,8 @@
</message>
</catch>
</try>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
</block>
</function>
@@ -483,8 +518,13 @@
#@TestPostamble none
#@TestResult Success if entry are indexed as expected
-->
- <block name="'Entry_Limit'">
+ <block name="'indexes_entry_limit'">
<sequence>
+ <script>
+ CurrentTestPath['suite'] = STAXCurrentBlock
+ </script>
+ <call function="'testSuite_Preamble'"/>
+
<try>
<sequence>
<call function="'loopThroughFilters'">
@@ -515,6 +555,8 @@
</message>
</catch>
</try>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
</block>
</function>
@@ -534,8 +576,13 @@
#@TestPostamble none
#@TestResult Success if entry are indexed as expected
-->
- <block name="'Entry_Limit'">
+ <block name="'indexes_vlv_add'">
<sequence>
+ <script>
+ CurrentTestPath['suite'] = STAXCurrentBlock
+ </script>
+ <call function="'testSuite_Preamble'"/>
+
<try>
<sequence>
<call function="'loopThroughFilters'">
@@ -566,6 +613,8 @@
</message>
</catch>
</try>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
</block>
</function>
@@ -645,10 +694,10 @@
testNumber=0
</script>
- <testcase name="'%s: %d.%s: %03d-%03d.%s: %s%02d'
- % ( CurrentTestPath['group'], len(_testSteps)-_testStepNumber,
- filters, len(indexTests)-indexTestNumber, indexTestNumber,
- test.getAttribute(), test.getName(), testNumber)" >
+ <testcase name="getTestCaseName('%s: %03d-%03d.%s: %s%02d')
+ % (filters, len(indexTests)-indexTestNumber, indexTestNumber,
+ test.getAttribute(), test.getName(), testNumber)">
+
<sequence>
<call function="'testCase_Preamble'" />
<message log="1" level="'trace'">
@@ -700,52 +749,70 @@
<!-- Setup the instance for indexes tests -->
<function name="indexes_setup">
- <sequence>
- <call function="'runFunction'">
- { 'functionName' : 'createTopology',
- 'functionMessage' : 'Create DS topology as described in config.py',
- 'functionException' : 'Topology.CreationException',
- 'functionArguments' : { 'initialiseInstance' : True }
- }
- </call>
- <call function="'runFunction'">
- { 'functionName' : 'StartDsWithScript' ,
- 'functionMessage' : 'Start DS to run on port %s' \
- % (DIRECTORY_INSTANCE_PORT) ,
- 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME }
- }
- </call>
- <call function="'runFunction'">
- { 'functionName' : 'isAlive',
- 'functionMessage' : 'Checking if the server is available',
- 'functionException' : 'Topology.StartException',
- 'functionArguments' : { 'noOfLoops' : 5,
- 'noOfMilliSeconds' : 2000
- }
- }
- </call>
- </sequence>
+ <block name="'indexes_setup'">
+ <sequence>
+ <script>
+ CurrentTestPath['suite'] = STAXCurrentBlock
+ </script>
+ <call function="'testSuite_Preamble'"/>
+
+ <call function="'runFunction'">
+ { 'functionName' : 'createTopology',
+ 'functionMessage' : 'Create DS topology as described in config.py',
+ 'functionException' : 'Topology.CreationException',
+ 'functionArguments' : { 'initialiseInstance' : True }
+ }
+ </call>
+ <call function="'runFunction'">
+ { 'functionName' : 'StartDsWithScript' ,
+ 'functionMessage' : 'Start DS to run on port %s' \
+ % (DIRECTORY_INSTANCE_PORT) ,
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME }
+ }
+ </call>
+ <call function="'runFunction'">
+ { 'functionName' : 'isAlive',
+ 'functionMessage' : 'Checking if the server is available',
+ 'functionException' : 'Topology.StartException',
+ 'functionArguments' : { 'noOfLoops' : 5,
+ 'noOfMilliSeconds' : 2000
+ }
+ }
+ </call>
+
+ <call function="'testSuite_Postamble'"/>
+ </sequence>
+ </block>
</function>
<!-- cleanup after the tests -->
<function name="indexes_cleanup">
- <sequence>
- <call function="'runFunction'">
- { 'functionName' : 'StopDsWithScript' ,
- 'functionMessage' : 'Stop DS running on port %s' \
- % (DIRECTORY_INSTANCE_PORT),
- 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- }
- </call>
- <call function="'runFunction'">
- { 'functionName' : 'removeTopology',
- 'functionMessage' : 'Remove DS topology created for the Test Suite'
- }
- </call>
- </sequence>
+ <block name="'indexes_cleanup'">
+ <sequence>
+ <script>
+ CurrentTestPath['suite'] = STAXCurrentBlock
+ </script>
+ <call function="'testSuite_Preamble'"/>
+
+ <call function="'runFunction'">
+ { 'functionName' : 'StopDsWithScript' ,
+ 'functionMessage' : 'Stop DS running on port %s' \
+ % (DIRECTORY_INSTANCE_PORT),
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ }
+ </call>
+ <call function="'runFunction'">
+ { 'functionName' : 'removeTopology',
+ 'functionMessage' : 'Remove DS topology created for the Test Suite'
+ }
+ </call>
+
+ <call function="'testSuite_Postamble'"/>
+ </sequence>
+ </block>
</function>
</stax>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_cleanup.xml
index f7823e2..e03db08 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_cleanup.xml
@@ -39,11 +39,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml
index 42e6401..20ac23f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml
@@ -74,7 +74,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-log-publisher',
@@ -90,7 +89,6 @@
<message>'------ set auto-flush to true --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -105,7 +103,6 @@
</message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -120,7 +117,6 @@
<message>'------ set append to false --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -133,7 +129,6 @@
<message>'------ get append --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -149,7 +144,6 @@
<message>'------ set asynchronous to true --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-log-publisher-prop',
@@ -162,7 +156,6 @@
<message>'------ get asynchronous --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'log-publisher' ,
@@ -177,7 +170,6 @@
<message>'------ set buffer-size to 10mb --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-log-publisher-prop' ,
@@ -189,7 +181,6 @@
<message>'------ get buffer-size --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -205,7 +196,6 @@
<message>'------ set time-interval to 3m --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -218,7 +208,6 @@
<message>'------ get time-interval --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -234,7 +223,6 @@
<message>'------ set log-file to logs/testaccess --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -247,7 +235,6 @@
<message>'------ get log-file --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -262,7 +249,6 @@
<message>'------ set log-file to logs/access --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -277,7 +263,6 @@
<message>'------ set log-file-permissions to 777 --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -290,7 +275,6 @@
<message>'------ get log-file-permissions --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -306,7 +290,6 @@
<message>'------ set queue-size to 1000 --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-log-publisher-prop',
@@ -319,7 +302,6 @@
<message>'------ get queue-size --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -337,7 +319,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -352,7 +333,6 @@
</message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -370,7 +350,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-log-publisher-prop',
@@ -385,7 +364,6 @@
</message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -402,7 +380,6 @@
<message>'------ delete logger publisher --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-log-publisher',
@@ -442,7 +419,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -455,7 +431,6 @@
<message>'------ get default-severity --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -472,7 +447,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-log-publisher-prop',
@@ -487,7 +461,6 @@
</message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -528,7 +501,6 @@
<message>'------ set default-debug-category --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -541,7 +513,6 @@
<message>'------ get default-debug-category --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -557,7 +528,6 @@
<message>'------ set default-debug-level --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-log-publisher-prop',
@@ -570,7 +540,6 @@
<message>'------ get default-debug-level --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -587,7 +556,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -600,7 +568,6 @@
<message>'------ get default-include-throwable-cause --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -617,7 +584,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -632,7 +598,6 @@
</message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -649,7 +614,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-log-publisher-prop' ,
@@ -661,7 +625,6 @@
<message>'------ get default-omit-method-return-value --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -678,7 +641,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -691,7 +653,6 @@
<message>'------ get default-throwable-stack-frames --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml
index eb891a5..e4245fa 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml
@@ -88,7 +88,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-log-retention-policy',
@@ -104,7 +103,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -119,7 +117,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-log-rotation-policy',
@@ -134,7 +131,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -147,7 +143,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -164,7 +159,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'get-log-publisher-prop',
@@ -176,7 +170,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'get-log-rotation-policy-prop',
@@ -188,7 +181,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'get-log-retention-policy-prop',
@@ -267,7 +259,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -283,7 +274,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -300,7 +290,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'delete-log-retention-policy' ,
@@ -316,7 +305,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-log-rotation-policy',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml
index a724f6d..55586aa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml
@@ -72,7 +72,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-log-retention-policy',
@@ -85,7 +84,6 @@
<message>'------ get file-size-limit --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-retention-policy',
@@ -100,7 +98,6 @@
<message>'------ set file-size-limit to 5kb --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-retention-policy-prop',
@@ -113,7 +110,6 @@
<message>'------ get disk-space-used --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-retention-policy',
@@ -129,7 +125,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-log-retention-policy',
@@ -169,7 +164,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-log-retention-policy',
@@ -185,7 +179,6 @@
</message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'log-retention-policy' ,
@@ -200,7 +193,6 @@
<message>'------ set free_disk-space to 4mb --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-retention-policy-prop',
@@ -213,7 +205,6 @@
<message>'------ get free_disk-space --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-retention-policy',
@@ -229,7 +220,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-log-retention-policy',
@@ -271,7 +261,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-log-retention-policy',
@@ -285,7 +274,6 @@
<message>'------ get number-of-files --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'log-retention-policy' ,
@@ -300,7 +288,6 @@
<message>'------ set number-of-files to 32 --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-retention-policy-prop',
@@ -313,7 +300,6 @@
<message>'------ get number-of-files --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-retention-policy',
@@ -330,7 +316,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-log-retention-policy',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
index 050a058..2f291a8 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
@@ -70,7 +70,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-log-rotation-policy',
@@ -86,7 +85,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-log-publisher-prop',
@@ -99,7 +97,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -113,7 +110,6 @@
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -156,7 +152,6 @@
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -267,7 +262,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -283,7 +277,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-log-rotation-policy',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml
index 28126ce..e9a35c4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml
@@ -68,7 +68,6 @@
<message>'------ create a size limit rotation policy --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-log-rotation-policy',
@@ -82,7 +81,6 @@
<message>'------ get file-size-limit --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-rotation-policy',
@@ -97,7 +95,6 @@
<message>'------ set file-size-limit to 6kb --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-log-rotation-policy-prop',
@@ -110,7 +107,6 @@
<message>'------ get file-size-limit --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-rotation-policy',
@@ -124,7 +120,6 @@
<message>'------ delete a size limit rotation policy --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-log-rotation-policy',
@@ -162,7 +157,6 @@
</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-log-rotation-policy',
@@ -176,7 +170,6 @@
<message>'------ get rotation-interval --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-rotation-policy',
@@ -192,7 +185,6 @@
<message>'------ set rotation-interval to 3s --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-rotation-policy-prop',
@@ -205,7 +197,6 @@
<message>'------ get rotation-interval --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-rotation-policy',
@@ -220,7 +211,6 @@
<message>'------ delete a time limit rotation policy --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-log-rotation-policy',
@@ -259,7 +249,6 @@
<message>'------ create a fixed time limit rotation policy --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-log-rotation-policy',
@@ -273,7 +262,6 @@
<message>'------ get time-of-day --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-rotation-policy',
@@ -288,7 +276,6 @@
<message>'------ set time-of-day to 3s --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-rotation-policy-prop',
@@ -301,7 +288,6 @@
<message>'------ get time-of-day --' </message>
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'log-rotation-policy' ,
@@ -317,7 +303,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-log-rotation-policy',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
index 2cbe680..d1312e4 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
@@ -76,7 +76,6 @@
<message>'------ set properties --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-log-publisher-prop',
@@ -89,7 +88,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-rotation-policy-prop',
@@ -130,7 +128,6 @@
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'log-publisher',
@@ -241,7 +238,6 @@
<message>'------ Enabled Debug logger --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
@@ -253,10 +249,10 @@
</call>
<call function="'RestartDs'">
- { 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ { 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
<message>'--- Check log files ---'</message>
@@ -308,7 +304,6 @@
<message>'------ Disable Debug logger --' </message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-log-publisher-prop',
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_cleanup.xml
index 7d1689b..c349511 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_cleanup.xml
@@ -41,10 +41,10 @@
<call function="'StopDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
{ 'returncode' : RC ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
index 6c3a41f..2469304 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
@@ -77,7 +77,6 @@
<message>'-- Disable the LDIF Connection Handler --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -103,7 +102,6 @@
<message>'-- Enabled the LDIF Connection Handler --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -135,7 +133,6 @@
<message>'-- Create a new LDIF Connection Handler --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'create-connection-handler' ,
@@ -160,7 +157,6 @@
<message>'-- Delete the new LDIF Connection Handler --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'delete-connection-handler' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
index 523bd87..5167871 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
@@ -79,7 +79,6 @@
<message>'-- Disable the Client Connections monitor provider --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-monitor-provider-prop' ,
@@ -138,7 +137,6 @@
<message>'-- Disable the Entry Caches monitor provider --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-monitor-provider-prop' ,
@@ -197,7 +195,6 @@
<message>'-- Disable the JVM Memory Usage monitor provider --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-monitor-provider-prop' ,
@@ -257,7 +254,6 @@
<message>'-- Disable the JVM Stack Trace monitor provider --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-monitor-provider-prop' ,
@@ -317,7 +313,6 @@
<message>'-- Disable the System Info monitor provider --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-monitor-provider-prop' ,
@@ -381,7 +376,6 @@
<message>'-- Disable the Version monitor provider --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-monitor-provider-prop' ,
@@ -428,7 +422,6 @@
<message>'-- Create a new monitor provider for Version --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'create-monitor-provider' ,
@@ -441,7 +434,6 @@
<message>'-- Disable the Version monitor provider --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-monitor-provider-prop' ,
@@ -466,7 +458,6 @@
<message>'-- Enable the new Version monitor provider --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-monitor-provider-prop' ,
@@ -491,7 +482,6 @@
<message>'-- Delete the new monitor provider for Version --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'delete-monitor-provider' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml
index 73d074d..bc6a88b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml
@@ -62,7 +62,6 @@
<message>'-- Enable the plugin 7-Bit Clean --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -143,7 +142,6 @@
<message>'-- configure a new attribute-type for the plugin 7-Bit --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -205,7 +203,6 @@
<message>'-- disable the plugin 7-Bit Clean --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_cleanup.xml
index 2be7a22..8b27e04 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_cleanup.xml
@@ -40,11 +40,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
{ 'returncode' : RC ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
index d5f4785..5dc703c 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
@@ -63,7 +63,6 @@
<message>'-- Disable the virtual attribute entryUUID --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-virtual-attribute-prop' ,
@@ -98,7 +97,6 @@
<message>'-- Activate the entryUUID plugin --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -176,7 +174,6 @@
<message>'-- Disable the entryUUID plugin --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -210,7 +207,6 @@
<message>'-- Disable the entryUUID plugin --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml
index e35525f..b379a49 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml
@@ -176,7 +176,6 @@
<message>'-- Disable the lastmod plugin --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -241,7 +240,6 @@
<message>'-- Enable the lastmod plugin --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -274,7 +272,6 @@
<message>'-- Disable the lastmod plugin --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -329,7 +326,6 @@
<message>'-- Enable the lastmod plugin --'</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
index d5ebacc..acdc0a8 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
@@ -225,7 +225,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -264,7 +263,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -276,7 +274,6 @@
<call function="'dsconfigGet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'objectName' : 'plugin',
@@ -355,7 +352,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -458,7 +454,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -510,7 +505,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -551,7 +545,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -563,12 +556,12 @@
<!-- plugin-type attribute is not dynamic. Need to restart the server -->
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
- 'dsRestart' : ' ' }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsRestart' : ' ' }
</call>
<!--- Check that DS started -->
@@ -621,7 +614,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -661,7 +653,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -676,7 +667,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml
index 7838e29..a9e5d95 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml
@@ -113,7 +113,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -199,7 +198,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -265,7 +263,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -400,7 +397,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -509,7 +505,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -644,7 +639,6 @@
<message>' '</message>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
@@ -731,7 +725,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-plugin-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_cleanup.xml
index a5d9949..4400f30 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_cleanup.xml
@@ -46,11 +46,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
index 0e217eb..4d02021 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
@@ -89,7 +89,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -220,7 +219,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -285,7 +283,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -347,7 +344,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
index 6ce3cdf..7385e12 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
@@ -124,7 +124,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -251,7 +250,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -314,7 +312,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -374,7 +371,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'cn=Aroot' ,
'dsInstancePswd' : 'PrivsRule' ,
'aciValue' : GLOBAL_ACI_SEARCH ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
index 9538e84..ba5dcad 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
@@ -97,7 +97,6 @@
<call function="'dsconfigSet'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'backend' ,
@@ -558,7 +557,6 @@
<call function="'dsconfigSet'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'global-configuration' ,
@@ -599,7 +597,6 @@
<call function="'dsconfigSet'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'global-configuration' ,
@@ -665,7 +662,6 @@
<call function="'dsconfigSet'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'backend' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
index ad7cf07..1910b0b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
@@ -113,7 +113,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -228,7 +227,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -296,7 +294,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -469,7 +466,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -537,7 +533,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -706,7 +701,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -769,7 +763,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -823,7 +816,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : GLOBAL_ACI_SEARCH ,
@@ -1135,7 +1127,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'global-configuration' ,
@@ -1200,7 +1191,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'global-configuration' ,
@@ -1756,7 +1746,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'global-configuration' ,
@@ -1801,7 +1790,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'global-configuration' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
index bd6bedf..fd09a3f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -63,11 +63,11 @@
<!--- Stop DS -->
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
index 029819c..72a4eea 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
@@ -89,14 +89,14 @@
initialization'
</message>
<call function="'preInitializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'localOnly' : False,
- 'replicationDnList' : [synchroSuffix],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'localOnly' : False,
+ 'replicationDnList' : [synchroSuffix],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
@@ -169,6 +169,7 @@
'dsPath' : clientPath,
'dsHost' : masterHost,
'dsPort' : master.getPort(),
+ 'dsAdminPort' : master.getAdminPort(),
'dsDn' : master.getRootDn(),
'dsPswd' : master.getRootPwd(),
'expectedEntries' : ['uid=scarter,ou=People,o=example',
@@ -183,13 +184,13 @@
'+++++ binary copy off-line: end external server initialization'
</message>
<call function="'postInitializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'replicationDnList' : [synchroSuffix],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : [synchroSuffix],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
@@ -249,14 +250,14 @@
initialization'
</message>
<call function="'preInitializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'localOnly' : False,
- 'replicationDnList' : [synchroSuffix],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'localOnly' : False,
+ 'replicationDnList' : [synchroSuffix],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
@@ -284,6 +285,7 @@
'dsPath' : clientPath,
'dsHost' : masterHost,
'dsPort' : master.getPort(),
+ 'dsAdminPort' : master.getAdminPort(),
'dsDn' : master.getRootDn(),
'dsPswd' : master.getRootPwd(),
'expectedEntries' : ['uid=scarter,ou=People,o=example',
@@ -349,13 +351,13 @@
'+++++ binary copy on-line: end external server initialization'
</message>
<call function="'postInitializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'replicationDnList' : [synchroSuffix],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : [synchroSuffix],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
index ea877ed..97c6f52 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
@@ -1041,14 +1041,15 @@
<!-- Reset the changelog (call pre/post-external-init) -->
<call function="'resetReplicationData'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'sourceInstanceHost' : masterHost,
- 'sourceInstancePort' : master.getPort(),
- 'sourceInstanceDn' : master.getRootDn(),
- 'sourceInstancePswd' : master.getRootPwd(),
- 'backupDir' : masterBackupDir,
- 'suffixDn' : synchroSuffix
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'sourceInstanceHost' : masterHost,
+ 'sourceInstancePort' : master.getPort(),
+ 'sourceInstanceAdminPort' : master.getAdminPort(),
+ 'sourceInstanceDn' : master.getRootDn(),
+ 'sourceInstancePswd' : master.getRootPwd(),
+ 'backupDir' : masterBackupDir,
+ 'suffixDn' : synchroSuffix
}
</call>
@@ -1155,17 +1156,17 @@
<!-- Set purge delay to 20s on "master" server -->
<call function="'dsconfigSet'">
- { 'location' : masterHost,
- 'dsPath' : masterPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'dsInstanceDn' : master.getRootDn(),
- 'dsInstancePswd' : master.getRootPwd(),
- 'objectName' : 'replication-server' ,
- 'propertyType' : 'provider',
- 'propertyName' : 'Multimaster Synchronization',
- 'attributeName' : 'replication-purge-delay' ,
- 'attributeValue' : '20s'
+ { 'location' : masterHost,
+ 'dsPath' : masterPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'dsInstanceDn' : master.getRootDn(),
+ 'dsInstancePswd' : master.getRootPwd(),
+ 'objectName' : 'replication-server' ,
+ 'propertyType' : 'provider',
+ 'propertyName' : 'Multimaster Synchronization',
+ 'attributeName' : 'replication-purge-delay' ,
+ 'attributeValue' : '20s'
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
index e424663..d5f6d1a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
@@ -70,12 +70,12 @@
<!-- Load entries into "master" server -->
<!-- Stop "master" Directory Server -->
<call function="'StopDsWithScript'">
- { 'location' : masterHost,
- 'dsPath' : masterPath,
- 'dsHost' : masterHost,
- 'dsPort' : master.getPort(),
- 'dsBindDN' : master.getRootDn(),
- 'dsBindPwd' : master.getRootPwd()
+ { 'location' : masterHost,
+ 'dsPath' : masterPath,
+ 'dsHost' : masterHost,
+ 'dsAdminPort' : master.getAdminPort(),
+ 'dsBindDN' : master.getRootDn(),
+ 'dsBindPwd' : master.getRootPwd()
}
</call>
@@ -113,22 +113,22 @@
<call function="'initializeReplication'">
{ 'location' : clientHost,
'dsPath' : clientPath,
- 'sourceInstanceHost' : masterHost,
- 'sourceInstancePort' : master.getPort(),
- 'replicationDnList' : ['o=example']
+ 'sourceInstanceHost' : masterHost,
+ 'sourceInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : ['o=example']
}
</call>
-->
<iterate var="server" in="consumerList">
<!-- Perform the total update -->
<call function="'initializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : server.getHostname(),
- 'dsInstancePort' : server.getPort(),
- 'sourceInstanceHost' : masterHost,
- 'sourceInstancePort' : master.getPort(),
- 'replicationDnList' : ['o=example']
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstanceAdminPort' : server.getAdminPort(),
+ 'sourceInstanceHost' : masterHost,
+ 'sourceInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : ['o=example']
}
</call>
</iterate>
@@ -164,12 +164,12 @@
<!-- Stop server (simulate failover?) -->
<call function="'StopDsWithScript'">
- { 'location' : server.getHostname(),
- 'dsPath' : serverPath,
- 'dsHost' : server.getHostname(),
- 'dsPort' : server.getPort(),
- 'dsBindDN' : server.getRootDn(),
- 'dsBindPwd' : server.getRootPwd()
+ { 'location' : server.getHostname(),
+ 'dsPath' : serverPath,
+ 'dsHost' : server.getHostname(),
+ 'dsAdminPort' : server.getAdminPort(),
+ 'dsBindDN' : server.getRootDn(),
+ 'dsBindPwd' : server.getRootPwd()
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
index 33daacc..d073e6f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
@@ -97,14 +97,14 @@
initialization'
</message>
<call function="'preInitializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'localOnly' : False,
- 'replicationDnList' : [synchroSuffix],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'localOnly' : False,
+ 'replicationDnList' : [synchroSuffix],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
@@ -181,6 +181,7 @@
'dsPath' : clientPath,
'dsHost' : masterHost,
'dsPort' : master.getPort(),
+ 'dsAdminPort' : master.getAdminPort(),
'dsDn' : master.getRootDn(),
'dsPswd' : master.getRootPwd(),
'expectedEntries' : ['uid=scarter,ou=People,o=example',
@@ -195,13 +196,13 @@
'+++++ ldif import off-line: end external server initialization'
</message>
<call function="'postInitializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'replicationDnList' : [synchroSuffix],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : [synchroSuffix],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
@@ -268,14 +269,14 @@
initialization'
</message>
<call function="'preInitializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'localOnly' : False,
- 'replicationDnList' : [synchroSuffix],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'localOnly' : False,
+ 'replicationDnList' : [synchroSuffix],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
@@ -303,6 +304,7 @@
'dsPath' : clientPath,
'dsHost' : masterHost,
'dsPort' : master.getPort(),
+ 'dsAdminPort' : master.getAdminPort(),
'dsDn' : master.getRootDn(),
'dsPswd' : master.getRootPwd(),
'expectedEntries' : ['uid=scarter,ou=People,o=example',
@@ -375,13 +377,13 @@
'+++++ ldif import on-line: end external server initialization'
</message>
<call function="'postInitializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'replicationDnList' : [synchroSuffix],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : [synchroSuffix],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
index 066324e..4e13b50 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
@@ -200,13 +200,13 @@
{ 'location' : clientHost,
'dsPath' : clientPath,
'dsInstanceHost' : server.getHostname(),
- 'dsInstancePort' : server.getPort(),
+ 'dsInstanceAdminPort' : server.getAdminPort(),
'dsInstanceDn' : server.getRootDn(),
'dsInstancePswd' : server.getRootPwd(),
'dsReplicationPort' : replicationServer.getPort(),
'dsSecureReplication' : secureReplication,
'refInstanceHost' : masterHost,
- 'refInstancePort' : master.getPort(),
+ 'refInstanceAdminPort' : master.getAdminPort(),
'refInstanceDn' : master.getRootDn(),
'refInstancePswd' : master.getRootPwd(),
'refReplicationPort' : masterReplicationServer.getPort(),
@@ -236,16 +236,17 @@
<!-- Retrieve replication-domain name -->
<call function="'dsconfig'">
- { 'location' : server.getHostname(),
- 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : server.getHostname(),
- 'dsInstancePort' : server.getPort(),
- 'dsInstanceDn' : server.getRootDn(),
- 'dsInstancePswd' : server.getRootPwd(),
- 'subcommand' : 'list-replication-domains',
- 'objectType' : 'provider-name',
- 'objectName' : 'Multimaster Synchronization',
- 'optionsString' : '--script-friendly'
+ { 'location' : server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstanceAdminPort' : server.getAdminPort(),
+ 'dsInstanceDn' : server.getRootDn(),
+ 'dsInstancePswd' : server.getRootPwd(),
+ 'subcommand' : 'list-replication-domains',
+ 'objectType' : 'provider-name',
+ 'objectName' : 'Multimaster Synchronization',
+ 'optionsString' : '--script-friendly'
}
</call>
<if expr='RC == 0'>
@@ -273,16 +274,17 @@
</message>
<!-- Remove peer RS from replicated domain -->
<call function="'dsconfig'">
- { 'location' : server.getHostname(),
- 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : server.getHostname(),
- 'dsInstancePort' : server.getPort(),
- 'dsInstanceDn' : server.getRootDn(),
- 'dsInstancePswd' : server.getRootPwd(),
- 'subcommand' : 'set-replication-domain-prop',
- 'objectType' : 'provider-name',
- 'objectName' : 'Multimaster Synchronization',
- 'optionsString' : options
+ { 'location' : server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstanceAdminPort' : server.getAdminPort(),
+ 'dsInstanceDn' : server.getRootDn(),
+ 'dsInstancePswd' : server.getRootPwd(),
+ 'subcommand' : 'set-replication-domain-prop',
+ 'objectType' : 'provider-name',
+ 'objectName' : 'Multimaster Synchronization',
+ 'optionsString' : options
}
</call>
</sequence>
@@ -299,24 +301,24 @@
<!-- Initialise the servers in the topology -->
<call function="'initializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'sourceInstanceHost' : masterHost,
- 'sourceInstancePort' : master.getPort(),
- 'replicationDnList' : [synchroSuffix]
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'sourceInstanceHost' : masterHost,
+ 'sourceInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : [synchroSuffix]
}
</call>
<if expr="0">
<iterate var="server" in="consumerList">
<sequence>
<!-- <call function="'initializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : server.getHostname(),
- 'dsInstancePort' : server.getPort(),
- 'sourceInstanceHost' : masterHost,
- 'sourceInstancePort' : master.getPort(),
- 'replicationDnList' : [synchroSuffix]
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstanceAdminPort' : server.getAdminPort(),
+ 'sourceInstanceHost' : masterHost,
+ 'sourceInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : [synchroSuffix]
}
</call> -->
@@ -360,47 +362,50 @@
<sequence>
<!-- Set the debug logger to "enabled" -->
<call function="'dsconfigSet'">
- { 'location' : server.getHostname(),
- 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : server.getHostname(),
- 'dsInstancePort' : server.getPort(),
- 'dsInstanceDn' : server.getRootDn(),
- 'dsInstancePswd' : server.getRootPwd(),
- 'objectName' : 'log-publisher',
- 'propertyType' : 'publisher',
- 'propertyName' : 'File-based Debug Logger',
- 'attributeName' : 'enabled',
- 'attributeValue' : 'true'
+ { 'location' : server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstanceAdminPort' : server.getAdminPort(),
+ 'dsInstanceDn' : server.getRootDn(),
+ 'dsInstancePswd' : server.getRootPwd(),
+ 'objectName' : 'log-publisher',
+ 'propertyType' : 'publisher',
+ 'propertyName' : 'File-based Debug Logger',
+ 'attributeName' : 'enabled',
+ 'attributeValue' : 'true'
}
</call>
<!-- Set the debug level to "info" -->
<call function="'dsconfigSet'">
- { 'location' : server.getHostname(),
- 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : server.getHostname(),
- 'dsInstancePort' : server.getPort(),
- 'dsInstanceDn' : server.getRootDn(),
- 'dsInstancePswd' : server.getRootPwd(),
- 'objectName' : 'log-publisher',
- 'propertyType' : 'publisher',
- 'propertyName' : 'File-based Debug Logger',
- 'attributeName' : 'default-debug-level',
- 'attributeValue' : 'info'
+ { 'location' : server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstanceAdminPort' : server.getAdminPort(),
+ 'dsInstanceDn' : server.getRootDn(),
+ 'dsInstancePswd' : server.getRootPwd(),
+ 'objectName' : 'log-publisher',
+ 'propertyType' : 'publisher',
+ 'propertyName' : 'File-based Debug Logger',
+ 'attributeName' : 'default-debug-level',
+ 'attributeValue' : 'info'
}
</call>
<!-- Set the debug logger log file to "logs/errors" -->
<call function="'dsconfigSet'">
- { 'location' : server.getHostname(),
- 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : server.getHostname(),
- 'dsInstancePort' : server.getPort(),
- 'dsInstanceDn' : server.getRootDn(),
- 'dsInstancePswd' : server.getRootPwd(),
- 'objectName' : 'log-publisher',
- 'propertyType' : 'publisher',
- 'propertyName' : 'File-based Debug Logger',
- 'attributeName' : 'log-file',
- 'attributeValue' : 'logs/errors'
+ { 'location' : server.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstanceAdminPort' : server.getAdminPort(),
+ 'dsInstanceDn' : server.getRootDn(),
+ 'dsInstancePswd' : server.getRootPwd(),
+ 'objectName' : 'log-publisher',
+ 'propertyType' : 'publisher',
+ 'propertyName' : 'File-based Debug Logger',
+ 'attributeName' : 'log-file',
+ 'attributeValue' : 'logs/errors'
}
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
index e6551f2..400a3a2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
@@ -174,14 +174,14 @@
initialization'
</message>
<call function="'preInitializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'localOnly' : False,
- 'replicationDnList' : [synchroSuffix],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'localOnly' : False,
+ 'replicationDnList' : [synchroSuffix],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
@@ -209,6 +209,7 @@
'dsPath' : clientPath,
'dsHost' : masterHost,
'dsPort' : master.getPort(),
+ 'dsAdminPort' : master.getAdminPort(),
'dsDn' : master.getRootDn(),
'dsPswd' : master.getRootPwd(),
'expectedEntries' : ['uid=scarter,ou=People,o=example',
@@ -292,13 +293,13 @@
initialization'
</message>
<call function="'postInitializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'replicationDnList' : [synchroSuffix],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : [synchroSuffix],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
index 473ba2e..232420fa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
@@ -91,12 +91,12 @@
<!-- Stop "master" Directory Server -->
<call function="'StopDsWithScript'">
- { 'location' : masterHost,
- 'dsPath' : masterPath,
- 'dsHost' : masterHost,
- 'dsPort' : master.getPort(),
- 'dsBindDN' : master.getRootDn(),
- 'dsBindPwd' : master.getRootPwd()
+ { 'location' : masterHost,
+ 'dsPath' : masterPath,
+ 'dsHost' : masterHost,
+ 'dsAdminPort' : master.getAdminPort(),
+ 'dsBindDN' : master.getRootDn(),
+ 'dsBindPwd' : master.getRootPwd()
}
</call>
@@ -137,6 +137,7 @@
'dsPath' : masterPath,
'dsHost' : masterHost,
'dsPort' : master.getPort(),
+ 'dsAdminPort' : master.getAdminPort(),
'dsDn' : master.getRootDn(),
'dsPswd' : master.getRootPwd(),
'expectedEntries' : ['uid=scarter,ou=People,o=example',
@@ -151,24 +152,25 @@
<sequence>
<!-- Perform the total update -->
<call function="'initializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : server.getHostname(),
- 'dsInstancePort' : server.getPort(),
- 'sourceInstanceHost' : masterHost,
- 'sourceInstancePort' : master.getPort(),
- 'replicationDnList' : ['o=example']
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstanceAdminPort' : server.getAdminPort(),
+ 'sourceInstanceHost' : masterHost,
+ 'sourceInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : ['o=example']
}
</call>
<!-- Verify the total update -->
<call function="'checkImport'">
- { 'location' : server.getHostname(),
- 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
- 'dsHost' : server.getHostname(),
- 'dsPort' : server.getPort(),
- 'dsDn' : server.getRootDn(),
- 'dsPswd' : server.getRootPwd(),
+ { 'location' : server.getHostname(),
+ 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
+ 'dsHost' : server.getHostname(),
+ 'dsPort' : server.getPort(),
+ 'dsAdminPort' : server.getAdminPort(),
+ 'dsDn' : server.getRootDn(),
+ 'dsPswd' : server.getRootPwd(),
'expectedEntries' : ['uid=scarter,ou=People,o=example',
'uid=dmiller, ou=People, o=example',
'uid=rhunt, ou=People, o=example'],
@@ -268,11 +270,11 @@
<!-- Disable schema replication on "master" server -->
<call function="'disableReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'replicationDnList' : ['cn=schema']
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : ['cn=schema']
}
</call>
@@ -314,17 +316,17 @@
<!-- Re-enable schema replication on "master" server, and
at the same time initialise the schema across the topology -->
<call function="'enableReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'dsInstanceHost' : masterHost,
- 'dsInstancePort' : master.getPort(),
- 'dsInstanceDn' : master.getRootDn(),
- 'dsInstancePswd' : master.getRootPwd(),
- 'refInstanceHost' : consumer.getHostname(),
- 'refInstancePort' : consumer.getPort(),
- 'refInstanceDn' : consumer.getRootDn(),
- 'refInstancePswd' : consumer.getRootPwd(),
- 'replicationDnList' : ['cn=schema']
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'dsInstanceHost' : masterHost,
+ 'dsInstanceAdminPort' : master.getAdminPort(),
+ 'dsInstanceDn' : master.getRootDn(),
+ 'dsInstancePswd' : master.getRootPwd(),
+ 'refInstanceHost' : consumer.getHostname(),
+ 'refInstanceAdminPort' : consumer.getAdminPort(),
+ 'refInstanceDn' : consumer.getRootDn(),
+ 'refInstancePswd' : consumer.getRootPwd(),
+ 'replicationDnList' : ['cn=schema']
}
</call>
@@ -393,12 +395,12 @@
<!-- Stop "master" Directory Server -->
<call function="'StopDsWithScript'">
- { 'location' : masterHost,
- 'dsPath' : masterPath,
- 'dsHost' : masterHost,
- 'dsPort' : master.getPort(),
- 'dsBindDN' : master.getRootDn(),
- 'dsBindPwd' : master.getRootPwd()
+ { 'location' : masterHost,
+ 'dsPath' : masterPath,
+ 'dsHost' : masterHost,
+ 'dsAdminPort' : master.getAdminPort(),
+ 'dsBindDN' : master.getRootDn(),
+ 'dsBindPwd' : master.getRootPwd()
}
</call>
@@ -440,6 +442,7 @@
'dsPath' : masterPath,
'dsHost' : masterHost,
'dsPort' : master.getPort(),
+ 'dsAdminPort' : master.getAdminPort(),
'dsDn' : master.getRootDn(),
'dsPswd' : master.getRootPwd(),
'expectedEntries' : ['uid=scarter,ou=People,o=example',
@@ -452,11 +455,11 @@
<!-- Perform the total update -->
<call function="'initializeReplication'">
- { 'location' : clientHost,
- 'dsPath' : clientPath,
- 'sourceInstanceHost' : masterHost,
- 'sourceInstancePort' : master.getPort(),
- 'replicationDnList' : ['o=example']
+ { 'location' : clientHost,
+ 'dsPath' : clientPath,
+ 'sourceInstanceHost' : masterHost,
+ 'sourceInstanceAdminPort' : master.getAdminPort(),
+ 'replicationDnList' : ['o=example']
}
</call>
@@ -465,12 +468,13 @@
<sequence>
<!-- Verify the total update -->
<call function="'checkImport'">
- { 'location' : server.getHostname(),
- 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
- 'dsHost' : server.getHostname(),
- 'dsPort' : server.getPort(),
- 'dsDn' : server.getRootDn(),
- 'dsPswd' : server.getRootPwd(),
+ { 'location' : server.getHostname(),
+ 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
+ 'dsHost' : server.getHostname(),
+ 'dsPort' : server.getPort(),
+ 'dsAdminPort' : server.getAdminPort(),
+ 'dsDn' : server.getRootDn(),
+ 'dsPswd' : server.getRootPwd(),
'expectedEntries' : ['uid=scarter,ou=People,o=example',
'uid=dmiller, ou=People, o=example',
'uid=sholmes, ou=People, o=example'],
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
index b37efef..eec164b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
@@ -299,11 +299,11 @@
<call function="'runFunction'">
{ 'functionName' : 'StopDsWithScript' ,
'functionMessage' : 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT),
- 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsPort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
}
</call>
<call function="'runFunction'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml
index 9b849c5..3c4a4c2 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml
@@ -46,11 +46,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_rfc_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_rfc_tests.xml
index 78f75b3..2128af6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_rfc_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_rfc_tests.xml
@@ -715,7 +715,6 @@
<call function="'modifyGlobal'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'attributeName' : 'check-schema' ,
@@ -740,7 +739,6 @@
<call function="'modifyGlobal'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'attributeName' : 'check-schema' ,
@@ -765,7 +763,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-attribute-syntax-prop' ,
@@ -795,7 +792,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-attribute-syntax-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
index 2392c16..ef3bfbd 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -87,7 +87,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-password-policy-dn' ,
@@ -143,7 +142,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-account-expiration-time' ,
@@ -199,7 +197,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-authentication-failure-times' ,
@@ -259,7 +256,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-account-expiration-time' ,
@@ -281,7 +277,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-seconds-until-account-expiration' ,
@@ -303,7 +298,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : msg4 ,
@@ -410,7 +404,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-account-expiration-time' ,
@@ -432,7 +425,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-password-expiration-warned-time' ,
@@ -454,7 +446,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-seconds-until-password-expiration' ,
@@ -476,7 +467,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : msg2 ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml
index 2eaf6dd..d5ce21b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml
@@ -69,7 +69,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-account-is-disabled' ,
@@ -123,7 +122,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-account-is-disabled' ,
@@ -197,7 +195,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'clear-account-is-disabled' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
index 32f53e1..a1859b9 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
@@ -86,7 +86,6 @@
<call function="'modifyGlobal'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'attributeName' : 'bind-with-dn-requires-password' ,
@@ -191,7 +190,6 @@
<call function="'modifyGlobal'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'attributeName' : 'bind-with-dn-requires-password' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
index 1f63fc80..6b2af30 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
@@ -283,7 +283,6 @@
<message>'---- Configure SSL and TLS----'</message>
<call function="'configureSSL_TLS'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'keystorePin' : SERVER_STOREPASS,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
index 12851c9..6bbdeb5 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
@@ -72,7 +72,6 @@
<call function="'unconfigureSSL_TLS'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD }
</call>
@@ -114,7 +113,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : DIRECTORY_INSTANCE_SFX ,
- 'dsScope' : 'base',
+ 'dsScope' : 'base',
'dsFilter' : 'objectclass=*' ,
'expectedRC' : 0 }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
index a01c3b6..380aa54 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
@@ -56,7 +56,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-sasl-mechanism-handler-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
index dfcbb89..fcb9858 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
@@ -57,7 +57,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-sasl-mechanism-handler-prop' ,
@@ -159,7 +158,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-certificate-mapper-prop' ,
@@ -311,7 +309,6 @@
<!-- fingerprint-algorithm:SHA1-->
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-certificate-mapper-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
index 44c99f4..e9c3bf4 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
@@ -57,7 +57,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-sasl-mechanism-handler-prop' ,
@@ -102,7 +101,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-certificate-mapper-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
index f323f20..aede779 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
@@ -58,7 +58,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-sasl-mechanism-handler-prop' ,
@@ -292,7 +291,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-certificate-mapper-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
index 473445b..1cd5f81 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
@@ -243,13 +243,11 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-connection-handler-prop' ,
'objectType' : 'handler-name' ,
'objectName' : 'LDAPS Connection Handler',
- 'optionsString' : '-Z -X',
'expectedRC' : 0
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
index 9a857ac..72095cb 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
@@ -243,13 +243,11 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-connection-handler-prop' ,
'objectType' : 'handler-name' ,
'objectName' : 'LDAPS Connection Handler',
- 'optionsString' : '-Z -X',
'expectedRC' : 0
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
index c2ccc0b..13a6d71 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
@@ -101,7 +101,6 @@
<call function="'configureSSL'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'customKeyMgr' : "Custom JKS" ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
index 0aa7435..2d74eb9 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
@@ -103,7 +103,6 @@
<call function="'configureSSL'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
index 317e946..934f230 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
@@ -79,7 +79,6 @@
<call function="'unconfigureSSL'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'customKeyMgr' : "Custom JKS" ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
index f32824f..258259f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
@@ -76,7 +76,6 @@
<call function="'unconfigureSSL'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
index 3b12f43..ed88109 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
@@ -237,13 +237,11 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-connection-handler-prop' ,
'objectType' : 'handler-name' ,
'objectName' : 'LDAPS Connection Handler',
- 'optionsString' : '-Z -X',
'expectedRC' : 0
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
index e656ebe..3125608 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
@@ -98,7 +98,6 @@
<call function="'configureSSL'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'keystoreType' : 'PKCS12' }
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
index 3db4323..8ca46a2 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
@@ -81,7 +81,6 @@
<!--- Unconfigure SSL -->
<call function="'unconfigureSSL'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'keystoreType' : 'PKCS12' }
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
index 7471d05..84fad4b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
@@ -82,7 +82,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -209,7 +208,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -284,7 +282,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -606,7 +603,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -717,7 +713,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -841,7 +836,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -855,7 +849,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
index 37ef5b6..26dde06 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
@@ -87,7 +87,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -101,7 +100,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -169,7 +167,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -250,7 +247,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -279,7 +275,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-password-changed-by-required-time' ,
@@ -301,7 +296,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-seconds-until-required-change-time' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
index 30a94c3..aeb46a9 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
@@ -281,7 +281,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-grace-login-use-times' ,
@@ -318,7 +317,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-remaining-grace-login-count' ,
@@ -344,7 +342,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-grace-login-use-times' ,
@@ -381,7 +378,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-remaining-grace-login-count' ,
@@ -422,7 +418,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-remaining-grace-login-count' ,
@@ -459,7 +454,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-remaining-grace-login-count' ,
@@ -481,7 +475,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-all' ,
@@ -563,7 +556,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
index 7fca390..2444634 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
@@ -113,7 +113,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -191,7 +190,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -205,7 +203,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -282,7 +279,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -310,7 +306,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-last-login-time' ,
@@ -395,7 +390,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -470,7 +464,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -564,7 +557,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -592,7 +584,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-seconds-until-idle-lockout' ,
@@ -682,7 +673,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -776,7 +766,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -873,7 +862,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -947,7 +935,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -975,7 +962,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1029,7 +1015,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1043,7 +1028,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1117,7 +1101,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1145,7 +1128,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1200,7 +1182,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1214,7 +1195,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1305,7 +1285,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1381,7 +1360,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1476,7 +1454,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1563,7 +1540,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1643,7 +1619,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1672,7 +1647,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1753,7 +1727,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -1767,7 +1740,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
index f9dcf4c..e5e0c0b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
@@ -96,7 +96,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -177,7 +176,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -294,7 +292,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -308,7 +305,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : msg3 ,
@@ -456,7 +452,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -518,7 +513,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
index 007683c..4eaed07 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
@@ -118,7 +118,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : msg1 ,
@@ -162,7 +161,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +174,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : msg1 ,
@@ -240,7 +237,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : msg1 ,
@@ -285,7 +281,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
index 07a7cc9..01f0ab8 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
@@ -102,7 +102,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -171,7 +170,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
index a01a844..3964c6b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
@@ -70,7 +70,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'create-password-policy' ,
@@ -160,7 +159,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Sales Password Policy' ,
@@ -289,7 +287,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'delete-password-policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
index e61118e..0a2ecb5 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
@@ -147,7 +147,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -224,7 +223,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
index 3d1bdcf..bc9026d 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
@@ -267,7 +267,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -295,7 +294,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-password-is-reset' ,
@@ -343,7 +341,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -371,7 +368,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-password-is-reset' ,
@@ -393,7 +389,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-password-changed-time' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
index 1c60f89..9858bcb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
@@ -66,7 +66,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Root Password Policy' ,
@@ -92,7 +91,6 @@
<call function="'modifyIdentityMapper'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'mapperName' : 'Exact Match' ,
@@ -106,7 +104,6 @@
<call function="'modifyIdentityMapper'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'mapperName' : 'Exact Match' ,
@@ -456,7 +453,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Root Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
index 7945fe4..f014477 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
@@ -66,7 +66,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -77,7 +76,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -88,7 +86,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -164,7 +161,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -384,7 +380,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
index 03f638a..9517cbb 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
@@ -67,7 +67,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'delete-password-storage-scheme' ,
@@ -82,7 +81,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'create-password-storage-scheme' ,
@@ -98,7 +96,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -112,7 +109,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -127,7 +123,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -510,7 +505,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'create-password-storage-scheme' ,
@@ -526,7 +520,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
index b9de007..95b5ad0 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +175,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
index 7811a79..f50a40e 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +175,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
index 14a63c1..473eee5 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +175,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
index dcca8f4..8ed634f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -217,7 +216,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
index d8cc203..3a94164 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +175,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
index 0f6ae73..7d2dd03 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +175,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
index 3829176..17538b7 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +175,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
index db62a80..adf7699 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +175,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
index e52e532..cb21f63 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +175,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
index 9fea553..72cd2c1 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
@@ -219,7 +219,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
index ad6f585..5f8ec72 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -175,7 +174,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
index dad0808..5dba9e5 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -175,7 +174,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
index 5cfa23a..f5e2445 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +175,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_blowfish.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_blowfish.xml
index 6778fd6..47e8922 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_blowfish.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_blowfish.xml
@@ -62,7 +62,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -176,7 +175,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
index 51f95e5..2cc0c34 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
@@ -84,7 +84,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -117,7 +116,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Attribute Value' ,
@@ -413,7 +411,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Attribute Value' ,
@@ -552,7 +549,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Attribute Value' ,
@@ -691,7 +687,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
index 2f14a21..112a4c0 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
@@ -84,7 +84,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -225,7 +224,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Character Set' ,
@@ -236,7 +234,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Character Set' ,
@@ -247,7 +244,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Character Set' ,
@@ -435,7 +431,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -445,7 +440,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Character Set' ,
@@ -530,7 +524,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
index 4b7fab3..6869041 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
@@ -71,7 +71,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Dictionary' ,
@@ -86,7 +85,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -231,7 +229,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Dictionary' ,
@@ -310,7 +307,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
index 79a6108..7ed2967 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
@@ -69,7 +69,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -239,7 +238,6 @@
<call function="'manageAccountWithScript'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-password-history' ,
@@ -464,7 +462,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -562,7 +559,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -576,7 +572,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml
index 2f6f6e4..03f87e0 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml
@@ -75,7 +75,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -89,7 +88,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'create-password-validator' ,
@@ -105,7 +103,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'password-policy' ,
@@ -122,7 +119,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'password-policy' ,
@@ -160,7 +156,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Attribute Value' ,
@@ -248,7 +243,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Custom Attribute Value' ,
@@ -397,7 +391,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
index ff58a15..073be08 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
@@ -90,7 +90,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -174,7 +173,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'password-validator' ,
@@ -309,7 +307,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'password-validator' ,
@@ -358,7 +355,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'password-validator' ,
@@ -493,7 +489,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'password-validator' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
index db6e170..f2a029f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
@@ -68,7 +68,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -205,7 +204,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Repeated Characters' ,
@@ -290,7 +288,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Repeated Characters' ,
@@ -324,7 +321,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Repeated Characters' ,
@@ -464,7 +460,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
index 0510238..7f4d223 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
@@ -73,7 +73,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -87,7 +86,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -174,7 +172,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -418,7 +415,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -462,7 +458,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
index 7aa0909..450b179 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
@@ -80,7 +80,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -170,7 +169,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -236,7 +234,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'password-validator' ,
@@ -366,7 +363,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -380,7 +376,6 @@
<call function="'dsconfigSet'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'password-validator' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
index 28c8a25..217afb1 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
@@ -68,7 +68,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -253,7 +252,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Unique Characters' ,
@@ -338,7 +336,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Unique Characters' ,
@@ -373,7 +370,6 @@
<call function="'modifyPwdValidator'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Unique Characters' ,
@@ -512,7 +508,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
index 563ab10..87056c6 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
@@ -61,7 +61,6 @@
<call function="'modifySaslMech'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'handlerName' : 'ANONYMOUS' ,
@@ -140,7 +139,6 @@
<call function="'modifySaslMech'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'handlerName' : 'ANONYMOUS' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
index c4a0035..e87e1a8 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
@@ -63,7 +63,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -320,7 +319,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
index 5a594af..b2f0ef7 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
@@ -63,7 +63,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
@@ -303,7 +302,6 @@
<call function="'modifyIdentityMapper'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'mapperName' : 'Exact Match' ,
@@ -405,7 +403,6 @@
<call function="'modifyIdentityMapper'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'mapperName' : 'Exact Match' ,
@@ -573,7 +570,6 @@
<call function="'modifySaslMech'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'handlerName' : 'DIGEST-MD5' ,
@@ -950,7 +946,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : global_aci ,
@@ -1099,7 +1094,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : global_aci ,
@@ -1198,7 +1192,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : global_aci ,
@@ -1347,7 +1340,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : global_aci ,
@@ -1446,7 +1438,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : global_aci ,
@@ -1595,7 +1586,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : global_aci ,
@@ -1694,7 +1684,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : global_aci ,
@@ -1845,7 +1834,6 @@
<call function="'modifyGlobalAci'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'aciValue' : global_aci ,
@@ -1887,7 +1875,6 @@
<call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
index 775a16f..7c42cf1 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
@@ -88,7 +88,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'delete-sasl-mechanism-handler' ,
@@ -117,7 +116,6 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'create-sasl-mechanism-handler' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
index d82e4e4..641daa3 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
@@ -310,7 +310,6 @@
<call function="'modifySaslMech'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'handlerName' : 'PLAIN' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml
index e27de35..c435517 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml
@@ -46,11 +46,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
index fd7d117..7937af2 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
@@ -131,13 +131,11 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-connection-handler-prop' ,
'objectType' : 'handler-name' ,
'objectName' : 'LDAP Connection Handler',
- 'optionsString' : '-q -X',
'expectedRC' : 0
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
index cb218f9..18980a2 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
@@ -73,7 +73,6 @@
<call function="'configureTLS'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
index 761aa53..439ba26 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
@@ -58,7 +58,6 @@
<call function="'unconfigureTLS'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
index 5347549..7626855 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
@@ -64,6 +64,14 @@
<call function="'getFreePort'">
{
'host' : STAF_REMOTE_HOSTNAME,
+ 'port' : 5444,
+ }
+ </call>
+ <script>DM_I1_ADMIN_PORT = STAXResult</script>
+
+ <call function="'getFreePort'">
+ {
+ 'host' : STAF_REMOTE_HOSTNAME,
'port' : 6000,
}
</call>
@@ -72,6 +80,14 @@
<call function="'getFreePort'">
{
'host' : STAF_REMOTE_HOSTNAME,
+ 'port' : 6444,
+ }
+ </call>
+ <script>DM_I2_ADMIN_PORT = STAXResult</script>
+
+ <call function="'getFreePort'">
+ {
+ 'host' : STAF_REMOTE_HOSTNAME,
'port' : 6500,
}
</call>
@@ -80,6 +96,14 @@
<call function="'getFreePort'">
{
'host' : STAF_REMOTE_HOSTNAME,
+ 'port' : 6544,
+ }
+ </call>
+ <script>DM_I3_ADMIN_PORT = STAXResult</script>
+
+ <call function="'getFreePort'">
+ {
+ 'host' : STAF_REMOTE_HOSTNAME,
'port' : 7000,
}
</call>
@@ -94,9 +118,10 @@
<script>DM_I2_REPLICATION_PORT = STAXResult</script>
<message>
- 'Got these free ports: %s, %s, %s, %s and %s' % \
- (DM_I1_PORT, DM_I2_PORT, DM_I3_PORT, DM_I1_REPLICATION_PORT, \
- DM_I2_REPLICATION_PORT)
+ 'Got these free ports: %s, %s, %s, %s, %s, %s, %s and %s' % \
+ (DM_I1_PORT, DM_I1_ADMIN_PORT, DM_I2_PORT, DM_I2_ADMIN_PORT, \
+ DM_I3_PORT, DM_I3_ADMIN_PORT, DM_I1_REPLICATION_PORT, \
+ DM_I2_REPLICATION_PORT)
</message>
@@ -172,6 +197,7 @@
c = '%s/setup%s' % (DM_I1_ROOT, fileExt)
p = []
p.append('--cli --no-prompt --ldapPort %s' % (DM_I1_PORT))
+ p.append('--adminConnectorPort %s' % DM_I1_ADMIN_PORT)
p.append('--rootUserPassword "kangourou"')
p = ' '.join(p)
</script>
@@ -229,6 +255,7 @@
c = '%s/setup%s' % (DM_I2_ROOT, fileExt)
p = []
p.append('--cli --no-prompt --ldapPort %s' % (DM_I2_PORT))
+ p.append('--adminConnectorPort %s' % DM_I2_ADMIN_PORT)
p.append('--rootUserDN "cn=DM" --rootUserPassword "kangourou"')
p = ' '.join(p)
</script>
@@ -255,7 +282,8 @@
c = '%s/%s/dsconfig%s' % (DM_I1_ROOT, fileFolder, fileExt)
p = []
p.append('create-backend --bindDN "cn=directory manager"')
- p.append('--bindPassword kangourou --port %s' % (DM_I1_PORT))
+ p.append('--bindPassword kangourou')
+ p.append('--trustAll --port %s' % DM_I1_ADMIN_PORT)
p.append('--backend-name o1 --type local-db --no-prompt')
p.append('--set enabled:true --set writability-mode:enabled')
p.append('--set base-dn:"o=o1"')
@@ -278,7 +306,8 @@
c = '%s/%s/dsconfig%s' % (DM_I2_ROOT, fileFolder, fileExt)
p = []
p.append('create-backend --bindDN "cn=DM" --bindPassword kangourou')
- p.append('--port %s --backend-name o1' % DM_I2_PORT)
+ p.append('--trustAll --port %s' % DM_I2_ADMIN_PORT)
+ p.append('--backend-name o1')
p.append('--type local-db --no-prompt --set enabled:true')
p.append('--set writability-mode:enabled --set base-dn:"o=o1"')
p.append('')
@@ -303,7 +332,7 @@
c = '%s/%s/import-ldif%s' % (DM_I1_ROOT, fileFolder, fileExt)
p = []
p.append('--bindDN "cn=directory manager" --bindPassword kangourou')
- p.append('--port %s --backendID o1' % DM_I1_PORT)
+ p.append('--trustAll --port %s --backendID o1' % DM_I1_ADMIN_PORT)
p.append('--ldifFile %s' % DM_O1_LDIF)
p = ' '.join(p)
</script>
@@ -323,14 +352,14 @@
<script>
c = '%s/%s/dsreplication%s' % (DM_I1_ROOT, fileFolder, fileExt)
p = []
- p.append('enable --host1 %s' % STAF_REMOTE_HOSTNAME)
+ p.append('enable --trustAll --host1 %s' % STAF_REMOTE_HOSTNAME)
p.append('--bindDN1 "cn=directory manager"')
p.append('--bindPassword1 kangourou')
- p.append('--port1 %s' % DM_I1_PORT)
+ p.append('--port1 %s' % DM_I1_ADMIN_PORT)
p.append('--replicationPort1 %s' % DM_I1_REPLICATION_PORT)
p.append('--host2 %s --bindDN2 "cn=DM"' % STAF_REMOTE_HOSTNAME)
p.append('--bindPassword2 kangourou')
- p.append('--port2 %s' % (DM_I2_PORT))
+ p.append('--port2 %s' % DM_I2_ADMIN_PORT)
p.append('--replicationPort2 %s' % DM_I2_REPLICATION_PORT)
p.append('-I admin -w secret12')
p.append('--baseDN "o=o1" --no-prompt')
@@ -354,10 +383,10 @@
p = []
p.append('initialize -I admin -w secret12 --baseDN "o=o1"')
p.append('--hostSource %s' % STAF_REMOTE_HOSTNAME)
- p.append('--portSource %s' % DM_I1_PORT)
+ p.append('--portSource %s' % DM_I1_ADMIN_PORT)
p.append('--hostDestination %s' % STAF_REMOTE_HOSTNAME)
- p.append('--portDestination %s' % DM_I2_PORT)
- p.append('--no-prompt')
+ p.append('--portDestination %s' % DM_I2_ADMIN_PORT)
+ p.append('--no-prompt --trustAll')
p = ' '.join(p)
</script>
@@ -379,7 +408,7 @@
<script>
c = '%s/%s/backup%s' % (DM_I1_ROOT, fileFolder, fileExt)
p = []
- p.append('--backendID o1 --port %s' % DM_I1_PORT)
+ p.append('--trustAll --backendID o1 --port %s' % DM_I1_ADMIN_PORT)
p.append('--bindDN "cn=directory manager"')
p.append('--bindPassword "kangourou"')
p.append('--backupDirectory %s/bak' % DM_I1_ROOT)
@@ -401,7 +430,7 @@
<script>
c = '%s/%s/backup%s' % (DM_I2_ROOT, fileFolder, fileExt)
p = []
- p.append('--backendID o1 --port %s' % DM_I2_PORT)
+ p.append('--trustAll --backendID o1 --port %s' % DM_I2_ADMIN_PORT)
p.append('--bindDN "cn=DM" --bindPassword "kangourou"')
p.append('--backupDirectory %s/bak' % DM_I2_ROOT)
p = ' '.join(p)
@@ -467,7 +496,7 @@
<script>
c = '%s/uninstall%s' % (DM_I1_ROOT, fileExt)
p = []
- p.append('--cli --no-prompt')
+ p.append('--cli --no-prompt --trustAll')
p.append('--adminUID admin --bindPassword secret12')
p.append('--configuration-files')
p.append('--databases')
@@ -494,7 +523,7 @@
<script>
c = '%s/uninstall%s' % (DM_I2_ROOT, fileExt)
p = []
- p.append('--cli --no-prompt')
+ p.append('--cli --no-prompt --trustAll')
p.append('--remove-all')
p = ' '.join(p)
</script>
@@ -517,7 +546,7 @@
<script>
c = '%s/uninstall%s' % (DM_I2_ROOT, fileExt)
p = []
- p.append('--cli --no-prompt')
+ p.append('--cli --no-prompt --trustAll')
p.append('--adminUID admin --bindPassword secret12')
p.append('--backup-files')
p.append('--ldif-files')
@@ -651,6 +680,7 @@
c = '%s/setup%s' % (DM_I3_ROOT, fileExt)
p = []
p.append('--cli --no-prompt --rootUserDN "cn=DM"')
+ p.append('--adminConnectorPort %s' % DM_I3_ADMIN_PORT)
p.append('--rootUserPasswordFile %s/does-not-exist.txt' % OUT_GROUP)
p = ' '.join(p)
</script>
@@ -717,7 +747,7 @@
<script>
c = '%s/uninstall%s' % (DM_I3_ROOT, fileExt)
p = []
- p.append('--cli --no-prompt')
+ p.append('--cli --no-prompt --trustAll')
p.append('--remove-all')
p.append('--referencedHostName %s' % STAF_REMOTE_HOSTNAME)
p = ' '.join(p)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
index 41fa8fb..9eeff57 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
@@ -65,13 +65,30 @@
<call function="'getFreePort'">
{
'host' : STAF_REMOTE_HOSTNAME,
+ 'port' : 5544,
+ }
+ </call>
+ <script>IMP_I1_ADMIN_PORT = STAXResult</script>
+
+ <call function="'getFreePort'">
+ {
+ 'host' : STAF_REMOTE_HOSTNAME,
'port' : 5600,
}
</call>
<script>IMP_I2_PORT = STAXResult</script>
+ <call function="'getFreePort'">
+ {
+ 'host' : STAF_REMOTE_HOSTNAME,
+ 'port' : 5644,
+ }
+ </call>
+ <script>IMP_I2_ADMIN_PORT = STAXResult</script>
+
<message>
- 'Got these free ports: %s, %s' % (IMP_I1_PORT, IMP_I2_PORT)
+ 'Got these free ports: %s, %s, %sand %s' % (IMP_I1_PORT, \
+ IMP_I1_ADMIN_PORT, IMP_I2_PORT, IMP_I2_ADMIN_PORT)
</message>
<!--- Test Case information
@@ -142,6 +159,7 @@
c = '%s/setup%s' % (IMP_I1_ROOT, fileExt)
p = []
p.append('--cli --no-prompt --ldapPort %s' % (IMP_I1_PORT))
+ p.append('--adminConnectorPort %s' % IMP_I1_ADMIN_PORT)
p.append('--rootUserPassword "kangourou"')
p.append('--baseDN "o=o1"')
p.append('--baseDN "o=o2"')
@@ -323,6 +341,7 @@
p.append('--cli --no-prompt --rootUserDN "cn=DM"')
p.append('--rootUserPassword "kangourou"')
p.append('--ldapPort %s' % IMP_I2_PORT)
+ p.append('--adminConnectorPort %s' % IMP_I2_ADMIN_PORT)
p.append('--baseDN "o=o1"')
p.append('--ldifFile %s' % IMP_LDIF_FILE)
p.append('--rejectFile %s' % IMP_REJECT_FILE)
@@ -416,11 +435,11 @@
<!-- 2. Stop DS -->
<message>'Stop DS'</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsPath' : '%s' % IMP_I2_ROOT,
- 'dsPort' : IMP_I2_PORT,
- 'dsBindDN' : 'cn=DM',
- 'dsBindPwd' : 'kangourou',
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsPath' : '%s' % IMP_I2_ROOT,
+ 'dsAdminPort' : IMP_I2_ADMIN_PORT,
+ 'dsBindDN' : 'cn=DM',
+ 'dsBindPwd' : 'kangourou',
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
index 86b8a9e..0031122 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
@@ -174,7 +174,7 @@
<script>
c = '%s/uninstall%s' % (MISC_I1_ROOT, fileExt)
p = []
- p.append('--cli --no-prompt')
+ p.append('--cli --no-prompt --trustAll')
p.append('--removeAll')
p = ' '.join(p)
</script>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
index 4ab01f5..7cc0448 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
@@ -387,7 +387,7 @@
<call function="'StopDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsPath' : '%s/%s' % (ODS_UNZIPPED, OPENDSNAME),
- 'dsPort' : 1,
+ 'dsAdminPort' : 1,
'dsBindDN' : 'cn=Directory Manager' ,
'dsBindPwd' : 'kangourou' ,
'expectedRC' : 'noCheck'
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
index 8108a80..bc4d0e5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
@@ -68,6 +68,14 @@
}
</call>
<script>SEC_I1_SPORT = STAXResult</script>
+
+ <call function="'getFreePort'">
+ {
+ 'host' : STAF_REMOTE_HOSTNAME,
+ 'port' : 8524,
+ }
+ </call>
+ <script>SEC_I1_ADMIN_PORT = STAXResult</script>
<call function="'getFreePort'">
{
@@ -92,6 +100,14 @@
}
</call>
<script>SEC_I2_SPORT = STAXResult</script>
+
+ <call function="'getFreePort'">
+ {
+ 'host' : STAF_REMOTE_HOSTNAME,
+ 'port' : 8624,
+ }
+ </call>
+ <script>SEC_I2_ADMIN_PORT = STAXResult</script>
<call function="'getFreePort'">
{
@@ -102,10 +118,10 @@
<script>SEC_I2_REPL_PORT = STAXResult</script>
<message>
- 'Got these free ports for I1: %s, %s, %s' % (SEC_I1_PORT, \
- SEC_I1_SPORT, SEC_I1_REPL_PORT)
- 'Got these free ports for I2: %s, %s, %s' % (SEC_I2_PORT, \
- SEC_I2_SPORT, SEC_I2_REPL_PORT)
+ 'Got these free ports for I1: %s, %s, %s, %s' % (SEC_I1_PORT, \
+ SEC_I1_SPORT, SEC_I1_ADMIN_PORT, SEC_I1_REPL_PORT)
+ 'Got these free ports for I2: %s, %s, %s, %s' % (SEC_I2_PORT, \
+ SEC_I2_SPORT, SEC_I2_ADMIN_PORT, SEC_I2_REPL_PORT)
</message>
@@ -192,6 +208,7 @@
p = []
p.append('--cli --no-prompt --ldapPort %s' % (SEC_I1_PORT))
p.append('--ldapsPort %s' % SEC_I1_SPORT)
+ p.append('--adminConnectorPort %s' % SEC_I1_ADMIN_PORT)
p.append('--rootUserDN "%s"' % DM_DN)
p.append('--rootUserPassword "%s"' % DM_PW)
p.append('--generateSelfSignedCertificate')
@@ -215,7 +232,7 @@
<script>
c = '%s/%s/status%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
- p.append('--no-prompt')
+ p.append('--no-prompt --trustAll')
p.append('--bindDN "%s" --bindPassword "%s"' % (DM_DN, DM_PW))
p = ' '.join(p)
</script>
@@ -239,15 +256,15 @@
<call function="'grep'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'filename' : grepFile,
- 'testString': 'Server Run Status: Started',
+ 'testString': 'Server Run Status: Started',
'expectedRC': 0,
}
</call>
- <!-- 1.3. Check config/keystore -->
- <message>'++ Check file config/keystore exists'</message>
+ <!-- 1.3. Check config/admin-keystore -->
+ <message>'++ Check file config/admin-keystore exists'</message>
<script>
- ks = '%s/config/keystore' % SEC_I1_ROOT
+ ks = '%s/config/admin-keystore' % SEC_I1_ROOT
</script>
<call function="'checkFileExists'">
@@ -326,6 +343,7 @@
p = []
p.append('--cli --no-prompt --ldapPort %s' % (SEC_I2_PORT))
p.append('--ldapsPort %s' % SEC_I2_SPORT)
+ p.append('--adminConnectorPort %s' % SEC_I2_ADMIN_PORT)
p.append('--rootUserDN "%s"' % DM_DN)
p.append('--rootUserPassword "%s"' % DM_PW)
p.append('--generateSelfSignedCertificate --enableStartTLS')
@@ -349,7 +367,7 @@
<script>
c = '%s/%s/status%s' % (SEC_I2_ROOT, fileFolder, fileExt)
p = []
- p.append('--no-prompt')
+ p.append('--no-prompt --trustAll')
p.append('--bindDN "%s" --bindPassword "%s"' % (DM_DN, DM_PW))
p = ' '.join(p)
</script>
@@ -373,15 +391,15 @@
<call function="'grep'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'filename' : grepFile,
- 'testString': 'Server Run Status: Started',
+ 'testString': 'Server Run Status: Started',
'expectedRC': 0,
}
</call>
- <!-- 2.3. Check config/keystore -->
- <message>'++ Check file config/keystore exists'</message>
+ <!-- 2.3. Check config/admin-keystore -->
+ <message>'++ Check file config/admin-keystore exists'</message>
<script>
- ks = '%s/config/keystore' % SEC_I2_ROOT
+ ks = '%s/config/admin-keystore' % SEC_I2_ROOT
</script>
<call function="'checkFileExists'">
@@ -425,7 +443,8 @@
c = '%s/%s/dsconfig%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
p.append('create-backend --bindDN "%s"' % DM_DN)
- p.append('--bindPassword "%s" --port %s' % (DM_PW, SEC_I1_PORT))
+ p.append('--bindPassword "%s"' % DM_PW)
+ p.append('--trustAll --port %s' % SEC_I1_ADMIN_PORT)
p.append('--backend-name o1 --type local-db --no-prompt')
p.append('--set enabled:true --set writability-mode:enabled')
p.append('--set base-dn:"o=o1"')
@@ -450,7 +469,8 @@
c = '%s/%s/dsconfig%s' % (SEC_I2_ROOT, fileFolder, fileExt)
p = []
p.append('create-backend --bindDN "%s"' % DM_DN)
- p.append('--bindPassword "%s" --port %s' % (DM_PW, SEC_I2_PORT))
+ p.append('--bindPassword "%s"' % DM_PW)
+ p.append('--trustAll --port %s' % SEC_I2_ADMIN_PORT)
p.append('--backend-name o1 --type local-db --no-prompt')
p.append('--set enabled:true --set writability-mode:enabled')
p.append('--set base-dn:"o=o1"')
@@ -475,7 +495,7 @@
c = '%s/%s/import-ldif%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
p.append('--bindDN "%s" --bindPassword "%s"' % (DM_DN, DM_PW))
- p.append('--port %s --backendID o1' % SEC_I1_PORT)
+ p.append('--trustAll --port %s --backendID o1' % SEC_I1_ADMIN_PORT)
p.append('--ldifFile %s' % SEC_O1_LDIF)
p = ' '.join(p)
</script>
@@ -497,14 +517,14 @@
<script>
c = '%s/%s/dsreplication%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
- p.append('enable --host1 %s' % STAF_REMOTE_HOSTNAME)
+ p.append('enable --trustAll --host1 %s' % STAF_REMOTE_HOSTNAME)
p.append('--bindDN1 "%s"' % DM_DN)
p.append('--bindPassword1 "%s"' % DM_PW)
- p.append('--port1 %s' % SEC_I1_PORT)
+ p.append('--port1 %s' % SEC_I1_ADMIN_PORT)
p.append('--replicationPort1 %s' % SEC_I1_REPL_PORT)
p.append('--host2 %s --bindDN2 "%s"' % (STAF_REMOTE_HOSTNAME, DM_DN))
p.append('--bindPassword2 "%s"' % DM_PW)
- p.append('--port2 %s' % (SEC_I2_PORT))
+ p.append('--port2 %s' % SEC_I2_ADMIN_PORT)
p.append('--replicationPort2 %s' % SEC_I2_REPL_PORT)
p.append('-I admin -w secret12')
p.append('--baseDN "o=o1" --no-prompt')
@@ -528,11 +548,12 @@
<script>
c = '%s/%s/dsreplication%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
- p.append('initialize -I admin -w secret12 --baseDN "o=o1"')
+ p.append('initialize --trustAll')
+ p.append('-I admin -w secret12 --baseDN "o=o1"')
p.append('--hostSource %s' % STAF_REMOTE_HOSTNAME)
- p.append('--portSource %s' % SEC_I1_PORT)
+ p.append('--portSource %s' % SEC_I1_ADMIN_PORT)
p.append('--hostDestination %s' % STAF_REMOTE_HOSTNAME)
- p.append('--portDestination %s' % SEC_I2_PORT)
+ p.append('--portDestination %s' % SEC_I2_ADMIN_PORT)
p.append('--no-prompt')
p = ' '.join(p)
</script>
@@ -689,8 +710,8 @@
<message>'++ Export server cert I1'</message>
<script>
CERT1_FILE = '%s/cert1' % OUT_GROUP
- KEYSTORE1_FILE = '%s/config/keystore' % SEC_I1_ROOT
- KEYSTORE1_PIN_FILE = '%s/config/keystore.pin' % SEC_I1_ROOT
+ KEYSTORE1_FILE = '%s/config/admin-keystore' % SEC_I1_ROOT
+ KEYSTORE1_PIN_FILE = '%s/config/admin-keystore.pin' % SEC_I1_ROOT
</script>
<call function="'runSTAFCommand'">
@@ -718,7 +739,7 @@
p = []
p.append('-export -keystore %s' % KEYSTORE1_FILE)
p.append('-storepass "%s"' % KEYSTORE1_PIN)
- p.append('-alias server-cert -file %s' % CERT1_FILE)
+ p.append('-alias admin-cert -file %s' % CERT1_FILE)
p = ' '.join(p)
</script>
@@ -738,8 +759,8 @@
<message>'++ Export server cert I2'</message>
<script>
CERT2_FILE = '%s/cert2' % OUT_GROUP
- KEYSTORE2_FILE = '%s/config/keystore' % SEC_I2_ROOT
- KEYSTORE2_PIN_FILE = '%s/config/keystore.pin' % SEC_I2_ROOT
+ KEYSTORE2_FILE = '%s/config/admin-keystore' % SEC_I2_ROOT
+ KEYSTORE2_PIN_FILE = '%s/config/admin-keystore.pin' % SEC_I2_ROOT
</script>
<call function="'runSTAFCommand'">
@@ -767,7 +788,7 @@
p = []
p.append('-export -keystore %s' % KEYSTORE2_FILE)
p.append('-storepass "%s"' % KEYSTORE2_PIN)
- p.append('-alias server-cert -file %s' % CERT2_FILE)
+ p.append('-alias admin-cert -file %s' % CERT2_FILE)
p = ' '.join(p)
</script>
@@ -790,7 +811,7 @@
p = []
p.append('-import -storetype JKS -keystore %s' % MY_KEYSTORE)
p.append('-file %s' % CERT1_FILE)
- p.append('-storepass secret12 -alias server-cert1')
+ p.append('-storepass secret12 -alias admin-cert1')
p.append('-noprompt')
p = ' '.join(p)
</script>
@@ -814,7 +835,7 @@
p = []
p.append('-import -storetype JKS -keystore %s' % MY_KEYSTORE)
p.append('-file %s' % CERT2_FILE)
- p.append('-storepass secret12 -alias server-cert2')
+ p.append('-storepass secret12 -alias admin-cert2')
p.append('-noprompt')
p = ' '.join(p)
</script>
@@ -838,7 +859,7 @@
p = []
p.append('--cli --no-prompt')
p.append('--adminUID admin --bindPassword %s' % DM_PW)
- p.append('--useSSL --useStartTLS --remove-all')
+ p.append('--remove-all')
p.append('--trustStorePath %s' % MY_KEYSTORE)
p.append('--trustStorePassword secret12')
p = ' '.join(p)
@@ -864,7 +885,7 @@
p = []
p.append('--cli --no-prompt')
p.append('--adminUID admin --bindPassword %s' % DM_PW)
- p.append('--useSSL --remove-all')
+ p.append('--remove-all')
p.append('--trustStorePath %s' % MY_KEYSTORE)
p.append('--trustStorePassword secret12')
p = ' '.join(p)
@@ -894,7 +915,7 @@
<call function="'StopDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsPath' : SEC_I1_ROOT,
- 'dsPort' : SEC_I1_PORT,
+ 'dsAdminPort' : SEC_I1_ADMIN_PORT,
'dsBindDN' : DM_DN ,
'dsBindPwd' : DM_PW ,
'expectedRC' : 'noCheck'
@@ -910,8 +931,7 @@
p = []
p.append('--cli --no-prompt')
p.append('--adminUID admin --bindPasswordFile %s' % DM_PW_FILE)
- p.append('--useStartTLS --remove-all')
- p.append('--trustAll')
+ p.append('--remove-all')
p = ' '.join(p)
</script>
@@ -939,7 +959,7 @@
<call function="'StopDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsPath' : SEC_I2_ROOT,
- 'dsPort' : SEC_I2_PORT,
+ 'dsAdminPort' : SEC_I2_ADMIN_PORT,
'dsBindDN' : DM_DN ,
'dsBindPwd' : DM_PW ,
'expectedRC' : 'noCheck'
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml
index d07ae92..a5e4d7f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml
@@ -74,11 +74,11 @@
<call function="'StopDsWithScript'">
{
- 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml
index 52313bd..e66bf93 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml
@@ -83,7 +83,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -99,11 +98,11 @@
</message>
<call function="'StopDsWithScript'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsPort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
<call function="'StartDsWithScript'">
@@ -151,7 +150,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -169,7 +167,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -205,7 +202,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
index d3b9674..cb49ee1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
@@ -211,7 +211,6 @@
<call function="'GetDSConfigProperties'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-connection-handler-prop' ,
@@ -298,7 +297,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -395,7 +393,6 @@
<call function="'GetDSConfigProperties'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'get-connection-handler-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
index f2c76ad..7595b18 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
@@ -89,11 +89,11 @@
<call function="'StopDsWithScript'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsPort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
@@ -209,7 +209,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -264,7 +263,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -354,7 +352,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -370,11 +367,11 @@
</message>
<call function="'StopDsWithScript'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsPort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
<call function="'StartDsWithScript'">
@@ -455,7 +452,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -473,7 +469,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -522,7 +517,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -538,11 +532,11 @@
</message>
<call function="'StopDsWithScript'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsPort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
<call function="'StartDsWithScript'">
@@ -636,7 +630,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -654,7 +647,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -702,7 +694,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -719,11 +710,11 @@
</message>
<call function="'StopDsWithScript'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsPort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
<call function="'StartDsWithScript'">
@@ -801,7 +792,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -819,7 +809,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml
index 9460e5d..8aa59e7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml
@@ -83,7 +83,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -101,7 +100,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -268,7 +266,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -286,7 +283,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -328,7 +324,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -346,7 +341,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -436,7 +430,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -453,7 +446,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -495,7 +487,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -513,7 +504,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -565,11 +555,11 @@
</message>
<call function="'StopDsWithScript'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsPort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
@@ -648,7 +638,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -665,7 +654,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -701,7 +689,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -714,7 +701,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -732,7 +718,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -784,11 +769,11 @@
</message>
<call function="'StopDsWithScript'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsPort' : DIRECTORY_INSTANCE_PORT ,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT ,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
<call function="'StartDsWithScript'">
@@ -854,7 +839,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -871,7 +855,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -913,7 +896,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_customconf.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_customconf.xml
index 09becfc..b2fdb8c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_customconf.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_customconf.xml
@@ -87,7 +87,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -104,7 +103,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -147,7 +145,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -164,7 +161,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -200,7 +196,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -217,7 +212,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -245,7 +239,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -262,7 +255,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -298,7 +290,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -316,7 +307,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -344,7 +334,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -362,7 +351,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -398,7 +386,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -411,7 +398,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -429,7 +415,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -457,7 +442,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -475,7 +459,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -511,7 +494,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_customconf.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_customconf.xml
index be567e2..4c274e9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_customconf.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_customconf.xml
@@ -87,7 +87,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -104,7 +103,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -147,7 +145,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -164,7 +161,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -200,7 +196,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -217,7 +212,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -245,7 +239,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -262,7 +255,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -298,7 +290,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -316,7 +307,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -344,7 +334,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -362,7 +351,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -398,7 +386,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -411,7 +398,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -429,7 +415,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -457,7 +442,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -475,7 +459,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -511,7 +494,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml
index 0ca7dc8..06dda94 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml
@@ -94,7 +94,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -112,7 +111,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -225,7 +223,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -242,7 +239,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -291,7 +287,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -308,7 +303,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -344,7 +338,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -356,7 +349,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -373,7 +365,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -422,7 +413,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -439,7 +429,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -475,7 +464,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -492,7 +480,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -541,7 +528,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -558,7 +544,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -594,7 +579,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -612,7 +596,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -679,7 +662,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -697,7 +679,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -733,7 +714,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -751,7 +731,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -818,7 +797,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -836,7 +814,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
@@ -872,7 +849,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -931,7 +907,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -949,7 +924,6 @@
<call function="'restartSNMPConnectionHandler'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD
}
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
index f6a3e31..1b2e940 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
@@ -66,37 +66,35 @@
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'subcommand' : 'set-global-configuration-prop',
- 'optionsString' : '--remove allowed-task:org.opends.server.tasks.ExportTask',
- 'expectedRC' : 0
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'subcommand' : 'set-global-configuration-prop',
+ 'optionsString' : '--remove allowed-task:org.opends.server.tasks.ExportTask',
+ 'expectedRC' : 0
}
</call>
<!-- the export task is not allowed. the task must be rejected -->
<call function="'exportLdif'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_asynchronous' % remote.data,
- 'startTask' : '0',
- 'backEnd' : DIRECTORY_INSTANCE_BE,
- 'expectedRC' : 1}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'ldifFile' : '%s/tasks/export_asynchronous' % remote.data,
+ 'startTask' : '0',
+ 'backEnd' : DIRECTORY_INSTANCE_BE,
+ 'expectedRC' : 1}
</call>
<call function="'dsconfig'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'subcommand' : 'set-global-configuration-prop',
- 'optionsString' : '--add allowed-task:org.opends.server.tasks.ExportTask',
- 'expectedRC' : 0
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'subcommand' : 'set-global-configuration-prop',
+ 'optionsString' : '--add allowed-task:org.opends.server.tasks.ExportTask',
+ 'expectedRC' : 0
}
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
index 05e14bb..f97843b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
@@ -67,21 +67,20 @@
<call function="'backup'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_asynchronous' % remote.data,
- 'startTask' : '0',
- 'backEnd' : DIRECTORY_INSTANCE_BE}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'backupDir' : '%s/tasks/backup_asynchronous' % remote.data,
+ 'startTask' : '0',
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
<!-- manage-tasks -->
<call function="'manage-tasks'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'dsQuiet' : ' '
@@ -137,13 +136,13 @@
<call function="'testCase_Preamble'"/>
<call function="'backup'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_synchronous' % remote.data,
- 'backEnd' : DIRECTORY_INSTANCE_BE}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'backupDir' : '%s/tasks/backup_synchronous' % remote.data,
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
<message>'--- Check log files ---'</message>
@@ -183,14 +182,14 @@
<call function="'backup'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'startTask' : '20061212000000',
- 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % remote.data,
- 'backEnd' : DIRECTORY_INSTANCE_BE}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'startTask' : '20061212000000',
+ 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % remote.data,
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml
index bd3724f..896c148 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml
@@ -41,10 +41,10 @@
<call function="'StopDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
{ 'returncode' : RC ,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
index 9a2c9c9..5687958 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
@@ -65,14 +65,14 @@
<call function="'testCase_Preamble'"/>
<call function="'exportLdif'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_asynchronous' % remote.data,
- 'startTask' : '0',
- 'backEnd' : DIRECTORY_INSTANCE_BE}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'ldifFile' : '%s/tasks/export_asynchronous' % remote.data,
+ 'startTask' : '0',
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
<message>'--- Check log files export_asynchronous ---'</message>
<call function="'listFolder'">
@@ -113,20 +113,19 @@
<call function="'testCase_Preamble'"/>
<call function="'exportLdif'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_synchronous' % remote.data,
- 'backEnd' : DIRECTORY_INSTANCE_BE}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'ldifFile' : '%s/tasks/export_synchronous' % remote.data,
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
<!-- manage-tasks -->
<call function="'manage-tasks'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'dsQuiet' : ' '
@@ -181,14 +180,14 @@
<call function="'exportLdif'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'ldifFile' : '%s/tasks/export_schedule_asynchronous' % remote.data,
- 'startTask' : '20061212000000',
- 'backEnd' : DIRECTORY_INSTANCE_BE}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'ldifFile' : '%s/tasks/export_schedule_asynchronous' % remote.data,
+ 'startTask' : '20061212000000',
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
<message>'--- Check log files export_asynchronous ---'</message>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
index 30ae1f9..0fab933 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -65,21 +65,20 @@
<call function="'testCase_Preamble'"/>
<call function="'ImportLdifWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
- 'dsAppend' : ' ',
- 'dsBackEnd' : DIRECTORY_INSTANCE_BE}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
+ 'dsAppend' : ' ',
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE}
</call>
<!-- manage-tasks -->
<call function="'manage-tasks'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'dsQuiet' : ' '
@@ -144,15 +143,15 @@
<call function="'testCase_Preamble'"/>
<call function="'ImportLdifWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
- 'dsAppend' : ' ',
- 'startTask' : '0',
- 'dsBackEnd' : DIRECTORY_INSTANCE_BE}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
+ 'dsAppend' : ' ',
+ 'startTask' : '0',
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE}
</call>
<call function="'Sleep'">
{ 'location' : STAF_REMOTE_HOSTNAME,
@@ -205,15 +204,15 @@
<call function="'testCase_Preamble'"/>
<call function="'ImportLdifWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
- 'dsAppend' : ' ',
- 'startTask' : '20061212000000',
- 'dsBackEnd' : DIRECTORY_INSTANCE_BE}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
+ 'dsAppend' : ' ',
+ 'startTask' : '20061212000000',
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE}
</call>
<call function="'Sleep'">
{ 'location' : STAF_REMOTE_HOSTNAME,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
index 8bd785c..609de24 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
@@ -65,12 +65,12 @@
<call function="'StopDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
- 'dsRestart' : ' ',
- 'dsStopTime' : '20061212000000' }
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsRestart' : ' ',
+ 'dsStopTime' : '20061212000000' }
</call>
<call function="'Sleep'">
@@ -112,11 +112,11 @@
<call function="'StopDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
- 'dsStopTime' : '20061212000000' }
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsStopTime' : '20061212000000' }
</call>
<call function="'SearchObject'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
index d5c0ec3..ca231ed 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
@@ -62,13 +62,13 @@
<call function="'testCase_Preamble'"/>
<call function="'restore'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_asynchronous' % remote.data,
- 'startTask' : '0'}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'backupDir' : '%s/tasks/backup_asynchronous' % remote.data,
+ 'startTask' : '0'}
</call>
@@ -96,19 +96,18 @@
<call function="'restore'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'backupDir' : '%s/tasks/backup_synchronous' % remote.data}
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'backupDir' : '%s/tasks/backup_synchronous' % remote.data}
</call>
<!-- manage-tasks -->
<call function="'manage-tasks'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'dsQuiet' : ' '
@@ -151,13 +150,13 @@
<call function="'restore'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'startTask' : '%s' % mydate,
- 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % remote.data
+ { 'location' : STAF_REMOTE_HOSTNAME ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstanceAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'startTask' : '%s' % mydate,
+ 'backupDir' : '%s/tasks/backup_schedule_asynchronous' % remote.data
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml
index e88fdcb..f00ba27 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml
@@ -54,11 +54,11 @@
</message>
<call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
index 0101b31..ae6ea25 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
@@ -119,7 +119,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-virtual-attribute',
@@ -135,7 +134,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'list-virtual-attributes',
@@ -187,7 +185,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-virtual-attribute-prop',
@@ -226,7 +223,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
@@ -275,7 +271,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-virtual-attribute',
@@ -291,7 +286,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'list-virtual-attributes',
@@ -361,7 +355,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
@@ -410,7 +403,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-virtual-attribute',
@@ -466,7 +458,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
@@ -513,7 +504,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-virtual-attribute',
@@ -555,7 +545,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'set-virtual-attribute-prop',
@@ -593,7 +582,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
@@ -643,7 +631,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-virtual-attribute',
@@ -694,7 +681,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
@@ -745,7 +731,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-virtual-attribute',
@@ -796,7 +781,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
@@ -846,7 +830,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-virtual-attribute',
@@ -897,7 +880,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
@@ -947,7 +929,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'create-virtual-attribute',
@@ -1009,7 +990,6 @@
<call function="'dsconfig'">
{
'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'subcommand' : 'delete-virtual-attribute',
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml
index 0f23b6f..0577379 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml
@@ -47,13 +47,13 @@
<mkdir dir="${tests.run.dir}/${tests.run.time}/server-logs"/>
<mkdir dir="${tests.run.dir}/${tests.run.time}/coverage"/>
- <delete file="${test.plan.default}"/>
+ <!--<delete file="${test.plan.default}"/>
<for list="${test.plan.list}" param="item">
<sequential>
<echo file="${test.plan.default}" append="true">@{item}
</echo>
</sequential>
- </for>
+ </for>-->
<!-- generate the timestamped config file that will be used for this run -->
<copy file="${tests.config.stubs}"
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
index 7d13f9e..a8d5264 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -27,19 +27,47 @@
! -->
<stax>
+ <function name="_adminCommonArgs">
+ <function-prolog>
+ This function resolves common admin arguments
+ </function-prolog>
+ <function-no-args/>
+
+ <script>
+ if dsInstanceHost:
+ STAFCmdParamsList.append('-h %s' % dsInstanceHost)
+
+ if dsInstanceAdminPort:
+ STAFCmdParamsList.append('-p %s' % dsInstanceAdminPort)
+ STAFCmdParamsList.append('-X')
+
+ if dsInstanceDn:
+ STAFCmdParamsList.append('-D "%s"' % dsInstanceDn)
+
+ if dsInstancePswd:
+ STAFCmdParamsList.append('-w "%s"' % dsInstancePswd)
+
+ </script>
+
+ </function>
+
<!-- This function sets up DS using the setup script -->
<function name="SetUpDsWithScript">
<function-prolog>
This function sets up a Directory Server using a script
</function-prolog>
<function-map-args>
- <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="location"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Location of target host
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -51,6 +79,14 @@
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
+ <function-arg-def name="dsAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
+ <function-arg-description>
+ Directory server admin port number
+ </function-arg-description>
+ <function-arg-property name="type" value="Port number"/>
+ </function-arg-def>
<function-arg-def name="dsJmxPort" type="optional">
<function-arg-description>
Directory server JMX port number
@@ -115,7 +151,10 @@
if dsPort:
STAFCmdParamsList.append('-p %s' % dsPort)
-
+
+ if dsAdminPort:
+ STAFCmdParamsList.append('--adminConnectorPort %s' % dsAdminPort)
+
if dsJmxPort:
STAFCmdParamsList.append('-x %s' % dsJmxPort)
@@ -267,13 +306,17 @@
This function starts a Directory Server using the script
</function-prolog>
<function-map-args>
- <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="location"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Location of target host
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -285,9 +328,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPort" type="optional">
+ <function-arg-def name="dsAdminPort" type="optional">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="integer"/>
</function-arg-def>
@@ -421,9 +464,10 @@
if dsHost:
STAFCmdParamsList.append('-h %s' % dsHost)
- if dsPort:
- STAFCmdParamsList.append('-p %s' % dsPort)
-
+ if dsAdminPort:
+ STAFCmdParamsList.append('-p %s' % dsAdminPort)
+ STAFCmdParamsList.append('-X')
+
if dsUseSSL:
STAFCmdParamsList.append('-Z')
@@ -453,9 +497,6 @@
if dsStopTime:
STAFCmdParamsList.append('-t "%s"' % dsStopTime)
-
- if dsTrustAll:
- STAFCmdParamsList.append('-X')
if dsKeyStoreFile:
STAFCmdParamsList.append('-K "%s"' % dsKeyStoreFile)
@@ -506,41 +547,62 @@
This function restarts a Directory Server
</function-prolog>
<function-map-args>
- <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="location"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Location of target host
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsHost" type="optional" default="'%s' % DIRECTORY_INSTANCE_HOST">
+ <function-arg-def name="dsHost"
+ type="optional"
+ default="'%s' % DIRECTORY_INSTANCE_HOST">
<function-arg-description>
Directory server hostname or IP address
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPort" type="optional" default="'%s' % DIRECTORY_INSTANCE_PORT">
+ <function-arg-def name="dsPort"
+ type="optional"
+ default="'%s' % DIRECTORY_INSTANCE_PORT">
<function-arg-description>
Directory server port number
</function-arg-description>
<function-arg-property name="type" value="port"/>
</function-arg-def>
-
- <function-arg-def name="dsBindDN" type="optional" default="'%s' % DIRECTORY_INSTANCE_DN">
+
+ <function-arg-def name="dsAdminPort"
+ type="optional"
+ default="'%s' % DIRECTORY_INSTANCE_ADMIN_PORT">
+ <function-arg-description>
+ Directory server admin port number
+ </function-arg-description>
+ <function-arg-property name="type" value="port"/>
+ </function-arg-def>
+
+ <function-arg-def name="dsBindDN"
+ type="optional"
+ default="'%s' % DIRECTORY_INSTANCE_DN">
<function-arg-description>
Bind DN
</function-arg-description>
<function-arg-property name="type" value="DN"/>
</function-arg-def>
- <function-arg-def name="dsBindPwd" type="optional" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+ <function-arg-def name="dsBindPwd"
+ type="optional"
+ default="'%s' % DIRECTORY_INSTANCE_PSWD">
<function-arg-description>
Bind password
</function-arg-description>
@@ -576,9 +638,10 @@
if dsHost:
STAFCmdParamsList.append('-h %s' % dsHost)
- if dsPort:
- STAFCmdParamsList.append('-p %s' % dsPort)
-
+ if dsAdminPort:
+ STAFCmdParamsList.append('-p %s' % dsAdminPort)
+ STAFCmdParamsList.append('-X')
+
if dsBindDN:
STAFCmdParamsList.append('-D "%s"' % dsBindDN)
@@ -702,13 +765,17 @@
This function performs an offline import of an ldif file using the script
</function-prolog>
<function-map-args>
- <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="location"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Location of target host
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -719,9 +786,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort" type="optional">
<function-arg-description>
- Directory server port number
+ Directory server adminport number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
@@ -881,7 +948,7 @@
</script>
<!-- Set common ldap arguments -->
- <call function="'_ldapCommonArgs'" />
+ <call function="'_adminCommonArgs'" />
<script>
if dsPath:
@@ -1264,37 +1331,57 @@
This function verifies an import of an ldif file
</function-prolog>
<function-map-args>
- <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="location"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Location of target host
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
<function-arg-property name="type" value="pathname"/>
</function-arg-def>
- <function-arg-def name="dsHost" type="optional" default="DIRECTORY_INSTANCE_HOST">
+ <function-arg-def name="dsHost"
+ type="optional"
+ default="DIRECTORY_INSTANCE_HOST">
<function-arg-description>
Directory server hostname or IP address
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPort" type="optional" default="DIRECTORY_INSTANCE_PORT">
+ <function-arg-def name="dsPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_PORT">
<function-arg-description>
Directory server port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
- <function-arg-def name="dsDn" type="optional" default="DIRECTORY_INSTANCE_DN">
+ <function-arg-def name="dsAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
+ <function-arg-description>
+ Directory server admin port number
+ </function-arg-description>
+ <function-arg-property name="type" value="Port number"/>
+ </function-arg-def>
+ <function-arg-def name="dsDn"
+ type="optional"
+ default="DIRECTORY_INSTANCE_DN">
<function-arg-description>
Bind DN
</function-arg-description>
<function-arg-property name="type" value="DN"/>
</function-arg-def>
- <function-arg-def name="dsPswd" type="optional" default="DIRECTORY_INSTANCE_PSWD">
+ <function-arg-def name="dsPswd"
+ type="optional"
+ default="DIRECTORY_INSTANCE_PSWD">
<function-arg-description>
Bind password
</function-arg-description>
@@ -1306,25 +1393,33 @@
</function-arg-description>
<function-arg-property name="type" value="list"/>
</function-arg-def>
- <function-arg-def name="missingEntries" type="optional" default="'NULL'">
+ <function-arg-def name="missingEntries"
+ type="optional"
+ default="'NULL'">
<function-arg-description>
Optional entries expected to be missing after import
</function-arg-description>
<function-arg-property name="type" value="list"/>
</function-arg-def>
- <function-arg-def name="expectedAttributes" type="optional" default="'NULL'">
+ <function-arg-def name="expectedAttributes"
+ type="optional"
+ default="'NULL'">
<function-arg-description>
Optional attributes expected to be present after import
</function-arg-description>
<function-arg-property name="type" value="list"/>
</function-arg-def>
- <function-arg-def name="missingAttributes" type="optional" default="'NULL'">
+ <function-arg-def name="missingAttributes"
+ type="optional"
+ default="'NULL'">
<function-arg-description>
Optional attributes expected to be missing after import
</function-arg-description>
<function-arg-property name="type" value="list"/>
</function-arg-def>
- <function-arg-def name="suffix" type="optional" default="DIRECTORY_INSTANCE_SFX">
+ <function-arg-def name="suffix"
+ type="optional"
+ default="DIRECTORY_INSTANCE_SFX">
<function-arg-description>
Optional main suffix for the import
</function-arg-description>
@@ -1346,6 +1441,7 @@
myPath=dsPath
myhost=dsHost
myport=dsPort
+ myadminport=dsAdminPort
mydn=dsDn
mypswd=dsPswd
</script>
@@ -1428,12 +1524,12 @@
<if expr="stopDS == 'yes'">
<!-- StopDS -->
<call function="'StopDsWithScript'">
- { 'location' : myLocation ,
- 'dsPath' : myPath,
- 'dsHost' : myhost ,
- 'dsPort' : myport ,
- 'dsBindDN' : mydn ,
- 'dsBindPwd' : mypswd }
+ { 'location' : myLocation ,
+ 'dsPath' : myPath,
+ 'dsHost' : myhost ,
+ 'dsAdminPort' : myadminport ,
+ 'dsBindDN' : mydn ,
+ 'dsBindPwd' : mypswd }
</call>
</if>
</sequence>
@@ -1445,13 +1541,17 @@
</function-prolog>
<function-map-args>
- <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="location"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Location of target host
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1463,9 +1563,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort" type="optional">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
@@ -1524,7 +1624,7 @@
</script>
<!-- Set common ldap arguments -->
- <call function="'_ldapCommonArgs'" />
+ <call function="'_adminCommonArgs'" />
<script>
if dsPath:
@@ -1820,13 +1920,17 @@
This function performs an off line backup
</function-prolog>
<function-map-args>
- <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="location"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Location of target host
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1838,9 +1942,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort" type="optional">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
@@ -1897,7 +2001,7 @@
</script>
<!-- Set common ldap arguments -->
- <call function="'_ldapCommonArgs'" />
+ <call function="'_adminCommonArgs'" />
<script>
if dsPath:
@@ -2159,13 +2263,17 @@
This function performs an off line restore
</function-prolog>
<function-map-args>
- <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="location"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Location of target host
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -2177,9 +2285,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort" type="optional">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
@@ -2230,7 +2338,7 @@
</script>
<!-- Set common ldap arguments -->
- <call function="'_ldapCommonArgs'" />
+ <call function="'_adminCommonArgs'" />
<script>
if dsPath:
@@ -3258,7 +3366,7 @@
STAFCmd='%s/ldapmodify%s' % (dsBinPath,fileExt)
STAFCmdParamsList.append('-a')
-
+
if dsHost:
STAFCmdParamsList.append('-h %s' % dsHost)
@@ -3495,13 +3603,17 @@
This function shows server status using the status script
</function-prolog>
<function-map-args>
- <function-arg-def name="location" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="location"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Location of target host
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -3541,6 +3653,8 @@
STAFCmdParams=''
STAFCmdParamsList.append('-n')
+ STAFCmdParamsList.append('-X')
+
if dsPath:
dsBinPath='%s/%s' % (dsPath,fileFolder)
STAFCmd='%s/status%s' % (dsBinPath,fileExt)
@@ -3912,7 +4026,7 @@
</function>
<!-- manage-tasks Function -->
- <function name="manage-tasks">
+ <function name="manage-tasks" scope="local">
<function-prolog>
This function performs a manage-tasks command line
</function-prolog>
@@ -3938,12 +4052,14 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
- </function-arg-def>
+ </function-arg-def>
<function-arg-def name="dsInstanceDn" type="optional">
<function-arg-description>
Bind DN
@@ -4082,12 +4198,14 @@
</script>
<!-- Set common ldap arguments -->
- <call function="'_ldapCommonArgs'" />
+ <call function="'_adminCommonArgs'" />
<script>
if dsPath:
dsBinPath='%s/%s' % (dsPath,fileFolder)
STAFCmd='%s/manage-tasks%s' % (dsBinPath,fileExt)
+
+
if dsBindPasswordFile:
STAFCmdParamsList.append('-j %s' % dsBindPasswordFile)
@@ -4118,10 +4236,7 @@
if dsKeyStorePassword:
STAFCmdParamsList.append('-W %s' % dsKeyStorePassword)
-
- if dsTrustAll:
- STAFCmdParamsList.append('-X')
-
+
if dsUseSSL:
STAFCmdParamsList.append('-Z')
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml
index 2652289..16c4f5b 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml
@@ -36,8 +36,8 @@
if dsInstanceHost:
STAFCmdParamsList.append('-h %s' % dsInstanceHost)
- if dsInstancePort:
- STAFCmdParamsList.append('-p %s' % dsInstancePort)
+ if dsInstanceAdminPort:
+ STAFCmdParamsList.append('-p %s' % dsInstanceAdminPort)
if dsInstanceDn:
STAFCmdParamsList.append('-D "%s"' % dsInstanceDn)
@@ -46,6 +46,7 @@
STAFCmdParamsList.append('-w "%s"' % dsInstancePswd)
STAFCmdParamsList.append('-n')
+ STAFCmdParamsList.append('-X')
</script>
</function>
@@ -65,22 +66,29 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath"
+ type="optional"
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
<function-arg-property name="type" value="filepath" />
</function-arg-def>
- <function-arg-def name="dsInstanceHost" type="optional" default="STAF_REMOTE_HOSTNAME">
+ <function-arg-def name="dsInstanceHost"
+ type="optional"
+ default="STAF_REMOTE_HOSTNAME">
<function-arg-description>
Directory server hostname or IP address
</function-arg-description>
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -228,11 +236,13 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
- <function-arg-property name="type" value="integer" />
+ <function-arg-property name="type" value="Port number" />
</function-arg-def>
<function-arg-def name="dsInstanceDn" type="required">
@@ -386,9 +396,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -512,9 +524,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -573,7 +587,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'objectName' : 'password-policy',
@@ -625,9 +639,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -683,19 +699,19 @@
</function-map-args>
<sequence>
<call function="'dsconfigSet'">
- { 'location' : location,
- 'dsPath' : dsPath,
- 'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
- 'dsInstanceDn' : dsInstanceDn,
- 'dsInstancePswd' : dsInstancePswd,
- 'objectName' : 'password-validator',
- 'propertyType' : 'validator',
- 'propertyName' : propertyName,
- 'attributeName' : attributeName,
- 'attributeValue' : attributeValue,
- 'modifyType' : modifyType,
- 'expectedRC' : expectedRC
+ { 'location' : location,
+ 'dsPath' : dsPath,
+ 'dsInstanceHost' : dsInstanceHost,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
+ 'dsInstanceDn' : dsInstanceDn,
+ 'dsInstancePswd' : dsInstancePswd,
+ 'objectName' : 'password-validator',
+ 'propertyType' : 'validator',
+ 'propertyName' : propertyName,
+ 'attributeName' : attributeName,
+ 'attributeValue' : attributeValue,
+ 'modifyType' : modifyType,
+ 'expectedRC' : expectedRC
}
</call>
<return>
@@ -738,11 +754,13 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
- </function-arg-description>
- <function-arg-property name="type" value="integer" />
+ Directory server admin port number
+ </function-arg-description>
+ <function-arg-property name="type" value="Port number" />
</function-arg-def>
<function-arg-def name="dsInstanceDn" type="required">
@@ -851,11 +869,13 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
- </function-arg-description>
- <function-arg-property name="type" value="integer" />
+ Directory server admin port number
+ </function-arg-description>
+ <function-arg-property name="type" value="Port number" />
</function-arg-def>
<function-arg-def name="dsInstanceDn" type="required">
@@ -912,7 +932,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'objectName' : 'identity-mapper',
@@ -964,11 +984,13 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
- <function-arg-property name="type" value="integer" />
+ <function-arg-property name="type" value="Port number" />
</function-arg-def>
<function-arg-def name="dsInstanceDn" type="required">
@@ -1078,9 +1100,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1136,19 +1160,19 @@
</function-map-args>
<sequence>
<call function="'dsconfigSet'">
- { 'location' : location,
- 'dsPath' : dsPath,
- 'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
- 'dsInstanceDn' : dsInstanceDn,
- 'dsInstancePswd' : dsInstancePswd,
- 'objectName' : 'sasl-mechanism-handler',
- 'propertyType' : 'handler',
- 'propertyName' : handlerName,
- 'attributeName' : propertyName,
- 'attributeValue' : propertyValue,
- 'modifyType' : modifyType,
- 'expectedRC' : expectedRC
+ { 'location' : location,
+ 'dsPath' : dsPath,
+ 'dsInstanceHost' : dsInstanceHost,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
+ 'dsInstanceDn' : dsInstanceDn,
+ 'dsInstancePswd' : dsInstancePswd,
+ 'objectName' : 'sasl-mechanism-handler',
+ 'propertyType' : 'handler',
+ 'propertyName' : handlerName,
+ 'attributeName' : propertyName,
+ 'attributeValue' : propertyValue,
+ 'modifyType' : modifyType,
+ 'expectedRC' : expectedRC
}
</call>
<return>
@@ -1190,11 +1214,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="port"
+ <function-arg-def name="adminPort"
type="optional"
- default="DIRECTORY_INSTANCE_PORT">
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1263,10 +1287,9 @@
dsconfigCmd=''
dsBinPath='%s/%s' % (dsPath,fileFolder)
dsconfigCmd='%s/%s%s' % (dsBinPath,DSCONFIG,fileExt)
- dsconfigParams = 'create-local-db-index -n -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s --set index-type:%s' % (host,port,rootDN,rootPwd,backendID, indexAttribute, ' --set index-type:'.join(indexTypes))
+ dsconfigParams = 'create-local-db-index -n -X -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s --set index-type:%s' % (host,adminPort,rootDN,rootPwd,backendID, indexAttribute, ' --set index-type:'.join(indexTypes))
</script>
- <call function="'_dsconfigCommonArgs'" />
<call function="'runCommand'">
{ 'name' : 'dsconfig addIndex',
'location' : location,
@@ -1314,11 +1337,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="port"
+ <function-arg-def name="adminPort"
type="optional"
- default="DIRECTORY_INSTANCE_PORT">
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1402,9 +1425,9 @@
operationArguments = indexProperty
if indexPropertyValue:
operationArguments = '%s:%s' % (indexProperty, indexPropertyValue)
- dsconfigParams = 'set-local-db-index-prop -n -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s --%s %s' % ( host, port, rootDN, rootPwd, backendID, indexAttribute, operation, operationArguments )
+ dsconfigParams = 'set-local-db-index-prop -n -X -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s --%s %s' % ( host, adminPort, rootDN, rootPwd, backendID, indexAttribute, operation, operationArguments)
</script>
- <call function="'_dsconfigCommonArgs'" />
+
<call function="'runCommand'">
{ 'name' : 'dsconfig modifyIndex',
'location' : location,
@@ -1452,9 +1475,9 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="port"
+ <function-arg-def name="adminPort"
type="optional"
- default="DIRECTORY_INSTANCE_PORT">
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
Directory server port number
</function-arg-description>
@@ -1508,9 +1531,8 @@
dsconfigCmd=''
dsBinPath='%s/%s' % (dsPath,fileFolder)
dsconfigCmd='%s/%s%s' % (dsBinPath,DSCONFIG,fileExt)
- dsconfigParams = 'delete-local-db-index -n -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s' % (host,port,rootDN,rootPwd,backendID, indexAttribute)
+ dsconfigParams = 'delete-local-db-index -n -X -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s' % (host,adminPort,rootDN,rootPwd,backendID, indexAttribute)
</script>
- <call function="'_dsconfigCommonArgs'" />
<call function="'runCommand'">
{ 'name' : 'dsconfig removeIndex',
'location' : location,
@@ -1559,9 +1581,9 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort" type="required">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1674,9 +1696,9 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort" type="required">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1770,9 +1792,9 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort" type="required">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1901,9 +1923,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort" type="required">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1975,7 +1997,7 @@
#STAFCmdParamsList.append('-h %s' % dsInstanceHost)
#STAFCmdParamsList.append('-D %s' % dsInstanceDn)
#STAFCmdParamsList.append('-w %s' % dsInstancePswd)
- #STAFCmdParamsList.append('-p %s' % dsInstancePort)
+ #STAFCmdParamsList.append('-p %s' % dsInstanceAdminPort)
STAFCmdParamsList.append('--backend-name %s' % dsBackendID)
STAFCmdParamsList.append('--type local-db')
STAFCmdParamsList.append(baseDNOption)
@@ -2037,9 +2059,9 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort" type="required">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -2175,9 +2197,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -2239,15 +2263,15 @@
<!-- Call dsconfig -->
<call function="'dsconfig'">
{
- 'location' : location ,
- 'dsPath' : dsPath ,
- 'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
- 'dsInstanceDn' : dsInstanceDn ,
- 'dsInstancePswd' : dsInstancePswd ,
- 'subcommand' : subcommand ,
- 'optionsString' : optionsString ,
- 'expectedRC' : expectedRC
+ 'location' : location ,
+ 'dsPath' : dsPath ,
+ 'dsInstanceHost' : dsInstanceHost ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
+ 'dsInstanceDn' : dsInstanceDn ,
+ 'dsInstancePswd' : dsInstancePswd ,
+ 'subcommand' : subcommand ,
+ 'optionsString' : optionsString ,
+ 'expectedRC' : expectedRC
}
</call>
@@ -2323,17 +2347,17 @@
</message>
<!-- Remove peer RS from replicated domain -->
<call function="'dsconfig'">
- { 'location' : server.getHostname(),
- 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
- 'dsInstanceHost' : server.getHostname(),
- 'dsInstancePort' : server.getPort(),
- 'dsInstanceDn' : server.getRootDn(),
- 'dsInstancePswd' : server.getRootPwd(),
- 'subcommand' : 'set-replication-server-prop',
- 'objectType' : 'provider-name',
- 'objectName' : 'Multimaster Synchronization',
- 'optionsString' : '--reset replication-server',
- 'expectedRC' : expectedRC
+ { 'location' : server.getHostname(),
+ 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstanceAdminPort' : server.getAdminPort(),
+ 'dsInstanceDn' : server.getRootDn(),
+ 'dsInstancePswd' : server.getRootPwd(),
+ 'subcommand' : 'set-replication-server-prop',
+ 'objectType' : 'provider-name',
+ 'objectName' : 'Multimaster Synchronization',
+ 'optionsString' : '--reset replication-server',
+ 'expectedRC' : expectedRC
}
</call>
</sequence>
@@ -2422,18 +2446,18 @@
</message>
<!-- Remove peer RS from replicated domain -->
<call function="'dsconfig'">
- { 'location' : mainServer.getHostname(),
- 'dsPath' : '%s/%s' \
- % (mainServer.getDir(),OPENDSNAME),
- 'dsInstanceHost' : mainServer.getHostname(),
- 'dsInstancePort' : mainServer.getPort(),
- 'dsInstanceDn' : mainServer.getRootDn(),
- 'dsInstancePswd' : mainServer.getRootPwd(),
- 'subcommand' : 'set-replication-server-prop',
- 'objectType' : 'provider-name',
- 'objectName' : 'Multimaster Synchronization',
- 'optionsString' : optionString,
- 'expectedRC' : expectedRC
+ { 'location' : mainServer.getHostname(),
+ 'dsPath' : '%s/%s' \
+ % (mainServer.getDir(),OPENDSNAME),
+ 'dsInstanceHost' : mainServer.getHostname(),
+ 'dsInstanceAdminPort' : mainServer.getAdminPort(),
+ 'dsInstanceDn' : mainServer.getRootDn(),
+ 'dsInstancePswd' : mainServer.getRootPwd(),
+ 'subcommand' : 'set-replication-server-prop',
+ 'objectType' : 'provider-name',
+ 'objectName' : 'Multimaster Synchronization',
+ 'optionsString' : optionString,
+ 'expectedRC' : expectedRC
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
index 355bc97..2206f49 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
@@ -422,9 +422,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort" type="optional" default="'%s' % DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
@@ -488,7 +488,7 @@
{ 'location' : location ,
'dsPath' : dsPath ,
'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'create-key-manager-provider' ,
@@ -503,7 +503,7 @@
{ 'location' : location ,
'dsPath' : dsPath ,
'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-key-manager-provider-prop' ,
@@ -526,7 +526,7 @@
{ 'location' : location ,
'dsPath' : dsPath ,
'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'create-trust-manager-provider' ,
@@ -541,7 +541,7 @@
{ 'location' : location ,
'dsPath' : dsPath ,
'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-trust-manager-provider-prop' ,
@@ -579,7 +579,7 @@
{ 'location' : location ,
'dsPath' : dsPath ,
'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop',
@@ -619,9 +619,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort" type="optional" default="'%s' % DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
@@ -671,7 +671,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'subcommand' : 'set-key-manager-provider-prop',
@@ -692,7 +692,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'subcommand' : 'set-trust-manager-provider-prop',
@@ -720,7 +720,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'subcommand' : 'set-connection-handler-prop',
@@ -760,9 +760,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort" type="optional" default="'%s' % DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
@@ -812,10 +812,10 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort ,
- 'dsInstanceDn' : dsInstanceDn ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
+ 'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
- 'subcommand' : 'set-key-manager-provider-prop' ,
+ 'subcommand' : 'set-key-manager-provider-prop' ,
'objectType' : 'provider-name' ,
'objectName' : keystoreType,
'optionsString' : '--set key-store-file:config/keystore --reset key-store-pin-file --set key-store-pin:%s --set enabled:true' % keystorePin,
@@ -832,10 +832,10 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
- 'dsInstanceDn' : dsInstanceDn ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
+ 'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
- 'subcommand' : 'set-trust-manager-provider-prop' ,
+ 'subcommand' : 'set-trust-manager-provider-prop' ,
'objectType' : 'provider-name' ,
'objectName' : 'Blind Trust',
'optionsString' : '--set enabled:true' ,
@@ -862,10 +862,10 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
- 'dsInstanceDn' : dsInstanceDn,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
+ 'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
- 'subcommand' : 'set-connection-handler-prop',
+ 'subcommand' : 'set-connection-handler-prop',
'objectType' : 'handler-name',
'objectName' : 'LDAPS Connection Handler',
'optionsString' : optionsString,
@@ -890,7 +890,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'subcommand' : 'set-connection-handler-prop',
@@ -930,9 +930,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort" type="optional" default="'%s' %DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
@@ -983,7 +983,7 @@
{ 'location' : location,
'dsPath' : dsPath ,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -998,7 +998,7 @@
{ 'location' : location,
'dsPath' : dsPath ,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -1018,7 +1018,7 @@
{ 'location' : location ,
'dsPath' : dsPath ,
'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'delete-trust-manager-provider' ,
@@ -1032,7 +1032,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'subcommand' : 'set-trust-manager-provider-prop',
@@ -1055,7 +1055,7 @@
{ 'location' : location ,
'dsPath' : dsPath ,
'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'delete-key-manager-provider' ,
@@ -1069,7 +1069,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-key-manager-provider-prop' ,
@@ -1111,9 +1111,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort" type="optional" default="'%s' %DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
@@ -1152,7 +1152,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'subcommand' : 'set-connection-handler-prop',
@@ -1171,7 +1171,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'subcommand' : 'set-trust-manager-provider-prop',
@@ -1191,13 +1191,13 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
- 'dsInstanceDn' : dsInstanceDn,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
+ 'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
- 'subcommand' : 'set-key-manager-provider-prop',
+ 'subcommand' : 'set-key-manager-provider-prop',
'objectType' : 'provider-name',
'objectName' : keystoreType,
- 'optionsString' : '--set enabled:false',
+ 'optionsString' : '--set enabled:false',
'expectedRC' : 0
}
</call>
@@ -1231,9 +1231,9 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="optional">
+ <function-arg-def name="dsInstanceAdminPort" type="optional" default="'%s' %DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
@@ -1272,7 +1272,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'subcommand' : 'set-connection-handler-prop',
@@ -1291,7 +1291,7 @@
{ 'location' : location ,
'dsPath' : dsPath ,
'dsInstanceHost' : dsInstanceHost ,
- 'dsInstancePort' : dsInstancePort ,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort ,
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-connection-handler-prop' ,
@@ -1311,7 +1311,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd ,
'subcommand' : 'set-trust-manager-provider-prop' ,
@@ -1331,7 +1331,7 @@
{ 'location' : location,
'dsPath' : dsPath,
'dsInstanceHost' : dsInstanceHost,
- 'dsInstancePort' : dsInstancePort,
+ 'dsInstanceAdminPort' : dsInstanceAdminPort,
'dsInstanceDn' : dsInstanceDn,
'dsInstancePswd' : dsInstancePswd,
'subcommand' : 'set-key-manager-provider-prop',
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
index c02a203..c0f9623 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
@@ -528,9 +528,11 @@
</function-arg-description>
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -568,8 +570,8 @@
if dsInstanceHost:
STAFCmdParamsList.append('-h %s' % dsInstanceHost)
- if dsInstancePort:
- STAFCmdParamsList.append('-p %s' % dsInstancePort)
+ if dsInstanceAdminPort:
+ STAFCmdParamsList.append('-p %s' % dsInstanceAdminPort)
if dsInstanceDn:
STAFCmdParamsList.append('-D "%s"' % dsInstanceDn)
@@ -578,6 +580,7 @@
STAFCmdParamsList.append('-w "%s"' % dsInstancePswd)
STAFCmdParamsList.append('-n')
+ STAFCmdParamsList.append('-X')
STAFCmdParamsList.append('set-connection-handler-prop')
STAFCmdParamsList.append('--handler-name "SNMP Connection Handler"')
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
index e1ab9c9..f788d58 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
@@ -864,12 +864,12 @@
<!--- Stop DS -->
<call function="'StopDsWithScript'">
- { 'location' : server.getHostname(),
- 'dsHost' : server.getHostname(),
- 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
- 'dsPort' : server.getPort(),
- 'dsBindDN' : server.getRootDn(),
- 'dsBindPwd' : server.getRootPwd()
+ { 'location' : server.getHostname(),
+ 'dsHost' : server.getHostname(),
+ 'dsPath' : '%s/%s' % (server.getDir(),OPENDSNAME),
+ 'dsAdminPort' : server.getAdminPort(),
+ 'dsBindDN' : server.getRootDn(),
+ 'dsBindPwd' : server.getRootPwd()
}
</call>
</sequence>
@@ -1447,9 +1447,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1638,9 +1640,10 @@
if dsSaslOption:
STAFCmdParamsList.append('-o %s' % dsSaslOption)
- if dsInstancePort:
- STAFCmdParamsList.append('-p %s' % dsInstancePort)
-
+ if dsInstanceAdminPort:
+ STAFCmdParamsList.append('-p %s' % dsInstanceAdminPort)
+ STAFCmdParamsList.append('-X')
+
if dsTrustStorePath:
STAFCmdParamsList.append('-P %s' % dsTrustStorePath)
@@ -1661,10 +1664,7 @@
if dsKeyStorePassword:
STAFCmdParamsList.append('-W %s' % dsKeyStorePassword)
-
- if dsTrustAll:
- STAFCmdParamsList.append('-X')
-
+
if dsUseSSL:
STAFCmdParamsList.append('-Z')
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
index e16b742..4d7844f 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
@@ -104,19 +104,20 @@
'Number of server instances required by the deployment: %s' \
% len(_topologyServerList)
</message>
-
+
<iterate var="server" in="_topologyServerList">
<sequence>
<!-- Create the instance-->
<call function="'createInstance'">
- { 'dsHost' : server.getHostname(),
- 'dsDir' : server.getDir(),
- 'dsPort' : server.getPort(),
- 'dsSslPort' : server.getSslPort(),
- 'dsJmxPort' : server.getJmxPort(),
- 'dsBindDN' : server.getRootDn(),
- 'dsBindPwd' : server.getRootPwd(),
- 'dsBaseDN' : server.getBaseDn()
+ { 'dsHost' : server.getHostname(),
+ 'dsDir' : server.getDir(),
+ 'dsPort' : server.getPort(),
+ 'dsAdminPort' : server.getAdminPort(),
+ 'dsSslPort' : server.getSslPort(),
+ 'dsJmxPort' : server.getJmxPort(),
+ 'dsBindDN' : server.getRootDn(),
+ 'dsBindPwd' : server.getRootPwd(),
+ 'dsBaseDN' : server.getBaseDn()
}
</call>
@@ -525,6 +526,14 @@
</function-arg-description>
<function-arg-property name="type" value="Port number"/>
</function-arg-def>
+ <function-arg-def name="dsAdminPort"
+ type="optional"
+ default="DIRECTORY_INSTANCE_ADMIN_PORT">
+ <function-arg-description>
+ Directory Server admin port number
+ </function-arg-description>
+ <function-arg-property name="type" value="Port number"/>
+ </function-arg-def>
<function-arg-def name="dsSslPort"
type="optional"
default="DIRECTORY_INSTANCE_SSL_PORT">
@@ -681,6 +690,7 @@
{ 'location' : dsHost,
'dsPath' : '%s/%s' % (dsDir, OPENDSNAME),
'dsPort' : dsPort,
+ 'dsAdminPort' : dsAdminPort,
'dsJmxPort' : dsJmxPort,
'dsBindDN' : dsBindDN,
'dsBindPwd' : dsBindPwd,
@@ -795,12 +805,12 @@
<!--- Stop DS -->
<call function="'StopDsWithScript'">
- { 'location' : syncserver.getHostname(),
- 'dsHost' : syncserver.getHostname(),
- 'dsPath' : syncserverPath,
- 'dsPort' : syncserver.getPort(),
- 'dsBindDN' : syncserver.getRootDn(),
- 'dsBindPwd' : syncserver.getRootPwd()
+ { 'location' : syncserver.getHostname(),
+ 'dsHost' : syncserver.getHostname(),
+ 'dsPath' : syncserverPath,
+ 'dsAdminPort' : syncserver.getAdminPort(),
+ 'dsBindDN' : syncserver.getRootDn(),
+ 'dsBindPwd' : syncserver.getRootPwd()
}
</call>
@@ -863,12 +873,12 @@
</message>
<call function="'listSyncProviders'">
- { 'location' : syncserver.getHostname(),
- 'dsPath' : syncserverPath,
- 'dsInstanceHost' : syncserver.getHostname(),
- 'dsInstancePort' : syncserver.getPort(),
- 'dsInstanceDn' : syncserver.getRootDn(),
- 'dsInstancePswd' : syncserver.getRootPwd()
+ { 'location' : syncserver.getHostname(),
+ 'dsPath' : syncserverPath,
+ 'dsInstanceHost' : syncserver.getHostname(),
+ 'dsInstanceAdminPort' : syncserver.getAdminPort(),
+ 'dsInstanceDn' : syncserver.getRootDn(),
+ 'dsInstancePswd' : syncserver.getRootPwd()
}
</call>
@@ -887,7 +897,7 @@
{ 'location' : syncserver.getHostname(),
'dsPath' : syncserverPath,
'dsInstanceHost' : syncserver.getHostname(),
- 'dsInstancePort' : syncserver.getPort(),
+ 'dsInstanceAdminPort' : syncserver.getAdminPort(),
'dsInstanceDn' : syncserver.getRootDn(),
'dsInstancePswd' : syncserver.getRootPwd(),
'replicationPort' : replicationServer.getPort(),
@@ -907,7 +917,7 @@
{ 'location' : syncserver.getHostname(),
'dsPath' : syncserverPath,
'dsInstanceHost' : syncserver.getHostname(),
- 'dsInstancePort' : syncserver.getPort(),
+ 'dsInstanceAdminPort' : syncserver.getAdminPort(),
'dsInstanceDn' : syncserver.getRootDn(),
'dsInstancePswd' : syncserver.getRootPwd(),
'domainName' : 'SUFFIX-%s' % i,
@@ -921,12 +931,12 @@
<!--- Stop DS -->
<call function="'StopDsWithScript'">
- { 'location' : syncserver.getHostname(),
- 'dsHost' : syncserver.getHostname(),
- 'dsPath' : syncserverPath,
- 'dsPort' : syncserver.getPort(),
- 'dsBindDN' : syncserver.getRootDn(),
- 'dsBindPwd' : syncserver.getRootPwd()
+ { 'location' : syncserver.getHostname(),
+ 'dsHost' : syncserver.getHostname(),
+ 'dsPath' : syncserverPath,
+ 'dsAdminPort' : syncserver.getAdminPort(),
+ 'dsBindDN' : syncserver.getRootDn(),
+ 'dsBindPwd' : syncserver.getRootPwd()
}
</call>
</sequence>
@@ -968,9 +978,9 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort" type="required">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1016,9 +1026,9 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="refInstancePort" type="required">
+ <function-arg-def name="refInstanceAdminPort" type="required">
<function-arg-description>
- Reference Directory server port number
+ Reference Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1120,12 +1130,13 @@
STAFCmdParamsList.append('enable')
STAFCmdParamsList.append('-n')
STAFCmdParamsList.append('-Q')
+ STAFCmdParamsList.append('-X')
if dsInstanceHost:
STAFCmdParamsList.append('--host1 %s' % dsInstanceHost)
- if dsInstancePort:
- STAFCmdParamsList.append('--port1 %s' % dsInstancePort)
+ if dsInstanceAdminPort:
+ STAFCmdParamsList.append('--port1 %s' % dsInstanceAdminPort)
if dsInstanceDn:
STAFCmdParamsList.append('--bindDN1 "%s"' % dsInstanceDn)
@@ -1142,8 +1153,8 @@
if refInstanceHost:
STAFCmdParamsList.append('--host2 %s' % refInstanceHost)
- if refInstancePort:
- STAFCmdParamsList.append('--port2 %s' % refInstancePort)
+ if refInstanceAdminPort:
+ STAFCmdParamsList.append('--port2 %s' % refInstanceAdminPort)
if refInstanceDn:
STAFCmdParamsList.append('--bindDN2 "%s"' % refInstanceDn)
@@ -1226,11 +1237,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort"
+ <function-arg-def name="dsInstanceAdminPort"
type="optional"
default="None">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1244,9 +1255,9 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="sourceInstancePort" type="required">
+ <function-arg-def name="sourceInstanceAdminPort" type="required">
<function-arg-description>
- Source Directory server port number
+ Source Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1302,18 +1313,19 @@
STAFCmdParamsList.append('initialize-all')
STAFCmdParamsList.append('-n')
STAFCmdParamsList.append('-Q')
-
+ STAFCmdParamsList.append('-X')
+
if dsInstanceHost:
STAFCmdParamsList.append('-O %s' % dsInstanceHost)
- if dsInstancePort:
- STAFCmdParamsList.append('--portDestination %s' % dsInstancePort)
+ if dsInstanceAdminPort:
+ STAFCmdParamsList.append('--portDestination %s' % dsInstanceAdminPort)
if sourceInstanceHost:
STAFCmdParamsList.append('-h %s' % sourceInstanceHost)
- if sourceInstancePort:
- STAFCmdParamsList.append('-p %s' % sourceInstancePort)
+ if sourceInstanceAdminPort:
+ STAFCmdParamsList.append('-p %s' % sourceInstanceAdminPort)
if replicationDnList:
for dn in replicationDnList:
@@ -1377,7 +1389,7 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort" type="required">
+ <function-arg-def name="dsInstanceAdminPort" type="required">
<function-arg-description>
Directory server port number
</function-arg-description>
@@ -1431,12 +1443,13 @@
STAFCmdParamsList.append('disable')
STAFCmdParamsList.append('-n')
STAFCmdParamsList.append('-Q')
-
+ STAFCmdParamsList.append('-X')
+
if dsInstanceHost:
STAFCmdParamsList.append('-h %s' % dsInstanceHost)
- if dsInstancePort:
- STAFCmdParamsList.append('-p %s' % dsInstancePort)
+ if dsInstanceAdminPort:
+ STAFCmdParamsList.append('-p %s' % dsInstanceAdminPort)
if replicationDnList:
for dn in replicationDnList:
@@ -1496,6 +1509,7 @@
hostname = None
dir = None
port = None
+ adminport = None
sslport = None
jmxport = None
rootDn = None
@@ -1517,6 +1531,8 @@
dir = line[line.find('Directory') + 10:].strip()
elif line.find('Port') != -1:
port = line[line.find('Port') + 5:].strip()
+ elif line.find('Adminport') != -1:
+ adminport = line[line.find('Adminport') + 10:].strip()
elif line.find('Sslport') != -1:
sslport = line[line.find('Sslport') + 8:].strip()
elif line.find('Jmxport') != -1:
@@ -1534,8 +1550,8 @@
elif line.find('ChangelogServer') != -1:
changelogList.append( line[line.find('ChangelogServer') + 16:].strip() )
elif (line.isspace()) or (len(line) == 0):
- server = Server(hostname, dir, port, sslport, jmxport, rootDn,
- rootPwd, baseDn)
+ server = Server(hostname, dir, port, adminport, sslport, jmxport,
+ rootDn, rootPwd, baseDn)
if changelogport != None:
changelogServer = ChangelogServer(changelogport, serverId)
@@ -1558,6 +1574,7 @@
hostname = None
dir = None
port = None
+ adminport = None
sslport = None
jmxport = None
rootDn = None
@@ -1569,8 +1586,8 @@
serverId += 1
if hostname != None:
- server = Server(hostname, dir, port, sslport, jmxport, rootDn,
- rootPwd, baseDn)
+ server = Server(hostname, dir, port, adminport, sslport, jmxport,
+ rootDn, rootPwd, baseDn)
if changelogport != None:
changelogServer = ChangelogServer(changelogport, serverId)
@@ -1749,11 +1766,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort"
+ <function-arg-def name="dsInstanceAdminPort"
type="optional"
default="None">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1802,7 +1819,7 @@
<sequence>
<message>
'Preparing instance %s:%s for external initialization' \
- % (dsInstanceHost,dsInstancePort)
+ % (dsInstanceHost,dsInstanceAdminPort)
</message>
<!-- Local variables -->
@@ -1819,12 +1836,13 @@
STAFCmdParamsList.append('pre-external-initialization')
STAFCmdParamsList.append('-n')
STAFCmdParamsList.append('-Q')
+ STAFCmdParamsList.append('-X')
if dsInstanceHost:
STAFCmdParamsList.append('-h %s' % dsInstanceHost)
- if dsInstancePort:
- STAFCmdParamsList.append('-p %s' % dsInstancePort)
+ if dsInstanceAdminPort:
+ STAFCmdParamsList.append('-p %s' % dsInstanceAdminPort)
if localOnly:
STAFCmdParamsList.append('-l')
@@ -1903,11 +1921,11 @@
<function-arg-property name="type" value="hostname" />
</function-arg-def>
- <function-arg-def name="dsInstancePort"
+ <function-arg-def name="dsInstanceAdminPort"
type="optional"
default="None">
<function-arg-description>
- Directory server port number
+ Directory server admin port number
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
@@ -1947,7 +1965,7 @@
<sequence>
<message>
'Post-processing external initialization of instance %s:%s' \
- % (dsInstanceHost,dsInstancePort)
+ % (dsInstanceHost,dsInstanceAdminPort)
</message>
<!-- Local variables -->
@@ -1964,12 +1982,13 @@
STAFCmdParamsList.append('post-external-initialization')
STAFCmdParamsList.append('-n')
STAFCmdParamsList.append('-Q')
-
+ STAFCmdParamsList.append('-X')
+
if dsInstanceHost:
STAFCmdParamsList.append('-h %s' % dsInstanceHost)
- if dsInstancePort:
- STAFCmdParamsList.append('-p %s' % dsInstancePort)
+ if dsInstanceAdminPort:
+ STAFCmdParamsList.append('-p %s' % dsInstanceAdminPort)
if replicationDnList:
for dn in replicationDnList:
@@ -2042,7 +2061,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname" />
</function-arg-def>
-
+
<function-arg-def name="sourceInstancePort"
type="optional"
default="None">
@@ -2051,6 +2070,15 @@
</function-arg-description>
<function-arg-property name="type" value="Port number" />
</function-arg-def>
+
+ <function-arg-def name="sourceInstanceAdminPort"
+ type="optional"
+ default="None">
+ <function-arg-description>
+ Directory server admin port number
+ </function-arg-description>
+ <function-arg-property name="type" value="Port number" />
+ </function-arg-def>
<function-arg-def name="sourceInstanceDn" type="required">
<function-arg-description>
@@ -2110,20 +2138,20 @@
<sequence>
<message>
'Resetting %s data in replication topology using backup %s on instance \
- %s:%s' % (suffixDn,backupDir,sourceInstanceHost,sourceInstancePort)
+ %s:%s' % (suffixDn,backupDir,sourceInstanceHost,sourceInstanceAdminPort)
</message>
<!-- Pre-initialise the servers in the topology -->
<call function="'preInitializeReplication'">
- { 'location' : location,
- 'dsPath' : dsPath,
- 'dsInstanceHost' : sourceInstanceHost,
- 'dsInstancePort' : sourceInstancePort,
- 'localOnly' : False,
- 'replicationDnList' : [suffixDn],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : location,
+ 'dsPath' : dsPath,
+ 'dsInstanceHost' : sourceInstanceHost,
+ 'dsInstanceAdminPort' : sourceInstanceAdminPort,
+ 'localOnly' : False,
+ 'replicationDnList' : [suffixDn],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
@@ -2149,26 +2177,26 @@
<!-- Post-initialise the servers in the topology -->
<call function="'postInitializeReplication'">
- { 'location' : location,
- 'dsPath' : dsPath,
- 'dsInstanceHost' : sourceInstanceHost,
- 'dsInstancePort' : sourceInstancePort,
- 'replicationDnList' : [suffixDn],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : location,
+ 'dsPath' : dsPath,
+ 'dsInstanceHost' : sourceInstanceHost,
+ 'dsInstanceAdminPort' : sourceInstanceAdminPort,
+ 'replicationDnList' : [suffixDn],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
<!-- Initialise the servers in the topology -->
<call function="'initializeReplication'">
- { 'location' : location,
- 'dsPath' : dsPath,
- 'sourceInstanceHost' : sourceInstanceHost,
- 'sourceInstancePort' : sourceInstancePort,
- 'replicationDnList' : [suffixDn],
- 'adminUID' : adminUID,
- 'adminPswd' : adminPswd
+ { 'location' : location,
+ 'dsPath' : dsPath,
+ 'sourceInstanceHost' : sourceInstanceHost,
+ 'sourceInstanceAdminPort' : sourceInstanceAdminPort,
+ 'replicationDnList' : [suffixDn],
+ 'adminUID' : adminUID,
+ 'adminPswd' : adminPswd
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/python/replication.py b/opendj-sdk/opends/tests/staf-tests/shared/python/replication.py
index b431142..66531a6 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/python/replication.py
+++ b/opendj-sdk/opends/tests/staf-tests/shared/python/replication.py
@@ -76,10 +76,11 @@
# Define Server class
class Server:
- def __init__(self, hostname, dir, port, sslPort, jmxPort, rootDn, rootPwd, baseDn):
+ def __init__(self, hostname, dir, port, adminPort, sslPort, jmxPort, rootDn, rootPwd, baseDn):
self.hostname = hostname
self.dir = dir
self.port = port
+ self.adminPort = adminPort
self.sslPort = sslPort
self.jmxPort = jmxPort
self.rootDn = rootDn
@@ -106,6 +107,9 @@
def getPort(self):
return self.port
+ def getAdminPort(self):
+ return self.adminPort
+
def getSslPort(self):
return self.sslPort
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs b/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
index 95e8560..e3a264f 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
@@ -44,17 +44,19 @@
DIRECTORY_INSTANCE_DIR = '%s' % TMPDIR
DIRECTORY_INSTANCE_HOST = 'localhost'
DIRECTORY_INSTANCE_PORT = '${opends.port.ldap}'
+DIRECTORY_INSTANCE_ADMIN_PORT = '4444'
DIRECTORY_INSTANCE_SSL_PORT = '${opends.port.ldaps}'
DIRECTORY_INSTANCE_SFX = 'dc=com'
DIRECTORY_INSTANCE_BE = 'userRoot'
JAVA_HOME = '${java.path}'
+LOCAL_JAVA_HOME = '${java.path}'
LOGS_ROOT = '%s' % TMPDIR
LOGS_URI = ''
SEND_MAIL_AFTER_TEST_RUN = '${staf.email.send}'
SEND_MAIL_TO = '${staf.email.to}'
WC_TYPE = 'apache-tomcat'
WC_VERSION = '6.0.14'
-WC_ZIPPATH = '%s/tests/ext' % OPENDSDIR
+WC_ZIPPATH = '${archives.dir}'
WC_ZIPNAME = '%s-%s.zip' % (WC_TYPE, WC_VERSION)
WC_DIRECTORY = '%s' % TMPDIR
WC_PORT = '9000'
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt b/opendj-sdk/opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt
index 916500e..cd521ec 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt
@@ -1,6 +1,7 @@
Hostname: localhost
Directory: /tmp/opends-synchro-tests/server1
Port: 11389
+Adminport: 11444
Sslport: 11636
Jmxport: 11689
RootDn: cn=directory manager
@@ -14,6 +15,7 @@
Hostname: localhost
Directory: /tmp/opends-synchro-tests/server2
Port: 22389
+Adminport: 22444
Sslport: 22636
Jmxport: 22689
RootDn: cn=directory manager
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/resource/config-changes.ldif b/opendj-sdk/opends/tests/unit-tests-testng/resource/config-changes.ldif
index baf6820..0b79465 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/resource/config-changes.ldif
+++ b/opendj-sdk/opends/tests/unit-tests-testng/resource/config-changes.ldif
@@ -18,6 +18,11 @@
replace: ds-cfg-trust-manager-provider
ds-cfg-trust-manager-provider: cn=JKS,cn=Trust Manager Providers,cn=config
+dn: cn=Administration Connector,cn=config
+changeType: modify
+replace: ds-cfg-listen-port
+ds-cfg-listen-port: #adminport#
+
dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
changeType: modify
replace: ds-cfg-enabled
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java
index b58165b..3da9124 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java
@@ -342,7 +342,7 @@
*/
@Test(enabled = false)
public void testGetStatusPanelCommandFile() {
- assertExistentFile(installation.getStatusPanelCommandFile());
+ assertExistentFile(installation.getControlPanelCommandFile());
}
/**
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index 9240a02..3fedc9c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -44,6 +44,7 @@
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.StringReader;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
@@ -55,7 +56,6 @@
import java.util.logging.Logger;
import org.opends.messages.Message;
-import org.opends.messages.Severity;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.client.ldap.LDAPConnection;
@@ -129,13 +129,21 @@
/**
* The name of the system property that specifies the ldap port.
- * Set this prtoperty when running the server if you want to use a given
- * port number, otherwise a port is choosed randomly at test startup time.
+ * Set this property when running the server if you want to use a given
+ * port number, otherwise a port is chosen randomly at test startup time.
*/
public static final String PROPERTY_LDAP_PORT =
"org.opends.server.LdapPort";
/**
+ * The name of the system property that specifies the admin port.
+ * Set this prtoperty when running the server if you want to use a given
+ * port number, otherwise a port is choosed randomly at test startup time.
+ */
+ public static final String PROPERTY_ADMIN_PORT =
+ "org.opends.server.AdminPort";
+
+ /**
* If this System property is set to true, then the classes/ directory
* will be copied into the server package setup for the tests. This allows
* the server tools (e.g. ldapsearch) to be used on a live server, but it
@@ -152,6 +160,11 @@
public static final String TEST_ROOT_DN_STRING = "o=test";
/**
+ * The backend if for the test backend
+ */
+ public static final String TEST_BACKEND_ID = "test";
+
+ /**
* The string representation of the OpenDMK jar file location
* that will be used as base to determine if snmp is included or not
*/
@@ -184,16 +197,16 @@
public static boolean SERVER_STARTED = false;
/**
- * The memory-based backend configured for use in the server.
- */
- private static MemoryBackend memoryBackend = null;
-
- /**
* The LDAP port the server is bound to on start.
*/
private static int serverLdapPort;
/**
+ * The Administration port the server is bound to on start.
+ */
+ private static int serverAdminPort;
+
+ /**
* The JMX port the server is bound to on start.
*/
private static int serverJmxPort;
@@ -383,9 +396,11 @@
} catch (Exception e) {}
}
}
+
// Find some free ports for the listeners and write them to the
// config-chamges.ldif file.
ServerSocket serverLdapSocket = null;
+ ServerSocket serverAdminSocket = null;
ServerSocket serverJmxSocket = null;
ServerSocket serverLdapsSocket = null;
@@ -401,6 +416,18 @@
serverLdapSocket = bindPort(serverLdapPort);
}
+ String adminPort = System.getProperty(PROPERTY_ADMIN_PORT);
+ if (adminPort == null)
+ {
+ serverAdminSocket = bindFreePort();
+ serverAdminPort = serverAdminSocket.getLocalPort();
+ }
+ else
+ {
+ serverAdminPort = Integer.valueOf(adminPort);
+ serverAdminSocket = bindPort(serverAdminPort);
+ }
+
serverJmxSocket = bindFreePort();
serverJmxPort = serverJmxSocket.getLocalPort();
@@ -422,6 +449,7 @@
while(line != null)
{
line = line.replaceAll("#ldapport#", String.valueOf(serverLdapPort));
+ line = line.replaceAll("#adminport#", String.valueOf(serverAdminPort));
line = line.replaceAll("#jmxport#", String.valueOf(serverJmxPort));
line = line.replaceAll("#ldapsport#", String.valueOf(serverLdapsPort));
@@ -434,6 +462,7 @@
reader.close();
serverLdapSocket.close();
+ serverAdminSocket.close();
serverJmxSocket.close();
serverLdapsSocket.close();
@@ -518,7 +547,14 @@
clearJEBackends();
restoreServerConfigLdif();
- memoryBackend = null; // We need it to be recreated and reregistered
+ // We need it to be recreated and reregistered
+ MemoryBackend memoryBackend =
+ (MemoryBackend) DirectoryServer.getBackend(TEST_BACKEND_ID);
+ if (memoryBackend != null)
+ {
+ memoryBackend.finalizeBackend();
+ DirectoryServer.deregisterBackend(memoryBackend);
+ }
EmbeddedUtils.restartServer(null, null, DirectoryServer.getEnvironmentConfig());
initializeTestBackend(true);
@@ -563,7 +599,10 @@
public static void clearDataBackends() throws Exception
{
clearJEBackends();
- memoryBackend.clearMemoryBackend();
+ MemoryBackend memoryBackend =
+ (MemoryBackend) DirectoryServer.getBackend(TEST_BACKEND_ID);
+ if (memoryBackend != null)
+ memoryBackend.clearMemoryBackend();
}
private static File getTestConfigDir()
@@ -708,11 +747,21 @@
startServer();
DN baseDN = DN.decode(TEST_ROOT_DN_STRING);
+
+ // Retrieve backend. Warning: it is important to perform this each time,
+ // because a test may have disabled then enabled the backend (i.e a test
+ // performing an import task). As it is a memory backend, when the backend
+ // is re-enabled, a new backend object is in fact created and old reference
+ // to memory backend must be invalidated. So to prevent this problem, we
+ // retrieve the memory backend reference each time before cleaning it.
+ MemoryBackend memoryBackend =
+ (MemoryBackend)DirectoryServer.getBackend(TEST_BACKEND_ID);
+
if (memoryBackend == null)
{
memoryBackend = new MemoryBackend();
- memoryBackend.setBackendID("test");
- memoryBackend.setBaseDNs(new DN[] { baseDN });
+ memoryBackend.setBackendID(TEST_BACKEND_ID);
+ memoryBackend.setBaseDNs(new DN[] {baseDN});
memoryBackend.initializeBackend();
DirectoryServer.registerBackend(memoryBackend);
}
@@ -915,6 +964,17 @@
}
/**
+ * Get the Admin port the test environment Directory Server instance is
+ * running on.
+ *
+ * @return The port number.
+ */
+ public static int getServerAdminPort()
+ {
+ return serverAdminPort;
+ }
+
+ /**
* Get the JMX port the test environment Directory Server instance is
* running on.
*
@@ -1060,7 +1120,7 @@
}
/**
- * This is a convience method that constructs an Entry from the specified
+ * This is a convenience method that constructs an Entry from the specified
* lines of LDIF. Here's a sample usage
*
<pre>
@@ -1078,7 +1138,7 @@
}
/**
- * This is a convience method that constructs an List of EntryS from the
+ * This is a convenience method that constructs an List of EntryS from the
* specified lines of LDIF. Here's a sample usage
*
<pre>
@@ -1127,7 +1187,7 @@
/**
- * Deletess the provided entry from the Directory Server using an
+ * Deletes the provided entry from the Directory Server using an
* internal operation.
*
* @param entry The entry to be added.
@@ -1259,7 +1319,7 @@
*
* @throws Exception If an unexpected problem occurs.
*/
- public static int applyModifications(String... lines)
+ public static int applyModifications(boolean useAdminPort, String... lines)
throws Exception
{
if (! SERVER_STARTED)
@@ -1278,8 +1338,23 @@
"-a",
"-f", path
};
-
- return LDAPModify.mainModify(args, false, null, null);
+ String[] adminArgs =
+ {
+ "--noPropertiesFile",
+ "-h", "127.0.0.1",
+ "-p", String.valueOf(serverAdminPort),
+ "-Z", "-X",
+ "-D", "cn=Directory Manager",
+ "-w", "password",
+ "-a",
+ "-f", path
+ };
+
+ if (useAdminPort) {
+ return LDAPModify.mainModify(adminArgs, false, null, null);
+ } else {
+ return LDAPModify.mainModify(args, false, null, null);
+ }
}
@@ -1630,19 +1705,27 @@
*/
public static void dsconfig(String... args)
{
- String[] fullArgs = new String[args.length + 10];
+ String hostName;
+ try {
+ hostName = InetAddress.getLocalHost().getHostName();
+ } catch (Exception e) {
+ hostName="Unknown (" + e + ")";
+ }
+
+ String[] fullArgs = new String[args.length + 11];
fullArgs[0] = "-h";
- fullArgs[1] = "127.0.0.1";
+ fullArgs[1] = hostName;
fullArgs[2] = "-p";
- fullArgs[3] = String.valueOf(serverLdapPort);
+ fullArgs[3] = String.valueOf(serverAdminPort);
fullArgs[4] = "-D";
fullArgs[5] = "cn=Directory Manager";
fullArgs[6] = "-w";
fullArgs[7] = "password";
fullArgs[8] = "-n";
fullArgs[9] = "--noPropertiesFile";
+ fullArgs[10] = "-X";
- System.arraycopy(args, 0, fullArgs, 10, args.length);
+ System.arraycopy(args, 0, fullArgs, 11, args.length);
assertEquals(DSConfig.main(fullArgs, false, System.out, System.err), 0);
}
@@ -1667,9 +1750,9 @@
*/
public static RootCfgClient getRootConfiguration() throws Exception
{
- LDAPConnection connection = JNDIDirContextAdaptor.simpleBind(
+ LDAPConnection connection = JNDIDirContextAdaptor.simpleSSLBind(
"127.0.0.1",
- serverLdapPort,
+ serverAdminPort,
"cn=Directory Manager",
"password");
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java
index deb16fb..5f781d7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java
@@ -87,8 +87,9 @@
{
"create-ads",
"--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-w", "password"
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-w", "password",
+ "-X"
};
assertEquals(DsFrameworkCliMain.mainCLI(args, false, System.out,
@@ -107,7 +108,7 @@
// {
// "delete-ads",
// "--noPropertiesFile",
-// "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+// "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
// "-w", "password",
// "--backendName", "admin"
// };
@@ -126,9 +127,10 @@
{
"list-groups",
"--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-D", "malformed",
- "-w", "password"
+ "-w", "password",
+ "-X"
};
assertFalse(DsFrameworkCliMain.mainCLI(args, false, null, null)
@@ -145,9 +147,10 @@
{
"list-groups",
"--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-D", "cn=Does Not Exist",
- "-w", "password"
+ "-w", "password",
+ "-X"
};
assertFalse(DsFrameworkCliMain.mainCLI(args, false, System.out, System.err)
@@ -164,9 +167,10 @@
{
"list-groups",
"--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-D", "cn=Directory Manager",
- "-w", "wrongPassword"
+ "-w", "wrongPassword",
+ "-X"
};
assertFalse(DsFrameworkCliMain.mainCLI(args, false, System.out, System.err)
@@ -189,9 +193,10 @@
{
"list-groups",
"--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-D", "cn=Directory Manager",
"-j", validPasswordFile,
+ "-X"
};
assertEquals(DsFrameworkCliMain.mainCLI(args, false, System.out,
@@ -211,9 +216,10 @@
{
"list-groups",
"--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-D", "cn=Directory Manager",
- "-j",invalidPasswordFile
+ "-j",invalidPasswordFile,
+ "-X"
};
assertFalse(DsFrameworkCliMain.mainCLI(args, false, System.out, System.err)
@@ -230,9 +236,8 @@
{
"list-groups",
"--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapsPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-w", "password",
- "-Z",
"-X"
};
@@ -249,15 +254,14 @@
public void testListGroupsSSLTrustStore()
{
String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
- "config" + File.separator + "client.truststore";
+ "config" + File.separator + "admin-truststore";
String[] args =
{
"list-groups",
"--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapsPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-w", "password",
- "-Z",
"-P", trustStorePath
};
@@ -266,52 +270,6 @@
}
-
- /**
- * Tests a list-groups using StartTLS with blind trust.
- */
- @Test()
- public void testListGroupsStartTLSBlindTrust()
- {
- String[] args =
- {
- "list-groups",
- "--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-w", "password",
- "-q",
- "-X"
- };
-
- assertEquals(DsFrameworkCliMain.mainCLI(args, false, null, System.err),
- SUCCESSFUL.getReturnCode());
- }
-
-
-
- /**
- * Tests a list-groups using StartTLS with a trust store.
- */
- @Test()
- public void testListGroupsStartTLSTrustStore()
- {
- String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
- "config" + File.separator + "client.truststore";
-
- String[] args =
- {
- "list-groups",
- "--noPropertiesFile",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-w", "password",
- "-q",
- "-P", trustStorePath
- };
-
- assertEquals(DsFrameworkCliMain.mainCLI(args, false, null, System.err),
- SUCCESSFUL.getReturnCode());
- }
-
/**
* Tests the dsservice with the "--help" option.
*/
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java
index 76c9321..714e1f3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java
@@ -316,7 +316,7 @@
Attributes attributes = new BasicAttributes();
for (org.opends.server.types.Attribute attribute : entry.getAttributes()) {
BasicAttribute ba = new BasicAttribute(attribute.getName());
- for (AttributeValue value : attribute.getValues()) {
+ for (AttributeValue value : attribute) {
ba.add(value.getStringValue());
}
attributes.put(ba);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
index 2b2d4b2..2d6a19a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
@@ -976,8 +976,8 @@
// Gets the JNDI connection for the test server instance.
private synchronized JNDIDirContextAdaptor getAdaptor() throws Exception {
if (adaptor == null) {
- adaptor = JNDIDirContextAdaptor.simpleBind("127.0.0.1", TestCaseUtils
- .getServerLdapPort(), "cn=directory manager", "password");
+ adaptor = JNDIDirContextAdaptor.simpleSSLBind("127.0.0.1", TestCaseUtils
+ .getServerAdminPort(), "cn=directory manager", "password");
}
return adaptor;
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
index db60b41..f4349eb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
@@ -474,7 +474,7 @@
"ds-cfg-group-dn: dc=new value 4,dc=com"
};
- int result = TestCaseUtils.applyModifications(changes);
+ int result = TestCaseUtils.applyModifications(true, changes);
Assert.assertEquals(result, ResultCode.SUCCESS.getIntValue());
} finally {
TestCfg.removeConstraint(constraint);
@@ -521,7 +521,7 @@
"ds-cfg-group-dn: dc=new value 4,dc=com"
};
- int result = TestCaseUtils.applyModifications(changes);
+ int result = TestCaseUtils.applyModifications(true, changes);
Assert
.assertEquals(result, ResultCode.UNWILLING_TO_PERFORM.getIntValue());
} finally {
@@ -562,8 +562,8 @@
// Gets the JNDI connection for the test server instance.
private synchronized JNDIDirContextAdaptor getAdaptor() throws Exception {
if (adaptor == null) {
- adaptor = JNDIDirContextAdaptor.simpleBind("127.0.0.1", TestCaseUtils
- .getServerLdapPort(), "cn=directory manager", "password");
+ adaptor = JNDIDirContextAdaptor.simpleSSLBind("127.0.0.1", TestCaseUtils
+ .getServerAdminPort(), "cn=directory manager", "password");
}
return adaptor;
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
index 29c0d92..c6ad397 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
@@ -457,7 +457,7 @@
"ds-cfg-group-dn: dc=new value 3,dc=com",
"ds-cfg-group-dn: dc=new value 4,dc=com"
};
- TestCaseUtils.applyModifications(changes);
+ TestCaseUtils.applyModifications(true, changes);
// Make sure that the change listener was notified and the
// modified child contains the correct values.
@@ -506,7 +506,7 @@
"ds-cfg-base-dn: dc=new value 1,dc=com",
"ds-cfg-base-dn: dc=new value 2,dc=com"
};
- TestCaseUtils.applyModifications(changes);
+ TestCaseUtils.applyModifications(true, changes);
// Make sure that the change listener was notified and the
// modified child contains the correct values.
@@ -554,7 +554,7 @@
"ds-cfg-group-dn: dc=new value 1,dc=com",
"ds-cfg-group-dn: dc=new value 2,dc=com"
};
- TestCaseUtils.applyModifications(changes);
+ TestCaseUtils.applyModifications(true, changes);
// Make sure that the change listener was notified and the
// modified child contains the correct values.
@@ -603,7 +603,7 @@
"ds-cfg-base-dn: dc=new value 1,dc=com",
"ds-cfg-base-dn: dc=new value 2,dc=com"
};
- TestCaseUtils.applyModifications(changes);
+ TestCaseUtils.applyModifications(true, changes);
// Make sure that the change listener was notified and the
// modified child contains the correct values.
@@ -626,7 +626,7 @@
"changetype: modify",
"delete: ds-cfg-base-dn"
};
- TestCaseUtils.applyModifications(changes);
+ TestCaseUtils.applyModifications(true, changes);
}
}
@@ -835,8 +835,8 @@
// Gets the JNDI connection for the test server instance.
private synchronized JNDIDirContextAdaptor getAdaptor() throws Exception {
if (adaptor == null) {
- adaptor = JNDIDirContextAdaptor.simpleBind("127.0.0.1", TestCaseUtils
- .getServerLdapPort(), "cn=directory manager", "password");
+ adaptor = JNDIDirContextAdaptor.simpleSSLBind("127.0.0.1", TestCaseUtils
+ .getServerAdminPort(), "cn=directory manager", "password");
}
return adaptor;
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java
index 2ddf5bb..5cef3bc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java
@@ -244,23 +244,29 @@
protected void LDIFAdd(String ldif, String bindDn, String bindPassword,
String controlStr, int rc) throws Exception {
- _LDIFModify(ldif, bindDn, bindPassword, controlStr, true, rc);
+ _LDIFModify(ldif, bindDn, bindPassword, controlStr, true, rc, false);
}
protected void LDIFModify(String ldif, String bindDn, String bindPassword,
String controlStr, int rc) throws Exception {
- _LDIFModify(ldif, bindDn, bindPassword, controlStr, false, rc);
+ _LDIFModify(ldif, bindDn, bindPassword, controlStr, false, rc, false);
}
protected void LDIFModify(String ldif, String bindDn, String bindPassword)
throws Exception {
- _LDIFModify(ldif, bindDn, bindPassword, null, false, -1);
+ _LDIFModify(ldif, bindDn, bindPassword, null, false, -1, false);
+ }
+
+ protected void LDIFAdminModify (String ldif, String bindDn,
+ String bindPassword)
+ throws Exception {
+ _LDIFModify(ldif, bindDn, bindPassword, null, false, -1, true);
}
protected void LDIFModify(String ldif, String bindDn, String bindPassword,
String ctrlString)
throws Exception {
- _LDIFModify(ldif, bindDn, bindPassword, ctrlString, false, -1);
+ _LDIFModify(ldif, bindDn, bindPassword, ctrlString, false, -1, false);
}
protected void LDIFDelete(String dn, String bindDn, String bindPassword,
@@ -296,7 +302,8 @@
private void _LDIFModify(String ldif, String bindDn, String bindPassword,
- String controlStr, boolean add, int rc)
+ String controlStr, boolean add, int rc,
+ boolean useAdminPort)
throws Exception {
File tempFile = getTemporaryLdifFile();
TestCaseUtils.writeFile(tempFile, ldif);
@@ -304,7 +311,13 @@
argList.add("-h");
argList.add("127.0.0.1");
argList.add("-p");
- argList.add(String.valueOf(TestCaseUtils.getServerLdapPort()));
+ if (useAdminPort) {
+ argList.add(String.valueOf(TestCaseUtils.getServerAdminPort()));
+ argList.add("-Z");
+ argList.add("-X");
+ } else {
+ argList.add(String.valueOf(TestCaseUtils.getServerLdapPort()));
+ }
argList.add("-D");
argList.add(bindDn);
argList.add("-w");
@@ -338,6 +351,16 @@
LDIFModify(ldif.toString(), DIR_MGR_DN, PWD);
}
+ protected void deleteAttrFromAdminEntry(String dn, String attr)
+ throws Exception {
+ StringBuilder ldif = new StringBuilder();
+ ldif.append(TestCaseUtils.makeLdif(
+ "dn: " + dn,
+ "changetype: modify",
+ "delete: " + attr));
+ LDIFAdminModify(ldif.toString(), DIR_MGR_DN, PWD);
+ }
+
protected static String makeModDNLDIF(String dn, String newRDN,
String deleteOldRDN,
String newSuperior ) {
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java
index d36a2da..f83c1ca 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java
@@ -71,7 +71,7 @@
@BeforeClass
public void setupClass() throws Exception {
TestCaseUtils.startServer();
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
addEntries("o=test");
addRootEntry();
}
@@ -81,14 +81,14 @@
String aciLdif=makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN,
G_READ_ACI, G_SELF_MOD, G_SCHEMA, G_DSE, G_USER_OPS, G_CONTROL,
E_EXTEND_OP);
- LDIFModify(aciLdif, DIR_MGR_DN, PWD);
+ LDIFAdminModify(aciLdif, DIR_MGR_DN, PWD);
}
@BeforeMethod
public void clearBackend() throws Exception {
deleteAttrFromEntry(user1, "aci");
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
}
/**
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
index 9f9a783..bd4e750 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
@@ -119,7 +119,7 @@
@BeforeClass
public void setupClass() throws Exception {
TestCaseUtils.startServer();
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
addEntries("o=test");
}
@@ -128,14 +128,14 @@
String aciLdif=makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN,
G_READ_ACI, G_SELF_MOD, G_SCHEMA, G_DSE, G_USER_OPS, G_CONTROL,
E_EXTEND_OP);
- LDIFModify(aciLdif, DIR_MGR_DN, PWD);
+ LDIFAdminModify(aciLdif, DIR_MGR_DN, PWD);
}
@BeforeMethod
public void clearBackend() throws Exception {
deleteAttrFromEntry(peopleBase, "aci");
deleteAttrFromEntry(adminBase, "aci");
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
}
/**
@@ -221,7 +221,7 @@
String globalControlAcis=
makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN,
extOpAdmin, extOpPeople);
- LDIFModify(globalControlAcis, DIR_MGR_DN, PWD);
+ LDIFAdminModify(globalControlAcis, DIR_MGR_DN, PWD);
String pwdLdifs =
makeAddLDIF("aci", peopleBase, pwdControls, ALLOW_ALL);
LDIFModify(pwdLdifs, DIR_MGR_DN, PWD);
@@ -235,7 +235,7 @@
LDAPResultCode.INSUFFICIENT_ACCESS_RIGHTS);
deleteAttrFromEntry(peopleBase, "aci");
deleteAttrFromEntry(adminBase, "aci");
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
index 569d478..58946fb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
@@ -164,7 +164,7 @@
@BeforeClass
public void setupClass() throws Exception {
TestCaseUtils.startServer();
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
addEntries("o=test");
}
@@ -173,7 +173,7 @@
String aciLdif=makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN,
G_READ_ACI, G_SELF_MOD, G_SCHEMA, G_DSE, G_USER_OPS, G_CONTROL,
E_EXTEND_OP);
- LDIFModify(aciLdif, DIR_MGR_DN, PWD);
+ LDIFAdminModify(aciLdif, DIR_MGR_DN, PWD);
}
@BeforeMethod
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
index a0cc1c5..2740eda 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
@@ -57,7 +57,7 @@
@BeforeClass
public void setupClass() throws Exception {
TestCaseUtils.restartServer();
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
addEntries("o=test");
}
@@ -66,7 +66,7 @@
String aciLdif=makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN,
G_READ_ACI, G_SELF_MOD, G_SCHEMA, G_DSE, G_USER_OPS, G_CONTROL,
E_EXTEND_OP);
- LDIFModify(aciLdif, DIR_MGR_DN, PWD);
+ LDIFAdminModify(aciLdif, DIR_MGR_DN, PWD);
}
@@ -76,7 +76,7 @@
deleteAttrFromEntry(group1DN, "member");
deleteAttrFromEntry(group2DN, "member");
deleteAttrFromEntry(group3DN, "member");
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
}
/**
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
index 3ea87a9..96230fe 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
@@ -82,7 +82,7 @@
@BeforeClass
public void setupClass() throws Exception {
TestCaseUtils.restartServer();
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
TestCaseUtils.clearJEBackend(true,"userRoot", suffix);
addEntries(suffix);
}
@@ -92,14 +92,14 @@
String aciLdif=makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN,
G_READ_ACI, G_SELF_MOD, G_SCHEMA, G_DSE, G_USER_OPS, G_CONTROL,
E_EXTEND_OP);
- LDIFModify(aciLdif, DIR_MGR_DN, PWD);
+ LDIFAdminModify(aciLdif, DIR_MGR_DN, PWD);
TestCaseUtils.clearJEBackend(false,"userRoot", suffix);
}
@BeforeMethod
public void clearBackend() throws Exception {
deleteAttrFromEntry(adminBase, "aci");
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
}
/**
@@ -151,7 +151,7 @@
public void testGlobalTargetAci() throws Exception {
String pwdLdifs =
makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN, ALLOW_PEOPLE);
- LDIFModify(pwdLdifs, DIR_MGR_DN, PWD);
+ LDIFAdminModify(pwdLdifs, DIR_MGR_DN, PWD);
//Fail, ACI only allows people references
String userResults =
LDAPSearchParams(level5User, PWD, null,null, null,
@@ -176,7 +176,7 @@
public void testGlobalAci() throws Exception {
String pwdLdifs =
makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN, ALLOW_OC_PLUS);
- LDIFModify(pwdLdifs, DIR_MGR_DN, PWD);
+ LDIFAdminModify(pwdLdifs, DIR_MGR_DN, PWD);
String userResults =
LDAPSearchParams(level5User, PWD, null,null, null,
adminBase, filter, null);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
index bc8a147..b1a5607 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
@@ -123,7 +123,7 @@
@BeforeClass
public void setupClass() throws Exception {
TestCaseUtils.startServer();
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
addEntries("o=test");
}
@@ -132,7 +132,7 @@
String aciLdif=makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN,
G_READ_ACI, G_SELF_MOD, G_SCHEMA, G_DSE, G_USER_OPS, G_CONTROL,
E_EXTEND_OP);
- LDIFModify(aciLdif, DIR_MGR_DN, PWD);
+ LDIFAdminModify(aciLdif, DIR_MGR_DN, PWD);
}
/**
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
index 9570f13..d08b309 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
@@ -62,7 +62,7 @@
@BeforeClass
public void setupClass() throws Exception {
TestCaseUtils.startServer();
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
addEntries("o=test");
}
@@ -71,7 +71,7 @@
String aciLdif=makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN,
G_READ_ACI, G_SELF_MOD, G_SCHEMA, G_DSE, G_USER_OPS, G_CONTROL,
E_EXTEND_OP);
- LDIFModify(aciLdif, DIR_MGR_DN, PWD);
+ LDIFAdminModify(aciLdif, DIR_MGR_DN, PWD);
}
@@ -79,7 +79,7 @@
public void clearBackend() throws Exception {
deleteAttrFromEntry(peopleBase, "aci");
deleteAttrFromEntry(base, "aci");
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
}
private static final String[] newEntry = new String[] {
@@ -308,7 +308,7 @@
String globalControlAcis=
makeAddLDIF(ATTR_AUTHZ_GLOBAL_ACI, ACCESS_HANDLER_DN,
controlAdmin, controlPeople);
- LDIFModify(globalControlAcis, DIR_MGR_DN, PWD);
+ LDIFAdminModify(globalControlAcis, DIR_MGR_DN, PWD);
//Fails because geteffectiverights control not allowed on
//ou=people, o=test
LDAPSearchParams(level3User, PWD, null,
@@ -333,7 +333,7 @@
String addEntryLDIF1=makeAddEntryLDIF(newAdminDN, newEntry);
LDIFAdd(addEntryLDIF1, superUser, PWD, controlStr,
LDAPResultCode.INSUFFICIENT_ACCESS_RIGHTS);
- deleteAttrFromEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
+ deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
}
/**
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
index 01159bd..0ddde2d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
@@ -140,7 +140,7 @@
throws Exception
{
// Add a number of entries to the server.
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(false,
"dn: ou=dummy,o=ldif",
"changetype: add",
"objectClass: top",
@@ -180,7 +180,7 @@
// Verify that we can delete a single leaf entry.
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(false,
"dn: ou=sub5,ou=dummy,o=ldif",
"changetype: delete");
assertEquals(resultCode, 0);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
index a24cf16..7cab354 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
@@ -5293,7 +5293,7 @@
assertTrue(schemaEntry.hasAttribute(mtType));
AttributeValue oldMTValue =
- schemaEntry.getAttribute(mtType).get(0).getValues().iterator().next();
+ schemaEntry.getAttribute(mtType).get(0).iterator().next();
String path = TestCaseUtils.createTempFile(
"dn: cn=schema",
@@ -5323,7 +5323,7 @@
assertTrue(schemaEntry.hasAttribute(mtType));
AttributeValue newMTValue =
- schemaEntry.getAttribute(mtType).get(0).getValues().iterator().next();
+ schemaEntry.getAttribute(mtType).get(0).iterator().next();
assertFalse(oldMTValue.equals(newMTValue));
}
@@ -5340,7 +5340,7 @@
public void testAddAndDeleteDefinitionWithExtraSpaces()
throws Exception
{
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(false,
"dn: cn=schema",
"changetype: modify",
"add: objectClasses",
@@ -5354,7 +5354,7 @@
assertNotNull(DirectoryServer.getObjectClass(
"testaddanddeletedefinitionwithextraspaces-oid"));
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(false,
"dn: cn=schema",
"changetype: modify",
"delete: objectClasses",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
index 7571308..8b41fb9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -670,7 +670,7 @@
//Only one index should be used because it is below the FILTER_CANDIDATEassertEquals(ec.getDN2URI().)_THRESHOLD.
debugString =
- result.get(0).getAttribute("debugsearchindex").get(0).getValues().toString();
+ result.get(0).getAttribute("debugsearchindex").get(0).toString();
assertTrue(debugString.split("cn").length <= 3);
finalStartPos = debugString.indexOf("final=") + 13;
finalEndPos = debugString.indexOf("]", finalStartPos);
@@ -690,7 +690,7 @@
result = search.getSearchEntries();
debugString =
- result.get(0).getAttribute("debugsearchindex").get(0).getValues().toString();
+ result.get(0).getAttribute("debugsearchindex").get(0).toString();
assertTrue(!debugString.contains("NOT-INDEXED"));
finalStartPos = debugString.indexOf("final=") + 13;
finalEndPos = debugString.indexOf("]", finalStartPos);
@@ -710,7 +710,7 @@
result = search.getSearchEntries();
debugString =
- result.get(0).getAttribute("debugsearchindex").get(0).getValues().toString();
+ result.get(0).getAttribute("debugsearchindex").get(0).toString();
assertTrue(!debugString.contains("NOT-INDEXED"));
finalStartPos = debugString.indexOf("final=") + 13;
finalEndPos = debugString.indexOf("]", finalStartPos);
@@ -730,7 +730,7 @@
result = search.getSearchEntries();
debugString =
- result.get(0).getAttribute("debugsearchindex").get(0).getValues().toString();
+ result.get(0).getAttribute("debugsearchindex").get(0).toString();
assertTrue(!debugString.contains("NOT-INDEXED"));
finalStartPos = debugString.indexOf("final=") + 13;
finalEndPos = debugString.indexOf("]", finalStartPos);
@@ -750,7 +750,7 @@
result = search.getSearchEntries();
debugString =
- result.get(0).getAttribute("debugsearchindex").get(0).getValues().toString();
+ result.get(0).getAttribute("debugsearchindex").get(0).toString();
assertTrue(!debugString.contains("NOT-INDEXED"));
finalStartPos = debugString.indexOf("final=") + 13;
finalEndPos = debugString.indexOf("]", finalStartPos);
@@ -909,7 +909,8 @@
SubstringIndexer substringIndexer;
OrderingIndexer orderingIndexer;
- backend.replaceEntry(replaceEntry, null);
+ oldEntry = entries.get(0);
+ backend.replaceEntry(oldEntry, replaceEntry, null);
EntryContainer ec =
backend.getRootContainer().getEntryContainer(DN.decode("dc=test,dc=com"));
@@ -917,26 +918,20 @@
try
{
entry = ec.getEntry(DN.decode("uid=user.0,ou=People,dc=test,dc=com"));
- oldEntry = entries.get(0);
entryID = ec.getDN2ID().get(null,
DN.decode("uid=user.0,ou=People,dc=test,dc=com"), LockMode.DEFAULT);
assertNotNull(entry);
- LinkedHashSet<AttributeValue> values =
- entry.getAttribute("cn").get(0).getValues();
- for (AttributeValue value : values) {
+ for (AttributeValue value : entry.getAttribute("cn").get(0)) {
assertEquals(value.getStringValue(), "Testing Test");
}
- values = entry.getAttribute("sn").get(0).getValues();
- for (AttributeValue value : values) {
+ for (AttributeValue value : entry.getAttribute("sn").get(0)) {
assertEquals(value.getStringValue(), "Test");
}
- values = entry.getAttribute("givenname").get(0).getValues();
- for (AttributeValue value : values) {
+ for (AttributeValue value : entry.getAttribute("givenname").get(0)) {
assertEquals(value.getStringValue(), "Testing");
}
- values = entry.getAttribute("employeenumber").get(0).getValues();
- for (AttributeValue value : values) {
+ for (AttributeValue value : entry.getAttribute("employeenumber").get(0)) {
assertEquals(value.getStringValue(), "777");
}
@@ -1017,7 +1012,8 @@
@Test(dependsOnMethods = {"testSearchNotIndexed", "testAdd",
"testSearchIndex", "testSearchScope", "testMatchedDN",
"testNumSubordinates", "testNumSubordinatesIndexEntryLimitExceeded"})
- public void testModifyEntry() throws Exception {
+ public void testModifyEntry() throws Exception
+ {
Entry entry;
Entry newEntry;
EntryID entryID;
@@ -1031,160 +1027,146 @@
SubstringIndexer substringIndexer;
OrderingIndexer orderingIndexer;
-
- EntryContainer ec =
- backend.getRootContainer().getEntryContainer(DN.decode("dc=test,dc=com"));
+ EntryContainer ec = backend.getRootContainer().getEntryContainer(
+ DN.decode("dc=test,dc=com"));
ec.sharedLock.lock();
try
{
ArrayList<Modification> modifications = new ArrayList<Modification>();
- modifications.add(new Modification(ModificationType.ADD, new
- Attribute("title", "debugger")));
+ modifications.add(new Modification(ModificationType.ADD, Attributes
+ .create("title", "debugger")));
- attribute = DirectoryServer.getAttributeType("title");
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(attribute, "debugger2"));
- LinkedHashSet<String> options = new LinkedHashSet<String>(1);
- options.add("lang-en");
- Attribute attr = new Attribute(attribute, "title", options, values);
- modifications.add(new Modification(ModificationType.ADD, attr));
+ AttributeBuilder builder = new AttributeBuilder("title");
+ builder.setOption("lang-en");
+ builder.add("debugger2");
- modifications.add(new Modification(ModificationType.DELETE, new
- Attribute("cn", "Aaren Atp")));
- modifications.add(new Modification(ModificationType.ADD, new
- Attribute("cn", "Aaren Rigor")));
- modifications.add(new Modification(ModificationType.ADD, new
- Attribute("cn", "Aarenister Rigor")));
+ modifications.add(new Modification(ModificationType.ADD, builder
+ .toAttribute()));
+ modifications.add(new Modification(ModificationType.DELETE,
+ Attributes.create("cn", "Aaren Atp")));
+ modifications.add(new Modification(ModificationType.ADD, Attributes
+ .create("cn", "Aaren Rigor")));
+ modifications.add(new Modification(ModificationType.ADD, Attributes
+ .create("cn", "Aarenister Rigor")));
- attribute = DirectoryServer.getAttributeType("givenname");
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(attribute, "test"));
- options = new LinkedHashSet<String>(1);
- options.add("lang-de");
- attr = new Attribute(attribute, "givenName", options, values);
- modifications.add(new Modification(ModificationType.ADD, attr));
+ builder = new AttributeBuilder("givenname");
+ builder.add("test");
+ builder.setOption("lang-de");
+ modifications.add(new Modification(ModificationType.ADD, builder
+ .toAttribute()));
- attribute = DirectoryServer.getAttributeType("givenname");
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(attribute, "test2"));
- options = new LinkedHashSet<String>(1);
- options.add("lang-cn");
- attr = new Attribute(attribute, "givenName", options, values);
- modifications.add(new Modification(ModificationType.DELETE, attr));
+ builder = new AttributeBuilder("givenname");
+ builder.add("test2");
+ builder.setOption("lang-cn");
+ modifications.add(new Modification(ModificationType.DELETE, builder
+ .toAttribute()));
- attribute = DirectoryServer.getAttributeType("givenname");
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(attribute, "newtest3"));
- options = new LinkedHashSet<String>(1);
- options.add("lang-es");
- attr = new Attribute(attribute, "givenName", options, values);
- modifications.add(new Modification(ModificationType.REPLACE, attr));
+ builder = new AttributeBuilder("givenname");
+ builder.add("newtest3");
+ builder.setOption("lang-es");
+ modifications.add(new Modification(ModificationType.REPLACE, builder
+ .toAttribute()));
- modifications.add(new Modification(ModificationType.REPLACE, new
- Attribute("employeenumber", "222")));
+ modifications.add(new Modification(ModificationType.REPLACE,
+ Attributes.create("employeenumber", "222")));
newEntry = entries.get(1);
newEntry.applyModifications(modifications);
entry = ec.getEntry(DN.decode("uid=user.1,ou=People,dc=test,dc=com"));
- entryID = ec.getDN2ID().get(null, DN.decode("uid=user.1,ou=People,dc=test,dc=com"), LockMode.DEFAULT);
+ entryID = ec.getDN2ID().get(null,
+ DN.decode("uid=user.1,ou=People,dc=test,dc=com"), LockMode.DEFAULT);
assertNotNull(entryID);
-
attribute = DirectoryServer.getAttributeType("title");
titleIndex = ec.getAttributeIndex(attribute);
attribute = DirectoryServer.getAttributeType("name");
nameIndex = ec.getAttributeIndex(attribute);
- //This current entry in the DB shouldn't be in the presence titleIndex.
+ // This current entry in the DB shouldn't be in the presence
+ // titleIndex.
addKeys = new HashSet<byte[]>();
addKeys.add(AttributeIndex.presenceKey.getData());
key = new DatabaseEntry();
- for (byte[] keyBytes : addKeys) {
+ for (byte[] keyBytes : addKeys)
+ {
key.setData(keyBytes);
}
assertEquals(titleIndex.presenceIndex.containsID(null, key, entryID),
ConditionResult.FALSE);
- //This current entry should be in the presence nameIndex.
+ // This current entry should be in the presence nameIndex.
addKeys = new HashSet<byte[]>();
addKeys.add(AttributeIndex.presenceKey.getData());
key = new DatabaseEntry();
- for (byte[] keyBytes : addKeys) {
+ for (byte[] keyBytes : addKeys)
+ {
key.setData(keyBytes);
}
assertEquals(nameIndex.presenceIndex.containsID(null, key, entryID),
ConditionResult.TRUE);
ArrayList<Control> noControls = new ArrayList<Control>(0);
- InternalClientConnection conn =
- InternalClientConnection.getRootConnection();
+ InternalClientConnection conn = InternalClientConnection
+ .getRootConnection();
- ModifyOperationBasis modifyOp = new ModifyOperationBasis(conn,
- conn.nextOperationID(),
- conn.nextMessageID(),
- noControls,
- DN.decode("uid=user.1,ou=People,dc=test,dc=com"),
- modifications);
+ ModifyOperationBasis modifyOp = new ModifyOperationBasis(conn, conn
+ .nextOperationID(), conn.nextMessageID(), noControls, DN
+ .decode("uid=user.1,ou=People,dc=test,dc=com"), modifications);
-
- backend.replaceEntry(newEntry, modifyOp);
+ backend.replaceEntry(entry, newEntry, modifyOp);
entry = ec.getEntry(DN.decode("uid=user.1,ou=People,dc=test,dc=com"));
- assertTrue(entry.getAttribute("title").contains(new
- Attribute("title", "debugger")));
+ assertTrue(entry.getAttribute("title").contains(
+ Attributes.create("title", "debugger")));
- assertTrue(entry.getAttribute("cn").get(0).getValues().contains(
- new AttributeValue(
- entry.getAttribute("cn").get(0).getAttributeType(),
- "Aaren Rigor")));
- assertTrue(entry.getAttribute("cn").get(0).getValues().contains(
+ assertTrue(entry.getAttribute("cn").get(0)
+ .contains(
+ new AttributeValue(entry.getAttribute("cn").get(0)
+ .getAttributeType(), "Aaren Rigor")));
+ assertTrue(entry.getAttribute("cn").get(0).contains(
new AttributeValue(
entry.getAttribute("cn").get(0).getAttributeType(),
"Aarenister Rigor")));
- assertFalse(entry.getAttribute("cn").get(0).getValues().contains(
+ assertFalse(entry.getAttribute("cn").get(0).contains(
new AttributeValue(
- entry.getAttribute("cn").get(0).getAttributeType(),
- "Aaren Atp")));
+ entry.getAttribute("cn").get(0).getAttributeType(), "Aaren Atp")));
- options = new LinkedHashSet<String>();
+ Set<String> options = new LinkedHashSet<String>();
options.add("lang-de");
- assertTrue(entry.getAttribute("givenname", options).get(0).getValues().contains(
- new AttributeValue(
- entry.getAttribute("givenname", options).get(0).getAttributeType(),
- "test")));
+ assertTrue(entry.getAttribute("givenname", options).get(0).contains(
+ new AttributeValue(entry.getAttribute("givenname", options).get(0)
+ .getAttributeType(), "test")));
options = new LinkedHashSet<String>();
options.add("lang-cn");
- assertNull
- (entry.getAttribute("givenname", options));
+ assertNull(entry.getAttribute("givenname", options));
options = new LinkedHashSet<String>();
options.add("lang-es");
- assertTrue(entry.getAttribute("givenname", options).get(0).getValues().contains(
- new AttributeValue(
- entry.getAttribute("givenname", options).get(0).getAttributeType(),
- "newtest3")));
+ assertTrue(entry.getAttribute("givenname", options).get(0).contains(
+ new AttributeValue(entry.getAttribute("givenname", options).get(0)
+ .getAttributeType(), "newtest3")));
options = new LinkedHashSet<String>();
options.add("lang-fr");
- assertTrue(entry.getAttribute("givenname", options).get(0).getValues().contains(
- new AttributeValue(
- entry.getAttribute("givenname", options).get(0).getAttributeType(),
- "test2")));
+ assertTrue(entry.getAttribute("givenname", options).get(0).contains(
+ new AttributeValue(entry.getAttribute("givenname", options).get(0)
+ .getAttributeType(), "test2")));
- assertTrue(entry.getAttribute("employeenumber").contains(new
- Attribute("employeenumber", "222")));
- assertFalse(entry.getAttribute("employeenumber").contains(new
- Attribute("employeenumber", "1")));
+ assertTrue(entry.getAttribute("employeenumber").contains(
+ Attributes.create("employeenumber", "222")));
+ assertFalse(entry.getAttribute("employeenumber").contains(
+ Attributes.create("employeenumber", "1")));
addKeys = new HashSet<byte[]>();
presenceIndexer = new PresenceIndexer(titleIndex.getAttributeType());
presenceIndexer.indexEntry(entry, addKeys);
key = new DatabaseEntry();
- for (byte[] keyBytes : addKeys) {
+ for (byte[] keyBytes : addKeys)
+ {
key.setData(keyBytes);
assertEquals(titleIndex.presenceIndex.containsID(null, key, entryID),
- ConditionResult.TRUE);
+ ConditionResult.TRUE);
}
addKeys = new HashSet<byte[]>();
@@ -1192,10 +1174,11 @@
presenceIndexer.indexEntry(entry, addKeys);
key = new DatabaseEntry();
- for (byte[] keyBytes : addKeys) {
+ for (byte[] keyBytes : addKeys)
+ {
key.setData(keyBytes);
assertEquals(nameIndex.presenceIndex.containsID(null, key, entryID),
- ConditionResult.TRUE);
+ ConditionResult.TRUE);
}
addKeys = new HashSet<byte[]>();
@@ -1203,10 +1186,11 @@
orderingIndexer.indexEntry(entry, addKeys);
key = new DatabaseEntry();
- for (byte[] keyBytes : addKeys) {
+ for (byte[] keyBytes : addKeys)
+ {
key.setData(keyBytes);
assertEquals(titleIndex.orderingIndex.containsID(null, key, entryID),
- ConditionResult.TRUE);
+ ConditionResult.TRUE);
}
addKeys = new HashSet<byte[]>();
@@ -1214,10 +1198,11 @@
orderingIndexer.indexEntry(entry, addKeys);
key = new DatabaseEntry();
- for (byte[] keyBytes : addKeys) {
+ for (byte[] keyBytes : addKeys)
+ {
key.setData(keyBytes);
assertEquals(nameIndex.orderingIndex.containsID(null, key, entryID),
- ConditionResult.TRUE);
+ ConditionResult.TRUE);
}
addKeys = new HashSet<byte[]>();
@@ -1225,10 +1210,11 @@
equalityIndexer.indexEntry(entry, addKeys);
key = new DatabaseEntry();
- for (byte[] keyBytes : addKeys) {
+ for (byte[] keyBytes : addKeys)
+ {
key.setData(keyBytes);
assertEquals(titleIndex.equalityIndex.containsID(null, key, entryID),
- ConditionResult.TRUE);
+ ConditionResult.TRUE);
}
addKeys = new HashSet<byte[]>();
@@ -1236,34 +1222,37 @@
equalityIndexer.indexEntry(entry, addKeys);
key = new DatabaseEntry();
- for (byte[] keyBytes : addKeys) {
+ for (byte[] keyBytes : addKeys)
+ {
key.setData(keyBytes);
assertEquals(nameIndex.equalityIndex.containsID(null, key, entryID),
- ConditionResult.TRUE);
+ ConditionResult.TRUE);
}
addKeys = new HashSet<byte[]>();
substringIndexer = new SubstringIndexer(titleIndex.getAttributeType(),
- titleIndex.getConfiguration().getSubstringLength());
+ titleIndex.getConfiguration().getSubstringLength());
substringIndexer.indexEntry(entry, addKeys);
key = new DatabaseEntry();
- for (byte[] keyBytes : addKeys) {
+ for (byte[] keyBytes : addKeys)
+ {
key.setData(keyBytes);
assertEquals(titleIndex.substringIndex.containsID(null, key, entryID),
- ConditionResult.TRUE);
+ ConditionResult.TRUE);
}
addKeys = new HashSet<byte[]>();
substringIndexer = new SubstringIndexer(nameIndex.getAttributeType(),
- nameIndex.getConfiguration().getSubstringLength());
+ nameIndex.getConfiguration().getSubstringLength());
substringIndexer.indexEntry(entry, addKeys);
key = new DatabaseEntry();
- for (byte[] keyBytes : addKeys) {
+ for (byte[] keyBytes : addKeys)
+ {
key.setData(keyBytes);
assertEquals(nameIndex.substringIndex.containsID(null, key, entryID),
- ConditionResult.TRUE);
+ ConditionResult.TRUE);
}
}
finally
@@ -1397,7 +1386,7 @@
"testSearchNotIndexed",
"testModifyDNNewSuperior", "testMatchedDN"})
public void testApplyIndexConfig() throws Exception {
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: ds-cfg-attribute=givenName,cn=Index," +
"ds-cfg-backend-id=indexRoot,cn=Backends,cn=config",
"changetype: modify",
@@ -1475,10 +1464,10 @@
//No indexes should be used.
String debugString =
- result.get(0).getAttribute("debugsearchindex").get(0).getValues().toString();
+ result.get(0).getAttribute("debugsearchindex").get(0).toString();
assertTrue(debugString.contains("NOT-INDEXED"));
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(true,
"dn: ds-cfg-attribute=givenName,cn=Index," +
"ds-cfg-backend-id=indexRoot,cn=Backends,cn=config",
"changetype: modify",
@@ -1532,7 +1521,7 @@
assertFalse(apfound);
// Delete the entries attribute index.
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(true,
"dn: ds-cfg-attribute=givenName,cn=Index," +
"ds-cfg-backend-id=indexRoot,cn=Backends,cn=config",
"changetype: delete");
@@ -1549,7 +1538,7 @@
}
// Add it back
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(true,
"dn: ds-cfg-attribute=givenName,cn=Index," +
"ds-cfg-backend-id=indexRoot,cn=Backends,cn=config",
"changetype: add",
@@ -1603,7 +1592,7 @@
// Make sure changing the index entry limit on an index where the limit
// is already exceeded causes warnings.
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(true,
"dn: ds-cfg-attribute=mail,cn=Index," +
"ds-cfg-backend-id=indexRoot,cn=Backends,cn=config",
"changetype: modify",
@@ -1614,7 +1603,7 @@
// Make sure removing a index entry limit for an index makes it use the
// backend wide setting.
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(true,
"dn: ds-cfg-attribute=mail,cn=Index," +
"ds-cfg-backend-id=indexRoot,cn=Backends,cn=config",
"changetype: modify",
@@ -1658,7 +1647,7 @@
//No indexes should be used.
debugString =
- result.get(0).getAttribute("debugsearchindex").get(0).getValues().toString();
+ result.get(0).getAttribute("debugsearchindex").get(0).toString();
assertTrue(debugString.contains("NOT-INDEXED"));
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
index d5c5b83..f6ba336 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
@@ -696,9 +696,7 @@
if (attrType == null)
attrType = DirectoryServer.getDefaultAttributeType(type);
List<Attribute> attrList = e.getAttribute(attrType, null);
- LinkedHashSet<AttributeValue> values =
- attrList.get(0).getValues();
- AttributeValue v = values.iterator().next();
+ AttributeValue v = attrList.get(0).iterator().next();
long retVal = Long.parseLong(v.getStringValue());
return (retVal);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
index c5d862e..ee50903 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
@@ -338,9 +338,7 @@
if (attrType == null)
attrType = DirectoryServer.getDefaultAttributeType(type);
List<Attribute> attrList = e.getAttribute(attrType, null);
- LinkedHashSet<AttributeValue> values =
- attrList.get(0).getValues();
- AttributeValue v = values.iterator().next();
+ AttributeValue v = attrList.get(0).iterator().next();
long retVal = Long.parseLong(v.getStringValue());
return (retVal);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
index c737a1a..c0ced3f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
@@ -875,9 +875,7 @@
if (attrType == null)
attrType = DirectoryServer.getDefaultAttributeType(type);
List<Attribute> attrList = e.getAttribute(attrType, null);
- LinkedHashSet<AttributeValue> values =
- attrList.get(0).getValues();
- AttributeValue v = values.iterator().next();
+ AttributeValue v = attrList.get(0).iterator().next();
long retVal = Long.parseLong(v.getStringValue());
return (retVal);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
index 21b9e2c..0293b9a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
@@ -124,7 +124,7 @@
assertTrue(TaskState.isPending(task.getTaskState()));
// Perform a modification to delete that task.
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: delete");
assertEquals(resultCode, 0);
@@ -174,7 +174,7 @@
// Perform a modification to delete that task.
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: delete");
assertFalse(resultCode == 0);
@@ -213,7 +213,7 @@
// Perform a modification to delete that task.
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: delete");
assertEquals(resultCode, 0);
@@ -258,7 +258,7 @@
assertTrue(TaskState.isPending(task.getTaskState()));
// Perform a modification to update a non-state attribute.
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: modify",
"add: description",
@@ -267,7 +267,7 @@
// Perform a modification to update the task state.
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: modify",
"replace: ds-task-state",
@@ -275,7 +275,7 @@
assertEquals(resultCode, 0);
// Delete the task.
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: delete");
assertEquals(resultCode, 0);
@@ -326,7 +326,7 @@
// Perform a modification to change something other than the state.
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: modify",
"replace: description",
@@ -335,7 +335,7 @@
// Perform a modification to cancel the task.
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: modify",
"replace: ds-task-state",
@@ -351,7 +351,7 @@
// Perform a modification to delete that task.
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: delete");
assertEquals(resultCode, 0);
@@ -390,7 +390,7 @@
// Perform a modification to update a non-state attribute.
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: modify",
"add: description",
@@ -399,7 +399,7 @@
// Perform a modification to delete that task.
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDN,
"changetype: delete");
assertEquals(resultCode, 0);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
index 5d08929..763bc9c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
@@ -28,33 +28,53 @@
+import static org.opends.server.protocols.ldap.LDAPConstants.*;
+import static org.testng.Assert.*;
+
import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.Lock;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import org.testng.annotations.AfterMethod;
-
-import org.opends.server.TestCaseUtils;
import org.opends.messages.Message;
+import org.opends.server.TestCaseUtils;
import org.opends.server.api.Backend;
import org.opends.server.plugins.DisconnectClientPlugin;
import org.opends.server.plugins.ShortCircuitPlugin;
import org.opends.server.plugins.UpdatePreOpPlugin;
-import org.opends.server.plugins.DelayPreOpPlugin;
-import org.opends.server.protocols.asn1.*;
+import org.opends.server.protocols.asn1.ASN1Element;
+import org.opends.server.protocols.asn1.ASN1OctetString;
+import org.opends.server.protocols.asn1.ASN1Reader;
+import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.protocols.ldap.*;
+import org.opends.server.protocols.ldap.AddRequestProtocolOp;
+import org.opends.server.protocols.ldap.AddResponseProtocolOp;
+import org.opends.server.protocols.ldap.BindRequestProtocolOp;
+import org.opends.server.protocols.ldap.BindResponseProtocolOp;
+import org.opends.server.protocols.ldap.LDAPAttribute;
+import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.tools.LDAPModify;
-import org.opends.server.types.*;
-
-import static org.testng.Assert.*;
-
-import static org.opends.server.protocols.ldap.LDAPConstants.*;
-import static org.opends.server.util.ServerConstants.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.CancelRequest;
+import org.opends.server.types.CancelResult;
+import org.opends.server.types.Control;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LockManager;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.Operation;
+import org.opends.server.types.RawAttribute;
+import org.opends.server.types.ResultCode;
+import org.opends.server.types.WritabilityMode;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
@@ -423,7 +443,7 @@
UpdatePreOpPlugin.reset();
- Attribute a = new Attribute("description", "bar");
+ Attribute a = Attributes.create("description", "bar");
UpdatePreOpPlugin.addAttributeToSet(a);
AddOperation addOperation =
@@ -442,13 +462,13 @@
boolean foundBar = false;
for (Attribute attr : attrList)
{
- if (attr.hasValue(new AttributeValue(a.getAttributeType(),
+ if (attr.contains(new AttributeValue(a.getAttributeType(),
new ASN1OctetString("foo"))))
{
foundFoo = true;
}
- if (attr.hasValue(new AttributeValue(a.getAttributeType(),
+ if (attr.contains(new AttributeValue(a.getAttributeType(),
new ASN1OctetString("bar"))))
{
foundBar = true;
@@ -486,7 +506,7 @@
UpdatePreOpPlugin.reset();
- Attribute a = new Attribute("description", "foo");
+ Attribute a = Attributes.create("description", "foo");
UpdatePreOpPlugin.addAttributeToSet(a);
AddOperation addOperation =
@@ -1247,7 +1267,7 @@
boolean found = false;
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
if (v.getStringValue().equalsIgnoreCase("top"))
{
@@ -1549,7 +1569,7 @@
AttributeType attrType = DirectoryServer.getAttributeType("description");
ArrayList<Attribute> attrList = new ArrayList<Attribute>();
- attrList.add(new Attribute(attrType));
+ attrList.add(Attributes.empty(attrType));
userAttrs.put(attrType, attrList);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
index 97e61de..015e4f0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
@@ -37,7 +37,7 @@
import org.opends.server.api.Backend;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -247,7 +247,7 @@
// Modify the backend to enable it.
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-enabled", "true")));
+ Attributes.create("ds-cfg-enabled", "true")));
ModifyOperation modifyOperation =
conn.processModify(backendEntry.getDN(), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -271,7 +271,7 @@
// Modify the backend to disable it.
mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-enabled", "false")));
+ Attributes.create("ds-cfg-enabled", "false")));
modifyOperation =
conn.processModify(backendEntry.getDN(), mods);
assertNull(DirectoryServer.getBackend(backendID));
@@ -613,7 +613,7 @@
// Disable the intermediate (child) backend. This should be allowed.
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-enabled",
+ Attributes.create("ds-cfg-enabled",
"false")));
ModifyOperation modifyOperation =
conn.processModify(childBackendEntry.getDN(), mods);
@@ -632,7 +632,7 @@
// Re-enable the intermediate backend.
mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-enabled", "true")));
+ Attributes.create("ds-cfg-enabled", "true")));
modifyOperation = conn.processModify(childBackendEntry.getDN(), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
index 8e825d8..799dfba 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
@@ -31,10 +31,8 @@
import java.net.Socket;
import java.util.ArrayList;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.BindOperation;
@@ -44,7 +42,6 @@
import org.opends.server.protocols.asn1.ASN1Element;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.asn1.ASN1Reader;
-import org.opends.server.protocols.asn1.ASN1Sequence;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.BindRequestProtocolOp;
@@ -52,7 +49,6 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.tools.LDAPSearch;
-import org.opends.server.tools.dsconfig.DSConfig;
import org.opends.server.types.*;
import static org.testng.Assert.*;
@@ -1814,7 +1810,7 @@
String attr = "ds-cfg-bind-with-dn-requires-password";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "false")));
+ Attributes.create(attr, "false")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode("cn=config"), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1826,7 +1822,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "true")));
+ Attributes.create(attr, "true")));
modifyOperation = conn.processModify(DN.decode("cn=config"), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -2018,7 +2014,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(false,
"dn: uid=test.user,o=test",
"changetype: add",
"objectClass: top",
@@ -2080,7 +2076,7 @@
}
finally
{
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(true,
"dn: cn=config",
"changetype: modify",
"replace: ds-cfg-writability-mode",
@@ -2112,7 +2108,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(false,
"dn: uid=test.user,o=test",
"changetype: add",
"objectClass: top",
@@ -2123,8 +2119,8 @@
"givenName: Test",
"sn: User",
"cn: Test User",
- "userPassword: password",
- "",
+ "userPassword: password");
+ TestCaseUtils.applyModifications(true,
"dn: cn=Default Password Policy,cn=Password Policies,cn=config",
"changetype: modify",
"replace: ds-cfg-last-login-time-attribute",
@@ -2175,7 +2171,7 @@
}
finally
{
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(true,
"dn: cn=config",
"changetype: modify",
"replace: ds-cfg-writability-mode",
@@ -2207,7 +2203,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(false,
"dn: uid=test.user,o=test",
"changetype: add",
"objectClass: top",
@@ -2218,8 +2214,8 @@
"givenName: Test",
"sn: User",
"cn: Test User",
- "userPassword: password",
- "",
+ "userPassword: password");
+ TestCaseUtils.applyModifications(true,
"dn: cn=Default Password Policy,cn=Password Policies,cn=config",
"changetype: modify",
"replace: ds-cfg-last-login-time-attribute",
@@ -2269,7 +2265,7 @@
}
finally
{
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(true,
"dn: cn=config",
"changetype: modify",
"replace: ds-cfg-writability-mode",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
index 6b45a03..971b761 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
@@ -46,7 +46,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.Attribute;
-import org.opends.server.types.AuthenticationInfo;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
@@ -61,7 +61,6 @@
import org.opends.server.types.SearchScope;
import static org.testng.Assert.*;
-import static org.testng.Assert.assertTrue;
/**
@@ -250,15 +249,15 @@
//Switch things around, change groups and members to odd numbered nested
//groups and odd numbered members via ldap modify.
LinkedList<Modification> mods = new LinkedList<Modification>();
- Attribute g1 = new Attribute("member", "cn=group 1,ou=Groups,o=test");
- Attribute g2 = new Attribute("member", "cn=group 2,ou=Groups,o=test");
- Attribute g3 = new Attribute("member", "cn=group 3,ou=Groups,o=test");
- Attribute g4 = new Attribute("member", "cn=group 4,ou=Groups,o=test");
- Attribute u1 = new Attribute("member", "uid=user.1,ou=People,o=test");
- Attribute u2 = new Attribute("member", "uid=user.2,ou=People,o=test");
- Attribute u3 = new Attribute("member", "uid=user.3,ou=People,o=test");
- Attribute u4 = new Attribute("member", "uid=user.4,ou=People,o=test");
- Attribute u5 = new Attribute("member", "uid=user.5,ou=People,o=test");
+ Attribute g1 = Attributes.create("member", "cn=group 1,ou=Groups,o=test");
+ Attribute g2 = Attributes.create("member", "cn=group 2,ou=Groups,o=test");
+ Attribute g3 = Attributes.create("member", "cn=group 3,ou=Groups,o=test");
+ Attribute g4 = Attributes.create("member", "cn=group 4,ou=Groups,o=test");
+ Attribute u1 = Attributes.create("member", "uid=user.1,ou=People,o=test");
+ Attribute u2 = Attributes.create("member", "uid=user.2,ou=People,o=test");
+ Attribute u3 = Attributes.create("member", "uid=user.3,ou=People,o=test");
+ Attribute u4 = Attributes.create("member", "uid=user.4,ou=People,o=test");
+ Attribute u5 = Attributes.create("member", "uid=user.5,ou=People,o=test");
//Delete even groups and users.
mods.add(new Modification(ModificationType.DELETE, g2));
mods.add(new Modification(ModificationType.DELETE, g4));
@@ -467,8 +466,8 @@
} catch (DirectoryException ex) {}
//Modify list via ldap modify.
LinkedList<Modification> mods = new LinkedList<Modification>();
- Attribute a2 = new Attribute("member", "cn=group 2,ou=Groups,o=test");
- Attribute a3 = new Attribute("member", "cn=group 1,ou=Groups,o=test");
+ Attribute a2 = Attributes.create("member", "cn=group 2,ou=Groups,o=test");
+ Attribute a3 = Attributes.create("member", "cn=group 1,ou=Groups,o=test");
mods.add(new Modification(ModificationType.DELETE, a2));
mods.add(new Modification(ModificationType.ADD, a3));
InternalClientConnection conn =
@@ -726,8 +725,8 @@
// Modify the group and make sure the group manager gets updated
// accordingly.
LinkedList<Modification> mods = new LinkedList<Modification>();
- Attribute a2 = new Attribute("member", "uid=user.2,ou=People,o=test");
- Attribute a3 = new Attribute("member", "uid=user.3,ou=People,o=test");
+ Attribute a2 = Attributes.create("member", "uid=user.2,ou=People,o=test");
+ Attribute a3 = Attributes.create("member", "uid=user.3,ou=People,o=test");
mods.add(new Modification(ModificationType.DELETE, a2));
mods.add(new Modification(ModificationType.ADD, a3));
@@ -920,8 +919,8 @@
// Modify the group and make sure the group manager gets updated
// accordingly.
LinkedList<Modification> mods = new LinkedList<Modification>();
- Attribute a2 = new Attribute("uniquemember", "uid=user.2,ou=People,o=test");
- Attribute a3 = new Attribute("uniquemember", "uid=user.3,ou=People,o=test");
+ Attribute a2 = Attributes.create("uniquemember", "uid=user.2,ou=People,o=test");
+ Attribute a3 = Attributes.create("uniquemember", "uid=user.3,ou=People,o=test");
mods.add(new Modification(ModificationType.DELETE, a2));
mods.add(new Modification(ModificationType.ADD, a3));
@@ -1114,8 +1113,8 @@
// Modify the group and make sure the group manager gets updated
// accordingly.
LinkedList<Modification> mods = new LinkedList<Modification>();
- Attribute a2 = new Attribute("member", "uid=user.2,ou=People,o=test");
- Attribute a3 = new Attribute("member", "uid=user.3,ou=People,o=test");
+ Attribute a2 = Attributes.create("member", "uid=user.2,ou=People,o=test");
+ Attribute a3 = Attributes.create("member", "uid=user.3,ou=People,o=test");
mods.add(new Modification(ModificationType.DELETE, a2));
mods.add(new Modification(ModificationType.ADD, a3));
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
index 94b8f40..b6719b5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
@@ -31,7 +31,6 @@
import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import java.util.concurrent.locks.Lock;
import org.testng.annotations.DataProvider;
@@ -204,7 +203,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.ADD,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
conn.nextMessageID(), null, DN.nullDN(), mods));
@@ -220,7 +219,7 @@
mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
conn.nextMessageID(), null, DN.nullDN(), mods));
@@ -236,7 +235,7 @@
mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
conn.nextMessageID(), null, DN.nullDN(), mods));
@@ -252,9 +251,9 @@
mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
mods.add(new Modification(ModificationType.ADD,
- new Attribute("description", "bar")));
+ Attributes.create("description", "bar")));
opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
conn.nextMessageID(), null, DN.nullDN(), mods));
@@ -270,9 +269,9 @@
mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("cn", "bar")));
+ Attributes.create("cn", "bar")));
opList.add(new ModifyOperationBasis(conn, conn.nextOperationID(),
conn.nextMessageID(), null, DN.nullDN(), mods));
@@ -396,7 +395,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
ModifyOperation modifyOperation =
new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
null, DN.nullDN(), mods);
@@ -421,7 +420,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
ModifyOperation modifyOperation =
new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
null, DN.nullDN(), mods);
@@ -540,7 +539,7 @@
UpdatePreOpPlugin.reset();
UpdatePreOpPlugin.addModification(
new Modification(ModificationType.REPLACE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
InternalClientConnection conn =
@@ -548,7 +547,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("l", "Austin")));
+ Attributes.create("l", "Austin")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode("o=test"), mods);
@@ -757,7 +756,7 @@
e.getAttribute(DirectoryServer.getAttributeType("o", true));
for (Attribute a : attrList)
{
- numValues += a.getValues().size();
+ numValues += a.size();
}
assertEquals(numValues, 1);
@@ -781,7 +780,7 @@
attrList = e.getAttribute(DirectoryServer.getAttributeType("o", true));
for (Attribute a : attrList)
{
- numValues += a.getValues().size();
+ numValues += a.size();
}
assertEquals(numValues, 2);
}
@@ -807,7 +806,7 @@
e.getAttribute(DirectoryServer.getAttributeType("dc", true));
for (Attribute a : attrList)
{
- numValues += a.getValues().size();
+ numValues += a.size();
}
assertEquals(numValues, 1);
@@ -831,7 +830,7 @@
attrList = e.getAttribute(DirectoryServer.getAttributeType("dc", true));
for (Attribute a : attrList)
{
- numValues += a.getValues().size();
+ numValues += a.size();
}
assertEquals(numValues, 2);
}
@@ -2846,7 +2845,7 @@
boolean found = false;
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
assertEquals(Integer.parseInt(v.getStringValue()), 2);
found = true;
@@ -2915,7 +2914,7 @@
boolean found = false;
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
assertEquals(Integer.parseInt(v.getStringValue()), 11);
found = true;
@@ -2984,7 +2983,7 @@
boolean found = false;
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
assertEquals(Integer.parseInt(v.getStringValue()), 0);
found = true;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/NetworkGroupTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/NetworkGroupTest.java
deleted file mode 100644
index eb4a137..0000000
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/NetworkGroupTest.java
+++ /dev/null
@@ -1,764 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.core;
-
-
-import static org.opends.messages.CoreMessages.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.opends.server.config.ConfigConstants.DN_BACKEND_BASE;
-
-import java.util.ArrayList;
-
-import org.opends.server.TestCaseUtils;
-import org.opends.server.DirectoryServerTestCase;
-import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.protocols.ldap.LDAPFilter;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.Entry;
-import org.opends.server.types.Modification;
-import org.opends.server.types.ModificationType;
-import org.opends.server.types.ResultCode;
-import org.opends.server.types.SearchScope;
-import org.opends.server.workflowelement.WorkflowElement;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-
-/**
- * This set of tests test the network groups.
- */
-public class NetworkGroupTest extends DirectoryServerTestCase {
- //===========================================================================
- //
- // B E F O R E C L A S S
- //
- //===========================================================================
-
- /**
- * Sets up the environment for performing the tests in this suite.
- *
- * @throws Exception if the environment could not be set up.
- */
- @BeforeClass
- public void setUp()
- throws Exception
- {
- // This test suite depends on having the schema available,
- // so we'll start the server.
- TestCaseUtils.startServer();
- }
-
- //===========================================================================
- //
- // D A T A P R O V I D E R
- //
- //===========================================================================
-
- /**
- * Provides information to create a network group with one workflow inside.
- *
- * Each set of DNs contains:
- * - one network group identifier
- * - one base DN for the workflow to register with the network group
-
- */
- @DataProvider (name = "DNSet_0")
- public Object[][] initDNSet_0()
- throws Exception
- {
- // Network group ID
- String networkGroupID1 = "networkGroup1";
- String networkGroupID2 = "networkGroup2";
-
- // Workflow base DNs
- DN dn1 = null;
- DN dn2 = null;
- try
- {
- dn1 = DN.decode("o=test1");
- dn2 = DN.decode("o=test2");
- }
- catch (DirectoryException de)
- {
- throw de;
- }
-
- // Network group info
- Object[][] myData =
- {
- // Test1: create a network group with the identifier networkGroupID1
- { networkGroupID1, dn1 },
-
- // Test2: create the same network group to check that previous
- // network group was properly cleaned.
- { networkGroupID1, dn1 },
-
- // Test3: create another network group
- { networkGroupID2, dn2 },
- };
-
- return myData;
- }
-
-
- /**
- * Provides a single DN to search a workflow in a network group.
- *
- * Each set of DNs is composed of:
- * - one baseDN
- * - one subordinateDN
- * - a boolean telling whether we expect to find a workflow for the baseDN
- *
- * @return set of DNs
- * @throws Exception when DN.decode fails
- */
- @DataProvider(name = "DNSet_1")
- public Object[][] initDNSet_1()
- throws Exception
- {
- DN dnRootDSE = null;
- DN dnConfig = null;
- DN dnMonitor = null;
- DN dnSchema = null;
- DN dnTasks = null;
- DN dnBackups = null;
- DN dnDummy = null;
-
- DN dnSubordinateConfig = null;
- DN dnSubordinateMonitor = null;
- DN dnSubordinateTasks = null;
-
- try
- {
- dnRootDSE = DN.decode("");
- dnConfig = DN.decode("cn=config");
- dnMonitor = DN.decode("cn=monitor");
- dnSchema = DN.decode("cn=schema");
- dnTasks = DN.decode("cn=tasks");
- dnBackups = DN.decode("cn=backups");
- dnDummy = DN.decode("o=dummy_suffix");
-
- dnSubordinateConfig = DN.decode("cn=Work Queue,cn=config");
- dnSubordinateMonitor = DN.decode("cn=schema Backend,cn=monitor");
- dnSubordinateTasks = DN.decode("cn=Scheduled Tasks,cn=tasks");
-
- // No DN subordinate for schema because the schema backend is
- // currently empty.
- // No DN subordinate for cn=backups because by default there is no
- // child entry under cn=backups.
- }
- catch (DirectoryException de)
- {
- throw de;
- }
-
- // Sets of DNs
- Object[][] myData =
- {
- { dnRootDSE, null, true },
- { dnConfig, dnSubordinateConfig, true },
- { dnMonitor, dnSubordinateMonitor, true },
- { dnTasks, dnSubordinateTasks, true },
- { dnSchema, null, true },
- { dnBackups, null, true },
- { dnDummy, null, false },
- };
-
- return myData;
- }
-
-
- /**
- * Provides information to create a network group to test the routing
- * process.
- *
- * Each set of DNs contains:
- * - one base DN for the 1st workflow
- * - one base DN for the 2nd workflow
- * - one base DN for the 3rd workflow
- * - one subordinate DN for the 1st workflow
- * - one subordinate DN for the 2nd workflow
- * - one subordinate DN for the 3rd workflow
- * - one unrelated DN which has no hierarchical relationship with
- * any of the above DNs
-
- */
- @DataProvider (name = "DNSet_2")
- public Object[][] initDNSet_2()
- throws Exception
- {
- // Network group definition
- DN dn1 = null;
- DN dn2 = null;
- DN dn3 = null;
- DN subordinate1 = null;
- DN subordinate2 = null;
- DN subordinate3 = null;
- DN unrelatedDN = null;
- try
- {
- dn1 = DN.decode("o=test1");
- dn2 = DN.decode("o=test2");
- dn3 = DN.decode("o=test3");
- subordinate1 = DN.decode("ou=subtest1,o=test1");
- subordinate2 = DN.decode("ou=subtest2,o=test2");
- subordinate3 = DN.decode("ou=subtest3,o=test3");
- unrelatedDN = DN.decode("o=dummy");
- }
- catch (DirectoryException de)
- {
- throw de;
- }
-
- // Network group info
- Object[][] myData =
- {
- // Test1: one DN for one workflow
- {
- dn1,
- null,
- null,
- subordinate1,
- null,
- null,
- unrelatedDN
- },
- // Test2: two DNs for two workflows
- {
- dn1,
- dn2,
- null,
- subordinate1,
- subordinate2,
- null,
- unrelatedDN
- },
- // Test3: three DNs for three workflows
- {
- dn1,
- dn2,
- dn3,
- subordinate1,
- subordinate2,
- subordinate3,
- unrelatedDN
- }
- };
-
- return myData;
- }
-
-
- //===========================================================================
- //
- // T E S T C A S E S
- //
- //===========================================================================
-
-
- /**
- * Tests the network group registration.
- *
- * @param networkGroupID the ID of the network group to register
- * @param workflowBaseDN1 the base DN of the first workflow node to register
- * in the network group
- */
- @Test (dataProvider = "DNSet_0", groups = "virtual")
- public void testNetworkGroupRegistration(
- String networkGroupID,
- DN workflowBaseDN
- )
- throws DirectoryException
- {
- // Create and register the network group with the server.
- NetworkGroup networkGroup = new NetworkGroup(networkGroupID);
- networkGroup.register();
-
- // Register again the network group with the server and catch the
- // expected DirectoryServer exception.
- boolean exceptionRaised = false;
- try
- {
- networkGroup.register();
- }
- catch (DirectoryException de)
- {
- exceptionRaised = true;
- assertEquals(de.getMessageObject().getDescriptor(),
- ERR_REGISTER_NETWORK_GROUP_ALREADY_EXISTS);
- }
- assertEquals(exceptionRaised, true);
-
- // Create a workflow -- the workflow ID is the string representation
- // of the workflow base DN.
- WorkflowElement nullWE = null;
- WorkflowImpl workflow = new WorkflowImpl(
- workflowBaseDN.toString(), workflowBaseDN, nullWE);
-
- // Register the workflow with the network group.
- networkGroup.registerWorkflow(workflow);
-
- // Register again the workflow with the network group and catch the
- // expected DirectoryServer exception.
- exceptionRaised = false;
- try
- {
- networkGroup.registerWorkflow(workflow);
- }
- catch (DirectoryException de)
- {
- exceptionRaised = true;
- assertEquals(
- de.getMessageObject().getDescriptor(),
- ERR_REGISTER_WORKFLOW_NODE_ALREADY_EXISTS);
- }
- assertEquals(exceptionRaised, true);
-
- // Clean the network group
- networkGroup.deregisterWorkflow(workflow.getWorkflowId());
- networkGroup.deregister();
- }
-
-
- /**
- * Check the route process in the default network group.
- *
- * @param dnToSearch the DN of a workflow to search in the default
- * network group
- * @param dnSubordinate a subordinate DN of dnToSearch
- * @param exists true if we are supposed to find a workflow for
- * dnToSearch
- */
- @Test (dataProvider = "DNSet_1", groups = "virtual")
- public void checkDefaultNetworkGroup(
- DN dnToSearch,
- DN dnSubordinate,
- boolean exists
- )
- {
- // let's get the default network group -- it should always exist
- NetworkGroup defaultNG = NetworkGroup.getDefaultNetworkGroup();
- assertNotNull(defaultNG);
-
- // let's check the routing through the network group
- doCheckNetworkGroup(defaultNG, dnToSearch, dnSubordinate, null, exists);
-
- // Dump the default network group
- dump(defaultNG, "defaultNetworkGroup> ");
- }
-
-
- /**
- * Creates a network group with several workflows inside and do some check
- * on the route processing.
- *
- * @param dn1 the DN for the 1st workflow
- * @param dn2 the DN for the 2nd workflow
- * @param dn3 the DN for the 3rd workflow
- * @param subordinate1 the subordinate DN for the 1st workflow
- * @param subordinate2 the subordinate DN for the 2nd workflow
- * @param subordinate3 the subordinate DN for the 3rd workflow
- * @param unrelatedDN a DN with no hierarchical relationship with
- * any of the DNs above
- *
- * @throws DirectoryException If the network group ID for a provided
- * network group conflicts with the network
- * group ID of an existing network group.
- */
- @Test (dataProvider = "DNSet_2", groups = "virtual")
- public void createNetworkGroup(
- DN dn1,
- DN dn2,
- DN dn3,
- DN subordinate1,
- DN subordinate2,
- DN subordinate3,
- DN unrelatedDN
- ) throws DirectoryException
- {
- // The network group identifier is always the same for this test.
- String networkGroupID = "Network Group for test2";
-
- // Create the network group
- NetworkGroup networkGroup = new NetworkGroup(networkGroupID);
- assertNotNull(networkGroup);
-
- // Register the network group with the server
- networkGroup.register();
-
- // Create and register workflow 1, 2 and 3
- createAndRegisterWorkflow(networkGroup, dn1);
- createAndRegisterWorkflow(networkGroup, dn2);
- createAndRegisterWorkflow(networkGroup, dn3);
-
- // Check the route thorugh the network group
- doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, true);
- doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, true);
- doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, true);
-
- // Deregister the workflow1 and check the route again.
- // Workflow to deregister is identified by its baseDN.
- networkGroup.deregisterWorkflow(dn1);
- doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
- doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, true);
- doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, true);
-
- // Deregister the workflow2 and check the route again
- networkGroup.deregisterWorkflow(dn2);
- doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
- doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, false);
- doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, true);
-
- // Deregister the workflow3 and check the route again
- networkGroup.deregisterWorkflow(dn3);
- doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
- doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, false);
- doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, false);
-
- // Now create again the workflow 1, 2 and 3...
- WorkflowImpl w1;
- WorkflowImpl w2;
- WorkflowImpl w3;
- w1 = createAndRegisterWorkflow(networkGroup, dn1);
- w2 = createAndRegisterWorkflow(networkGroup, dn2);
- w3 = createAndRegisterWorkflow(networkGroup, dn3);
-
- // ... and deregister the workflows using their workflowID
- // instead of their baseDN
- if (w1 != null)
- {
- networkGroup.deregisterWorkflow(w1.getWorkflowId());
- doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
- doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, true);
- doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, true);
- }
-
- if (w2 != null)
- {
- networkGroup.deregisterWorkflow(w2.getWorkflowId());
- doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
- doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, false);
- doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, true);
- }
-
- if (w3 != null)
- {
- networkGroup.deregisterWorkflow(w3.getWorkflowId());
- doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
- doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, false);
- doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, false);
- }
-
- // Deregister the network group
- networkGroup.deregister();
- }
-
-
- /**
- * This test checks that network groups are updated as appropriate when
- * backend base DNs are added or removed. When a new backend base DN is
- * added, the new suffix should be accessible for the route process - ie.
- * a workflow should be created and be a potential candidate for the route
- * process. Simillarly, when a backend base DN is removed its associated
- * workflow should be removed; subsequently, any request targetting the
- * removed suffix should be rejected and a no such entry status code be
- * returned.
- */
- @Test
- public void testBackendBaseDNModification()
- throws Exception
- {
- String suffix = "dc=example,dc=com";
- String suffix2 = "o=networkgroup suffix";
- String backendBaseDNName = "ds-cfg-base-dn";
-
- // Initialize a backend with a base entry.
- TestCaseUtils.clearJEBackend(true, "userRoot", suffix);
-
- // Create a client connection for the test.
- InternalClientConnection connection =
- InternalClientConnection.getRootConnection();
-
- // Check that suffix is accessible while suffix2 is not.
- searchEntry(connection, suffix, true);
- searchEntry(connection, suffix2, false);
-
- // Add a new suffix in the backend and create a base entry for the
- // new suffix.
- String backendConfigDN = "ds-cfg-backend-id=userRoot," + DN_BACKEND_BASE;
- modifyAttribute(
- connection, backendConfigDN,
- ModificationType.ADD, backendBaseDNName, suffix2);
- addBaseEntry(connection, suffix2, "networkgroup suffix");
-
- // Both old and new suffix should be accessible.
- searchEntry(connection, suffix, true);
- searchEntry(connection, suffix2, true);
-
- // Remove the new suffix...
- modifyAttribute(
- connection, backendConfigDN,
- ModificationType.DELETE, backendBaseDNName, suffix2);
-
- // ...and check that the removed suffix is no more accessible.
- searchEntry(connection, suffix, true);
- searchEntry(connection, suffix2, false);
-
- // Replace the suffix with suffix2 in the backend
- modifyAttribute(
- connection, backendConfigDN,
- ModificationType.REPLACE, backendBaseDNName, suffix2);
-
- // Now none of the suffixes are accessible: this means the entries
- // under the old suffix are not moved to the new suffix.
- searchEntry(connection, suffix, false);
- searchEntry(connection, suffix2, false);
-
- // Add a base entry for the new suffix
- addBaseEntry(connection, suffix2, "networkgroup suffix");
-
- // The new suffix is accessible while the old one is not.
- searchEntry(connection, suffix, false);
- searchEntry(connection, suffix2, true);
- }
-
-
- /**
- * Searches an entry on a given connection.
- *
- * @param connection the connection to use for the search request
- * @param baseDN the request base DN string
- * @param shouldExist if true the searched entry is expected to be found
- */
- private void searchEntry(
- InternalClientConnection connection,
- String baseDN,
- boolean shouldExist
- ) throws Exception
- {
- SearchOperation search = connection.processSearch(
- DN.decode(baseDN),
- SearchScope.BASE_OBJECT,
- LDAPFilter.decode("(objectClass=*)").toSearchFilter());
-
- // Compare the result code with the expected one
- ResultCode resultCode = search.getResultCode();
- if (shouldExist)
- {
- assertEquals(resultCode, ResultCode.SUCCESS);
- }
- else
- {
- assertEquals(resultCode, ResultCode.NO_SUCH_OBJECT);
- }
- }
-
-
- /**
- * Creates a base entry for the given suffix.
- *
- * @param connection the connection to use for the add request
- * @param suffix the suffix for which the base entry is to be created
- */
- private void addBaseEntry(
- InternalClientConnection connection,
- String suffix,
- String namingAttribute
- ) throws Exception
- {
- Entry e = TestCaseUtils.makeEntry(
- "dn: " + suffix,
- "objectClass: top",
- "objectClass: organization",
- "o: " + namingAttribute);
-
- AddOperation addOperation = connection.processAdd(
- e.getDN(),
- e.getObjectClasses(),
- e.getUserAttributes(),
- e.getOperationalAttributes());
-
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- }
-
-
- /**
- * Adds/Deletes/Replaces an attribute in a given entry.
- *
- * @param connection the connection to use for the modify request
- * @param baseDN the request base DN string
- * @param modType the modification type (add/delete/replace)
- * @param attributeName the name of the attribute to add/delete/replace
- * @param attributeValue the value of the attribute to add/delete/replace
- */
- private void modifyAttribute(
- InternalClientConnection connection,
- String baseDN,
- ModificationType modType,
- String attributeName,
- String attributeValue
- ) throws Exception
- {
- ArrayList<Modification> mods = new ArrayList<Modification>();
- Attribute attributeToModify = new Attribute(attributeName, attributeValue);
- mods.add(new Modification(modType, attributeToModify));
- ModifyOperation modifyOperation = connection.processModify(
- DN.decode(baseDN), mods);
- assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
- }
-
-
- /**
- * Checks the DN routing through a network group.
- *
- * @param networkGroup the network group to use for the check
- * @param dnToSearch the DN of a workflow in the network group; may
- * be null
- * @param dnSubordinate a subordinate of dnToSearch
- * @param unrelatedDN a DN with no hierarchical relationship with
- * any of the DNs above, may be null
- * @param shouldExist true if we are supposed to find a workflow for
- * dnToSearch
- */
- private void doCheckNetworkGroup(
- NetworkGroup networkGroup,
- DN dnToSearch,
- DN dnSubordinate,
- DN unrelatedDN,
- boolean shouldExist
- )
- {
- if (dnToSearch == null)
- {
- return;
- }
-
- // Let's retrieve the workflow that maps best the dnToSearch
- Workflow workflow = networkGroup.getWorkflowCandidate(dnToSearch);
- if (shouldExist)
- {
- assertNotNull(workflow);
- }
- else
- {
- assertNull(workflow);
- }
-
- // let's retrieve the workflow that handles the DN subordinate:
- // it should be the same than the one for dnToSearch
- if (dnSubordinate != null)
- {
- Workflow workflow2 = networkGroup.getWorkflowCandidate(dnSubordinate);
- assertEquals(workflow2, workflow);
- }
-
- // Check that the unrelatedDN is not handled by any workflow
- if (unrelatedDN != null)
- {
- Workflow unrelatedWorkflow =
- networkGroup.getWorkflowCandidate(unrelatedDN);
- assertNull(unrelatedWorkflow);
- }
- }
-
-
- /**
- * Creates a workflow and register it with a network group.
- *
- * @param networkGroup a network group to register the workflow with
- * @param workflowBaseDN the base DN of the workflow to register; may be
- * null
- * @throws DirectoryException If the workflow ID for the provided
- * workflow conflicts with the workflow
- * ID of an existing workflow.
- */
- private WorkflowImpl createAndRegisterWorkflow(
- NetworkGroup networkGroup,
- DN workflowBaseDN
- ) throws DirectoryException
- {
- assertNotNull(networkGroup);
-
- if (workflowBaseDN == null)
- {
- return null;
- }
-
- // Create a workflow with no task inside. The workflow identifier
- // is the a string representation of the workflow base DN.
- WorkflowElement rootWE = null;
- String workflowId = workflowBaseDN.toString();
- WorkflowImpl workflow = new WorkflowImpl(
- workflowId, workflowBaseDN, rootWE);
- assertNotNull(workflow);
-
- // Register the workflow with the network group.
- networkGroup.registerWorkflow(workflow);
-
- return workflow;
- }
-
-
- /**
- * Prints a text to System.out.
- */
- private void write(String msg)
- {
- System.out.print(msg);
- }
-
-
- /**
- * Prints a text to System.out.
- */
- private void writeln(String msg)
- {
- write(msg + "\n");
- }
-
-
-
- /**
- * Dump the network group info to the console.
- */
- private void dump(NetworkGroup networkGroup, String prompt)
- {
- final boolean doDump = false;
-
- if (doDump)
- {
- StringBuilder sb = networkGroup.toString(prompt);
- writeln(sb.toString());
- }
- }
-
-}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java
index 0960fdb..1ef5f7a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java
@@ -2260,7 +2260,7 @@
throws Exception
{
PasswordPolicy p = DirectoryServer.getDefaultPasswordPolicy();
- CopyOnWriteArrayList<PasswordStorageScheme> defaultSchemes =
+ CopyOnWriteArrayList<PasswordStorageScheme<?>> defaultSchemes =
p.getDefaultStorageSchemes();
assertNotNull(defaultSchemes);
assertFalse(defaultSchemes.isEmpty());
@@ -2297,7 +2297,7 @@
DN dn = DN.decode("cn=SHA1 AuthPassword Policy,cn=Password Policies," +
"cn=config");
PasswordPolicy p = DirectoryServer.getPasswordPolicy(dn);
- CopyOnWriteArrayList<PasswordStorageScheme> defaultSchemes =
+ CopyOnWriteArrayList<PasswordStorageScheme<?>> defaultSchemes =
p.getDefaultStorageSchemes();
assertNotNull(defaultSchemes);
assertFalse(defaultSchemes.isEmpty());
@@ -4304,7 +4304,7 @@
try
{
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(false,
"dn: uid=test.user,o=test",
"changetype: modify",
"replace: userPassword",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
index 1970683..508926f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
@@ -27,6 +27,7 @@
package org.opends.server.core;
+
import java.net.Socket;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
@@ -46,90 +47,63 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.UnbindRequestProtocolOp;
import org.opends.server.tools.*;
-import org.testng.annotations.*;
import static org.testng.Assert.*;
import static org.opends.server.util.ServerConstants.*;
+
+
/**
* A set of testcases for configuration attribute
* "ds-cfg-reject-unauthenticated-requests".
- *
*/
public class RejectUnauthReqTests extends CoreTestCase
{
/**
- * Utility method which is called by the testcase sending an ADD request.
- * @param authentication The flag to set the authentication on and off.
+ * Utility method which is called by the testcase sending an ADD
+ * request.
+ *
+ * @param authentication
+ * The flag to set the authentication on and off.
* @return The error code of operation performed.
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
private int performAddOperation(boolean authentication) throws Exception
{
String filePath = TestCaseUtils.createTempFile(
- "dn: o=rejectTestCase,o=test",
- "objectclass: top",
- "objectclass: organization",
- "o: rejectTestCase",
- "description: Reject Test Case");
+ "dn: o=rejectTestCase,o=test", "objectclass: top",
+ "objectclass: organization", "o: rejectTestCase",
+ "description: Reject Test Case");
String[] args = null;
- if(authentication)
- args = new String []
+ if (authentication)
+ args = new String[]
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D","cn=directory manager",
- "-w","password",
- "-a",
- "-f", filePath,
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D",
+ "cn=directory manager",
+ "-w",
+ "password",
+ "-a",
+ "-f",
+ filePath,
};
else
args = new String[]
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-a",
- "-f", filePath,
- };
- return LDAPModify.mainModify(args, false, null,null);
- }
-
-
-
- /**
- * Utility method which is called by the testcase sending a MODIFY request.
- * @param authentication The flag to set the authentication on and off.
- * @return The error code of operation performed.
- * @throws Exception If an unexpected problem occurs.
- */
- private int performModifyOperation(boolean authentication) throws Exception
- {
- String path = TestCaseUtils.createTempFile(
- "dn: o=rejectTestCase,o=test",
- "changetype: modify",
- "replace: description",
- "description: New Description");
- String[] args = null;
- if(authentication)
- args = new String[]
- {
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D","cn=directory manager",
- "-w","password",
- "-f", path
- };
- else
- args = new String[]
- {
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-f", path
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-a",
+ "-f",
+ filePath,
};
return LDAPModify.mainModify(args, false, null, null);
}
@@ -137,33 +111,90 @@
/**
- * Utility method which is called by the testcase sending a COMPARE request.
- * @param authentication The flag to set the authentication on and off.
+ * Utility method which is called by the testcase sending a MODIFY
+ * request.
+ *
+ * @param authentication
+ * The flag to set the authentication on and off.
* @return The error code of operation performed.
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
- private int performCompareOperation(boolean authentication) throws Exception
+ private int performModifyOperation(boolean authentication) throws Exception
{
+ String path = TestCaseUtils.createTempFile("dn: o=rejectTestCase,o=test",
+ "changetype: modify", "replace: description",
+ "description: New Description");
String[] args = null;
- if(authentication)
+ if (authentication)
args = new String[]
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "o:test",
- "o=test"
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D",
+ "cn=directory manager",
+ "-w",
+ "password",
+ "-f",
+ path
};
else
args = new String[]
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "o:test",
- "o=test"
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-f",
+ path
+ };
+ return LDAPModify.mainModify(args, false, null, null);
+ }
+
+
+
+ /**
+ * Utility method which is called by the testcase sending a COMPARE
+ * request.
+ *
+ * @param authentication
+ * The flag to set the authentication on and off.
+ * @return The error code of operation performed.
+ * @throws Exception
+ * If an unexpected problem occurs.
+ */
+ private int performCompareOperation(boolean authentication) throws Exception
+ {
+ String[] args = null;
+ if (authentication)
+ args = new String[]
+ {
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D",
+ "cn=Directory Manager",
+ "-w",
+ "password",
+ "o:test",
+ "o=test"
+ };
+ else
+ args = new String[]
+ {
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "o:test",
+ "o=test"
};
return LDAPCompare.mainCompare(args, false, null, null);
@@ -172,35 +203,46 @@
/**
- * Utility method which is called by the testcase sending a MODRDN request.
- * @param authentication The flag to set the authentication on and off.
+ * Utility method which is called by the testcase sending a MODRDN
+ * request.
+ *
+ * @param authentication
+ * The flag to set the authentication on and off.
* @return The error code of operation performed.
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
private int performModRdnOperation(boolean authentication) throws Exception
{
- String path= TestCaseUtils.createTempFile("dn: o=rejectTestCase,o=Test",
- "changetype: modrdn",
- "newrdn: o=mod_rejectTestCase",
- "deleteoldrdn: 0");
+ String path = TestCaseUtils
+ .createTempFile("dn: o=rejectTestCase,o=Test", "changetype: modrdn",
+ "newrdn: o=mod_rejectTestCase", "deleteoldrdn: 0");
String[] args = null;
- if(authentication)
+ if (authentication)
args = new String[]
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D","cn=directory manager",
- "-w","password",
- "-f", path
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D",
+ "cn=directory manager",
+ "-w",
+ "password",
+ "-f",
+ path
};
else
args = new String[]
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-f", path
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-f",
+ path
};
return LDAPModify.mainModify(args, false, null, null);
}
@@ -208,69 +250,92 @@
/**
- * Utility method which is called by the testcase sending a DELETE request.
- * @param authentication The flag to set the authentication on and off.
+ * Utility method which is called by the testcase sending a DELETE
+ * request.
+ *
+ * @param authentication
+ * The flag to set the authentication on and off.
* @return The error code of operation performed.
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
private int performDeleteOperation(boolean authentication) throws Exception
{
String[] args = null;
- if(authentication)
+ if (authentication)
args = new String[]
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-V", "3",
- "-D", "cn=Directory Manager",
- "-w", "password",
- "o=mod_rejectTestCase,o=test"
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-V",
+ "3",
+ "-D",
+ "cn=Directory Manager",
+ "-w",
+ "password",
+ "o=mod_rejectTestCase,o=test"
};
else
args = new String[]
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "o=mod_rejectTestCase,o=test"
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "o=mod_rejectTestCase,o=test"
};
return LDAPDelete.mainDelete(args, false, null, null);
}
+
+
/**
* Ensures that the Directory Server is running before executing the
* testcases.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@BeforeClass()
- public void startServer()
- throws Exception
+ public void startServer() throws Exception
{
TestCaseUtils.startServer();
TestCaseUtils.initializeTestBackend(true);
}
+
/**
- * Tests whether an authenticated SEARCH request will be allowed with the
- * default configuration settings for
+ * Tests whether an authenticated SEARCH request will be allowed
+ * with the default configuration settings for
* "ds-cfg-reject-unauthenticated-requests".
*/
@Test()
public void testAuthSearchDefCfg()
{
- String[] args = {
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-b", "",
- "-s", "base",
- "(objectClass=*)"
- };
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+
+ String[] args =
+ {
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D",
+ "cn=Directory Manager",
+ "-w",
+ "password",
+ "-b",
+ "",
+ "-s",
+ "base",
+ "(objectClass=*)"
+ };
assertEquals(LDAPSearch.mainSearch(args, false, null, System.err), 0);
}
@@ -278,21 +343,28 @@
/**
- * Tests whether an unauthenticated SEARCH request will be allowed with the
- * default configuration settings for
+ * Tests whether an unauthenticated SEARCH request will be allowed
+ * with the default configuration settings for
* "ds-cfg-reject-unauthenticated-requests".
*/
@Test()
public void testUnauthSearchDefCfg()
{
- String[] args = {
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-b", "",
- "-s", "base",
- "(objectClass=*)"
- };
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+
+ String[] args =
+ {
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-b",
+ "",
+ "-s",
+ "base",
+ "(objectClass=*)"
+ };
assertEquals(LDAPSearch.mainSearch(args, false, null, System.err), 0);
}
@@ -300,67 +372,71 @@
/**
- * Tests whether an authenticated BIND request will be allowed with the
- * default configuration settings for
+ * Tests whether an authenticated BIND request will be allowed with
+ * the default configuration settings for
* "ds-cfg-reject-unauthenticated-requests" .
*/
@Test()
public void testAuthBindDefCfg()
{
- InternalClientConnection conn =
- new InternalClientConnection(new AuthenticationInfo());
- ASN1OctetString user =
- new ASN1OctetString("cn=Directory Manager");
- ASN1OctetString password =
- new ASN1OctetString("password");
- BindOperation bindOperation = conn.processSimpleBind(user,password);
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+
+ InternalClientConnection conn = new InternalClientConnection(
+ new AuthenticationInfo());
+ ASN1OctetString user = new ASN1OctetString("cn=Directory Manager");
+ ASN1OctetString password = new ASN1OctetString("password");
+ BindOperation bindOperation = conn.processSimpleBind(user, password);
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
/**
- * Tests whether an Unauthenticated BIND request will be allowed with the
- * default configuration settings for
+ * Tests whether an Unauthenticated BIND request will be allowed
+ * with the default configuration settings for
* "ds-cfg-reject-unauthenticated-requests".
*/
@Test()
public void testUnauthBindDefCfg()
{
- InternalClientConnection conn =
- new InternalClientConnection(new AuthenticationInfo());
- BindOperation bindOperation = conn.processSimpleBind(DN.nullDN(),null);
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+
+ InternalClientConnection conn = new InternalClientConnection(
+ new AuthenticationInfo());
+ BindOperation bindOperation = conn.processSimpleBind(DN.nullDN(), null);
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
+
/**
* Tests whether the Who Am I? extended operation with an internal
* authenticated connection succeeds with default setting of
* "ds-cfg-reject-unauthenticated-requests".
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test()
public void testAuthWAIDefCfg() throws Exception
{
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader reader = new LDAPReader(s);
LDAPWriter writer = new LDAPWriter(s);
AtomicInteger nextMessageID = new AtomicInteger(1);
- LDAPAuthenticationHandler authHandler =
- new LDAPAuthenticationHandler(reader, writer, "localhost",
- nextMessageID);
+ LDAPAuthenticationHandler authHandler = new LDAPAuthenticationHandler(
+ reader, writer, "localhost", nextMessageID);
authHandler.doSimpleBind(3, new ASN1OctetString("cn=Directory Manager"),
- new ASN1OctetString("password"),
- new ArrayList<LDAPControl>(),
- new ArrayList<LDAPControl>());
+ new ASN1OctetString("password"), new ArrayList<LDAPControl>(),
+ new ArrayList<LDAPControl>());
ASN1OctetString authzID = authHandler.requestAuthorizationIdentity();
assertNotNull(authzID);
- LDAPMessage unbindMessage = new LDAPMessage(nextMessageID.getAndIncrement(),
- new UnbindRequestProtocolOp());
+ LDAPMessage unbindMessage = new LDAPMessage(
+ nextMessageID.getAndIncrement(), new UnbindRequestProtocolOp());
writer.writeMessage(unbindMessage);
s.close();
}
@@ -372,24 +448,26 @@
* unauthenticated connection succeeds with default setting of
* "ds-cfg-reject-unauthenticated-requests".
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test()
public void testUnauthWAIDefCfg() throws Exception
{
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader reader = new LDAPReader(s);
LDAPWriter writer = new LDAPWriter(s);
AtomicInteger nextMessageID = new AtomicInteger(1);
- LDAPAuthenticationHandler authHandler =
- new LDAPAuthenticationHandler(reader, writer, "localhost",
- nextMessageID);
+ LDAPAuthenticationHandler authHandler = new LDAPAuthenticationHandler(
+ reader, writer, "localhost", nextMessageID);
ASN1OctetString authzID = authHandler.requestAuthorizationIdentity();
assertNull(authzID);
- LDAPMessage unbindMessage = new LDAPMessage(nextMessageID.getAndIncrement(),
- new UnbindRequestProtocolOp());
+ LDAPMessage unbindMessage = new LDAPMessage(
+ nextMessageID.getAndIncrement(), new UnbindRequestProtocolOp());
writer.writeMessage(unbindMessage);
s.close();
}
@@ -397,237 +475,249 @@
/**
- * Tests the use of the StartTLS extended operation to communicate with the
- * server in conjunction with no authentication and using blind trust
- * with the default configuration settings.
+ * Tests the use of the StartTLS extended operation to communicate
+ * with the server in conjunction with no authentication and using
+ * blind trust with the default configuration settings.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test()
public void testStartTLSUnauthDefCfg() throws Exception
{
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+
String[] argSearch =
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=directory manager",
- "-w", "password",
- "-q",
- "-X",
- "-b", "",
- "-s", "base",
- "(objectClass=*)"
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D",
+ "cn=directory manager",
+ "-w",
+ "password",
+ "-q",
+ "-X",
+ "-b",
+ "",
+ "-s",
+ "base",
+ "(objectClass=*)"
};
- assertEquals(LDAPSearch.mainSearch(
- argSearch, false, null, System.err),0);
+ assertEquals(LDAPSearch.mainSearch(argSearch, false, null, System.err), 0);
}
/**
- * Tests the whether the authenticated ADD,MODIFY,COMPARE,MODRDN and DELETE
- * requests succeed with the default configuration settings.
+ * Tests the whether the authenticated ADD,MODIFY,COMPARE,MODRDN and
+ * DELETE requests succeed with the default configuration settings.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test()
public void testOtherOpsAuthDefCfg() throws Exception
{
- assertEquals(performAddOperation(true),0);
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
- assertEquals(performModifyOperation(true),0);
+ assertEquals(performAddOperation(true), 0);
+
+ assertEquals(performModifyOperation(true), 0);
assertEquals(performCompareOperation(true), 0);
assertEquals(performModRdnOperation(true), 0);
- assertEquals(performDeleteOperation(true),0);
+ assertEquals(performDeleteOperation(true), 0);
}
/**
- * Tests the whether the unauthenticated ADD,MODIFY,COMPARE,MODRDN and
- * DELETE requests succeed with the default configuration settings.
- * FIXME: This test is disabled because it is unreasonable to expect
- * unauthenticated writes to succeed when access control is enabled.
+ * Tests the whether the unauthenticated ADD,MODIFY,COMPARE,MODRDN
+ * and DELETE requests succeed with the default configuration
+ * settings. FIXME: This test is disabled because it is unreasonable
+ * to expect unauthenticated writes to succeed when access control
+ * is enabled.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
- @Test(enabled=false)
+ @Test(enabled = false)
public void testOtherOpsUnauthDefCfg() throws Exception
{
- assertEquals(performAddOperation(false),0);
+ assertEquals(performAddOperation(false), 0);
- assertEquals(performModifyOperation(false),0);
+ assertEquals(performModifyOperation(false), 0);
assertEquals(performCompareOperation(false), 0);
assertEquals(performModRdnOperation(false), 0);
- assertEquals(performDeleteOperation(false),0);
+ assertEquals(performDeleteOperation(false), 0);
}
/**
- * Tests whether change in the configuration attribute takes effect
- * on-the-fly.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- @Test(dependsOnMethods = {
- "org.opends.server.core.RejectUnauthReqTests.testAuthSearchDefCfg",
- "org.opends.server.core.RejectUnauthReqTests.testUnauthSearchDefCfg",
- "org.opends.server.core.RejectUnauthReqTests.testAuthBindDefCfg",
- "org.opends.server.core.RejectUnauthReqTests.testUnauthBindDefCfg",
- "org.opends.server.core.RejectUnauthReqTests.testUnauthWAIDefCfg",
- "org.opends.server.core.RejectUnauthReqTests.testAuthWAIDefCfg",
- "org.opends.server.core.RejectUnauthReqTests.testStartTLSUnauthDefCfg",
-// "org.opends.server.core.RejectUnauthReqTests.testOtherOpsUnauthDefCfg",
- "org.opends.server.core.RejectUnauthReqTests.testOtherOpsAuthDefCfg"
- })
- public void testChangeAndVerifyRejUnauthReqCfgAttr() throws Exception
- {
- //Verify the default setting of the configuration attribute.
- assertEquals(DirectoryServer.rejectUnauthenticatedRequests(),false);
- String path = TestCaseUtils.createTempFile(
- "dn: cn=config",
- "changetype: modify",
- "replace: ds-cfg-reject-unauthenticated-requests",
- "ds-cfg-reject-unauthenticated-requests: true");
-
- String[] args =
- {
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
- assertEquals(DirectoryServer.rejectUnauthenticatedRequests(),true);
- }
-
-
-
- /**
- * Tests whether both authenticated and unauthenticated SEARCH requests
- * will be allowed with the new configuration settings for
+ * Tests whether both authenticated and unauthenticated SEARCH
+ * requests will be allowed with the new configuration settings for
* "ds-cfg-reject-unauthenticated-requests" .
*/
- @Test(dependsOnMethods = {
- "org.opends.server.core.RejectUnauthReqTests." +
- "testChangeAndVerifyRejUnauthReqCfgAttr"
- })
+ @Test
public void testSearchNewCfg()
{
- String[] args = {
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-b", "",
- "-s", "base",
- "(objectClass=*)"
+ try
+ {
+ DirectoryServer.setRejectUnauthenticatedRequests(true);
+
+ String[] args =
+ {
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-b",
+ "",
+ "-s",
+ "base",
+ "(objectClass=*)"
};
- assertFalse(LDAPSearch.mainSearch(args, false, null, null)==0);
+ assertFalse(LDAPSearch.mainSearch(args, false, null, null) == 0);
- String[] authArgs = {
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-b", "",
- "-s", "base",
- "(objectClass=*)"
- } ;
- assertEquals(LDAPSearch.mainSearch(
- authArgs, false, null, System.err), 0);
- }
-
-
-
- /**
- * Tests whether authenticated and unauthenticated BIND requests will be
- * allowed with the new configuration settings for
- * "ds-cfg-reject-unauthenticated-requests" .
- */
- @Test(dependsOnMethods = {
- "org.opends.server.core.RejectUnauthReqTests." +
- "testChangeAndVerifyRejUnauthReqCfgAttr"})
- public void testBindNewCfg()
- {
- InternalClientConnection conn =
- new InternalClientConnection(new AuthenticationInfo());
- ASN1OctetString user =
- new ASN1OctetString("cn=Directory Manager");
- ASN1OctetString password =
- new ASN1OctetString("password");
- //Unauthenticated BIND request.
- BindOperation bindOperation = conn.processSimpleBind(DN.nullDN(),null);
- assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
- //Authenticated BIND request.
- bindOperation = conn.processSimpleBind(user,password);
- assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
+ String[] authArgs =
+ {
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D",
+ "cn=Directory Manager",
+ "-w",
+ "password",
+ "-b",
+ "",
+ "-s",
+ "base",
+ "(objectClass=*)"
+ };
+ assertEquals(LDAPSearch.mainSearch(authArgs, false, null, System.err), 0);
+ }
+ finally
+ {
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+ }
}
/**
- * Tests the use of the StartTLS extended operation to communicate with the
- * server in conjunction with no authentication and using blind trust.
- *
- * @throws Exception If an unexpected problem occurs.
+ * Tests whether authenticated and unauthenticated BIND requests
+ * will be allowed with the new configuration settings for
+ * "ds-cfg-reject-unauthenticated-requests" .
*/
- @Test(dependsOnMethods = {
- "org.opends.server.core.RejectUnauthReqTests." +
- "testChangeAndVerifyRejUnauthReqCfgAttr"})
- public void testStartTLSNoAuthTrustAll() throws Exception
+ @Test
+ public void testBindNewCfg()
{
- String[] argSearch =
+ try
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=directory manager",
- "-w", "password",
- "-q",
- "-X",
- "-b", "",
- "-s", "base",
- "(objectClass=*)"
- };
- assertEquals(LDAPSearch.mainSearch(
- argSearch, false, null, System.err),0);
+ DirectoryServer.setRejectUnauthenticatedRequests(true);
+
+ InternalClientConnection conn = new InternalClientConnection(
+ new AuthenticationInfo());
+ ASN1OctetString user = new ASN1OctetString("cn=Directory Manager");
+ ASN1OctetString password = new ASN1OctetString("password");
+ // Unauthenticated BIND request.
+ BindOperation bindOperation = conn.processSimpleBind(DN.nullDN(), null);
+ assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
+ // Authenticated BIND request.
+ bindOperation = conn.processSimpleBind(user, password);
+ assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
+ }
+ finally
+ {
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+ }
}
+ /**
+ * Tests the use of the StartTLS extended operation to communicate
+ * with the server in conjunction with no authentication and using
+ * blind trust.
+ *
+ * @throws Exception
+ * If an unexpected problem occurs.
+ */
+ @Test
+ public void testStartTLSNoAuthTrustAll() throws Exception
+ {
+ try
+ {
+ DirectoryServer.setRejectUnauthenticatedRequests(true);
+
+ String[] argSearch =
+ {
+ "--noPropertiesFile",
+ "-h",
+ "127.0.0.1",
+ "-p",
+ String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D",
+ "cn=directory manager",
+ "-w",
+ "password",
+ "-q",
+ "-X",
+ "-b",
+ "",
+ "-s",
+ "base",
+ "(objectClass=*)"
+ };
+ assertEquals(LDAPSearch.mainSearch(argSearch, false, null, System.err), 0);
+ }
+ finally
+ {
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+ }
+ }
+
+
/**
* Tests whether the Who Am I? extended operation with an internal
* authenticated connection succeeds with new setting of
* "ds-cfg-reject-unauthenticated-requests".
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
- @Test(dependsOnMethods = {
- "org.opends.server.core.RejectUnauthReqTests." +
- "testChangeAndVerifyRejUnauthReqCfgAttr"})
-
+ @Test
public void testAuthWAINewCfg() throws Exception
{
- InternalClientConnection conn =
- InternalClientConnection.getRootConnection();
- ExtendedOperation extOp =
- conn.processExtendedOperation(OID_WHO_AM_I_REQUEST, null);
- assertEquals(extOp.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(extOp.getResponseValue());
+ try
+ {
+ DirectoryServer.setRejectUnauthenticatedRequests(true);
+
+ InternalClientConnection conn = InternalClientConnection
+ .getRootConnection();
+ ExtendedOperation extOp = conn.processExtendedOperation(
+ OID_WHO_AM_I_REQUEST, null);
+ assertEquals(extOp.getResultCode(), ResultCode.SUCCESS);
+ assertNotNull(extOp.getResponseValue());
+ }
+ finally
+ {
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+ }
}
@@ -637,117 +727,111 @@
* unauthenticated connection fails with new setting of
* "ds-cfg-reject-unauthenticated-requests".
*
- * @throws UnsupportedEncodingException If an unexpected problem occurs.
- * @throws IOException If an unexpected problem occurs.
- * @throws ClientException If an unexpected problem occurs.
+ * @throws UnsupportedEncodingException
+ * If an unexpected problem occurs.
+ * @throws IOException
+ * If an unexpected problem occurs.
+ * @throws ClientException
+ * If an unexpected problem occurs.
*/
- @Test(dependsOnMethods = {
- "org.opends.server.core.RejectUnauthReqTests." +
- "testChangeAndVerifyRejUnauthReqCfgAttr"})
+ @Test
public void testUnauthWAINewCfg() throws UnsupportedEncodingException,
- IOException,ClientException
+ IOException, ClientException
{
- Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
- LDAPReader reader = new LDAPReader(s);
- LDAPWriter writer = new LDAPWriter(s);
- AtomicInteger nextMessageID = new AtomicInteger(1);
- LDAPAuthenticationHandler authHandler =
- new LDAPAuthenticationHandler(reader, writer, "localhost",
- nextMessageID);
- ASN1OctetString authzID = null;
try
{
- authzID = authHandler.requestAuthorizationIdentity();
- }
- catch(LDAPException e)
- {
- assertNull(authzID);
+ DirectoryServer.setRejectUnauthenticatedRequests(true);
+
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
+ LDAPReader reader = new LDAPReader(s);
+ LDAPWriter writer = new LDAPWriter(s);
+ AtomicInteger nextMessageID = new AtomicInteger(1);
+ LDAPAuthenticationHandler authHandler = new LDAPAuthenticationHandler(
+ reader, writer, "localhost", nextMessageID);
+ ASN1OctetString authzID = null;
+ try
+ {
+ authzID = authHandler.requestAuthorizationIdentity();
+ }
+ catch (LDAPException e)
+ {
+ assertNull(authzID);
+ }
+ finally
+ {
+ LDAPMessage unbindMessage = new LDAPMessage(nextMessageID
+ .getAndIncrement(), new UnbindRequestProtocolOp());
+ writer.writeMessage(unbindMessage);
+ s.close();
+ }
}
finally
{
- LDAPMessage unbindMessage = new LDAPMessage(
- nextMessageID.getAndIncrement(),
- new UnbindRequestProtocolOp());
- writer.writeMessage(unbindMessage);
- s.close();
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
}
}
/**
- * Tests the whether the authenticated ADD,MODIFY,COMPARE,MODRDN and DELETE
- * requests succeed with the new configuration settings.
+ * Tests the whether the authenticated ADD,MODIFY,COMPARE,MODRDN and
+ * DELETE requests succeed with the new configuration settings.
*
- * @throws Exception If an unexpected problem occurs.
- */
- @Test(dependsOnMethods = {
- "org.opends.server.core.RejectUnauthReqTests." +
- "testChangeAndVerifyRejUnauthReqCfgAttr"})
- public void testOtherOpsAuthNewCfg() throws Exception {
-
- assertEquals(performAddOperation(true),0);
-
- assertEquals(performModifyOperation(true),0);
-
- assertEquals(performCompareOperation(true), 0);
-
- assertEquals(performModRdnOperation(true), 0);
-
- assertEquals(performDeleteOperation(true),0);
- }
-
-
-
- /**
- * Tests the whether the unauthenticated ADD,MODIFY,COMPARE,MODRDN and
- * DELETE requests fail with the new configuration settings.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- @Test(dependsOnMethods = {
- "org.opends.server.core.RejectUnauthReqTests." +
- "testChangeAndVerifyRejUnauthReqCfgAttr"})
- public void testOtherOpsUnauthNewCfg() throws Exception
- {
- assertFalse(performAddOperation(false)==0);
-
- assertFalse(performModifyOperation(false)==0);
-
- assertFalse(performCompareOperation(false)==0);
-
- assertFalse(performModRdnOperation(false)==0);
-
- assertFalse(performDeleteOperation(false)==0);
- }
-
-
- /**
- * Resets the configuration attribute to the default settings.
- *
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
- public void testResetRejUnauthReqCfgAttr() throws Exception
+ public void testOtherOpsAuthNewCfg() throws Exception
{
- String path = TestCaseUtils.createTempFile(
- "dn: cn=config",
- "changetype: modify",
- "replace: ds-cfg-reject-unauthenticated-requests",
- "ds-cfg-reject-unauthenticated-requests: false");
-
- String[] args =
+ try
{
- "--noPropertiesFile",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
+ DirectoryServer.setRejectUnauthenticatedRequests(true);
- assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
- assertEquals(DirectoryServer.rejectUnauthenticatedRequests(),false);
+ assertEquals(performAddOperation(true), 0);
+
+ assertEquals(performModifyOperation(true), 0);
+
+ assertEquals(performCompareOperation(true), 0);
+
+ assertEquals(performModRdnOperation(true), 0);
+
+ assertEquals(performDeleteOperation(true), 0);
+ }
+ finally
+ {
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+ }
+ }
+
+
+
+ /**
+ * Tests the whether the unauthenticated ADD,MODIFY,COMPARE,MODRDN
+ * and DELETE requests fail with the new configuration settings.
+ *
+ * @throws Exception
+ * If an unexpected problem occurs.
+ */
+ @Test
+ public void testOtherOpsUnauthNewCfg() throws Exception
+ {
+ try
+ {
+ DirectoryServer.setRejectUnauthenticatedRequests(true);
+
+ assertFalse(performAddOperation(false) == 0);
+
+ assertFalse(performModifyOperation(false) == 0);
+
+ assertFalse(performCompareOperation(false) == 0);
+
+ assertFalse(performModRdnOperation(false) == 0);
+
+ assertFalse(performDeleteOperation(false) == 0);
+ }
+ finally
+ {
+ DirectoryServer.setRejectUnauthenticatedRequests(false);
+ }
}
}
-
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
index 0c6356a..521effb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
@@ -132,7 +132,7 @@
ldapAttrCount = 1; // For the objectclass attribute.
for (Attribute a : testEntry.getAttributes())
{
- ldapAttrCount += a.getValues().size();
+ ldapAttrCount += a.size();
}
// The add operation changes the attributes, so let's duplicate the entry.
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
index 26a9c92..fc646e3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
@@ -661,8 +661,8 @@
for(Attribute attribute : newEntry.getAttribute("cn"))
{
- assertTrue(attribute.hasValue(new AttributeValue(attribute.getAttributeType(), "Aaccf Amar Test")));
- assertTrue(attribute.hasValue(new AttributeValue(attribute.getAttributeType(), "Aaccf Amar")));
+ assertTrue(attribute.contains(new AttributeValue(attribute.getAttributeType(), "Aaccf Amar Test")));
+ assertTrue(attribute.contains(new AttributeValue(attribute.getAttributeType(), "Aaccf Amar")));
}
examineCompletedOPNoExtraPluginCounts(modifyDNOperation);
@@ -685,12 +685,12 @@
assertNull(DirectoryServer.getEntry(DN.decode("cn=Aaccf Amar Test,dc=example,dc=com")));
for(Attribute attribute : newOldEntry.getAttribute("cn"))
{
- assertTrue(attribute.hasValue(new AttributeValue(attribute.getAttributeType(), "Aaccf Amar Test")));
- assertTrue(attribute.hasValue(new AttributeValue(attribute.getAttributeType(), "Aaccf Amar")));
+ assertTrue(attribute.contains(new AttributeValue(attribute.getAttributeType(), "Aaccf Amar Test")));
+ assertTrue(attribute.contains(new AttributeValue(attribute.getAttributeType(), "Aaccf Amar")));
}
for(Attribute attribute : newOldEntry.getAttribute("uid"))
{
- assertTrue(attribute.hasValue(new AttributeValue(attribute.getAttributeType(), "user.0")));
+ assertTrue(attribute.contains(new AttributeValue(attribute.getAttributeType(), "user.0")));
}
examineCompletedOPNoExtraPluginCounts(modifyDNOperation);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
index c44c38e..389696a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
@@ -37,6 +37,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.ClientConnection;
import org.opends.server.config.ConfigConstants;
+import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
new file mode 100644
index 0000000..a91f1d9
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
@@ -0,0 +1,1225 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+
+import static org.opends.messages.CoreMessages.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.opends.server.config.ConfigConstants.DN_BACKEND_BASE;
+
+import java.util.ArrayList;
+
+import org.opends.server.TestCaseUtils;
+import org.opends.server.DirectoryServerTestCase;
+import org.opends.server.admin.std.meta.NetworkGroupCriteriaCfgDefn.AllowedAuthMethod;
+import org.opends.server.api.ClientConnection;
+import org.opends.server.core.*;
+import org.opends.server.extensions.NullConnectionSecurityProvider;
+import org.opends.server.protocols.asn1.ASN1OctetString;
+import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.protocols.ldap.LDAPFilter;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.AuthenticationInfo;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.Modification;
+import org.opends.server.types.ModificationType;
+import org.opends.server.types.ResultCode;
+import org.opends.server.types.SearchScope;
+import org.opends.server.workflowelement.WorkflowElement;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+
+/**
+ * This set of tests test the network groups.
+ */
+public class NetworkGroupTest extends DirectoryServerTestCase {
+ //===========================================================================
+ //
+ // B E F O R E C L A S S
+ //
+ //===========================================================================
+
+ /**
+ * Sets up the environment for performing the tests in this suite.
+ *
+ * @throws Exception if the environment could not be set up.
+ */
+ @BeforeClass
+ public void setUp()
+ throws Exception
+ {
+ // This test suite depends on having the schema available,
+ // so we'll start the server.
+ TestCaseUtils.startServer();
+ }
+
+ //===========================================================================
+ //
+ // D A T A P R O V I D E R
+ //
+ //===========================================================================
+
+ /**
+ * Provides information to create a network group with one workflow inside.
+ *
+ * Each set of DNs contains:
+ * - one network group identifier
+ * - one base DN for the workflow to register with the network group
+
+ */
+ @DataProvider (name = "DNSet_0")
+ public Object[][] initDNSet_0()
+ throws Exception
+ {
+ // Network group ID
+ String networkGroupID1 = "networkGroup1";
+ String networkGroupID2 = "networkGroup2";
+
+ // Workflow base DNs
+ DN dn1 = null;
+ DN dn2 = null;
+ try
+ {
+ dn1 = DN.decode("o=test1");
+ dn2 = DN.decode("o=test2");
+ }
+ catch (DirectoryException de)
+ {
+ throw de;
+ }
+
+ // Network group info
+ Object[][] myData =
+ {
+ // Test1: create a network group with the identifier networkGroupID1
+ { networkGroupID1, dn1 },
+
+ // Test2: create the same network group to check that previous
+ // network group was properly cleaned.
+ { networkGroupID1, dn1 },
+
+ // Test3: create another network group
+ { networkGroupID2, dn2 },
+ };
+
+ return myData;
+ }
+
+
+ /**
+ * Provides a single DN to search a workflow in a network group.
+ *
+ * Each set of DNs is composed of:
+ * - one baseDN
+ * - one subordinateDN
+ * - a boolean telling whether we expect to find a workflow for the baseDN
+ *
+ * @return set of DNs
+ * @throws Exception when DN.decode fails
+ */
+ @DataProvider(name = "DNSet_1")
+ public Object[][] initDNSet_1()
+ throws Exception
+ {
+ DN dnRootDSE = null;
+ DN dnConfig = null;
+ DN dnMonitor = null;
+ DN dnSchema = null;
+ DN dnTasks = null;
+ DN dnBackups = null;
+ DN dnDummy = null;
+
+ DN dnSubordinateConfig = null;
+ DN dnSubordinateMonitor = null;
+ DN dnSubordinateTasks = null;
+
+ try
+ {
+ dnRootDSE = DN.decode("");
+ dnConfig = DN.decode("cn=config");
+ dnMonitor = DN.decode("cn=monitor");
+ dnSchema = DN.decode("cn=schema");
+ dnTasks = DN.decode("cn=tasks");
+ dnBackups = DN.decode("cn=backups");
+ dnDummy = DN.decode("o=dummy_suffix");
+
+ dnSubordinateConfig = DN.decode("cn=Work Queue,cn=config");
+ dnSubordinateMonitor = DN.decode("cn=schema Backend,cn=monitor");
+ dnSubordinateTasks = DN.decode("cn=Scheduled Tasks,cn=tasks");
+
+ // No DN subordinate for schema because the schema backend is
+ // currently empty.
+ // No DN subordinate for cn=backups because by default there is no
+ // child entry under cn=backups.
+ }
+ catch (DirectoryException de)
+ {
+ throw de;
+ }
+
+ // Sets of DNs
+ Object[][] myData =
+ {
+ { dnRootDSE, null, true },
+ { dnConfig, dnSubordinateConfig, true },
+ { dnMonitor, dnSubordinateMonitor, true },
+ { dnTasks, dnSubordinateTasks, true },
+ { dnSchema, null, true },
+ { dnBackups, null, true },
+ { dnDummy, null, false },
+ };
+
+ return myData;
+ }
+
+
+ /**
+ * Provides information to create a network group to test the routing
+ * process.
+ *
+ * Each set of DNs contains:
+ * - one base DN for the 1st workflow
+ * - one base DN for the 2nd workflow
+ * - one base DN for the 3rd workflow
+ * - one subordinate DN for the 1st workflow
+ * - one subordinate DN for the 2nd workflow
+ * - one subordinate DN for the 3rd workflow
+ * - one unrelated DN which has no hierarchical relationship with
+ * any of the above DNs
+
+ */
+ @DataProvider (name = "DNSet_2")
+ public Object[][] initDNSet_2()
+ throws Exception
+ {
+ // Network group definition
+ DN dn1 = null;
+ DN dn2 = null;
+ DN dn3 = null;
+ DN subordinate1 = null;
+ DN subordinate2 = null;
+ DN subordinate3 = null;
+ DN unrelatedDN = null;
+ try
+ {
+ dn1 = DN.decode("o=test1");
+ dn2 = DN.decode("o=test2");
+ dn3 = DN.decode("o=test3");
+ subordinate1 = DN.decode("ou=subtest1,o=test1");
+ subordinate2 = DN.decode("ou=subtest2,o=test2");
+ subordinate3 = DN.decode("ou=subtest3,o=test3");
+ unrelatedDN = DN.decode("o=dummy");
+ }
+ catch (DirectoryException de)
+ {
+ throw de;
+ }
+
+ // Network group info
+ Object[][] myData =
+ {
+ // Test1: one DN for one workflow
+ {
+ dn1,
+ null,
+ null,
+ subordinate1,
+ null,
+ null,
+ unrelatedDN
+ },
+ // Test2: two DNs for two workflows
+ {
+ dn1,
+ dn2,
+ null,
+ subordinate1,
+ subordinate2,
+ null,
+ unrelatedDN
+ },
+ // Test3: three DNs for three workflows
+ {
+ dn1,
+ dn2,
+ dn3,
+ subordinate1,
+ subordinate2,
+ subordinate3,
+ unrelatedDN
+ }
+ };
+
+ return myData;
+ }
+
+
+ /**
+ * Provides information to create a network group with resource limits.
+ */
+ @DataProvider (name = "DNSet_3")
+ public Object[][] initDNSet_3()
+ throws Exception
+ {
+ // Network group definition
+ String networkGroupID = "networkGroup1";
+ DN dn = null;
+ int prio = 1;
+
+ // Resource limits
+ int maxConnections = 10;
+ int maxConnectionsFromSameClient = 5;
+ int maxOpsPerConn = 4;
+ int maxConcurrentOpsPerConn = 2;
+ int searchTimeLimit = 100;
+ int searchSizeLimit = 50;
+ int minSubstringLength = 4;
+
+ try
+ {
+ dn = DN.decode("o=test1");
+ }
+ catch (DirectoryException de)
+ {
+ throw de;
+ }
+
+ // Network group info
+ Object[][] myData =
+ {
+ // Test1: one DN for one workflow
+ {
+ networkGroupID,
+ dn,
+ prio,
+ maxConnections,
+ maxConnectionsFromSameClient,
+ maxOpsPerConn,
+ maxConcurrentOpsPerConn,
+ searchTimeLimit,
+ searchSizeLimit,
+ minSubstringLength
+ }
+ };
+ return myData;
+ }
+
+
+ /**
+ * Provides information to create 2 network groups with different priorities.
+ */
+ @DataProvider (name = "DNSet_4")
+ public Object[][] initDNSet_4()
+ throws Exception
+ {
+ String networkGroupID1 = "group1";
+ String networkGroupID2 = "group2";
+ DN dn1 = null;
+ DN dn2 = null;
+
+ try {
+ dn1 = DN.decode("o=test1");
+ dn2 = DN.decode("o=test2");
+ } catch (DirectoryException de) {
+ throw de;
+ }
+ Object[][] myData = {
+ {
+ networkGroupID1,
+ dn1,
+ 1,
+ networkGroupID2,
+ dn2,
+ 2
+ },
+ {
+ networkGroupID1,
+ dn1,
+ 2,
+ networkGroupID2,
+ dn2,
+ 1
+ }
+
+ };
+
+ return myData;
+ }
+
+
+ /**
+ * Provides the priorities for 3 network groups
+ */
+ @DataProvider (name = "PrioritySet_0")
+ public Object[][] initPrioritySet_0()
+ {
+ Object[][] myData = {
+ { 1, 2, 3 },
+ { 1, 3, 2 },
+ { 2, 1, 3 },
+ { 2, 3, 1 },
+ { 3, 1, 2 },
+ { 3, 2, 1 }
+ };
+
+ return myData;
+ }
+
+
+ /**
+ * Provides a bind DN filter to build network group criteria
+ * and the expected result (true if the connection with
+ * cn=Directory Manager, cn =Root DNs, cn=config should match the
+ * network group, false if it should go into the default network group).
+ */
+ @DataProvider (name = "BindFilterSet_0")
+ public Object[][] initBindFilterSet_0()
+ {
+ Object[][] myData = {
+ {
+ "*, cn=Root DNs, cn=config",
+ true
+ },
+ {
+ "cn=Dir*, cn=Root DNs, cn=config",
+ true
+ },
+ {
+ "cn=*",
+ false
+ },
+ {
+ "uid=*",
+ false
+ },
+ {
+ "**, cn=config",
+ true
+ },
+ {
+ "*, cn=config",
+ false
+ }
+ };
+ return myData;
+ }
+
+
+ //===========================================================================
+ //
+ // T E S T C A S E S
+ //
+ //===========================================================================
+
+
+ /**
+ * Tests the network group registration.
+ *
+ * @param networkGroupID the ID of the network group to register
+ * @param workflowBaseDN1 the base DN of the first workflow node to register
+ * in the network group
+ */
+ @Test (dataProvider = "DNSet_0", groups = "virtual")
+ public void testNetworkGroupRegistration(
+ String networkGroupID,
+ DN workflowBaseDN
+ )
+ throws DirectoryException
+ {
+ // Create and register the network group with the server.
+ NetworkGroup networkGroup = new NetworkGroup(networkGroupID);
+ networkGroup.register();
+
+ // Register again the network group with the server and catch the
+ // expected DirectoryServer exception.
+ boolean exceptionRaised = false;
+ try
+ {
+ networkGroup.register();
+ }
+ catch (DirectoryException de)
+ {
+ exceptionRaised = true;
+ assertEquals(de.getMessageObject().getDescriptor(),
+ ERR_REGISTER_NETWORK_GROUP_ALREADY_EXISTS);
+ }
+ assertEquals(exceptionRaised, true);
+
+ // Create a workflow -- the workflow ID is the string representation
+ // of the workflow base DN.
+ WorkflowElement nullWE = null;
+ WorkflowImpl workflow = new WorkflowImpl(
+ workflowBaseDN.toString(), workflowBaseDN, nullWE);
+
+ // Register the workflow with the network group.
+ networkGroup.registerWorkflow(workflow);
+
+ // Register again the workflow with the network group and catch the
+ // expected DirectoryServer exception.
+ exceptionRaised = false;
+ try
+ {
+ networkGroup.registerWorkflow(workflow);
+ }
+ catch (DirectoryException de)
+ {
+ exceptionRaised = true;
+ assertEquals(
+ de.getMessageObject().getDescriptor(),
+ ERR_REGISTER_WORKFLOW_NODE_ALREADY_EXISTS);
+ }
+ assertEquals(exceptionRaised, true);
+
+ // Clean the network group
+ networkGroup.deregisterWorkflow(workflow.getWorkflowId());
+ networkGroup.deregister();
+ }
+
+
+ /**
+ * Check the route process in the default network group.
+ *
+ * @param dnToSearch the DN of a workflow to search in the default
+ * network group
+ * @param dnSubordinate a subordinate DN of dnToSearch
+ * @param exists true if we are supposed to find a workflow for
+ * dnToSearch
+ */
+ @Test (dataProvider = "DNSet_1", groups = "virtual")
+ public void checkDefaultNetworkGroup(
+ DN dnToSearch,
+ DN dnSubordinate,
+ boolean exists
+ )
+ {
+ // let's get the default network group -- it should always exist
+ NetworkGroup defaultNG = NetworkGroup.getDefaultNetworkGroup();
+ assertNotNull(defaultNG);
+
+ // let's check the routing through the network group
+ doCheckNetworkGroup(defaultNG, dnToSearch, dnSubordinate, null, exists);
+
+ // Dump the default network group
+ dump(defaultNG, "defaultNetworkGroup> ");
+ }
+
+
+ /**
+ * Creates a network group with several workflows inside and do some check
+ * on the route processing.
+ *
+ * @param dn1 the DN for the 1st workflow
+ * @param dn2 the DN for the 2nd workflow
+ * @param dn3 the DN for the 3rd workflow
+ * @param subordinate1 the subordinate DN for the 1st workflow
+ * @param subordinate2 the subordinate DN for the 2nd workflow
+ * @param subordinate3 the subordinate DN for the 3rd workflow
+ * @param unrelatedDN a DN with no hierarchical relationship with
+ * any of the DNs above
+ *
+ * @throws DirectoryException If the network group ID for a provided
+ * network group conflicts with the network
+ * group ID of an existing network group.
+ */
+ @Test (dataProvider = "DNSet_2", groups = "virtual")
+ public void createNetworkGroup(
+ DN dn1,
+ DN dn2,
+ DN dn3,
+ DN subordinate1,
+ DN subordinate2,
+ DN subordinate3,
+ DN unrelatedDN
+ ) throws DirectoryException
+ {
+ // The network group identifier is always the same for this test.
+ String networkGroupID = "Network Group for test2";
+
+ // Create the network group
+ NetworkGroup networkGroup = new NetworkGroup(networkGroupID);
+ assertNotNull(networkGroup);
+
+ // Register the network group with the server
+ networkGroup.register();
+
+ // Create and register workflow 1, 2 and 3
+ createAndRegisterWorkflow(networkGroup, dn1);
+ createAndRegisterWorkflow(networkGroup, dn2);
+ createAndRegisterWorkflow(networkGroup, dn3);
+
+ // Check the route thorugh the network group
+ doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, true);
+ doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, true);
+ doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, true);
+
+ // Deregister the workflow1 and check the route again.
+ // Workflow to deregister is identified by its baseDN.
+ networkGroup.deregisterWorkflow(dn1);
+ doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
+ doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, true);
+ doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, true);
+
+ // Deregister the workflow2 and check the route again
+ networkGroup.deregisterWorkflow(dn2);
+ doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
+ doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, false);
+ doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, true);
+
+ // Deregister the workflow3 and check the route again
+ networkGroup.deregisterWorkflow(dn3);
+ doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
+ doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, false);
+ doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, false);
+
+ // Now create again the workflow 1, 2 and 3...
+ WorkflowImpl w1;
+ WorkflowImpl w2;
+ WorkflowImpl w3;
+ w1 = createAndRegisterWorkflow(networkGroup, dn1);
+ w2 = createAndRegisterWorkflow(networkGroup, dn2);
+ w3 = createAndRegisterWorkflow(networkGroup, dn3);
+
+ // ... and deregister the workflows using their workflowID
+ // instead of their baseDN
+ if (w1 != null)
+ {
+ networkGroup.deregisterWorkflow(w1.getWorkflowId());
+ doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
+ doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, true);
+ doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, true);
+ }
+
+ if (w2 != null)
+ {
+ networkGroup.deregisterWorkflow(w2.getWorkflowId());
+ doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
+ doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, false);
+ doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, true);
+ }
+
+ if (w3 != null)
+ {
+ networkGroup.deregisterWorkflow(w3.getWorkflowId());
+ doCheckNetworkGroup(networkGroup, dn1, subordinate1, unrelatedDN, false);
+ doCheckNetworkGroup(networkGroup, dn2, subordinate2, unrelatedDN, false);
+ doCheckNetworkGroup(networkGroup, dn3, subordinate3, unrelatedDN, false);
+ }
+
+ // Deregister the network group
+ networkGroup.deregister();
+ }
+
+
+ /**
+ * This test checks that network groups are updated as appropriate when
+ * backend base DNs are added or removed. When a new backend base DN is
+ * added, the new suffix should be accessible for the route process - ie.
+ * a workflow should be created and be a potential candidate for the route
+ * process. Simillarly, when a backend base DN is removed its associated
+ * workflow should be removed; subsequently, any request targetting the
+ * removed suffix should be rejected and a no such entry status code be
+ * returned.
+ */
+ @Test
+ public void testBackendBaseDNModification()
+ throws Exception
+ {
+ String suffix = "dc=example,dc=com";
+ String suffix2 = "o=networkgroup suffix";
+ String backendBaseDNName = "ds-cfg-base-dn";
+
+ // Initialize a backend with a base entry.
+ TestCaseUtils.clearJEBackend(true, "userRoot", suffix);
+
+ // Create a client connection for the test.
+ InternalClientConnection connection =
+ InternalClientConnection.getRootConnection();
+
+ // Check that suffix is accessible while suffix2 is not.
+ searchEntry(connection, suffix, true);
+ searchEntry(connection, suffix2, false);
+
+ // Add a new suffix in the backend and create a base entry for the
+ // new suffix.
+ String backendConfigDN = "ds-cfg-backend-id=userRoot," + DN_BACKEND_BASE;
+ modifyAttribute(
+ connection, backendConfigDN,
+ ModificationType.ADD, backendBaseDNName, suffix2);
+ addBaseEntry(connection, suffix2, "networkgroup suffix");
+
+ // Both old and new suffix should be accessible.
+ searchEntry(connection, suffix, true);
+ searchEntry(connection, suffix2, true);
+
+ // Remove the new suffix...
+ modifyAttribute(
+ connection, backendConfigDN,
+ ModificationType.DELETE, backendBaseDNName, suffix2);
+
+ // ...and check that the removed suffix is no more accessible.
+ searchEntry(connection, suffix, true);
+ searchEntry(connection, suffix2, false);
+
+ // Replace the suffix with suffix2 in the backend
+ modifyAttribute(
+ connection, backendConfigDN,
+ ModificationType.REPLACE, backendBaseDNName, suffix2);
+
+ // Now none of the suffixes are accessible: this means the entries
+ // under the old suffix are not moved to the new suffix.
+ searchEntry(connection, suffix, false);
+ searchEntry(connection, suffix2, false);
+
+ // Add a base entry for the new suffix
+ addBaseEntry(connection, suffix2, "networkgroup suffix");
+
+ // The new suffix is accessible while the old one is not.
+ searchEntry(connection, suffix, false);
+ searchEntry(connection, suffix2, true);
+
+ // Reset the configuration with previous suffix
+ modifyAttribute(
+ connection, backendConfigDN,
+ ModificationType.REPLACE, backendBaseDNName, suffix);
+ }
+
+
+ /**
+ * Tests the network group resource limits
+ *
+ * @param networkGroupID the ID of the network group to register
+ * @param workflowBaseDN1 the base DN of the first workflow node to register
+ * in the network group
+ */
+ @Test (dataProvider = "DNSet_3", groups = "virtual")
+ public void testNetworkGroupResourceLimits(
+ String networkGroupID,
+ DN workflowBaseDN,
+ int priority,
+ int maxConnections,
+ int maxConnectionsFromSameClient,
+ int maxOpsPerConn,
+ int maxConcurrentOpsPerConn,
+ int searchTimeLimit,
+ int searchSizeLimit,
+ int minSubstringLength
+ )
+ throws DirectoryException
+ {
+ // Create and register the network group with the server.
+ NetworkGroup networkGroup = new NetworkGroup(networkGroupID);
+ networkGroup.register();
+
+ networkGroup.setNetworkGroupPriority(priority);
+
+ // Create a workflow -- the workflow ID is the string representation
+ // of the workflow base DN.
+ WorkflowElement nullWE = null;
+ WorkflowImpl workflow = new WorkflowImpl(
+ workflowBaseDN.toString(), workflowBaseDN, nullWE);
+
+ // Register the workflow with the network group.
+ networkGroup.registerWorkflow(workflow);
+
+ // Create the resource limits
+ ResourceLimits limits = new ResourceLimits(null);
+ limits.setMaxConnections(maxConnections);
+ limits.setMaxConnectionsFromSameIP(maxConnectionsFromSameClient);
+ limits.setMaxOpsPerConnection(maxOpsPerConn);
+ limits.setMaxConcurrentOpsPerConnection(maxConcurrentOpsPerConn);
+ limits.setSearchTimeLimit(searchTimeLimit);
+ limits.setSearchSizeLimit(searchSizeLimit);
+ limits.setMinSearchSubstringLength(minSubstringLength);
+
+ // Associate the resource limits to the network group
+ networkGroup.setResourceLimits(limits);
+
+ // Check the resource limits
+ assertEquals(networkGroup.getSearchDurationLimit(), searchTimeLimit);
+ assertEquals(networkGroup.getSearchSizeLimit(), searchSizeLimit);
+ assertEquals(networkGroup.getMinSubstring(), minSubstringLength);
+
+ // Clean the network group
+ networkGroup.deregisterWorkflow(workflow.getWorkflowId());
+ networkGroup.deregister();
+ }
+
+
+ /**
+ * Tests the mechanism to attribute a network group to a client connection,
+ * comparing the priority.
+ */
+ @Test (dataProvider = "DNSet_4", groups = "virtual")
+ public void testNetworkGroupPriority(
+ String ng1,
+ DN dn1,
+ int prio1,
+ String ng2,
+ DN dn2,
+ int prio2
+ )
+ throws DirectoryException
+ {
+ // Create and register the network group with the server.
+ NetworkGroup networkGroup1 = new NetworkGroup(ng1);
+ networkGroup1.register();
+ networkGroup1.setNetworkGroupPriority(prio1);
+ NetworkGroup networkGroup2 = new NetworkGroup(ng2);
+ networkGroup2.register();
+ networkGroup2.setNetworkGroupPriority(prio2);
+
+ // Create a workflow -- the workflow ID is the string representation
+ // of the workflow base DN.
+ WorkflowElement nullWE = null;
+ WorkflowImpl workflow1 = new WorkflowImpl(
+ dn1.toString(), dn1, nullWE);
+ WorkflowImpl workflow2 = new WorkflowImpl(
+ dn2.toString(), dn2, nullWE);
+
+ // Register the workflow with the network group.
+ networkGroup1.registerWorkflow(workflow1);
+ networkGroup2.registerWorkflow(workflow2);
+
+ // Create a new ClientConnection
+ ClientConnection connection = new InternalClientConnection(DN.NULL_DN);
+
+ // Find a networkGroup for this connection
+ // As the network groups define no criteria, the highest priority
+ // must be choosen
+ NetworkGroup ng = NetworkGroup.findMatchingNetworkGroup(connection);
+ if (prio1 < prio2) {
+ assertEquals(ng, networkGroup1);
+ } else {
+ assertEquals(ng, networkGroup2);
+ }
+
+ // Clean the network group
+ networkGroup1.deregisterWorkflow(workflow1.getWorkflowId());
+ networkGroup1.deregister();
+ networkGroup2.deregisterWorkflow(workflow2.getWorkflowId());
+ networkGroup2.deregister();
+ }
+
+
+ /**
+ * Tests the mechanism to attribute a network group to a client connection,
+ * based on the authentication method.
+ */
+ @Test (dataProvider = "PrioritySet_0", groups = "virtual")
+ public void testNetworkGroupAuthenticationMethodCriteria(
+ int prio1,
+ int prio2,
+ int prio3)
+ throws DirectoryException
+ {
+ // Create a AuthMethodCriteria for anonymous connections
+ AuthMethodCriteria authCriteria1 = new AuthMethodCriteria();
+ authCriteria1.addAuthMethod(AllowedAuthMethod.ANONYMOUS);
+ NetworkGroupCriteria criteria1 = new NetworkGroupCriteria(null);
+ criteria1.setAuthMethodCriteria(authCriteria1);
+
+ // Create a AuthMethodCriteria for simple bind connections
+ AuthMethodCriteria authCriteria2 = new AuthMethodCriteria();
+ authCriteria2.addAuthMethod(AllowedAuthMethod.SIMPLE);
+ NetworkGroupCriteria criteria2 = new NetworkGroupCriteria(null);
+ criteria2.setAuthMethodCriteria(authCriteria2);
+
+ // Create a AuthMethodCriteria for sasl connections
+ AuthMethodCriteria authCriteria3 = new AuthMethodCriteria();
+ authCriteria3.addAuthMethod(AllowedAuthMethod.SASL);
+ NetworkGroupCriteria criteria3 = new NetworkGroupCriteria(null);
+ criteria3.setAuthMethodCriteria(authCriteria3);
+
+
+ // Create and register the network group with the server.
+ NetworkGroup networkGroup1 = new NetworkGroup("anonymous_group");
+ networkGroup1.register();
+ networkGroup1.setCriteria(criteria1);
+ networkGroup1.setNetworkGroupPriority(prio1);
+ NetworkGroup networkGroup2 = new NetworkGroup("simplebind_group");
+ networkGroup2.register();
+ networkGroup2.setCriteria(criteria2);
+ networkGroup2.setNetworkGroupPriority(prio2);
+ NetworkGroup networkGroup3 = new NetworkGroup("sasl_group");
+ networkGroup3.register();
+ networkGroup3.setCriteria(criteria3);
+ networkGroup3.setNetworkGroupPriority(prio3);
+
+ // Create a new client connection, with anonymous authentication
+ ClientConnection connection1 = new InternalClientConnection(DN.NULL_DN);
+ NetworkGroup ng = NetworkGroup.findMatchingNetworkGroup(connection1);
+ assertEquals(ng, networkGroup1);
+
+ // Use simple bind on this connection
+ Entry userEntry = DirectoryServer.getEntry(
+ DN.decode("cn=Directory Manager, cn=Root DNs, cn=config"));
+ ByteString password = new ASN1OctetString();
+ password.setValue("password");
+ ClientConnection connection2 = new InternalClientConnection(
+ new AuthenticationInfo(userEntry, password, true));
+ ng = NetworkGroup.findMatchingNetworkGroup(connection2);
+ assertEquals(ng, networkGroup2);
+
+ // Use SASL on this connection
+ ClientConnection connection3 = new InternalClientConnection(
+ new AuthenticationInfo(userEntry, "external", true));
+ ng = NetworkGroup.findMatchingNetworkGroup(connection3);
+ assertEquals(ng, networkGroup3);
+
+ // Clean the network group
+ networkGroup1.deregister();
+ networkGroup2.deregister();
+ networkGroup3.deregister();
+ }
+
+
+ /**
+ * Tests the mechanism to attribute a network group to a client connection,
+ * based on the bind dn filter.
+ */
+ @Test (dataProvider = "BindFilterSet_0", groups = "virtual")
+ public void testNetworkGroupBindDnCriteria(
+ String bindDnFilter,
+ boolean match)
+ throws DirectoryException
+ {
+ // Create a BindDnFilterCriteria
+ BindDnCriteria bindCriteria = new BindDnCriteria();
+ bindCriteria.addBindDnFilter(bindDnFilter);
+ NetworkGroupCriteria criteria = new NetworkGroupCriteria(null);
+ criteria.setBindDnCriteria(bindCriteria);
+
+ // Create and register the network group with the server.
+ NetworkGroup networkGroup = new NetworkGroup("bindfilter_group");
+ networkGroup.register();
+ networkGroup.setCriteria(criteria);
+
+ NetworkGroup defaultNg = NetworkGroup.getDefaultNetworkGroup();
+
+ // Create a new client connection, with anonymous authentication
+ // It should match the default network group
+ // as it has no bind information
+ ClientConnection connection1 = new InternalClientConnection(DN.NULL_DN);
+ NetworkGroup ng = NetworkGroup.findMatchingNetworkGroup(connection1);
+ assertEquals(ng, defaultNg);
+
+ // Use simple bind on this connection
+ Entry userEntry = DirectoryServer.getEntry(
+ DN.decode("cn=Directory Manager, cn=Root DNs, cn=config"));
+ ByteString password = new ASN1OctetString();
+ password.setValue("password");
+ ClientConnection connection2 = new InternalClientConnection(
+ new AuthenticationInfo(userEntry, password, true));
+ ng = NetworkGroup.findMatchingNetworkGroup(connection2);
+ if (match) {
+ assertEquals(ng, networkGroup);
+ } else {
+ assertEquals(ng, defaultNg);
+ }
+
+ // Use SASL on this connection
+ ClientConnection connection3 = new InternalClientConnection(
+ new AuthenticationInfo(userEntry, "external", true));
+ ng = NetworkGroup.findMatchingNetworkGroup(connection3);
+ if (match) {
+ assertEquals(ng, networkGroup);
+ } else {
+ assertEquals(ng, defaultNg);
+ }
+
+ // Clean the network group
+ networkGroup.deregister();
+ }
+
+
+ /**
+ * Tests the mechnism to attribute a network group to a client connection,
+ * based on the bind dn filter.
+ */
+ @Test (groups = "virtual")
+ public void testNetworkGroupSecurityCriteria()
+ throws DirectoryException
+ {
+ // Create a SecurityCriteria
+ SecurityCriteria secCriteria = new SecurityCriteria(true);
+ NetworkGroupCriteria criteria = new NetworkGroupCriteria(null);
+ criteria.setSecurityCriteria(secCriteria);
+
+ // Create and register the network group with the server.
+ NetworkGroup networkGroup = new NetworkGroup("secured_group");
+ networkGroup.register();
+ networkGroup.setCriteria(criteria);
+
+ NetworkGroup defaultNg = NetworkGroup.getDefaultNetworkGroup();
+
+ // Create a new client connection, with anonymous authentication
+ // It should match the secured group as internal connections
+ // are secured
+ ClientConnection connection1 = new InternalClientConnection(DN.NULL_DN);
+ NetworkGroup ng = NetworkGroup.findMatchingNetworkGroup(connection1);
+ assertEquals(ng, networkGroup);
+
+ // Now set the security provider to NullConnectionSecurityProvider
+ // the connection is not secured any more
+ connection1.setConnectionSecurityProvider(
+ new NullConnectionSecurityProvider());
+ ng = NetworkGroup.findMatchingNetworkGroup(connection1);
+ assertEquals(ng, defaultNg);
+
+ // now change the criteria (security not mandatory)
+ secCriteria = new SecurityCriteria(false);
+ criteria.setSecurityCriteria(secCriteria);
+
+ // connection1 should match the networkGroup, even though it is not
+ // secured
+ ng = NetworkGroup.findMatchingNetworkGroup(connection1);
+ assertEquals(ng, networkGroup);
+
+ // Clean the network group
+ networkGroup.deregister();
+ }
+
+
+ /**
+ * Searches an entry on a given connection.
+ *
+ * @param connection the connection to use for the search request
+ * @param baseDN the request base DN string
+ * @param shouldExist if true the searched entry is expected to be found
+ */
+ private void searchEntry(
+ InternalClientConnection connection,
+ String baseDN,
+ boolean shouldExist
+ ) throws Exception
+ {
+ SearchOperation search = connection.processSearch(
+ DN.decode(baseDN),
+ SearchScope.BASE_OBJECT,
+ LDAPFilter.decode("(objectClass=*)").toSearchFilter());
+
+ // Compare the result code with the expected one
+ ResultCode resultCode = search.getResultCode();
+ if (shouldExist)
+ {
+ assertEquals(resultCode, ResultCode.SUCCESS);
+ }
+ else
+ {
+ assertEquals(resultCode, ResultCode.NO_SUCH_OBJECT);
+ }
+ }
+
+
+ /**
+ * Creates a base entry for the given suffix.
+ *
+ * @param connection the connection to use for the add request
+ * @param suffix the suffix for which the base entry is to be created
+ */
+ private void addBaseEntry(
+ InternalClientConnection connection,
+ String suffix,
+ String namingAttribute
+ ) throws Exception
+ {
+ Entry e = TestCaseUtils.makeEntry(
+ "dn: " + suffix,
+ "objectClass: top",
+ "objectClass: organization",
+ "o: " + namingAttribute);
+
+ AddOperation addOperation = connection.processAdd(
+ e.getDN(),
+ e.getObjectClasses(),
+ e.getUserAttributes(),
+ e.getOperationalAttributes());
+
+ assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
+ }
+
+
+ /**
+ * Adds/Deletes/Replaces an attribute in a given entry.
+ *
+ * @param connection the connection to use for the modify request
+ * @param baseDN the request base DN string
+ * @param modType the modification type (add/delete/replace)
+ * @param attributeName the name of the attribute to add/delete/replace
+ * @param attributeValue the value of the attribute to add/delete/replace
+ */
+ private void modifyAttribute(
+ InternalClientConnection connection,
+ String baseDN,
+ ModificationType modType,
+ String attributeName,
+ String attributeValue
+ ) throws Exception
+ {
+ ArrayList<Modification> mods = new ArrayList<Modification>();
+ Attribute attributeToModify =
+ Attributes.create(attributeName, attributeValue);
+ mods.add(new Modification(modType, attributeToModify));
+ ModifyOperation modifyOperation = connection.processModify(
+ DN.decode(baseDN), mods);
+ assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
+ }
+
+
+ /**
+ * Checks the DN routing through a network group.
+ *
+ * @param networkGroup the network group to use for the check
+ * @param dnToSearch the DN of a workflow in the network group; may
+ * be null
+ * @param dnSubordinate a subordinate of dnToSearch
+ * @param unrelatedDN a DN with no hierarchical relationship with
+ * any of the DNs above, may be null
+ * @param shouldExist true if we are supposed to find a workflow for
+ * dnToSearch
+ */
+ private void doCheckNetworkGroup(
+ NetworkGroup networkGroup,
+ DN dnToSearch,
+ DN dnSubordinate,
+ DN unrelatedDN,
+ boolean shouldExist
+ )
+ {
+ if (dnToSearch == null)
+ {
+ return;
+ }
+
+ // Let's retrieve the workflow that maps best the dnToSearch
+ Workflow workflow = networkGroup.getWorkflowCandidate(dnToSearch);
+ if (shouldExist)
+ {
+ assertNotNull(workflow);
+ }
+ else
+ {
+ assertNull(workflow);
+ }
+
+ // let's retrieve the workflow that handles the DN subordinate:
+ // it should be the same than the one for dnToSearch
+ if (dnSubordinate != null)
+ {
+ Workflow workflow2 = networkGroup.getWorkflowCandidate(dnSubordinate);
+ assertEquals(workflow2, workflow);
+ }
+
+ // Check that the unrelatedDN is not handled by any workflow
+ if (unrelatedDN != null)
+ {
+ Workflow unrelatedWorkflow =
+ networkGroup.getWorkflowCandidate(unrelatedDN);
+ assertNull(unrelatedWorkflow);
+ }
+ }
+
+
+ /**
+ * Creates a workflow and register it with a network group.
+ *
+ * @param networkGroup a network group to register the workflow with
+ * @param workflowBaseDN the base DN of the workflow to register; may be
+ * null
+ * @throws DirectoryException If the workflow ID for the provided
+ * workflow conflicts with the workflow
+ * ID of an existing workflow.
+ */
+ private WorkflowImpl createAndRegisterWorkflow(
+ NetworkGroup networkGroup,
+ DN workflowBaseDN
+ ) throws DirectoryException
+ {
+ assertNotNull(networkGroup);
+
+ if (workflowBaseDN == null)
+ {
+ return null;
+ }
+
+ // Create a workflow with no task inside. The workflow identifier
+ // is the a string representation of the workflow base DN.
+ WorkflowElement rootWE = null;
+ String workflowId = workflowBaseDN.toString();
+ WorkflowImpl workflow = new WorkflowImpl(
+ workflowId, workflowBaseDN, rootWE);
+ assertNotNull(workflow);
+
+ // Register the workflow with the network group.
+ networkGroup.registerWorkflow(workflow);
+
+ return workflow;
+ }
+
+
+ /**
+ * Prints a text to System.out.
+ */
+ private void write(String msg)
+ {
+ System.out.print(msg);
+ }
+
+
+ /**
+ * Prints a text to System.out.
+ */
+ private void writeln(String msg)
+ {
+ write(msg + "\n");
+ }
+
+
+
+ /**
+ * Dump the network group info to the console.
+ */
+ private void dump(NetworkGroup networkGroup, String prompt)
+ {
+ final boolean doDump = false;
+
+ if (doDump)
+ {
+ StringBuilder sb = networkGroup.toString(prompt);
+ writeln(sb.toString());
+ }
+ }
+
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
new file mode 100644
index 0000000..80ec06d
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
@@ -0,0 +1,593 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+
+import java.util.ArrayList;
+import java.util.Set;
+import java.util.TreeSet;
+import org.opends.messages.Message;
+import org.opends.server.DirectoryServerTestCase;
+import org.opends.server.TestCaseUtils;
+import org.opends.server.admin.std.meta.
+ NetworkGroupRequestFilteringPolicyCfgDefn.AllowedOperations;
+import org.opends.server.admin.std.meta.
+ NetworkGroupRequestFilteringPolicyCfgDefn.AllowedSearchScopes;
+import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.protocols.internal.InternalSearchOperation;
+import org.opends.server.protocols.ldap.LDAPFilter;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.LDAPException;
+import org.opends.server.types.Modification;
+import org.opends.server.types.ModificationType;
+import org.opends.server.types.OperationType;
+import org.opends.server.types.SearchScope;
+import org.opends.server.types.operation.PreParseAddOperation;
+import org.opends.server.types.operation.PreParseBindOperation;
+import org.opends.server.types.operation.PreParseCompareOperation;
+import org.opends.server.types.operation.PreParseDeleteOperation;
+import org.opends.server.types.operation.PreParseExtendedOperation;
+import org.opends.server.types.operation.PreParseModifyDNOperation;
+import org.opends.server.types.operation.PreParseModifyOperation;
+import org.opends.server.types.operation.PreParseOperation;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static org.opends.server.util.ServerConstants.*;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+
+/*
+ * This set of tests test the resource limits.
+ */
+public class RequestFilteringPolicyTest extends DirectoryServerTestCase {
+ //===========================================================================
+ //
+ // B E F O R E C L A S S
+ //
+ //===========================================================================
+
+ /**
+ * Sets up the environment for performing the tests in this suite.
+ *
+ * @throws Exception if the environment could not be set up.
+ */
+ @BeforeClass
+ public void setUp()
+ throws Exception
+ {
+ // This test suite depends on having the schema available,
+ // so we'll start the server.
+ TestCaseUtils.startServer();
+ }
+
+
+ //===========================================================================
+ //
+ // D A T A P R O V I D E R
+ //
+ //===========================================================================
+
+ /* Provides information to create an allowedAttribute policy and a filter
+ * to test.
+ */
+ @DataProvider (name = "AllowedAttributesSet")
+ public Object[][] initAllowedAttributesSet()
+ {
+ TreeSet<String> allowedAttr_uid_cn = new TreeSet<String>();
+ allowedAttr_uid_cn.add("uid");
+ allowedAttr_uid_cn.add("cn");
+
+ TreeSet<String> allowedAttr_cn = new TreeSet<String>();
+ allowedAttr_cn.add("cn");
+
+ TreeSet<String> allowedAttr_uid = new TreeSet<String>();
+ allowedAttr_uid.add("uid");
+
+ Object[][] myData = {
+ // allowed attributes, attribute to test, success
+ {allowedAttr_uid_cn, "uid=*", true},
+ {allowedAttr_uid_cn, "cn=*", true},
+ {allowedAttr_uid_cn, "(&(uid=user.1)(cn=*))", true},
+ {allowedAttr_cn, "cn=*", true},
+ {allowedAttr_cn, "uid=*", false},
+ {allowedAttr_cn, "(&(uid=user.1)(cn=*))", false},
+ {allowedAttr_uid, "cn=*", false},
+ {allowedAttr_uid, "uid=*", true},
+ {allowedAttr_uid, "(&(uid=user.1)(cn=*))", false}
+ };
+
+ return myData;
+ }
+
+ /* Provides information to create a prohibitedAttribute policy and a filter
+ * to test.
+ */
+ @DataProvider (name = "ProhibitedAttributesSet")
+ public Object[][] initProhibitedAttributesSet()
+ {
+ TreeSet<String> prohibitedAttr_uid = new TreeSet<String>();
+ prohibitedAttr_uid.add("uid");
+
+ TreeSet<String> prohibitedAttr_cn = new TreeSet<String>();
+ prohibitedAttr_cn.add("cn");
+
+ Object[][] myData = {
+ // prohibited attributes, attribute to test, success
+ {prohibitedAttr_uid, "uid=*", false},
+ {prohibitedAttr_cn, "uid=*", true},
+ {prohibitedAttr_cn, "(&(uid=user.1)(cn=*))", false}
+ };
+
+ return myData;
+ }
+
+ /* Provides information to create an allowedSearchScopes policy and a
+ * scope to test.
+ */
+ @DataProvider (name = "AllowedSearchScopesSet")
+ public Object[][] initAllowedSearchScopesSet()
+ {
+ TreeSet<AllowedSearchScopes> scopes_all =
+ new TreeSet<AllowedSearchScopes>();
+ scopes_all.add(AllowedSearchScopes.BASE);
+ scopes_all.add(AllowedSearchScopes.CHILDREN);
+ scopes_all.add(AllowedSearchScopes.ONE);
+ scopes_all.add(AllowedSearchScopes.SUB);
+
+ TreeSet<AllowedSearchScopes> scope_base =
+ new TreeSet<AllowedSearchScopes>();
+ scope_base.add(AllowedSearchScopes.BASE);
+
+ TreeSet<AllowedSearchScopes> scope_children =
+ new TreeSet<AllowedSearchScopes>();
+ scope_children.add(AllowedSearchScopes.CHILDREN);
+
+ TreeSet<AllowedSearchScopes> scope_one =
+ new TreeSet<AllowedSearchScopes>();
+ scope_one.add(AllowedSearchScopes.ONE);
+
+ TreeSet<AllowedSearchScopes> scope_sub =
+ new TreeSet<AllowedSearchScopes>();
+ scope_sub.add(AllowedSearchScopes.SUB);
+
+ Object[][] myData = {
+ // allowed search scopes, scope to test, success
+ {scopes_all, SearchScope.BASE_OBJECT, true},
+ {scope_base, SearchScope.BASE_OBJECT, true},
+ {scope_base, SearchScope.SINGLE_LEVEL, false},
+ {scope_base, SearchScope.SUBORDINATE_SUBTREE, false},
+ {scope_base, SearchScope.WHOLE_SUBTREE, false},
+ {scope_children, SearchScope.BASE_OBJECT, false},
+ {scope_children, SearchScope.SINGLE_LEVEL, false},
+ {scope_children, SearchScope.SUBORDINATE_SUBTREE, true},
+ {scope_children, SearchScope.WHOLE_SUBTREE, false},
+ {scope_one, SearchScope.BASE_OBJECT, false},
+ {scope_one, SearchScope.SINGLE_LEVEL, true},
+ {scope_one, SearchScope.SUBORDINATE_SUBTREE, false},
+ {scope_one, SearchScope.WHOLE_SUBTREE, false},
+ {scope_sub, SearchScope.BASE_OBJECT, false},
+ {scope_sub, SearchScope.SINGLE_LEVEL, false},
+ {scope_sub, SearchScope.SUBORDINATE_SUBTREE, false},
+ {scope_sub, SearchScope.WHOLE_SUBTREE, true}
+ };
+
+ return myData;
+ }
+
+ /* Provides information to create a allowedSubtree policy and
+ * a subtree search to test.
+ */
+ @DataProvider (name = "AllowedSubtreesSet")
+ public Object[][] initAllowedSubtreesSet()
+ throws DirectoryException
+ {
+ TreeSet<DN> subtrees1 = new TreeSet<DN>();
+ subtrees1.add(DN.decode("ou=people,dc=example,dc=com"));
+
+ TreeSet<DN> subtrees2 = new TreeSet<DN>();
+ subtrees2.add(DN.decode("ou=test,dc=example,dc=com"));
+
+ TreeSet<DN> subtrees3 = new TreeSet<DN>();
+ subtrees3.add(DN.decode("dc=example,dc=com"));
+
+ TreeSet<DN> subtrees4 = new TreeSet<DN>();
+ subtrees4.add(DN.decode("dc=example,dc=com"));
+ subtrees4.add(DN.decode("dc=test,dc=com"));
+
+ Object[][] myData = {
+ // allowed subtrees, subtree to test, success
+ {subtrees1, "ou=people,dc=example,dc=com", true},
+ {subtrees2, "ou=people,dc=example,dc=com", false},
+ {subtrees3, "ou=people,dc=example,dc=com", true},
+ {subtrees1, "dc=example,dc=com", false},
+ {subtrees4, "dc=example,dc=com", true},
+ {subtrees4, "ou=people,dc=example,dc=com", true}
+ };
+
+ return myData;
+ }
+
+ /* Provides information to create a prohibitedSubtree policy and
+ * a subtree search to test.
+ */
+ @DataProvider (name = "ProhibitedSubtreesSet")
+ public Object[][] initProhibitedSubtreesSet() throws DirectoryException
+ {
+ TreeSet<DN> subtrees1 = new TreeSet<DN>();
+ subtrees1.add(DN.decode("ou=people,dc=example,dc=com"));
+
+ TreeSet<DN> subtrees2 = new TreeSet<DN>();
+ subtrees2.add(DN.decode("ou=test,dc=example,dc=com"));
+
+ TreeSet<DN> subtrees3 = new TreeSet<DN>();
+ subtrees3.add(DN.decode("dc=example,dc=com"));
+
+ TreeSet<DN> subtrees4 = new TreeSet<DN>();
+ subtrees4.add(DN.decode("dc=example,dc=com"));
+ subtrees4.add(DN.decode("dc=test,dc=com"));
+
+ Object[][] myData = {
+ // prohibited subtrees, subtree to test, success
+ {subtrees1, "ou=people,dc=example,dc=com", false},
+ {subtrees2, "ou=people,dc=example,dc=com", true},
+ {subtrees3, "ou=people,dc=example,dc=com", false},
+ {subtrees1, "dc=example,dc=com", true},
+ {subtrees4, "ou=people,dc=example,dc=com", false}
+ };
+
+ return myData;
+ }
+
+ /* Provides information to create a complex subtree policy and a
+ * subtree search to test.
+ */
+ @DataProvider (name = "ComplexSubtreesSet")
+ public Object[][] initComplexSubtreesSet() throws DirectoryException
+ {
+ TreeSet<DN> subtrees_root = new TreeSet<DN>();
+ subtrees_root.add(DN.decode("dc=example,dc=com"));
+
+ TreeSet<DN> subtrees_people = new TreeSet<DN>();
+ subtrees_people.add(DN.decode("ou=people,dc=example,dc=com"));
+
+ TreeSet<DN> subtrees_entry = new TreeSet<DN>();
+ subtrees_entry.add(DN.decode("uid=user.1,ou=people,dc=example,dc=com"));
+
+ Object[][] myData = {
+ // allowed subtree, prohibited subtree, subtree to test, success
+ {subtrees_root, subtrees_people, "dc=example,dc=com", true},
+ {subtrees_root, subtrees_people, "ou=people,dc=example,dc=com", false},
+ {subtrees_root, subtrees_entry, "ou=people,dc=example,dc=com", true},
+ {null, subtrees_people, "dc=example,dc=com", true},
+ {null, subtrees_people, "ou=people,dc=example,dc=com", false}
+ };
+ return myData;
+ }
+
+ /* Provides information to create an allowed operations policy.
+ */
+ @DataProvider (name = "AllowedOperationsSet")
+ public Object[][] initAllowedOperationsSet()
+ {
+ TreeSet<AllowedOperations> ops_all = new TreeSet<AllowedOperations>();
+ ops_all.add(AllowedOperations.ADD);
+ ops_all.add(AllowedOperations.BIND);
+ ops_all.add(AllowedOperations.COMPARE);
+ ops_all.add(AllowedOperations.DELETE);
+ ops_all.add(AllowedOperations.EXTENDED);
+ ops_all.add(AllowedOperations.INEQUALITY_SEARCH);
+ ops_all.add(AllowedOperations.MODIFY);
+ ops_all.add(AllowedOperations.RENAME);
+ ops_all.add(AllowedOperations.SEARCH);
+
+ TreeSet<AllowedOperations> ops_search = new TreeSet<AllowedOperations>();
+ ops_search.add(AllowedOperations.INEQUALITY_SEARCH);
+ ops_search.add(AllowedOperations.SEARCH);
+
+ TreeSet<AllowedOperations> ops_add_del = new TreeSet<AllowedOperations>();
+ ops_add_del.add(AllowedOperations.ADD);
+ ops_add_del.add(AllowedOperations.DELETE);
+
+ Object[][] myData = {
+ // allowed operations, operation to test, success
+ {ops_all, OperationType.ABANDON, true},
+ {ops_all, OperationType.ADD, true},
+ {ops_all, OperationType.BIND, true},
+ {ops_all, OperationType.COMPARE, true},
+ {ops_all, OperationType.DELETE, true},
+ {ops_all, OperationType.EXTENDED, true},
+ {ops_all, OperationType.MODIFY, true},
+ {ops_all, OperationType.MODIFY_DN, true},
+ {ops_all, OperationType.SEARCH, true},
+ {ops_all, OperationType.UNBIND, true},
+ {ops_search, OperationType.SEARCH, true},
+ {ops_search, OperationType.ADD, false},
+ {ops_search, OperationType.BIND, false},
+ {ops_add_del, OperationType.ADD, true},
+ {ops_add_del, OperationType.DELETE, true},
+ {ops_add_del, OperationType.EXTENDED, false}
+ };
+ return myData;
+ }
+
+ //===========================================================================
+ //
+ // T E S T C A S E S
+ //
+ //===========================================================================
+
+ /**
+ * Tests the "allowed attributes" policy
+ */
+ @Test (dataProvider = "AllowedAttributesSet", groups = "virtual")
+ public void testAllowedAttributes(
+ Set<String> allowedAttributes,
+ String searchFilter,
+ boolean success)
+ throws DirectoryException, LDAPException
+ {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ RequestFilteringPolicy policy = new RequestFilteringPolicy(null);
+ policy.setAllowedAttributes(allowedAttributes);
+
+ InternalClientConnection conn = new InternalClientConnection(DN.NULL_DN);
+ InternalSearchOperation search = conn.processSearch(
+ DN.decode("dc=example,dc=com"),
+ SearchScope.BASE_OBJECT,
+ LDAPFilter.decode(searchFilter).toSearchFilter());
+
+ boolean check = policy.checkPolicy(search, messages);
+ if (success) {
+ assertTrue(check);
+ } else {
+ assertFalse(check);
+ }
+ }
+
+ /**
+ * Tests the "prohibited operations" policy
+ */
+ @Test (dataProvider = "ProhibitedAttributesSet", groups = "virtual")
+ public void testProhibitedAttributes(
+ Set<String> prohibitedAttributes,
+ String searchFilter,
+ boolean success)
+ throws DirectoryException, LDAPException
+ {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ RequestFilteringPolicy policy = new RequestFilteringPolicy(null);
+ policy.setProhibitedAttributes(prohibitedAttributes);
+
+ InternalClientConnection conn = new InternalClientConnection(DN.NULL_DN);
+ InternalSearchOperation search = conn.processSearch(
+ DN.decode("dc=example,dc=com"),
+ SearchScope.BASE_OBJECT,
+ LDAPFilter.decode(searchFilter).toSearchFilter());
+
+ boolean check = policy.checkPolicy(search, messages);
+ if (success) {
+ assertTrue(check);
+ } else {
+ assertFalse(check);
+ }
+ }
+
+ /**
+ * Tests the "allowed search scopes" policy.
+ */
+ @Test (dataProvider = "AllowedSearchScopesSet", groups = "virtual")
+ public void testAllowedSearchScopes(
+ Set<AllowedSearchScopes> allowedScopes,
+ SearchScope searchScope,
+ boolean success)
+ throws DirectoryException, LDAPException
+ {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ RequestFilteringPolicy policy = new RequestFilteringPolicy(null);
+ policy.setAllowedSearchScopes(allowedScopes);
+
+ InternalClientConnection conn = new InternalClientConnection(DN.NULL_DN);
+ InternalSearchOperation search = conn.processSearch(
+ DN.decode("dc=example,dc=com"),
+ searchScope,
+ LDAPFilter.decode("objectclass=*").toSearchFilter());
+
+ boolean check = policy.checkPolicy(search, messages);
+ if (success) {
+ assertTrue(check);
+ } else {
+ assertFalse(check);
+ }
+ }
+
+ /**
+ * Tests the "allowed subtrees" policy.
+ */
+ @Test (dataProvider = "AllowedSubtreesSet", groups = "virtual")
+ public void testAllowedSubtrees(
+ Set<DN> allowedSubtrees,
+ String searchSubtree,
+ boolean success)
+ throws DirectoryException, LDAPException
+ {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ RequestFilteringPolicy policy = new RequestFilteringPolicy(null);
+ policy.setAllowedSubtrees(allowedSubtrees);
+
+ InternalClientConnection conn = new InternalClientConnection(DN.NULL_DN);
+ InternalSearchOperation search = conn.processSearch(
+ DN.decode(searchSubtree),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode("objectclass=*").toSearchFilter());
+
+ boolean check = policy.checkPolicy(search, messages);
+ if (success) {
+ assertTrue(check);
+ } else {
+ assertFalse(check);
+ }
+ }
+
+ /**
+ * Tests the "prohibited subtrees" policy.
+ */
+ @Test (dataProvider = "ProhibitedSubtreesSet", groups = "virtual")
+ public void testProhibitedSubtrees(
+ Set<DN> prohibitedSubtrees,
+ String searchSubtree,
+ boolean success)
+ throws DirectoryException, LDAPException
+ {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ RequestFilteringPolicy policy = new RequestFilteringPolicy(null);
+ policy.setProhibitedSubtrees(prohibitedSubtrees);
+
+ InternalClientConnection conn = new InternalClientConnection(DN.NULL_DN);
+ InternalSearchOperation search = conn.processSearch(
+ DN.decode(searchSubtree),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode("objectclass=*").toSearchFilter());
+
+ boolean check = policy.checkPolicy(search, messages);
+ if (success) {
+ assertTrue(check);
+ } else {
+ assertFalse(check);
+ }
+ }
+
+ /**
+ * Tests the subtrees policy.
+ */
+ @Test (dataProvider = "ComplexSubtreesSet", groups = "virtual")
+ public void testComplexSubtrees(
+ Set<DN> allowedSubtrees,
+ Set<DN> prohibitedSubtrees,
+ String searchSubtree,
+ boolean success)
+ throws DirectoryException, LDAPException
+ {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ RequestFilteringPolicy policy = new RequestFilteringPolicy(null);
+ policy.setAllowedSubtrees(allowedSubtrees);
+ policy.setProhibitedSubtrees(prohibitedSubtrees);
+
+ InternalClientConnection conn = new InternalClientConnection(DN.NULL_DN);
+ InternalSearchOperation search = conn.processSearch(
+ DN.decode(searchSubtree),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode("objectclass=*").toSearchFilter());
+
+ boolean check = policy.checkPolicy(search, messages);
+ if (success) {
+ assertTrue(check);
+ } else {
+ assertFalse(check);
+ }
+ }
+
+ /**
+ * Tests the allowed operations policy.
+ */
+ @Test (dataProvider = "AllowedOperationsSet", groups = "virtual")
+ public void testAllowedOperations(
+ Set<AllowedOperations> allowedOps,
+ OperationType type,
+ boolean success)
+ throws DirectoryException, LDAPException, Exception
+ {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ RequestFilteringPolicy policy = new RequestFilteringPolicy(null);
+ policy.setAllowedOperations(allowedOps);
+
+ InternalClientConnection conn = new InternalClientConnection(DN.NULL_DN);
+ PreParseOperation op = null;
+
+ switch (type) {
+ case ABANDON:
+ return;
+ case ADD:
+ Entry e = TestCaseUtils.makeEntry(
+ "dn: ou=People,o=ldif",
+ "objectClass: top",
+ "objectClass: organizationalUnit",
+ "ou: People");
+
+ op = (PreParseAddOperation) conn.processAdd(e);
+ break;
+ case BIND:
+ op = (PreParseBindOperation) conn.processSimpleBind(
+ "cn=Directory Manager", "password");
+ break;
+ case COMPARE:
+ op = (PreParseCompareOperation) conn.processCompare(
+ "uid=user.1,ou=People,o=ldif", "uid", "user.1");
+ break;
+ case DELETE:
+ op = (PreParseDeleteOperation) conn.processDelete(
+ "uid=user.1,ou=people,dc=example,dc=com");
+ break;
+ case EXTENDED:
+ op = (PreParseExtendedOperation) conn.processExtendedOperation(
+ OID_WHO_AM_I_REQUEST, null);
+ break;
+ case MODIFY:
+ ArrayList<Modification> mods = new ArrayList<Modification>();
+ Attribute attributeToModify = Attributes.create("attr", "newVal");
+ mods.add(new Modification(ModificationType.ADD, attributeToModify));
+ op = (PreParseModifyOperation) conn.processModify(
+ DN.decode("uid=user.1,ou=people,dc=example,dc=com"), mods);
+ break;
+ case MODIFY_DN:
+ op = (PreParseModifyDNOperation) conn.processModifyDN(
+ "uid=user.1,ou=people,dc=example,dc=com",
+ "uid=usr.1,ou=people,dc=example,dc=com", true);
+ break;
+ case SEARCH:
+ op = conn.processSearch(DN.decode("dc=example,dc=com"),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode("uid>=user.1").toSearchFilter());
+ break;
+ case UNBIND:
+ return;
+ }
+
+ boolean check = policy.checkPolicy(op, messages);
+ if (success) {
+ assertTrue(check);
+ } else {
+ assertFalse(check);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsTest.java
new file mode 100644
index 0000000..86ff103
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsTest.java
@@ -0,0 +1,213 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.core.networkgroups;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.opends.messages.Message;
+import org.opends.server.DirectoryServerTestCase;
+import org.opends.server.TestCaseUtils;
+import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.protocols.internal.InternalSearchOperation;
+import org.opends.server.protocols.ldap.LDAPFilter;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.LDAPException;
+import org.opends.server.types.SearchScope;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+
+/*
+ * This set of tests test the resource limits.
+ */
+public class ResourceLimitsTest extends DirectoryServerTestCase {
+ //===========================================================================
+ //
+ // B E F O R E C L A S S
+ //
+ //===========================================================================
+
+ /**
+ * Sets up the environment for performing the tests in this suite.
+ *
+ * @throws Exception if the environment could not be set up.
+ */
+ @BeforeClass
+ public void setUp()
+ throws Exception
+ {
+ // This test suite depends on having the schema available,
+ // so we'll start the server.
+ TestCaseUtils.startServer();
+ }
+
+
+ //===========================================================================
+ //
+ // D A T A P R O V I D E R
+ //
+ //===========================================================================
+ /**
+ * Provides information to create a search filter. First parameter is
+ * the min substring length, 2nd param the search filter, and last param
+ * the expected return value (true=check success, false = check failure).
+ */
+ @DataProvider (name = "SearchFilterSet")
+ public Object[][] initSearchFilterSet()
+ {
+ Object[][] myData = {
+ // Presence filter
+ { 5, "(cn=*)", true},
+ // Substring filter
+ { 5, "(cn=Dir*)", false },
+ { 5, "(cn=Direc*)", true },
+ { 5, "(cn=D*re*)", false },
+ { 5, "(cn=D*re*t*y)", true },
+ // NOT filter
+ { 5, "(!(cn=Dir*))", false },
+ { 5, "(!(cn=*ctory))", true},
+ // AND filter
+ { 5, "(&(objectclass=*)(cn=Dir*))", false },
+ { 5, "(&(objectclass=*)(cn=Direc*))", true },
+ // OR filter
+ { 5, "(|(objectclass=*)(cn=Dir*))", false },
+ { 5, "(|(objectclass=*)(cn=Direc*))", true }
+ };
+
+ return myData;
+ }
+
+
+ //===========================================================================
+ //
+ // T E S T C A S E S
+ //
+ //===========================================================================
+
+ /**
+ * Tests the max number of connections resource limit.
+ * @throws DirectoryException when there was a problem creating the connection
+ */
+ @Test (groups = "virtual")
+ public void testMaxNumberOfConnections()
+ throws DirectoryException
+ {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ ResourceLimits limits = new ResourceLimits(null);
+ limits.setMaxConnections(1);
+
+ InternalClientConnection conn1 = new InternalClientConnection(DN.NULL_DN);
+ limits.addConnection(conn1);
+
+ boolean check = limits.checkLimits(conn1, null, true, messages);
+ assertTrue(check);
+
+ InternalClientConnection conn2 = new InternalClientConnection(DN.NULL_DN);
+ limits.addConnection(conn2);
+ check = limits.checkLimits(conn2, null, true, messages);
+ assertFalse(check);
+
+ limits.removeConnection(conn1);
+ check = limits.checkLimits(conn2, null, true, messages);
+ assertTrue(check);
+
+ limits.removeConnection(conn2);
+ }
+
+ /**
+ * Tests the max number of connections from same IP resource limit.
+ * @throws DirectoryException when there was a problem creating the connection
+ */
+ @Test (groups = "virtual")
+ public void testMaxNumberOfConnectionsFromSameIp()
+ throws DirectoryException
+ {
+ ArrayList<Message> messages = new ArrayList<Message>();
+ ResourceLimits limits = new ResourceLimits(null);
+ limits.setMaxConnectionsFromSameIP(1);
+
+ InternalClientConnection conn1 = new InternalClientConnection(DN.NULL_DN);
+ limits.addConnection(conn1);
+
+ boolean check = limits.checkLimits(conn1, null, true, messages);
+ assertTrue(check);
+
+ InternalClientConnection conn2 = new InternalClientConnection(DN.NULL_DN);
+ limits.addConnection(conn2);
+ check = limits.checkLimits(conn2, null, true, messages);
+ assertFalse(check);
+
+ limits.removeConnection(conn1);
+ check = limits.checkLimits(conn2, null, true, messages);
+ assertTrue(check);
+
+ limits.removeConnection(conn2);
+ }
+
+ /**
+ * Tests the min substring length.
+ * @param minLength minimum search filter substring length
+ * @param searchFilter the search filter to test
+ * @param success boolean indicating the expected result
+ * @throws DirectoryException when there was a problem creating the connection
+ * @throws LDAPException when there was a problem decoding the filter
+ */
+ @Test (dataProvider = "SearchFilterSet", groups = "virtual")
+ public void testMinSubstringLength(
+ int minLength,
+ String searchFilter,
+ boolean success)
+ throws DirectoryException, LDAPException
+ {
+ List<Message> messages = new ArrayList<Message>();
+ ResourceLimits limits = new ResourceLimits(null);
+ limits.setMinSearchSubstringLength(minLength);
+
+ InternalClientConnection conn1 = new InternalClientConnection(DN.NULL_DN);
+ limits.addConnection(conn1);
+
+ InternalSearchOperation search = conn1.processSearch(
+ DN.decode("dc=example,dc=com"),
+ SearchScope.BASE_OBJECT,
+ LDAPFilter.decode(searchFilter).toSearchFilter());
+
+ boolean check = limits.checkLimits(conn1, search, true, messages);
+ if (success) {
+ assertTrue(check);
+ } else {
+ assertFalse(check);
+ }
+ limits.removeConnection(conn1);
+ }
+
+
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
index b7517d4..87eb653 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
@@ -100,11 +100,11 @@
assertNotNull(cert);
// The certificate should now be accessible in the truststore backend via LDAP.
- final InitialLdapContext ctx = ConnectionUtils.createLdapContext(
- "ldap://" + "127.0.0.1" + ":"
- + String.valueOf(TestCaseUtils.getServerLdapPort()),
+ final InitialLdapContext ctx = ConnectionUtils.createLdapsContext(
+ "ldaps://" + "127.0.0.1" + ":"
+ + String.valueOf(TestCaseUtils.getServerAdminPort()),
"cn=Directory Manager", "password",
- ConnectionUtils.getDefaultLDAPTimeout(), null);
+ ConnectionUtils.getDefaultLDAPTimeout(), null, null, null);
// TODO: should the below dn be in ConfigConstants?
final String dnStr = "ds-cfg-key-id=ads-certificate,cn=ads-truststore";
final LdapName dn = new LdapName(dnStr);
@@ -415,7 +415,7 @@
String compromisedTime = TimeThread.getGeneralizedTime();
for (Entry e : searchOp.getSearchEntries()) {
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(true,
"dn: " + e.getDN().toNormalizedString(),
"changetype: modify",
"replace: " + ConfigConstants.ATTR_CRYPTO_KEY_COMPROMISED_TIME,
@@ -443,7 +443,7 @@
// 3. Delete the compromised entry(ies) and ensure ciphertext produced
// using a compromised key can no longer be decrypted.
for (Entry e : searchOp.getSearchEntries()) {
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(true,
"dn: " + e.getDN().toNormalizedString(), "changetype: delete");
}
Thread.sleep(1000); // Clearing the cache is asynchronous.
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
index 99668a1..6cf0323 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
@@ -45,7 +45,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
@@ -411,7 +411,7 @@
ASN1OctetString pwOS = new ASN1OctetString(password);
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", password)));
+ Attributes.create("userpassword", password)));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
index b78e680..48b9c13 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
@@ -45,7 +45,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
@@ -527,7 +527,7 @@
ASN1OctetString pwOS = new ASN1OctetString(password);
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", password)));
+ Attributes.create("userpassword", password)));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java
index b6d97ce..81c38fb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java
@@ -88,7 +88,7 @@
public void testChangingStructuralClass()
throws Exception
{
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: cn=config",
"changetype: modify",
"replace: objectClass",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
index a2d0326..e6dad21 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
@@ -46,7 +46,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
@@ -502,7 +502,7 @@
ASN1OctetString pwOS = new ASN1OctetString(password);
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", password)));
+ Attributes.create("userpassword", password)));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index ed18c3b..1b82082 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -144,9 +144,9 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(a.hasValue());
- assertEquals(a.getValues().size(), 1);
- assertTrue(a.hasValue(new AttributeValue(entryDNType,
+ assertTrue(!a.isEmpty());
+ assertEquals(a.size(), 1);
+ assertTrue(a.contains(new AttributeValue(entryDNType,
entryDN.toNormalizedString())));
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
index 3d441c2..2c674e2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
@@ -142,9 +142,9 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(a.hasValue());
- assertEquals(a.getValues().size(), 1);
- assertTrue(a.hasValue(new AttributeValue(entryUUIDType, uuidString)));
+ assertTrue(!a.isEmpty());
+ assertEquals(a.size(), 1);
+ assertTrue(a.contains(new AttributeValue(entryUUIDType, uuidString)));
}
}
@@ -186,9 +186,9 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(a.hasValue());
- assertEquals(a.getValues().size(), 1);
- assertFalse(a.hasValue(new AttributeValue(entryUUIDType, uuidString)));
+ assertTrue(!a.isEmpty());
+ assertEquals(a.size(), 1);
+ assertFalse(a.contains(new AttributeValue(entryUUIDType, uuidString)));
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
index 18931e7..22e52ba 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
@@ -48,9 +48,9 @@
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -155,7 +155,7 @@
"ds-cfg-match-attribute: uid");
AttributeType t = DirectoryServer.getAttributeType("ds-cfg-match-base-dn");
- e.addAttribute(new Attribute(t), new ArrayList<AttributeValue>());
+ e.addAttribute(Attributes.empty(t), new ArrayList<AttributeValue>());
entries.add(e);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
index 531b459..2b9eebd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
@@ -28,6 +28,8 @@
+import static org.testng.Assert.*;
+
import java.io.File;
import java.io.FileInputStream;
import java.net.Socket;
@@ -35,17 +37,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.
- ExternalSASLMechanismHandlerCfgDefn;
-import org.opends.server.admin.std.server.
- ExternalSASLMechanismHandlerCfg;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.admin.std.meta.ExternalSASLMechanismHandlerCfgDefn;
+import org.opends.server.admin.std.server.ExternalSASLMechanismHandlerCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
@@ -58,7 +53,7 @@
import org.opends.server.protocols.ldap.BindResponseProtocolOp;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.tools.LDAPSearch;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
@@ -66,8 +61,9 @@
import org.opends.server.types.ModificationType;
import org.opends.server.types.ResultCode;
import org.opends.server.util.Base64;
-
-import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
@@ -404,7 +400,7 @@
String attrName = "ds-cfg-certificate-validation-policy";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attrName, "always")));
+ Attributes.create(attrName, "always")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -433,7 +429,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attrName, "ifpresent")));
+ Attributes.create(attrName, "ifpresent")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -604,7 +600,7 @@
String attrName = "ds-cfg-certificate-validation-policy";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attrName, "always")));
+ Attributes.create(attrName, "always")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -630,7 +626,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attrName, "ifpresent")));
+ Attributes.create(attrName, "ifpresent")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -674,7 +670,7 @@
String attrName = "ds-cfg-certificate-validation-policy";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attrName, "always")));
+ Attributes.create(attrName, "always")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -703,7 +699,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attrName, "ifpresent")));
+ Attributes.create(attrName, "ifpresent")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
index 289029d..ef73c6e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
@@ -38,6 +38,7 @@
import org.opends.server.api.Backend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.util.ServerConstants;
@@ -105,7 +106,7 @@
// Configure this cache as LRU.
Entry newCacheConfigEntry = cacheConfigEntry.duplicate(true);
Attribute cacheConfigTypeAttr =
- new Attribute("ds-cfg-cache-type", "LRU");
+ Attributes.create("ds-cfg-cache-type", "LRU");
newCacheConfigEntry.addAttribute(cacheConfigTypeAttr, null);
super.configuration = AdminTestCaseUtils.getConfiguration(
EntryCacheCfgDefn.getInstance(), newCacheConfigEntry);
@@ -146,10 +147,10 @@
// unlimited number of entries.
Entry newCacheConfigEntry = cacheConfigEntry.duplicate(true);
Attribute cacheConfigPersistAttr =
- new Attribute("ds-cfg-persistent-cache", "true");
+ Attributes.create("ds-cfg-persistent-cache", "true");
newCacheConfigEntry.addAttribute(cacheConfigPersistAttr, null);
Attribute cacheConfigMaxAttr =
- new Attribute("ds-cfg-max-entries", Integer.toString(super.MAXENTRIES));
+ Attributes.create("ds-cfg-max-entries", Integer.toString(super.MAXENTRIES));
newCacheConfigEntry.removeAttribute(cacheConfigMaxAttr, null);
super.configuration = AdminTestCaseUtils.getConfiguration(
EntryCacheCfgDefn.getInstance(), newCacheConfigEntry);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
index feaded1..eb81e03 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
@@ -28,38 +28,34 @@
+import static org.testng.Assert.*;
+
import java.io.File;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.List;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.
- FingerprintCertificateMapperCfgDefn;
-import org.opends.server.admin.std.server.
- FingerprintCertificateMapperCfg;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.admin.std.meta.FingerprintCertificateMapperCfgDefn;
+import org.opends.server.admin.std.server.FingerprintCertificateMapperCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
import org.opends.server.types.ResultCode;
-
-import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
@@ -455,7 +451,7 @@
String mapperDN = "cn=Fingerprint Mapper,cn=Certificate Mappers,cn=config";
Attribute a =
- new Attribute(DirectoryServer.getAttributeType(
+ Attributes.empty(DirectoryServer.getAttributeType(
"ds-cfg-fingerprint-attribute"));
ArrayList<Modification> mods = new ArrayList<Modification>();
@@ -483,7 +479,7 @@
String mapperDN = "cn=Fingerprint Mapper,cn=Certificate Mappers,cn=config";
Attribute a =
- new Attribute(DirectoryServer.getAttributeType(
+ Attributes.empty(DirectoryServer.getAttributeType(
"ds-cfg-fingerprint-algorithm"));
ArrayList<Modification> mods = new ArrayList<Modification>();
@@ -556,7 +552,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-certificate-mapper",
+ Attributes.create("ds-cfg-certificate-mapper",
mapperDN)));
InternalClientConnection conn =
@@ -582,7 +578,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-certificate-mapper",
+ Attributes.create("ds-cfg-certificate-mapper",
mapperDN)));
InternalClientConnection conn =
@@ -610,7 +606,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-fingerprint-attribute",
+ Attributes.create("ds-cfg-fingerprint-attribute",
attrName)));
InternalClientConnection conn =
@@ -637,7 +633,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-fingerprint-algorithm",
+ Attributes.create("ds-cfg-fingerprint-algorithm",
algorithm)));
InternalClientConnection conn =
@@ -667,19 +663,18 @@
AttributeType attrType =
DirectoryServer.getAttributeType("ds-cfg-user-base-dn");
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(attrType);
if (baseDNs != null)
{
for (String baseDN : baseDNs)
{
- values.add(new AttributeValue(attrType, baseDN));
+ builder.add(baseDN);
}
}
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attrType, attrType.getNameOrOID(),
- values)));
+ builder.toAttribute()));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
index d405762..6635588 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
@@ -29,7 +29,7 @@
import org.opends.server.types.*;
import org.opends.server.TestCaseUtils;
import org.opends.server.DirectoryServerTestCase;
-import static org.opends.server.util.StaticUtils.getBytes;
+import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.util.ServerConstants.OID_REAL_ATTRS_ONLY;
import static org.opends.server.util.ServerConstants.OID_VIRTUAL_ATTRS_ONLY;
import org.opends.server.protocols.internal.InternalClientConnection;
@@ -45,7 +45,6 @@
import java.util.List;
import java.util.LinkedHashSet;
-import java.util.UUID;
import java.util.LinkedList;
public class HasSubordinatesVirtualAttributeProviderTestCase extends DirectoryServerTestCase {
@@ -195,7 +194,6 @@
new Object[] { DN.decode("cn=Work Queue,cn=config"), false },
new Object[] { DN.decode("cn=tasks"), true },
new Object[] { DN.decode("cn=Recurring Tasks,cn=tasks"), false },
- new Object[] { DN.decode("cn=Scheduled Tasks,cn=tasks"), false },
new Object[] { DN.decode("cn=backups"), false }
};
}
@@ -223,13 +221,13 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(a.hasValue());
- assertEquals(a.getValues().size(), 1);
- assertTrue(a.getValues().contains(new AttributeValue(
- ByteStringFactory.create(String.valueOf(hasSubs)),
- ByteStringFactory.create(String.valueOf(hasSubs)))));
- assertTrue(a.hasValue(new AttributeValue(hasSubordinatesType,
- String.valueOf(hasSubs))));
+ assertTrue(!a.isEmpty());
+ assertEquals(a.size(), 1);
+ assertTrue(a.contains(new AttributeValue(ByteStringFactory
+ .create(toUpperCase(String.valueOf(hasSubs))), ByteStringFactory
+ .create(toUpperCase(String.valueOf(hasSubs))))));
+ assertTrue(a.contains(new AttributeValue(hasSubordinatesType,
+ toUpperCase(String.valueOf(hasSubs)))));
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
index 4c673cc..93736f1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
@@ -139,14 +139,14 @@
assertTrue(e.hasAttribute(isMemberOfType));
for (Attribute a : e.getAttribute(isMemberOfType))
{
- assertEquals(a.getValues().size(), 1);
+ assertEquals(a.size(), 1);
- assertTrue(a.hasValue());
- assertTrue(a.hasValue(new AttributeValue(isMemberOfType,
+ assertTrue(!a.isEmpty());
+ assertTrue(a.contains(new AttributeValue(isMemberOfType,
"cn=test static group,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType,
+ assertFalse(a.contains(new AttributeValue(isMemberOfType,
"cn=not a group,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType, "invalid")));
+ assertFalse(a.contains(new AttributeValue(isMemberOfType, "invalid")));
}
InternalClientConnection conn =
@@ -205,14 +205,14 @@
assertTrue(e.hasAttribute(isMemberOfType));
for (Attribute a : e.getAttribute(isMemberOfType))
{
- assertEquals(a.getValues().size(), 1);
+ assertEquals(a.size(), 1);
- assertTrue(a.hasValue());
- assertTrue(a.hasValue(new AttributeValue(isMemberOfType,
+ assertTrue(!a.isEmpty());
+ assertTrue(a.contains(new AttributeValue(isMemberOfType,
"cn=test static group,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType,
+ assertFalse(a.contains(new AttributeValue(isMemberOfType,
"cn=not a group,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType, "invalid")));
+ assertFalse(a.contains(new AttributeValue(isMemberOfType, "invalid")));
}
InternalClientConnection conn =
@@ -270,14 +270,14 @@
assertTrue(e.hasAttribute(isMemberOfType));
for (Attribute a : e.getAttribute(isMemberOfType))
{
- assertEquals(a.getValues().size(), 1);
+ assertEquals(a.size(), 1);
- assertTrue(a.hasValue());
- assertTrue(a.hasValue(new AttributeValue(isMemberOfType,
+ assertTrue(!a.isEmpty());
+ assertTrue(a.contains(new AttributeValue(isMemberOfType,
"cn=test dynamic group,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType,
+ assertFalse(a.contains(new AttributeValue(isMemberOfType,
"cn=not a group,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType, "invalid")));
+ assertFalse(a.contains(new AttributeValue(isMemberOfType, "invalid")));
}
InternalClientConnection conn =
@@ -360,18 +360,18 @@
assertTrue(e.hasAttribute(isMemberOfType));
for (Attribute a : e.getAttribute(isMemberOfType))
{
- assertEquals(a.getValues().size(), 2);
+ assertEquals(a.size(), 2);
- assertTrue(a.hasValue());
- assertTrue(a.hasValue(new AttributeValue(isMemberOfType,
+ assertTrue(!a.isEmpty());
+ assertTrue(a.contains(new AttributeValue(isMemberOfType,
"cn=test group 1,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType,
+ assertFalse(a.contains(new AttributeValue(isMemberOfType,
"cn=test group 2,ou=groups,o=test")));
- assertTrue(a.hasValue(new AttributeValue(isMemberOfType,
+ assertTrue(a.contains(new AttributeValue(isMemberOfType,
"cn=test group 3,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType,
+ assertFalse(a.contains(new AttributeValue(isMemberOfType,
"cn=not a group,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType, "invalid")));
+ assertFalse(a.contains(new AttributeValue(isMemberOfType, "invalid")));
}
InternalClientConnection conn =
@@ -479,24 +479,24 @@
assertTrue(e.hasAttribute(isMemberOfType));
for (Attribute a : e.getAttribute(isMemberOfType))
{
- assertEquals(a.getValues().size(), 4);
+ assertEquals(a.size(), 4);
- assertTrue(a.hasValue());
- assertTrue(a.hasValue(new AttributeValue(isMemberOfType,
+ assertTrue(!a.isEmpty());
+ assertTrue(a.contains(new AttributeValue(isMemberOfType,
"cn=test group 1,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType,
+ assertFalse(a.contains(new AttributeValue(isMemberOfType,
"cn=test group 2,ou=groups,o=test")));
- assertTrue(a.hasValue(new AttributeValue(isMemberOfType,
+ assertTrue(a.contains(new AttributeValue(isMemberOfType,
"cn=test group 3,ou=groups,o=test")));
- assertTrue(a.hasValue(new AttributeValue(isMemberOfType,
+ assertTrue(a.contains(new AttributeValue(isMemberOfType,
"cn=test group 4,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType,
+ assertFalse(a.contains(new AttributeValue(isMemberOfType,
"cn=test group 5,ou=groups,o=test")));
- assertTrue(a.hasValue(new AttributeValue(isMemberOfType,
+ assertTrue(a.contains(new AttributeValue(isMemberOfType,
"cn=test group 6,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType,
+ assertFalse(a.contains(new AttributeValue(isMemberOfType,
"cn=not a group,ou=groups,o=test")));
- assertFalse(a.hasValue(new AttributeValue(isMemberOfType, "invalid")));
+ assertFalse(a.contains(new AttributeValue(isMemberOfType, "invalid")));
}
InternalClientConnection conn =
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
index 71f5675..c40ad47 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
@@ -28,28 +28,22 @@
+import static org.testng.Assert.*;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import org.opends.server.TestCaseUtils;
import org.opends.messages.MessageBuilder;
-import org.opends.server.admin.std.meta.
- LengthBasedPasswordValidatorCfgDefn;
-import org.opends.server.admin.std.server.
- LengthBasedPasswordValidatorCfg;
+import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.admin.std.meta.LengthBasedPasswordValidatorCfgDefn;
+import org.opends.server.admin.std.server.LengthBasedPasswordValidatorCfg;
import org.opends.server.config.ConfigException;
-import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
@@ -57,8 +51,9 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
-
-import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
@@ -370,7 +365,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword",
+ Attributes.create("userpassword",
buffer.toString())));
InternalClientConnection conn =
@@ -443,7 +438,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword",
+ Attributes.create("userpassword",
buffer.toString())));
InternalClientConnection conn =
@@ -518,7 +513,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword",
+ Attributes.create("userpassword",
buffer.toString())));
InternalClientConnection conn =
@@ -593,7 +588,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword",
+ Attributes.create("userpassword",
buffer.toString())));
InternalClientConnection conn =
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
index 2ba31be..90b32e2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
@@ -221,12 +221,12 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(a.hasValue());
- assertEquals(a.getValues().size(), 1);
- assertTrue(a.getValues().contains(new AttributeValue(
+ assertTrue(!a.isEmpty());
+ assertEquals(a.size(), 1);
+ assertTrue(a.contains(new AttributeValue(
ByteStringFactory.create(String.valueOf(count)),
ByteStringFactory.create(String.valueOf(count)))));
- assertTrue(a.hasValue(new AttributeValue(numSubordinatesType,
+ assertTrue(a.contains(new AttributeValue(numSubordinatesType,
String.valueOf(count))));
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
index cc6ff57..94b2c1f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
@@ -50,8 +50,8 @@
import org.opends.server.protocols.asn1.ASN1Sequence;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPPasswordModify;
-import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
+import org.opends.server.types.Attributes;
import org.opends.server.types.AuthenticationInfo;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -1251,7 +1251,7 @@
String attr = "ds-cfg-allow-pre-encoded-passwords";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "true")));
+ Attributes.create(attr, "true")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1275,7 +1275,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "false")));
+ Attributes.create(attr, "false")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1493,7 +1493,7 @@
String attr = "ds-cfg-allow-user-password-changes";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "false")));
+ Attributes.create(attr, "false")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1516,7 +1516,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "true")));
+ Attributes.create(attr, "true")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1561,7 +1561,7 @@
String attr = "ds-cfg-allow-user-password-changes";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "false")));
+ Attributes.create(attr, "false")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1585,7 +1585,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "true")));
+ Attributes.create(attr, "true")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1630,7 +1630,7 @@
String attr = "ds-cfg-password-change-requires-current-password";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "true")));
+ Attributes.create(attr, "true")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1654,7 +1654,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "false")));
+ Attributes.create(attr, "false")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1699,7 +1699,7 @@
String attr = "ds-cfg-require-secure-authentication";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "true")));
+ Attributes.create(attr, "true")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1722,7 +1722,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "false")));
+ Attributes.create(attr, "false")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1767,7 +1767,7 @@
String attr = "ds-cfg-require-secure-password-changes";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "true")));
+ Attributes.create(attr, "true")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1790,7 +1790,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "false")));
+ Attributes.create(attr, "false")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1835,7 +1835,7 @@
String attr = "ds-cfg-require-secure-password-changes";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "true")));
+ Attributes.create(attr, "true")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1859,7 +1859,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "false")));
+ Attributes.create(attr, "false")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1904,7 +1904,7 @@
String attr = "ds-cfg-min-password-age";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "24 hours")));
+ Attributes.create(attr, "24 hours")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1926,7 +1926,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "0 seconds")));
+ Attributes.create(attr, "0 seconds")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1971,7 +1971,7 @@
String attr = "ds-cfg-min-password-age";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "24 hours")));
+ Attributes.create(attr, "24 hours")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1994,7 +1994,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "0 seconds")));
+ Attributes.create(attr, "0 seconds")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -2042,9 +2042,9 @@
String attr2 = "ds-cfg-expire-passwords-without-warning";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr1, "90 days")));
+ Attributes.create(attr1, "90 days")));
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr2, "true")));
+ Attributes.create(attr2, "true")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2052,7 +2052,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("pwdchangedtime",
+ Attributes.create("pwdchangedtime",
"20050101000000.000Z")));
modifyOperation = conn.processModify(userEntry.getDN(), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2074,9 +2074,9 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr1, "0 seconds")));
+ Attributes.create(attr1, "0 seconds")));
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr2, "false")));
+ Attributes.create(attr2, "false")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -2125,11 +2125,11 @@
String attr3 = "ds-cfg-allow-expired-password-changes";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr1, "90 days")));
+ Attributes.create(attr1, "90 days")));
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr2, "true")));
+ Attributes.create(attr2, "true")));
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr3, "true")));
+ Attributes.create(attr3, "true")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2137,7 +2137,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("pwdchangedtime",
+ Attributes.create("pwdchangedtime",
"20050101000000.000Z")));
modifyOperation = conn.processModify(userEntry.getDN(), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2160,11 +2160,11 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr1, "0 seconds")));
+ Attributes.create(attr1, "0 seconds")));
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr2, "false")));
+ Attributes.create(attr2, "false")));
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr3, "false")));
+ Attributes.create(attr3, "false")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -2211,7 +2211,7 @@
String attr = "ds-cfg-password-generator";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(DirectoryServer.getAttributeType(attr))));
+ Attributes.empty(DirectoryServer.getAttributeType(attr))));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2234,7 +2234,7 @@
String genDN =
"cn=Random Password Generator,cn=Password Generators,cn=config";
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, genDN)));
+ Attributes.create(attr, genDN)));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -2281,7 +2281,7 @@
String attr = "ds-cfg-password-generator";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(DirectoryServer.getAttributeType(attr))));
+ Attributes.empty(DirectoryServer.getAttributeType(attr))));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2304,7 +2304,7 @@
String genDN =
"cn=Random Password Generator,cn=Password Generators,cn=config";
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, genDN)));
+ Attributes.create(attr, genDN)));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -2352,7 +2352,7 @@
"cn=Length-Based Password Validator,cn=Password Validators,cn=config";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, valDN)));
+ Attributes.create(attr, valDN)));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2374,7 +2374,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(DirectoryServer.getAttributeType(attr))));
+ Attributes.empty(DirectoryServer.getAttributeType(attr))));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -2422,7 +2422,7 @@
"cn=Length-Based Password Validator,cn=Password Validators,cn=config";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, valDN)));
+ Attributes.create(attr, valDN)));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2444,7 +2444,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(DirectoryServer.getAttributeType(attr))));
+ Attributes.empty(DirectoryServer.getAttributeType(attr))));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -2484,7 +2484,7 @@
String attr = "ds-cfg-allow-multiple-password-values";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "true")));
+ Attributes.create(attr, "true")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2516,7 +2516,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "false")));
+ Attributes.create(attr, "false")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -2559,7 +2559,7 @@
String attr = "ds-cfg-allow-multiple-password-values";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "true")));
+ Attributes.create(attr, "true")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2591,7 +2591,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "false")));
+ Attributes.create(attr, "false")));
modifyOperation = conn.processModify(DN.decode(dnStr), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -2610,7 +2610,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(false,
"dn: uid=test.user,o=test",
"changetype: add",
"objectClass: top",
@@ -2629,8 +2629,8 @@
// then this will likely need to be updated, but I don't want to
// have to give the user the bypass-acl privilege.
"aci: (targetattr=\"*\")(version 3.0; acl \"Self Modify Rights\"; " +
- "allow (read,search,compare,write) userdn=\"ldap:///self\";)",
- "",
+ "allow (read,search,compare,write) userdn=\"ldap:///self\";)");
+ TestCaseUtils.applyModifications(true,
"dn: cn=Default Password Policy,cn=Password Policies,cn=config",
"changetype: modify",
"replace: ds-cfg-last-login-time-attribute",
@@ -2670,7 +2670,7 @@
}
finally
{
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(true,
"dn: cn=Default Password Policy,cn=Password Policies,cn=config",
"changetype: modify",
"replace: ds-cfg-last-login-time-attribute",
@@ -2693,7 +2693,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(false,
"dn: uid=test.user,o=test",
"changetype: add",
"objectClass: top",
@@ -2704,8 +2704,8 @@
"givenName: Test",
"sn: User",
"cn: Test User",
- "userPassword: oldpassword",
- "",
+ "userPassword: oldpassword");
+ TestCaseUtils.applyModifications(true,
"dn: cn=Default Password Policy,cn=Password Policies,cn=config",
"changetype: modify",
"replace: ds-cfg-lockout-failure-count",
@@ -2742,7 +2742,7 @@
}
finally
{
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(true,
"dn: cn=Default Password Policy,cn=Password Policies,cn=config",
"changetype: modify",
"replace: ds-cfg-lockout-failure-count",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
index e4a4d89..dbc93ba 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
@@ -28,33 +28,31 @@
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+import java.util.ArrayList;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.core.PasswordPolicy;
import org.opends.server.core.ModifyOperation;
+import org.opends.server.core.PasswordPolicy;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteString;
-import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
-import org.opends.server.types.Attribute;
-
-import static org.testng.Assert.*;
-import static org.testng.Assert.assertEquals;
-
-import java.util.ArrayList;
+import org.opends.server.types.ResultCode;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
/**
@@ -99,7 +97,7 @@
throws Exception
{
TestCaseUtils.startServer();
-
+
if (configDNString != null)
{
configEntry = DirectoryServer.getConfigEntry(DN.decode(configDNString));
@@ -319,7 +317,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, ""+allowPreencoded)));
+ Attributes.create(attr, String.valueOf(allowPreencoded))));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
index 5a8db6a..10d9c15 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
@@ -48,7 +48,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteString;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.Control;
@@ -312,7 +312,7 @@
ASN1OctetString password = new ASN1OctetString("password");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "password")));
+ Attributes.create("userpassword", "password")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -381,7 +381,7 @@
ASN1OctetString password = new ASN1OctetString("passsword");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "passsword")));
+ Attributes.create("userpassword", "passsword")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -449,7 +449,7 @@
ASN1OctetString password = new ASN1OctetString("passSword");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "passSword")));
+ Attributes.create("userpassword", "passSword")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -518,7 +518,7 @@
ASN1OctetString password = new ASN1OctetString("passSword");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "passSword")));
+ Attributes.create("userpassword", "passSword")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -585,7 +585,7 @@
ASN1OctetString password = new ASN1OctetString("aaaaaaaa");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "aaaaaaaa")));
+ Attributes.create("userpassword", "aaaaaaaa")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -653,7 +653,7 @@
ASN1OctetString password = new ASN1OctetString("aaaaaaaa");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "aaaaaaaa")));
+ Attributes.create("userpassword", "aaaaaaaa")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
index 9eda91b..935d7ae 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
@@ -40,7 +40,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteString;
import org.opends.server.types.ByteStringFactory;
import org.opends.server.types.Control;
@@ -287,7 +287,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword",
+ Attributes.create("userpassword",
buffer.toString())));
InternalClientConnection conn =
@@ -363,7 +363,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword",
+ Attributes.create("userpassword",
buffer.toString())));
InternalClientConnection conn =
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
index bb636b2..7f8ef71 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
@@ -28,38 +28,34 @@
+import static org.testng.Assert.*;
+
import java.io.File;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.List;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.
- SubjectAttributeToUserAttributeCertificateMapperCfgDefn;
-import org.opends.server.admin.std.server.
- SubjectAttributeToUserAttributeCertificateMapperCfg;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.admin.std.meta.SubjectAttributeToUserAttributeCertificateMapperCfgDefn;
+import org.opends.server.admin.std.server.SubjectAttributeToUserAttributeCertificateMapperCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
import org.opends.server.types.ResultCode;
-
-import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
@@ -607,7 +603,7 @@
"cn=Certificate Mappers,cn=config";
Attribute a =
- new Attribute(DirectoryServer.getAttributeType(
+ Attributes.empty(DirectoryServer.getAttributeType(
"ds-cfg-subject-attribute-mapping"));
ArrayList<Modification> mods = new ArrayList<Modification>();
@@ -741,7 +737,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-certificate-mapper",
+ Attributes.create("ds-cfg-certificate-mapper",
mapperDN)));
InternalClientConnection conn =
@@ -767,7 +763,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-certificate-mapper",
+ Attributes.create("ds-cfg-certificate-mapper",
mapperDN)));
InternalClientConnection conn =
@@ -797,19 +793,18 @@
DirectoryServer.getAttributeType(
"ds-cfg-subject-attribute-mapping");
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(attrType);
if (mappings != null)
{
for (String mapping : mappings)
{
- values.add(new AttributeValue(attrType, mapping));
+ builder.add(mapping);
}
}
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attrType, attrType.getNameOrOID(),
- values)));
+ builder.toAttribute()));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -839,19 +834,18 @@
AttributeType attrType =
DirectoryServer.getAttributeType("ds-cfg-user-base-dn");
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(attrType);
if (baseDNs != null)
{
for (String baseDN : baseDNs)
{
- values.add(new AttributeValue(attrType, baseDN));
+ builder.add(baseDN);
}
}
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attrType, attrType.getNameOrOID(),
- values)));
+ builder.toAttribute()));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
index d9cc9f9..2f570ed 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
@@ -28,38 +28,34 @@
+import static org.testng.Assert.*;
+
import java.io.File;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.List;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.AdminTestCaseUtils;
-import org.opends.server.admin.std.meta.
- SubjectDNToUserAttributeCertificateMapperCfgDefn;
-import org.opends.server.admin.std.server.
- SubjectDNToUserAttributeCertificateMapperCfg;
-import org.opends.server.config.ConfigEntry;
+import org.opends.server.admin.std.meta.SubjectDNToUserAttributeCertificateMapperCfgDefn;
+import org.opends.server.admin.std.server.SubjectDNToUserAttributeCertificateMapperCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
import org.opends.server.types.ResultCode;
-
-import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
@@ -553,7 +549,7 @@
"cn=Subject DN to User Attribute,cn=Certificate Mappers,cn=config";
Attribute a =
- new Attribute(DirectoryServer.getAttributeType(
+ Attributes.empty(DirectoryServer.getAttributeType(
"ds-cfg-subject-attribute"));
ArrayList<Modification> mods = new ArrayList<Modification>();
@@ -612,7 +608,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-certificate-mapper",
+ Attributes.create("ds-cfg-certificate-mapper",
mapperDN)));
InternalClientConnection conn =
@@ -638,7 +634,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-certificate-mapper",
+ Attributes.create("ds-cfg-certificate-mapper",
mapperDN)));
InternalClientConnection conn =
@@ -667,7 +663,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-subject-attribute",
+ Attributes.create("ds-cfg-subject-attribute",
attrName)));
InternalClientConnection conn =
@@ -698,19 +694,18 @@
AttributeType attrType =
DirectoryServer.getAttributeType("ds-cfg-user-base-dn");
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(attrType);
if (baseDNs != null)
{
for (String baseDN : baseDNs)
{
- values.add(new AttributeValue(attrType, baseDN));
+ builder.add(baseDN);
}
}
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attrType, attrType.getNameOrOID(),
- values)));
+ builder.toAttribute()));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
index 90d73b5..c3fba30 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
@@ -144,9 +144,9 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(a.hasValue());
- assertEquals(a.getValues().size(), 1);
- assertTrue(a.hasValue(new AttributeValue(subschemaSubentryType,
+ assertTrue(!a.isEmpty());
+ assertEquals(a.size(), 1);
+ assertTrue(a.contains(new AttributeValue(subschemaSubentryType,
"cn=schema")));
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
index 64cd284..f6131ac 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
@@ -28,34 +28,31 @@
+import static org.testng.Assert.*;
+
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
import org.opends.server.TestCaseUtils;
import org.opends.server.api.WorkQueue;
-import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
-import org.opends.server.core.SearchOperation;
import org.opends.server.plugins.DelayPreOpPlugin;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.Control;
-import org.opends.server.types.DereferencePolicy;
-import org.opends.server.types.DN;
import org.opends.server.tools.LDAPSearch;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.Control;
+import org.opends.server.types.DN;
+import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchScope;
-
-import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
@@ -106,7 +103,7 @@
String attr = "ds-cfg-num-worker-threads";
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "30")));
+ Attributes.create(attr, "30")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -115,7 +112,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute(attr, "24")));
+ Attributes.create(attr, "24")));
modifyOperation = conn.processModify(dn, mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
index 60a362b..231446e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
@@ -48,7 +48,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteString;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.Control;
@@ -312,7 +312,7 @@
ASN1OctetString password = new ASN1OctetString("password");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "password")));
+ Attributes.create("userpassword", "password")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -381,7 +381,7 @@
ASN1OctetString password = new ASN1OctetString("passw");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "passw")));
+ Attributes.create("userpassword", "passw")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -449,7 +449,7 @@
ASN1OctetString password = new ASN1OctetString("pasSw");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "pasSw")));
+ Attributes.create("userpassword", "pasSw")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -518,7 +518,7 @@
ASN1OctetString password = new ASN1OctetString("pasSw");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "pasSw")));
+ Attributes.create("userpassword", "pasSw")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -585,7 +585,7 @@
ASN1OctetString password = new ASN1OctetString("aaaaaaaa");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "aaaaaaaa")));
+ Attributes.create("userpassword", "aaaaaaaa")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -653,7 +653,7 @@
ASN1OctetString password = new ASN1OctetString("aaaaaaaa");
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("userpassword", "aaaaaaaa")));
+ Attributes.create("userpassword", "aaaaaaaa")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
index e18e14c..c9c85bb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
@@ -45,7 +45,6 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchScope;
import org.opends.server.types.ResultCode;
@@ -272,8 +271,8 @@
assertEquals(attrList.size(), 1);
Attribute attr = attrList.get(0);
- assertEquals(attr.getValues().size(), 1);
- assertTrue(attr.hasValue(new AttributeValue(descriptionType, value)));
+ assertEquals(attr.size(), 1);
+ assertTrue(attr.contains(new AttributeValue(descriptionType, value)));
DeleteOperation deleteOperation = conn.processDelete(DN.decode(ruleDN));
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
@@ -336,9 +335,9 @@
assertEquals(attrList.size(), 1);
Attribute attr = attrList.get(0);
- assertEquals(attr.getValues().size(), 2);
- assertTrue(attr.hasValue(new AttributeValue(descriptionType, value1)));
- assertTrue(attr.hasValue(new AttributeValue(descriptionType, value2)));
+ assertEquals(attr.size(), 2);
+ assertTrue(attr.contains(new AttributeValue(descriptionType, value1)));
+ assertTrue(attr.contains(new AttributeValue(descriptionType, value2)));
DeleteOperation deleteOperation = conn.processDelete(DN.decode(ruleDN));
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
@@ -401,8 +400,8 @@
assertEquals(attrList.size(), 1);
Attribute attr = attrList.get(0);
- assertEquals(attr.getValues().size(), 1);
- assertTrue(attr.hasValue(new AttributeValue(descriptionType, realValue)));
+ assertEquals(attr.size(), 1);
+ assertTrue(attr.contains(new AttributeValue(descriptionType, realValue)));
DeleteOperation deleteOperation = conn.processDelete(DN.decode(ruleDN));
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
@@ -465,8 +464,8 @@
assertEquals(attrList.size(), 1);
Attribute attr = attrList.get(0);
- assertEquals(attr.getValues().size(), 1);
- assertTrue(attr.hasValue(new AttributeValue(descriptionType,
+ assertEquals(attr.size(), 1);
+ assertTrue(attr.contains(new AttributeValue(descriptionType,
virtualValue)));
DeleteOperation deleteOperation = conn.processDelete(DN.decode(ruleDN));
@@ -533,7 +532,9 @@
new LinkedHashSet<AttributeValue>();
for (Attribute a : attrList)
{
- allValues.addAll(a.getValues());
+ for (AttributeValue av : a) {
+ allValues.add(av);
+ }
}
assertTrue(allValues.contains(new AttributeValue(descriptionType,
@@ -645,7 +646,8 @@
String[] args2 = new String[]
{
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-Z", "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-f", path2
@@ -736,7 +738,8 @@
String[] args2 = new String[]
{
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-Z", "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-f", path2
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
index 445d929..bcd5967 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
@@ -38,7 +38,6 @@
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.GroupManager;
import org.opends.server.core.ModifyOperation;
@@ -47,6 +46,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.DirectoryException;
@@ -794,10 +794,10 @@
assertTrue(e.hasAttribute(memberType));
Attribute a = e.getAttribute(memberType).get(0);
- assertEquals(a.getValues().size(), 4);
+ assertEquals(a.size(), 4);
AttributeValue v = new AttributeValue(memberType, u1.toString());
- assertTrue(a.hasValue(v));
+ assertTrue(a.contains(v));
cleanUp();
}
@@ -824,24 +824,24 @@
assertTrue(e.hasAttribute(memberType));
Attribute a = e.getAttribute(memberType).get(0);
- assertEquals(a.getValues().size(), 1);
+ assertEquals(a.size(), 1);
AttributeValue v = new AttributeValue(memberType, u4.toString());
- assertTrue(a.hasValue(v));
+ assertTrue(a.contains(v));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
LinkedList<Modification> mods = new LinkedList<Modification>();
mods.add(new Modification(ModificationType.ADD,
- new Attribute("memberurl",
+ Attributes.create("memberurl",
"ldap:///o=test??sub?(objectClass=person)")));
ModifyOperation modifyOperation = conn.processModify(d1, mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
a = e.getAttribute(memberType).get(0);
- assertEquals(a.getValues().size(), 4);
- assertTrue(a.hasValue(v));
+ assertEquals(a.size(), 4);
+ assertTrue(a.contains(v));
cleanUp();
}
@@ -866,10 +866,10 @@
assertTrue(e.hasAttribute(memberType));
Attribute a = e.getAttribute(memberType).get(0);
- assertEquals(a.getValues().size(), 1);
+ assertEquals(a.size(), 1);
AttributeValue v = new AttributeValue(memberType, u4.toString());
- assertTrue(a.hasValue(v));
+ assertTrue(a.contains(v));
InternalClientConnection conn =
@@ -877,7 +877,7 @@
LinkedList<Modification> mods = new LinkedList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-allow-retrieving-membership", "false")));
+ Attributes.create("ds-cfg-allow-retrieving-membership", "false")));
DN definitionDN =
DN.decode("cn=Virtual Static member,cn=Virtual Attributes,cn=config");
ModifyOperation modifyOperation = conn.processModify(definitionDN, mods);
@@ -889,15 +889,15 @@
assertTrue(e.hasAttribute(memberType));
a = e.getAttribute(memberType).get(0);
- assertEquals(a.getValues().size(), 0);
+ assertEquals(a.size(), 0);
v = new AttributeValue(memberType, u4.toString());
- assertTrue(a.hasValue(v));
+ assertTrue(a.contains(v));
mods = new LinkedList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-allow-retrieving-membership", "true")));
+ Attributes.create("ds-cfg-allow-retrieving-membership", "true")));
modifyOperation = conn.processModify(definitionDN, mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
index e355c3b..ce75e26 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
@@ -28,21 +28,18 @@
+import static org.testng.Assert.*;
+
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.UUID;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.EntryUUIDPluginCfgDefn;
import org.opends.server.admin.std.server.EntryUUIDPluginCfg;
-import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
@@ -51,18 +48,14 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.AuthenticationInfo;
-import org.opends.server.types.Control;
-import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
-import org.opends.server.types.Modification;
-import org.opends.server.types.ModificationType;
-import org.opends.server.types.RDN;
import org.opends.server.types.ResultCode;
-
-import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
@@ -152,7 +145,7 @@
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
@@ -191,7 +184,7 @@
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
@@ -270,7 +263,7 @@
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
index f2ceed2..9dc4efa 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
@@ -49,7 +49,6 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DereferencePolicy;
-import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ResultCode;
@@ -127,7 +126,7 @@
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
@@ -213,7 +212,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
index 5061946..9b40de3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
@@ -40,7 +40,6 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.LastModPluginCfgDefn;
import org.opends.server.admin.std.server.LastModPluginCfg;
-import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
@@ -51,8 +50,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.AuthenticationInfo;
-import org.opends.server.types.Control;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -161,7 +159,7 @@
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
@@ -210,7 +208,7 @@
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
@@ -293,7 +291,7 @@
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
@@ -355,7 +353,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
index ef0b109..5c56d0e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
@@ -172,7 +172,7 @@
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
@@ -248,7 +248,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
index 8723e96..9e22f52 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
@@ -42,7 +42,6 @@
import org.opends.server.types.*;
import java.util.LinkedList;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.HashSet;
@@ -404,7 +403,7 @@
HashSet<PluginType> pluginTypes = new HashSet<PluginType>();
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList){
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
ReferentialIntegrityPluginCfg configuration =
@@ -553,7 +552,7 @@
HashSet<PluginType> pluginTypes = new HashSet<PluginType>();
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList){
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
ReferentialIntegrityPluginCfg configuration =
@@ -798,13 +797,12 @@
private void
addAttrEntry(DN dn, String attrTypeString, String... attrValStrings) {
LinkedList<Modification> mods = new LinkedList<Modification>();
- LinkedHashSet<AttributeValue> attrValues =
- new LinkedHashSet<AttributeValue>();
AttributeType attrType = getAttrType(attrTypeString);
- for(String valString : attrValStrings)
- attrValues.add(new AttributeValue(attrType, valString));
- Attribute attr = new Attribute(attrType, attrTypeString, attrValues);
- mods.add(new Modification(ModificationType.ADD, attr));
+ AttributeBuilder builder = new AttributeBuilder(attrType, attrTypeString);
+ for(String valString : attrValStrings) {
+ builder.add(valString);
+ }
+ mods.add(new Modification(ModificationType.ADD, builder.toAttribute()));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
conn.processModify(dn, mods);
@@ -823,13 +821,12 @@
private void
replaceAttrEntry(DN dn, String attrTypeString, String... attrValStrings) {
LinkedList<Modification> mods = new LinkedList<Modification>();
- LinkedHashSet<AttributeValue> attrValues =
- new LinkedHashSet<AttributeValue>();
AttributeType attrType = getAttrType(attrTypeString);
- for(String valString : attrValStrings)
- attrValues.add(new AttributeValue(attrType, valString));
- Attribute attr = new Attribute(attrType, attrTypeString, attrValues);
- mods.add(new Modification(ModificationType.REPLACE, attr));
+ AttributeBuilder builder = new AttributeBuilder(attrType, attrTypeString);
+ for(String valString : attrValStrings) {
+ builder.add(valString);
+ }
+ mods.add(new Modification(ModificationType.REPLACE, builder.toAttribute()));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
conn.processModify(dn, mods);
@@ -854,7 +851,7 @@
for(String attrTypeString : attrTypeStrings) {
AttributeType attrType = getAttrType(attrTypeString);
mods.add(new Modification(ModificationType.DELETE,
- new Attribute(attrType)));
+ Attributes.empty(attrType)));
}
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java
index ef234a9..c7eb127 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java
@@ -46,7 +46,6 @@
import java.util.List;
import java.util.HashSet;
import java.util.LinkedList;
-import java.util.LinkedHashSet;
/**
@@ -216,7 +215,7 @@
HashSet<PluginType> pluginTypes = new HashSet<PluginType>();
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList){
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
UniqueAttributePluginCfg configuration =
@@ -334,7 +333,7 @@
List<Attribute> attrList = e.getAttribute("ds-cfg-plugin-type");
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
pluginTypes.add(PluginType.forName(v.getStringValue().toLowerCase()));
}
UniqueAttributePluginCfg configuration =
@@ -739,47 +738,24 @@
for(String attrTypeString : attrTypeStrings) {
AttributeType attrType = getAttrType(attrTypeString);
mods.add(new Modification(ModificationType.DELETE,
- new Attribute(attrType)));
+ Attributes.empty(attrType)));
}
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
conn.processModify(dn, mods);
}
- /**
- * Attempt to add an attribute of attribute type string to the entry
- * specified by the dn argument. The values to use in the attribute creation
- * is specified by the variable argument list.
- *
- * @param dn The dn of the entry to add the attribute.
- * @param attrTypeString The attribute type string.
- * @param attrValStrings The values of the attribute.
- */
- private void
- addAttrToEntry(DN dn, String attrTypeString, String... attrValStrings) {
- LinkedList<Modification> mods = new LinkedList<Modification>();
- LinkedHashSet<AttributeValue> attrValues =
- new LinkedHashSet<AttributeValue>();
- AttributeType attrType = getAttrType(attrTypeString);
- for(String valString : attrValStrings)
- attrValues.add(new AttributeValue(attrType, valString));
- Attribute attr = new Attribute(attrType, attrTypeString, attrValues);
- mods.add(new Modification(ModificationType.ADD, attr));
- InternalClientConnection conn =
- InternalClientConnection.getRootConnection();
- conn.processModify(dn, mods);
- }
+
private void
replaceAttrInEntry(DN dn, String attrTypeString, String... attrValStrings) {
LinkedList<Modification> mods = new LinkedList<Modification>();
- LinkedHashSet<AttributeValue> attrValues =
- new LinkedHashSet<AttributeValue>();
AttributeType attrType = getAttrType(attrTypeString);
- for(String valString : attrValStrings)
- attrValues.add(new AttributeValue(attrType, valString));
- Attribute attr = new Attribute(attrType, attrTypeString, attrValues);
- mods.add(new Modification(ModificationType.REPLACE, attr));
+ AttributeBuilder builder = new AttributeBuilder(attrType, attrTypeString);
+ for(String valString : attrValStrings) {
+ builder.add(new AttributeValue(attrType, valString));
+ }
+ mods.add(new Modification(ModificationType.REPLACE, builder.toAttribute()));
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
conn.processModify(dn, mods);
@@ -841,13 +817,12 @@
*/
private void
addAttribute(Entry entry, String attrTypeString, String... attrValues) {
- LinkedHashSet<AttributeValue> values=new LinkedHashSet<AttributeValue>();
AttributeType attrType=getAttrType(attrTypeString);
+ AttributeBuilder builder = new AttributeBuilder(attrType, attrTypeString);
for(String attrValue : attrValues) {
- AttributeValue value = new AttributeValue(attrType, attrValue);
- values.add(value);
+ builder.add(attrValue);
}
- entry.addAttribute(new Attribute(attrType, attrTypeString, values), null);
+ entry.addAttribute(builder.toAttribute(), null);
}
/**
@@ -862,14 +837,13 @@
private void
addMods(LinkedList<Modification> mods, String attrTypeString,
ModificationType modificationType, String... attrValues) {
- LinkedHashSet<AttributeValue> values=new LinkedHashSet<AttributeValue>();
AttributeType attrType=getAttrType(attrTypeString);
+ AttributeBuilder builder = new AttributeBuilder(attrType, attrTypeString);
for(String attrValue : attrValues) {
- AttributeValue value = new AttributeValue(attrType, attrValue);
- values.add(value);
+ builder.add(attrValue);
}
mods.add(new Modification(modificationType,
- new Attribute(attrType, attrTypeString, values)));
+ builder.toAttribute()));
}
/**
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
index fbb61e0..57d32b5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
@@ -55,7 +55,7 @@
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.types.AbstractOperation;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.AuthenticationInfo;
import org.opends.server.types.CancelRequest;
import org.opends.server.types.CancelResult;
@@ -693,7 +693,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("description", "This is a test")));
+ Attributes.create("description", "This is a test")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode("cn=test,o=test"), mods);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
index 9351200..c06d885 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
@@ -65,7 +65,7 @@
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.AuthenticationInfo;
import org.opends.server.types.ByteStringFactory;
import org.opends.server.types.Control;
@@ -222,7 +222,7 @@
"uid: pwreset.target",
"userPassword: password");
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(false,
"dn: o=test",
"changetype: modify",
"add: aci",
@@ -432,8 +432,8 @@
InternalClientConnection rootConnection =
InternalClientConnection.getRootConnection();
ArrayList<Modification> mods = new ArrayList<Modification>();
- mods.add(new Modification(ModificationType.ADD,
- new Attribute("ds-privilege-name", "jmx-read")));
+ mods.add(new Modification(ModificationType.ADD, Attributes.create(
+ "ds-privilege-name", "jmx-read")));
ModifyOperation modifyOperation =
rootConnection.processModify(DN.decode(user), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -464,7 +464,7 @@
// remove JMX_READ privilege
mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("ds-privilege-name", "jmx-read")));
+ Attributes.create("ds-privilege-name", "jmx-read")));
modifyOperation =
rootConnection.processModify(DN.decode(user), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -648,7 +648,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-size-limit", "2000")));
+ Attributes.create("ds-cfg-size-limit", "2000")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode("cn=config"), mods);
@@ -658,7 +658,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-size-limit", "1000")));
+ Attributes.create("ds-cfg-size-limit", "1000")));
modifyOperation = conn.processModify(DN.decode("cn=config"), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -740,7 +740,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.ADD,
- new Attribute("attributetypes", attrDefinition)));
+ Attributes.create("attributetypes", attrDefinition)));
ModifyOperation modifyOperation =
conn.processModify(DN.decode("cn=schema"), mods);
@@ -750,7 +750,7 @@
mods.clear();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("attributetypes", attrDefinition)));
+ Attributes.create("attributetypes", attrDefinition)));
modifyOperation = conn.processModify(DN.decode("cn=schema"), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1172,7 +1172,7 @@
// Try to modify the entry to add a description.
ArrayList<Modification> mods = new ArrayList<Modification>(1);
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
ModifyOperationBasis modifyOperation = new ModifyOperationBasis(conn,
conn.nextOperationID(), conn.nextMessageID(), controls, e.getDN(),
@@ -1371,7 +1371,7 @@
// Try to modify the entry to add a description.
ArrayList<Modification> mods = new ArrayList<Modification>(1);
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
ModifyOperationBasis modifyOperation =
new ModifyOperationBasis(conn,
@@ -1556,7 +1556,7 @@
// the client connection reflects that.
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.ADD,
- new Attribute("ds-privilege-name", "jmx-read")));
+ Attributes.create("ds-privilege-name", "jmx-read")));
ModifyOperation modifyOperation =
rootConnection.processModify(DN.decode("cn=Test User,o=test"), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1567,7 +1567,7 @@
// immediately.
mods.clear();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("ds-privilege-name", "jmx-read")));
+ Attributes.create("ds-privilege-name", "jmx-read")));
modifyOperation =
rootConnection.processModify(DN.decode("cn=Test User,o=test"), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1608,7 +1608,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.ADD,
- new Attribute("ds-cfg-default-root-privilege-name",
+ Attributes.create("ds-cfg-default-root-privilege-name",
"proxied-auth")));
ModifyOperation modifyOperation =
internalRootConn.processModify(DN.decode("cn=Root DNs,cn=config"),
@@ -1626,7 +1626,7 @@
// Update the set of root privileges to revoke proxied auth.
mods.clear();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("ds-cfg-default-root-privilege-name",
+ Attributes.create("ds-cfg-default-root-privilege-name",
"proxied-auth")));
modifyOperation =
internalRootConn.processModify(DN.decode("cn=Root DNs,cn=config"),
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java
index 05dd852..5aaf082 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java
@@ -37,6 +37,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.types.Attributes;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
@@ -127,7 +128,7 @@
InternalClientConnection conn = InternalClientConnection
.getRootConnection();
mods.add(new Modification(ModificationType.REPLACE,
- new org.opends.server.types.Attribute(
+ Attributes.create(
"ds-cfg-enabled", "true")));
ModifyOperationBasis op = new ModifyOperationBasis(
conn,
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
new file mode 100644
index 0000000..4eeb2ee
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
@@ -0,0 +1,570 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.protocols.ldap;
+
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.File;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import org.opends.server.TestCaseUtils;
+import org.opends.server.api.Backend;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.protocols.asn1.ASN1Element;
+import org.opends.server.protocols.asn1.ASN1OctetString;
+import org.opends.server.protocols.asn1.ASN1Reader;
+import org.opends.server.protocols.asn1.ASN1Writer;
+import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.types.ResultCode;
+import org.opends.server.protocols.internal.InternalSearchOperation;
+import org.opends.server.tools.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.Control;
+import org.opends.server.types.DereferencePolicy;
+import org.opends.server.types.ExistingFileBehavior;
+import org.opends.server.types.LDIFExportConfig;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.RawAttribute;
+import org.opends.server.types.SearchResultEntry;
+import org.opends.server.types.SearchScope;
+import org.testng.annotations.*;
+import static org.testng.Assert.*;
+
+/*
+ * This class defines a set of testcases for testing the ;binary transfer
+ * option functionality across different protocol versions of LDAP.
+ */
+public class LDAPBinaryOptionTestCase extends LdapTestCase {
+ // Exported LDIF file.
+ File ldif = null;
+ //LDIFExportConfig used for exporting entries.
+ LDIFExportConfig exportConfig = null;
+ //LDIFImportConfig used for importing entries.
+ LDIFImportConfig importConfig = null;
+ //Test Backend.
+ Backend backend = null;
+
+ //Constant value of userCertificate attribute.
+ private static final String CERT=
+ ": MIIB5TCCAU6gAwIBAgIERloIajANBgkqhkiG9" +
+ "w0BAQUFADA3MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRXhhbXBs" +
+ "ZSBDb3JwMREwDwYDVQQDEwhKb2huIERvZTAeFw0wNzA1MjcyMjM4" +
+ "MzRaFw0wNzA4MjUyMjM4MzRaMDcxCzAJBgNVBAYTAlVTMRUwEwYD" +
+ "VQQKEwxFeGFtcGxlIENvcnAxETAPBgNVBAMTCEpvaG4gRG9lMIGfMA" +
+ "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWNZB4qs1UvjYgvGvB" +
+ "9udmiUi4X4DeaSm3o0p8PSwpOFxSqgWdSwKgUugZ1EJVyYoakljDFs" +
+ "J0GVown+dIB24V4ozNs6wa0YotIKTV2AcySQkmzzP3e+OnE9Aa1wlB/" +
+ "PVnh1CFLgk1UOoruLE10bac5HA8QiAmfNMorU26AwFTcwIDAQABMA" +
+ "0GCSqGSIb3DQEBBQUAA4GBAGrzMKNbBRWn+LIfYTfqKYUc258XVbhFri" +
+ "1OV0oF82vyvciYWZzyxLc52EPDsymLmcDh+CdWxy3bVkjdMg1WEtMGr" +
+ "1GsxOVi/vWe+kT4tPhinnB4Fowf8zgqiUKo9/FJN26y7Fpvy1IODiBInDrKZ" +
+ "RvNfqemCf7o3+Cp00OmF5ey";
+
+
+
+ /**
+ * Ensures that the Directory Server is running before executing the
+ * testcases.
+ *
+ * @throws Exception If an unexpected problem occurs.
+ */
+ @BeforeClass()
+ public void startServer()
+ throws Exception
+ {
+ TestCaseUtils.startServer();
+ TestCaseUtils.initializeTestBackend(true);
+ }
+
+
+
+ /**
+ * Test to verify an ADD of the binary attributes using a V3
+ * protocol.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ @Test()
+ public void binaryAttributeAddV3() throws Exception
+ {
+ //Add a binary attribute both with or without the binary option.
+ String filePath = TestCaseUtils.createTempFile(
+ "dn: uid=user.1,o=test",
+ "objectClass: inetOrgPerson",
+ "uid: user.1",
+ "sn: 1",
+ "cn: user 1",
+ "userCertificate"+CERT
+ );
+ String[] args = new String []
+ {
+ "-h", "127.0.0.1",
+ "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D","cn=directory manager",
+ "-w","password",
+ "-a",
+ "-f", filePath
+ };
+ int err = LDAPModify.mainModify(args, false, null,null);
+ assertEquals(err,0);
+
+ //ADD with ;binary option.
+ filePath = TestCaseUtils.createTempFile(
+ "dn: uid=user.2,o=test",
+ "objectClass: inetOrgPerson",
+ "uid: user.2",
+ "sn: 2",
+ "cn: user 2",
+ "userCertificate;binary"+CERT
+ );
+ args = new String []
+ {
+ "-h", "127.0.0.1",
+ "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D","cn=directory manager",
+ "-w","password",
+ "-a",
+ "-f", filePath
+ };
+ err = LDAPModify.mainModify(args, false, null,null);
+ assertEquals(err,0);
+ }
+
+
+
+ /**
+ * Test to verify an ADD of a non-binary attribute with the ;binary
+ * transfer option using a V3 protocol.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ @Test()
+ public void nonBinaryAttributeAddV3() throws Exception
+ {
+ String filePath = TestCaseUtils.createTempFile(
+ "dn: uid=user.3,o=test",
+ "objectClass: inetOrgPerson",
+ "uid: user.3",
+ "sn: 3",
+ "cn: user 3",
+ "cn;binary: common name"
+ );
+ String[] args = new String []
+ {
+ "-h", "127.0.0.1",
+ "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D","cn=directory manager",
+ "-w","password",
+ "-a",
+ "-f", filePath,
+ };
+ int err = LDAPModify.mainModify(args, false, null,null);
+ assertFalse(err==0);
+ }
+
+
+
+
+ /**
+ * Test to verify a SEARCH using the ;binary transfer option using a V3
+ * protocol.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ @Test(dependsOnMethods = {"org.opends.server.protocols.ldap."+
+ "LDAPBinaryOptionTestCase.binaryAttributeAddV3"})
+ public void binaryAttributeSearchV3() throws Exception
+ {
+ InternalClientConnection conn =
+ InternalClientConnection.getRootConnection();
+
+ InternalSearchOperation searchOperation =
+ new InternalSearchOperation(
+ conn,
+ InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(),
+ new ArrayList<Control>(),
+ new ASN1OctetString("o=test"),
+ SearchScope.WHOLE_SUBTREE,
+ DereferencePolicy.NEVER_DEREF_ALIASES,
+ Integer.MAX_VALUE,
+ Integer.MAX_VALUE,
+ false,
+ LDAPFilter.decode("(uid=user.1)"),
+ null, null);
+
+ searchOperation.run();
+ assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
+ List<SearchResultEntry> entries = searchOperation.getSearchEntries();
+ SearchResultEntry e = entries.get(0);
+ assertNotNull(e);
+ List<Attribute> attrs = e.getAttribute("usercertificate");
+ Attribute a = attrs.get(0);
+ assertNotNull(a);
+ assertTrue(a.getOptions().contains("binary"));
+
+ }
+
+
+
+ /**
+ * Test to verify a SEARCH using the ;binary transfer option using a V3
+ * protocol for a non-binary attribute.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ @Test(dependsOnMethods = {"org.opends.server.protocols.ldap."+
+ "LDAPBinaryOptionTestCase.binaryAttributeAddV3"})
+ public void invalidBinaryAttributeSearchV3() throws Exception
+ {
+ InternalClientConnection conn =
+ InternalClientConnection.getRootConnection();
+ LinkedHashSet<String> attrs = new LinkedHashSet<String>();
+ attrs.add("cn;binary");
+ InternalSearchOperation searchOperation =
+ new InternalSearchOperation(
+ conn,
+ InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(),
+ new ArrayList<Control>(),
+ new ASN1OctetString("o=test"),
+ SearchScope.WHOLE_SUBTREE,
+ DereferencePolicy.NEVER_DEREF_ALIASES,
+ Integer.MAX_VALUE,
+ Integer.MAX_VALUE,
+ false,
+ LDAPFilter.decode("(uid=user.1)"),
+ attrs, null);
+
+ searchOperation.run();
+ assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
+ List<SearchResultEntry> entries = searchOperation.getSearchEntries();
+ SearchResultEntry e = entries.get(0);
+ assertNotNull(e);
+ List<Attribute> list = e.getAttributes();
+ assertEquals(list.size(), 0);
+ }
+
+
+
+ /**
+ * Test to verify an ADD and SEARCH using the ;binary transfer option using a
+ * V2 protocol.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ @Test()
+ public void binaryOptionUsingV2() throws Exception
+ {
+ //Construct a V2 connection.
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
+ ASN1Reader r = new ASN1Reader(s);
+ ASN1Writer w = new ASN1Writer(s);
+
+ try
+ {
+ BindRequestProtocolOp bindRequest =
+ new BindRequestProtocolOp(
+ new ASN1OctetString("cn=Directory Manager"), 2,
+ new ASN1OctetString("password"));
+ LDAPMessage message = new LDAPMessage(1, bindRequest);
+ w.writeElement(message.encode());
+
+ message = LDAPMessage.decode(r.readElement().decodeAsSequence());
+ BindResponseProtocolOp bindResponse = message.getBindResponseProtocolOp();
+ assertEquals(bindResponse.getResultCode(), 0);
+ ArrayList<RawAttribute> addAttrs = new ArrayList<RawAttribute>();
+ addAttrs.add(RawAttribute.create("objectClass", "inetOrgPerson"));
+ addAttrs.add(RawAttribute.create("uid", "user.7"));
+ addAttrs.add(RawAttribute.create("cn", "user 7"));
+ addAttrs.add(RawAttribute.create("sn", "sn#1"));
+ addAttrs.add(RawAttribute.create("sn;x-foo", "sn#2"));
+ addAttrs.add(RawAttribute.create("sn;lang-fr", "sn#3"));
+ addAttrs.add(RawAttribute.create("userCertificate;binary", CERT));
+
+ AddRequestProtocolOp addRequest =
+ new AddRequestProtocolOp(new ASN1OctetString("uid=user.7,o=test"),
+ addAttrs);
+ message = new LDAPMessage(2, addRequest);
+ w.writeElement(message.encode());
+
+ message = LDAPMessage.decode(r.readElement().decodeAsSequence());
+ AddResponseProtocolOp addResponse = message.getAddResponseProtocolOp();
+ assertEquals(addResponse.getResultCode(),0);
+
+ //Create a SEARCH request to search for this added entry.
+ LinkedHashSet<String> attrs = new LinkedHashSet<String>();
+ //Request only the interesting attributes.
+ attrs.add("sn");
+ attrs.add("userCertificate;binary");
+ SearchRequestProtocolOp searchRequest =
+ new SearchRequestProtocolOp(new ASN1OctetString("o=test"),
+ SearchScope.WHOLE_SUBTREE,
+ DereferencePolicy.NEVER_DEREF_ALIASES, 0,
+ 0, false,
+ LDAPFilter.decode("(uid=user.7)"),
+ attrs);
+ message = new LDAPMessage(2, searchRequest);
+ w.writeElement(message.encode());
+ //message = LDAPMessage.decode(r.readElement().decodeAsSequence());
+
+ SearchResultEntryProtocolOp searchResultEntry = null;
+ SearchResultDoneProtocolOp searchResultDone = null;
+ ASN1Element element = null;
+ while (searchResultDone == null && (element = r.readElement()) != null)
+ {
+ message = LDAPMessage.decode(element.decodeAsSequence());
+ switch (message.getProtocolOpType())
+ {
+ case LDAPConstants.OP_TYPE_SEARCH_RESULT_ENTRY:
+ searchResultEntry = message.getSearchResultEntryProtocolOp();
+ break;
+ case LDAPConstants.OP_TYPE_SEARCH_RESULT_DONE:
+ searchResultDone = message.getSearchResultDoneProtocolOp();
+ assertEquals(searchResultDone.getResultCode(),
+ LDAPResultCode.SUCCESS);
+ break;
+ }
+ }
+ assertNotNull(searchResultEntry);
+ boolean certWithNoOption = false;
+ boolean snWithMultiVal = false;
+ for(LDAPAttribute a:searchResultEntry.getAttributes())
+ {
+ //Shouldn't be userCertificate;binary.
+ if(a.getAttributeType().equalsIgnoreCase("userCertificate"))
+ certWithNoOption=true;
+ else if(a.getAttributeType().equalsIgnoreCase("sn"))
+ {
+ List<ASN1OctetString> lVal = a.getValues();
+ for(ASN1OctetString v:lVal)
+ {
+ String val = v.stringValue();
+ if(val.equals("sn#1") || val.equals("sn#2")
+ || val.equals("sn#3"))
+ {
+ snWithMultiVal = true;
+ }
+ else //All the values should match.
+ snWithMultiVal = false;
+ }
+
+ }
+ }
+ assertTrue(snWithMultiVal && certWithNoOption);
+ }
+ finally
+ {
+ try
+ {
+ r.close();
+ } catch (Exception e) {}
+ try
+ {
+ w.close();
+ } catch (Exception e) {}
+ try
+ {
+ s.close();
+ } catch (Exception e) {}
+ }
+
+ }
+
+
+
+ /**
+ * Test to verify that the DB stores the binary option by
+ * exporting the LDIF and searching for the binary keyword.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ @Test(dependsOnMethods = {"org.opends.server.protocols.ldap."+
+ "LDAPBinaryOptionTestCase.binaryAttributeAddV3"})
+ public void exportAndValidateBinaryAttribute() throws Exception
+ {
+ //Ensure that the entry exists.
+ String args[] = new String []
+ {
+ "-h", "127.0.0.1",
+ "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-b", "o=test",
+ "(uid=user.1)"
+ };
+ assertEquals(LDAPSearch.mainSearch(args, false, null, System.err), 0);
+ exportBackend();
+ assertTrue(ldif.exists());
+ assertTrue(containsBinary());
+ }
+
+
+
+ /**
+ * Test to verify that the server adds the binary option by
+ * importing an LDIF both with or without the binary option.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ @Test(dependsOnMethods = {"org.opends.server.protocols.ldap."+
+ "LDAPBinaryOptionTestCase.exportAndValidateBinaryAttribute"})
+ public void ImportAndValidateBinaryAttribute() throws Exception
+ {
+ //This testcase uses the exported ldif in exportAndValidBinaryAttribute
+ //testcase. It imports the ldif after cleaning up the database and verifies
+ //that the binary option is present in the binary attributes. After that, it
+ //modifies the binary option from the ldif and re-imports it.A re-export of
+ //the last import should have the binary option even though it wasn't
+ //there in the imported ldif.
+ assert(ldif.exists());
+ importLDIF();
+ assertTrue(containsBinary());
+ //Remove the binary option and re-import it.
+ FileReader reader = new FileReader(ldif);
+ BufferedReader buf = new BufferedReader(reader);
+ StringBuilder builder = new StringBuilder();
+ String userCert = "userCertificate;binary";
+ String line = null;
+ while((line=buf.readLine())!=null)
+ {
+ if(line.startsWith(userCert))
+ {
+
+ builder.append("userCertificate:");
+ builder.append(line.substring(userCert.length()+1, line.length()));
+ }
+ else
+ builder.append(line);
+ builder.append("\n");
+ }
+ buf.close();
+ ldif.delete();
+ ldif = new File(TestCaseUtils.createTempFile(builder.toString()));
+ importLDIF();
+ //Re-export it.
+ exportBackend();
+ assertTrue(containsBinary());
+ ldif.delete();
+ }
+
+
+
+ /**
+ * Test to verify a MODIFY using the ;binary transfer option using V3
+ * protocol.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ @Test()
+ public void binaryModifyV3() throws Exception
+ {
+ String filePath = TestCaseUtils.createTempFile(
+ "dn: uid=user.4,o=test",
+ "objectClass: inetOrgPerson",
+ "uid: user.4",
+ "sn: 4",
+ "cn: user 4"
+ );
+ String[] args = new String []
+ {
+ "-h", "127.0.0.1",
+ "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D","cn=directory manager",
+ "-w","password",
+ "-a",
+ "-f", filePath,
+ };
+ int err = LDAPModify.mainModify(args, false, null,null);
+ assertEquals(err,0);
+
+ filePath = TestCaseUtils.createTempFile(
+ "dn: uid=user.4,o=test",
+ "changetype: modify",
+ "add: usercertificate;binary",
+ "userCertificate;binary" + CERT);
+ args = new String[]
+ {
+ "-h", "127.0.0.1",
+ "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D","cn=directory manager",
+ "-w","password",
+ "-f", filePath,
+ };
+ err = LDAPModify.mainModify(args, false, null,null);
+ assertEquals(err,0);
+
+ }
+
+
+
+ /**
+ * Utility method to verify if the LDIF file contains binary option.
+ * @return {@code true} if binary option is found in the LDIF
+ * , or {@code false} if not.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ private boolean containsBinary() throws Exception
+ {
+ FileReader reader = new FileReader(ldif);
+ BufferedReader buf = new BufferedReader(reader);
+ String line = null;
+ boolean found=false;
+ while((line=buf.readLine())!=null)
+ {
+ if(line.startsWith("userCertificate;binary"))
+ found = true;
+ }
+ buf.close();
+ return found;
+ }
+
+
+
+ /**
+ * Utility method to export the database into an LDIF file.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ private void exportBackend() throws Exception
+ {
+ //Initialize necessary instance variables.
+ if(ldif==null)
+ ldif = File.createTempFile("LDAPBinaryOptionTestCase", ".ldif");
+ exportConfig = new LDIFExportConfig(ldif.getAbsolutePath(),
+ ExistingFileBehavior.OVERWRITE);
+ backend = DirectoryServer.getBackend("test");
+ backend.exportLDIF(exportConfig);
+ }
+
+
+
+ /**
+ * Utility method to import the LDIF into the database.
+ * @throws Exception If an unexpected problem occurs.
+ */
+ private void importLDIF() throws Exception
+ {
+ importConfig = new LDIFImportConfig(ldif.getAbsolutePath());
+ TestCaseUtils.initializeTestBackend(false);
+ backend = DirectoryServer.getBackend("test");
+ backend.importLDIF(importConfig);
+ }
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
index 24941f3..3981edf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
@@ -82,7 +82,7 @@
public void testRejectBindRequest()
throws Exception
{
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(true,
"dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config",
"changetype: modify",
"replace: ds-cfg-allow-ldap-v2",
@@ -108,7 +108,7 @@
}
finally
{
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(true,
"dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config",
"changetype: modify",
"replace: ds-cfg-allow-ldap-v2",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java
index 42192eb..4fccf12 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java
@@ -27,6 +27,8 @@
package org.opends.server.protocols.ldap ;
import static org.opends.server.config.ConfigConstants.ATTR_LISTEN_PORT;
+
+import org.opends.server.types.Attributes;
import org.opends.server.types.Entry;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.admin.server.AdminTestCaseUtils;
@@ -165,7 +167,7 @@
serverLdapSocket.bind(new InetSocketAddress(localHost, 0));
long serverLdapPort = serverLdapSocket.getLocalPort();
serverLdapSocket.close();
- Attribute a=new Attribute(ATTR_LISTEN_PORT, String.valueOf(serverLdapPort));
+ Attribute a=Attributes.create(ATTR_LISTEN_PORT, String.valueOf(serverLdapPort));
handlerEntry.addAttribute(a,null);
LDAPConnectionHandlerCfg config =
getConfiguration(handlerEntry);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
index 9b57737..3c22a0d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
@@ -27,26 +27,25 @@
package org.opends.server.protocols.ldap;
+import static org.opends.server.config.ConfigConstants.*;
+import static org.testng.Assert.*;
+
+import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.List;
-import java.util.Collection;
-import static org.opends.server.config.ConfigConstants.*;
-
+import org.opends.messages.Message;
+import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
import org.opends.server.api.ClientConnection;
-import org.opends.server.TestCaseUtils;
-import org.opends.messages.Message;
-import org.opends.server.types.*;
-import org.opends.server.config.ConfigAttribute;
-import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.DN;
import org.opends.server.types.Entry;
-import static org.testng.Assert.*;
-
+import org.opends.server.types.SSLClientAuthPolicy;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -119,15 +118,15 @@
Collection<ClientConnection> cons=LDAPConnHandler.getClientConnections();
LDAPConnHandler.processServerShutdown(reasonMsg);
//Reset some things for the SSL handler
- Attribute useSSL=new Attribute(ATTR_USE_SSL, String.valueOf(false));
- Attribute startTls=new Attribute(ATTR_ALLOW_STARTTLS, String.valueOf(false));
+ Attribute useSSL=Attributes.create(ATTR_USE_SSL, String.valueOf(false));
+ Attribute startTls=Attributes.create(ATTR_ALLOW_STARTTLS, String.valueOf(false));
AttributeType attrType=DirectoryServer.getAttributeType(ATTR_LISTEN_PORT, true);
- Attribute a=new Attribute(attrType);
+ Attribute a=Attributes.empty(attrType);
LDAPHandlerEntry.removeAttribute(a, null);
LDAPHandlerEntry.removeAttribute(useSSL, null);
LDAPHandlerEntry.removeAttribute(startTls, null);
- Attribute useSSL1=new Attribute(ATTR_USE_SSL, String.valueOf(true));
- Attribute startTls1=new Attribute(ATTR_ALLOW_STARTTLS, String.valueOf(false));
+ Attribute useSSL1=Attributes.create(ATTR_USE_SSL, String.valueOf(true));
+ Attribute startTls1=Attributes.create(ATTR_ALLOW_STARTTLS, String.valueOf(false));
LDAPHandlerEntry.addAttribute(useSSL1,null);
LDAPHandlerEntry.addAttribute(startTls1,null);
LDAPConnectionHandler LDAPSConnHandler = getLDAPHandlerInstance(LDAPHandlerEntry);
@@ -171,22 +170,22 @@
"ds-cfg-trust-manager-provider: cn=JKS,cn=Trust Manager Providers,cn=config");
// Add some invalid attrs and some duplicate attrs
- Attribute a2=new Attribute(ATTR_LISTEN_PORT, String.valueOf(389));
- Attribute a2a=new Attribute(ATTR_LISTEN_PORT, String.valueOf(70000));
- Attribute a3=new Attribute(ATTR_LISTEN_ADDRESS, "localhost");
- Attribute a3a=new Attribute(ATTR_LISTEN_ADDRESS, "FAFASFSDFSADFASDFSDFSDAFAS");
- Attribute a4=new Attribute(ATTR_ACCEPT_BACKLOG, String.valueOf(Long.MAX_VALUE));
- Attribute a5=new Attribute(ATTR_ALLOWED_CLIENT, "129.800.990.45");
- Attribute a6=new Attribute(ATTR_DENIED_CLIENT, "129.");
- Attribute a7=new Attribute(ATTR_ALLOW_LDAPV2, "45");
- Attribute a8=new Attribute(ATTR_KEEP_LDAP_STATS, "45");
- Attribute a9=new Attribute(ATTR_SEND_REJECTION_NOTICE, "45");
- Attribute a10=new Attribute(ATTR_USE_TCP_KEEPALIVE, "45");
- Attribute a11=new Attribute(ATTR_USE_TCP_NODELAY, "45");
- Attribute a12=new Attribute(ATTR_ALLOW_REUSE_ADDRESS, "45");
- Attribute a13=new Attribute(ATTR_MAX_REQUEST_SIZE, "45 FLUBBERBYTES");
- Attribute a14=new Attribute(ATTR_USE_SSL, "45");
- Attribute a15=new Attribute(ATTR_ALLOW_STARTTLS, "45");
+ Attribute a2=Attributes.create(ATTR_LISTEN_PORT, String.valueOf(389));
+ Attribute a2a=Attributes.create(ATTR_LISTEN_PORT, String.valueOf(70000));
+ Attribute a3=Attributes.create(ATTR_LISTEN_ADDRESS, "localhost");
+ Attribute a3a=Attributes.create(ATTR_LISTEN_ADDRESS, "FAFASFSDFSADFASDFSDFSDAFAS");
+ Attribute a4=Attributes.create(ATTR_ACCEPT_BACKLOG, String.valueOf(Long.MAX_VALUE));
+ Attribute a5=Attributes.create(ATTR_ALLOWED_CLIENT, "129.800.990.45");
+ Attribute a6=Attributes.create(ATTR_DENIED_CLIENT, "129.");
+ Attribute a7=Attributes.create(ATTR_ALLOW_LDAPV2, "45");
+ Attribute a8=Attributes.create(ATTR_KEEP_LDAP_STATS, "45");
+ Attribute a9=Attributes.create(ATTR_SEND_REJECTION_NOTICE, "45");
+ Attribute a10=Attributes.create(ATTR_USE_TCP_KEEPALIVE, "45");
+ Attribute a11=Attributes.create(ATTR_USE_TCP_NODELAY, "45");
+ Attribute a12=Attributes.create(ATTR_ALLOW_REUSE_ADDRESS, "45");
+ Attribute a13=Attributes.create(ATTR_MAX_REQUEST_SIZE, "45 FLUBBERBYTES");
+ Attribute a14=Attributes.create(ATTR_USE_SSL, "45");
+ Attribute a15=Attributes.create(ATTR_ALLOW_STARTTLS, "45");
BadHandlerEntry.addAttribute(a2, null);
BadHandlerEntry.addAttribute(a3, null);
BadHandlerEntry.addAttribute(a2a, null);
@@ -257,26 +256,26 @@
AttributeType at11=DirectoryServer.getAttributeType(ATTR_MAX_REQUEST_SIZE,true);
AttributeType at12=DirectoryServer.getAttributeType(ATTR_ACCEPT_BACKLOG,true);
//Remove them
- Attribute rAttr0=new Attribute(at0);
+ Attribute rAttr0=Attributes.empty(at0);
GoodHandlerEntry.removeAttribute(rAttr0, null);
- Attribute rAttr2=new Attribute(at2);
+ Attribute rAttr2=Attributes.empty(at2);
GoodHandlerEntry.removeAttribute(rAttr2, null);
- Attribute rAttr3=new Attribute(at3);
+ Attribute rAttr3=Attributes.empty(at3);
GoodHandlerEntry.removeAttribute(rAttr3, null);
- Attribute rAttr4=new Attribute(at4);
+ Attribute rAttr4=Attributes.empty(at4);
GoodHandlerEntry.removeAttribute(rAttr4, null);
- Attribute rAttr5=new Attribute(at5);
+ Attribute rAttr5=Attributes.empty(at5);
GoodHandlerEntry.removeAttribute(rAttr5, null);
- Attribute rAttr6=new Attribute(at6);
+ Attribute rAttr6=Attributes.empty(at6);
GoodHandlerEntry.removeAttribute(rAttr6, null);
- Attribute rAttr7=new Attribute(at7);
+ Attribute rAttr7=Attributes.empty(at7);
GoodHandlerEntry.removeAttribute(rAttr7, null);
- Attribute rAttr8=new Attribute(at8);
- Attribute rAttr9=new Attribute(at9);
- Attribute rAttr10=new Attribute(at10);
- Attribute rAttr11=new Attribute(at11);
- Attribute rAttr12=new Attribute(at12);
+ Attribute rAttr8=Attributes.empty(at8);
+ Attribute rAttr9=Attributes.empty(at9);
+ Attribute rAttr10=Attributes.empty(at10);
+ Attribute rAttr11=Attributes.empty(at11);
+ Attribute rAttr12=Attributes.empty(at12);
GoodHandlerEntry.removeAttribute(rAttr8, null);
GoodHandlerEntry.removeAttribute(rAttr9, null);
GoodHandlerEntry.removeAttribute(rAttr10, null);
@@ -284,21 +283,21 @@
GoodHandlerEntry.removeAttribute(rAttr12, null);
//Make new AttrTypes with different values
long newPort=getFreePort();
- Attribute a2=new Attribute(ATTR_LISTEN_PORT, String.valueOf(newPort));
+ Attribute a2=Attributes.create(ATTR_LISTEN_PORT, String.valueOf(newPort));
//uncomment if want to test listen address
// Attribute a3=new Attribute(ATTR_LISTEN_ADDRESS, "localhost");
- Attribute a4=new Attribute(ATTR_ACCEPT_BACKLOG, String.valueOf(25));
- Attribute a5=new Attribute(ATTR_ALLOWED_CLIENT, "129.56.56.45");
- Attribute a6=new Attribute(ATTR_DENIED_CLIENT, "129.*.*.90");
- Attribute a7=new Attribute(ATTR_ALLOW_LDAPV2, "true");
- Attribute a8=new Attribute(ATTR_KEEP_LDAP_STATS, "true");
- Attribute a9=new Attribute(ATTR_SEND_REJECTION_NOTICE, "false");
- Attribute a10=new Attribute(ATTR_USE_TCP_KEEPALIVE, "false");
- Attribute a11=new Attribute(ATTR_USE_TCP_NODELAY, "false");
- Attribute a12=new Attribute(ATTR_ALLOW_REUSE_ADDRESS, "false");
- Attribute a13=new Attribute(ATTR_MAX_REQUEST_SIZE, "45 kb");
- Attribute a14=new Attribute(ATTR_USE_SSL, "false");
- Attribute a15=new Attribute(ATTR_ALLOW_STARTTLS, "true");
+ Attribute a4=Attributes.create(ATTR_ACCEPT_BACKLOG, String.valueOf(25));
+ Attribute a5=Attributes.create(ATTR_ALLOWED_CLIENT, "129.56.56.45");
+ Attribute a6=Attributes.create(ATTR_DENIED_CLIENT, "129.*.*.90");
+ Attribute a7=Attributes.create(ATTR_ALLOW_LDAPV2, "true");
+ Attribute a8=Attributes.create(ATTR_KEEP_LDAP_STATS, "true");
+ Attribute a9=Attributes.create(ATTR_SEND_REJECTION_NOTICE, "false");
+ Attribute a10=Attributes.create(ATTR_USE_TCP_KEEPALIVE, "false");
+ Attribute a11=Attributes.create(ATTR_USE_TCP_NODELAY, "false");
+ Attribute a12=Attributes.create(ATTR_ALLOW_REUSE_ADDRESS, "false");
+ Attribute a13=Attributes.create(ATTR_MAX_REQUEST_SIZE, "45 kb");
+ Attribute a14=Attributes.create(ATTR_USE_SSL, "false");
+ Attribute a15=Attributes.create(ATTR_ALLOW_STARTTLS, "true");
//Add them
GoodHandlerEntry.addAttribute(a2, null);
// GoodHandlerEntry.addAttribute(a3, null);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java
new file mode 100644
index 0000000..b0bd7b4
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java
@@ -0,0 +1,194 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication;
+
+import java.io.BufferedReader;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.net.ServerSocket;
+import org.opends.server.TestCaseUtils;
+import org.opends.server.core.AddOperationBasis;
+import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.replication.ReplicationTestCase;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.opends.server.tools.LDAPModify;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.ResultCode;
+import static org.opends.server.util.ServerConstants.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.opends.server.TestCaseUtils.*;
+
+public class ChangeNumberControlPluginTestCase
+ extends ReplicationTestCase {
+
+ /**
+ * The port of the replicationServer.
+ */
+ private int replServerPort;
+
+ /**
+ * The replicationServer that will be used in this test.
+ */
+ private static final int WINDOW_SIZE = 10;
+ private static final int REPLICATION_QUEUE_SIZE = 100;
+ private DN baseDn;
+
+ /**
+ * Before starting the tests, start the server and configure a
+ * replicationServer.
+ */
+
+ @BeforeClass(alwaysRun=true)
+ public void setUp() throws Exception {
+ super.setUp();
+
+ baseDn = DN.decode(TEST_ROOT_DN_STRING);
+
+ // find a free port for the replicationServer
+ ServerSocket socket = TestCaseUtils.bindFreePort();
+ replServerPort = socket.getLocalPort();
+ socket.close();
+
+ // replication server
+ String replServerLdif =
+ "dn: cn=Replication Server, " + SYNCHRO_PLUGIN_DN + "\n"
+ + "objectClass: top\n"
+ + "objectClass: ds-cfg-replication-server\n"
+ + "cn: Replication Server\n"
+ + "ds-cfg-replication-port: " + replServerPort + "\n"
+ + "ds-cfg-replication-db-directory: ChangeNumberControlDbTest\n"
+ + "ds-cfg-replication-server-id: 103\n";
+ replServerEntry = TestCaseUtils.entryFromLdifString(replServerLdif);
+
+ // suffix synchronized
+ String testName = "changeNumberControlPluginTestCase";
+ String synchroServerLdif =
+ "dn: cn=" + testName + ", cn=domains, " + SYNCHRO_PLUGIN_DN + "\n"
+ + "objectClass: top\n"
+ + "objectClass: ds-cfg-replication-domain\n"
+ + "cn: " + testName + "\n"
+ + "ds-cfg-base-dn: " + baseDn + "\n"
+ + "ds-cfg-replication-server: localhost:" + replServerPort + "\n"
+ + "ds-cfg-server-id: 1\n"
+ + "ds-cfg-receive-status: true\n";
+ synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
+
+ configureReplication();
+ }
+
+ @DataProvider(name = "operations")
+ public Object[][] createLdapRequests() {
+ return new Object[][] {
+ new Object[] {
+ "dn: cn=user1," + baseDn + "\n"
+ + "changetype: add" + "\n"
+ + "objectClass: person" + "\n"
+ + "cn: user1" + "\n"
+ + "sn: User Test 10"},
+ new Object[] {
+ "dn: cn=user1," + baseDn + "\n"
+ + "changetype: modify" + "\n"
+ + "add: description" + "\n"
+ + "description: blah"},
+ new Object[] {
+ "dn: cn=user1," + baseDn + "\n"
+ + "changetype: moddn" + "\n"
+ + "newrdn: cn=user111" + "\n"
+ + "deleteoldrdn: 1"},
+ new Object[] {
+ "dn: cn=user111," + baseDn + "\n"
+ + "changetype: delete"}
+ };
+ }
+
+ @Test(dataProvider="operations")
+ public void ChangeNumberControlTest(String request) throws Exception {
+
+ String path = TestCaseUtils.createTempFile(request);
+
+ String[] args =
+ {
+ "-h", "127.0.0.1",
+ "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-D", "cn=Directory Manager",
+ "-w", "password",
+ "-J", OID_CSN_CONTROL + ":false",
+ "--noPropertiesFile",
+ "-f", path
+ };
+
+ String resultPath = TestCaseUtils.createTempFile();
+
+ FileOutputStream fos = new FileOutputStream(resultPath);
+
+ assertEquals(LDAPModify.mainModify(args, false, fos, System.err), 0);
+ //fos.flush();
+ fos.close();
+
+ assertTrue(isCsnLinePresent(resultPath));
+ }
+
+ private boolean isCsnLinePresent(String file) throws Exception {
+ FileReader fr = new FileReader(file);
+ BufferedReader br = new BufferedReader(fr);
+ String line = null;
+ boolean found = false;
+ while ((line = br.readLine()) != null) {
+ if (line.contains("operation change number is")) {
+ found = true;
+ }
+ }
+ return (found);
+ }
+
+ /**
+ * Utility function. Can be used to create and add and entry
+ * in the local DS from its ldif description.
+ *
+ * @param entryString The entry in ldif from.
+ * @return The ResultCode of the operation.
+ * @throws Exception If something went wrong.
+ */
+ private ResultCode addEntry(String entryString) throws Exception
+ {
+ Entry entry;
+ AddOperationBasis addOp;
+ entry = TestCaseUtils.entryFromLdifString(entryString);
+ addOp = new AddOperationBasis(InternalClientConnection.getRootConnection(),
+ InternalClientConnection.nextOperationID(), InternalClientConnection
+ .nextMessageID(), null, entry.getDN(), entry.getObjectClasses(),
+ entry.getUserAttributes(), entry.getOperationalAttributes());
+ addOp.setInternalOperation(true);
+ addOp.run();
+
+ return addOp.getResultCode();
+ }
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
index d89e273..06c1deb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
@@ -28,19 +28,16 @@
import static org.testng.Assert.*;
-import java.io.File;
import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
import java.net.ServerSocket;
import java.util.LinkedList;
import java.util.SortedSet;
import java.util.TreeSet;
-import java.util.UUID;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.SynchronizationProvider;
+import org.opends.server.backends.MemoryBackend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.ChangeNumberGenerator;
import org.opends.server.replication.plugin.DomainFakeCfg;
@@ -53,12 +50,13 @@
import org.opends.server.replication.protocol.ModifyMsg;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
import org.opends.server.replication.server.ReplicationServer;
-import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.testng.annotations.*;
+import static org.opends.server.TestCaseUtils.*;
/**
* Test that the dependencies are computed correctly when replaying
@@ -67,18 +65,16 @@
*/
public class DependencyTest extends ReplicationTestCase
{
- private static final String BASEDN_STRING = "dc=example,dc=com";
-
/**
* Check that a sequence of dependents adds and mods is correctly ordered:
* Using a deep dit :
- * dc=example,dc=com
+ * TEST_ROOT_DN_STRING
* |
* dc=dependency1
* |
* dc=dependency2
* |
- * dc=dependency2
+ * dc=dependency3
* |
*
* |
@@ -95,11 +91,11 @@
{
ReplicationServer replServer = null;
ReplicationDomain domain = null;
- DN baseDn = DN.decode(BASEDN_STRING);
+ DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
SynchronizationProvider replicationPlugin = null;
short brokerId = 2;
short serverId = 1;
- short replServerId = 1;
+ short replServerId = 81;
int AddSequenceLength = 30;
@@ -118,9 +114,9 @@
*/
String entryldif =
- "dn:" + BASEDN_STRING + "\n"
+ "dn:" + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n"
- + "objectClass: domain\n"
+ + "objectClass: organization\n"
+ "entryuuid: " + stringUID(1) + "\n";
Entry entry = TestCaseUtils.entryFromLdifString(entryldif);
AttributeType uidType =
@@ -134,26 +130,26 @@
replicationPlugin = new MultimasterReplication();
DirectoryServer.registerSynchronizationProvider(replicationPlugin);
ReplServerFakeConfiguration conf =
- new ReplServerFakeConfiguration(replServerPort, "addModDeldependency",
+ new ReplServerFakeConfiguration(replServerPort, "dependencyTestAddModDelDependencyTestDb",
0, replServerId, 0,
AddSequenceLength*5+100, null);
replServer = new ReplicationServer(conf);
ReplicationBroker broker =
openReplicationSession(baseDn, brokerId, 1000, replServerPort, 1000,
- false);
+ false, CLEAN_DB_GENERATION_ID);
Thread.sleep(2000);
// send a sequence of add operation
- String addDn = BASEDN_STRING;
+ String addDn = TEST_ROOT_DN_STRING;
ChangeNumberGenerator gen = new ChangeNumberGenerator(brokerId, 0L);
int sequence;
for (sequence = 1; sequence<=AddSequenceLength; sequence ++)
{
entry.removeAttribute(uidType);
- entry.addAttribute(new Attribute("entryuuid", stringUID(sequence+1)),
+ entry.addAttribute(Attributes.create("entryuuid", stringUID(sequence+1)),
new LinkedList<AttributeValue>());
addDn = "dc=dependency" + sequence + "," + addDn;
AddMsg addMsg =
@@ -170,7 +166,7 @@
broker.publish(modifyMsg);
}
- // configure and start replication of dc=example,dc=com on the server
+ // configure and start replication of TEST_ROOT_DN_STRING on the server
SortedSet<String> replServers = new TreeSet<String>();
replServers.add("localhost:"+replServerPort);
DomainFakeCfg domainConf =
@@ -187,7 +183,7 @@
// Check that all the modify have been replayed
// (all the entries should have a description).
- addDn = BASEDN_STRING;
+ addDn = TEST_ROOT_DN_STRING;
for (sequence = 1; sequence<=AddSequenceLength; sequence ++)
{
addDn = "dc=dependency" + sequence + "," + addDn;
@@ -231,7 +227,7 @@
// check that entry just below the base entry was deleted.
// (we can't delete the base entry because some other tests might
// have added other children)
- DN node1 = DN.decode("dc=dependency1," + BASEDN_STRING);
+ DN node1 = DN.decode("dc=dependency1," + TEST_ROOT_DN_STRING);
Entry baseEntry = getEntry(node1, 30000, false);
assertNull(baseEntry,
"The last entry of the DEL sequence was not deleted.");
@@ -239,7 +235,7 @@
finally
{
if (replServer != null)
- replServer.shutdown();
+ replServer.remove();
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
@@ -260,11 +256,11 @@
{
ReplicationServer replServer = null;
ReplicationDomain domain = null;
- DN baseDn = DN.decode(BASEDN_STRING);
+ DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
SynchronizationProvider replicationPlugin = null;
short brokerId = 2;
short serverId = 1;
- short replServerId = 1;
+ short replServerId = 82;
cleanDB();
@@ -273,10 +269,10 @@
//
// Create replication server, replication domain and broker.
//
-
- String entryldif = "dn:" + BASEDN_STRING + "\n"
+
+ String entryldif = "dn:" + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n"
- + "objectClass: domain\n";
+ + "objectClass: organization\n";
Entry entry = TestCaseUtils.entryFromLdifString(entryldif);
AttributeType uidType =
DirectoryServer.getSchema().getAttributeType("entryuuid");
@@ -291,12 +287,12 @@
replicationPlugin = new MultimasterReplication();
DirectoryServer.registerSynchronizationProvider(replicationPlugin);
ReplServerFakeConfiguration conf =
- new ReplServerFakeConfiguration(replServerPort, "addModDeldependency",
+ new ReplServerFakeConfiguration(replServerPort, "dependencyTestModdnDelDependencyTestDb",
0, replServerId, 0,
200, null);
replServer = new ReplicationServer(conf);
- // configure and start replication of dc=example,dc=com on the server
+ // configure and start replication of TEST_ROOT_DN_STRING on the server
SortedSet<String> replServers = new TreeSet<String>();
replServers.add("localhost:"+replServerPort);
DomainFakeCfg domainConf =
@@ -309,14 +305,14 @@
ReplicationBroker broker =
openReplicationSession(baseDn, brokerId, 1000, replServerPort, 1000,
- false);
-
+ false, CLEAN_DB_GENERATION_ID);
+
// add an entry to play with.
entry.removeAttribute(uidType);
- entry.addAttribute(new Attribute("entryuuid",
+ entry.addAttribute(Attributes.create("entryuuid",
stringUID(renamedEntryUuid)),
new LinkedList<AttributeValue>());
- String addDn = "dc=moddndel" + "," + BASEDN_STRING;
+ String addDn = "dc=moddndel" + "," + TEST_ROOT_DN_STRING;
AddMsg addMsg =
new AddMsg(gen.newChangeNumber(), addDn, stringUID(renamedEntryUuid),
stringUID(1),
@@ -324,20 +320,20 @@
entry.getAttributes(), null );
broker.publish(addMsg);
-
+
// check that the entry was correctly added
boolean found =
checkEntryHasAttribute(DN.decode(addDn), "entryuuid",
stringUID(renamedEntryUuid),
30000, true);
-
+
assertTrue(found, "The initial entry add failed");
-
-
+
+
// disable the domain to make sure that the messages are
// all sent in a row.
domain.disable();
-
+
// rename and delete the entry.
ModifyDNMsg moddnMsg =
new ModifyDNMsg(addDn, gen.newChangeNumber(),
@@ -345,26 +341,26 @@
stringUID(1), true, null, "dc=new_name");
broker.publish(moddnMsg);
DeleteMsg delMsg =
- new DeleteMsg("dc=new_name" + "," + BASEDN_STRING,
+ new DeleteMsg("dc=new_name" + "," + TEST_ROOT_DN_STRING,
gen.newChangeNumber(), stringUID(renamedEntryUuid));
broker.publish(delMsg);
-
+
// enable back the domain to trigger message replay.
domain.enable();
-
+
// check that entry does not exist anymore.
Thread.sleep(10000);
- found = checkEntryHasAttribute(DN.decode("dc=new_name" + "," + BASEDN_STRING),
+ found = checkEntryHasAttribute(DN.decode("dc=new_name" + "," + TEST_ROOT_DN_STRING),
"entryuuid",
stringUID(renamedEntryUuid),
30000, false);
-
+
assertFalse(found, "The delete dependencies was not correctly enforced");
}
finally
{
if (replServer != null)
- replServer.shutdown();
+ replServer.remove();
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
@@ -372,10 +368,11 @@
if (replicationPlugin != null)
DirectoryServer.deregisterSynchronizationProvider(replicationPlugin);
}
-
+
}
-
-
+
+
+ private final long CLEAN_DB_GENERATION_ID = 7933L;
/**
* Clean the database and replace with a single entry.
*
@@ -385,32 +382,22 @@
*/
private void cleanDB() throws FileNotFoundException, IOException, Exception
{
+ // Clear backend
+ TestCaseUtils.initializeTestBackend(false);
+
+ // Create top entry with uuid
String baseentryldif =
- "dn:" + BASEDN_STRING + "\n"
+ "dn:" + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n"
- + "objectClass: domain\n"
- + "dc: example\n"
+ + "objectClass: organization\n"
+ + "o: test\n"
+ "entryuuid: " + stringUID(1) + "\n";
+ Entry topEntry = TestCaseUtils.entryFromLdifString(baseentryldif);
+ MemoryBackend memoryBackend =
+ (MemoryBackend) DirectoryServer.getBackend(TEST_BACKEND_ID);
+ memoryBackend.addEntry(topEntry, null);
- // Initialization :
- // Load the database with a single entry :
- String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
- String path = buildRoot + File.separator + "build" + File.separator
- + "unit-tests" + File.separator + "package-instance" + File.separator
- + "addModDelDependencyTest";
- OutputStream out = new FileOutputStream(new File(path));
- out.write(baseentryldif.getBytes());
-
- task("dn: ds-task-id=" + UUID.randomUUID()
- + ",cn=Scheduled Tasks,cn=Tasks\n"
- + "objectclass: top\n"
- + "objectclass: ds-task\n"
- + "objectclass: ds-task-import\n"
- + "ds-task-class-name: org.opends.server.tasks.ImportTask\n"
- + "ds-task-import-backend-id: userRoot\n"
- + "ds-task-import-ldif-file: " + path + "\n"
- + "ds-task-import-reject-file: " + path + "reject\n");
}
@@ -422,25 +409,25 @@
* To increase the risks of failures a loop of add/del/add is done.
*/
@SuppressWarnings("unchecked")
- @Test(enabled=false, groups="slow")
+ @Test(enabled=true, groups="slow")
public void addDelAddDependencyTest() throws Exception
{
ReplicationServer replServer = null;
ReplicationDomain domain = null;
- DN baseDn = DN.decode(BASEDN_STRING);
+ DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
SynchronizationProvider replicationPlugin = null;
short brokerId = 2;
short serverId = 1;
- short replServerId = 1;
+ short replServerId = 83;
int AddSequenceLength = 30;
cleanDB();
try
{
- String entryldif = "dn:" + BASEDN_STRING + "\n"
+ String entryldif = "dn:" + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n"
- + "objectClass: domain\n";
+ + "objectClass: organization\n";
Entry entry = TestCaseUtils.entryFromLdifString(entryldif);
AttributeType uidType =
DirectoryServer.getSchema().getAttributeType("entryuuid");
@@ -453,14 +440,14 @@
replicationPlugin = new MultimasterReplication();
DirectoryServer.registerSynchronizationProvider(replicationPlugin);
ReplServerFakeConfiguration conf =
- new ReplServerFakeConfiguration(replServerPort, "addDelAdddependency", 0,
+ new ReplServerFakeConfiguration(replServerPort, "dependencyTestAddDelAddDependencyTestDb", 0,
replServerId,
0, 5*AddSequenceLength+100, null);
replServer = new ReplicationServer(conf);
ReplicationBroker broker =
openReplicationSession(baseDn, brokerId, 100, replServerPort, 1000,
- false);
+ false, CLEAN_DB_GENERATION_ID);
// send a sequence of add/del/add operations
ChangeNumberGenerator gen = new ChangeNumberGenerator(brokerId, 0L);
@@ -470,9 +457,9 @@
{
// add the entry a first time
entry.removeAttribute(uidType);
- entry.addAttribute(new Attribute("entryuuid", stringUID(sequence+1)),
+ entry.addAttribute(Attributes.create("entryuuid", stringUID(sequence+1)),
new LinkedList<AttributeValue>());
- String addDn = "dc=dependency" + sequence + "," + BASEDN_STRING;
+ String addDn = "dc=dependency" + sequence + "," + TEST_ROOT_DN_STRING;
AddMsg addMsg =
new AddMsg(gen.newChangeNumber(), addDn, stringUID(sequence+1),
stringUID(1),
@@ -487,7 +474,7 @@
// add again the entry with a new entryuuid.
entry.removeAttribute(uidType);
- entry.addAttribute(new Attribute("entryuuid", stringUID(sequence+1025)),
+ entry.addAttribute(Attributes.create("entryuuid", stringUID(sequence+1025)),
new LinkedList<AttributeValue>());
addMsg =
new AddMsg(gen.newChangeNumber(), addDn, stringUID(sequence+1025),
@@ -497,7 +484,7 @@
broker.publish(addMsg);
}
- // configure and start replication of dc=example,dc=com on the server
+ // configure and start replication of TEST_ROOT_DN_STRING on the server
SortedSet<String> replServers = new TreeSet<String>();
replServers.add("localhost:"+replServerPort);
DomainFakeCfg domainConf =
@@ -510,7 +497,7 @@
// again by checking that they do have the correct entryuuid
for (sequence = 1; sequence<=AddSequenceLength; sequence ++)
{
- String addDn = "dc=dependency" + sequence + "," + BASEDN_STRING;
+ String addDn = "dc=dependency" + sequence + "," + TEST_ROOT_DN_STRING;
boolean found =
checkEntryHasAttribute(DN.decode(addDn), "entryuuid",
@@ -524,7 +511,7 @@
for (sequence = 1; sequence<=AddSequenceLength; sequence ++)
{
- String deleteDN = "dc=dependency" + sequence + "," + BASEDN_STRING;
+ String deleteDN = "dc=dependency" + sequence + "," + TEST_ROOT_DN_STRING;
DeleteMsg delMsg = new DeleteMsg(deleteDN,
gen.newChangeNumber(),
stringUID(sequence + 1025));
@@ -532,7 +519,7 @@
}
// check that the database was cleaned successfully
- DN node1 = DN.decode("dc=dependency1," + BASEDN_STRING);
+ DN node1 = DN.decode("dc=dependency1," + TEST_ROOT_DN_STRING);
Entry baseEntry = getEntry(node1, 30000, false);
assertNull(baseEntry,
"The entry were not removed succesfully after test completion.");
@@ -540,7 +527,7 @@
finally
{
if (replServer != null)
- replServer.shutdown();
+ replServer.remove();
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
@@ -555,25 +542,26 @@
* issuing a set of Add operation followed by a modrdn of the added entry.
*/
@SuppressWarnings("unchecked")
- @Test(enabled=false, groups="slow")
+ @Test(enabled=true, groups="slow")
public void addModdnDependencyTest() throws Exception
{
ReplicationServer replServer = null;
ReplicationDomain domain = null;
- DN baseDn = DN.decode(BASEDN_STRING);
+ DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
SynchronizationProvider replicationPlugin = null;
short brokerId = 2;
short serverId = 1;
- short replServerId = 1;
+ short replServerId = 84;
int AddSequenceLength = 30;
cleanDB();
+
try
{
- String entryldif = "dn:" + BASEDN_STRING + "\n"
+ String entryldif = "dn:" + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n"
- + "objectClass: domain\n";
+ + "objectClass: organization\n";
Entry entry = TestCaseUtils.entryFromLdifString(entryldif);
AttributeType uidType =
DirectoryServer.getSchema().getAttributeType("entryuuid");
@@ -586,17 +574,17 @@
replicationPlugin = new MultimasterReplication();
DirectoryServer.registerSynchronizationProvider(replicationPlugin);
ReplServerFakeConfiguration conf =
- new ReplServerFakeConfiguration(replServerPort, "addModdndependency", 0,
+ new ReplServerFakeConfiguration(replServerPort, "dependencyTestAddModdnDependencyTestDb", 0,
replServerId,
0, 5*AddSequenceLength+100, null);
replServer = new ReplicationServer(conf);
ReplicationBroker broker =
openReplicationSession(baseDn, brokerId, 100, replServerPort, 1000,
- false);
+ false, CLEAN_DB_GENERATION_ID);
- String addDn = BASEDN_STRING;
+ String addDn = TEST_ROOT_DN_STRING;
ChangeNumberGenerator gen = new ChangeNumberGenerator(brokerId, 0L);
// send a sequence of add/modrdn operations
@@ -605,9 +593,9 @@
{
// add the entry
entry.removeAttribute(uidType);
- entry.addAttribute(new Attribute("entryuuid", stringUID(sequence+1)),
+ entry.addAttribute(Attributes.create("entryuuid", stringUID(sequence+1)),
new LinkedList<AttributeValue>());
- addDn = "dc=dependency" + sequence + "," + BASEDN_STRING;
+ addDn = "dc=dependency" + sequence + "," + TEST_ROOT_DN_STRING;
AddMsg addMsg =
new AddMsg(gen.newChangeNumber(), addDn, stringUID(sequence+1),
stringUID(1),
@@ -622,7 +610,7 @@
broker.publish(moddnMsg);
}
- // configure and start replication of dc=example,dc=com on the server
+ // configure and start replication of TEST_ROOT_DN_STRING on the server
SortedSet<String> replServers = new TreeSet<String>();
replServers.add("localhost:"+replServerPort);
DomainFakeCfg domainConf =
@@ -634,7 +622,7 @@
// check that all entries have been renamed
for (sequence = 1; sequence<=AddSequenceLength; sequence ++)
{
- addDn = "dc=new_dep" + sequence + "," + BASEDN_STRING;
+ addDn = "dc=new_dep" + sequence + "," + TEST_ROOT_DN_STRING;
Entry baseEntry = getEntry(DN.decode(addDn), 30000, true);
assertNotNull(baseEntry,
@@ -644,7 +632,7 @@
// delete the entries to clean the database.
for (sequence = 1; sequence<=AddSequenceLength; sequence ++)
{
- addDn = "dc=new_dep" + sequence + "," + BASEDN_STRING;
+ addDn = "dc=new_dep" + sequence + "," + TEST_ROOT_DN_STRING;
DeleteMsg delMsg = new DeleteMsg(addDn.toString(),
gen.newChangeNumber(),
stringUID(sequence + 1));
@@ -654,7 +642,7 @@
finally
{
if (replServer != null)
- replServer.shutdown();
+ replServer.remove();
if (domain != null)
MultimasterReplication.deleteDomain(baseDn);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index b40fcb5..db46c73 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -40,7 +40,6 @@
import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -50,36 +49,40 @@
import org.opends.messages.Message;
import org.opends.messages.Severity;
import org.opends.server.TestCaseUtils;
+import org.opends.server.backends.MemoryBackend;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.plugin.ReplicationBroker;
import org.opends.server.replication.plugin.ReplicationDomain;
import org.opends.server.replication.protocol.AddMsg;
-import org.opends.server.replication.protocol.DoneMessage;
-import org.opends.server.replication.protocol.EntryMessage;
-import org.opends.server.replication.protocol.ErrorMessage;
-import org.opends.server.replication.protocol.InitializeTargetMessage;
-import org.opends.server.replication.protocol.ReplicationMessage;
+import org.opends.server.replication.protocol.ChangeStatusMsg;
+import org.opends.server.replication.protocol.DoneMsg;
+import org.opends.server.replication.protocol.EntryMsg;
+import org.opends.server.replication.protocol.ErrorMsg;
+import org.opends.server.replication.protocol.InitializeTargetMsg;
+import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.replication.protocol.SocketSession;
+import org.opends.server.replication.protocol.TopologyMsg;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
import org.opends.server.replication.server.ReplicationBackend;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.tasks.LdifFileWriter;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
+import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchScope;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
/**
* Tests contained here:
@@ -87,7 +90,7 @@
* - testSingleRS : test generation ID setting with different servers and one
* Replication server.
*
- * - testMultiRS : tests generation ID propagatoion with more than one
+ * - testMultiRS : tests generation ID propagation with more than one
* Replication server.
*
*/
@@ -97,11 +100,10 @@
// The tracer object for the debug logger
private static final DebugTracer TRACER = getTracer();
- private static final String baseDnStr = "dc=example,dc=com";
- private static final String baseSnStr = "genidcom";
+ private static final String baseDnStr = TEST_ROOT_DN_STRING;
+ private static final String testName = "generationIdTest";
private static final int WINDOW_SIZE = 10;
- private static final int CHANGELOG_QUEUE_SIZE = 100;
private static final short server1ID = 1;
private static final short server2ID = 2;
private static final short server3ID = 3;
@@ -120,7 +122,7 @@
private Entry taskInitRemoteS2;
SocketSession ssSession = null;
boolean ssShutdownRequested = false;
- protected String[] updatedEntries;
+ private String[] updatedEntries;
private static int[] replServerPort = new int[20];
@@ -130,11 +132,6 @@
private File ldifFile;
/**
- * A temporary file to contain rejected entries.
- */
- private File rejectFile;
-
- /**
* A makeldif template used to create some test entries.
*/
private static String diff = "";
@@ -198,35 +195,15 @@
@BeforeClass
public void setUp() throws Exception
{
- //log("Starting generationIdTest setup: debugEnabled:" + debugEnabled());
-
- // This test suite depends on having the schema available.
- TestCaseUtils.startServer();
+ super.setUp();
baseDn = DN.decode(baseDnStr);
updatedEntries = newLDIFEntries();
- // Create an internal connection in order to provide operations
- // to DS to populate the db -
- connection = InternalClientConnection.getRootConnection();
-
- // Synchro provider
- String synchroStringDN = "cn=Synchronization Providers,cn=config";
-
- // Synchro multi-master
- synchroPluginStringDN = "cn=Multimaster Synchronization, "
- + synchroStringDN;
-
// Synchro suffix
synchroServerEntry = null;
- // Add config entries to the current DS server based on :
- // Add the replication plugin: synchroPluginEntry & synchroPluginStringDN
- // Add synchroServerEntry
- // Add replServerEntry
- configureReplication();
-
taskInitRemoteS2 = TestCaseUtils.makeEntry(
"dn: ds-task-id=" + UUID.randomUUID() +
",cn=Scheduled Tasks,cn=Tasks",
@@ -236,19 +213,6 @@
"ds-task-class-name: org.opends.server.tasks.InitializeTargetTask",
"ds-task-initialize-domain-dn: " + baseDn,
"ds-task-initialize-replica-server-id: " + server2ID);
-
- // Change log
- String changeLogStringDN = "cn=Changelog Server, " + synchroPluginStringDN;
- String changeLogLdif = "dn: " + changeLogStringDN + "\n"
- + "objectClass: top\n"
- + "objectClass: ds-cfg-synchronization-changelog-server-config\n"
- + "cn: Changelog Server\n" + "ds-cfg-changelog-port: 8990\n"
- + "ds-cfg-changelog-server-id: 1\n"
- + "ds-cfg-window-size: " + WINDOW_SIZE + "\n"
- + "ds-cfg-changelog-max-queue-size: " + CHANGELOG_QUEUE_SIZE;
- replServerEntry = TestCaseUtils.entryFromLdifString(changeLogLdif);
- replServerEntry = null;
-
}
// Tests that entries have been written in the db
@@ -261,8 +225,9 @@
{
int dns = entry.indexOf("dn: ");
- int dne = entry.indexOf("dc=com");
- String dn = entry.substring(dns+4,dne+6);
+ int dne = entry.indexOf(TestCaseUtils.TEST_ROOT_DN_STRING);
+ String dn = entry.substring(dns + 4,
+ dne + TestCaseUtils.TEST_ROOT_DN_STRING.length());
debugInfo("Search Entry: " + dn);
@@ -306,7 +271,7 @@
{
"dn: " + baseDn + "\n"
+ "objectClass: top\n"
- + "objectClass: domain\n"
+ + "objectClass: organization\n"
+ "entryUUID: 21111111-1111-1111-1111-111111111111\n"
+ "\n",
"dn: ou=People," + baseDn + "\n"
@@ -345,8 +310,8 @@
String[] updatedEntries)
{
// Expect the broker to receive the entries
- ReplicationMessage msg;
- short entriesReceived = 0;
+ ReplicationMsg msg;
+ short entriesReceived = -100;
while (true)
{
try
@@ -357,26 +322,26 @@
if (msg == null)
break;
- if (msg instanceof InitializeTargetMessage)
+ if (msg instanceof InitializeTargetMsg)
{
debugInfo("Broker " + serverID + " receives InitializeTargetMessage ");
entriesReceived = 0;
}
- else if (msg instanceof EntryMessage)
+ else if (msg instanceof EntryMsg)
{
- EntryMessage em = (EntryMessage)msg;
+ EntryMsg em = (EntryMsg)msg;
debugInfo("Broker " + serverID + " receives entry " + new String(em.getEntryBytes()));
entriesReceived++;
}
- else if (msg instanceof DoneMessage)
+ else if (msg instanceof DoneMsg)
{
- debugInfo("Broker " + serverID + " receives done ");
+ debugInfo("Broker " + serverID + " receives done ");
break;
}
- else if (msg instanceof ErrorMessage)
+ else if (msg instanceof ErrorMsg)
{
- ErrorMessage em = (ErrorMessage)msg;
- debugInfo("Broker " + serverID + " receives ERROR "
+ ErrorMsg em = (ErrorMsg)msg;
+ debugInfo("Broker " + serverID + " receives ERROR "
+ em.toString());
break;
}
@@ -404,40 +369,28 @@
/**
* Creates a new replicationServer.
* @param changelogId The serverID of the replicationServer to create.
- * @param all Specifies whether to coonect the created replication
+ * @param all Specifies whether to connect the created replication
* server to the other replication servers in the test.
* @return The new created replication server.
*/
private ReplicationServer createReplicationServer(short changelogId,
- boolean all, String suffix)
+ boolean all, String testCase)
{
SortedSet<String> servers = null;
servers = new TreeSet<String>();
try
{
- if (changelogId==changelog1ID)
- {
- if (replServer1!=null)
- return replServer1;
- }
- else if (changelogId==changelog2ID)
- {
- if (replServer2!=null)
- return replServer2;
- }
- else if (changelogId==changelog3ID)
- {
- if (replServer3!=null)
- return replServer3;
- }
if (all)
{
- servers.add("localhost:" + getChangelogPort(changelog1ID));
- servers.add("localhost:" + getChangelogPort(changelog2ID));
- servers.add("localhost:" + getChangelogPort(changelog3ID));
+ if (changelogId != changelog1ID)
+ servers.add("localhost:" + getChangelogPort(changelog1ID));
+ if (changelogId != changelog2ID)
+ servers.add("localhost:" + getChangelogPort(changelog2ID));
+ if (changelogId != changelog3ID)
+ servers.add("localhost:" + getChangelogPort(changelog3ID));
}
int chPort = getChangelogPort(changelogId);
- String chDir = "genid"+changelogId+suffix+"Db";
+ String chDir = "generationIdTest"+changelogId+testCase+"Db";
ReplServerFakeConfiguration conf =
new ReplServerFakeConfiguration(chPort, chDir, 0, changelogId, 0, 100,
servers);
@@ -465,12 +418,11 @@
try
{
// suffix synchronized
- String synchroServerStringDN = synchroPluginStringDN;
String synchroServerLdif =
- "dn: cn=" + baseSnStr + ", cn=domains," + synchroServerStringDN + "\n"
+ "dn: cn=" + testName + ", cn=domains," + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-domain\n"
- + "cn: " + baseSnStr + "\n"
+ + "cn: " + testName + "\n"
+ "ds-cfg-base-dn: " + baseDnStr + "\n"
+ "ds-cfg-replication-server: localhost:"
+ getChangelogPort(changelogID)+"\n"
@@ -478,17 +430,19 @@
+ "ds-cfg-receive-status: true\n"
+ "ds-cfg-window-size: " + WINDOW_SIZE;
- if (synchroServerEntry == null)
- {
- synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
- DirectoryServer.getConfigHandler().addEntry(synchroServerEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()),
+ // Must be no connection already done or disconnectFromReplServer should
+ // have been called
+ assertTrue(synchroServerEntry == null);
+
+ synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
+ DirectoryServer.getConfigHandler().addEntry(synchroServerEntry, null);
+ assertNotNull(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()),
"Unable to add the synchronized server");
- configEntryList.add(synchroServerEntry.getDN());
+ configEntryList.add(synchroServerEntry.getDN());
- replDomain = ReplicationDomain.retrievesReplicationDomain(baseDn);
+ replDomain = ReplicationDomain.retrievesReplicationDomain(baseDn);
- }
+
if (replDomain != null)
{
debugInfo("ReplicationDomain: Import/Export is running ? " + replDomain.ieRunning());
@@ -509,18 +463,20 @@
try
{
// suffix synchronized
- String synchroServerStringDN = "cn=" + baseSnStr + ", cn=domains," +
- synchroPluginStringDN;
- if (synchroServerEntry != null)
- {
- DN synchroServerDN = DN.decode(synchroServerStringDN);
- DirectoryServer.getConfigHandler().deleteEntry(synchroServerDN,null);
- assertTrue(DirectoryServer.getConfigEntry(synchroServerEntry.getDN())==null,
- "Unable to delete the synchronized domain");
- synchroServerEntry = null;
+ String synchroServerStringDN = "cn=" + testName + ", cn=domains," +
+ SYNCHRO_PLUGIN_DN;
+ // Must have called connectServer1ToChangelog previously
+ assertTrue(synchroServerEntry != null);
- configEntryList.remove(configEntryList.indexOf(synchroServerDN));
- }
+ DN synchroServerDN = DN.decode(synchroServerStringDN);
+ DirectoryServer.getConfigHandler().deleteEntry(synchroServerDN, null);
+ assertTrue(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()) ==
+ null,
+ "Unable to delete the synchronized domain");
+ synchroServerEntry = null;
+
+ configEntryList.remove(configEntryList.indexOf(synchroServerDN));
+
}
catch(Exception e)
{
@@ -572,10 +528,9 @@
if (attrs != null)
{
Attribute attr = attrs.get(0);
- LinkedHashSet<AttributeValue> values = attr.getValues();
- if (values.size() == 1)
+ if (attr.size() == 1)
{
- genId = Long.decode(values.iterator().next().getStringValue());
+ genId = Long.decode(attr.iterator().next().getStringValue());
}
}
@@ -588,10 +543,8 @@
return genId;
}
- private Entry getTaskImport()
+ private void performLdifImport()
{
- Entry task = null;
-
try
{
// Create a temporary test LDIF file.
@@ -599,27 +552,25 @@
String resourcePath = DirectoryServer.getInstanceRoot() + File.separator +
"config" + File.separator + "MakeLDIF";
LdifFileWriter.makeLdif(ldifFile.getPath(), resourcePath, template);
- // Create a temporary rejects file.
- rejectFile = File.createTempFile("import-test-rejects", ".ldif");
- task = TestCaseUtils.makeEntry(
- "dn: ds-task-id=" + UUID.randomUUID() +
- ",cn=Scheduled Tasks,cn=Tasks",
- "objectclass: top",
- "objectclass: ds-task",
- "objectclass: ds-task-import",
- "ds-task-class-name: org.opends.server.tasks.ImportTask",
- "ds-task-import-backend-id: userRoot",
- "ds-task-import-ldif-file: " + ldifFile.getPath(),
- "ds-task-import-reject-file: " + rejectFile.getPath(),
- "ds-task-import-overwrite-rejects: TRUE",
- "ds-task-import-exclude-attribute: description"
- );
+ // Launch import of the Ldif file on the memory test backend
+ // Note: we do not use a task here as import task does not work on memory
+ // backend: it disables then re-enables backend which leads to backend
+ // object instance lost and this is not accepttable for a backend with
+ // non persistent data
+ LDIFImportConfig importConfig =
+ new LDIFImportConfig(ldifFile.getAbsolutePath());
+
+ MemoryBackend memoryBackend =
+ (MemoryBackend) DirectoryServer.getBackend(TEST_BACKEND_ID);
+ memoryBackend.importLDIF(importConfig);
+
}
catch(Exception e)
{
+ fail("Could not perform ldif import on memory test backend: "
+ + e.getMessage());
}
- return task;
}
private String createEntry(UUID uid)
@@ -642,7 +593,7 @@
+ "userPassword: password\n" + "initials: AA\n");
}
- static protected ReplicationMessage createAddMsg()
+ static protected ReplicationMsg createAddMsg()
{
Entry personWithUUIDEntry = null;
String user1entryUUID;
@@ -738,9 +689,9 @@
debugInfo("Starting "+ testCase + " debugEnabled:" + debugEnabled());
debugInfo(testCase + " Clearing DS1 backend");
- ReplicationDomain.clearJEBackend(false,
- "userRoot",
- baseDn.toNormalizedString());
+ // Special test were we want to test with an empty backend. So free it
+ // for this special test.
+ TestCaseUtils.initializeTestBackend(false);
try
{
@@ -748,7 +699,7 @@
long genId;
replServer1 = createReplicationServer(changelog1ID, false, testCase);
-
+
// To search the replication server db later in these tests, we need
// to attach the search backend to the replication server just created.
Thread.sleep(500);
@@ -762,14 +713,14 @@
debugInfo(testCase + " Configuring DS1 to replicate to RS1(" + changelog1ID + ") on an empty backend");
connectServer1ToChangelog(changelog1ID);
- debugInfo(testCase + " Expect genId to be not retrievable frm suffix root entry");
+ debugInfo(testCase + " Expect genId to be not retrievable from suffix root entry");
genId = readGenIdFromSuffixRootEntry();
assertEquals(genId,-1);
debugInfo(testCase + " Expect genId to be set in memory on the replication " +
" server side (not wrote on disk/db since no change occurred).");
rgenId = replServer1.getGenerationId(baseDn);
- assertEquals(rgenId, 3211313L);
+ assertEquals(rgenId, EMPTY_DN_GENID);
// Clean for next test
debugInfo(testCase + " Unconfiguring DS1 to replicate to RS1(" + changelog1ID + ")");
@@ -788,7 +739,7 @@
debugInfo(testCase + " Test that the generationId is written in the DB in the root entry on DS1");
genId = readGenIdFromSuffixRootEntry();
assertTrue(genId != -1);
- assertTrue(genId != 3211313L);
+ assertTrue(genId != EMPTY_DN_GENID);
debugInfo(testCase + " Test that the generationId is set on RS1");
rgenId = replServer1.getGenerationId(baseDn);
@@ -807,21 +758,6 @@
{
fail("DS2 with bad genID failed to connect to RS1.");
}
- try
- {
- ReplicationMessage msg = broker2.receive();
- if (!(msg instanceof ErrorMessage))
- {
- fail("Broker connection is expected to receive an ErrorMessage."
- + msg);
- }
- ErrorMessage emsg = (ErrorMessage)msg;
- debugInfo(testCase + " " + emsg.getMsgID() + " " + emsg.getDetails());
- }
- catch(SocketTimeoutException se)
- {
- fail("Broker is expected to receive an ErrorMessage.");
- }
//===========================================================
debugInfo(testCase + " ** TEST ** DS3 connection to RS1 with good genID");
@@ -835,6 +771,22 @@
fail("Broker connection is expected to be accepted.");
}
+ // Broker 2 should receive an update topo message to signal broker 3
+ // arrival in topology
+ try
+ {
+ ReplicationMsg msg = broker2.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 2 connection is expected to receive a TopologyMsg."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS2 is expected to receive a TopologyMsg.");
+ }
+
//===========================================================
debugInfo(testCase + " ** TEST ** DS2 (bad genID) changes must be ignored.");
@@ -863,7 +815,7 @@
// Verify that DS3 receives this change
try
{
- ReplicationMessage msg = broker3.receive();
+ ReplicationMsg msg = broker3.receive();
debugInfo("Broker 3 received expected update msg" + msg);
}
catch(SocketTimeoutException e)
@@ -873,7 +825,7 @@
//===========================================================
debugInfo(testCase + " ** TEST ** Persistence of the generation ID in RS1");
-
+
long genIdBeforeShut = replServer1.getGenerationId(baseDn);
debugInfo("Shutdown replServer1");
@@ -881,7 +833,7 @@
broker2 = null;
broker3.stop();
broker3 = null;
- replServer1.shutdown();
+ replServer1.remove();
replServer1 = null;
debugInfo("Create again replServer1");
@@ -903,7 +855,7 @@
" after replServer1 restart. Before : " + genIdBeforeShut +
" after : " + genIdAfterRestart);
- // By the way also verify that no change occured on the replication server db
+ // By the way also verify that no change occurred on the replication server db
// and still contain the ADD submitted initially.
Thread.sleep(500);
checkChangelogSize(1);
@@ -927,12 +879,92 @@
{
fail("Broker connection is expected to be accepted.");
}
+
+ // Broker 2 should receive an update topo message to signal broker 3
+ // arrival in topology
+ try
+ {
+ ReplicationMsg msg = broker2.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 2 connection is expected to receive a TopologyMsg."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS2 is expected to receive a TopologyMsg.");
+ }
+
debugInfo("Launch on-line import on DS1");
+ long oldGenId = genId;
genId=-1;
- Entry importTask = getTaskImport();
- addTask(importTask, ResultCode.SUCCESS, null);
- waitTaskState(importTask, TaskState.COMPLETED_SUCCESSFULLY, null);
- Thread.sleep(500);
+ disconnectFromReplServer(changelog1ID);
+ performLdifImport();
+ connectServer1ToChangelog(changelog1ID);
+
+ // Broker 2 and 3 should receive 2 update topo messages to signal broker 1
+ // has disconnected from topology then reconnected
+ try
+ {
+ ReplicationMsg msg = broker2.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 2 connection is expected to receive a first TopologyMsg" +
+ " for Broker 1 import + reconnect."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS2 is expected to receive a first TopologyMsg for DS1 import + " +
+ "reconnect.");
+ }
+ try
+ {
+ ReplicationMsg msg = broker3.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 3 connection is expected to receive a first TopologyMsg" +
+ " for Broker 1 import + reconnect."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS3 is expected to receive a first TopologyMsg for DS1 import + " +
+ "reconnect.");
+ }
+ try
+ {
+ ReplicationMsg msg = broker2.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 2 connection is expected to receive a second TopologyMsg" +
+ " for Broker 1 import + reconnect."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS2 is expected to receive a second TopologyMsg for DS1 import + " +
+ "reconnect.");
+ }
+ try
+ {
+ ReplicationMsg msg = broker3.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 3 connection is expected to receive a second TopologyMsg" +
+ " for Broker 1 import + reconnect."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS3 is expected to receive a second TopologyMsg for DS1 import + " +
+ "reconnect.");
+ }
debugInfo("Create Reset task on DS1 to propagate the new gen ID as the reference");
Entry taskReset = TestCaseUtils.makeEntry(
@@ -944,13 +976,121 @@
"ds-task-class-name: org.opends.server.tasks.SetGenerationIdTask",
"ds-task-reset-generation-id-domain-base-dn: " + baseDnStr);
addTask(taskReset, ResultCode.SUCCESS, null);
- waitTaskState(taskReset, TaskState.COMPLETED_SUCCESSFULLY, null);
- Thread.sleep(200);
+ waitTaskState(taskReset, TaskState.COMPLETED_SUCCESSFULLY, null);
+
+ // Broker 2 and 3 should receive 1 change status message to order them
+ // to enter the bad gen id status
+ try
+ {
+ ReplicationMsg msg = broker2.receive();
+ if (!(msg instanceof ChangeStatusMsg))
+ {
+ fail("Broker 2 connection is expected to receive 1 ChangeStatusMsg" +
+ " to enter the bad gen id status"
+ + msg);
+ }
+ ChangeStatusMsg csMsg = (ChangeStatusMsg)msg;
+ if (csMsg.getRequestedStatus() != ServerStatus.BAD_GEN_ID_STATUS)
+ {
+ fail("Broker 2 connection is expected to receive 1 ChangeStatusMsg" +
+ " to enter the bad gen id status"
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS2 is expected to receive 1 ChangeStatusMsg to enter the " +
+ "bad gen id status.");
+ }
+ try
+ {
+ ReplicationMsg msg = broker3.receive();
+ if (!(msg instanceof ChangeStatusMsg))
+ {
+ fail("Broker 3 connection is expected to receive 1 ChangeStatusMsg" +
+ " to enter the bad gen id status"
+ + msg);
+ }
+ ChangeStatusMsg csMsg = (ChangeStatusMsg)msg;
+ if (csMsg.getRequestedStatus() != ServerStatus.BAD_GEN_ID_STATUS)
+ {
+ fail("Broker 3 connection is expected to receive 1 ChangeStatusMsg" +
+ " to enter the bad gen id status"
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS3 is expected to receive 1 ChangeStatusMsg to enter the " +
+ "bad gen id status.");
+ }
+
+ // Broker 2 and 3 should receive 1 update topo message to signal other broker gen id
+ // has been resetted, and 2 topo messages to signal DS1 has been disconnected
+ // then reconnected
+ try
+ {
+ ReplicationMsg msg = broker2.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 2 connection is expected to receive 1 TopologyMsg" +
+ " for gen id reset of broker 3."
+ + msg);
+ }
+ msg = broker2.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 2 connection is expected to receive 1 TopologyMsg" +
+ " for DS1 disconnected."
+ + msg);
+ }
+ msg = broker2.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 2 connection is expected to receive 1 TopologyMsg" +
+ " for DS1 reconnected."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS2 is expected to receive 3 TopologyMsg for gen id reset.");
+ }
+ try
+ {
+ ReplicationMsg msg = broker3.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 3 connection is expected to receive 1 TopologyMsg" +
+ " for gen id reset of broker 2."
+ + msg);
+ }
+ msg = broker3.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 3 connection is expected to receive 1 TopologyMsg" +
+ " for DS1 disconnected."
+ + msg);
+ }
+ msg = broker3.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 3 connection is expected to receive 1 TopologyMsg" +
+ " for DS1 reconnected"
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS3 is expected to receive 3 TopologyMsg for gen id reset.");
+ }
debugInfo("DS1 root entry must contain the new gen ID");
genId = readGenIdFromSuffixRootEntry();
assertTrue(genId != -1, "DS is expected to have a new genID computed " +
" after on-line import but genId=" + genId);
+ assertTrue(genId != oldGenId, "The new genID after import and reset of genID "
+ + "is expected to be diffrent from previous one");
debugInfo("RS1 must have the new gen ID");
rgenId = replServer1.getGenerationId(baseDn);
@@ -961,7 +1101,7 @@
assertTrue(!replServer1.getReplicationServerDomain(baseDn, false).
isDegradedDueToGenerationId(server1ID),
- "Expecting that DS1 status in RS1 is : not degraded.");
+ "Expecting that DS1 status in RS1 is : not in bad gen id.");
//===============================================================
debugInfo(testCase + " ** TEST ** Previous test set a new gen ID on the "+
@@ -969,12 +1109,12 @@
assertTrue(replServer1.getReplicationServerDomain(baseDn, false).
isDegradedDueToGenerationId(server2ID),
- "Expecting that DS2 with old gen ID is degraded from RS1");
+ "Expecting that DS2 with old gen ID is in bad gen id from RS1");
assertTrue(replServer1.getReplicationServerDomain(baseDn, false).
isDegradedDueToGenerationId(server3ID),
- "Expecting that DS3 with old gen ID is degraded from RS1");
+ "Expecting that DS3 with old gen ID is in bad gen id from RS1");
- debugInfo("Add entries to DS1, update should not be sent to DS2 and DS3 that are degraded");
+ debugInfo("Add entries to DS1, update should not be sent to DS2 and DS3 that are in bad gen id");
String[] ent3 = { createEntry(UUID.randomUUID()) };
this.addTestEntriesToDB(ent3);
@@ -984,45 +1124,14 @@
try
{
- ReplicationMessage msg = broker2.receive();
- if (!(msg instanceof ErrorMessage))
- {
- fail("Broker 2 connection is expected to receive an ErrorMessage."
- + msg);
- }
- ErrorMessage emsg = (ErrorMessage)msg;
- debugInfo(testCase + " " + emsg.getMsgID() + " " + emsg.getDetails());
- }
- catch(SocketTimeoutException se)
- {
- fail("DS2 is expected to receive an ErrorMessage.");
- }
- try
- {
- ReplicationMessage msg = broker3.receive();
- if (!(msg instanceof ErrorMessage))
- {
- fail("DS3 connection is expected to receive an ErrorMessage."
- + msg);
- }
- ErrorMessage emsg = (ErrorMessage)msg;
- debugInfo(testCase + " " + emsg.getMsgID() + " " + emsg.getDetails());
- }
- catch(SocketTimeoutException se)
- {
- fail("DS3 is expected to receive an ErrorMessage.");
- }
-
- try
- {
- ReplicationMessage msg = broker2.receive();
- fail("No update message is supposed to be received by degraded broker2" + msg);
+ ReplicationMsg msg = broker2.receive();
+ fail("No update message is supposed to be received by broker2 in bad gen id. " + msg);
} catch(SocketTimeoutException e) { /* expected */ }
try
{
- ReplicationMessage msg = broker3.receive();
- fail("No update message is supposed to be received by degraded broker3"+ msg);
+ ReplicationMsg msg = broker3.receive();
+ fail("No update message is supposed to be received by broker3 in bad gen id. " + msg);
} catch(SocketTimeoutException e) { /* expected */ }
@@ -1035,13 +1144,13 @@
try
{
- ReplicationMessage msg = broker3.receive();
- fail("No update message is supposed to be received by degraded broker3"+ msg);
+ ReplicationMsg msg = broker3.receive();
+ fail("No update message is supposed to be received by broker3 in bad gen id. "+ msg);
} catch(SocketTimeoutException e) { /* expected */ }
-
+
//===============================================================
- debugInfo(testCase + " ** TEST ** Previous test degraded DS2 and DS3, "+
+ debugInfo(testCase + " ** TEST ** Previous test put DS2 and DS3 in bad gen id, "+
" now simulates \"dsreplication initialize \"by doing a TU+reset " +
" from DS1 to DS2 and DS3, verify NON degradation of DS2 and DS3");
@@ -1053,17 +1162,46 @@
debugInfo("broker2 has been initialized from DS with #entries=" + receivedEntriesNb);
broker2.stop();
-
+
// Simulates the broker restart at the end of the import
broker2 = openReplicationSession(baseDn,
server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges, genId);
broker3.stop();
-
+
// Simulates the broker restart at the end of the import
broker3 = openReplicationSession(baseDn,
server3ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges, genId);
+ // Broker 2 should receive 2 update topo messages to signal broker 3
+ // stopped and restarted
+ try
+ {
+ ReplicationMsg msg = broker2.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 2 connection is expected to receive a first TopologyMsg."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS2 is expected to receive a first TopologyMsg.");
+ }
+ try
+ {
+ ReplicationMsg msg = broker2.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 2 connection is expected to receive a second TopologyMsg."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS2 is expected to receive a second TopologyMsg.");
+ }
+
debugInfo("Adding reset task to DS1");
taskReset = TestCaseUtils.makeEntry(
"dn: ds-task-id=resetgenid"+ UUID.randomUUID() +
@@ -1078,6 +1216,38 @@
waitTaskState(taskReset, TaskState.COMPLETED_SUCCESSFULLY, null);
Thread.sleep(200);
+ // Broker 2 and 3 should not receive a change status as they are connected with
+ // the right genid, but should anyway receive a topo message to update them with potential
+ // updates.
+ try
+ {
+ ReplicationMsg msg = broker2.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 2 connection is expected to receive 1 TopologyMsg" +
+ " for topo update on reset gen id."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS2 is expected to receive 1 TopologyMsg for topo update on reset gen id.");
+ }
+ try
+ {
+ ReplicationMsg msg = broker3.receive();
+ if (!(msg instanceof TopologyMsg))
+ {
+ fail("Broker 3 connection is expected to receive 1 TopologyMsg" +
+ " for topo update on reset gen id."
+ + msg);
+ }
+ }
+ catch(SocketTimeoutException se)
+ {
+ fail("DS3 is expected to receive 1 TopologyMsg for topo update on reset gen id.");
+ }
+
debugInfo("Verify that RS1 has still the right genID");
assertEquals(replServer1.getGenerationId(baseDn), rgenId);
@@ -1085,11 +1255,17 @@
Thread.sleep(500);
checkChangelogSize(1);
- debugInfo("Verifying that DS2 is not degraded any more");
+ debugInfo("Verifying that DS2 is not in bad gen id any more");
assertTrue(!replServer1.getReplicationServerDomain(baseDn, false).
isDegradedDueToGenerationId(server2ID),
- "Expecting that DS2 is not degraded from RS1");
+ "Expecting that DS2 is not in bad gen id from RS1");
+
+ debugInfo("Verifying that DS3 is not in bad gen id any more");
+
+ assertTrue(!replServer1.getReplicationServerDomain(baseDn, false).
+ isDegradedDueToGenerationId(server3ID),
+ "Expecting that DS3 is not in bad gen id from RS1");
debugInfo("DS2 is publishing a change and RS1 must store this change, DS3 must receive it.");
AddMsg emsg = (AddMsg)createAddMsg();
@@ -1100,15 +1276,15 @@
try
{
- ReplicationMessage msg = broker3.receive();
+ ReplicationMsg msg = broker3.receive();
- /* expected */
+ /* expected */
AddMsg rcvmsg = (AddMsg)msg;
assertEquals(rcvmsg.getChangeNumber(), emsg.getChangeNumber());
}
- catch(SocketTimeoutException e)
- {
- fail("The msg send by DS2 is expected to be received by DS3);");
+ catch(SocketTimeoutException e)
+ {
+ fail("The msg send by DS2 is expected to be received by DS3)");
}
//===============================================================
@@ -1117,25 +1293,15 @@
debugInfo("Disconnect DS from replServer1 (required in order to DEL entries).");
disconnectFromReplServer(changelog1ID);
- postTest();
-
- debugInfo(testCase + " Clearing DS backend");
- ReplicationDomain.clearJEBackend(false,
- replDomain.getBackend().getBackendID(),
- baseDn.toNormalizedString());
-
- // At this moment, root entry of the domain has been removed so
- // genId is no more in the database ... but it has still the old
- // value in memory.
- testEntriesInDb();
- replDomain.loadGenerationId();
-
debugInfo("Successfully ending " + testCase);
}
catch(Exception e)
{
fail(testCase + " Exception:"+ e.getMessage() + " " +
stackTraceToSingleLineString(e));
+ } finally
+ {
+ postTest();
}
}
@@ -1144,7 +1310,7 @@
* testMultiRS tests basic features of generationID
* with more than one Replication Server.
* The following test focus on:
- * - genId checking accross multiple starting RS (replication servers)
+ * - genId checking across multiple starting RS (replication servers)
* - genId setting propagation from one RS to the others
* - genId reset propagation from one RS to the others
*/
@@ -1156,118 +1322,131 @@
debugInfo("Starting " + testCase);
- ReplicationDomain.clearJEBackend(false,
- "userRoot",
- baseDn.toNormalizedString());
-
- debugInfo ("Creating 3 RS");
- replServer1 = createReplicationServer(changelog1ID, true, testCase);
- replServer2 = createReplicationServer(changelog2ID, true, testCase);
- replServer3 = createReplicationServer(changelog3ID, true, testCase);
- Thread.sleep(500);
-
- debugInfo("Connecting DS to replServer1");
- connectServer1ToChangelog(changelog1ID);
- Thread.sleep(1500);
-
- debugInfo("Expect genId are set in all replServers.");
- assertEquals(replServer1.getGenerationId(baseDn), 3211313L, " in replServer1");
- assertEquals(replServer2.getGenerationId(baseDn), 3211313L, " in replServer2");
- assertEquals(replServer3.getGenerationId(baseDn), 3211313L, " in replServer3");
-
- debugInfo("Disconnect DS from replServer1.");
- disconnectFromReplServer(changelog1ID);
- Thread.sleep(1000);
-
- debugInfo("Add entries to DS");
- this.addTestEntriesToDB(updatedEntries);
-
- debugInfo("Connecting DS to replServer2");
- connectServer1ToChangelog(changelog2ID);
- Thread.sleep(1000);
-
- debugInfo("Expect genIds to be set in all servers based on the added entries.");
- genId = readGenIdFromSuffixRootEntry();
- assertTrue(genId != -1);
- assertEquals(replServer1.getGenerationId(baseDn), genId);
- assertEquals(replServer2.getGenerationId(baseDn), genId);
- assertEquals(replServer3.getGenerationId(baseDn), genId);
-
- debugInfo("Connecting broker2 to replServer3 with a good genId");
try
{
- broker2 = openReplicationSession(baseDn,
+ // Special test were we want to test with an empty backend. So free it
+ // for this special test.
+ TestCaseUtils.initializeTestBackend(false);
+
+ debugInfo("Creating 3 RS");
+ replServer1 = createReplicationServer(changelog1ID, true, testCase);
+ replServer2 = createReplicationServer(changelog2ID, true, testCase);
+ replServer3 = createReplicationServer(changelog3ID, true, testCase);
+ Thread.sleep(500);
+
+ debugInfo("Connecting DS to replServer1");
+ connectServer1ToChangelog(changelog1ID);
+ Thread.sleep(1500);
+
+ debugInfo("Expect genId are set in all replServers.");
+ assertEquals(replServer1.getGenerationId(baseDn), EMPTY_DN_GENID,
+ " in replServer1");
+ assertEquals(replServer2.getGenerationId(baseDn), EMPTY_DN_GENID,
+ " in replServer2");
+ assertEquals(replServer3.getGenerationId(baseDn), EMPTY_DN_GENID,
+ " in replServer3");
+
+ debugInfo("Disconnect DS from replServer1.");
+ disconnectFromReplServer(changelog1ID);
+ Thread.sleep(3000);
+
+ debugInfo(
+ "Expect genIds to be resetted in all servers to -1 as no more DS in topo");
+ assertEquals(replServer1.getGenerationId(baseDn), -1);
+ assertEquals(replServer2.getGenerationId(baseDn), -1);
+ assertEquals(replServer3.getGenerationId(baseDn), -1);
+
+ debugInfo("Add entries to DS");
+ this.addTestEntriesToDB(updatedEntries);
+
+ debugInfo("Connecting DS to replServer2");
+ connectServer1ToChangelog(changelog2ID);
+ Thread.sleep(3000);
+
+ debugInfo(
+ "Expect genIds to be set in all servers based on the added entries.");
+ genId = readGenIdFromSuffixRootEntry();
+ assertTrue(genId != -1);
+ assertEquals(replServer1.getGenerationId(baseDn), genId);
+ assertEquals(replServer2.getGenerationId(baseDn), genId);
+ assertEquals(replServer3.getGenerationId(baseDn), genId);
+
+ debugInfo("Connecting broker2 to replServer3 with a good genId");
+ try
+ {
+ broker2 = openReplicationSession(baseDn,
server2ID, 100, getChangelogPort(changelog3ID),
1000, !emptyOldChanges, genId);
- Thread.sleep(1000);
- }
- catch(SocketException se)
- {
- fail("Broker connection is expected to be accepted.");
- }
+ Thread.sleep(1000);
+ } catch (SocketException se)
+ {
+ fail("Broker connection is expected to be accepted.");
+ }
- debugInfo("Expecting that broker2 is not degraded since it has a correct genId");
- assertTrue(!replServer1.getReplicationServerDomain(baseDn, false).
+ debugInfo(
+ "Expecting that broker2 is not in bad gen id since it has a correct genId");
+ assertTrue(!replServer1.getReplicationServerDomain(baseDn, false).
isDegradedDueToGenerationId(server2ID));
- debugInfo("Disconnecting DS from replServer1");
- disconnectFromReplServer(changelog1ID);
+ debugInfo("Disconnecting DS from replServer1");
+ disconnectFromReplServer(changelog1ID);
- debugInfo("Expect all genIds to keep their value since broker2 is still connected.");
- assertEquals(replServer1.getGenerationId(baseDn), genId);
- assertEquals(replServer2.getGenerationId(baseDn), genId);
- assertEquals(replServer3.getGenerationId(baseDn), genId);
+ debugInfo(
+ "Expect all genIds to keep their value since broker2 is still connected.");
+ assertEquals(replServer1.getGenerationId(baseDn), genId);
+ assertEquals(replServer2.getGenerationId(baseDn), genId);
+ assertEquals(replServer3.getGenerationId(baseDn), genId);
- debugInfo("Connecting broker2 to replServer1 with a bad genId");
- try
- {
- long badgenId=1;
- broker3 = openReplicationSession(baseDn,
+ debugInfo("Connecting broker2 to replServer1 with a bad genId");
+ try
+ {
+ long badgenId = 1;
+ broker3 = openReplicationSession(baseDn,
server3ID, 100, getChangelogPort(changelog1ID),
1000, !emptyOldChanges, badgenId);
- Thread.sleep(1000);
- }
- catch(SocketException se)
- {
- fail("Broker connection is expected to be accepted.");
- }
+ Thread.sleep(1000);
+ } catch (SocketException se)
+ {
+ fail("Broker connection is expected to be accepted.");
+ }
- debugInfo("Expecting that broker3 is degraded since it has a bad genId");
- assertTrue(replServer1.getReplicationServerDomain(baseDn, false).
+ debugInfo(
+ "Expecting that broker3 is in bad gen id since it has a bad genId");
+ assertTrue(replServer1.getReplicationServerDomain(baseDn, false).
isDegradedDueToGenerationId(server3ID));
- int found = testEntriesInDb();
- assertEquals(found, updatedEntries.length,
+ int found = testEntriesInDb();
+ assertEquals(found, updatedEntries.length,
" Entries present in DB :" + found +
" Expected entries :" + updatedEntries.length);
- debugInfo("Connecting DS to replServer1.");
- connectServer1ToChangelog(changelog1ID);
- Thread.sleep(1000);
+ debugInfo("Connecting DS to replServer1.");
+ connectServer1ToChangelog(changelog1ID);
+ Thread.sleep(1000);
- debugInfo("Adding reset task to DS.");
- Entry taskReset = TestCaseUtils.makeEntry(
- "dn: ds-task-id=resetgenid"+ UUID.randomUUID() +
+ debugInfo("Adding reset task to DS.");
+ Entry taskReset = TestCaseUtils.makeEntry(
+ "dn: ds-task-id=resetgenid" + UUID.randomUUID() +
",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-reset-generation-id",
"ds-task-class-name: org.opends.server.tasks.SetGenerationIdTask",
"ds-task-reset-generation-id-domain-base-dn: " + baseDnStr);
- addTask(taskReset, ResultCode.SUCCESS, null);
- waitTaskState(taskReset, TaskState.COMPLETED_SUCCESSFULLY, null);
- Thread.sleep(500);
+ addTask(taskReset, ResultCode.SUCCESS, null);
+ waitTaskState(taskReset, TaskState.COMPLETED_SUCCESSFULLY, null);
+ Thread.sleep(500);
- debugInfo("Verifying that all replservers genIds have been reset.");
- genId = readGenIdFromSuffixRootEntry();
- assertEquals(replServer1.getGenerationId(baseDn), genId);
- assertEquals(replServer2.getGenerationId(baseDn), genId);
- assertEquals(replServer3.getGenerationId(baseDn), genId);
+ debugInfo("Verifying that all replservers genIds have been reset.");
+ genId = readGenIdFromSuffixRootEntry();
+ assertEquals(replServer1.getGenerationId(baseDn), genId);
+ assertEquals(replServer2.getGenerationId(baseDn), genId);
+ assertEquals(replServer3.getGenerationId(baseDn), genId);
- debugInfo("Adding reset task to DS.");
- taskReset = TestCaseUtils.makeEntry(
- "dn: ds-task-id=resetgenid"+ UUID.randomUUID() +
+ debugInfo("Adding reset task to DS.");
+ taskReset = TestCaseUtils.makeEntry(
+ "dn: ds-task-id=resetgenid" + UUID.randomUUID() +
",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
@@ -1275,23 +1454,25 @@
"ds-task-class-name: org.opends.server.tasks.SetGenerationIdTask",
"ds-task-reset-generation-id-domain-base-dn: " + baseDnStr,
"ds-task-reset-generation-id-new-value: -1");
- addTask(taskReset, ResultCode.SUCCESS, null);
- waitTaskState(taskReset, TaskState.COMPLETED_SUCCESSFULLY, null);
- Thread.sleep(500);
+ addTask(taskReset, ResultCode.SUCCESS, null);
+ waitTaskState(taskReset, TaskState.COMPLETED_SUCCESSFULLY, null);
+ Thread.sleep(500);
- debugInfo("Verifying that all replservers genIds have been reset.");
- genId = readGenIdFromSuffixRootEntry();
- assertEquals(replServer1.getGenerationId(baseDn), -1);
- assertEquals(replServer2.getGenerationId(baseDn), -1);
- assertEquals(replServer3.getGenerationId(baseDn), -1);
+ debugInfo("Verifying that all replservers genIds have been reset.");
+ genId = readGenIdFromSuffixRootEntry();
+ assertEquals(replServer1.getGenerationId(baseDn), -1);
+ assertEquals(replServer2.getGenerationId(baseDn), -1);
+ assertEquals(replServer3.getGenerationId(baseDn), -1);
- debugInfo("Disconnect DS from replServer1 (required in order to DEL entries).");
- disconnectFromReplServer(changelog1ID);
+ debugInfo(
+ "Disconnect DS from replServer1 (required in order to DEL entries).");
+ disconnectFromReplServer(changelog1ID);
- debugInfo("Cleaning entries");
- postTest();
-
- debugInfo("Successfully ending " + testCase);
+ debugInfo("Successfully ending " + testCase);
+ } finally
+ {
+ postTest();
+ }
}
/**
@@ -1311,35 +1492,43 @@
broker3 = null;
if (replServer1 != null)
+ {
+ replServer1.clearDb();
replServer1.remove();
+ replServer1 = null;
+ }
if (replServer2 != null)
+ {
+ replServer2.clearDb();
replServer2.remove();
+ replServer2 = null;
+ }
if (replServer3 != null)
+ {
+ replServer3.clearDb();
replServer3.remove();
- replServer1 = null;
- replServer2 = null;
- replServer3 = null;
+ replServer3 = null;
+ }
super.cleanRealEntries();
+ // Clean replication server ports
+ for (int i = 0; i < replServerPort.length; i++)
+ {
+ replServerPort[i] = 0;
+ }
+
+ debugInfo("Clearing DS backend");
try
{
- ReplicationDomain.clearJEBackend(false,
- replDomain.getBackend().getBackendID(),
- baseDn.toNormalizedString());
-
- // At this moment, root entry of the domain has been removed so
- // genId is no more in the database ... but it has still the old
- // value in memory.
- testEntriesInDb();
- replDomain.loadGenerationId();
- }
- catch (Exception e) {}
+ TestCaseUtils.initializeTestBackend(false);
+ } catch (Exception ex)
+ {debugInfo("postTest(): error cleaning memory backend: " + ex);}
}
-
+
/**
* Test generationID saving when the root entry does not exist
- * at the moement when the replication is enabled.
+ * at the moment when the replication is enabled.
* @throws Exception
*/
@Test(enabled=false, groups="slow")
@@ -1349,9 +1538,9 @@
debugInfo("Starting "+ testCase + " debugEnabled:" + debugEnabled());
debugInfo(testCase + " Clearing DS1 backend");
- ReplicationDomain.clearJEBackend(false,
- "userRoot",
- baseDn.toNormalizedString());
+ // Special test were we want to test with an empty backend. So free it
+ // for this special test.
+ TestCaseUtils.initializeTestBackend(false);
try
{
@@ -1378,8 +1567,8 @@
debugInfo(testCase + " Expect genId attribute to be retrievable");
genId = readGenIdFromSuffixRootEntry();
- assertEquals(genId, 3211313L);
-
+ assertEquals(genId, EMPTY_DN_GENID);
+
disconnectFromReplServer(changelog1ID);
}
finally
@@ -1388,7 +1577,7 @@
debugInfo("Successfully ending " + testCase);
}
}
-
+
/**
* Loop opening sessions to the Replication Server
* to check that it handle correctly deconnection and reconnection.
@@ -1399,39 +1588,36 @@
String testCase = "testLoop";
debugInfo("Starting "+ testCase + " debugEnabled:" + debugEnabled());
long rgenId;
-
- ReplicationDomain.clearJEBackend(false,
- "userRoot",
- baseDn.toNormalizedString());
+
+ // Special test were we want to test with an empty backend. So free it
+ // for this special test.
+ TestCaseUtils.initializeTestBackend(false);
replServer1 = createReplicationServer(changelog1ID, false, testCase);
replServer1.clearDb();
ReplicationBroker broker = null;
- try
+ try
{
- for (int i=0; i< 100; i++)
+ for (int i=0; i< 5; i++)
{
long generationId = 1000+i;
broker = openReplicationSession(baseDn,
server2ID, 100, getChangelogPort(changelog1ID),
- 1000, !emptyOldChanges, generationId);
-
+ 1000, !emptyOldChanges, generationId);
debugInfo(testCase + " Expect genId to be set in memory on the replication " +
- " server side even if not wrote on disk/db since no change occurred.");
+ " server side even if not wrote on disk/db since no change occurred.");
rgenId = replServer1.getGenerationId(baseDn);
- if (rgenId != generationId)
- {
- fail("replication server failed to set generation ID");
- replServer1.getGenerationId(baseDn);
- }
+ assertEquals(rgenId, generationId);
broker.stop();
broker = null;
+ Thread.sleep(2000); // Let time to RS to clear info about previous connection
}
} finally
{
if (broker != null)
broker.stop();
+ postTest();
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 4e265bf..7713a48 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -62,13 +62,13 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.replication.plugin.ReplicationBroker;
import org.opends.server.replication.plugin.ReplicationDomain;
-import org.opends.server.replication.protocol.DoneMessage;
-import org.opends.server.replication.protocol.EntryMessage;
-import org.opends.server.replication.protocol.ErrorMessage;
-import org.opends.server.replication.protocol.InitializeRequestMessage;
-import org.opends.server.replication.protocol.InitializeTargetMessage;
-import org.opends.server.replication.protocol.ReplicationMessage;
-import org.opends.server.replication.protocol.RoutableMessage;
+import org.opends.server.replication.protocol.DoneMsg;
+import org.opends.server.replication.protocol.EntryMsg;
+import org.opends.server.replication.protocol.ErrorMsg;
+import org.opends.server.replication.protocol.InitializeRequestMsg;
+import org.opends.server.replication.protocol.InitializeTargetMsg;
+import org.opends.server.replication.protocol.ReplicationMsg;
+import org.opends.server.replication.protocol.RoutableMsg;
import org.opends.server.replication.protocol.SocketSession;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
import org.opends.server.replication.server.ReplicationServer;
@@ -80,6 +80,7 @@
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchScope;
import org.opends.server.util.Base64;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -132,8 +133,10 @@
private static final short changelog2ID = 9;
private static final short changelog3ID = 10;
+ private static final String EXAMPLE_DN = "dc=example,dc=com";
+
private static int[] replServerPort = new int[20];
-
+
private DN baseDn;
ReplicationBroker server2 = null;
ReplicationBroker server3 = null;
@@ -145,7 +148,7 @@
private void log(String s)
{
- logError(Message.raw(Category.SYNC, Severity.INFORMATION,
+ logError(Message.raw(Category.SYNC, Severity.INFORMATION,
"InitOnLineTests/" + s));
if (debugEnabled())
{
@@ -166,11 +169,19 @@
@BeforeClass
public void setUp() throws Exception
{
+ super.setUp();
+
log("Setup: debugEnabled:" + debugEnabled());
// This test suite depends on having the schema available.
- TestCaseUtils.startServer();
- baseDn = DN.decode("dc=example,dc=com");
+ baseDn = DN.decode(EXAMPLE_DN);
+
+ // This test uses import tasks which do not work with memory backend
+ // (like the test backend we use in every tests): backend is disabled then
+ // re-enabled and this clears the backend reference and thus the underlying
+ // data. So for this particular test, we use a classical backend. Let's
+ // clear it.
+ ReplicationDomain.clearJEBackend(false, "userRoot", EXAMPLE_DN);
updatedEntries = newLDIFEntries();
@@ -178,21 +189,8 @@
// to DS to populate the db -
connection = InternalClientConnection.getRootConnection();
- // Synchro provider
- String synchroStringDN = "cn=Synchronization Providers,cn=config";
-
- // Synchro multi-master
- synchroPluginStringDN = "cn=Multimaster Synchronization, "
- + synchroStringDN;
-
- // Synchro suffix
synchroServerEntry = null;
-
- // Add config entries to the current DS server based on :
- // Add the replication plugin: synchroPluginEntry & synchroPluginStringDN
- // Add synchroServerEntry
- // Add replServerEntry
- configureReplication();
+ replServerEntry = null;
taskInitFromS2 = TestCaseUtils.makeEntry(
"dn: ds-task-id=" + UUID.randomUUID() +
@@ -201,7 +199,7 @@
"objectclass: ds-task",
"objectclass: ds-task-initialize-from-remote-replica",
"ds-task-class-name: org.opends.server.tasks.InitializeTask",
- "ds-task-initialize-domain-dn: dc=example,dc=com",
+ "ds-task-initialize-domain-dn: " + EXAMPLE_DN,
"ds-task-initialize-replica-server-id: " + server2ID);
taskInitTargetS2 = TestCaseUtils.makeEntry(
@@ -211,7 +209,7 @@
"objectclass: ds-task",
"objectclass: ds-task-initialize-remote-replica",
"ds-task-class-name: org.opends.server.tasks.InitializeTargetTask",
- "ds-task-initialize-domain-dn: dc=example,dc=com",
+ "ds-task-initialize-domain-dn: " + EXAMPLE_DN,
"ds-task-initialize-replica-server-id: " + server2ID);
taskInitTargetAll = TestCaseUtils.makeEntry(
@@ -221,11 +219,8 @@
"objectclass: ds-task",
"objectclass: ds-task-initialize-remote-replica",
"ds-task-class-name: org.opends.server.tasks.InitializeTargetTask",
- "ds-task-initialize-domain-dn: dc=example,dc=com",
+ "ds-task-initialize-domain-dn: " + EXAMPLE_DN,
"ds-task-initialize-replica-server-id: all");
-
- replServerEntry = null;
-
}
// Tests that entries have been written in the db
@@ -238,8 +233,8 @@
{
int dns = entry.indexOf("dn: ");
- int dne = entry.indexOf("dc=com");
- String dn = entry.substring(dns+4,dne+6);
+ int dne = entry.indexOf(EXAMPLE_DN);
+ String dn = entry.substring(dns+4,dne+EXAMPLE_DN.length());
log("Search Entry: " + dn);
@@ -281,9 +276,9 @@
* Wait a task to be completed and check the expected state and expected
* stats.
* @param taskEntry The task to process.
- * @param expectedState The expected state fot this task.
+ * @param expectedState The expected state for this task.
* @param expectedLeft The expected number of entries still to be processed.
- * @param expectedDone The expected numner of entries to be processed.
+ * @param expectedDone The expected number of entries to be processed.
*/
private void waitTaskCompleted(Entry taskEntry, TaskState expectedState,
long expectedLeft, long expectedDone)
@@ -394,7 +389,7 @@
}
/**
- * Add to the current DB the entries necessary to the test
+ * Add to the current DB the entries necessary to the test.
*/
private void addTestEntriesToDB()
{
@@ -437,19 +432,19 @@
String[] entries =
{
- "dn: dc=example,dc=com\n"
+ "dn: " + EXAMPLE_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: domain\n"
+ "dc: example\n"
+ "entryUUID: 21111111-1111-1111-1111-111111111111\n"
+ "\n",
- "dn: ou=People,dc=example,dc=com\n"
+ "dn: ou=People," + EXAMPLE_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: organizationalUnit\n"
+ "ou: People\n"
+ "entryUUID: 21111111-1111-1111-1111-111111111112\n"
+ "\n",
- "dn: cn=Fiona Jensen,ou=people,dc=example,dc=com\n"
+ "dn: cn=Fiona Jensen,ou=people," + EXAMPLE_DN + "\n"
+ "objectclass: top\n"
+ "objectclass: person\n"
+ "objectclass: organizationalPerson\n"
@@ -461,7 +456,7 @@
new String(bigAttributeValue).getBytes())+"\n"
+ "entryUUID: 21111111-1111-1111-1111-111111111113\n"
+ "\n",
- "dn: cn=Robert Langman,ou=people,dc=example,dc=com\n"
+ "dn: cn=Robert Langman,ou=people," + EXAMPLE_DN + "\n"
+ "objectclass: top\n"
+ "objectclass: person\n"
+ "objectclass: organizationalPerson\n"
@@ -490,7 +485,7 @@
// Send entries
try
{
- RoutableMessage initTargetMessage = new InitializeTargetMessage(
+ RoutableMsg initTargetMessage = new InitializeTargetMsg(
baseDn, server2ID, destinationServerID, requestorID, updatedEntries.length);
broker.publish(initTargetMessage);
@@ -498,12 +493,12 @@
{
log("Broker will pusblish 1 entry: bytes:"+ entry.length());
- EntryMessage entryMsg = new EntryMessage(senderID, destinationServerID,
+ EntryMsg entryMsg = new EntryMsg(senderID, destinationServerID,
entry.getBytes());
broker.publish(entryMsg);
}
- DoneMessage doneMsg = new DoneMessage(senderID, destinationServerID);
+ DoneMsg doneMsg = new DoneMsg(senderID, destinationServerID);
broker.publish(doneMsg);
log("Broker " + senderID + " published entries");
@@ -520,7 +515,7 @@
String[] updatedEntries)
{
// Expect the broker to receive the entries
- ReplicationMessage msg;
+ ReplicationMsg msg;
short entriesReceived = 0;
while (true)
{
@@ -532,25 +527,25 @@
if (msg == null)
break;
- if (msg instanceof InitializeTargetMessage)
+ if (msg instanceof InitializeTargetMsg)
{
log("Broker " + serverID + " receives InitializeTargetMessage ");
entriesReceived = 0;
}
- else if (msg instanceof EntryMessage)
+ else if (msg instanceof EntryMsg)
{
- EntryMessage em = (EntryMessage)msg;
+ EntryMsg em = (EntryMsg)msg;
log("Broker " + serverID + " receives entry " + new String(em.getEntryBytes()));
entriesReceived++;
}
- else if (msg instanceof DoneMessage)
+ else if (msg instanceof DoneMsg)
{
log("Broker " + serverID + " receives done ");
break;
}
- else if (msg instanceof ErrorMessage)
+ else if (msg instanceof ErrorMsg)
{
- ErrorMessage em = (ErrorMessage)msg;
+ ErrorMsg em = (ErrorMsg)msg;
log("Broker " + serverID + " receives ERROR "
+ " " + em.getDetails());
break;
@@ -581,38 +576,26 @@
* @param changelogId The serverID of the replicationServer to create.
* @return The new replicationServer.
*/
- private ReplicationServer createChangelogServer(short changelogId)
+ private ReplicationServer createChangelogServer(short changelogId, String testCase)
{
SortedSet<String> servers = null;
servers = new TreeSet<String>();
try
{
- if (changelogId==changelog1ID)
- {
- if (changelog1!=null)
- return changelog1;
- }
- else if (changelogId==changelog2ID)
- {
- if (changelog2!=null)
- return changelog2;
- }
- else if (changelogId==changelog3ID)
- {
- if (changelog3!=null)
- return changelog3;
- }
- servers.add("localhost:" + getChangelogPort(changelog1ID));
- servers.add("localhost:" + getChangelogPort(changelog2ID));
- servers.add("localhost:" + getChangelogPort(changelog3ID));
+ if (changelogId != changelog1ID)
+ servers.add("localhost:" + getChangelogPort(changelog1ID));
+ if (changelogId != changelog2ID)
+ servers.add("localhost:" + getChangelogPort(changelog2ID));
+ if (changelogId != changelog3ID)
+ servers.add("localhost:" + getChangelogPort(changelog3ID));
ReplServerFakeConfiguration conf =
new ReplServerFakeConfiguration(
- getChangelogPort(changelogId),
- "rsdbdirname" + getChangelogPort(changelogId),
- 0,
- changelogId,
- 0,
+ getChangelogPort(changelogId),
+ "initOnlineTest" + getChangelogPort(changelogId) + testCase + "Db",
+ 0,
+ changelogId,
+ 0,
100,
servers);
ReplicationServer replicationServer = new ReplicationServer(conf);
@@ -638,14 +621,14 @@
try
{
// suffix synchronized
- String synchroServerStringDN = synchroPluginStringDN;
+ String testName = "initOnLineTest";
String synchroServerLdif =
- "dn: cn=example, cn=domains," + synchroServerStringDN + "\n"
+ "dn: cn=" + testName + ", cn=domains," + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
- + "objectClass: ds-cfg-synchronization-provider\n"
+ + "objectC7lass: ds-cfg-synchronization-provider\n"
+ "objectClass: ds-cfg-replication-domain\n"
- + "cn: example\n"
- + "ds-cfg-base-dn: dc=example,dc=com\n"
+ + "cn: " + testName + "\n"
+ + "ds-cfg-base-dn: " + EXAMPLE_DN + "\n"
+ "ds-cfg-replication-server: localhost:"
+ getChangelogPort(changelogID)+"\n"
+ "ds-cfg-server-id: " + server1ID + "\n"
@@ -653,27 +636,20 @@
// + "ds-cfg-heartbeat-interval: 0 ms\n"
+ "ds-cfg-window-size: " + WINDOW_SIZE;
- if (synchroServerEntry == null)
- {
- synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
- DirectoryServer.getConfigHandler().addEntry(synchroServerEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()),
+
+ // Clear the backend
+ ReplicationDomain.clearJEBackend(false, "userRoot", EXAMPLE_DN);
+
+ synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
+ DirectoryServer.getConfigHandler().addEntry(synchroServerEntry, null);
+ assertNotNull(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()),
"Unable to add the synchronized server");
- super.configEntryList.add(synchroServerEntry.getDN());
+ configEntryList.add(synchroServerEntry.getDN());
- replDomain = ReplicationDomain.retrievesReplicationDomain(baseDn);
+ replDomain = ReplicationDomain.retrievesReplicationDomain(baseDn);
- // Clear the backend
- ReplicationDomain.clearJEBackend(false,
- replDomain.getBackend().getBackendID(),
- baseDn.toNormalizedString());
-
- }
- if (replDomain != null)
- {
- assertTrue(!replDomain.ieRunning(),
- "ReplicationDomain: Import/Export is not expected to be running");
- }
+ assertTrue(!replDomain.ieRunning(),
+ "ReplicationDomain: Import/Export is not expected to be running");
}
catch(Exception e)
{
@@ -708,19 +684,19 @@
@Test(enabled=true, groups="slow")
public void initializeImport() throws Exception
{
- String testCase = "InitializeImport";
+ String testCase = "initializeImport";
log("Starting "+testCase);
try
{
- changelog1 = createChangelogServer(changelog1ID);
+ changelog1 = createChangelogServer(changelog1ID, testCase);
// Connect DS to the replicationServer
connectServer1ToChangelog(changelog1ID);
if (server2 == null)
- server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode(EXAMPLE_DN),
server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
Thread.sleep(2000);
@@ -729,13 +705,13 @@
addTask(taskInitFromS2, ResultCode.SUCCESS, null);
// S2 should receive init msg
- ReplicationMessage msg;
+ ReplicationMsg msg;
msg = server2.receive();
- if (!(msg instanceof InitializeRequestMessage))
+ if (!(msg instanceof InitializeRequestMsg))
{
fail(testCase + " Message received by S2 is of unexpected class" + msg);
}
- InitializeRequestMessage initMsg = (InitializeRequestMessage)msg;
+ InitializeRequestMsg initMsg = (InitializeRequestMsg)msg;
// S2 publishes entries to S1
makeBrokerPublishEntries(server2, server2ID, initMsg.getsenderID(),
@@ -748,13 +724,14 @@
// Test import result in S1
testEntriesInDb();
- afterTest();
-
log("Successfully ending " + testCase);
}
catch(Exception e)
{
fail(testCase + " Exception:"+ e.getMessage() + " " + stackTraceToSingleLineString(e));
+ } finally
+ {
+ afterTest();
}
}
@@ -764,32 +741,36 @@
@Test(enabled=true, groups="slow")
public void initializeExport() throws Exception
{
- String testCase = "Replication/InitializeExport";
+ String testCase = "initializeExport";
log("Starting "+testCase);
+
+ try
+ {
+ changelog1 = createChangelogServer(changelog1ID, testCase);
- changelog1 = createChangelogServer(changelog1ID);
+ // Connect DS to the replicationServer
+ connectServer1ToChangelog(changelog1ID);
- // Connect DS to the replicationServer
- connectServer1ToChangelog(changelog1ID);
+ addTestEntriesToDB();
- addTestEntriesToDB();
+ if (server2 == null)
+ server2 = openReplicationSession(DN.decode(EXAMPLE_DN),
+ server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
- if (server2 == null)
- server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
- server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
+ Thread.sleep(3000);
- Thread.sleep(3000);
-
- InitializeRequestMessage initMsg = new InitializeRequestMessage(baseDn,
+ InitializeRequestMsg initMsg = new InitializeRequestMsg(baseDn,
server2ID, server1ID);
- server2.publish(initMsg);
+ server2.publish(initMsg);
- receiveUpdatedEntries(server2, server2ID, updatedEntries);
+ receiveUpdatedEntries(server2, server2ID, updatedEntries);
- afterTest();
-
- log("Successfully ending "+testCase);
+ log("Successfully ending " + testCase);
+ } finally
+ {
+ afterTest();
+ }
}
/**
@@ -798,38 +779,42 @@
@Test(enabled=true, groups="slow")
public void initializeTargetExport() throws Exception
{
- String testCase = "Replication/InitializeTargetExport";
+ String testCase = "initializeTargetExport";
log("Starting " + testCase);
+
+ try
+ {
- changelog1 = createChangelogServer(changelog1ID);
+ changelog1 = createChangelogServer(changelog1ID, testCase);
- // Creates config to synchronize suffix
- connectServer1ToChangelog(changelog1ID);
+ // Creates config to synchronize suffix
+ connectServer1ToChangelog(changelog1ID);
- // Add in S1 the entries to be exported
- addTestEntriesToDB();
+ // Add in S1 the entries to be exported
+ addTestEntriesToDB();
- // S1 is the server we are running in, S2 is simulated by a broker
- if (server2 == null)
- server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
- server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
+ // S1 is the server we are running in, S2 is simulated by a broker
+ if (server2 == null)
+ server2 = openReplicationSession(DN.decode(EXAMPLE_DN),
+ server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
- Thread.sleep(1000);
+ Thread.sleep(1000);
- // Launch in S1 the task that will initialize S2
- addTask(taskInitTargetS2, ResultCode.SUCCESS, null);
+ // Launch in S1 the task that will initialize S2
+ addTask(taskInitTargetS2, ResultCode.SUCCESS, null);
- // Wait for task completion
- waitTaskState(taskInitTargetS2, TaskState.COMPLETED_SUCCESSFULLY, null);
+ // Wait for task completion
+ waitTaskState(taskInitTargetS2, TaskState.COMPLETED_SUCCESSFULLY, null);
- // Tests that entries have been received by S2
- receiveUpdatedEntries(server2, server2ID, updatedEntries);
+ // Tests that entries have been received by S2
+ receiveUpdatedEntries(server2, server2ID, updatedEntries);
- afterTest();
-
- log("Successfully ending " + testCase);
-
+ log("Successfully ending " + testCase);
+ } finally
+ {
+ afterTest();
+ }
}
/**
@@ -838,43 +823,46 @@
@Test(enabled=true, groups="slow")
public void initializeTargetExportAll() throws Exception
{
- String testCase = "Replication/InitializeTargetExportAll";
+ String testCase = "initializeTargetExportAll";
log("Starting " + testCase);
- changelog1 = createChangelogServer(changelog1ID);
+ try
+ {
+ changelog1 = createChangelogServer(changelog1ID, testCase);
- // Creates config to synchronize suffix
- connectServer1ToChangelog(changelog1ID);
+ // Creates config to synchronize suffix
+ connectServer1ToChangelog(changelog1ID);
- // Add in S1 the entries to be exported
- addTestEntriesToDB();
+ // Add in S1 the entries to be exported
+ addTestEntriesToDB();
- // S1 is the server we are running in, S2 and S3 are simulated by brokers
- if (server2==null)
- server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
- server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
+ // S1 is the server we are running in, S2 and S3 are simulated by brokers
+ if (server2 == null)
+ server2 = openReplicationSession(DN.decode(EXAMPLE_DN),
+ server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
- if (server3==null)
- server3 = openReplicationSession(DN.decode("dc=example,dc=com"),
- server3ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
+ if (server3 == null)
+ server3 = openReplicationSession(DN.decode(EXAMPLE_DN),
+ server3ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
- Thread.sleep(1000);
+ Thread.sleep(1000);
- // Launch in S1 the task that will initialize S2
- addTask(taskInitTargetAll, ResultCode.SUCCESS, null);
+ // Launch in S1 the task that will initialize S2
+ addTask(taskInitTargetAll, ResultCode.SUCCESS, null);
- // Wait for task completion
- waitTaskState(taskInitTargetAll, TaskState.COMPLETED_SUCCESSFULLY, null);
+ // Wait for task completion
+ waitTaskState(taskInitTargetAll, TaskState.COMPLETED_SUCCESSFULLY, null);
- // Tests that entries have been received by S2
- receiveUpdatedEntries(server2, server2ID, updatedEntries);
- receiveUpdatedEntries(server3, server3ID, updatedEntries);
+ // Tests that entries have been received by S2
+ receiveUpdatedEntries(server2, server2ID, updatedEntries);
+ receiveUpdatedEntries(server3, server3ID, updatedEntries);
- afterTest();
-
- log("Successfully ending " + testCase);
-
+ log("Successfully ending " + testCase);
+ } finally
+ {
+ afterTest();
+ }
}
/**
@@ -883,18 +871,18 @@
@Test(enabled=true, groups="slow")
public void initializeTargetImport() throws Exception
{
- String testCase = "InitializeTargetImport";
+ String testCase = "initializeTargetImport";
try
{
log("Starting " + testCase + " debugEnabled:" + debugEnabled());
// Start SS
- changelog1 = createChangelogServer(changelog1ID);
+ changelog1 = createChangelogServer(changelog1ID, testCase);
// S1 is the server we are running in, S2 is simulated by a broker
if (server2==null)
- server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode(EXAMPLE_DN),
server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
// Creates config to synchronize suffix
@@ -908,13 +896,14 @@
// Test that entries have been imported in S1
testEntriesInDb();
- afterTest();
-
log("Successfully ending " + testCase);
}
catch(Exception e)
{
fail(testCase + " Exception:"+ e.getMessage() + " " + stackTraceToSingleLineString(e));
+ } finally
+ {
+ afterTest();
}
}
@@ -962,13 +951,14 @@
// Scope containing a serverID absent from the domain
// createTask(taskInitTargetS2);
- afterTest();
-
log("Successfully ending " + testCase);
}
catch(Exception e)
{
fail(testCase + " Exception:"+ e.getMessage() + " " + stackTraceToSingleLineString(e));
+ } finally
+ {
+ afterTest();
}
}
@@ -978,14 +968,14 @@
@Test(enabled=true)
public void initializeConfigErrors() throws Exception
{
- String testCase = "InitializeConfigErrors";
+ String testCase = "initializeConfigErrors";
try
{
log("Starting " + testCase);
// Start SS
- changelog1 = createChangelogServer(changelog1ID);
+ changelog1 = createChangelogServer(changelog1ID, testCase);
// Creates config to synchronize suffix
connectServer1ToChangelog(changelog1ID);
@@ -1031,13 +1021,14 @@
// Scope containing a serverID absent from the domain
// createTask(taskInitTargetS2);
- afterTest();
-
log("Successfully ending " + testCase);
}
catch(Exception e)
{
fail(testCase + " Exception:"+ e.getMessage() + " " + stackTraceToSingleLineString(e));
+ } finally
+ {
+ afterTest();
}
}
@@ -1066,73 +1057,72 @@
@Test(enabled=true, groups="slow")
public void testReplServerInfos() throws Exception
{
- String testCase = "Replication/TestReplServerInfos";
+ String testCase = "testReplServerInfos";
log("Starting " + testCase);
- // Create the Repl Servers
- changelog1 = createChangelogServer(changelog1ID);
- changelog2 = createChangelogServer(changelog2ID);
- changelog3 = createChangelogServer(changelog3ID);
+ ReplicationBroker broker2 = null;
+ ReplicationBroker broker3 = null;
+ try
+ {
+ // Create the Repl Servers
+ changelog1 = createChangelogServer(changelog1ID, testCase);
+ changelog2 = createChangelogServer(changelog2ID, testCase);
+ changelog3 = createChangelogServer(changelog3ID, testCase);
- // Connects lDAP1 to replServer1
- connectServer1ToChangelog(changelog1ID);
-
- // Connects lDAP2 to replServer2
- ReplicationBroker broker2 =
- openReplicationSession(DN.decode("dc=example,dc=com"),
+ // Connects lDAP1 to replServer1
+ connectServer1ToChangelog(changelog1ID);
+
+ // Connects lDAP2 to replServer2
+ broker2 = openReplicationSession(DN.decode(EXAMPLE_DN),
server2ID, 100, getChangelogPort(changelog2ID), 1000, emptyOldChanges);
- // Connects lDAP3 to replServer2
- ReplicationBroker broker3 =
- openReplicationSession(DN.decode("dc=example,dc=com"),
+ // Connects lDAP3 to replServer2
+ broker3 = openReplicationSession(DN.decode(EXAMPLE_DN),
server3ID, 100, getChangelogPort(changelog2ID), 1000, emptyOldChanges);
- // Check that the list of connected LDAP servers is correct
- // in each replication servers
- List<String> l1 = changelog1.getReplicationServerDomain(baseDn, false).
- getConnectedLDAPservers();
- assertEquals(l1.size(), 1);
- assertEquals(l1.get(0), String.valueOf(server1ID));
-
- List<String> l2;
+ // Check that the list of connected LDAP servers is correct
+ // in each replication servers
+ List<String> l1 = changelog1.getReplicationServerDomain(baseDn, false).
+ getConnectedLDAPservers();
+ assertEquals(l1.size(), 1);
+ assertEquals(l1.get(0), String.valueOf(server1ID));
+
+ List<String> l2;
l2 = changelog2.getReplicationServerDomain(baseDn, false).getConnectedLDAPservers();
- assertEquals(l2.size(), 2);
- assertTrue(l2.contains(String.valueOf(server2ID)));
- assertTrue(l2.contains(String.valueOf(server3ID)));
-
- List<String> l3;
+ assertEquals(l2.size(), 2);
+ assertTrue(l2.contains(String.valueOf(server2ID)));
+ assertTrue(l2.contains(String.valueOf(server3ID)));
+
+ List<String> l3;
l3 = changelog3.getReplicationServerDomain(baseDn, false).getConnectedLDAPservers();
- assertEquals(l3.size(), 0);
+ assertEquals(l3.size(), 0);
- // Test updates
- broker3.stop();
- Thread.sleep(1000);
+ // Test updates
+ broker3.stop();
+ Thread.sleep(1000);
l2 = changelog2.getReplicationServerDomain(baseDn, false).getConnectedLDAPservers();
- assertEquals(l2.size(), 1);
- assertEquals(l2.get(0), String.valueOf(server2ID));
+ assertEquals(l2.size(), 1);
+ assertEquals(l2.get(0), String.valueOf(server2ID));
- broker3 = openReplicationSession(DN.decode("dc=example,dc=com"),
+ broker3 = openReplicationSession(DN.decode(EXAMPLE_DN),
server3ID, 100, getChangelogPort(changelog2ID), 1000, emptyOldChanges);
- broker2.stop();
- Thread.sleep(1000);
+ broker2.stop();
+ Thread.sleep(1000);
l2 = changelog2.getReplicationServerDomain(baseDn, false).getConnectedLDAPservers();
- assertEquals(l2.size(), 1);
- assertEquals(l2.get(0), String.valueOf(server3ID));
+ assertEquals(l2.size(), 1);
+ assertEquals(l2.get(0), String.valueOf(server3ID));
// TODO Test ReplicationServerDomain.getDestinationServers method.
- broker2.stop();
- broker3.stop();
-
- afterTest();
-
- changelog3.shutdown();
- changelog3 = null;
- changelog2.shutdown();
- changelog2 = null;
- changelog1.shutdown();
- changelog1 = null;
+ } finally
+ {
+ if (broker2 != null)
+ broker2.stop();
+ if (broker3 != null)
+ broker3.stop();
+ afterTest();
+ }
}
@Test(enabled=true, groups="slow")
@@ -1140,14 +1130,14 @@
{
try
{
- String testCase = "Replication/InitializeTargetExportMultiSS";
+ String testCase = "initializeTargetExportMultiSS";
log("Starting " + testCase);
// Create 2 changelogs
- changelog1 = createChangelogServer(changelog1ID);
+ changelog1 = createChangelogServer(changelog1ID, testCase);
- changelog2 = createChangelogServer(changelog2ID);
+ changelog2 = createChangelogServer(changelog2ID, testCase);
// Creates config to synchronize suffix
connectServer1ToChangelog(changelog1ID);
@@ -1159,7 +1149,7 @@
// connected to changelog2
if (server2 == null)
{
- server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode(EXAMPLE_DN),
server2ID, 100, getChangelogPort(changelog2ID), 1000, emptyOldChanges);
}
@@ -1179,178 +1169,183 @@
finally
{
afterTest();
-
- changelog2.shutdown();
- changelog2 = null;
}
}
@Test(enabled=true, groups="slow")
public void initializeExportMultiSS() throws Exception
{
- String testCase = "Replication/InitializeExportMultiSS";
+ String testCase = "initializeExportMultiSS";
log("Starting "+testCase);
- // Create 2 changelogs
- changelog1 = createChangelogServer(changelog1ID);
- Thread.sleep(1000);
-
- changelog2 = createChangelogServer(changelog2ID);
- Thread.sleep(1000);
-
- // Connect DS to the replicationServer 1
- connectServer1ToChangelog(changelog1ID);
-
- // Put entries in DB
- log(testCase + " Will add entries");
- addTestEntriesToDB();
-
- // Connect a broker acting as server 2 to Repl Server 2
- if (server2 == null)
+ try
{
- log(testCase + " Will connect server 2 to " + changelog2ID);
- server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
- server2ID, 100, getChangelogPort(changelog2ID),
- 1000, emptyOldChanges, changelog1.getGenerationId(baseDn));
- }
+ // Create 2 changelogs
+ changelog1 = createChangelogServer(changelog1ID, testCase);
+ Thread.sleep(1000);
- // Connect a broker acting as server 3 to Repl Server 3
- log(testCase + " Will create replServer " + changelog3ID);
- changelog3 = createChangelogServer(changelog3ID);
- Thread.sleep(500);
- if (server3 == null)
- {
- log(testCase + " Will connect server 3 to " + changelog3ID);
- server3 = openReplicationSession(DN.decode("dc=example,dc=com"),
- server3ID, 100, getChangelogPort(changelog3ID),
- 1000, emptyOldChanges, changelog1.getGenerationId(baseDn));
- }
+ changelog2 = createChangelogServer(changelog2ID, testCase);
+ Thread.sleep(1000);
- Thread.sleep(500);
+ // Connect DS to the replicationServer 1
+ connectServer1ToChangelog(changelog1ID);
- // S3 sends init request
- log(testCase + " server 3 Will send reqinit to " + server1ID);
- InitializeRequestMessage initMsg =
- new InitializeRequestMessage(baseDn, server3ID, server1ID);
- server3.publish(initMsg);
+ // Put entries in DB
+ log(testCase + " Will add entries");
+ addTestEntriesToDB();
- // S3 should receive target, entries & done
- log(testCase + " Will verify server 3 has received expected entries");
- receiveUpdatedEntries(server3, server3ID, updatedEntries);
-
- while(true)
- {
- try
+ // Connect a broker acting as server 2 to Repl Server 2
+ if (server2 == null)
{
- ReplicationMessage msg = server3.receive();
- fail("Receive unexpected message " + msg);
+ log(testCase + " Will connect server 2 to " + changelog2ID);
+ server2 = openReplicationSession(DN.decode(EXAMPLE_DN),
+ server2ID, 100, getChangelogPort(changelog2ID),
+ 1000, emptyOldChanges, changelog1.getGenerationId(baseDn));
}
- catch(SocketTimeoutException e)
+
+ // Connect a broker acting as server 3 to Repl Server 3
+ log(testCase + " Will create replServer " + changelog3ID);
+ changelog3 = createChangelogServer(changelog3ID, testCase);
+ Thread.sleep(500);
+ if (server3 == null)
{
- // Test is a success
- break;
+ log(testCase + " Will connect server 3 to " + changelog3ID);
+ server3 = openReplicationSession(DN.decode(EXAMPLE_DN),
+ server3ID, 100, getChangelogPort(changelog3ID),
+ 1000, emptyOldChanges, changelog1.getGenerationId(baseDn));
}
+
+ Thread.sleep(500);
+
+ // S3 sends init request
+ log(testCase + " server 3 Will send reqinit to " + server1ID);
+ InitializeRequestMsg initMsg =
+ new InitializeRequestMsg(baseDn, server3ID, server1ID);
+ server3.publish(initMsg);
+
+ // S3 should receive target, entries & done
+ log(testCase + " Will verify server 3 has received expected entries");
+ receiveUpdatedEntries(server3, server3ID, updatedEntries);
+
+ while (true)
+ {
+ try
+ {
+ ReplicationMsg msg = server3.receive();
+ fail("Receive unexpected message " + msg);
+ } catch (SocketTimeoutException e)
+ {
+ // Test is a success
+ break;
+ }
+ }
+
+ log("Successfully ending " + testCase);
+ } finally
+ {
+ afterTest();
}
-
- afterTest();
-
- changelog3.shutdown();
- changelog3 = null;
-
- changelog2.shutdown();
- changelog2 = null;
-
- log("Successfully ending "+testCase);
}
@Test(enabled=false)
public void initializeNoSource() throws Exception
{
- String testCase = "InitializeNoSource";
+ String testCase = "initializeNoSource";
log("Starting "+testCase);
- // Start Replication Server
- changelog1 = createChangelogServer(changelog1ID);
+ try
+ {
+ // Start Replication Server
+ changelog1 = createChangelogServer(changelog1ID, testCase);
- // Creates config to synchronize suffix
- connectServer1ToChangelog(changelog1ID);
+ // Creates config to synchronize suffix
+ connectServer1ToChangelog(changelog1ID);
- // Test 1
- Entry taskInit = TestCaseUtils.makeEntry(
+ // Test 1
+ Entry taskInit = TestCaseUtils.makeEntry(
"dn: ds-task-id=" + UUID.randomUUID() +
",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-from-remote-replica",
"ds-task-class-name: org.opends.server.tasks.InitializeTask",
- "ds-task-initialize-domain-dn: "+baseDn,
+ "ds-task-initialize-domain-dn: " + baseDn,
"ds-task-initialize-replica-server-id: " + 20);
- addTask(taskInit, ResultCode.SUCCESS, null);
+ addTask(taskInit, ResultCode.SUCCESS, null);
- waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR,
+ waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR,
ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get());
- // Test 2
- taskInit = TestCaseUtils.makeEntry(
+ // Test 2
+ taskInit = TestCaseUtils.makeEntry(
"dn: ds-task-id=" + UUID.randomUUID() +
",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-from-remote-replica",
"ds-task-class-name: org.opends.server.tasks.InitializeTask",
- "ds-task-initialize-domain-dn: "+baseDn,
+ "ds-task-initialize-domain-dn: " + baseDn,
"ds-task-initialize-replica-server-id: " + server1ID);
- addTask(taskInit, ResultCode.OTHER, ERR_INVALID_IMPORT_SOURCE.get());
+ addTask(taskInit, ResultCode.OTHER, ERR_INVALID_IMPORT_SOURCE.get());
- if (replDomain != null)
+ if (replDomain != null)
+ {
+ assertTrue(!replDomain.ieRunning(),
+ "ReplicationDomain: Import/Export is not expected to be running");
+ }
+
+ log("Successfully ending " + testCase);
+ } finally
{
- assertTrue(!replDomain.ieRunning(),
- "ReplicationDomain: Import/Export is not expected to be running");
+ afterTest();
}
-
- log("Successfully ending "+testCase);
-
}
@Test(enabled=false)
public void initializeTargetNoTarget() throws Exception
{
- String testCase = "InitializeTargetNoTarget" + baseDn;
+ String testCase = "initializeTargetNoTarget" + baseDn;
log("Starting "+testCase);
- // Start SS
- changelog1 = createChangelogServer(changelog1ID);
+ try
+ {
+ // Start SS
+ changelog1 = createChangelogServer(changelog1ID, testCase);
- // Creates config to synchronize suffix
- connectServer1ToChangelog(changelog1ID);
+ // Creates config to synchronize suffix
+ connectServer1ToChangelog(changelog1ID);
- // Put entries in DB
- addTestEntriesToDB();
+ // Put entries in DB
+ addTestEntriesToDB();
- Entry taskInit = TestCaseUtils.makeEntry(
+ Entry taskInit = TestCaseUtils.makeEntry(
"dn: ds-task-id=" + UUID.randomUUID() +
",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-remote-replica",
"ds-task-class-name: org.opends.server.tasks.InitializeTargetTask",
- "ds-task-initialize-domain-dn: "+baseDn,
+ "ds-task-initialize-domain-dn: " + baseDn,
"ds-task-initialize-replica-server-id: " + 0);
- addTask(taskInit, ResultCode.SUCCESS, null);
+ addTask(taskInit, ResultCode.SUCCESS, null);
- waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR,
+ waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR,
ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get());
- if (replDomain != null)
- {
- assertTrue(!replDomain.ieRunning(),
- "ReplicationDomain: Import/Export is not expected to be running");
- }
+ if (replDomain != null)
+ {
+ assertTrue(!replDomain.ieRunning(),
+ "ReplicationDomain: Import/Export is not expected to be running");
+ }
- log("Successfully ending "+testCase);
+ log("Successfully ending " + testCase);
+ } finally
+ {
+ afterTest();
+ }
}
@Test(enabled=false)
@@ -1378,73 +1373,76 @@
fail(testCase + " NYI");
}
- @Test(enabled=false)
+ @Test(enabled = false)
public void initializeSimultaneous() throws Exception
{
- String testCase = "InitializeSimultaneous";
+ String testCase = "initializeSimultaneous";
- // Start SS
- changelog1 = createChangelogServer(changelog1ID);
-
- // Connect a broker acting as server 2 to changelog2
- if (server2 == null)
+ try
{
- server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
- server2ID, 100, getChangelogPort(changelog1ID),
- 1000, emptyOldChanges);
- }
+ // Start SS
+ changelog1 = createChangelogServer(changelog1ID, testCase);
- // Creates config to synchronize suffix
- connectServer1ToChangelog(changelog1ID);
+ // Connect a broker acting as server 2 to changelog2
+ if (server2 == null)
+ {
+ server2 = openReplicationSession(DN.decode(EXAMPLE_DN),
+ server2ID, 100, getChangelogPort(changelog1ID),
+ 1000, emptyOldChanges);
+ }
- Entry taskInit = TestCaseUtils.makeEntry(
+ // Creates config to synchronize suffix
+ connectServer1ToChangelog(changelog1ID);
+
+ Entry taskInit = TestCaseUtils.makeEntry(
"dn: ds-task-id=" + UUID.randomUUID() +
",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-from-remote-replica",
"ds-task-class-name: org.opends.server.tasks.InitializeTask",
- "ds-task-initialize-domain-dn: "+baseDn,
+ "ds-task-initialize-domain-dn: " + baseDn,
"ds-task-initialize-replica-server-id: " + server2ID);
- addTask(taskInit, ResultCode.SUCCESS, null);
+ addTask(taskInit, ResultCode.SUCCESS, null);
- Thread.sleep(3000);
+ Thread.sleep(3000);
- Entry taskInit2 = TestCaseUtils.makeEntry(
+ Entry taskInit2 = TestCaseUtils.makeEntry(
"dn: ds-task-id=" + UUID.randomUUID() +
",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
"objectclass: ds-task-initialize-from-remote-replica",
"ds-task-class-name: org.opends.server.tasks.InitializeTask",
- "ds-task-initialize-domain-dn: "+baseDn,
+ "ds-task-initialize-domain-dn: " + baseDn,
"ds-task-initialize-replica-server-id: " + server2ID);
- // Second task is expected to be rejected
- addTask(taskInit2, ResultCode.SUCCESS, null);
+ // Second task is expected to be rejected
+ addTask(taskInit2, ResultCode.SUCCESS, null);
- waitTaskState(taskInit2, TaskState.STOPPED_BY_ERROR,
+ waitTaskState(taskInit2, TaskState.STOPPED_BY_ERROR,
ERR_SIMULTANEOUS_IMPORT_EXPORT_REJECTED.get());
- // First task is stilll running
- waitTaskState(taskInit, TaskState.RUNNING, null);
+ // First task is stilll running
+ waitTaskState(taskInit, TaskState.RUNNING, null);
- // External request is supposed to be rejected
+ // External request is supposed to be rejected
- // Now tests error in the middle of an import
- // S2 sends init request
- ErrorMessage msg =
- new ErrorMessage(server1ID, (short) 1, Message.EMPTY);
- server2.publish(msg);
+ // Now tests error in the middle of an import
+ // S2 sends init request
+ ErrorMsg msg =
+ new ErrorMsg(server1ID, (short) 1, Message.EMPTY);
+ server2.publish(msg);
- waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR,
+ waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR,
null);
- afterTest();
-
- log("Successfully ending "+testCase);
-
+ log("Successfully ending " + testCase);
+ } finally
+ {
+ afterTest();
+ }
}
/**
@@ -1453,10 +1451,10 @@
protected void afterTest()
{
- // Check that the domain hsa completed the import/export task.
+ // Check that the domain has completed the import/export task.
if (replDomain != null)
{
- // race condition could cause the main thread to reach
+ // race condition could cause the main thread to reach
// this code before the task is fully completed.
// in those cases, loop for a while waiting for completion.
for (int i = 0; i< 10; i++)
@@ -1477,6 +1475,9 @@
assertTrue(!replDomain.ieRunning(),
"ReplicationDomain: Import/Export is not expected to be running");
}
+ // Remove domain config
+ super.cleanConfigEntries();
+ replDomain = null;
// Clean brokers
if (server2 != null)
@@ -1494,14 +1495,50 @@
server3 = null;
}
super.cleanRealEntries();
-
+
if (changelog1 != null)
- changelog1.clearDb();
-
+ {
+ changelog1.clearDb();
+ changelog1.remove();
+ changelog1 = null;
+ }
+
if (changelog2 != null)
- changelog2.clearDb();
-
+ {
+ changelog2.clearDb();
+ changelog2.remove();
+ changelog2 = null;
+ }
+
if (changelog3 != null)
- changelog3.clearDb();
+ {
+ changelog3.clearDb();
+ changelog3.remove();
+ changelog3 = null;
+ }
+
+ // Clean replication server ports
+ for (int i = 0; i < replServerPort.length; i++)
+ {
+ replServerPort[i] = 0;
+ }
+ }
+
+ /**
+ * Clean up the environment.
+ *
+ * @throws Exception If the environment could not be set up.
+ */
+ @AfterClass
+ @Override
+ public void classCleanUp() throws Exception
+ {
+ callParanoiaCheck = false;
+ super.classCleanUp();
+
+ // Clear the backend
+ ReplicationDomain.clearJEBackend(false, "userRoot", EXAMPLE_DN);
+
+ paranoiaCheck();
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
index 49f52d0..c8014f4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
@@ -37,11 +37,13 @@
import java.util.Iterator;
import java.util.List;
+import java.util.NoSuchElementException;
import org.opends.messages.Category;
import org.opends.messages.Message;
import org.opends.messages.Severity;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.AddOperationBasis;
+import org.opends.server.core.DeleteOperationBasis;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.asn1.ASN1OctetString;
@@ -52,7 +54,7 @@
import org.opends.server.replication.plugin.ReplicationBroker;
import org.opends.server.replication.protocol.AddMsg;
import org.opends.server.replication.protocol.ProtocolVersion;
-import org.opends.server.replication.protocol.ReplicationMessage;
+import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.DN;
@@ -70,6 +72,7 @@
import org.opends.server.types.Attribute;
import static org.opends.server.TestCaseUtils.*;
+import static org.testng.Assert.assertNotNull;
/**
* Test the constructors, encoders and decoders of the Replication AckMsg,
@@ -88,12 +91,12 @@
*/
protected Entry personEntry;
private int replServerPort;
-
-
- // the base DN used for this test
+
+
+ // the base DN used for this test
private DN baseDn;
private ReplicationServer replicationServer;
-
+
/**
* Test the window mechanism by :
* - creating a ReplicationServer service client using the ReplicationBroker class.
@@ -109,23 +112,37 @@
logError(Message.raw(
Category.SYNC, Severity.INFORMATION,
"Starting Replication ProtocolWindowTest : saturateAndRestart"));
-
- // clear the Replication Server and the backend to isolate this test
- // from the other tests,
- TestCaseUtils.initializeTestBackend(true);
- replicationServer.clearDb();
- ReplicationBroker broker = openReplicationSession(baseDn, (short) 13,
+ // suffix synchronized
+ String testName = "protocolWindowTest";
+ String synchroServerLdif =
+ "dn: " + "cn=" + testName + ", cn=domains, " + SYNCHRO_PLUGIN_DN + "\n"
+ + "objectClass: top\n"
+ + "objectClass: ds-cfg-replication-domain\n"
+ + "cn: " + testName + "\n"
+ + "ds-cfg-base-dn: " + TEST_ROOT_DN_STRING + "\n"
+ + "ds-cfg-replication-server: localhost:" + replServerPort + "\n"
+ + "ds-cfg-server-id: 1\n"
+ + "ds-cfg-receive-status: true\n"
+ + "ds-cfg-window-size: " + WINDOW_SIZE;
+ Entry repDomainEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
+
+ // Configure replication domain
+ DirectoryServer.getConfigHandler().addEntry(repDomainEntry, null);
+ assertNotNull(DirectoryServer.getConfigEntry(repDomainEntry.getDN()),
+ "Unable to add the synchronized server");
+
+ ReplicationBroker broker = openReplicationSession(baseDn, (short) 12,
WINDOW_SIZE, replServerPort, 1000, true);
try {
/* Test that replicationServer monitor and synchro plugin monitor informations
* publish the correct window size.
- * This allows both the check the monitoring code and to test that
+ * This allows both to check the monitoring code and to test that
* configuration is working.
*/
- Thread.sleep(1500);
+ Thread.sleep(2000);
assertTrue(checkWindows(WINDOW_SIZE));
assertTrue(checkChangelogQueueSize(REPLICATION_QUEUE_SIZE));
@@ -138,12 +155,11 @@
tmp.getOperationalAttributes());
addOp.run();
assertEquals(addOp.getResultCode(), ResultCode.SUCCESS);
- entryList.addLast(personEntry.getDN());
assertTrue(DirectoryServer.entryExists(personEntry.getDN()),
"The Add Entry operation failed");
// Check if the client has received the MSG
- ReplicationMessage msg = broker.receive();
+ ReplicationMsg msg = broker.receive();
assertTrue(msg instanceof AddMsg,
"The received Replication message is not an ADD msg");
AddMsg addMsg = (AddMsg) msg;
@@ -161,7 +177,7 @@
processModify(count);
// let some time to the message to reach the replicationServer client
- Thread.sleep(500);
+ Thread.sleep(2000);
// check that the replicationServer only sent WINDOW_SIZE messages
searchUpdateSent();
@@ -186,6 +202,26 @@
finally {
broker.stop();
DirectoryServer.deregisterMonitorProvider(REPLICATION_STRESS_TEST);
+ // Clean domain
+ DN dn = repDomainEntry.getDN();
+ try
+ {
+ DeleteOperationBasis op = new DeleteOperationBasis(connection,
+ InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), null, dn);
+ op.run();
+ if ((op.getResultCode() != ResultCode.SUCCESS) &&
+ (op.getResultCode() != ResultCode.NO_SUCH_OBJECT))
+ {
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "saturateQueueAndRestart: error cleaning config entry: " + dn));
+ }
+ } catch (NoSuchElementException e)
+ {
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "saturateQueueAndRestart: error cleaning config entry: " + dn));
+ }
+ replicationServer.clearDb();
}
}
@@ -206,7 +242,7 @@
}
/**
- * Check that the window configuration has been successfull
+ * Check that the window configuration has been successful
* by reading the monitoring information and checking
* that we do have 2 entries with the configured max-rcv-window.
*/
@@ -234,7 +270,7 @@
LDAPFilter.decode("(update-sent=" + WINDOW_SIZE + ")"));
assertEquals(op.getResultCode(), ResultCode.SUCCESS);
- assertEquals(op.getEntriesSent(), 1,
+ assertEquals(op.getEntriesSent(), 1,
"Entries#=" + op.getEntriesSent());
op = connection.processSearch(
@@ -243,7 +279,7 @@
LDAPFilter.decode("(missing-changes=" +
(REPLICATION_QUEUE_SIZE + WINDOW_SIZE) + ")"));
assertEquals(op.getResultCode(), ResultCode.SUCCESS);
-
+
Iterator<SearchResultEntry> entriesit = op.getSearchEntries().iterator();
while(entriesit.hasNext())
{
@@ -252,8 +288,8 @@
while (attit.hasNext())
{
Attribute attr = attit.next();
- logError(Message.raw(Category.SYNC, Severity.INFORMATION,
- e.getDN() + "= " + attr.getName() + " " + attr.getValues().iterator()
+ logError(Message.raw(Category.SYNC, Severity.INFORMATION,
+ e.getDN() + "= " + attr.getName() + " " + attr.iterator()
.next().getStringValue()));
}
}
@@ -271,20 +307,10 @@
public void setUp() throws Exception
{
// This test suite depends on having the schema available.
- TestCaseUtils.startServer();
-
+ super.setUp();
+
baseDn = DN.decode(TEST_ROOT_DN_STRING);
- // Create an internal connection
- connection = InternalClientConnection.getRootConnection();
-
- // top level synchro provider
- String synchroStringDN = "cn=Synchronization Providers,cn=config";
-
- // Multimaster Synchro plugin
- synchroPluginStringDN = "cn=Multimaster Synchronization, "
- + synchroStringDN;
-
// find a free port for the replicationServer
ServerSocket socket = TestCaseUtils.bindFreePort();
replServerPort = socket.getLocalPort();
@@ -292,21 +318,8 @@
// configure the replication Server.
replicationServer = new ReplicationServer(new ReplServerFakeConfiguration(
- replServerPort, "changelogDbReplWindowTest", 0,
+ replServerPort, "protocolWindowTestDb", 0,
1, REPLICATION_QUEUE_SIZE, WINDOW_SIZE, null));
-
- // suffix synchronized
- String synchroServerLdif =
- "dn: " + "cn=example, cn=domains, " + synchroPluginStringDN + "\n"
- + "objectClass: top\n"
- + "objectClass: ds-cfg-replication-domain\n"
- + "cn: example\n"
- + "ds-cfg-base-dn: " + TEST_ROOT_DN_STRING + "\n"
- + "ds-cfg-replication-server: localhost:" + replServerPort + "\n"
- + "ds-cfg-server-id: 1\n"
- + "ds-cfg-receive-status: true\n"
- + "ds-cfg-window-size: " + WINDOW_SIZE;
- synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
String personLdif = "dn: uid=user.windowTest," + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n" + "objectClass: person\n"
@@ -323,21 +336,6 @@
+ "sn: Amar\n" + "givenName: Aaccf\n" + "postalCode: 85762\n"
+ "userPassword: password\n" + "initials: AA\n";
personEntry = TestCaseUtils.entryFromLdifString(personLdif);
-
- configureReplication();
- }
-
- /**
- * Clean up the environment. return null;
- *
- * @throws Exception
- * If the environment could not be set up.
- */
- @AfterClass
- public void classCleanUp() throws Exception
- {
- super.classCleanUp();
- replicationServer.shutdown();
}
private void processModify(int count)
@@ -362,37 +360,63 @@
Category.SYNC, Severity.INFORMATION,
"Starting Replication ProtocolWindowTest : protocolVersion"));
- // Test : Make a broker degrade its version when connecting to an old
- // replication server.
- ProtocolVersion.setCurrentVersion((short)2);
+ ReplicationBroker broker = null;
- ReplicationBroker broker = new ReplicationBroker(
+ try
+ {
+ // Test : Make a broker degrade its version when connecting to an old
+ // replication server.
+ ProtocolVersion.resetCurrentVersion();
+
+ broker = new ReplicationBroker(null,
new ServerState(),
baseDn,
(short) 13, 0, 0, 0, 0, 1000, 0,
ReplicationTestCase.getGenerationId(baseDn),
- getReplSessionSecurity());
+ getReplSessionSecurity(), (byte)1);
- // Check broker hard-coded version
- short pversion = broker.getProtocolVersion();
- assertEquals(pversion, 2);
+ // Check broker hard-coded version
+ short pversion = broker.getProtocolVersion();
+ assertEquals(pversion, ProtocolVersion.getCurrentVersion());
- // Connect the broker to the replication server
- ProtocolVersion.setCurrentVersion((short)0);
- ArrayList<String> servers = new ArrayList<String>(1);
- servers.add("localhost:" + replServerPort);
- broker.start(servers);
- TestCaseUtils.sleep(100); // wait for connection established
+ // Connect the broker to the replication server
+ ProtocolVersion.setCurrentVersion(ProtocolVersion.REPLICATION_PROTOCOL_V1);
+ ArrayList<String> servers = new ArrayList<String>(1);
+ servers.add("localhost:" + replServerPort);
+ broker.start(servers);
+ TestCaseUtils.sleep(3000); // wait for connection established
- // Check broker negociated version
- pversion = broker.getProtocolVersion();
- assertEquals(pversion, 0);
+ // Check broker negociated version
+ pversion = broker.getProtocolVersion();
+ assertEquals(pversion, ProtocolVersion.REPLICATION_PROTOCOL_V1);
- broker.stop();
-
- logError(Message.raw(
+ logError(Message.raw(
Category.SYNC, Severity.INFORMATION,
"Ending Replication ProtocolWindowTest : protocolVersion"));
+ } finally
+ {
+ if (broker != null)
+ broker.stop();
+
+ ProtocolVersion.resetCurrentVersion();
+ }
+ }
+
+ /**
+ * Clean up the environment.
+ *
+ * @throws Exception If the environment could not be set up.
+ */
+ @AfterClass
+ @Override
+ public void classCleanUp() throws Exception
+ {
+ callParanoiaCheck = false;
+ super.classCleanUp();
+
+ replicationServer.remove();
+
+ paranoiaCheck();
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
index 3e2e4e8..eb65fe1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
@@ -32,20 +32,44 @@
import java.net.ServerSocket;
import java.util.UUID;
+import org.opends.messages.Category;
+import org.opends.messages.Message;
+import org.opends.messages.Severity;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.AddOperationBasis;
+import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.replication.plugin.ReplicationDomain;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ResultCode;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import static org.opends.server.loggers.ErrorLogger.logError;
+import static org.opends.server.loggers.debug.DebugLogger.getTracer;
/**
* Test re-synchronization after after backup/restore and LDIF import.
*/
public class ReSyncTest extends ReplicationTestCase
{
+ // The tracer object for the debug logger
+ private static final DebugTracer TRACER = getTracer();
+
+ private void debugInfo(String s)
+ {
+ logError(Message.raw(Category.SYNC, Severity.NOTICE, s));
+ if (debugEnabled())
+ {
+ TRACER.debugInfo(s);
+ }
+ }
+
+ protected static final String EXAMPLE_DN = "dc=example,dc=com";
+
/**
* Set up the environment for performing the tests in this Class.
*
@@ -55,48 +79,47 @@
@BeforeClass
public void setup() throws Exception
{
+ super.setUp();
+
/*
- * - Start a server and a replicationServer, configure replication
+ * - Configure replication
* - Do some changes.
*/
- TestCaseUtils.startServer();
// find a free port for the replicationServer
ServerSocket socket = TestCaseUtils.bindFreePort();
int replServerPort = socket.getLocalPort();
socket.close();
- // Create an internal connection
- connection = InternalClientConnection.getRootConnection();
+ // This test uses restore task which does not work with memory backend
+ // (like the test backend we use in every tests): backend is disabled then
+ // re-enabled and this clears the backend reference and thus the underlying
+ // data. So for this particular test, we use a classical backend. Let's
+ // clear it and create the root entry
- // Create backend top level entries
+ ReplicationDomain.clearJEBackend(false, "userRoot", EXAMPLE_DN);
addEntry("dn: dc=example,dc=com\n" + "objectClass: top\n"
+ "objectClass: domain\n");
- // top level synchro provider
- String synchroStringDN = "cn=Synchronization Providers,cn=config";
-
- // Multimaster Synchro plugin
- synchroPluginStringDN = "cn=Multimaster Synchronization, "
- + synchroStringDN;
-
// Change log
String replServerLdif =
- "dn: " + "cn=Replication Server, " + synchroPluginStringDN + "\n"
+ "dn: " + "cn=Replication Server, " + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-server\n"
+ "cn: Replication Server\n"
+ "ds-cfg-replication-port:" + replServerPort + "\n"
- + "ds-cfg-replication-server-id: 1\n";
+ + "ds-cfg-replication-db-directory: ReSyncTest\n"
+ + "ds-cfg-replication-server-id: 104\n";
replServerEntry = TestCaseUtils.entryFromLdifString(replServerLdif);
// suffix synchronized
+ String reSyncTest = "reSyncTest";
String domainLdif =
- "dn: cn=example, cn=domains, " + synchroPluginStringDN + "\n"
+ "dn: cn=" + reSyncTest + ", cn=domains, " + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-domain\n"
- + "cn: example\n"
- + "ds-cfg-base-dn: dc=example,dc=com\n"
+ + "cn: " + reSyncTest + "\n"
+ + "ds-cfg-base-dn: " + EXAMPLE_DN + "\n"
+ "ds-cfg-replication-server: localhost:"+ replServerPort + "\n"
+ "ds-cfg-server-id: 123\n";
synchroServerEntry = TestCaseUtils.entryFromLdifString(domainLdif);
@@ -107,7 +130,7 @@
Thread.sleep(1000);
// Create a dummy entry
- addEntry("dn: dc=dummy, dc=example,dc=com\n"
+ addEntry("dn: dc=dummy," + EXAMPLE_DN + "\n"
+ "objectClass: top\n" + "objectClass: domain\n");
}
@@ -150,7 +173,8 @@
// Delete the entry we are going to use to make sure that
// we do test something.
- connection.processDelete(DN.decode("dc=foo, dc=example,dc=com"));
+
+ connection.processDelete(DN.decode("dc=fooUniqueName1," + EXAMPLE_DN));
task("dn: ds-task-id=" + UUID.randomUUID()
+ ",cn=Scheduled Tasks,cn=Tasks\n"
@@ -161,8 +185,10 @@
+ "ds-backup-directory-path: bak\n"
+ "ds-task-backup-all: TRUE\n");
- addEntry("dn: dc=foo, dc=example,dc=com\n"
+ debugInfo("testResyncAfterRestore: backup done");
+ addEntry("dn: dc=fooUniqueName1," + EXAMPLE_DN + "\n"
+ "objectClass: top\n" + "objectClass: domain\n");
+ debugInfo("testResyncAfterRestore: entry added");
task("dn: ds-task-id=" + UUID.randomUUID()
+ ",cn=Scheduled Tasks,cn=Tasks\n"
@@ -173,10 +199,12 @@
+ "ds-backup-directory-path: bak" + File.separator
+ "userRoot\n");
- if (getEntry(DN.decode("dc=foo, dc=example,dc=com"), 30000, true) == null)
+ debugInfo("testResyncAfterRestore: restore done");
+
+ if (getEntry(DN.decode("dc=fooUniqueName1," + EXAMPLE_DN), 30000, true) == null)
fail("The Directory has not been resynchronized after the restore.");
- connection.processDelete(DN.decode("dc=foo, dc=example,dc=com"));
+ connection.processDelete(DN.decode("dc=fooUniqueName1," + EXAMPLE_DN));
}
/**
@@ -194,7 +222,7 @@
// delete the entry we are going to use to make sure that
// we do test something.
- connection.processDelete(DN.decode("dc=foo, dc=example,dc=com"));
+ connection.processDelete(DN.decode("dc=fooUniqueName2," + EXAMPLE_DN));
String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
String path = buildRoot + File.separator + "build" +
@@ -210,8 +238,10 @@
+ "ds-task-export-backend-id: userRoot\n"
+ "ds-task-export-ldif-file: " + path + "\n");
- addEntry("dn: dc=foo, dc=example,dc=com\n"
+ debugInfo("testResyncAfterImport: export done");
+ addEntry("dn: dc=fooUniqueName2," + EXAMPLE_DN + "\n"
+ "objectClass: top\n" + "objectClass: domain\n");
+ debugInfo("testResyncAfterImport: entry added");
task("dn: ds-task-id=" + UUID.randomUUID()
+ ",cn=Scheduled Tasks,cn=Tasks\n"
@@ -223,9 +253,27 @@
+ "ds-task-import-ldif-file: " + path + "\n"
+ "ds-task-import-reject-file: " + path + "reject\n");
- if (getEntry(DN.decode("dc=foo, dc=example,dc=com"), 30000, true) == null)
+ debugInfo("testResyncAfterImport: import done");
+
+ if (getEntry(DN.decode("dc=fooUniqueName2," + EXAMPLE_DN), 30000, true) == null)
fail("The Directory has not been resynchronized after the restore.");
}
+
+ /**
+ * Clean up the environment.
+ *
+ * @throws Exception If the environment could not be set up.
+ */
+ @AfterClass
+ @Override
+ public void classCleanUp() throws Exception
+ {
+ callParanoiaCheck = false;
+ super.classCleanUp();
+ // Clear the backend
+ ReplicationDomain.clearJEBackend(false, "userRoot", EXAMPLE_DN);
+ paranoiaCheck();
+ }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index 986cad8..880b11f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.replication;
+import java.io.File;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
@@ -37,7 +38,6 @@
import java.net.SocketException;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.NoSuchElementException;
@@ -48,7 +48,6 @@
import org.opends.messages.MessageBuilder;
import org.opends.messages.Severity;
import org.opends.server.DirectoryServerTestCase;
-import org.opends.server.TestCaseUtils;
import org.opends.server.backends.task.TaskState;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
@@ -63,14 +62,15 @@
import org.opends.server.replication.plugin.PersistentServerState;
import org.opends.server.replication.plugin.ReplicationBroker;
import org.opends.server.replication.plugin.ReplicationDomain;
-import org.opends.server.replication.protocol.ErrorMessage;
+import org.opends.server.replication.protocol.ErrorMsg;
import org.opends.server.replication.protocol.ReplSessionSecurity;
-import org.opends.server.replication.protocol.ReplicationMessage;
+import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.schema.IntegerSyntax;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.ByteStringFactory;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -84,6 +84,9 @@
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import org.opends.server.TestCaseUtils;
+import org.opends.server.protocols.asn1.ASN1OctetString;
+import org.opends.server.replication.plugin.MultimasterReplication;
/**
* An abstract class that all Replication unit test should extend.
@@ -95,6 +98,18 @@
// The tracer object for the debug logger
private static final DebugTracer TRACER = getTracer();
+ // This is the generation id matching the memory test backend
+ // with its initial root entry o=test created.
+ // This matches the backend obtained calling:
+ // TestCaseUtils.initializeTestBackend(true).
+ // (using the default TestCaseUtils.TEST_ROOT_DN_STRING suffix)
+ protected static final long TEST_DN_WITH_ROOT_ENTRY_GENID = 5095L;
+
+ /**
+ * Generation id for a fully empty domain.
+ */
+ public static final long EMPTY_DN_GENID = 48L;
+
/**
* The internal connection used for operation
*/
@@ -122,10 +137,27 @@
*/
protected boolean schemaCheck;
+ // Call the paranoiaCheck at test cleanup or not.
+ // Must not been touched except if sub class has its own clean up code,
+ // for instance:
+ // @AfterClass
+ // public void classCleanUp() throws Exception
+ // {
+ // callParanoiaCheck = false;
+ // super.classCleanUp();
+ //
+ // // Clear my own stuff that I have setup (in my own setup() method for instance)
+ // myReplServerInstantiatedWithConstructor.remove(); // This removes the replication changes backend
+ //
+ // // Now call paramoiaCheck myself
+ // paranoiaCheck();
+ // }
+ protected boolean callParanoiaCheck = true;
+
/**
* The replication plugin entry
*/
- protected String synchroPluginStringDN =
+ protected final String SYNCHRO_PLUGIN_DN =
"cn=Multimaster Synchronization, cn=Synchronization Providers,cn=config";
/**
@@ -138,10 +170,21 @@
public void setUp() throws Exception
{
// This test suite depends on having the schema available.
- TestCaseUtils.restartServer();
+ TestCaseUtils.startServer();
+
+ // After start of server because not seen if server not started
+ // after server started once, TestCaseUtils.startServer() does nothing.
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ " ##### Calling ReplicationTestCase.setUp ##### "));
+
+ // Initialize the test backend (TestCaseUtils.TEST_ROOT_DN_STRING)
+ // (in case previous (non replication?) tests were run before...)
+ TestCaseUtils.initializeTestBackend(true);
// Create an internal connection
connection = InternalClientConnection.getRootConnection();
+
+ callParanoiaCheck = true;
}
/**
@@ -155,8 +198,8 @@
static protected long getGenerationId(DN baseDn)
{
// This is the value of the generationId computed by the server when the
- // suffix is empty.
- long genId = 3276850;
+ // test suffix (o=test) has only the root entry created.
+ long genId = TEST_DN_WITH_ROOT_ENTRY_GENID;
try
{
ReplicationDomain replDomain = ReplicationDomain.retrievesReplicationDomain(baseDn);
@@ -196,16 +239,16 @@
else
state = new ServerState();
- ReplicationBroker broker = new ReplicationBroker(
+ ReplicationBroker broker = new ReplicationBroker(null,
state, baseDn, serverId, 0, 0, 0, 0,
- window_size, 0, generationId, getReplSessionSecurity());
+ window_size, 0, generationId, getReplSessionSecurity(), (byte)1);
ArrayList<String> servers = new ArrayList<String>(1);
servers.add("localhost:" + port);
broker.start(servers);
if (timeout != 0)
broker.setSoTimeout(timeout);
- TestCaseUtils.sleep(100); // give some time to the broker to connect
- // to the replicationServer.
+ checkConnection(30, broker, port); // give some time to the broker to connect
+ // to the replicationServer.
if (emptyOldChanges)
{
/*
@@ -216,10 +259,10 @@
{
while (true)
{
- ReplicationMessage rMsg = broker.receive();
- if (rMsg instanceof ErrorMessage)
+ ReplicationMsg rMsg = broker.receive();
+ if (rMsg instanceof ErrorMsg)
{
- ErrorMessage eMsg = (ErrorMessage)rMsg;
+ ErrorMsg eMsg = (ErrorMsg)rMsg;
logError(new MessageBuilder(
"ReplicationTestCase/openReplicationSession ").append(
" received ErrorMessage when emptying old changes ").append(
@@ -230,13 +273,56 @@
catch (Exception e)
{
logError(new MessageBuilder(
- "ReplicationTestCase/openChangelogSession ").append(e.getMessage())
+ "ReplicationTestCase/openReplicationSession ").append(e.getMessage())
.append(" when emptying old changes").toMessage());
}
}
return broker;
}
+ /**
+ * Check connection of the provided ds to the
+ * replication server. Waits for connection to be ok up to secTimeout seconds
+ * before failing.
+ */
+ protected void checkConnection(int secTimeout, ReplicationBroker rb, int rsPort)
+ {
+ int nSec = 0;
+
+ // Go out of the loop only if connection is verified or if timeout occurs
+ while (true)
+ {
+ // Test connection
+ boolean connected = rb.isConnected();
+
+ if (connected)
+ {
+ // Connection verified
+ TRACER.debugInfo("checkConnection: connection of broker "
+ + rb.getServerId() + " to RS " + rb.getRsGroupId()
+ + " obtained after " + nSec + " seconds.");
+ return;
+ }
+
+ // Sleep 1 second
+ try
+ {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex)
+ {
+ fail("Error sleeping " + stackTraceToSingleLineString(ex));
+ }
+ nSec++;
+
+ if (nSec > secTimeout)
+ {
+ // Timeout reached, end with error
+ fail("checkConnection: DS " + rb.getServerId() + " is not connected to "
+ + "the RS port " + rsPort + " after " + secTimeout + " seconds.");
+ }
+ }
+ }
+
/**
* Open a replicationServer session to the local ReplicationServer
* with a default value generationId.
@@ -260,9 +346,9 @@
int port, int timeout, ServerState state, long generationId)
throws Exception, SocketException
{
- ReplicationBroker broker = new ReplicationBroker(
+ ReplicationBroker broker = new ReplicationBroker(null,
state, baseDn, serverId, 0, 0, 0, 0, window_size, 0, generationId,
- getReplSessionSecurity());
+ getReplSessionSecurity(), (byte)1);
ArrayList<String> servers = new ArrayList<String>(1);
servers.add("localhost:" + port);
broker.start(servers);
@@ -300,10 +386,10 @@
else
state = new ServerState();
- ReplicationBroker broker = new ReplicationBroker(
+ ReplicationBroker broker = new ReplicationBroker(null,
state, baseDn, serverId, maxRcvQueue, 0,
maxSendQueue, 0, window_size, 0, generationId,
- getReplSessionSecurity());
+ getReplSessionSecurity(), (byte)1);
ArrayList<String> servers = new ArrayList<String>(1);
servers.add("localhost:" + port);
broker.start(servers);
@@ -319,10 +405,10 @@
{
while (true)
{
- ReplicationMessage rMsg = broker.receive();
- if (rMsg instanceof ErrorMessage)
+ ReplicationMsg rMsg = broker.receive();
+ if (rMsg instanceof ErrorMsg)
{
- ErrorMessage eMsg = (ErrorMessage)rMsg;
+ ErrorMsg eMsg = (ErrorMsg)rMsg;
logError(new MessageBuilder(
"ReplicationTestCase/openReplicationSession ").append(
" received ErrorMessage when emptying old changes ").append(
@@ -362,10 +448,8 @@
if ((op.getResultCode() != ResultCode.SUCCESS) &&
(op.getResultCode() != ResultCode.NO_SUCH_OBJECT))
{
- logError(Message.raw(Category.SYNC, Severity.NOTICE,
- "ReplicationTestCase/Cleaning config entries" +
- "DEL " + dn +
- " failed " + op.getResultCode().getResultCodeName()));
+ fail("ReplicationTestCase/Cleaning config entries DEL " + dn +
+ " failed: " + op.getResultCode().getResultCodeName());
}
}
}
@@ -373,6 +457,7 @@
// done
}
synchroServerEntry = null;
+ replServerEntry = null;
}
/**
@@ -417,20 +502,120 @@
/**
* Clean up the environment. return null;
*
- * @throws Exception
- * If the environment could not be set up.
+ * @throws Exception If the environment could not be set up.
*/
@AfterClass
public void classCleanUp() throws Exception
{
- cleanConfigEntries();
- cleanRealEntries();
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ " ##### Calling ReplicationTestCase.classCleanUp ##### "));
- entryList = null;
+ cleanConfigEntries();
configEntryList = null;
- // In-core restart to cleanup.
- TestCaseUtils.restartServer();
+ cleanRealEntries();
+ entryList = null;
+
+ // Clear the test backend (TestCaseUtils.TEST_ROOT_DN_STRING)
+ // (in case our test created some emtries in it)
+ TestCaseUtils.initializeTestBackend(true);
+
+ // Clean the default DB dir for replication server
+ String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
+ String rsDbDirPath = buildRoot + File.separator + "build" +
+ File.separator + "unit-tests" + File.separator +
+ "package-instance"+ File.separator + "changelogDb";
+
+ File rsDbDir = new File(rsDbDirPath);
+ if (rsDbDir != null)
+ {
+ File[] dbFiles = rsDbDir.listFiles();
+ if (dbFiles != null)
+ {
+ for (File dbFile : dbFiles)
+ {
+ if (dbFile != null)
+ TRACER.debugInfo("ReplicationTestCase: classCleanUp: deleting " + dbFile);
+ dbFile.delete();
+ }
+ }
+ TRACER.debugInfo("ReplicationTestCase: classCleanUp: deleting " + rsDbDir);
+ rsDbDir.delete();
+ }
+
+ // Check for unexpected replication config/objects left
+ if (callParanoiaCheck)
+ paranoiaCheck();
+ }
+
+ /**
+ * After having run, each replication test should not leave any of the following:
+ * - config entry for replication server
+ * - config entry for a replication domain
+ * - replication domain object
+ * - config entry for a replication changes backend
+ * - replication changes backend object
+ * This method checks for existence of anything of that type.
+ */
+ protected void paranoiaCheck()
+ {
+ logError(Message.raw(Category.SYNC, Severity.NOTICE,
+ "Performing paranoia check"));
+
+ // Check for config entries for replication server
+ assertNoConfigEntriesWithFilter("(objectclass=ds-cfg-replication-server)",
+ "Found unexpected replication server config left");
+
+ // Check for config entries for replication domain
+ assertNoConfigEntriesWithFilter("(objectclass=ds-cfg-replication-domain)",
+ "Found unexpected replication domain config left");
+
+ // Check for config entries for replication changes backend
+ assertNoConfigEntriesWithFilter(
+ "(ds-cfg-java-class=org.opends.server.replication.server.ReplicationBackend)",
+ "Found unexpected replication changes backend config left");
+
+ // Check for left domain object
+ assertEquals(MultimasterReplication.getNumberOfDomains(), 0, "Some replication domain objects left");
+
+ // Check for left replication changes backend object
+ assertEquals(DirectoryServer.getBackend("replicationChanges"), null, "Replication changes backend object has been left");
+ }
+
+ /**
+ * Performs a search on the config backend with the specified filter.
+ * Fails if a config entry is found.
+ * @param filter The filter to apply for the search
+ * @param errorMsg The error message to display if a config entry is found
+ */
+ private void assertNoConfigEntriesWithFilter(String filter, String errorMsg)
+ {
+ try
+ {
+ // Search for matching entries in config backend
+ InternalSearchOperation op = connection.processSearch(
+ new ASN1OctetString("cn=config"),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode(filter));
+
+ assertEquals(op.getResultCode(), ResultCode.SUCCESS,
+ op.getErrorMessage().toString());
+
+ // Check that no entries have been found
+ LinkedList<SearchResultEntry> entries = op.getSearchEntries();
+ assertTrue(entries != null);
+ StringBuffer sb = new StringBuffer();
+ for (SearchResultEntry entry : entries)
+ {
+ sb.append(entry.toLDIFString());
+ sb.append(' ');
+ }
+ assertEquals(entries.size(), 0, errorMsg + ":\n" + sb);
+ } catch (Exception e)
+ {
+ fail("assertNoConfigEntriesWithFilter: could not search config backend" +
+ "with filter: " + filter + ": " + e.getMessage());
+ }
}
/**
@@ -534,7 +719,7 @@
AttributeType attrType =
DirectoryServer.getAttributeType(attrTypeStr, true);
- found = tmpAttr.hasValue(new AttributeValue(attrType, valueString));
+ found = tmpAttr.contains(new AttributeValue(attrType, valueString));
}
}
@@ -641,11 +826,7 @@
*/
protected List<Modification> generatemods(String attrName, String attrValue)
{
- AttributeType attrType =
- DirectoryServer.getAttributeType(attrName.toLowerCase(), true);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(attrType, attrValue));
- Attribute attr = new Attribute(attrType, attrName, values);
+ Attribute attr = Attributes.create(attrName, attrValue);
List<Modification> mods = new ArrayList<Modification>();
Modification mod = new Modification(ModificationType.REPLACE, attr);
mods.add(mod);
@@ -924,13 +1105,11 @@
TRACER.debugInfo(entry.getDN() +
" added " + addOp.getResultCode());
}
- // They will be removed at the end of the test
- entryList.addLast(entry.getDN());
}
}
catch(Exception e)
{
fail("addEntries Exception:"+ e.getMessage() + " " + stackTraceToSingleLineString(e));
}
- }
+ }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
index e164da4..b388847 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
@@ -34,7 +34,6 @@
import java.io.FileInputStream;
import java.net.ServerSocket;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.List;
import org.opends.server.TestCaseUtils;
@@ -49,11 +48,11 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.replication.common.ChangeNumberGenerator;
import org.opends.server.replication.plugin.ReplicationBroker;
+import org.opends.server.replication.protocol.DeleteMsg;
import org.opends.server.replication.protocol.ModifyMsg;
-import org.opends.server.replication.protocol.ReplicationMessage;
+import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
@@ -82,8 +81,9 @@
@BeforeClass
public void setUp() throws Exception
{
+ super.setUp();
+
// This test suite depends on having the schema available.
- TestCaseUtils.startServer();
// find a free port for the replicationServer
ServerSocket socket = TestCaseUtils.bindFreePort();
@@ -93,29 +93,24 @@
// Create an internal connection
connection = InternalClientConnection.getRootConnection();
- // top level synchro provider
- String synchroStringDN = "cn=Synchronization Providers,cn=config";
-
- // Multimaster Synchro plugin
- synchroPluginStringDN = "cn=Multimaster Synchronization, "
- + synchroStringDN;
-
// Change log
String replServerLdif =
- "dn: " + "cn=Replication Server, " + synchroPluginStringDN + "\n"
+ "dn: " + "cn=Replication Server, " + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-server\n"
+ "cn: Replication Server\n"
+ "ds-cfg-replication-port: " + replServerPort + "\n"
- + "ds-cfg-replication-server-id: 1\n";
+ + "ds-cfg-replication-db-directory: SchemaReplicationTest\n"
+ + "ds-cfg-replication-server-id: 105\n";
replServerEntry = TestCaseUtils.entryFromLdifString(replServerLdif);
// suffix synchronized
+ String testName = "schemaReplicationTest";
String domainLdif =
- "dn: cn=example, cn=domains, " + synchroPluginStringDN + "\n"
+ "dn: cn=" + testName + ", cn=domains, " + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-domain\n"
- + "cn: example\n"
+ + "cn: " + testName + "\n"
+ "ds-cfg-base-dn: cn=schema\n"
+ "ds-cfg-replication-server: localhost:" + replServerPort + "\n"
+ "ds-cfg-server-id: 1\n";
@@ -142,11 +137,8 @@
try
{
// Modify the schema
- AttributeType attrType =
- DirectoryServer.getAttributeType("attributetypes", true);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(attrType, "( 2.5.44.77.33 NAME 'dummy' )"));
- Attribute attr = new Attribute(attrType, "attributetypes", values);
+ Attribute attr = Attributes.create("attributetypes",
+ "( 2.5.44.77.33 NAME 'dummy' )");
List<Modification> mods = new ArrayList<Modification>();
Modification mod = new Modification(ModificationType.ADD, attr);
mods.add(mod);
@@ -161,7 +153,7 @@
"The original operation failed: " + code.getResultCodeName());
// See if the client has received the msg
- ReplicationMessage msg = broker.receive();
+ ReplicationMsg msg = broker.receive();
assertTrue(msg instanceof ModifyMsg,
"The received replication message is not a MODIFY msg");
@@ -201,7 +193,13 @@
code = modOp.getResultCode();
assertTrue(code.equals(ResultCode.SUCCESS),
- "The original operation failed");
+ "The original operation failed" + code.getResultCodeName());
+
+ // See if the client has received the msg
+ msg = broker.receive();
+
+ assertTrue(msg instanceof ModifyMsg,
+ "The received replication message is not a MODIFY msg");
}
finally
{
@@ -224,18 +222,25 @@
ReplicationBroker broker =
openReplicationSession(baseDn, (short) 2, 100, replServerPort, 5000, true);
- ChangeNumberGenerator gen = new ChangeNumberGenerator((short)2, 0);
+ try
+ {
+ ChangeNumberGenerator gen = new ChangeNumberGenerator((short) 2, 0);
- ModifyMsg modMsg = new ModifyMsg(gen.newChangeNumber(),
- baseDn, rcvdMods, "cn=schema");
- broker.publish(modMsg);
+ ModifyMsg modMsg = new ModifyMsg(gen.newChangeNumber(),
+ baseDn, rcvdMods, "cn=schema");
+ broker.publish(modMsg);
- boolean found = checkEntryHasAttribute(baseDn, "attributetypes",
- "( 2.5.44.77.33 NAME 'dummy' )",
- 10000, true);
+ boolean found = checkEntryHasAttribute(baseDn, "attributetypes",
+ "( 2.5.44.77.33 NAME 'dummy' )",
+ 10000, true);
- if (found == false)
- fail("The modification has not been correctly replayed.");
+ if (found == false)
+ fail("The modification has not been correctly replayed.");
+ }
+ finally
+ {
+ broker.stop();
+ }
}
/**
@@ -256,89 +261,89 @@
ReplicationBroker broker =
openReplicationSession(baseDn, (short) 3, 100, replServerPort, 5000, true);
-
- // create a schema change Notification
- AttributeType attrType =
- DirectoryServer.getAttributeType("attributetypes", true);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(attrType, "( 2.5.44.76.35 NAME 'push' )"));
- Attribute attr = new Attribute(attrType, "attributetypes", values);
- List<Modification> mods = new ArrayList<Modification>();
- Modification mod = new Modification(ModificationType.ADD, attr);
- mods.add(mod);
-
- for (SynchronizationProvider<SynchronizationProviderCfg> provider :
- DirectoryServer.getSynchronizationProviders())
+
+ try
{
- provider.processSchemaChange(mods);
- }
+ // create a schema change Notification
+ Attribute attr = Attributes.create("attributetypes",
+ "( 2.5.44.76.35 NAME 'push' )");
+ List<Modification> mods = new ArrayList<Modification>();
+ Modification mod = new Modification(ModificationType.ADD, attr);
+ mods.add(mod);
- // receive the message on the broker side.
- ReplicationMessage msg = broker.receive();
-
- assertTrue(msg instanceof ModifyMsg,
- "The received replication message is not a MODIFY msg");
- ModifyMsg modMsg = (ModifyMsg) msg;
-
- Operation receivedOp = modMsg.createOperation(connection);
- assertTrue(DN.decode(modMsg.getDn()).compareTo(baseDn) == 0,
- "The received message is not for cn=schema");
-
- assertTrue(receivedOp instanceof ModifyOperation,
- "The received replication message is not a MODIFY msg");
- ModifyOperation receivedModifyOperation = (ModifyOperation) receivedOp;
-
- List<RawModification> rcvdRawMods =
- receivedModifyOperation.getRawModifications();
-
- this.rcvdMods = new ArrayList<Modification>();
- for (RawModification m : rcvdRawMods)
- {
- this.rcvdMods.add(m.toModification());
- }
-
- assertTrue(this.rcvdMods.contains(mod),
- "The received mod does not contain the original change");
-
- // check that the schema files were updated with the new ServerState.
- // by checking that the ChangeNUmber of msg we just received has been
- // added to the user schema file.
-
- // build the string to find in the schema file
- String stateStr = modMsg.getChangeNumber().toString();
-
- // open the schema file
- String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
- String path = buildRoot + File.separator + "build" + File.separator +
- "unit-tests" + File.separator + "package-instance" +
- File.separator +
- "config" + File.separator + "schema" + File.separator +
- "99-user.ldif";
-
- // it is necessary to loop on this check because the state is not
- // written immediately but only every so often.
- int count = 0;
- while (true)
- {
- File file = new File(path);
- FileInputStream input = new FileInputStream(file);
- byte[] bytes = new byte[input.available()];
- input.read(bytes);
- String fileStr = new String(bytes);
- if (fileStr.indexOf(stateStr) != -1)
+ for (SynchronizationProvider<SynchronizationProviderCfg> provider : DirectoryServer.
+ getSynchronizationProviders())
{
- break;
+ provider.processSchemaChange(mods);
}
- else
+
+ // receive the message on the broker side.
+ ReplicationMsg msg = broker.receive();
+
+ assertTrue(msg instanceof ModifyMsg,
+ "The received replication message is not a MODIFY msg");
+ ModifyMsg modMsg = (ModifyMsg) msg;
+
+ Operation receivedOp = modMsg.createOperation(connection);
+ assertTrue(DN.decode(modMsg.getDn()).compareTo(baseDn) == 0,
+ "The received message is not for cn=schema");
+
+ assertTrue(receivedOp instanceof ModifyOperation,
+ "The received replication message is not a MODIFY msg");
+ ModifyOperation receivedModifyOperation = (ModifyOperation) receivedOp;
+
+ List<RawModification> rcvdRawMods =
+ receivedModifyOperation.getRawModifications();
+
+ this.rcvdMods = new ArrayList<Modification>();
+ for (RawModification m : rcvdRawMods)
{
- if (count++ > 50)
+ this.rcvdMods.add(m.toModification());
+ }
+
+ assertTrue(this.rcvdMods.contains(mod),
+ "The received mod does not contain the original change");
+
+ // check that the schema files were updated with the new ServerState.
+ // by checking that the ChangeNUmber of msg we just received has been
+ // added to the user schema file.
+
+ // build the string to find in the schema file
+ String stateStr = modMsg.getChangeNumber().toString();
+
+ // open the schema file
+ String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
+ String path = buildRoot + File.separator + "build" + File.separator +
+ "unit-tests" + File.separator + "package-instance" + File.separator +
+ "config" + File.separator + "schema" + File.separator +
+ "99-user.ldif";
+
+ // it is necessary to loop on this check because the state is not
+ // written immediately but only every so often.
+ int count = 0;
+ while (true)
+ {
+ File file = new File(path);
+ FileInputStream input = new FileInputStream(file);
+ byte[] bytes = new byte[input.available()];
+ input.read(bytes);
+ String fileStr = new String(bytes);
+ if (fileStr.indexOf(stateStr) != -1)
{
- fail("The Schema persistentState (changenumber:"
- + stateStr + ") has not been saved to " + path + " : " + fileStr);
+ break;
+ } else
+ {
+ if (count++ > 50)
+ {
+ fail("The Schema persistentState (changenumber:" + stateStr +
+ ") has not been saved to " + path + " : " + fileStr);
+ } else
+ TestCaseUtils.sleep(100);
}
- else
- TestCaseUtils.sleep(100);
}
+ } finally
+ {
+ broker.stop();
}
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
index 865bd4e..a9f7815 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
@@ -49,8 +49,9 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.replication.plugin.ReplicationBroker;
import org.opends.server.replication.protocol.AddMsg;
-import org.opends.server.replication.protocol.ReplicationMessage;
+import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
@@ -60,6 +61,7 @@
import org.opends.server.types.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
/**
* Stress test for the synchronization code using the ReplicationBroker API.
@@ -88,7 +90,7 @@
logError(Message.raw(Category.SYNC, Severity.NOTICE,
"Starting replication StressTest : fromServertoBroker"));
- final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
+ final DN baseDn = DN.decode("ou=People," + TEST_ROOT_DN_STRING);
final int TOTAL_MESSAGES = 1000;
ReplicationBroker broker =
@@ -110,13 +112,12 @@
tmp.getObjectClasses(), tmp.getUserAttributes(),
tmp.getOperationalAttributes());
addOp.run();
- entryList.add(personEntry.getDN());
assertTrue(DirectoryServer.entryExists(personEntry.getDN()),
"The Add Entry operation failed");
if (ResultCode.SUCCESS == addOp.getResultCode())
{
// Check if the client has received the msg
- ReplicationMessage msg = broker.receive();
+ ReplicationMsg msg = broker.receive();
assertTrue(msg instanceof AddMsg,
"The received replication message is not an ADD msg");
@@ -176,38 +177,19 @@
@BeforeClass
public void setUp() throws Exception
{
+ super.setUp();
+
// This test suite depends on having the schema available.
- TestCaseUtils.restartServer();
// Create an internal connection
connection = InternalClientConnection.getRootConnection();
- // Create backend top level entries
- String[] topEntries = new String[2];
- topEntries[0] = "dn: dc=example,dc=com\n" + "objectClass: top\n"
- + "objectClass: domain\n";
- topEntries[1] = "dn: ou=People,dc=example,dc=com\n" + "objectClass: top\n"
+ // Create necessary backend top level entry
+ String topEntry = "dn: ou=People," + TEST_ROOT_DN_STRING + "\n"
+ + "objectClass: top\n"
+ "objectClass: organizationalUnit\n"
+ "entryUUID: 11111111-1111-1111-1111-111111111111\n";
- Entry entry;
- for (int i = 0; i < topEntries.length; i++)
- {
- entry = TestCaseUtils.entryFromLdifString(topEntries[i]);
- AddOperationBasis addOp = new AddOperationBasis(connection,
- InternalClientConnection.nextOperationID(), InternalClientConnection
- .nextMessageID(), null, entry.getDN(), entry.getObjectClasses(),
- entry.getUserAttributes(), entry.getOperationalAttributes());
- addOp.setInternalOperation(true);
- addOp.run();
- entryList.add(entry.getDN());
- }
-
- // top level synchro provider
- String synchroStringDN = "cn=Synchronization Providers,cn=config";
-
- // Multimaster Synchro plugin
- synchroPluginStringDN = "cn=Multimaster Synchronization, "
- + synchroStringDN;
+ TestCaseUtils.addEntry(topEntry);
// find a free port for the replicationServer
ServerSocket socket = TestCaseUtils.bindFreePort();
@@ -216,26 +198,28 @@
// Change log
String replServerLdif =
- "dn: cn=Replication Server, " + synchroPluginStringDN + "\n"
+ "dn: cn=Replication Server, " + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-server\n"
+ "cn: Replication Server\n"
+ "ds-cfg-replication-port: " + replServerPort + "\n"
- + "ds-cfg-replication-server-id: 1\n";
+ + "ds-cfg-replication-db-directory: StressTest\n"
+ + "ds-cfg-replication-server-id: 106\n";
replServerEntry = TestCaseUtils.entryFromLdifString(replServerLdif);
// suffix synchronized
+ String testName = "stressTest";
String synchroServerLdif =
- "dn: " + "cn=example, cn=domains, " + synchroPluginStringDN + "\n"
+ "dn: cn=" + testName + ", cn=domains, " + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-domain\n"
- + "cn: example\n"
- + "ds-cfg-base-dn: ou=People,dc=example,dc=com\n"
+ + "cn: " + testName + "\n"
+ + "ds-cfg-base-dn: ou=People," + TEST_ROOT_DN_STRING + "\n"
+ "ds-cfg-replication-server: localhost:" + replServerPort + "\n"
+ "ds-cfg-server-id: 1\n" + "ds-cfg-receive-status: true\n";
synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
- String personLdif = "dn: uid=user.1,ou=People,dc=example,dc=com\n"
+ String personLdif = "dn: uid=user.1,ou=People," + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n" + "objectClass: person\n"
+ "objectClass: organizationalPerson\n"
+ "objectClass: inetOrgPerson\n" + "uid: user.1\n"
@@ -318,7 +302,7 @@
{
while (true)
{
- ReplicationMessage msg = broker.receive();
+ ReplicationMsg msg = broker.receive();
if (msg == null)
break;
count ++;
@@ -376,13 +360,13 @@
{
Attribute attr;
if (reader == null)
- attr = new Attribute("received-messages", "not yet started");
+ attr = Attributes.create("received-messages", "not yet started");
else
- attr = new Attribute("received-messages",
- String.valueOf(reader.getCurrentCount()));
- List<Attribute> list = new LinkedList<Attribute>();
+ attr = Attributes.create("received-messages", String
+ .valueOf(reader.getCurrentCount()));
+ List<Attribute> list = new LinkedList<Attribute>();
list.add(attr);
- attr = new Attribute("base-dn", "ou=People,dc=example,dc=com");
+ attr = Attributes.create("base-dn", "ou=People," + TEST_ROOT_DN_STRING);
list.add(attr);
return list;
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
index 51f1e21..4bf87f1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -37,7 +37,6 @@
import java.net.ServerSocket;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.concurrent.locks.Lock;
@@ -66,11 +65,12 @@
import org.opends.server.replication.protocol.HeartbeatThread;
import org.opends.server.replication.protocol.ModifyDNMsg;
import org.opends.server.replication.protocol.ModifyMsg;
-import org.opends.server.replication.protocol.ReplicationMessage;
+import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.LockManager;
@@ -84,6 +84,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
/**
* Test synchronization of update operations on the directory server and through
@@ -123,7 +124,7 @@
private Entry domain1;
private Entry domain2;
private Entry domain3;
-
+
Short domainSid = 55;
/**
@@ -136,28 +137,16 @@
@Override
public void setUp() throws Exception
{
- super.setUp();
+ super.setUp();
- // Create backend top level entries
- String[] topEntries = new String[2];
- topEntries[0] = "dn: dc=example,dc=com\n" + "objectClass: top\n"
- + "objectClass: domain\n";
- topEntries[1] = "dn: ou=People,dc=example,dc=com\n" + "objectClass: top\n"
+ // Create necessary backend top level entry
+ String topEntry = "dn: ou=People," + TEST_ROOT_DN_STRING + "\n"
+ + "objectClass: top\n"
+ "objectClass: organizationalUnit\n"
+ "entryUUID: 11111111-1111-1111-1111-111111111111\n";
- for (String entryStr : topEntries)
- {
- addEntry(TestCaseUtils.entryFromLdifString(entryStr));
- }
+ addEntry(TestCaseUtils.entryFromLdifString(topEntry));
- baseUUID = getEntryUUID(DN.decode("ou=People,dc=example,dc=com"));
-
- // top level synchro provider
- String synchroStringDN = "cn=Synchronization Providers,cn=config";
-
- // Multimaster Synchro plugin
- synchroPluginStringDN = "cn=Multimaster Synchronization, "
- + synchroStringDN;
+ baseUUID = getEntryUUID(DN.decode("ou=People," + TEST_ROOT_DN_STRING));
// find a free port for the replicationServer
ServerSocket socket = TestCaseUtils.bindFreePort();
@@ -166,27 +155,29 @@
// replication server
String replServerLdif =
- "dn: cn=Replication Server, " + synchroPluginStringDN + "\n"
+ "dn: cn=Replication Server, " + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-server\n"
+ "cn: Replication Server\n"
+ "ds-cfg-replication-port: " + replServerPort + "\n"
- + "ds-cfg-replication-server-id: 1\n";
+ + "ds-cfg-replication-db-directory: UpdateOperationTest\n"
+ + "ds-cfg-replication-server-id: 107\n";
replServerEntry = TestCaseUtils.entryFromLdifString(replServerLdif);
// suffix synchronized
+ String testName = "updateOperationTest";
String synchroServerLdif =
- "dn: cn=example, cn=domains, " + synchroPluginStringDN + "\n"
+ "dn: cn=" + testName + ", cn=domains, " + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-domain\n"
- + "cn: example\n"
- + "ds-cfg-base-dn: ou=People,dc=example,dc=com\n"
+ + "cn: " + testName + "\n"
+ + "ds-cfg-base-dn: ou=People," + TEST_ROOT_DN_STRING + "\n"
+ "ds-cfg-replication-server: localhost:" + replServerPort + "\n"
- + "ds-cfg-server-id: "+ domainSid +"\n"
+ + "ds-cfg-server-id: "+ domainSid +"\n"
+ "ds-cfg-receive-status: true\n";
synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
- String personLdif = "dn: uid=user.1,ou=People,dc=example,dc=com\n"
+ String personLdif = "dn: uid=user.1,ou=People," + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n" + "objectClass: person\n"
+ "objectClass: organizationalPerson\n"
+ "objectClass: inetOrgPerson\n" + "uid: user.1\n"
@@ -209,7 +200,7 @@
*/
user1entryUUID = "33333333-3333-3333-3333-333333333333";
user1entrysecondUUID = "22222222-2222-2222-2222-222222222222";
- user1dn = "uid=user1,ou=People,dc=example,dc=com";
+ user1dn = "uid=user1,ou=People," + TEST_ROOT_DN_STRING;
String entryWithUUIDldif = "dn: "+ user1dn + "\n"
+ "objectClass: top\n" + "objectClass: person\n"
+ "objectClass: organizationalPerson\n"
@@ -244,9 +235,9 @@
+ "entryUUID: "+ user1entrysecondUUID + "\n";
personWithSecondUniqueID =
TestCaseUtils.entryFromLdifString(entryWithSecondUUID);
-
+
user3UUID = "44444444-4444-4444-4444-444444444444";
- user3dn = "uid=user3,ou=People,dc=example,dc=com";
+ user3dn = "uid=user3,ou=People," + TEST_ROOT_DN_STRING;
String user3LDIFEntry = "dn: "+ user3dn + "\n"
+ "objectClass: top\n" + "objectClass: person\n"
+ "objectClass: organizationalPerson\n"
@@ -264,19 +255,19 @@
+ "entryUUID: " + user3UUID + "\n";
user3Entry = TestCaseUtils.entryFromLdifString(user3LDIFEntry);
- domain1dn = "dc=domain1,ou=People,dc=example,dc=com";
- domain2dn = "dc=domain2,dc=domain1,ou=People,dc=example,dc=com";
- domain3dn = "dc=domain3,dc=domain1,ou=People,dc=example,dc=com";
+ domain1dn = "dc=domain1,ou=People," + TEST_ROOT_DN_STRING;
+ domain2dn = "dc=domain2,dc=domain1,ou=People," + TEST_ROOT_DN_STRING;
+ domain3dn = "dc=domain3,dc=domain1,ou=People," + TEST_ROOT_DN_STRING;
domain1 = TestCaseUtils.entryFromLdifString(
- "dn:" + domain1dn + "\n"
+ "dn:" + domain1dn + "\n"
+ "objectClass:domain\n"
+ "dc:domain1");
domain2 = TestCaseUtils.entryFromLdifString(
- "dn:" + domain2dn + "\n"
+ "dn:" + domain2dn + "\n"
+ "objectClass:domain\n"
+ "dc:domain2");
domain3 = TestCaseUtils.entryFromLdifString(
- "dn:" + domain3dn + "\n"
+ "dn:" + domain3dn + "\n"
+ "objectClass:domain\n"
+ "dc:domain3");
@@ -284,7 +275,7 @@
}
/**
- * Add an entry in the datatbase
+ * Add an entry in the database
*
*/
private void addEntry(Entry entry) throws Exception
@@ -295,11 +286,13 @@
entry.getUserAttributes(), entry.getOperationalAttributes());
addOp.setInternalOperation(true);
addOp.run();
+
+ assertEquals(addOp.getResultCode(), ResultCode.SUCCESS);
assertNotNull(getEntry(entry.getDN(), 1000, true));
}
-
+
/**
- * Delete an entry in the datatbase
+ * Delete an entry in the database
*
*/
private void delEntry(DN dn) throws Exception
@@ -320,7 +313,7 @@
logError(Message.raw(Category.SYNC, Severity.INFORMATION,
"Starting synchronization test : toggleReceiveStatus"));
- final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
+ final DN baseDn = DN.decode("ou=People," + TEST_ROOT_DN_STRING);
/*
* Open a session to the replicationServer using the broker API.
@@ -350,7 +343,6 @@
personWithUUIDEntry.getAttributes(), new ArrayList<Attribute>());
broker.publish(addMsg);
- entryList.add(personWithUUIDEntry.getDN());
Entry resultEntry;
// Check that the entry has not been created in the directory server.
@@ -400,9 +392,7 @@
logError(Message.raw(Category.SYNC, Severity.INFORMATION,
"Starting replication test : lostHeartbeatFailover"));
- cleanRealEntries();
-
- final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
+ final DN baseDn = DN.decode("ou=People," + TEST_ROOT_DN_STRING);
/*
* Open a session to the replicationServer using the broker API.
@@ -428,7 +418,6 @@
personWithUUIDEntry.getAttributes(), new ArrayList<Attribute>());
broker.publish(addMsg);
- entryList.add(personWithUUIDEntry.getDN());
Entry resultEntry;
// Check that the entry has been created in the directory server.
@@ -499,7 +488,7 @@
public void modifyConflicts()
throws Exception
{
- final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
+ final DN baseDn = DN.decode("ou=People," + TEST_ROOT_DN_STRING);
final DN dn1 = DN.decode("cn=test1," + baseDn.toString());
final AttributeType attrType =
DirectoryServer.getAttributeType("displayname");
@@ -530,7 +519,7 @@
Entry entry = DirectoryServer.getEntry(dn1);
List<Attribute> attrs = entry.getAttribute(entryuuidType);
String entryuuid =
- attrs.get(0).getValues().iterator().next().getStringValue();
+ attrs.get(0).iterator().next().getStringValue();
// A change on a first server.
ChangeNumber t1 = new ChangeNumber(1, (short) 0, (short) 3);
@@ -542,7 +531,7 @@
updateMonitorCount(baseDn, monitorAttr);
// Replay a replace of a value B at time t2 on a second server.
- Attribute attr = new Attribute(attrType.getNormalizedPrimaryName(), "B");
+ Attribute attr = Attributes.create(attrType, "B");
Modification mod = new Modification(ModificationType.REPLACE, attr);
List<Modification> mods = new ArrayList<Modification>(1);
mods.add(mod);
@@ -552,7 +541,7 @@
Thread.sleep(2000);
// Replay an add of a value A at time t1 on a first server.
- attr = new Attribute(attrType.getNormalizedPrimaryName(), "A");
+ attr = Attributes.create(attrType, "A");
mod = new Modification(ModificationType.ADD, attr);
mods = new ArrayList<Modification>(1);
mods.add(mod);
@@ -565,7 +554,7 @@
entry = DirectoryServer.getEntry(dn1);
attrs = entry.getAttribute(attrType);
String attrValue1 =
- attrs.get(0).getValues().iterator().next().getStringValue();
+ attrs.get(0).iterator().next().getStringValue();
// the value should be the last (time t2) value added
assertEquals(attrValue1, "B");
@@ -583,7 +572,7 @@
updateMonitorCount(baseDn, monitorAttr);
// Replay an delete of attribute displayname at time t2 on a second server.
- attr = new Attribute(attrType);
+ attr = Attributes.empty(attrType);
mod = new Modification(ModificationType.DELETE, attr);
mods = new ArrayList<Modification>(1);
mods.add(mod);
@@ -593,7 +582,7 @@
Thread.sleep(2000);
// Replay a replace of a value A at time t1 on a first server.
- attr = new Attribute(attrType.getNormalizedPrimaryName(), "A");
+ attr = Attributes.create(attrType, "A");
mod = new Modification(ModificationType.REPLACE, attr);
mods = new ArrayList<Modification>(1);
mods.add(mod);
@@ -620,7 +609,7 @@
*
* The test creates an other session to the replicationServer using
* directly the ReplicationBroker API.
- * It then uses this session to siomulate conflicts and therefore
+ * It then uses this session to simulate conflicts and therefore
* test the naming conflict resolution code.
*/
@Test(enabled=true, groups="slow")
@@ -629,7 +618,7 @@
logError(Message.raw(Category.SYNC, Severity.INFORMATION,
"Starting replication test : namingConflicts"));
- final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
+ final DN baseDn = DN.decode("ou=People," + TEST_ROOT_DN_STRING);
String resolvedMonitorAttr = "resolved-naming-conflicts";
String unresolvedMonitorAttr = "unresolved-naming-conflicts";
@@ -646,7 +635,6 @@
*/
ChangeNumberGenerator gen = new ChangeNumberGenerator((short) 2, 0);
-
/*
* Test that the conflict resolution code is able to find entries
* that have been renamed by an other master.
@@ -667,12 +655,11 @@
Entry resultEntry = getEntry(personWithUUIDEntry.getDN(), 10000, true);
assertNotNull(resultEntry,
"The send ADD replication message was not applied");
- entryList.add(resultEntry.getDN());
// send a modify operation with the correct unique ID but another DN
List<Modification> mods = generatemods("telephonenumber", "01 02 45");
ModifyMsg modMsg = new ModifyMsg(gen.newChangeNumber(),
- DN.decode("cn=something,ou=People,dc=example,dc=com"), mods,
+ DN.decode("cn=something,ou=People," + TEST_ROOT_DN_STRING), mods,
user1entryUUID);
updateMonitorCount(baseDn, resolvedMonitorAttr);
int AlertCount = DummyAlertHandler.getAlertCount();
@@ -684,15 +671,40 @@
if (found == false)
fail("The modification has not been correctly replayed.");
assertEquals(getMonitorDelta(), 1);
-
+
// check that there was no administrative alert generated
// because the conflict has been automatically resolved.
assertEquals(DummyAlertHandler.getAlertCount(), AlertCount,
"An alert was incorrectly generated when resolving conflicts");
-
+
+ /*
+ * Test that modify conflict resolution is able to detect that
+ * because there is a conflict between a MODIFYDN and a MODIFY,
+ * when a MODIFY is replayed the attribute that is being modified is
+ * now the RDN of the entry and therefore should not be deleted.
+ */
+ // send a modify operation attempting to replace the RDN entry
+ // with a new value
+ mods = generatemods("uid", "AnotherUid");
+ modMsg = new ModifyMsg(gen.newChangeNumber(),
+ personWithUUIDEntry.getDN(), mods,
+ user1entryUUID);
+
+ updateMonitorCount(baseDn, resolvedMonitorAttr);
+ AlertCount = DummyAlertHandler.getAlertCount();
+ broker.publish(modMsg);
+
+ // check that the modify has been applied.
+ found = checkEntryHasAttribute(personWithUUIDEntry.getDN(),
+ "uid", "AnotherUid", 10000, true);
+
+ if (found == false)
+ fail("The modification has not been correctly replayed.");
+ assertEquals(getMonitorDelta(), 1);
+
/*
* Test that the conflict resolution code is able to detect
- * that and entry have been renamed and that a new entry has
+ * that an entry has been renamed and that a new entry has
* been created with the same DN but another entry UUID
* To simulate this, create and entry with a given UUID and a given DN
* then send a modify operation using the same DN but another UUID.
@@ -712,7 +724,6 @@
resultEntry = getEntry(personWithUUIDEntry.getDN(), 10000, true);
assertNotNull(resultEntry,
"The ADD replication message was not applied");
- entryList.add(resultEntry.getDN());
// send a modify operation with a wrong unique ID but the same DN
mods = generatemods("telephonenumber", "02 01 03 05");
@@ -729,7 +740,7 @@
if (found == true)
fail("The modification has been replayed while it should not.");
assertEquals(getMonitorDelta(), 1);
-
+
// Check that there was no administrative alert generated
// because the conflict has been automatically resolved.
assertEquals(DummyAlertHandler.getAlertCount(), AlertCount,
@@ -747,7 +758,7 @@
// send a delete operation with a wrong dn but the unique ID of the entry
// used above
DeleteMsg delMsg =
- new DeleteMsg("cn=anotherdn,ou=People,dc=example,dc=com",
+ new DeleteMsg("cn=anotherdn,ou=People," + TEST_ROOT_DN_STRING,
gen.newChangeNumber(), user1entryUUID);
updateMonitorCount(baseDn, resolvedMonitorAttr);
AlertCount = DummyAlertHandler.getAlertCount();
@@ -781,7 +792,6 @@
resultEntry = getEntry(personWithUUIDEntry.getDN(), 10000, true);
assertNotNull(resultEntry,
"The ADD replication message was not applied");
- entryList.add(resultEntry.getDN());
// create an entry with the same DN and another unique ID
addMsg = new AddMsg(gen.newChangeNumber(),
@@ -830,7 +840,7 @@
* exist but with a parent ID that exist.
*/
addMsg = new AddMsg(gen.newChangeNumber(),
- "uid=new person,o=nothere,o=below,ou=People,dc=example,dc=com",
+ "uid=new person,o=nothere,o=below,ou=People," + TEST_ROOT_DN_STRING,
user1entryUUID,
baseUUID,
personWithUUIDEntry.getObjectClassAttribute(),
@@ -839,9 +849,9 @@
AlertCount = DummyAlertHandler.getAlertCount();
broker.publish(addMsg);
- // Check that the entry has been renamed and created in the local DS.
+ // Check that the entry has been created in the local DS.
resultEntry = getEntry(
- DN.decode("uid=new person,ou=People,dc=example,dc=com"), 10000, true);
+ DN.decode("uid=new person,ou=People," + TEST_ROOT_DN_STRING), 10000, true);
assertNotNull(resultEntry,
"The ADD replication message was not applied");
assertEquals(getMonitorDelta(), 1);
@@ -861,19 +871,19 @@
*/
delMsg =
- new DeleteMsg("uid=new person,ou=People,dc=example,dc=com",
+ new DeleteMsg("uid=new person,ou=People," + TEST_ROOT_DN_STRING,
gen.newChangeNumber(), "11111111-9abc-def0-1234-1234567890ab");
updateMonitorCount(baseDn, resolvedMonitorAttr);
AlertCount = DummyAlertHandler.getAlertCount();
broker.publish(delMsg);
resultEntry = getEntry(
- DN.decode("uid=new person,ou=People,dc=example,dc=com"), 10000, true);
+ DN.decode("uid=new person,ou=People," + TEST_ROOT_DN_STRING), 10000, true);
// check that the delete operation has not been applied
assertNotNull(resultEntry,
"The DELETE replication message was replayed when it should not");
assertEquals(getMonitorDelta(), 1);
-
+
// Check that there was no administrative alert generated
// because the conflict has been automatically resolved.
assertEquals(DummyAlertHandler.getAlertCount(), AlertCount,
@@ -890,22 +900,22 @@
*/
ModifyDNMsg modDnMsg = new ModifyDNMsg(
- "uid=new person,ou=People,dc=example,dc=com", gen.newChangeNumber(),
+ "uid=new person,ou=People," + TEST_ROOT_DN_STRING, gen.newChangeNumber(),
user1entryUUID, baseUUID, false,
- "uid=wrong, ou=people,dc=example,dc=com",
+ "uid=wrong, ou=people," + TEST_ROOT_DN_STRING,
"uid=newrdn");
updateMonitorCount(baseDn, resolvedMonitorAttr);
AlertCount = DummyAlertHandler.getAlertCount();
broker.publish(modDnMsg);
resultEntry = getEntry(
- DN.decode("uid=newrdn,ou=People,dc=example,dc=com"), 10000, true);
+ DN.decode("uid=newrdn,ou=People," + TEST_ROOT_DN_STRING), 10000, true);
// check that the operation has been correctly relayed
assertNotNull(resultEntry,
"The modify dn was not or badly replayed");
assertEquals(getMonitorDelta(), 1);
-
+
// Check that there was no administrative alert generated
// because the conflict has been automatically resolved.
assertEquals(DummyAlertHandler.getAlertCount(), AlertCount,
@@ -917,20 +927,20 @@
*/
modDnMsg = new ModifyDNMsg(
- "uid=wrong,ou=People,dc=example,dc=com", gen.newChangeNumber(),
- user1entryUUID, baseUUID, false, null, "uid=reallynewrdn");
+ "uid=wrong,ou=People," + TEST_ROOT_DN_STRING, gen.newChangeNumber(),
+ user1entryUUID, null, false, null, "uid=reallynewrdn");
updateMonitorCount(baseDn, resolvedMonitorAttr);
AlertCount = DummyAlertHandler.getAlertCount();
broker.publish(modDnMsg);
resultEntry = getEntry(
- DN.decode("uid=reallynewrdn,ou=People,dc=example,dc=com"), 10000, true);
+ DN.decode("uid=reallynewrdn,ou=People," + TEST_ROOT_DN_STRING), 10000, true);
// check that the operation has been correctly relayed
assertNotNull(resultEntry,
"The modify dn was not or badly replayed");
assertEquals(getMonitorDelta(), 1);
-
+
// Check that there was no administrative alert generated
// because the conflict has been automatically resolved.
assertEquals(DummyAlertHandler.getAlertCount(), AlertCount,
@@ -968,11 +978,11 @@
// check that the second entry has been renamed
resultEntry = getEntry(
DN.decode("entryUUID = " + user1entrysecondUUID + "+uid=reallynewrdn," +
- "ou=People,dc=example,dc=com"), 10000, true);
+ "ou=People," + TEST_ROOT_DN_STRING), 10000, true);
assertNotNull(resultEntry, "The modifyDN was not or incorrectly replayed");
assertEquals(getMonitorDelta(), 1);
assertConflictAttribute(resultEntry);
-
+
// Check that there was no administrative alert generated
// because the conflict has been automatically resolved.
assertEquals(DummyAlertHandler.getAlertCount(), AlertCount+1,
@@ -981,11 +991,11 @@
// delete the entries to clean the database
delMsg =
- new DeleteMsg("uid=reallynewrdn,ou=People,dc=example,dc=com",
+ new DeleteMsg("uid=reallynewrdn,ou=People," + TEST_ROOT_DN_STRING,
gen.newChangeNumber(), user1entryUUID);
broker.publish(delMsg);
resultEntry = getEntry(
- DN.decode("uid=reallynewrdn,ou=People,dc=example,dc=com"), 10000, false);
+ DN.decode("uid=reallynewrdn,ou=People," + TEST_ROOT_DN_STRING), 10000, false);
// check that the delete operation has been applied
assertNull(resultEntry,
@@ -994,13 +1004,13 @@
delMsg =
new DeleteMsg("entryUUID = " + user1entrysecondUUID + "+" +
DN.decode(user1dn).getRDN().toString() +
- ",ou=People,dc=example,dc=com",
+ ",ou=People," + TEST_ROOT_DN_STRING,
gen.newChangeNumber(), user1entrysecondUUID);
broker.publish(delMsg);
resultEntry = getEntry(
DN.decode("entryUUID = " + user1entrysecondUUID + "+" +
DN.decode(user1dn).getRDN().toString() +
- ",ou=People,dc=example,dc=com"), 10000, false);
+ ",ou=People," + TEST_ROOT_DN_STRING), 10000, false);
// check that the delete operation has been applied
assertNull(resultEntry,
@@ -1038,7 +1048,6 @@
entry.getUserAttributes(), entry.getOperationalAttributes());
addOp.setInternalOperation(true);
addOp.run();
- entryList.add(entry.getDN());
}
resultEntry = getEntry(
DN.decode("ou=baseDn1,"+baseDn), 10000, true);
@@ -1061,7 +1070,6 @@
RDN.decode("ou=baseDn2"), true,
baseDn);
modDNOp.run();
- entryList.add(DN.decode("ou=baseDn2,"+baseDn));
resultEntry = getEntry(
DN.decode("ou=baseDn2,"+baseDn), 10000, true);
@@ -1079,7 +1087,6 @@
entry.getUserAttributes(), entry.getOperationalAttributes());
addOp.setInternalOperation(true);
addOp.run();
- entryList.add(entry.getDN());
// - publish msg
@@ -1087,7 +1094,7 @@
AlertCount = DummyAlertHandler.getAlertCount();
broker.publish(addMsg);
- // - check that the Dn has been changed to baseDn2
+ // - check that the DN has been changed to baseDn2
resultEntry = getEntry(
DN.decode("uid=new person,ou=baseDn1,"+baseDn), 10000, false);
assertNull(resultEntry,
@@ -1097,7 +1104,6 @@
DN.decode("uid=new person,ou=baseDn2,"+baseDn), 10000, true);
assertNotNull(resultEntry,
"The ADD replication message was NOT applied under ou=baseDn2,"+baseDn);
- entryList.add(resultEntry.getDN());
assertEquals(getMonitorDelta(), 1);
// Check that there was no administrative alert generated
@@ -1112,7 +1118,7 @@
// before the deleted is replayed gets renamed correctly.
//
- // add domain1 entry with 2 childs domain2 and domain3
+ // add domain1 entry with 2 children : domain2 and domain3
addEntry(domain1);
domain1uid = getEntryUUID(DN.decode(domain1dn));
addEntry(domain2);
@@ -1120,9 +1126,9 @@
addEntry(domain3);
domain3uid = getEntryUUID(DN.decode(domain3dn));
DN conflictDomain2dn = DN.decode(
- "entryUUID = " + domain2uid + "+dc=domain2,ou=people,dc=example,dc=com");
+ "entryUUID = " + domain2uid + "+dc=domain2,ou=people," + TEST_ROOT_DN_STRING);
DN conflictDomain3dn = DN.decode(
- "entryUUID = " + domain3uid + "+dc=domain3,ou=people,dc=example,dc=com");
+ "entryUUID = " + domain3uid + "+dc=domain3,ou=people," + TEST_ROOT_DN_STRING);
updateMonitorCount(baseDn, unresolvedMonitorAttr);
AlertCount = DummyAlertHandler.getAlertCount();
@@ -1187,9 +1193,9 @@
// this is correctly detected as a resolved conflict.
// To simulate this simply try a modifyDN on a non existent uid.
modDnMsg = new ModifyDNMsg(
- "uid=new person,ou=People,dc=example,dc=com", gen.newChangeNumber(),
+ "uid=new person,ou=People," + TEST_ROOT_DN_STRING, gen.newChangeNumber(),
"33343333-3533-3633-3373-333333833333", baseUUID, false,
- "uid=wrong, ou=people,dc=example,dc=com",
+ "uid=wrong, ou=people," + TEST_ROOT_DN_STRING,
"uid=newrdn");
updateMonitorCount(baseDn, resolvedMonitorAttr);
AlertCount = DummyAlertHandler.getAlertCount();
@@ -1222,10 +1228,10 @@
updateMonitorCount(baseDn, unresolvedMonitorAttr);
AlertCount = DummyAlertHandler.getAlertCount();
modDnMsg = new ModifyDNMsg(
- "uid=new person,ou=People,dc=example,dc=com", gen.newChangeNumber(),
+ "uid=new person,ou=People," + TEST_ROOT_DN_STRING, gen.newChangeNumber(),
"33333333-3333-3333-3333-333333333333",
"12343333-3533-3633-3333-333333833333" , false,
- "uid=wrong, ou=people,dc=example,dc=com",
+ "uid=wrong, ou=people," + TEST_ROOT_DN_STRING,
"uid=newrdn");
broker.publish(modDnMsg);
@@ -1245,8 +1251,8 @@
assertTrue(checkEntryHasAttribute(
DN.decode("uid=new person,ou=baseDn2,"+baseDn),
ReplicationDomain.DS_SYNC_CONFLICT,
- "uid=newrdn,ou=People,dc=example,dc=com", 1000, true));
-
+ "uid=newrdn,ou=baseDn2,ou=People," + TEST_ROOT_DN_STRING, 1000, true));
+
broker.stop();
}
@@ -1284,9 +1290,7 @@
Category.SYNC, Severity.INFORMATION,
"Starting replication test : updateOperations " + assured));
- final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
-
- cleanRealEntries();
+ final DN baseDn = DN.decode("ou=People," + TEST_ROOT_DN_STRING);
ReplicationBroker broker =
openReplicationSession(baseDn, (short) 27, 100, replServerPort, 1000, true);
@@ -1306,14 +1310,13 @@
tmp.getObjectClasses(), tmp.getUserAttributes(),
tmp.getOperationalAttributes());
addOp.run();
- entryList.add(personEntry.getDN());
assertTrue(DirectoryServer.entryExists(personEntry.getDN()),
"The Add Entry operation failed");
if (ResultCode.SUCCESS.equals(addOp.getResultCode()))
{
// Check if the client has received the msg
- ReplicationMessage msg = broker.receive();
+ ReplicationMsg msg = broker.receive();
assertTrue(msg instanceof AddMsg,
"The received replication message is not an ADD msg");
AddMsg addMsg = (AddMsg) msg;
@@ -1336,7 +1339,7 @@
modOp.run();
// See if the client has received the msg
- ReplicationMessage msg = broker.receive();
+ ReplicationMsg msg = broker.receive();
assertTrue(msg instanceof ModifyMsg,
"The received replication message is not a MODIFY msg");
ModifyMsg modMsg = (ModifyMsg) msg;
@@ -1346,12 +1349,12 @@
"The received MODIFY replication message is not for the excepted DN");
// Modify the entry DN
- DN newDN = DN.decode("uid= new person,ou=People,dc=example,dc=com") ;
+ DN newDN = DN.decode("uid= new person,ou=People," + TEST_ROOT_DN_STRING) ;
ModifyDNOperationBasis modDNOp = new ModifyDNOperationBasis(connection,
InternalClientConnection.nextOperationID(), InternalClientConnection
.nextMessageID(), null, personEntry.getDN(), RDN
.decode("uid=new person"), true, DN
- .decode("ou=People,dc=example,dc=com"));
+ .decode("ou=People," + TEST_ROOT_DN_STRING));
modDNOp.run();
assertTrue(DirectoryServer.entryExists(newDN),
"The MOD_DN operation didn't create the new person entry");
@@ -1372,7 +1375,7 @@
DeleteOperationBasis delOp = new DeleteOperationBasis(connection,
InternalClientConnection.nextOperationID(), InternalClientConnection
.nextMessageID(), null, DN
- .decode("uid= new person,ou=People,dc=example,dc=com"));
+ .decode("uid= new person,ou=People," + TEST_ROOT_DN_STRING));
delOp.run();
assertFalse(DirectoryServer.entryExists(newDN),
"Unable to delete the new person Entry");
@@ -1384,7 +1387,7 @@
DeleteMsg delMsg = (DeleteMsg) msg;
delMsg.createOperation(connection);
assertTrue(DN.decode(delMsg.getDn()).compareTo(DN
- .decode("uid= new person,ou=People,dc=example,dc=com")) == 0,
+ .decode("uid= new person,ou=People," + TEST_ROOT_DN_STRING)) == 0,
"The received DELETE message is not for the excepted DN");
/*
@@ -1399,7 +1402,7 @@
personWithUUIDEntry.getObjectClassAttribute(),
personWithUUIDEntry.getAttributes(), new ArrayList<Attribute>());
if (assured)
- addMsg.setAssured();
+ addMsg.setAssured(true);
broker.publish(addMsg);
/*
@@ -1408,7 +1411,6 @@
Entry resultEntry = getEntry(personWithUUIDEntry.getDN(), 10000, true);
assertNotNull(resultEntry,
"The send ADD replication message was not applied for "+personWithUUIDEntry.getDN().toString());
- entryList.add(resultEntry.getDN());
/*
* Test the reception of Modify Msg
@@ -1416,7 +1418,7 @@
modMsg = new ModifyMsg(gen.newChangeNumber(), personWithUUIDEntry.getDN(),
mods, user1entryUUID);
if (assured)
- modMsg.setAssured();
+ modMsg.setAssured(true);
broker.publish(modMsg);
boolean found = checkEntryHasAttribute(personWithUUIDEntry.getDN(),
@@ -1431,7 +1433,7 @@
modMsg = new ModifyMsg(gen.newChangeNumber(), personWithUUIDEntry.getDN(),
invalidMods, user1entryUUID);
if (assured)
- modMsg.setAssured();
+ modMsg.setAssured(true);
broker.publish(modMsg);
found = checkEntryHasAttribute(
@@ -1447,11 +1449,11 @@
user1entryUUID, null,
true, null, "uid= new person");
if (assured)
- moddnMsg.setAssured();
+ moddnMsg.setAssured(true);
broker.publish(moddnMsg);
resultEntry = getEntry(
- DN.decode("uid= new person,ou=People,dc=example,dc=com"), 10000, true);
+ DN.decode("uid= new person,ou=People," + TEST_ROOT_DN_STRING), 10000, true);
assertNotNull(resultEntry,
"The modify DN replication message was not applied");
@@ -1459,13 +1461,13 @@
/*
* Test the Reception of Delete Msg
*/
- delMsg = new DeleteMsg("uid= new person,ou=People,dc=example,dc=com",
+ delMsg = new DeleteMsg("uid= new person,ou=People," + TEST_ROOT_DN_STRING,
gen.newChangeNumber(), user1entryUUID);
if (assured)
- delMsg.setAssured();
+ delMsg.setAssured(true);
broker.publish(delMsg);
resultEntry = getEntry(
- DN.decode("uid= new person,ou=People,dc=example,dc=com"), 10000, false);
+ DN.decode("uid= new person,ou=People," + TEST_ROOT_DN_STRING), 10000, false);
assertNull(resultEntry,
"The DELETE replication message was not replayed");
@@ -1517,9 +1519,7 @@
List<Attribute> tmpAttrList = newEntry.getAttribute("entryuuid");
Attribute tmpAttr = tmpAttrList.get(0);
- LinkedHashSet<AttributeValue> vals = tmpAttr.getValues();
-
- for (AttributeValue val : vals)
+ for (AttributeValue val : tmpAttr)
{
found = val.getStringValue();
break;
@@ -1547,7 +1547,7 @@
logError(Message.raw(Category.SYNC, Severity.INFORMATION,
"Starting replication test : deleteNoSuchObject"));
- DN dn = DN.decode("cn=No Such Object,ou=People,dc=example,dc=com");
+ DN dn = DN.decode("cn=No Such Object,ou=People," + TEST_ROOT_DN_STRING);
DeleteOperationBasis op =
new DeleteOperationBasis(connection,
InternalClientConnection.nextOperationID(),
@@ -1568,8 +1568,8 @@
logError(Message.raw(Category.SYNC, Severity.INFORMATION,
"Starting replication test : infiniteReplayLoop"));
- final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
-
+ final DN baseDn = DN.decode("ou=People," + TEST_ROOT_DN_STRING);
+
Thread.sleep(2000);
ReplicationBroker broker =
openReplicationSession(baseDn, (short) 11, 100, replServerPort, 1000, true);
@@ -1578,7 +1578,7 @@
ChangeNumberGenerator gen = new ChangeNumberGenerator((short) 11, 0);
// Create a test entry.
- String personLdif = "dn: uid=user.2,ou=People,dc=example,dc=com\n"
+ String personLdif = "dn: uid=user.2,ou=People," + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n" + "objectClass: person\n"
+ "objectClass: organizationalPerson\n"
+ "objectClass: inetOrgPerson\n" + "uid: user.2\n"
@@ -1603,7 +1603,6 @@
tmp.getOperationalAttributes());
addOp.run();
assertEquals(addOp.getResultCode(), ResultCode.SUCCESS);
- entryList.add(tmp.getDN());
long initialCount = getMonitorAttrValue(baseDn, "replayed-updates");
@@ -1699,7 +1698,7 @@
* - make it receive an update with a CN in the future
* - do a local operation replicated on that domain
* - check that the update generated for that operation has a CN in the
- * future.
+ * future.
* @throws Exception
*/
@Test(enabled=true)
@@ -1709,8 +1708,8 @@
logError(Message.raw(Category.SYNC, Severity.INFORMATION,
"Starting synchronization test : CNGeneratorAdjust"));
- final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
-
+ final DN baseDn = DN.decode("ou=People," + TEST_ROOT_DN_STRING);
+
/*
* Open a session to the replicationServer using the broker API.
* This must use a different serverId to that of the directory server.
@@ -1736,7 +1735,6 @@
new ArrayList<Attribute>());
broker.publish(addMsg);
- entryList.add(personWithUUIDEntry.getDN());
Entry resultEntry;
// Check that the entry has not been created in the directory server.
@@ -1756,7 +1754,7 @@
modOp.run();
// See if the client has received the msg
- ReplicationMessage msg = broker.receive();
+ ReplicationMsg msg = broker.receive();
assertTrue(msg instanceof ModifyMsg,
"The received replication message is not a MODIFY msg");
ModifyMsg modMsg = (ModifyMsg) msg;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
index 7d12017..9264fe0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
@@ -27,7 +27,6 @@
package org.opends.server.replication.plugin;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.ReplicationTestCase;
@@ -36,6 +35,7 @@
import org.opends.server.replication.plugin.ValueInfo;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.util.TimeThread;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -124,9 +124,8 @@
assertTrue(attrInfo4.getValuesInfo().size() == 1);
// Check delete(LinkedHashSet<AttributeValue> values, ChangeNumber CN)
- LinkedHashSet<AttributeValue> attVals = new LinkedHashSet<AttributeValue>();
- attVals.add(att);
- attrInfo3.delete(attVals, updateTime) ;
+ AttributeType type = DirectoryServer.getAttributeType("description");
+ attrInfo3.delete(Attributes.create(type, att), updateTime) ;
assertTrue(attrInfo3.getValuesInfo().size() == 1);
// Check delete(ChangeNumber CN)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ComputeBestServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ComputeBestServerTest.java
index a576fa0..5057812 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ComputeBestServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ComputeBestServerTest.java
@@ -40,9 +40,8 @@
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.plugin.ReplicationBroker.ServerInfo;
import org.opends.server.types.DN;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
@@ -65,36 +64,10 @@
}
/**
- * Set up the environment.
- *
- * @throws Exception
- * If the environment could not be set up.
- */
- @BeforeClass
- @Override
- public void setUp() throws Exception
- {
- // Don't need server context in these tests
- }
-
- /**
- * Clean up the environment.
- *
- * @throws Exception
- * If the environment could not be set up.
- */
- @AfterClass
- @Override
- public void classCleanUp() throws Exception
- {
- // Don't need server context in these tests
- }
-
- /**
* Test with one replication server, nobody has a change number (simulates)
* very first connection.
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void testNullCNBoth() throws Exception
@@ -118,8 +91,8 @@
cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
mySt.update(cn);
- // Create replication servers state list
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
// State for server 1
ServerState aState = new ServerState();
@@ -127,18 +100,18 @@
aState.update(cn);
cn = new ChangeNumber(0L, 0, myId3);
aState.update(cn);
- rsStates.put(WINNER, aState);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
String bestServer =
- computeBestReplicationServer(mySt, rsStates, myId1, new DN());
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
assertEquals(bestServer, WINNER, "Wrong best replication server.");
}
-
+
/**
* Test with one replication server, only replication server has a non null
* changenumber for ds server id
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void testNullCNDS() throws Exception
@@ -161,8 +134,8 @@
cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
mySt.update(cn);
- // Create replication servers state list
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
// State for server 1
ServerState aState = new ServerState();
@@ -172,19 +145,19 @@
aState.update(cn);
cn = new ChangeNumber(0L, 0, myId3);
aState.update(cn);
- rsStates.put(WINNER, aState);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
String bestServer =
- computeBestReplicationServer(mySt, rsStates, myId1, new DN());
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
assertEquals(bestServer, WINNER, "Wrong best replication server.");
}
-
+
/**
* Test with one replication server, only ds server has a non null
* changenumber for ds server id but rs has a null one.
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void testNullCNRS() throws Exception
@@ -210,8 +183,8 @@
cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
mySt.update(cn);
- // Create replication servers state list
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
// State for server 1
ServerState aState = new ServerState();
@@ -219,10 +192,10 @@
aState.update(cn);
cn = new ChangeNumber(0L, 0, myId3);
aState.update(cn);
- rsStates.put(WINNER, aState);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
String bestServer =
- computeBestReplicationServer(mySt, rsStates, myId1, new DN());
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
assertEquals(bestServer, WINNER, "Wrong best replication server.");
}
@@ -230,7 +203,7 @@
/**
* Test with one replication server, up to date.
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void test1ServerUp() throws Exception
@@ -255,8 +228,8 @@
cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
mySt.update(cn);
- // Create replication servers state list
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
// State for server 1
ServerState aState = new ServerState();
@@ -266,10 +239,10 @@
aState.update(cn);
cn = new ChangeNumber(1L, 0, myId3);
aState.update(cn);
- rsStates.put(WINNER, aState);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
String bestServer =
- computeBestReplicationServer(mySt, rsStates, myId1, new DN());
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
assertEquals(bestServer, WINNER, "Wrong best replication server.");
}
@@ -277,7 +250,7 @@
/**
* Test with 2 replication servers, up to date.
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void test2ServersUp() throws Exception
@@ -303,8 +276,8 @@
cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
mySt.update(cn);
- // Create replication servers state list
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
// State for server 1
ServerState aState = new ServerState();
@@ -314,7 +287,7 @@
aState.update(cn);
cn = new ChangeNumber(1L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER1, aState);
+ rsInfos.put(LOOSER1, new ServerInfo(aState, (byte)1));
// State for server 2
aState = new ServerState();
@@ -324,18 +297,136 @@
aState.update(cn);
cn = new ChangeNumber(1L, 0, myId3);
aState.update(cn);
- rsStates.put(WINNER, aState);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
String bestServer =
- computeBestReplicationServer(mySt, rsStates, myId1, new DN());
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
+
+ assertEquals(bestServer, WINNER, "Wrong best replication server.");
+ }
+
+ /**
+ * Test with 2 replication servers, up to date, but 2 different group ids.
+ *
+ * @throws Exception If a problem occurred
+ */
+ @Test
+ public void testDiffGroup2ServersUp() throws Exception
+ {
+ String testCase = "testDiffGroup2ServersUp";
+
+ debugInfo("Starting " + testCase);
+
+ // definitions for server ids
+ short myId1 = 1;
+ short myId2 = 2;
+ short myId3 = 3;
+ // definitions for server names
+ final String WINNER = "winner";
+ final String LOOSER1 = "looser1";
+
+ // Create my state
+ ServerState mySt = new ServerState();
+ ChangeNumber cn = new ChangeNumber(1L, 0, myId1);
+ mySt.update(cn);
+ cn = new ChangeNumber(2L, 0, myId2); // Should not be used inside algo
+ mySt.update(cn);
+ cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
+ mySt.update(cn);
+
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
+
+ // State for server 1
+ ServerState aState = new ServerState();
+ cn = new ChangeNumber(1L, 0, myId1);
+ aState.update(cn);
+ cn = new ChangeNumber(1L, 0, myId2);
+ aState.update(cn);
+ cn = new ChangeNumber(1L, 0, myId3);
+ aState.update(cn);
+ // This server has less changes than the other one but it has the same
+ // group id as us so he should be the winner
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
+
+ // State for server 2
+ aState = new ServerState();
+ cn = new ChangeNumber(2L, 0, myId1);
+ aState.update(cn);
+ cn = new ChangeNumber(1L, 0, myId2);
+ aState.update(cn);
+ cn = new ChangeNumber(1L, 0, myId3);
+ aState.update(cn);
+ rsInfos.put(LOOSER1, new ServerInfo(aState, (byte)2));
+
+ String bestServer =
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
assertEquals(bestServer, WINNER, "Wrong best replication server.");
}
/**
+ * Test with 2 replication servers, none of them from our group id.
+ *
+ * @throws Exception If a problem occurred
+ */
+ @Test
+ public void testNotOurGroup() throws Exception
+ {
+ String testCase = "testNotOurGroup";
+
+ debugInfo("Starting " + testCase);
+
+ // definitions for server ids
+ short myId1 = 1;
+ short myId2 = 2;
+ short myId3 = 3;
+ // definitions for server names
+ final String WINNER = "winner";
+ final String LOOSER1 = "looser1";
+
+ // Create my state
+ ServerState mySt = new ServerState();
+ ChangeNumber cn = new ChangeNumber(1L, 0, myId1);
+ mySt.update(cn);
+ cn = new ChangeNumber(2L, 0, myId2); // Should not be used inside algo
+ mySt.update(cn);
+ cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
+ mySt.update(cn);
+
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
+
+ // State for server 1
+ ServerState aState = new ServerState();
+ cn = new ChangeNumber(1L, 0, myId1);
+ aState.update(cn);
+ cn = new ChangeNumber(1L, 0, myId2);
+ aState.update(cn);
+ cn = new ChangeNumber(1L, 0, myId3);
+ aState.update(cn);
+ rsInfos.put(LOOSER1, new ServerInfo(aState, (byte)2));
+
+ // State for server 2
+ aState = new ServerState();
+ cn = new ChangeNumber(2L, 0, myId1);
+ aState.update(cn);
+ cn = new ChangeNumber(2L, 0, myId2);
+ aState.update(cn);
+ cn = new ChangeNumber(2L, 0, myId3);
+ aState.update(cn);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)2));
+
+ String bestServer =
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
+
+ assertEquals(bestServer, WINNER, "Wrong best replication server.");
+ }
+
+ /**
* Test with 3 replication servers, up to date.
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void test3ServersUp() throws Exception
@@ -362,8 +453,8 @@
cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
mySt.update(cn);
- // Create replication servers state list
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
// State for server 1
ServerState aState = new ServerState();
@@ -373,7 +464,7 @@
aState.update(cn);
cn = new ChangeNumber(1L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER1, aState);
+ rsInfos.put(LOOSER1, new ServerInfo(aState, (byte)1));
// State for server 2
aState = new ServerState();
@@ -383,7 +474,7 @@
aState.update(cn);
cn = new ChangeNumber(3L, 0, myId3);
aState.update(cn);
- rsStates.put(WINNER, aState);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
// State for server 3
aState = new ServerState();
@@ -393,18 +484,89 @@
aState.update(cn);
cn = new ChangeNumber(1L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER2, aState);
+ rsInfos.put(LOOSER2, new ServerInfo(aState, (byte)1));
String bestServer =
- computeBestReplicationServer(mySt, rsStates, myId1, new DN());
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
assertEquals(bestServer, WINNER, "Wrong best replication server.");
}
/**
+ * Test with 3 replication servers, up to date, but 2 different group ids.
+ *
+ * @throws Exception If a problem occurred
+ */
+ @Test
+ public void testDiffGroup3ServersUp() throws Exception
+ {
+ String testCase = "testDiffGroup3ServersUp";
+
+ debugInfo("Starting " + testCase);
+
+ // definitions for server ids
+ short myId1 = 1;
+ short myId2 = 2;
+ short myId3 = 3;
+ // definitions for server names
+ final String WINNER = "winner";
+ final String LOOSER1 = "looser1";
+ final String LOOSER2 = "looser2";
+
+ // Create my state
+ ServerState mySt = new ServerState();
+ ChangeNumber cn = new ChangeNumber(1L, 0, myId1);
+ mySt.update(cn);
+ cn = new ChangeNumber(2L, 0, myId2); // Should not be used inside algo
+ mySt.update(cn);
+ cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
+ mySt.update(cn);
+
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
+
+ // State for server 1
+ ServerState aState = new ServerState();
+ cn = new ChangeNumber(1L, 0, myId1);
+ aState.update(cn);
+ cn = new ChangeNumber(1L, 0, myId2);
+ aState.update(cn);
+ cn = new ChangeNumber(1L, 0, myId3);
+ aState.update(cn);
+ rsInfos.put(LOOSER1, new ServerInfo(aState, (byte)1));
+
+ // State for server 2
+ aState = new ServerState();
+ cn = new ChangeNumber(2L, 0, myId1);
+ aState.update(cn);
+ cn = new ChangeNumber(1L, 0, myId2);
+ aState.update(cn);
+ cn = new ChangeNumber(3L, 0, myId3);
+ aState.update(cn);
+ rsInfos.put(LOOSER2, new ServerInfo(aState, (byte)2));
+
+ // State for server 3
+ aState = new ServerState();
+ cn = new ChangeNumber(3L, 0, myId1);
+ aState.update(cn);
+ cn = new ChangeNumber(2L, 0, myId2);
+ aState.update(cn);
+ cn = new ChangeNumber(1L, 0, myId3);
+ aState.update(cn);
+ // This server has less changes than looser2 but it has the same
+ // group id as us so he should be the winner
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
+
+ String bestServer =
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
+
+ assertEquals(bestServer, WINNER, "Wrong best replication server.");
+ }
+
+ /**
* Test with one replication server, late.
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void test1ServerLate() throws Exception
@@ -429,8 +591,8 @@
cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
mySt.update(cn);
- // Create replication servers state list
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
// State for server 1
ServerState aState = new ServerState();
@@ -440,18 +602,18 @@
aState.update(cn);
cn = new ChangeNumber(1L, 0, myId3);
aState.update(cn);
- rsStates.put(WINNER, aState);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
String bestServer =
- computeBestReplicationServer(mySt, rsStates, myId1, new DN());
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
assertEquals(bestServer, WINNER, "Wrong best replication server.");
}
-
+
/**
* Test with 2 replication servers, late.
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void test2ServersLate() throws Exception
@@ -477,8 +639,8 @@
cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
mySt.update(cn);
- // Create replication servers state list
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
// State for server 1
ServerState aState = new ServerState();
@@ -488,7 +650,7 @@
aState.update(cn);
cn = new ChangeNumber(10L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER1, aState);
+ rsInfos.put(LOOSER1, new ServerInfo(aState, (byte)1));
// State for server 2
aState = new ServerState();
@@ -498,10 +660,10 @@
aState.update(cn);
cn = new ChangeNumber(0L, 0, myId3);
aState.update(cn);
- rsStates.put(WINNER, aState);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
String bestServer =
- computeBestReplicationServer(mySt, rsStates, myId1, new DN());
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
assertEquals(bestServer, WINNER, "Wrong best replication server.");
}
@@ -509,7 +671,7 @@
/**
* Test with 3 replication servers, late.
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void test3ServersLate() throws Exception
@@ -536,8 +698,8 @@
cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
mySt.update(cn);
- // Create replication servers state list
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
// State for server 1
ServerState aState = new ServerState();
@@ -547,7 +709,7 @@
aState.update(cn);
cn = new ChangeNumber(10L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER1, aState);
+ rsInfos.put(LOOSER1, new ServerInfo(aState, (byte)1));
// State for server 2
aState = new ServerState();
@@ -557,7 +719,7 @@
aState.update(cn);
cn = new ChangeNumber(0L, 0, myId3);
aState.update(cn);
- rsStates.put(WINNER, aState);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
// State for server 3
aState = new ServerState();
@@ -567,10 +729,10 @@
aState.update(cn);
cn = new ChangeNumber(10L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER2, aState);
+ rsInfos.put(LOOSER2, new ServerInfo(aState, (byte)1));
String bestServer =
- computeBestReplicationServer(mySt, rsStates, myId1, new DN());
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
assertEquals(bestServer, WINNER, "Wrong best replication server.");
}
@@ -578,7 +740,7 @@
/**
* Test with 6 replication servers, some up, some late, one null
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void test6ServersMixed() throws Exception
@@ -609,8 +771,8 @@
cn = new ChangeNumber(3L, 0, myId3); // Should not be used inside algo
mySt.update(cn);
- // Create replication servers state list
- HashMap<String, ServerState> rsStates = new HashMap<String, ServerState>();
+ // Create replication servers info list
+ HashMap<String, ServerInfo> rsInfos = new HashMap<String, ServerInfo>();
// State for server 1
ServerState aState = new ServerState();
@@ -620,7 +782,7 @@
aState.update(cn);
cn = new ChangeNumber(10L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER1, aState);
+ rsInfos.put(LOOSER1, new ServerInfo(aState, (byte)1));
// State for server 2
aState = new ServerState();
@@ -630,7 +792,7 @@
aState.update(cn);
cn = new ChangeNumber(5L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER2, aState);
+ rsInfos.put(LOOSER2, new ServerInfo(aState, (byte)1));
// State for server 3
aState = new ServerState();
@@ -640,7 +802,7 @@
aState.update(cn);
cn = new ChangeNumber(10L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER3, aState);
+ rsInfos.put(LOOSER3, new ServerInfo(aState, (byte)1));
// State for server 4
aState = new ServerState();
@@ -650,7 +812,7 @@
aState.update(cn);
cn = new ChangeNumber(8L, 0, myId3);
aState.update(cn);
- rsStates.put(WINNER, aState);
+ rsInfos.put(WINNER, new ServerInfo(aState, (byte)1));
// State for server 5 (null one for our serverid)
aState = new ServerState();
@@ -658,7 +820,7 @@
aState.update(cn);
cn = new ChangeNumber(5L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER4, aState);
+ rsInfos.put(LOOSER4, new ServerInfo(aState, (byte)1));
// State for server 6
aState = new ServerState();
@@ -668,10 +830,10 @@
aState.update(cn);
cn = new ChangeNumber(6L, 0, myId3);
aState.update(cn);
- rsStates.put(LOOSER5, aState);
+ rsInfos.put(LOOSER5, new ServerInfo(aState, (byte)1));
String bestServer =
- computeBestReplicationServer(mySt, rsStates, myId1, new DN());
+ computeBestReplicationServer(mySt, rsInfos, myId1, new DN(), (byte)1);
assertEquals(bestServer, WINNER, "Wrong best replication server.");
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
index 54e5baa..07fd87f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
@@ -28,9 +28,11 @@
import java.util.SortedSet;
+import java.util.TreeSet;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ServerManagedObject;
+import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.IsolationPolicy;
import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.types.DN;
@@ -47,9 +49,23 @@
private SortedSet<String> replicationServers;
private long heartbeatInterval = 1000;
private IsolationPolicy policy = IsolationPolicy.REJECT_ALL_UPDATES;
+
+ // Is assured mode enabled or not ?
+ private boolean assured = false;
+ // Assured sub mode (used when assured is true)
+ private AssuredType assuredType = AssuredType.NOT_ASSURED;
+ // Safe Data level (used when assuredType is safe data)
+ private int assuredSdLevel = 1;
+ // Timeout (in milliseconds) when waiting for acknowledgments
+ private long assuredTimeout = 1000;
+ // Group id
+ private int groupId = 1;
+ // Referrals urls to be published to other servers of the topology
+ SortedSet<String> refUrls = new TreeSet<String>();
/**
* Creates a new Domain with the provided information
+ * (assured mode disabled, default group id)
*/
public DomainFakeCfg(DN baseDn, int serverId, SortedSet<String> replServers)
{
@@ -57,6 +73,44 @@
this.serverId = serverId;
this.replicationServers = replServers;
}
+
+ /**
+ * Creates a new Domain with the provided information
+ * (assured mode disabled, group id provided)
+ */
+ public DomainFakeCfg(DN baseDn, int serverId, SortedSet<String> replServers,
+ int groupId)
+ {
+ this(baseDn, serverId, replServers);
+ this.groupId = groupId;
+ }
+
+ /**
+ * Creates a new Domain with the provided information
+ * (assured mode info provided as well as group id)
+ */
+ public DomainFakeCfg(DN baseDn, int serverId, SortedSet<String> replServers,
+ AssuredType assuredType, int assuredSdLevel, int groupId,
+ long assuredTimeout, SortedSet<String> refUrls)
+ {
+ this(baseDn, serverId, replServers);
+ switch(assuredType)
+ {
+ case NOT_ASSURED:
+ assured = false;
+ break;
+ case SAFE_DATA:
+ case SAFE_READ:
+ assured = true;
+ this.assuredType = assuredType;
+ break;
+ }
+ this.assuredSdLevel = assuredSdLevel;
+ this.groupId = groupId;
+ this.assuredTimeout = assuredTimeout;
+ if (refUrls != null)
+ this.refUrls = refUrls;
+ }
/**
* {@inheritDoc}
@@ -203,4 +257,34 @@
{
this.policy = policy;
}
+
+ public int getAssuredSdLevel()
+ {
+ return assuredSdLevel;
+ }
+
+ public int getGroupId()
+ {
+ return groupId;
+ }
+
+ public long getAssuredTimeout()
+ {
+ return assuredTimeout;
+ }
+
+ public AssuredType getAssuredType()
+ {
+ return assuredType;
+ }
+
+ public boolean isAssured()
+ {
+ return assured;
+ }
+
+ public SortedSet<String> getReferralsUrl()
+ {
+ return refUrls;
+ }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
new file mode 100644
index 0000000..f706f1c
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
@@ -0,0 +1,105 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.plugin;
+
+import org.opends.server.replication.ReplicationTestCase;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+/**
+ * Test basic computations done by the GenerationIdChecksum class that is used
+ * to compute generation ids for domains.
+ */
+public class GenerationIdChecksumTest extends ReplicationTestCase
+{
+
+ /**
+ * Basic usage test (reset and single update method)
+ */
+ @Test
+ public void testResetAndSingleUpdate()
+ {
+ GenerationIdChecksum checksum = new GenerationIdChecksum();
+
+ // Default value test
+ assertEquals(checksum.getValue(), 0L);
+
+ // Update method simple version test
+ checksum.update(3);
+ assertEquals(checksum.getValue(), 3L);
+ checksum.update(4);
+ assertEquals(checksum.getValue(), 7L);
+ checksum.update(125);
+ assertEquals(checksum.getValue(), 132L);
+
+ // Reset test
+ checksum.reset();
+ assertEquals(checksum.getValue(), 0L);
+
+ // Update method simple version test, again
+ checksum.update(101);
+ assertEquals(checksum.getValue(), 101L);
+ checksum.update(2);
+ assertEquals(checksum.getValue(), 103L);
+ checksum.update(66);
+ assertEquals(checksum.getValue(), 169L);
+ }
+
+ /**
+ * Provider for testArrayUpdate method
+ */
+ @DataProvider(name = "arrayUpdateProvider")
+ protected Object[][] arrayUpdateProvider()
+ {
+ return new Object[][] {
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 0, 10, 55},
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 0, 1, 1},
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 0, 2, 3},
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 0, 3, 6},
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 3, 1, 4},
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 3, 2, 9},
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 3, 3, 15},
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 7, 1, 8},
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 7, 2, 17},
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 7, 3, 27},
+ {new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 9, 1, 10},
+ {new byte[]{2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 0, 10, 65},
+ {new byte[]{118, 119, 120, 121, 122, 123, 124, 125, 126, 127}, 0, 10, 1225}};
+ }
+
+ /**
+ * Test of update method, array version
+ */
+ @Test(dataProvider = "arrayUpdateProvider")
+ public void testArrayUpdate(byte[] b, int off, int len, long expectedChecksum)
+ {
+ GenerationIdChecksum checksum = new GenerationIdChecksum();
+ checksum.update(b, off, len);
+ assertEquals(checksum.getValue(), expectedChecksum);
+ }
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
new file mode 100644
index 0000000..92fba1a
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
@@ -0,0 +1,562 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.plugin;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import static org.opends.server.replication.plugin.ReplicationBroker.*;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import static org.opends.server.loggers.ErrorLogger.logError;
+import static org.opends.server.loggers.debug.DebugLogger.getTracer;
+import org.opends.server.types.DirectoryException;
+import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
+
+import org.opends.messages.Category;
+import org.opends.messages.Message;
+import org.opends.messages.Severity;
+import org.opends.server.TestCaseUtils;
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.replication.ReplicationTestCase;
+import org.opends.server.replication.server.ReplServerFakeConfiguration;
+import org.opends.server.replication.server.ReplicationServer;
+import org.opends.server.types.DN;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+import static org.opends.server.TestCaseUtils.*;
+
+/**
+ * Some real connections from clients that should end up with a server with
+ * the right groupid if available.
+ */
+public class GroupIdHandshakeTest extends ReplicationTestCase
+{
+ private static final short DS1_ID = 1;
+ private static final short DS2_ID = 2;
+ private static final short RS1_ID = 61;
+ private static final short RS2_ID = 62;
+ private static final short RS3_ID = 63;
+ private int rs1Port = -1;
+ private int rs2Port = -1;
+ private int rs3Port = -1;
+ private ReplicationDomain rd1 = null;
+ private ReplicationDomain rd2 = null;
+ private ReplicationServer rs1 = null;
+ private ReplicationServer rs2 = null;
+ private ReplicationServer rs3 = null;
+
+ // The tracer object for the debug logger
+ private static final DebugTracer TRACER = getTracer();
+
+ private void debugInfo(String s)
+ {
+ logError(Message.raw(Category.SYNC, Severity.NOTICE, s));
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("** TEST **" + s);
+ }
+ }
+
+ private void debugInfo(String message, Exception e)
+ {
+ debugInfo(message + stackTraceToSingleLineString(e));
+ }
+
+ private void initTest()
+ {
+ rs1Port = -1;
+ rs2Port = -1;
+ rs3Port = -1;
+ rd1 = null;
+ rd2 = null;
+ rs1 = null;
+ rs2 = null;
+ rs3 = null;
+ findFreePorts();
+ }
+
+ private void endTest()
+ {
+ if (rd1 != null)
+ {
+ rd1.shutdown();
+ rd1 = null;
+ }
+
+ if (rd2 != null)
+ {
+ rd2.shutdown();
+ rd2 = null;
+ }
+
+ try
+ {
+ // Clear any reference to a domain in synchro plugin
+ MultimasterReplication.deleteDomain(DN.decode(TEST_ROOT_DN_STRING));
+ } catch (DirectoryException ex)
+ {
+ fail("Error deleting reference to domain: " + TEST_ROOT_DN_STRING);
+ }
+
+ if (rs1 != null)
+ {
+ rs1.clearDb();
+ rs1.remove();
+ rs1 = null;
+ }
+
+ if (rs2 != null)
+ {
+ rs2.clearDb();
+ rs2.remove();
+ rs2 = null;
+ }
+ if (rs3 != null)
+ {
+ rs3.clearDb();
+ rs3.remove();
+ rs3 = null;
+ }
+ rs1Port = -1;
+ rs2Port = -1;
+ rs3Port = -1;
+ }
+
+ private void sleep(long time)
+ {
+ try
+ {
+ Thread.sleep(time);
+ } catch (InterruptedException ex)
+ {
+ fail("Error sleeping " + stackTraceToSingleLineString(ex));
+ }
+ }
+
+ /**
+ * Check connection of the provided replication domain to the provided
+ * replication server. Waits for connection to be ok up to secTimeout seconds
+ * before failing.
+ */
+ private void checkConnection(int secTimeout, short dsId, short rsId, String msg)
+ {
+
+ int rsPort = -1;
+ ReplicationDomain rd = null;
+ switch (dsId)
+ {
+ case DS1_ID:
+ rd = rd1;
+ break;
+ case DS2_ID:
+ rd = rd2;
+ break;
+ default:
+ fail("Unknown replication domain server id.");
+ }
+
+ switch (rsId)
+ {
+ case RS1_ID:
+ rsPort = rs1Port;
+ break;
+ case RS2_ID:
+ rsPort = rs2Port;
+ break;
+ case RS3_ID:
+ rsPort = rs3Port;
+ break;
+ default:
+ fail("Unknown replication server id.");
+ }
+
+ int nSec = 0;
+
+ // Go out of the loop only if connection is verified or if timeout occurs
+ while (true)
+ {
+ // Test connection
+ boolean connected = rd.isConnected();
+ int rdPort = -1;
+ boolean rightPort = false;
+ if (connected)
+ {
+ String serverStr = rd.getReplicationServer();
+ int index = serverStr.lastIndexOf(':');
+ if ((index == -1) || (index >= serverStr.length()))
+ fail("Enable to find port number in: " + serverStr);
+ String rdPortStr = serverStr.substring(index + 1);
+ try
+ {
+ rdPort = (new Integer(rdPortStr)).intValue();
+ } catch (Exception e)
+ {
+ fail("Enable to get an int from: " + rdPortStr);
+ }
+ if (rdPort == rsPort)
+ rightPort = true;
+ }
+ if (connected && rightPort)
+ {
+ // Connection verified
+ debugInfo("checkConnection: connection from domain " + dsId + " to" +
+ " replication server " + rsId + " obtained after "
+ + nSec + " seconds.");
+ return;
+ }
+
+ // Sleep 1 second
+ try
+ {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex)
+ {
+ fail("Error sleeping " + stackTraceToSingleLineString(ex));
+ }
+ nSec++;
+
+ if (nSec > secTimeout)
+ {
+ // Timeout reached, end with error
+ fail("checkConnection: could not verify connection from domain " + dsId
+ + " to replication server " + rsId + " after " + secTimeout + " seconds."
+ + " Domain connected: " + connected + ", connection port: " + rdPort
+ + " (should be: " + rsPort + "). [" + msg + "]");
+ }
+ }
+ }
+
+ /**
+ * Find needed free TCP ports.
+ */
+ private void findFreePorts()
+ {
+ try
+ {
+ ServerSocket socket1 = TestCaseUtils.bindFreePort();
+ ServerSocket socket2 = TestCaseUtils.bindFreePort();
+ ServerSocket socket3 = TestCaseUtils.bindFreePort();
+ rs1Port = socket1.getLocalPort();
+ rs2Port = socket2.getLocalPort();
+ rs3Port = socket3.getLocalPort();
+ socket1.close();
+ socket2.close();
+ socket3.close();
+ } catch (IOException e)
+ {
+ fail("Unable to determinate some free ports " +
+ stackTraceToSingleLineString(e));
+ }
+ }
+
+ /**
+ * Creates the list of servers to represent the RS topology matching the
+ * passed test case.
+ */
+ private SortedSet<String> createRSListForTestCase(String testCase)
+ {
+ SortedSet<String> replServers = new TreeSet<String>();
+
+ if (testCase.equals("testRSWithSameGroupIds"))
+ {
+ // 2 servers used for this test case.
+ replServers.add("localhost:" + rs1Port);
+ replServers.add("localhost:" + rs2Port);
+ } else if (testCase.equals("testRSWithManyGroupIds"))
+ {
+ // 3 servers used for this test case.
+ replServers.add("localhost:" + rs1Port);
+ replServers.add("localhost:" + rs2Port);
+ replServers.add("localhost:" + rs3Port);
+ } else
+ fail("Unknown test case: " + testCase);
+
+ return replServers;
+ }
+
+ /**
+ * Creates a new ReplicationServer.
+ */
+ private ReplicationServer createReplicationServer(short serverId,
+ int groupId, String testCase)
+ {
+ SortedSet<String> replServers = new TreeSet<String>();
+ try
+ {
+ int port = -1;
+ if (serverId == RS1_ID)
+ {
+ port = rs1Port;
+ if (testCase.equals("testRSWithSameGroupIds"))
+ {
+ // 2 servers used for this test case.
+ replServers.add("localhost:" + rs2Port);
+ } else if (testCase.equals("testRSWithManyGroupIds"))
+ {
+ // 3 servers used for this test case.
+ replServers.add("localhost:" + rs2Port);
+ replServers.add("localhost:" + rs3Port);
+ } else
+ fail("Unknown test case: " + testCase);
+ } else if (serverId == RS2_ID)
+ {
+ port = rs2Port;
+ if (testCase.equals("testRSWithSameGroupIds"))
+ {
+ // 2 servers used for this test case.
+ replServers.add("localhost:" + rs1Port);
+ } else if (testCase.equals("testRSWithManyGroupIds"))
+ {
+ // 3 servers used for this test case.
+ replServers.add("localhost:" + rs1Port);
+ replServers.add("localhost:" + rs3Port);
+ } else
+ fail("Unknown test case: " + testCase);
+ } else if (serverId == RS3_ID)
+ {
+ port = rs3Port;
+ if (testCase.equals("testRSWithManyGroupIds"))
+ {
+ // 3 servers used for this test case.
+ replServers.add("localhost:" + rs2Port);
+ replServers.add("localhost:" + rs3Port);
+ } else
+ fail("Invalid test case: " + testCase);
+ } else
+ {
+ fail("Unknown replication server id.");
+ }
+
+ String dir = "groupIdHandshakeTest" + serverId + testCase + "Db";
+ ReplServerFakeConfiguration conf =
+ new ReplServerFakeConfiguration(port, dir, 0, serverId, 0, 100,
+ replServers, groupId, 1000, 5000);
+ ReplicationServer replicationServer = new ReplicationServer(conf);
+ return replicationServer;
+
+ } catch (Exception e)
+ {
+ fail("createReplicationServer " + stackTraceToSingleLineString(e));
+ }
+ return null;
+ }
+
+ /**
+ * Creates a new ReplicationDomain.
+ */
+ private ReplicationDomain createReplicationDomain(short serverId,
+ int groupId, String testCase)
+ {
+
+ SortedSet<String> replServers = null;
+ try
+ {
+ replServers = createRSListForTestCase(testCase);
+ DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
+ DomainFakeCfg domainConf =
+ new DomainFakeCfg(baseDn, serverId, replServers, groupId);
+ ReplicationDomain replicationDomain =
+ MultimasterReplication.createNewDomain(domainConf);
+ replicationDomain.start();
+ return replicationDomain;
+
+ } catch (Exception e)
+ {
+ fail("createReplicationDomain " + stackTraceToSingleLineString(e));
+ }
+ return null;
+ }
+
+ /**
+ * Connections with RSs that have the same group ids:
+ *
+ * Full topo is:
+ * - RS1 with GID=1
+ * - RS2 with GID=1
+ * - DS1 with GID=1
+ * - DS2 with GID=2
+ * Scenario is:
+ * - Start RS1 and RS2 with both GID=1
+ * - Start DS1 with GID=1 (should connect to a RS with his GID)
+ * - Start DS2 with GID=2 (should connect with a RS with wrong GID as only
+ * GID=1 is available)
+ *
+ * @throws Exception If a problem occurred
+ */
+ @Test
+ public void testRSWithSameGroupIds() throws Exception
+ {
+ String testCase = "testRSWithSameGroupIds";
+
+ debugInfo("Starting " + testCase);
+
+ initTest();
+
+ try
+ {
+
+ /**
+ * Start RS1 and RS2 with both GID=1
+ */
+ // Create and start RS1
+ rs1 = createReplicationServer(RS1_ID, 1, testCase);
+ // Create and start RS2
+ rs2 = createReplicationServer(RS2_ID, 1, testCase);
+
+ /**
+ * Start DS1 with GID=1 (should connect to a RS with his GID)
+ */
+ // Start DS1
+ rd1 = createReplicationDomain(DS1_ID, 1, testCase);
+ assertTrue(rd1.isConnected());
+
+ /**
+ * Start DS2 with GID=2 (should connect with a RS with wrong GID as only
+ * GID=1 is available
+ */
+ // Start DS2
+ rd2 = createReplicationDomain(DS2_ID, 2, testCase);
+ assertTrue(rd2.isConnected());
+
+ } finally
+ {
+ endTest();
+ }
+ }
+
+ /**
+ * Test connection algorithm, focusing on group ids. Also test the mechanism
+ * that polls replication servers to know if a RS with the right group id
+ * becomes available.
+ *
+ * Full topo is:
+ * - RS1 with GID=1
+ * - RS2 with GID=2
+ * - RS3 with GID=3
+ * - DS1 with GID=2
+ * - DS2 with GID=3
+ * Scenario is:
+ * - Start RS1 with GID=1 and RS2 with GID=2
+ * - Start DS1 with GID=2, should connect to RS2 with GID=2
+ * - Start DS2 with GID=3, should connect to either RS1 or RS2 (no GID=3
+ * available)
+ * - Start RS3 with GID=3, DS2 with GID=3 should detect server with his GID
+ * and connect to RS3
+ * - Stop RS2 and RS3, both DS1 and DS2 should failover to RS1 with GID=1
+ * (not their group id)
+ * - Restart RS2 and RS3, DS1 should reconnect to RS2 (with GID=2, his GID)
+ * and DS2 should connect to RS3 (with GID=3, his GID)
+ * @throws Exception If a problem occurred
+ */
+ @Test (groups = "slow")
+ public void testRSWithManyGroupIds() throws Exception
+ {
+ String testCase = "testRSWithManyGroupIds";
+
+ debugInfo("Starting " + testCase);
+
+ initTest();
+
+ try
+ {
+
+ /**
+ * Start RS1 with GID=1 and RS2 with GID=2
+ */
+ // Create and start RS1
+ rs1 = createReplicationServer(RS1_ID, 1, testCase);
+ // Create and start RS2
+ rs2 = createReplicationServer(RS2_ID, 2, testCase);
+
+ /**
+ * Start DS1 with GID=2, should connect to RS2 with GID=2
+ */
+ // Start DS1
+ rd1 = createReplicationDomain(DS1_ID, 2, testCase);
+ checkConnection(30, DS1_ID, RS2_ID,
+ "Start DS1 with GID=2, should connect to RS2 with GID=2");
+
+ /**
+ * Start DS2 with GID=3, should connect to either RS1 or RS2 (no GID=3
+ * available)
+ */
+ // Start DS2
+ rd2 = createReplicationDomain(DS2_ID, 3, testCase);
+ assertTrue(rd2.isConnected());
+
+ /**
+ * Start RS3 with GID=3, DS2 with GID=3 should detect server with his GID
+ * and connect to RS3
+ */
+ // Create and start RS3
+ rs3 = createReplicationServer(RS3_ID, 3, testCase);
+ // Sleep to insure start is done and DS2 has time to detect to server
+ // arrival and reconnect
+ checkConnection(30, DS2_ID, RS3_ID,
+ "Start RS3 with GID=3, DS2 with GID=3 should detect server with his GID and connect to RS3");
+
+
+ /**
+ * Stop RS2 and RS3, both DS1 and DS2 should failover to RS1 with GID=1
+ * (not their group id)
+ */
+ // Simulate RS2 failure
+ rs2.remove();
+ // Simulate RS3 failure
+ rs3.remove();
+ // Sleep to insure shutdowns are ok and DS1 and DS2 reconnect to RS1
+ checkConnection(30, DS1_ID, RS1_ID,
+ "Stop RS2 and RS3, DS1 should failover to RS1 with GID=1");
+ checkConnection(30, DS2_ID, RS1_ID,
+ "Stop RS2 and RS3, DS2 should failover to RS1 with GID=1");
+
+ /**
+ * Restart RS2 and RS3, DS1 should reconnect to RS2 (with GID=2, his GID)
+ * and DS2 should reconnect to RS3 (with GID=3, his GID)
+ */
+ // RS2 restart
+ rs2 = createReplicationServer(RS2_ID, 2, testCase);
+ // RS3 restart
+ rs3 = createReplicationServer(RS3_ID, 3, testCase);
+ // Sleep to insure restarts are ok and DS1 and DS2 reconnect to the RS with
+ // their group id
+ checkConnection(30, DS1_ID, RS2_ID,
+ "Restart RS2 and RS3, DS1 should reconnect to RS2 (with GID=2, his GID)");
+ checkConnection(30, DS2_ID, RS3_ID,
+ "Restart RS2 and RS3, DS2 should reconnect to RS3 (with GID=3, his GID)");
+
+ // TODO: when dynamic change of configuration for group id is done. One could
+ // add here change of DS1 and DS2 GID to 1 and check they both come back
+ // to rs1.
+
+ } finally
+ {
+ endTest();
+ }
+ }
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
index 80f27d4..f9c2ecf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
@@ -32,7 +32,6 @@
import static org.testng.Assert.assertTrue;
import java.net.ServerSocket;
-import java.util.Iterator;
import java.util.List;
import org.opends.messages.Category;
@@ -56,6 +55,7 @@
import org.opends.server.types.SearchResultEntry;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
/**
* Test the usage of the historical data of the replication.
@@ -79,26 +79,14 @@
@Override
public void setUp() throws Exception
{
- super.setUp();
+ super.setUp();
- // Create backend top level entries
- String[] topEntries = new String[2];
- topEntries[0] = "dn: dc=example,dc=com\n" + "objectClass: top\n"
- + "objectClass: domain\n";
- topEntries[1] = "dn: ou=People,dc=example,dc=com\n" + "objectClass: top\n"
- + "objectClass: organizationalUnit\n"
- + "entryUUID: 11111111-1111-1111-1111-111111111111\n";
- for (String entryStr : topEntries)
- {
- addEntry(TestCaseUtils.entryFromLdifString(entryStr));
- }
-
- // top level synchro provider
- String synchroStringDN = "cn=Synchronization Providers,cn=config";
-
- // Multimaster Synchro plugin
- synchroPluginStringDN = "cn=Multimaster Synchronization, "
- + synchroStringDN;
+ // Create necessary backend top level entry
+ String topEntry = "dn: ou=People," + TEST_ROOT_DN_STRING + "\n"
+ + "objectClass: top\n"
+ + "objectClass: organizationalUnit\n"
+ + "entryUUID: 11111111-1111-1111-1111-111111111111\n";
+ addEntry(TestCaseUtils.entryFromLdifString(topEntry));
// find a free port for the replicationServer
ServerSocket socket = TestCaseUtils.bindFreePort();
@@ -107,27 +95,28 @@
// replication server
String replServerLdif =
- "dn: cn=Replication Server, " + synchroPluginStringDN + "\n"
+ "dn: cn=Replication Server, " + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-server\n"
+ "cn: Replication Server\n"
+ "ds-cfg-replication-port: " + replServerPort + "\n"
+ "ds-cfg-replication-db-directory: HistoricalCsnOrderingTestDb\n"
- + "ds-cfg-replication-server-id: 1\n";
+ + "ds-cfg-replication-server-id: 101\n";
replServerEntry = TestCaseUtils.entryFromLdifString(replServerLdif);
// suffix synchronized
+ String testName = "historicalCsnOrderingTest";
String synchroServerLdif =
- "dn: cn=example, cn=domains, " + synchroPluginStringDN + "\n"
+ "dn: cn=" + testName + ", cn=domains, " + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-domain\n"
- + "cn: example\n"
- + "ds-cfg-base-dn: ou=People,dc=example,dc=com\n"
+ + "cn: " + testName + "\n"
+ + "ds-cfg-base-dn: ou=People," + TEST_ROOT_DN_STRING + "\n"
+ "ds-cfg-replication-server: localhost:" + replServerPort + "\n"
+ "ds-cfg-server-id: 1\n" + "ds-cfg-receive-status: true\n";
synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
- String personLdif = "dn: uid=user.1,ou=People,dc=example,dc=com\n"
+ String personLdif = "dn: uid=user.1,ou=People," + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n" + "objectClass: person\n"
+ "objectClass: organizationalPerson\n"
+ "objectClass: inetOrgPerson\n" + "uid: user.1\n"
@@ -147,7 +136,7 @@
}
/**
- * Add an entry in the datatbase
+ * Add an entry in the database
*
*/
private void addEntry(Entry entry) throws Exception
@@ -197,7 +186,7 @@
public void changesCmpTest()
throws Exception
{
- final DN baseDn = DN.decode("ou=People,dc=example,dc=com");
+ final DN baseDn = DN.decode("ou=People," + TEST_ROOT_DN_STRING);
final DN dn1 = DN.decode("cn=test1," + baseDn.toString());
final AttributeType histType =
DirectoryServer.getAttributeType(Historical.HISTORICALATTRIBUTENAME);
@@ -218,7 +207,7 @@
);
// Perform a first modification to update the historical attribute
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(false,
"dn: cn=test1," + baseDn.toString(),
"changetype: modify",
"add: description",
@@ -233,14 +222,14 @@
assertTrue(attrs1.isEmpty() != true);
String histValue =
- attrs1.get(0).getValues().iterator().next().getStringValue();
+ attrs1.get(0).iterator().next().getStringValue();
logError(Message.raw(Category.SYNC, Severity.INFORMATION,
"First historical value:" + histValue));
// Perform a 2nd modification to update the hist attribute with
// a second value
- resultCode = TestCaseUtils.applyModifications(
+ resultCode = TestCaseUtils.applyModifications(false,
"dn: cn=test1," + baseDn.toString(),
"changetype: modify",
"add: description",
@@ -253,18 +242,9 @@
assertTrue(attrs2 != null);
assertTrue(attrs2.isEmpty() != true);
- Iterator<AttributeValue> iav = attrs2.get(0).getValues().iterator();
- try
- {
- while (true)
- {
- AttributeValue av = iav.next();
- logError(Message.raw(Category.SYNC, Severity.INFORMATION,
- "Secnd historical value:" + av.getNormalizedStringValue()));
- }
- }
- catch(Exception e)
- {
+ for (AttributeValue av : attrs2.get(0)) {
+ logError(Message.raw(Category.SYNC, Severity.INFORMATION,
+ "Second historical value:" + av.getStringValue()));
}
// Build a change number from the first modification
@@ -283,7 +263,7 @@
assertEquals(op.getSearchEntries().size(), 1);
// From the historical of this entry, rebuild operations
- // Since there have been 2 modifications, there should be 2
+ // Since there have been 2 modifications and 1 add, there should be 3
// operations rebuild from this state.
int updatesCnt = 0;
for (SearchResultEntry searchEntry : op.getSearchEntries())
@@ -299,6 +279,6 @@
updatesCnt++;
}
}
- assertTrue(updatesCnt == 2);
+ assertTrue(updatesCnt == 3);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
index f0dc8d6..b756b5a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
@@ -29,10 +29,14 @@
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.AddMsg;
import org.opends.server.replication.protocol.ModifyMsg;
+import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPModify;
+import org.opends.server.types.AbstractOperation;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.Attribute;
@@ -42,7 +46,10 @@
import org.opends.server.core.DirectoryServer;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeClass;
+
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.opends.server.TestCaseUtils.*;
import java.net.ServerSocket;
import java.util.List;
@@ -65,7 +72,7 @@
public void setUp()
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
+ super.setUp();
// Create an internal connection.
connection = InternalClientConnection.getRootConnection();
@@ -76,22 +83,25 @@
socket.close();
// The replication server.
- String replServerStringDN = "cn=Replication Server, " + synchroPluginStringDN;
+ String replServerStringDN = "cn=Replication Server, " + SYNCHRO_PLUGIN_DN;
String replServerLdif = "dn: " + replServerStringDN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-server\n"
+ "cn: replication Server\n"
+ "ds-cfg-replication-port: " + replServerPort + "\n"
- + "ds-cfg-replication-server-id: 1\n";
+ + "ds-cfg-replication-db-directory: HistoricalTest\n"
+ + "ds-cfg-replication-server-id: 102\n";
replServerEntry = TestCaseUtils.entryFromLdifString(replServerLdif);
// The suffix to be synchronized.
- String synchroServerStringDN = "o=test, cn=domains, " + synchroPluginStringDN;
+ String testName = "historicalTest";
+ String synchroServerStringDN = "cn=" + testName + ", cn=domains, " +
+ SYNCHRO_PLUGIN_DN;
String synchroServerLdif = "dn: " + synchroServerStringDN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-domain\n"
- + "cn: example\n"
- + "ds-cfg-base-dn: o=test\n"
+ + "cn: " + testName + "\n"
+ + "ds-cfg-base-dn: " + TEST_ROOT_DN_STRING + "\n"
+ "ds-cfg-replication-server: localhost:" + replServerPort + "\n"
+ "ds-cfg-server-id: 1\n"
+ "ds-cfg-receive-status: true\n";
@@ -111,7 +121,7 @@
{
// Add a test entry.
TestCaseUtils.addEntry(
- "dn: uid=user.1,o=test",
+ "dn: uid=user.1," + TEST_ROOT_DN_STRING,
"objectClass: top",
"objectClass: person",
"objectClass: organizationalPerson",
@@ -129,7 +139,7 @@
// Test both single and multi-valued attributes.
String path = TestCaseUtils.createTempFile(
- "dn: uid=user.1,o=test",
+ "dn: uid=user.1," + TEST_ROOT_DN_STRING,
"changetype: modify",
"add: cn;lang-en",
"cn;lang-en: Aaccf Amar",
@@ -158,7 +168,7 @@
assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
args[9] = TestCaseUtils.createTempFile(
- "dn: uid=user.1,o=test",
+ "dn: uid=user.1," + TEST_ROOT_DN_STRING,
"changetype: modify",
"replace: displayName",
"displayName: 2",
@@ -168,7 +178,7 @@
assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
// Read the entry back to get its history operational attribute.
- DN dn = DN.decode("uid=user.1,o=test");
+ DN dn = DN.decode("uid=user.1," + TEST_ROOT_DN_STRING);
Entry entry = DirectoryServer.getEntry(dn);
List<Attribute> attrs = Historical.getHistoricalAttr(entry);
@@ -197,9 +207,9 @@
public void conflictSingleValue()
throws Exception
{
- final DN dn1 = DN.decode("cn=test1,o=test");
- final DN dn2 = DN.decode("cn=test2,o=test");
- final DN baseDn = DN.decode("o=test");
+ final DN dn1 = DN.decode("cn=test1," + TEST_ROOT_DN_STRING);
+ final DN dn2 = DN.decode("cn=test2," + TEST_ROOT_DN_STRING);
+ final DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
final AttributeType attrType =
DirectoryServer.getAttributeType("displayname");
final AttributeType entryuuidType =
@@ -213,12 +223,12 @@
openReplicationSession(baseDn, (short)2, 100, replServerPort, 1000, true);
- // Clear the backend.
+ // Clear the backend and create top entrye
TestCaseUtils.initializeTestBackend(true);
// Add the first test entry.
TestCaseUtils.addEntry(
- "dn: cn=test1,o=test",
+ "dn: cn=test1," + TEST_ROOT_DN_STRING,
"objectClass: top",
"objectClass: person",
"objectClass: organizationalPerson",
@@ -231,11 +241,11 @@
Entry entry = DirectoryServer.getEntry(dn1);
List<Attribute> attrs = entry.getAttribute(entryuuidType);
String entryuuid =
- attrs.get(0).getValues().iterator().next().getStringValue();
+ attrs.get(0).iterator().next().getStringValue();
// Add the second test entry.
TestCaseUtils.addEntry(
- "dn: cn=test2,o=test",
+ "dn: cn=test2," + TEST_ROOT_DN_STRING,
"objectClass: top",
"objectClass: person",
"objectClass: organizationalPerson",
@@ -249,7 +259,7 @@
entry = DirectoryServer.getEntry(dn2);
attrs = entry.getAttribute(entryuuidType);
String entryuuid2 =
- attrs.get(0).getValues().iterator().next().getStringValue();
+ attrs.get(0).iterator().next().getStringValue();
// A change on a first server.
ChangeNumber t1 = new ChangeNumber(1, (short) 0, (short) 3);
@@ -261,7 +271,7 @@
// happen on one server.
// Replay an add of a value A at time t1 on a first server.
- Attribute attr = new Attribute(attrType.getNormalizedPrimaryName(), "A");
+ Attribute attr = Attributes.create(attrType.getNormalizedPrimaryName(), "A");
Modification mod = new Modification(ModificationType.ADD, attr);
publishModify(broker, t1, dn1, entryuuid, mod);
@@ -273,7 +283,7 @@
Thread.sleep(2000);
// Replay an add of a value B at time t2 on a second server.
- attr = new Attribute(attrType.getNormalizedPrimaryName(), "B");
+ attr = Attributes.create(attrType.getNormalizedPrimaryName(), "B");
mod = new Modification(ModificationType.ADD, attr);
publishModify(broker, t2, dn1, entryuuid, mod);
@@ -286,14 +296,14 @@
t2 = new ChangeNumber(4, (short) 0, (short) 4);
// Replay an add of a value B at time t2 on a second server.
- attr = new Attribute(attrType.getNormalizedPrimaryName(), "B");
+ attr = Attributes.create(attrType.getNormalizedPrimaryName(), "B");
mod = new Modification(ModificationType.ADD, attr);
publishModify(broker, t2, dn2, entryuuid2, mod);
Thread.sleep(2000);
// Replay an add of a value A at time t1 on a first server.
- attr = new Attribute(attrType.getNormalizedPrimaryName(), "A");
+ attr = Attributes.create(attrType.getNormalizedPrimaryName(), "A");
mod = new Modification(ModificationType.ADD, attr);
publishModify(broker, t1, dn2, entryuuid2, mod);
@@ -303,13 +313,13 @@
entry = DirectoryServer.getEntry(dn1);
attrs = entry.getAttribute(attrType);
String attrValue1 =
- attrs.get(0).getValues().iterator().next().getStringValue();
+ attrs.get(0).iterator().next().getStringValue();
// Read the second entry to see how the conflict was resolved.
entry = DirectoryServer.getEntry(dn2);
attrs = entry.getAttribute(attrType);
String attrValue2 =
- attrs.get(0).getValues().iterator().next().getStringValue();
+ attrs.get(0).iterator().next().getStringValue();
// The two values should be the first value added.
assertEquals(attrValue1, "A");
@@ -325,4 +335,134 @@
ModifyMsg modMsg = new ModifyMsg(changeNum, dn, mods, entryuuid);
broker.publish(modMsg);
}
+
+ /**
+ * Test that historical information is correctly added when performaing ADD,
+ * MOD and MODDN operations.
+ */
+ @Test()
+ public void historicalAdd() throws Exception
+ {
+ final DN dn1 = DN.decode("cn=testHistoricalAdd,o=test");
+
+ // Clear the backend.
+ TestCaseUtils.initializeTestBackend(true);
+
+ // Add the first test entry.
+ TestCaseUtils.addEntry(
+ "dn: " + dn1,
+ "objectClass: top",
+ "objectClass: person",
+ "objectClass: organizationalPerson",
+ "objectClass: inetOrgPerson",
+ "cn: test1",
+ "sn: test"
+ );
+
+ // Read the entry that was just added.
+ Entry entry = DirectoryServer.getEntry(dn1);
+
+ // Check that we can build an Add operation from this entry.
+ // This will ensure both that the Add historical information is
+ // correctly added and also that the code that rebuild operation
+ // from this historical information is working.
+ Iterable<FakeOperation> ops = Historical.generateFakeOperations(entry);
+
+ // Perform a few check on the Operation to see that it
+ // was correctly generated.
+ assertFakeOperations(dn1, entry, ops, 1);
+
+ // Now apply a modifications to the entry and check that the
+ // ADD historical information has been preserved.
+ TestCaseUtils.applyModifications(false,
+ "dn: " + dn1,
+ "changetype: modify",
+ "add: description",
+ "description: foo");
+
+ // Read the modified entry.
+ entry = DirectoryServer.getEntry(dn1);
+
+ // use historical information to generate new list of operations
+ // equivalent to the operations that have been applied to this entry.
+ ops = Historical.generateFakeOperations(entry);
+
+ // Perform a few check on the operation list to see that it
+ // was correctly generated.
+ assertFakeOperations(dn1, entry, ops, 2);
+
+ // rename the entry.
+ TestCaseUtils.applyModifications(false,
+ "dn: " + dn1,
+ "changetype: moddn",
+ "newrdn: cn=test2",
+ "deleteoldrdn: 1");
+
+ // Read the modified entry.
+ final DN dn2 = DN.decode("cn=test2,o=test");
+ entry = DirectoryServer.getEntry(dn2);
+
+ // use historical information to generate new list of operations
+ // equivalent to the operations that have been applied to this entry.
+ ops = Historical.generateFakeOperations(entry);
+
+ // Perform a few check on the operation list to see that it
+ // was correctly generated.
+ assertFakeOperations(dn2, entry, ops, 3);
+
+ // Now clear the backend and try to run the generated operations
+ // to check that applying them do lead to an equivalent result.
+ TestCaseUtils.initializeTestBackend(true);
+
+ for (FakeOperation fake : ops)
+ {
+ UpdateMsg msg = (UpdateMsg) fake.generateMessage();
+ AbstractOperation op =
+ msg.createOperation(InternalClientConnection.getRootConnection());
+ op.setInternalOperation(true);
+ op.setSynchronizationOperation(true);
+ op.run();
+ }
+
+ Entry newEntry = DirectoryServer.getEntry(dn2);
+ assertEquals(entry.getDN(), newEntry.getDN());
+ }
+
+ /**
+ *
+ */
+ private void assertFakeOperations(final DN dn1, Entry entry,
+ Iterable<FakeOperation> ops, int assertCount) throws Exception
+ {
+ int count = 0;
+ for (FakeOperation op : ops)
+ {
+ count++;
+ if (op instanceof FakeAddOperation)
+ {
+ // perform a few check on the Operation to see that it
+ // was correctly generated :
+ // - the dn should be dn1,
+ // - the entry id and the parent id should match the ids from the entry
+ FakeAddOperation addOp = (FakeAddOperation) op;
+ assertTrue(addOp.getChangeNumber() != null);
+ AddMsg addmsg = addOp.generateMessage();
+ assertTrue(dn1.equals(DN.decode(addmsg.getDn())));
+ assertTrue(addmsg.getUniqueId().equals(Historical.getEntryUuid(entry)));
+ String parentId = ReplicationDomain.findEntryId(dn1.getParent());
+ assertTrue(addmsg.getParentUid().equals(parentId));
+ addmsg.createOperation(InternalClientConnection.getRootConnection());
+ } else
+ {
+ if (count == 1)
+ {
+ // The first operation should be an ADD operation.
+ assertTrue(false, "FakeAddOperation was not correctly generated"
+ + " from historical information");
+ }
+ }
+ }
+
+ assertEquals(count, assertCount);
+ }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
index 4d9c70d..611257d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
@@ -48,6 +48,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.ResultCode;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
/**
* Test behavior of an LDAP server that is not able to connect
@@ -55,8 +56,6 @@
*/
public class IsolationTest extends ReplicationTestCase
{
- private static final String BASEDN_STRING = "dc=example,dc=com";
-
/**
* Check that the server correctly accept or reject updates when
* the replication is configured but could not connect to
@@ -67,15 +66,13 @@
public void noUpdateIsolationPolicyTest() throws Exception
{
ReplicationDomain domain = null;
- DN baseDn = DN.decode(BASEDN_STRING);
+ DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
SynchronizationProvider replicationPlugin = null;
short serverId = 1;
- cleanDB();
-
try
{
- // configure and start replication of dc=example,dc=com on the server
+ // configure and start replication of TEST_ROOT_DN_STRING on the server
// using a replication server that is not started
replicationPlugin = new MultimasterReplication();
DirectoryServer.registerSynchronizationProvider(replicationPlugin);
@@ -91,7 +88,7 @@
domainConf.setHeartbeatInterval(100000);
domain = MultimasterReplication.createNewDomain(domainConf);
- // check that the udates fail with the unwilling to perform error.
+ // check that the updates fail with the unwilling to perform error.
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
ModifyOperation op =
@@ -108,7 +105,7 @@
// try a new modify operation on the base entry.
op = conn.processModify(baseDn, generatemods("description", "test"));
- // check that the operation was successfull.
+ // check that the operation was successful.
assertEquals(op.getResultCode(), ResultCode.SUCCESS,
op.getAdditionalLogMessage().toString());
}
@@ -124,55 +121,4 @@
}
}
}
-
- /**
- * Clean the database and replace with a single entry.
- *
- * @throws FileNotFoundException
- * @throws IOException
- * @throws Exception
- */
- private void cleanDB() throws FileNotFoundException, IOException, Exception
- {
- String baseentryldif =
- "dn:" + BASEDN_STRING + "\n"
- + "objectClass: top\n"
- + "objectClass: domain\n"
- + "dc: example\n"
- + "entryuuid: " + stringUID(1) + "\n";
-
-
- // Initialization :
- // Load the database with a single entry :
- String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
- String path = buildRoot + File.separator + "build" +
- File.separator + "unit-tests" + File.separator +
- "package-instance" + File.separator +
- "addModDelDependencyTest";
- OutputStream out = new FileOutputStream(new File(path));
- out.write(baseentryldif.getBytes());
-
- task("dn: ds-task-id=" + UUID.randomUUID()
- + ",cn=Scheduled Tasks,cn=Tasks\n"
- + "objectclass: top\n"
- + "objectclass: ds-task\n"
- + "objectclass: ds-task-import\n"
- + "ds-task-class-name: org.opends.server.tasks.ImportTask\n"
- + "ds-task-import-backend-id: userRoot\n"
- + "ds-task-import-ldif-file: " + path + "\n"
- + "ds-task-import-reject-file: " + path + "reject\n");
- }
-
-
- /**
- * Builds and return a uuid from an integer.
- * This methods assume that unique integers are used and does not make any
- * unicity checks. It is only responsible for generating a uid with a
- * correct syntax.
- */
- private String stringUID(int i)
- {
- return String.format("11111111-1111-1111-1111-%012x", i);
- }
-
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
index ec84b45..e2f7039 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
@@ -28,7 +28,7 @@
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedHashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -41,7 +41,6 @@
import org.opends.server.core.AddOperationBasis;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperationBasis;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.ChangeNumber;
@@ -49,11 +48,13 @@
import org.opends.server.replication.plugin.FakeOperationComparator;
import org.opends.server.replication.plugin.Historical;
import org.opends.server.replication.protocol.ModifyContext;
-import org.opends.server.replication.protocol.ReplicationMessage;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.ReplicationMsg;
+import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
@@ -62,6 +63,7 @@
import org.opends.server.types.ObjectClass;
import org.opends.server.workflowelement.localbackend.LocalBackendAddOperation;
import org.opends.server.workflowelement.localbackend.LocalBackendModifyOperation;
+import static org.opends.server.TestCaseUtils.*;
/*
* Test the conflict resolution for modify operations As a consequence,
@@ -78,6 +80,11 @@
extends ReplicationTestCase
{
+ private static final String ORGANIZATION = "organization";
+ private static final String DISPLAYNAME = "displayname";
+ private static final String EMPLOYEENUMBER = "employeenumber";
+ private static final String DESCRIPTION = "description";
+
/**
* Test that conflict between a modify-replace and modify-add for
* multi-valued attributes are handled correctly.
@@ -93,14 +100,14 @@
/*
* simulate a modify-replace done at time t10
*/
- testModify(entry, hist, "description", ModificationType.REPLACE,
+ testModify(entry, hist, DESCRIPTION, ModificationType.REPLACE,
"init value", 10, true);
/*
* Now simulate an add at an earlier date that the previous replace
* conflict resolution should remove it.
*/
- testModify(entry, hist, "description", ModificationType.ADD,
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
"older value", 1, false);
/*
@@ -108,18 +115,18 @@
* conflict resolution should remove it. (a second time to make
* sure...)
*/
- testModify(entry, hist, "description", ModificationType.ADD,
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
"older value", 2, false);
/*
* Now simulate an add at a later date that the previous replace.
* conflict resolution should keep it
*/
- testModify(entry, hist, "description", ModificationType.ADD, "new value",
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD, "new value",
11, true);
}
-
+
/**
* Test that conflict between a modify-replace and modify-add for
* single-valued attributes are handled correctly.
@@ -135,14 +142,14 @@
/*
* simulate a modify-replace done at time t10
*/
- testModify(entry, hist, "displayname", ModificationType.REPLACE,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.REPLACE,
"init value", 10, true);
/*
* Now simulate an add at an earlier date that the previous replace
* conflict resolution should remove it.
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"older value", 1, false);
/*
@@ -150,20 +157,20 @@
* conflict resolution should remove it. (a second time to make
* sure...)
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"older value", 2, false);
/*
* Now simulate an add at a later date that the previous replace.
* conflict resolution should remove it
*/
- testModify(entry, hist, "displayname", ModificationType.ADD, "new value",
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD, "new value",
11, false);
}
-
+
/**
- * Test that replace with null value is corrrectly seen as a delete
+ * Test that replace with null value is correctly seen as a delete
* by doing first a replace with null, then add at at previous time
* then check that the add was ignored
*/
@@ -178,14 +185,14 @@
/*
* simulate a replace with null done at time t3
*/
- testModify(entry, hist, "displayname", ModificationType.REPLACE, null, 3,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.REPLACE, null, 3,
true);
/*
* Now simulate an add at an earlier date that the previous replace. The
* conflict resolution should detect that this add must be ignored.
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"older value", 1, false);
/*
@@ -193,14 +200,14 @@
* conflict resolution should detect that this add must be ignored. (a
* second time to make sure that historical information is kept...)
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"older value", 2, false);
/*
* Now simulate an add at a later date that the previous delete.
* conflict resolution should keep it
*/
- testModify(entry, hist, "displayname", ModificationType.ADD, "new value",
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD, "new value",
4, true);
}
@@ -219,14 +226,14 @@
/*
* simulate a modify-add done at time t10
*/
- testModify(entry, hist, "description", ModificationType.ADD,
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
"init value", 10, true);
/*
* Now simulate a replace at an earlier date that the previous replace
* conflict resolution should keep it.
*/
- testModify(entry, hist, "description", ModificationType.REPLACE,
+ testModify(entry, hist, DESCRIPTION, ModificationType.REPLACE,
"older value", 1, true);
/*
@@ -234,18 +241,18 @@
* conflict resolution should remove it. (a second time to make
* sure...)
*/
- testModify(entry, hist, "description", ModificationType.REPLACE,
+ testModify(entry, hist, DESCRIPTION, ModificationType.REPLACE,
"older value", 2, true);
/*
* Now simulate a replace at a later date that the previous replace.
* conflict resolution should keep it
*/
- testModify(entry, hist, "description", ModificationType.REPLACE,
+ testModify(entry, hist, DESCRIPTION, ModificationType.REPLACE,
"new value", 11, true);
}
-
+
/**
* Test that conflict between modify-add and modify-replace for
* single-valued attributes are handled correctly.
@@ -261,21 +268,21 @@
/*
* simulate a modify-add done at time 2
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"init value", 2, true);
/*
* Now simulate a replace at an earlier date that the previous replace
* conflict resolution should keep it.
*/
- testModify(entry, hist, "displayname", ModificationType.REPLACE,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.REPLACE,
"older value", 1, true);
/*
* Now simulate a replace at a later date.
* Conflict resolution should keept it.
*/
- testModify(entry, hist, "displayname", ModificationType.REPLACE,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.REPLACE,
"older value", 3, true);
}
@@ -297,14 +304,14 @@
* simulate a delete of the whole description attribute done at time
* t10
*/
- testModify(entry, hist, "description", ModificationType.DELETE, null, 10,
+ testModify(entry, hist, DESCRIPTION, ModificationType.DELETE, null, 10,
true);
/*
* Now simulate an add at an earlier date that the previous delete. The
* conflict resolution should detect that this add must be ignored.
*/
- testModify(entry, hist, "description", ModificationType.ADD,
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
"older value", 1, false);
/*
@@ -312,17 +319,249 @@
* conflict resolution should detect that this add must be ignored. (a
* second time to make sure that historical information is kept...)
*/
- testModify(entry, hist, "description", ModificationType.ADD,
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
"older value", 2, false);
/*
* Now simulate an add at a later date that the previous delete.
* conflict resolution should keep it
*/
- testModify(entry, hist, "description", ModificationType.ADD, "new value",
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD, "new value",
11, true);
}
-
+
+ /**
+ * Test that conflict between a delete-attribute value and
+ * add attribute-values from 2 different servers are handled correctly.
+ * This test was created to reproduce issue 3392.
+ */
+ @Test()
+ public void delValueAndAddvalue() throws Exception
+ {
+ // create an entry to use with conflicts tests.
+ Entry entry = initializeEntry();
+
+ //
+ // Create description with values value1 and value2 and add
+ // this attribute to the entry.
+ //
+ AttributeBuilder builder = new AttributeBuilder(DESCRIPTION);
+ builder.add("value1");
+ builder.add("value2");
+
+ List<AttributeValue> duplicateValues = new LinkedList<AttributeValue>();
+ entry.addAttribute(builder.toAttribute(), duplicateValues);
+
+
+ // load historical from the entry
+ Historical hist = Historical.load(entry);
+
+ /*
+ * simulate a delete of the description attribute value "value1"
+ * done at time t1
+ */
+ testModify(entry, hist, DESCRIPTION, ModificationType.DELETE, "value1",
+ 1, true);
+
+
+ /*
+ * Now simulate an add of "value3" at time t2
+ */
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
+ "value3", 2, true);
+
+ /*
+ * Now simulate a delete of value "value1" at time t3
+ */
+ testModify(entry, hist, DESCRIPTION, ModificationType.DELETE, "value1",
+ 3, false);
+
+ /*
+ * Now simulate an add of "value4" at time t4
+ */
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
+ "value4", 4, true);
+
+ }
+
+ /**
+ * Test that conflict between several delete-attribute value and
+ * are handled correctly.
+ * This test was created to reproduce and fix issue 3397.
+ */
+ @Test()
+ public void delValueAndDelValue() throws Exception
+ {
+ // create an entry to use with conflicts tests.
+ Entry entry = initializeEntry();
+
+ //
+ // Create an attribute with values value1, value2, value3 and value4 and
+ // add this attribute to the entry.
+ //
+ AttributeBuilder builder = new AttributeBuilder(DESCRIPTION);
+ builder.add("value1");
+ builder.add("value2");
+ builder.add("value3");
+ builder.add("value4");
+
+ List<AttributeValue> duplicateValues = new LinkedList<AttributeValue>();
+ entry.addAttribute(builder.toAttribute(), duplicateValues);
+
+
+ // load historical from the entry
+ Historical hist = Historical.load(entry);
+
+ /*
+ * simulate a delete of the description attribute values
+ * "value1" and "value2" done at time t1
+ */
+ testModify(entry, hist, DESCRIPTION,
+ buildModWith2Vals(DESCRIPTION, ModificationType.DELETE,
+ "value1", "value2"),
+ 1, true);
+
+
+ /*
+ * simulate a delete of the description attribute values
+ * "value2" and "value3" done at time t1
+ */
+ testModify(entry, hist, DESCRIPTION,
+ buildModWith2Vals(DESCRIPTION, ModificationType.DELETE,
+ "value2", "value3"),
+ 2, true);
+
+
+ // Check that entry now only contains 1 attribute value : "value1"
+ List<Attribute> attrs = entry.getAttribute(DESCRIPTION);
+ Attribute attr = attrs.get(0);
+ assertEquals(1, attr.size());
+ }
+
+ /**
+ * Test that conflict between a delete attribute and a delete
+ * value on a single valued attribute works correctly.
+ * This test was created to reproduce and fix issue 3399.
+ */
+ @Test()
+ public void delAttributeAndDelValueSingle() throws Exception
+ {
+ // create an entry to use with conflicts tests.
+ Entry entry = initializeEntry();
+
+ //
+ // Create a single valued attribute with value : "value1"
+ // add this attribute to the entry.
+ //
+ List<AttributeValue> duplicateValues = new LinkedList<AttributeValue>();
+ Attribute attribute = Attributes.create(EMPLOYEENUMBER, "value1");
+ entry.addAttribute(attribute, duplicateValues);
+
+ // load historical from the entry
+ Historical hist = Historical.load(entry);
+
+ /*
+ * simulate a delete of attribute employeenumber.
+ */
+ testModify(
+ entry, hist, EMPLOYEENUMBER, ModificationType.DELETE, null, 1, true);
+
+ /*
+ * now simulate a delete of value "value1"
+ */
+ testModify(
+ entry, hist, EMPLOYEENUMBER, ModificationType.DELETE,
+ "value1", 2, false);
+ }
+
+ /**
+ * Test that conflict between a delete attribute and a delete
+ * value on a single valued attribute works correctly.
+ * This test was created to reproduce and fix issue 3399.
+ */
+ @Test()
+ public void delValueAndDelAttributeSingle() throws Exception
+ {
+ // create an entry to use with conflicts tests.
+ Entry entry = initializeEntry();
+
+ // Create a single valued attribute with value : "value1"
+ // add this attribute to the entry.
+ List<AttributeValue> duplicateValues = new LinkedList<AttributeValue>();
+ Attribute attribute = Attributes.create(EMPLOYEENUMBER, "value1");
+ entry.addAttribute(attribute, duplicateValues);
+
+ // load historical from the entry
+ Historical hist = Historical.load(entry);
+
+ /*
+ * now simulate a delete of value "value1"
+ */
+ testModify(
+ entry, hist, EMPLOYEENUMBER, ModificationType.DELETE,
+ "value1", 1, true);
+
+ /*
+ * simulate a delete of attribute employeenumber.
+ */
+ testModify(
+ entry, hist, EMPLOYEENUMBER, ModificationType.DELETE, null, 2, false);
+ }
+
+ /**
+ * Test that conflict between a delete-attribute value and
+ * add attribute-values from 2 different servers
+ * and replayed in the non-natural order are handled correctly.
+ * This test was created to reproduce issue 3392.
+ */
+ @Test()
+ public void delValueAndAddvalueDisordered() throws Exception
+ {
+ // create an entry to use with conflicts tests.
+ Entry entry = initializeEntry();
+
+ //
+ // Create description with values value1 and value2 and add
+ // this attribute to the entry.
+ //
+ AttributeBuilder builder = new AttributeBuilder(DESCRIPTION);
+ builder.add("value1");
+ builder.add("value2");
+
+ List<AttributeValue> duplicateValues = new LinkedList<AttributeValue>();
+ entry.addAttribute(builder.toAttribute(), duplicateValues);
+
+ // load historical from the entry
+ Historical hist = Historical.load(entry);
+
+ /*
+ * simulate a delete of the description attribute value "value1"
+ * done at time t3
+ */
+ testModify(entry, hist, DESCRIPTION, ModificationType.DELETE, "value1",
+ 3, true);
+
+
+ /*
+ * Now simulate an add of "value3" at time t4
+ */
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
+ "value3", 4, true);
+
+ /*
+ * Now simulate a delete of value "value1" at time t1
+ */
+ testModify(entry, hist, DESCRIPTION, ModificationType.DELETE, "value1",
+ 1, false);
+
+ /*
+ * Now simulate an add of "value4" at time t2
+ */
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
+ "value4", 2, true);
+
+ }
+
/**
* Test that conflict between a modify-delete-attribute and modify-add
* for multi-valued attributes are handled correctly.
@@ -332,6 +571,11 @@
{
Entry entry = initializeEntry();
+ // Create a single valued attribute with value : "value1"
+ // add this attribute to the entry.
+ List<AttributeValue> duplicateValues = new LinkedList<AttributeValue>();
+ Attribute attribute = Attributes.create(DISPLAYNAME, "value1");
+ entry.addAttribute(attribute, duplicateValues);
// load historical from the entry
Historical hist = Historical.load(entry);
@@ -340,14 +584,14 @@
* simulate a delete of the whole description attribute done at time
* t2
*/
- testModify(entry, hist, "displayname", ModificationType.DELETE, null, 3,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.DELETE, null, 3,
true);
/*
* Now simulate an add at an earlier date that the previous delete. The
* conflict resolution should detect that this add must be ignored.
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"older value", 1, false);
/*
@@ -355,17 +599,17 @@
* conflict resolution should detect that this add must be ignored. (a
* second time to make sure that historical information is kept...)
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"older value", 2, false);
/*
* Now simulate an add at a later date that the previous delete.
* conflict resolution should keep it
*/
- testModify(entry, hist, "displayname", ModificationType.ADD, "new value",
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD, "new value",
4, true);
}
-
+
/**
* Test that conflict between a modify-delete-attribute and modify-add
* for multi-valued attributes are handled correctly.
@@ -383,17 +627,158 @@
* simulate a delete of the whole description attribute done at time
* t4
*/
- testModify(entry, hist, "description", ModificationType.DELETE, null, 4,
+ testModify(entry, hist, DESCRIPTION, ModificationType.DELETE, null, 4,
true);
/*
* Now simulate a replace at an earlier date that the previous delete. The
* conflict resolution should detect that this replace must be ignored.
*/
- testModify(entry, hist, "description", ModificationType.REPLACE,
+ testModify(entry, hist, DESCRIPTION, ModificationType.REPLACE,
"new value", 3, false);
}
-
+
+ /**
+ * Test that conflict between a modify-replace and a a modify-delete
+ * with some attribute values is resolved correctly.
+ * This test has been created to reproduce Issue 3397.
+ */
+ @Test()
+ public void replaceAndDelete() throws Exception
+ {
+ AttributeType descriptionAttrType =
+ DirectoryServer.getSchema().getAttributeType(DESCRIPTION);
+
+ // create an entry to use with conflicts tests.
+ Entry entry = initializeEntry();
+
+ //
+ // Create description with values value1 and value2 and add
+ // this attribute to the entry.
+ //
+ AttributeBuilder builder = new AttributeBuilder(DESCRIPTION);
+ builder.add("value1");
+ builder.add("value2");
+ builder.add("value3");
+ builder.add("value4");
+
+ List<AttributeValue> duplicateValues = new LinkedList<AttributeValue>();
+ entry.addAttribute(builder.toAttribute(), duplicateValues);
+
+ // load historical from the entry
+ Historical hist = Historical.load(entry);
+
+ // simulate a REPLACE of the attribute with values : value1, value2, value3
+ // at time t1.
+ builder = new AttributeBuilder(DESCRIPTION);
+ builder.add("value1");
+ builder.add("value2");
+ builder.add("value3");
+
+ Modification mod =
+ new Modification(ModificationType.REPLACE, builder.toAttribute());
+ testModify(entry, hist, DESCRIPTION, mod, 1, true);
+
+ // simulate a DELETE of the attribute values : value3 and value4
+ // at time t2.
+ builder = new AttributeBuilder(DESCRIPTION);
+ builder.add("value3");
+ builder.add("value4");
+ mod = new Modification(ModificationType.DELETE, builder.toAttribute());
+ List<Modification> mods = replayModify(entry, hist, mod, 2);
+ mod = mods.get(0);
+ assertEquals(mod.getAttribute().getName(), DESCRIPTION);
+ assertEquals(mod.getModificationType(), ModificationType.DELETE);
+ assertEquals(mod.getAttribute().size(), 1);
+ assertTrue(mod.getAttribute().contains(
+ new AttributeValue(descriptionAttrType, "value3")));
+ }
+
+ /**
+ * Test that conflict between a modify-replace and a a modify-delete
+ * with some attribute values is resolved correctly when they are replayed
+ * disorderly.
+ * This test has been created to reproduce Issue 3397.
+ */
+ @Test()
+ public void replaceAndDeleteDisorder() throws Exception
+ {
+ AttributeType descriptionAttrType =
+ DirectoryServer.getSchema().getAttributeType(DESCRIPTION);
+
+ // create an entry to use with conflicts tests.
+ Entry entry = initializeEntry();
+
+ //
+ // Create description with values value1 and value2 and add
+ // this attribute to the entry.
+ //
+ AttributeBuilder builder = new AttributeBuilder(DESCRIPTION);
+ builder.add("value1");
+ builder.add("value2");
+ builder.add("value3");
+ builder.add("value4");
+
+ List<AttributeValue> duplicateValues = new LinkedList<AttributeValue>();
+ entry.addAttribute(builder.toAttribute(), duplicateValues);
+
+ // load historical from the entry
+ Historical hist = Historical.load(entry);
+
+ // simulate a DELETE of the attribute values : value3 and value4
+ // at time t2.
+ builder = new AttributeBuilder(DESCRIPTION);
+ builder.add("value3");
+ builder.add("value4");
+ Modification mod =
+ new Modification(ModificationType.DELETE, builder.toAttribute());
+ List<Modification> mods = replayModify(entry, hist, mod, 2);
+ entry.applyModifications(mods);
+ // check that the MOD is not altered by the replay mechanism.
+ mod = mods.get(0);
+ assertEquals(mod.getAttribute().getName(), DESCRIPTION);
+ assertEquals(mod.getModificationType(), ModificationType.DELETE);
+ assertEquals(mod.getAttribute().size(), 2);
+ assertTrue(mod.getAttribute().contains(
+ new AttributeValue(descriptionAttrType, "value3")));
+ assertTrue(mod.getAttribute().contains(
+ new AttributeValue(descriptionAttrType, "value4")));
+ Attribute resultEntryAttr = entry.getAttribute(descriptionAttrType).get(0);
+ // check that the entry now contains value1 and value2 and no other values.
+ assertEquals(resultEntryAttr.size(), 2);
+ assertTrue(resultEntryAttr.contains(
+ new AttributeValue(descriptionAttrType, "value1")));
+ assertTrue(resultEntryAttr.contains(
+ new AttributeValue(descriptionAttrType, "value2")));
+
+ // simulate a REPLACE of the attribute with values : value1, value2, value3
+ // at time t1.
+ builder = new AttributeBuilder(DESCRIPTION);
+ builder.add("value1");
+ builder.add("value2");
+ builder.add("value3");
+
+ mod = new Modification(ModificationType.REPLACE, builder.toAttribute());
+ mods = replayModify(entry, hist, mod, 1);
+ entry.applyModifications(mods);
+ mod = mods.get(0);
+ // check that value3 has been removed from the MOD-REPLACE because
+ // a later operation contains a MOD-DELETE of this value.
+ assertEquals(mod.getAttribute().getName(), DESCRIPTION);
+ assertEquals(mod.getModificationType(), ModificationType.REPLACE);
+ assertEquals(mod.getAttribute().size(), 2);
+ assertTrue(mod.getAttribute().contains(
+ new AttributeValue(descriptionAttrType, "value1")));
+ assertTrue(mod.getAttribute().contains(
+ new AttributeValue(descriptionAttrType, "value2")));
+ // check that the entry now contains value1 and value2 and no other values.
+ assertEquals(resultEntryAttr.size(), 2);
+ assertTrue(resultEntryAttr.contains(
+ new AttributeValue(descriptionAttrType, "value1")));
+ assertTrue(resultEntryAttr.contains(
+ new AttributeValue(descriptionAttrType, "value2")));
+ }
+
/**
* Test that conflict between a modify-delete-attribute and modify-add
* for multi-valued attributes are handled correctly.
@@ -403,6 +788,11 @@
{
Entry entry = initializeEntry();
+ // Create a single valued attribute with value : "value1"
+ // add this attribute to the entry.
+ List<AttributeValue> duplicateValues = new LinkedList<AttributeValue>();
+ Attribute attribute = Attributes.create(DISPLAYNAME, "value1");
+ entry.addAttribute(attribute, duplicateValues);
// load historical from the entry
Historical hist = Historical.load(entry);
@@ -411,14 +801,14 @@
* simulate a delete of the whole description attribute done at time
* t4
*/
- testModify(entry, hist, "displayname", ModificationType.DELETE, null, 4,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.DELETE, null, 4,
true);
/*
* Now simulate a replace at an earlier date that the previous delete. The
* conflict resolution should detect that this replace must be ignored.
*/
- testModify(entry, hist, "displayname", ModificationType.REPLACE,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.REPLACE,
"new value", 3, false);
}
@@ -437,28 +827,97 @@
/*
* simulate a add of the description attribute done at time t10
*/
- testModify(entry, hist, "description", ModificationType.ADD,
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
"init value", 10, true);
/*
* Now simulate an add at an earlier date that the previous add. The
* conflict resolution should detect that this add must be kept.
*/
- testModify(entry, hist, "description", ModificationType.ADD,
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
"older value", 1, true);
/*
* Now simulate an add with a value already existing.
* The conflict resolution should remove this add.
*/
- testModify(entry, hist, "description", ModificationType.ADD,
- "older value", 2, false);
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
+ "init value", 13, false);
/*
* Now simulate an add at a later date that the previous add. conflict
* resolution should keep it
*/
- testModify(entry, hist, "description", ModificationType.ADD, "new value",
- 11, true);
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD, "new value",
+ 14, true);
+ }
+
+ /**
+ * Test that conflict between two modify-add with for
+ * multi-valued attributes are handled correctly when some of the values
+ * are the same :
+ * - first ADD done with value1
+ * - second ADD done with value1 and value2
+ * This test has been created to make sure that issue 3394 is fixed.
+ */
+ @Test()
+ public void addAndAddSameValues() throws Exception
+ {
+ Entry entry = initializeEntry();
+
+ // load historical from the entry
+ Historical hist = Historical.load(entry);
+
+ /*
+ * simulate a add of the description attribute done at time 1
+ */
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
+ "value1", 1, true);
+
+
+ /*
+ * simulate an add of the description attribute values
+ * "value1" and "value2" done at time 2
+ */
+ testModify(entry, hist, DESCRIPTION,
+ buildModWith2Vals(DESCRIPTION, ModificationType.ADD, "value1",
+ "value2"),
+ 2, true);
+
+ // Check that entry now only contains the 2 attribute values
+ List<Attribute> attrs = entry.getAttribute(DESCRIPTION);
+ Attribute attr = attrs.get(0);
+ assertEquals(2, attr.size());
+ attr.contains(new AttributeValue(attr.getAttributeType(), "value1"));
+ attr.contains(new AttributeValue(attr.getAttributeType(), "value2"));
+
+
+ // do the same as before but in reverse order
+ entry = initializeEntry();
+
+ // load historical from the entry
+ hist = Historical.load(entry);
+
+ /*
+ * simulate an add of the description attribute values
+ * "value1" and "value2" done at time 1
+ */
+ testModify(entry, hist, DESCRIPTION,
+ buildModWith2Vals(DESCRIPTION, ModificationType.ADD, "value1",
+ "value2"),
+ 1, true);
+
+ /*
+ * simulate a add of the description attribute done at time 1
+ */
+ testModify(entry, hist, DESCRIPTION, ModificationType.ADD,
+ "value1", 2, false);
+
+ // Check that entry now only contains the 2 attribute values
+ attrs = entry.getAttribute(DESCRIPTION);
+ attr = attrs.get(0);
+ assertEquals(2, attr.size());
+ attr.contains(new AttributeValue(attr.getAttributeType(), "value1"));
+ attr.contains(new AttributeValue(attr.getAttributeType(), "value2"));
}
/**
@@ -476,21 +935,21 @@
/*
* simulate a add of the description attribute done at time t10
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"init value", 10, true);
/*
* Now simulate an add at an earlier date that the previous add. The
* conflict resolution should detect that this add must be kept.
- * and that the previous value must be discarded, and therefore
+ * and that the previous value must be discarded, and therefore
* turn the add into a replace.
*/
- Modification mod = buildMod("displayname", ModificationType.ADD,
+ Modification mod = buildMod(DISPLAYNAME, ModificationType.ADD,
"older value");
List<Modification> mods = replayModify(entry, hist, mod, 1);
-
+
/*
* After replay the mods should contain only one mod,
- * the mod should now be a replace with the older value.
+ * the mod should now be a replace with the older value.
*/
testMods(mods, 1, ModificationType.REPLACE, "older value");
@@ -499,11 +958,11 @@
* The conflict modify code should detect that there is already a value
* and skip this change.
*/
- mod = buildMod("displayname", ModificationType.ADD, "new value");
+ mod = buildMod(DISPLAYNAME, ModificationType.ADD, "new value");
mods = replayModify(entry, hist, mod, 2);
assertTrue(mods.isEmpty());
}
-
+
/**
* Test that conflict between add delete and add are handled correctly.
*/
@@ -518,32 +977,32 @@
/*
* simulate a add of the description attribute done at time t1
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"init value", 1, true);
-
+
/*
* simulate a del of the description attribute done at time t3
* this should be processed normally
*/
- testModify(entry, hist, "displayname", ModificationType.DELETE,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.DELETE,
"init value", 3, true);
-
+
/*
* Now simulate another add, that would come from another master
* and done at time t2 (between t1 and t2)
* This add should not be processed.
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"second value", 2, false);
}
-
+
/**
* Test that conflict between add, add and delete are handled correctly.
- *
+ *
* This test simulate the case where a simple add is done on a first server
- * and at a later date but before replication happens, a add followed by
+ * and at a later date but before replication happens, a add followed by
* a delete of the second value is done on another server.
- * The test checks that the firs tvalue wins and stay in the entry.
+ * The test checks that the firs tvalue wins and stay in the entry.
*/
@Test()
public void addAddDelSingle() throws Exception
@@ -556,34 +1015,34 @@
/*
* simulate a add of the description attribute done at time t1
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"first value", 1, true);
-
+
/*
* simulate a add of the description attribute done at time t2
* with a second value. This should not work because there is already
* a value
*/
- testModify(entry, hist, "displayname", ModificationType.ADD,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.ADD,
"second value", 2, false);
-
+
/*
* Now simulate a delete of the second value.
* The delete should not be accepted because it is done on a value
* that did not get into the entry.
*/
- testModify(entry, hist, "displayname", ModificationType.DELETE,
+ testModify(entry, hist, DISPLAYNAME, ModificationType.DELETE,
"second value", 2, false);
}
/**
* Check that the mods given as first parameter match the next parameters.
- *
+ *
* @param mods The mods that must be tested.
* @param size the size that the mods must have.
- * @param modType the type of Modification that the first mod of the
- * mods should have.
- * @param value the value that the first mod of the mods should have.
+ * @param modType the type of Modification that the first mod of the
+ * mods should have.
+ * @param value the value that the first mod of the mods should have.
*/
private void testMods(
List<Modification> mods, int size, ModificationType modType, String value)
@@ -591,7 +1050,7 @@
assertEquals(size, mods.size());
Modification newMod = mods.get(0);
assertTrue(newMod.getModificationType().equals(modType));
- AttributeValue val = newMod.getAttribute().getValues().iterator().next();
+ AttributeValue val = newMod.getAttribute().iterator().next();
assertEquals(val.getStringValue(), value);
}
@@ -604,16 +1063,16 @@
AttributeType entryuuidAttrType =
DirectoryServer.getSchema().getAttributeType(
Historical.ENTRYUIDNAME);
-
+
/*
- * Objectclass and DN do not have any impact on the modifty conflict
+ * Objectclass and DN do not have any impact on the modify conflict
* resolution for the description attribute. Always use the same values
* for all these tests.
*/
- DN dn = DN.decode("dc=com");
+ DN dn = DN.decode(TEST_ROOT_DN_STRING);
Map<ObjectClass, String> objectClasses = new HashMap<ObjectClass, String>();
- ObjectClass org = DirectoryServer.getObjectClass("organization");
- objectClasses.put(org, "organization");
+ ObjectClass org = DirectoryServer.getObjectClass(ORGANIZATION);
+ objectClasses.put(org, ORGANIZATION);
/*
* start with a new entry with an empty attribute
@@ -624,13 +1083,9 @@
UUID uuid = UUID.randomUUID();
// Create the att values list
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(
- 1);
- values.add(new AttributeValue(entryuuidAttrType,
- new ASN1OctetString(uuid.toString())));
ArrayList<Attribute> uuidList = new ArrayList<Attribute>(1);
- Attribute uuidAttr = new Attribute(entryuuidAttrType,
- "entryUUID", values);
+ Attribute uuidAttr = Attributes.create(entryuuidAttrType, uuid
+ .toString());
uuidList.add(uuidAttr);
/*
@@ -651,7 +1106,7 @@
{
AttributeType entryuuidAttrType =
DirectoryServer.getSchema().getAttributeType(Historical.ENTRYUIDNAME);
-
+
// Get the historical uuid associated to the entry
// (the one that needs to be tested)
String uuid = Historical.getEntryUuid(entry);
@@ -659,14 +1114,14 @@
// Get the Entry uuid in String format
List<Attribute> uuidAttrs = entry
.getOperationalAttribute(entryuuidAttrType);
- uuidAttrs.get(0).getValues().iterator().next().toString();
+ uuidAttrs.get(0).iterator().next().toString();
if (uuidAttrs != null)
{
if (uuidAttrs.size() > 0)
{
Attribute att = uuidAttrs.get(0);
- String retrievedUuid = (att.getValues().iterator().next()).toString();
+ String retrievedUuid = (att.iterator().next()).toString();
assertTrue(retrievedUuid.equals(uuid));
}
}
@@ -681,10 +1136,10 @@
FakeOperation fk = fks.iterator().next();
assertTrue(new FakeOperationComparator().compare(fk, fk) == 0);
assertTrue(new FakeOperationComparator().compare(null , fk) < 0);
- ReplicationMessage generatedMsg = fk.generateMessage() ;
- if (generatedMsg instanceof UpdateMessage)
+ ReplicationMsg generatedMsg = fk.generateMessage() ;
+ if (generatedMsg instanceof UpdateMsg)
{
- UpdateMessage new_name = (UpdateMessage) generatedMsg;
+ UpdateMsg new_name = (UpdateMsg) generatedMsg;
assertEquals(new_name.getUniqueId(),uuid);
}
@@ -699,15 +1154,25 @@
}
/**
- *
+ *
*
*/
private void testModify(Entry entry,
Historical hist, String attrName,
ModificationType modType, String value,
- int date, boolean keepChangeResult)
+ int date, boolean keepChangeResult) throws DirectoryException
{
Modification mod = buildMod(attrName, modType, value);
+ testModify(entry, hist, attrName, mod, date, keepChangeResult);
+ }
+
+ /**
+ *
+ */
+ private void testModify(Entry entry,
+ Historical hist, String attrName, Modification mod,
+ int date, boolean keepChangeResult) throws DirectoryException
+ {
List<Modification> mods = replayModify(entry, hist, mod, date);
if (keepChangeResult)
@@ -728,10 +1193,11 @@
assertFalse(mods.contains(mod));
assertEquals(0, mods.size());
}
+ entry.applyModifications(mods);
}
/**
- *
+ *
*/
private List<Modification> replayModify(
Entry entry, Historical hist, Modification mod, int date)
@@ -739,7 +1205,7 @@
AttributeType historicalAttrType =
DirectoryServer.getSchema().getAttributeType(
Historical.HISTORICALATTRIBUTENAME);
-
+
InternalClientConnection connection =
InternalClientConnection.getRootConnection();
ChangeNumber t = new ChangeNumber(date, (short) 0, (short) 0);
@@ -777,7 +1243,7 @@
entry.addAttribute(hist.encode(), null);
Historical hist2 = Historical.load(entry);
assertEquals(hist2.encode().toString(), hist.encode().toString());
-
+
return mods;
}
@@ -785,18 +1251,29 @@
String attrName, ModificationType modType, String value)
{
/* create AttributeType that will be used for this test */
- AttributeType attrType =
- DirectoryServer.getAttributeType(attrName, true);
-
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- if (value != null)
- values.add(new AttributeValue(attrType, value));
- Attribute attr = new Attribute(attrType, attrName, values);
+ Attribute attr;
+ if (value != null) {
+ attr = Attributes.create(attrName, value);
+ } else {
+ attr = Attributes.empty(attrName);
+ }
Modification mod = new Modification(modType, attr);
-
+
return mod;
}
+ private Modification buildModWith2Vals(
+ String attrName, ModificationType modType, String value1, String value2)
+ {
+ AttributeBuilder builder = new AttributeBuilder(attrName);
+ builder.add(value1);
+ builder.add(value2);
+
+ Modification mod = new Modification(modType, builder.toAttribute());
+ return mod;
+
+ }
+
/**
*
*/
@@ -805,7 +1282,7 @@
{
AttributeType entryuuidAttrType =
DirectoryServer.getSchema().getAttributeType(
- Historical.ENTRYUIDNAME);
+ Historical.ENTRYUIDNAME);
// Get the historical uuid associated to the entry
// (the one that needs to be tested)
@@ -814,14 +1291,14 @@
// Get the op uuid in String format
List<Attribute> uuidAttrs = addOp.getOperationalAttributes().get(
entryuuidAttrType);
- uuidAttrs.get(0).getValues().iterator().next().toString();
+ uuidAttrs.get(0).iterator().next().toString();
if (uuidAttrs != null)
{
if (uuidAttrs.size() > 0)
{
Attribute att = uuidAttrs.get(0);
- String retrievedUuid = (att.getValues().iterator().next()).toString();
+ String retrievedUuid = (att.iterator().next()).toString();
assertTrue(retrievedUuid.equals(uuid));
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
index c96d920..e447cb8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
@@ -28,17 +28,13 @@
import static org.testng.Assert.assertEquals;
-import org.opends.server.TestCaseUtils;
-import org.opends.server.core.AddOperationBasis;
-import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ChangeNumberGenerator;
import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
/**
* Test the PersistentServerState class.
@@ -46,39 +42,12 @@
public class PersistentServerStateTest extends ReplicationTestCase
{
/**
- * Set up the environment for performing the tests in this suite.
- *
- * @throws Exception
- * If the environment could not be set up.
- */
- @BeforeClass
- public void setUp() throws Exception
- {
- /*
- * start the server and create the dc=exmaple,dc=xom entry if it does not
- * exist yet.
- */
- TestCaseUtils.startServer();
- String topEntry = "dn: dc=example,dc=com\n" + "objectClass: top\n"
- + "objectClass: domain\n";
-
- connection = InternalClientConnection.getRootConnection();
- Entry entry = TestCaseUtils.entryFromLdifString(topEntry);
- AddOperationBasis addOp = new AddOperationBasis(connection,
- InternalClientConnection.nextOperationID(), InternalClientConnection
- .nextMessageID(), null, entry.getDN(), entry.getObjectClasses(),
- entry.getUserAttributes(), entry.getOperationalAttributes());
- addOp.setInternalOperation(true);
- addOp.run();
- }
-
- /**
* The suffix for which we want to test the PersistentServerState class.
*/
@DataProvider(name = "suffix")
public Object[][] suffixData() {
return new Object[][] {
- {"dc=example,dc=com"},
+ {TEST_ROOT_DN_STRING},
{"cn=schema"}
};
}
@@ -120,7 +89,7 @@
"cn1 has not been saved or loaded correctly for " + dn);
assertEquals(cn2Saved, cn2,
"cn2 has not been saved or loaded correctly for " + dn);
-
+
state.clear();
stateSaved = new PersistentServerState(baseDn, (short) 1);
cn1Saved = stateSaved.getMaxChangeNumber((short) 1);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java
deleted file mode 100644
index 6145e74..0000000
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentStateTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.replication.plugin;
-
-import static org.testng.Assert.assertEquals;
-
-import org.opends.server.TestCaseUtils;
-import org.opends.server.core.AddOperationBasis;
-import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.replication.ReplicationTestCase;
-import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.replication.common.ChangeNumberGenerator;
-import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-/**
- * Test the PersistentServerState class.
- */
-public class PersistentStateTest extends ReplicationTestCase
-{
- /**
- * Set up the environment for performing the tests in this suite.
- *
- * @throws Exception
- * If the environment could not be set up.
- */
- @BeforeClass
- public void setUp() throws Exception
- {
- /*
- * start the server and create the dc=exmaple,dc=xom entry if it does not
- * exist yet.
- */
- TestCaseUtils.startServer();
- String topEntry = "dn: dc=example,dc=com\n" + "objectClass: top\n"
- + "objectClass: domain\n";
-
- connection = InternalClientConnection.getRootConnection();
- Entry entry = TestCaseUtils.entryFromLdifString(topEntry);
- AddOperationBasis addOp = new AddOperationBasis(connection,
- InternalClientConnection.nextOperationID(), InternalClientConnection
- .nextMessageID(), null, entry.getDN(), entry.getObjectClasses(),
- entry.getUserAttributes(), entry.getOperationalAttributes());
- addOp.setInternalOperation(true);
- addOp.run();
- }
-
- /**
- * The suffix for which we want to test the PersistentServerState class.
- */
- @DataProvider(name = "suffix")
- public Object[][] suffixData() {
- return new Object[][] {
- {"dc=example,dc=com"},
- {"cn=schema"}
- };
- }
-
- /**
- * Test that the PersistentServerState class is able to store and
- * retrieve ServerState to persistent storage.
- */
- @Test(dataProvider = "suffix")
- public void persistenServerStateTest(String dn)
- throws Exception
- {
- /*
- * Create a new PersitentServerState,
- * update it with 2 new ChangeNumbers with 2 different server Ids
- * save it
- *
- * Then creates a new PersistentServerState and check that the
- * 2 ChangeNumbers have been saved in this new PersistentServerState.
- */
- DN baseDn = DN.decode(dn);
- PersistentServerState state = new PersistentServerState(baseDn, (short) 1);
- ChangeNumberGenerator gen1 = new ChangeNumberGenerator((short) 1, state);
- ChangeNumberGenerator gen2 = new ChangeNumberGenerator((short) 2, state);
-
- ChangeNumber cn1 = gen1.newChangeNumber();
- ChangeNumber cn2 = gen2.newChangeNumber();
-
- state.update(cn1);
- state.update(cn2);
-
- state.save();
-
- PersistentServerState stateSaved = new PersistentServerState(baseDn, (short) 1);
- ChangeNumber cn1Saved = stateSaved.getMaxChangeNumber((short) 1);
- ChangeNumber cn2Saved = stateSaved.getMaxChangeNumber((short) 2);
-
- assertEquals(cn1Saved, cn1,
- "cn1 has not been saved or loaded correctly for " + dn);
- assertEquals(cn2Saved, cn2,
- "cn2 has not been saved or loaded correctly for " + dn);
-
- }
-}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
index 8234ce7..acab536 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
@@ -31,6 +31,7 @@
import org.opends.server.tools.LDAPModify;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
+import static org.opends.server.TestCaseUtils.*;
public class ReplicationRepairControlTest extends ReplicationTestCase
{
@@ -38,14 +39,12 @@
public void testRepairControl()
throws Exception
{
- TestCaseUtils.startServer();
-
TestCaseUtils.initializeTestBackend(true);
// Test that we can't add an entry with the entryuuid attribute
// without specifying the replication repair control.
String path = TestCaseUtils.createTempFile(
- "dn: uid=test.repair,o=test\n" +
+ "dn: uid=test.repair," + TEST_ROOT_DN_STRING + "\n" +
"changetype: add\n" +
"objectClass: top\n" +
"objectClass: person" +
@@ -73,7 +72,7 @@
// Test that we can't add an entry with the ds-sync-hist attribute
// without specifying the replication repair control.
String path1 = TestCaseUtils.createTempFile(
- "dn: uid=test.repair,o=test\n" +
+ "dn: uid=test.repair," + TEST_ROOT_DN_STRING + "\n" +
"changetype: add\n" +
"objectClass: top\n" +
"objectClass: person" +
@@ -103,7 +102,7 @@
// possible to add an entry with the entryuuid and ds-sync-hist attributes
// (notice the -J repairControlOid in the ldapmodify arguments)
String path2 = TestCaseUtils.createTempFile(
- "dn: uid=test.repair,o=test\n" +
+ "dn: uid=test.repair," + TEST_ROOT_DN_STRING + "\n" +
"changetype: add\n" +
"objectClass: top\n" +
"objectClass: person" +
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
index 723c607..004c798 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
@@ -46,9 +46,9 @@
import org.opends.server.replication.server.ReplServerFakeConfiguration;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.DN;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
+import org.opends.server.types.DirectoryException;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
/**
* Test if the replication domain is able to switch of replication server
@@ -57,12 +57,10 @@
@Test(sequential = true)
public class ReplicationServerFailoverTest extends ReplicationTestCase
{
-
- private static final String BASEDN_STRING = "dc=example,dc=com";
private static final short DS1_ID = 1;
private static final short DS2_ID = 2;
- private static final short RS1_ID = 11;
- private static final short RS2_ID = 12;
+ private static final short RS1_ID = 31;
+ private static final short RS2_ID = 32;
private int rs1Port = -1;
private int rs2Port = -1;
private ReplicationDomain rd1 = null;
@@ -78,7 +76,7 @@
logError(Message.raw(Category.SYNC, Severity.NOTICE, s));
if (debugEnabled())
{
- TRACER.debugInfo("** TEST **" + s);
+ TRACER.debugInfo("*** TEST *** " + s);
}
}
@@ -107,15 +105,26 @@
rd2 = null;
}
+ try
+ {
+ // Clear any reference to a domain in synchro plugin
+ MultimasterReplication.deleteDomain(DN.decode(TEST_ROOT_DN_STRING));
+ } catch (DirectoryException ex)
+ {
+ fail("Error deleting reference to domain: " + TEST_ROOT_DN_STRING);
+ }
+
if (rs1 != null)
{
- rs1.shutdown();
+ rs1.clearDb();
+ rs1.remove();
rs1 = null;
}
if (rs2 != null)
{
- rs2.shutdown();
+ rs2.clearDb();
+ rs2.remove();
rs2 = null;
}
rs1Port = -1;
@@ -127,10 +136,10 @@
* 1 DS (DS1) and 2 RS (RS1 and RS2) in topology.
* DS1 connected to one RS
* Both RS are connected together (RS1<->RS2)
- * The RS connected to DS1 fails, DS1 should be connected
+ * The RS connected to DS1 fails, DS1 should be connected
* to the other RS
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
@Test
public void testFailOverSingle() throws Exception
@@ -141,42 +150,53 @@
initTest();
- // Start RS1
- rs1 = createReplicationServer(RS1_ID, testCase);
- // Start RS2
- rs2 = createReplicationServer(RS2_ID, testCase);
-
- // Start DS1
- DN baseDn = DN.decode(BASEDN_STRING);
- rd1 = createReplicationDomain(baseDn, DS1_ID, testCase);
-
- // DS1 connected to RS1 ?
- String msg = "Before " + RS1_ID + " failure";
- // Check which replication server is connected to this LDAP server
- rsPort = findReplServerConnected(rd1);
-
- if (rsPort == rs1Port)
+ try
{
- // Simulate RS1 failure
- rs1.shutdown();
- // Let time for failover to happen
- sleep(5000);
- // DS1 connected to RS2 ?
- msg = "After " + RS1_ID + " failure";
- checkConnection(DS1_ID, RS2_ID, msg);
- }
- else
- { // Simulate RS2 failure
- rs2.shutdown();
- // Let time for failover to happen
- sleep(5000);
+ // Start RS1
+ rs1 = createReplicationServer(RS1_ID, testCase);
+ // Start RS2
+ rs2 = createReplicationServer(RS2_ID, testCase);
+
+ // Start DS1
+ DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
+ rd1 = createReplicationDomain(baseDn, DS1_ID);
+
+ // Wait a bit so that connections are performed
+ sleep(2000);
+
// DS1 connected to RS1 ?
- msg = "After " + RS2_ID + " failure";
- checkConnection(DS1_ID, RS1_ID, msg);
+ // Check which replication server is connected to this LDAP server
+ rsPort = findReplServerConnected(rd1);
+
+ if (rsPort == rs1Port)
+ {
+ // Simulate RS1 failure
+ String msg = "Before " + RS1_ID + " failure";
+ debugInfo(msg);
+ rs1.remove();
+ // Let time for failover to happen
+ // DS1 connected to RS2 ?
+ msg = "After " + RS1_ID + " failure";
+ checkConnection(30, DS1_ID, RS2_ID, msg);
+ }
+ else if (rsPort == rs2Port)
+ { // Simulate RS2 failure
+ String msg = "Before " + RS2_ID + " failure";
+ debugInfo(msg);
+ rs2.remove();
+ // DS1 connected to RS1 ?
+ msg = "After " + RS2_ID + " failure";
+ checkConnection(30, DS1_ID, RS1_ID, msg);
+ }
+ else {
+ fail("DS1 is not connected to a RS");
+ }
+
+ debugInfo(testCase + " successfully ended.");
+ } finally
+ {
+ endTest();
}
-
-
- endTest();
}
/**
@@ -188,14 +208,9 @@
* RS1 comes back (no change)
* RS2 fails, DS1 and DS2 should be both connected to RS1
*
- * @throws Exception If a problem occured
+ * @throws Exception If a problem occurred
*/
- @Test(enabled = false)
- // This test to be run in standalone, not in precommit
- // because the timing is important as we restart servers after they fail
- // and thus cannot warrenty that the recovering server is the right one if
- // the sleep time is not enough with regard to thread scheduling in heavy
- // precommit environment
+ @Test(groups="slow")
public void testFailOverMulti() throws Exception
{
String testCase = "testFailOverMulti";
@@ -204,68 +219,63 @@
initTest();
- // Start RS1
- rs1 = createReplicationServer(RS1_ID, testCase);
- // Start RS2
- rs2 = createReplicationServer(RS2_ID, testCase);
+ try
+ {
+ // Start RS1
+ rs1 = createReplicationServer(RS1_ID, testCase);
+ // Start RS2
+ rs2 = createReplicationServer(RS2_ID, testCase);
- // Start DS1
- DN baseDn = DN.decode(BASEDN_STRING);
- rd1 = createReplicationDomain(baseDn, DS1_ID, testCase);
- // Start DS2
- rd2 = createReplicationDomain(baseDn, DS2_ID, testCase);
+ // Start DS1
+ DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
+ rd1 = createReplicationDomain(baseDn, DS1_ID);
+ // Start DS2
+ rd2 = createReplicationDomain(baseDn, DS2_ID);
+
+ // Wait a bit so that connections are performed
+ sleep(3000);
- // DS1 connected to RS1 ?
- //String msg = "Before " + RS1_ID + " failure";
- //checkConnection(DS1_ID, RS1_ID, msg);
- // DS2 connected to RS2 ?
- //checkConnection(DS2_ID, RS1_ID, msg);
+ // Simulate RS1 failure
+ rs1.remove();
- // Simulate RS1 failure
- rs1.shutdown();
- // Let time for failover to happen
- sleep(5000);
+ // DS1 connected to RS2 ?
+ String msg = "After " + RS1_ID + " failure";
+ checkConnection(30, DS1_ID, RS2_ID, msg);
+ // DS2 connected to RS2 ?
+ checkConnection(30, DS2_ID, RS2_ID, msg);
- // DS1 connected to RS2 ?
- String msg = "After " + RS1_ID + " failure";
- checkConnection(DS1_ID, RS2_ID, msg);
- // DS2 connected to RS2 ?
- checkConnection(DS2_ID, RS2_ID, msg);
+ // Restart RS1
+ rs1 = createReplicationServer(RS1_ID, testCase);
- // Restart RS1
- rs1 = createReplicationServer(RS1_ID, testCase);
- // Let time for RS1 to restart
- sleep(5000);
+ // DS1 connected to RS2 ?
+ msg = "Before " + RS2_ID + " failure";
+ checkConnection(30, DS1_ID, RS2_ID, msg);
+ // DS2 connected to RS2 ?
+ checkConnection(30, DS2_ID, RS2_ID, msg);
- // DS1 connected to RS2 ?
- msg = "Before " + RS2_ID + " failure";
- checkConnection(DS1_ID, RS2_ID, msg);
- // DS2 connected to RS2 ?
- checkConnection(DS2_ID, RS2_ID, msg);
+ // Simulate RS2 failure
+ rs2.remove();
- // Simulate RS2 failure
- rs2.shutdown();
- // Let time for failover to happen
- sleep(5000);
+ // DS1 connected to RS1 ?
+ msg = "After " + RS2_ID + " failure";
+ checkConnection(30, DS1_ID, RS1_ID, msg);
+ // DS2 connected to RS1 ?
+ checkConnection(30, DS2_ID, RS1_ID, msg);
- // DS1 connected to RS1 ?
- msg = "After " + RS2_ID + " failure";
- checkConnection(DS1_ID, RS1_ID, msg);
- // DS2 connected to RS1 ?
- checkConnection(DS2_ID, RS1_ID, msg);
+ // Restart RS2
+ rs2 = createReplicationServer(RS2_ID, testCase);
- // Restart RS2
- rs2 = createReplicationServer(RS2_ID, testCase);
- // Let time for RS2 to restart
- sleep(5000);
+ // DS1 connected to RS1 ?
+ msg = "After " + RS2_ID + " restart";
+ checkConnection(30, DS1_ID, RS1_ID, msg);
+ // DS2 connected to RS1 ?
+ checkConnection(30, DS2_ID, RS1_ID, msg);
- // DS1 connected to RS1 ?
- msg = "After " + RS2_ID + " restart";
- checkConnection(DS1_ID, RS1_ID, msg);
- // DS2 connected to RS1 ?
- checkConnection(DS2_ID, RS1_ID, msg);
-
- endTest();
+ debugInfo(testCase + " successfully ended.");
+ } finally
+ {
+ endTest();
+ }
}
private void sleep(long time)
@@ -281,58 +291,92 @@
/**
* Check connection of the provided replication domain to the provided
- * replication server.
+ * replication server. Waits for connection to be ok up to secTimeout seconds
+ * before failing.
*/
- private void checkConnection(short dsId, short rsId, String msg)
+ private void checkConnection(int secTimeout, short dsId, short rsId, String msg)
{
int rsPort = -1;
ReplicationDomain rd = null;
- if (dsId == DS1_ID)
+ switch (dsId)
{
- rd = rd1;
- } else if (dsId == DS2_ID)
- {
- rd = rd2;
- } else
- {
- fail("Unknown replication domain server id.");
+ case DS1_ID:
+ rd = rd1;
+ break;
+ case DS2_ID:
+ rd = rd2;
+ break;
+ default:
+ fail("Unknown replication domain server id.");
}
- if (rsId == RS1_ID)
+ switch (rsId)
{
- rsPort = rs1Port;
- } else if (rsId == RS2_ID)
- {
- rsPort = rs2Port;
- } else
- {
- fail("Unknown replication server id.");
+ case RS1_ID:
+ rsPort = rs1Port;
+ break;
+ case RS2_ID:
+ rsPort = rs2Port;
+ break;
+ default:
+ fail("Unknown replication server id.");
}
- // Connected ?
- assertEquals(rd.isConnected(), true,
- "Replication domain " + dsId +
- " is not connected to a replication server (" + msg + ")");
- // Right port ?
- String serverStr = rd.getReplicationServer();
- int index = serverStr.lastIndexOf(':');
- if ((index == -1) || (index >= serverStr.length()))
- fail("Enable to find port number in: " + serverStr);
- String rdPortStr = serverStr.substring(index + 1);
- int rdPort = -1;
- try
+ int nSec = 0;
+
+ // Go out of the loop only if connection is verified or if timeout occurs
+ while (true)
{
- rdPort = (new Integer(rdPortStr)).intValue();
- } catch (Exception e)
- {
- fail("Enable to get an int from: " + rdPortStr);
+ // Test connection
+ boolean connected = rd.isConnected();
+ int rdPort = -1;
+ boolean rightPort = false;
+ if (connected)
+ {
+ String serverStr = rd.getReplicationServer();
+ int index = serverStr.lastIndexOf(':');
+ if ((index == -1) || (index >= serverStr.length()))
+ fail("Enable to find port number in: " + serverStr);
+ String rdPortStr = serverStr.substring(index + 1);
+ try
+ {
+ rdPort = (new Integer(rdPortStr)).intValue();
+ } catch (Exception e)
+ {
+ fail("Enable to get an int from: " + rdPortStr);
+ }
+ if (rdPort == rsPort)
+ rightPort = true;
+ }
+ if (connected && rightPort)
+ {
+ // Connection verified
+ debugInfo("checkConnection: connection from domain " + dsId + " to" +
+ " replication server " + rsId + " obtained after "
+ + nSec + " seconds.");
+ return;
+ }
+
+ // Sleep 1 second
+ try
+ {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex)
+ {
+ fail("Error sleeping " + stackTraceToSingleLineString(ex));
+ }
+ nSec++;
+
+ if (nSec > secTimeout)
+ {
+ // Timeout reached, end with error
+ fail("checkConnection: could not verify connection from domain " + dsId
+ + " to replication server " + rsId + " after " + secTimeout + " seconds."
+ + " Domain connected: " + connected + ", connection port: " + rdPort
+ + " (should be: " + rsPort + "). [" + msg + "]");
+ }
}
- assertEquals(rdPort, rsPort,
- "Replication domain " + dsId +
- " is not connected to right replication server port (" +
- rdPort + ") was expecting " + rsPort +
- " (" + msg + ")");
}
/**
@@ -378,7 +422,7 @@
fail("Unknown replication server id.");
}
- String dir = "genid" + serverId + suffix + "Db";
+ String dir = "replicationServerFailoverTest" + serverId + suffix + "Db";
ReplServerFakeConfiguration conf =
new ReplServerFakeConfiguration(port, dir, 0, serverId, 0, 100,
replServers);
@@ -395,8 +439,7 @@
/**
* Creates a new ReplicationDomain.
*/
- private ReplicationDomain createReplicationDomain(DN baseDn, short serverId,
- String suffix)
+ private ReplicationDomain createReplicationDomain(DN baseDn, short serverId)
{
SortedSet<String> replServers = new TreeSet<String>();
@@ -405,7 +448,7 @@
// Create a domain with two replication servers
replServers.add("localhost:" + rs1Port);
replServers.add("localhost:" + rs2Port);
-
+
DomainFakeCfg domainConf =
new DomainFakeCfg(baseDn, serverId, replServers);
//domainConf.setHeartbeatInterval(500);
@@ -422,48 +465,20 @@
return null;
}
- /**
- * Set up the environment.
- *
- * @throws Exception
- * If the environment could not be set up.
- */
- @BeforeClass
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
- // In case we need to extend
- }
-
- /**
- * Clean up the environment.
- *
- * @throws Exception
- * If the environment could not be set up.
- */
- @AfterClass
- @Override
- public void classCleanUp() throws Exception
- {
- super.classCleanUp();
- // In case we need it extend
- }
-
private int findReplServerConnected(ReplicationDomain rd)
- {
+ {
int rsPort = -1;
-
+
// First check that the Replication domain is connected
if (!rd.isConnected())
return rsPort;
-
+
String serverStr = rd.getReplicationServer();
int index = serverStr.lastIndexOf(':');
if ((index == -1) || (index >= serverStr.length()))
fail("Enable to find port number in: " + serverStr);
rsPort = (new Integer(serverStr.substring(index + 1)));
-
+
return rsPort;
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
new file mode 100644
index 0000000..e1d614b
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
@@ -0,0 +1,1382 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.plugin;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+import static org.opends.server.replication.plugin.ReplicationBroker.*;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import static org.opends.server.loggers.ErrorLogger.logError;
+import static org.opends.server.loggers.debug.DebugLogger.getTracer;
+import org.opends.server.types.DirectoryException;
+import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
+
+import org.opends.messages.Category;
+import org.opends.messages.Message;
+import org.opends.messages.Severity;
+import org.opends.server.TestCaseUtils;
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.replication.ReplicationTestCase;
+import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.common.DSInfo;
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.common.ServerStatus;
+import org.opends.server.replication.protocol.AddMsg;
+import org.opends.server.replication.protocol.DoneMsg;
+import org.opends.server.replication.protocol.EntryMsg;
+import org.opends.server.replication.protocol.InitializeTargetMsg;
+import org.opends.server.replication.protocol.ReplSessionSecurity;
+import org.opends.server.replication.protocol.ReplicationMsg;
+import org.opends.server.replication.protocol.ResetGenerationIdMsg;
+import org.opends.server.replication.protocol.RoutableMsg;
+import org.opends.server.replication.protocol.TopologyMsg;
+import org.opends.server.replication.server.ReplServerFakeConfiguration;
+import org.opends.server.replication.server.ReplicationServer;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+import static org.opends.server.TestCaseUtils.*;
+
+/**
+ * Some tests to go through the DS state machine and validate we get the
+ * expected status according to the actions we perform.
+ */
+public class StateMachineTest extends ReplicationTestCase
+{
+
+ private static final String EXAMPLE_DN = "dc=example,dc=com"; // Server id definitions
+
+ private static final short DS1_ID = 1;
+ private static final short DS2_ID = 2;
+ private static final short DS3_ID = 3;
+ private static final short RS1_ID = 41;
+ private int rs1Port = -1;
+ private ReplicationDomain ds1 = null;
+ private ReplicationBroker ds2 = null;
+ private ReplicationBroker ds3 = null;
+ private ReplicationServer rs1 = null;
+ // The tracer object for the debug logger
+ private static final DebugTracer TRACER = getTracer();
+
+ private void debugInfo(String s)
+ {
+ logError(Message.raw(Category.SYNC, Severity.NOTICE, s));
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("** TEST **" + s);
+ }
+ }
+
+ private void debugInfo(String message, Exception e)
+ {
+ debugInfo(message + stackTraceToSingleLineString(e));
+ }
+
+ private void initTest()
+ {
+ rs1Port = -1;
+ ds1 = null;
+ ds2 = null;
+ ds3 = null;
+ findFreePorts();
+ }
+
+ private void endTest()
+ {
+ if (ds1 != null)
+ {
+ ds1.shutdown();
+ ds1 = null;
+ }
+
+ try
+ {
+ // Clear any reference to a domain in synchro plugin
+ MultimasterReplication.deleteDomain(DN.decode(EXAMPLE_DN));
+ } catch (DirectoryException ex)
+ {
+ fail("Error deleting reference to domain: " + EXAMPLE_DN);
+ }
+
+ if (ds2 != null)
+ {
+ ds2.stop();
+ ds2 = null;
+ }
+
+ if (ds3 != null)
+ {
+ ds3.stop();
+ ds3 = null;
+ }
+
+ if (rs1 != null)
+ {
+ rs1.clearDb();
+ rs1.remove();
+ rs1 = null;
+ }
+
+ rs1Port = -1;
+ }
+
+ private void sleep(long time)
+ {
+ try
+ {
+ Thread.sleep(time);
+ } catch (InterruptedException ex)
+ {
+ fail("Error sleeping " + stackTraceToSingleLineString(ex));
+ }
+ }
+
+ /**
+ * Check connection of the provided ds to the
+ * replication server. Waits for connection to be ok up to secTimeout seconds
+ * before failing.
+ */
+ private void checkConnection(int secTimeout, short dsId)
+ {
+
+ ReplicationBroker rb = null;
+ ReplicationDomain rd = null;
+ switch (dsId)
+ {
+ case DS1_ID:
+ rd = ds1;
+ break;
+ case DS2_ID:
+ rb = ds2;
+ break;
+ case DS3_ID:
+ rb = ds3;
+ break;
+ default:
+ fail("Unknown ds server id.");
+ }
+
+ int nSec = 0;
+
+ // Go out of the loop only if connection is verified or if timeout occurs
+ while (true)
+ {
+ // Test connection
+ boolean connected = false;
+ if (rd != null)
+ connected = rd.isConnected();
+ else
+ connected = rb.isConnected();
+
+ if (connected)
+ {
+ // Connection verified
+ debugInfo("checkConnection: connection of DS " + dsId +
+ " to RS obtained after " + nSec + " seconds.");
+ return;
+ }
+
+ // Sleep 1 second
+ try
+ {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex)
+ {
+ fail("Error sleeping " + stackTraceToSingleLineString(ex));
+ }
+ nSec++;
+
+ if (nSec > secTimeout)
+ {
+ // Timeout reached, end with error
+ fail("checkConnection: DS " + dsId + " is not connected to the RS after "
+ + secTimeout + " seconds.");
+ }
+ }
+ }
+
+ /**
+ * Find needed free TCP ports.
+ */
+ private void findFreePorts()
+ {
+ try
+ {
+ ServerSocket socket1 = TestCaseUtils.bindFreePort();
+ rs1Port = socket1.getLocalPort();
+ socket1.close();
+ } catch (IOException e)
+ {
+ fail("Unable to determinate some free ports " +
+ stackTraceToSingleLineString(e));
+ }
+ }
+
+ /**
+ * Creates a new ReplicationServer.
+ */
+ private ReplicationServer createReplicationServer(String testCase,
+ int degradedStatusThreshold)
+ {
+ try
+ {
+ SortedSet<String> replServers = new TreeSet<String>();
+
+ String dir = "stateMachineTest" + RS1_ID + testCase + "Db";
+ ReplServerFakeConfiguration conf =
+ new ReplServerFakeConfiguration(rs1Port, dir, 0, RS1_ID, 0, 100,
+ replServers, 1, 1000, degradedStatusThreshold);
+ ReplicationServer replicationServer = new ReplicationServer(conf);
+ return replicationServer;
+
+ } catch (Exception e)
+ {
+ fail("createReplicationServer " + stackTraceToSingleLineString(e));
+ }
+ return null;
+ }
+
+ /**
+ * Creates and starts a new ReplicationDomain configured for the replication
+ * server
+ */
+ private ReplicationDomain createReplicationDomain(short dsId)
+ {
+ try
+ {
+ SortedSet<String> replServers = new TreeSet<String>();
+ replServers.add("localhost:" + rs1Port);
+
+ DN baseDn = DN.decode(EXAMPLE_DN);
+ DomainFakeCfg domainConf =
+ new DomainFakeCfg(baseDn, dsId, replServers);
+ ReplicationDomain replicationDomain =
+ MultimasterReplication.createNewDomain(domainConf);
+ replicationDomain.start();
+
+ return replicationDomain;
+
+ } catch (Exception e)
+ {
+ fail("createReplicationDomain " + stackTraceToSingleLineString(e));
+ }
+ return null;
+ }
+
+ /**
+ * Create and connect a replication broker to the replication server with
+ * the given state and generation id (uses passed window for received changes)
+ */
+ private ReplicationBroker createReplicationBroker(short dsId,
+ ServerState state, long generationId, int window)
+ throws Exception, SocketException
+ {
+ ReplicationBroker broker = new ReplicationBroker(null,
+ state, DN.decode(EXAMPLE_DN), dsId, 0, 0, 0, 0, window, 0, generationId,
+ new ReplSessionSecurity(null, null, null, true), (byte) 1);
+ ArrayList<String> servers = new ArrayList<String>(1);
+ servers.add("localhost:" + rs1Port);
+ broker.start(servers);
+
+ return broker;
+ }
+
+ /**
+ * Create and connect a replication broker to the replication server with
+ * the given state and generation id (uses 100 as window for received changes)
+ */
+ private ReplicationBroker createReplicationBroker(short dsId,
+ ServerState state, long generationId)
+ throws Exception, SocketException
+ {
+ return createReplicationBroker(dsId, state, generationId, 100);
+ }
+
+ /**
+ * Make simple state machine test.
+ *
+ * NC = Not connected status
+ * N = Normal status
+ * D = Degraded status
+ * FU = Full update status
+ * BG = Bad generation id status
+ *
+ * The test path should be:
+ * ->NC->N->NC
+ * @throws Exception If a problem occurred
+ */
+ @Test(enabled=true)
+ public void testStateMachineBasic() throws Exception
+ {
+ String testCase = "testStateMachineBasic";
+
+ debugInfo("Starting " + testCase);
+
+ initTest();
+
+ try
+ {
+
+ /**
+ * DS1 start, no RS available: DS1 should be in not connected status
+ */
+ ds1 = createReplicationDomain(DS1_ID);
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NOT_CONNECTED_STATUS);
+
+ /**
+ * RS1 starts , DS1 should connect to it and be in normal status
+ */
+ rs1 = createReplicationServer(testCase, 5000);
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NORMAL_STATUS);
+
+ /**
+ * RS1 stops, DS1 should go in not connected status
+ */
+ rs1.remove();
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NOT_CONNECTED_STATUS);
+
+ } finally
+ {
+ endTest();
+ }
+ }
+
+ // Returns various init values for test testStateMachineStatusAnalyzer
+ @DataProvider(name="stateMachineStatusAnalyzerTestProvider")
+ public Object [][] stateMachineStatusAnalyzerTestProvider() throws Exception
+ {
+ return new Object [][] { {1} , {10}, {50}, {120} };
+ }
+
+ /**
+ * Test the status analyzer system that allows to go from normal to degraded
+ * and vice versa, using the configured threshold value
+ *
+ * NC = Not connected status
+ * N = Normal status
+ * D = Degraded status
+ * FU = Full update status
+ * BG = Bad generation id status
+ *
+ * Expected path:
+ * ->NC->N->D->N->NC
+ * @throws Exception If a problem occurred
+ */
+ @Test(enabled=true, groups="slow", dataProvider="stateMachineStatusAnalyzerTestProvider")
+ public void testStateMachineStatusAnalyzer(int thresholdValue) throws Throwable
+ {
+ String testCase = "testStateMachineStatusAnalyzer with threhold " + thresholdValue;
+
+ debugInfo("Starting " + testCase + " with " + thresholdValue);
+
+ initTest();
+
+ BrokerReader br3 = null;
+ BrokerReader br2 = null;
+ BrokerWriter bw = null;
+
+ try
+ {
+
+ /**
+ * RS1 starts with specified threshold value
+ */
+ rs1 = createReplicationServer(testCase, thresholdValue);
+
+ /**
+ * DS2 starts and connects to RS1. No reader and low window value at the
+ * beginning so writer for DS2 in RS should enqueue changes after first
+ * changes sent to DS. (window value reached: a window msg needed by RS for
+ * following sending changes to DS)
+ */
+ ds2 = createReplicationBroker(DS2_ID, new ServerState(), EMPTY_DN_GENID, 10);
+ checkConnection(30, DS2_ID);
+
+ /**
+ * DS3 starts and connects to RS1
+ */
+ ds3 = createReplicationBroker(DS3_ID, new ServerState(), EMPTY_DN_GENID);
+ br3 = new BrokerReader(ds3, DS3_ID);
+ checkConnection(30, DS3_ID);
+
+ // Send first changes to reach window and block DS2 writer queue. Writer will take them
+ // from queue and block (no more changes removed from writer queue) after
+ // having sent them to TCP receive queue of DS2.
+ bw = new BrokerWriter(ds3, DS3_ID, false);
+ bw.followAndPause(11);
+ sleep(1000);
+
+ /**
+ * DS3 sends changes (less than threshold): DS2 should still be in normal
+ * status so no topo message should be sent (update topo message
+ * for telling status of DS2 changed)
+ */
+ int nChangesSent = 0;
+ if (thresholdValue > 1)
+ {
+ nChangesSent = thresholdValue - 1;
+ bw.followAndPause(nChangesSent);
+ sleep(7000); // Be sure status analyzer has time to test
+ ReplicationMsg msg = br3.getLastMsg();
+ debugInfo(testCase + " Step 1: last message from writer: " + msg);
+ assertTrue(msg == null);
+ }
+
+ /**
+ * DS3 sends changes to reach the threshold value, DS3 should receive an
+ * update topo message with status of DS2: degraded status
+ */
+ bw.followAndPause(thresholdValue - nChangesSent);
+ sleep(7000); // Be sure status analyzer has time to test
+ ReplicationMsg lastMsg = br3.getLastMsg();
+ assertTrue(lastMsg != null);
+ debugInfo(testCase + " Step 2: last message from writer: " + lastMsg);
+ assertTrue(lastMsg instanceof TopologyMsg);
+ TopologyMsg topoMsg = (TopologyMsg) lastMsg;
+ List<DSInfo> dsList = topoMsg.getDsList();
+ assertEquals(dsList.size(), 1);
+ DSInfo ds3Info = dsList.get(0);
+ assertEquals(ds3Info.getDsId(), DS2_ID);
+ assertEquals(ds3Info.getStatus(), ServerStatus.DEGRADED_STATUS);
+
+ /**
+ * DS3 sends 10 additional changes after threshold value, DS2 should still be
+ * degraded so no topo message received.
+ */
+ bw.followAndPause(10);
+ bw.shutdown();
+ sleep(7000); // Be sure status analyzer has time to test
+ lastMsg = br3.getLastMsg();
+ ReplicationMsg msg = br3.getLastMsg();
+ debugInfo(testCase + " Step 3: last message from writer: " + msg);
+ assertTrue(lastMsg == null);
+
+ /**
+ * DS2 replays every changes and should go back to normal status
+ * (create a reader to emulate replay of messages (messages read from queue))
+ */
+ br2 = new BrokerReader(ds2, DS2_ID);
+ sleep(7000); // Be sure messages are read and status analyzer has time to test
+ lastMsg = br3.getLastMsg();
+ assertTrue(lastMsg != null);
+ debugInfo(testCase + " Step 4: last message from writer: " + lastMsg);
+ assertTrue(lastMsg instanceof TopologyMsg);
+ topoMsg = (TopologyMsg) lastMsg;
+ dsList = topoMsg.getDsList();
+ assertEquals(dsList.size(), 1);
+ ds3Info = dsList.get(0);
+ assertEquals(ds3Info.getDsId(), DS2_ID);
+ assertEquals(ds3Info.getStatus(), ServerStatus.NORMAL_STATUS);
+
+ } finally
+ {
+ endTest();
+ if (bw != null) bw.shutdown();
+ if (br3 != null) br3.shutdown();
+ if (br2 != null) br2.shutdown();
+ }
+ }
+
+ /**
+ * Go through the possible state machine transitions:
+ *
+ * NC = Not connected status
+ * N = Normal status
+ * D = Degraded status
+ * FU = Full update status
+ * BG = Bad generation id status
+ *
+ * The test path should be:
+ * ->NC->D->N->NC->N->D->NC->D->N->BG->NC->N->D->BG->FU->NC->N->D->FU->NC->BG->NC->N->FU->NC->N->NC
+ * @throws Exception If a problem occurred
+ */
+ @Test(enabled = true, groups = "slow")
+ public void testStateMachineFull() throws Exception
+ {
+ String testCase = "testStateMachineFull";
+
+ debugInfo("Starting " + testCase);
+
+ initTest();
+ BrokerReader br = null;
+ BrokerWriter bw = null;
+
+ try
+ {
+
+ int DEGRADED_STATUS_THRESHOLD = 1;
+
+ /**
+ * RS1 starts with 1 message as degraded status threshold value
+ */
+ rs1 = createReplicationServer(testCase, DEGRADED_STATUS_THRESHOLD);
+
+ /**
+ * DS2 starts and connects to RS1
+ */
+ ds2 = createReplicationBroker(DS2_ID, new ServerState(), EMPTY_DN_GENID);
+ br = new BrokerReader(ds2, DS2_ID);
+ checkConnection(30, DS2_ID);
+
+ /**
+ * DS2 starts sending a lot of changes
+ */
+ bw = new BrokerWriter(ds2, DS2_ID, false);
+ bw.follow();
+ sleep(1000); // Let some messages being queued in RS
+
+ /**
+ * DS1 starts and connects to RS1, server state exchange should lead to
+ * start in degraded status as some changes should be in queued in the RS
+ * and the threshold value is 1 change in queue.
+ */
+ ds1 = createReplicationDomain(DS1_ID);
+ checkConnection(30, DS1_ID);
+ sleepAssertStatusEquals(30, ds1, ServerStatus.DEGRADED_STATUS);
+
+ /**
+ * DS2 stops sending changes: DS1 should replay pending changes and should
+ * enter the normal status
+ */
+ bw.pause();
+ // Sleep enough so that replay can be done and analyzer has time
+ // to see that the queue length is now under the threshold value.
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NORMAL_STATUS);
+
+ /**
+ * RS1 stops to make DS1 go to not connected status (from normal status)
+ */
+ rs1.remove();
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NOT_CONNECTED_STATUS);
+
+ /**
+ * DS2 restarts with up to date server state (this allows to have
+ * restarting RS1 not sending him some updates he already sent)
+ */
+ ds2.stop();
+ bw.shutdown();
+ br.shutdown();
+ ServerState curState = ds1.getServerState();
+ ds2 = createReplicationBroker(DS2_ID, curState, EMPTY_DN_GENID);
+ br = new BrokerReader(ds2, DS2_ID);
+
+ /**
+ * RS1 restarts, DS1 should get back to normal status
+ */
+ rs1 = createReplicationServer(testCase, DEGRADED_STATUS_THRESHOLD);
+ checkConnection(30, DS2_ID);
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NORMAL_STATUS);
+
+ /**
+ * DS2 sends again a lot of changes to make DS1 degraded again
+ */
+ bw = new BrokerWriter(ds2, DS2_ID, false);
+ bw.follow();
+ sleep(8000); // Let some messages being queued in RS, and analyzer see the change
+ sleepAssertStatusEquals(30, ds1, ServerStatus.DEGRADED_STATUS);
+
+ /**
+ * RS1 stops to make DS1 go to not connected status (from degraded status)
+ */
+ rs1.remove();
+ bw.pause();
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NOT_CONNECTED_STATUS);
+
+
+ /**
+ * DS2 restarts with up to date server state (this allows to have
+ * restarting RS1 not sending him some updates he already sent)
+ */
+ ds2.stop();
+ bw.shutdown();
+ br.shutdown();
+ curState = ds1.getServerState();
+ ds2 = createReplicationBroker(DS2_ID, curState, EMPTY_DN_GENID);
+ br = new BrokerReader(ds2, DS2_ID);
+
+ /**
+ * RS1 restarts, DS1 should reconnect in degraded status (from not connected
+ * this time, not from state machine entry)
+ */
+ rs1 = createReplicationServer(testCase, DEGRADED_STATUS_THRESHOLD);
+ // It is too difficult to tune the right sleep so disabling this test:
+ // Sometimes the status analyzer may be fast and quickly change the status
+ // of DS1 to NORMAL_STATUS
+ //sleep(2000);
+ //sleepAssertStatusEquals(30, ds1, ServerStatus.DEGRADED_STATUS);
+ checkConnection(30, DS2_ID);
+
+ /**
+ * DS1 should come back in normal status after a while
+ */
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NORMAL_STATUS);
+
+ /**
+ * DS2 sends a reset gen id order with wrong gen id: DS1 should go into bad generation id status
+ */
+ long BAD_GEN_ID = 999999L;
+ resetGenId(ds2, BAD_GEN_ID); // ds2 will also go bad gen
+ sleepAssertStatusEquals(30, ds1, ServerStatus.BAD_GEN_ID_STATUS);
+
+ /**
+ * DS2 sends again a reset gen id order with right id: DS1 should be disconnected
+ * by RS then reconnect and enter again in normal status. This goes through
+ * not connected status but not possible to check as should reconnect immediately
+ */
+ resetGenId(ds2, EMPTY_DN_GENID); // ds2 will also be disconnected
+ ds2.stop();
+ br.shutdown(); // Reader could reconnect broker, but gen id would be bad: need to recreate a broker to send changex
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NORMAL_STATUS);
+
+ /**
+ * DS2 sends again a lot of changes to make DS1 degraded again
+ */
+ curState = ds1.getServerState();
+ ds2 = createReplicationBroker(DS2_ID, curState, EMPTY_DN_GENID);
+ checkConnection(30, DS2_ID);
+ bw = new BrokerWriter(ds2, DS2_ID, false);
+ br = new BrokerReader(ds2, DS2_ID);
+ bw.follow();
+ sleep(8000); // Let some messages being queued in RS, and analyzer see the change
+ sleepAssertStatusEquals(30, ds1, ServerStatus.DEGRADED_STATUS);
+
+ /**
+ * DS2 sends reset gen id order with bad gen id: DS1 should go in bad gen id
+ * status (from degraded status this time)
+ */
+ resetGenId(ds2, -1); // -1 to allow next step full update and flush RS db so that DS1 can reconnect after full update
+ sleepAssertStatusEquals(30, ds1, ServerStatus.BAD_GEN_ID_STATUS);
+ bw.pause();
+
+ /**
+ * DS2 engages full update (while DS1 in bad gen id status), DS1 should go
+ * in full update status
+ */
+ BrokerInitializer bi = new BrokerInitializer(ds2, DS2_ID, false);
+ bi.initFullUpdate(DS1_ID, 200);
+ sleepAssertStatusEquals(30, ds1, ServerStatus.FULL_UPDATE_STATUS);
+
+ /**
+ * DS2 terminates full update to DS1: DS1 should reconnect (goes through not connected status)
+ * and come back to normal status (RS genid was -1 so RS will adopt ne genb id)
+ */
+ bi.runFullUpdate();
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NORMAL_STATUS);
+
+ /**
+ * DS2 sends changes to DS1: DS1 should go in degraded status
+ */
+ ds2.stop(); // will need a new broker with another gen id restart it
+ bw.shutdown();
+ br.shutdown();
+ long newGen = ds1.getGenerationId();
+ curState = ds1.getServerState();
+ ds2 = createReplicationBroker(DS2_ID, curState, newGen);
+ checkConnection(30, DS2_ID);
+ bw = new BrokerWriter(ds2, DS2_ID, false);
+ br = new BrokerReader(ds2, DS2_ID);
+ bw.follow();
+ sleep(8000); // Let some messages being queued in RS, and analyzer see the change
+ sleepAssertStatusEquals(30, ds1, ServerStatus.DEGRADED_STATUS);
+
+ /**
+ * DS2 engages full update (while DS1 in degraded status), DS1 should go
+ * in full update status
+ */
+ bi = new BrokerInitializer(ds2, DS2_ID, false);
+ bi.initFullUpdate(DS1_ID, 300);
+ sleepAssertStatusEquals(30, ds1, ServerStatus.FULL_UPDATE_STATUS);
+ bw.pause();
+
+ /**
+ * DS2 terminates full update to DS1: DS1 should reconnect (goes through not connected status)
+ * and come back to bad gen id status (RS genid was another gen id (300 entries instead of 200))
+ */
+ bi.runFullUpdate();
+ sleepAssertStatusEquals(30, ds1, ServerStatus.BAD_GEN_ID_STATUS);
+
+ /**
+ * DS2 sends reset gen id with gen id same as DS1: DS1 will be disconnected
+ * by RS (not connected status) and come back to normal status
+ */
+ ds2.stop(); // will need a new broker with another gen id restart it
+ bw.shutdown();
+ br.shutdown();
+ newGen = ds1.getGenerationId();
+ curState = ds1.getServerState();
+ ds2 = createReplicationBroker(DS2_ID, curState, newGen);
+ checkConnection(30, DS2_ID);
+ br = new BrokerReader(ds2, DS2_ID);
+ resetGenId(ds2, newGen); // Make DS1 reconnect in normal status
+
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NORMAL_STATUS);
+
+ /**
+ * DS2 engages full update (while DS1 in normal status), DS1 should go
+ * in full update status
+ */
+ bi = new BrokerInitializer(ds2, DS2_ID, false);
+ bi.initFullUpdate(DS1_ID, 300); // 300 entries will compute same genid of the RS
+ sleepAssertStatusEquals(30, ds1, ServerStatus.FULL_UPDATE_STATUS);
+
+ /**
+ * DS2 terminates full update to DS1: DS1 should reconnect (goes through not connected status)
+ * and come back to normal status (process full update with same data as
+ * before so RS already has right gen id: version with 300 entries)
+ */
+ bi.runFullUpdate();
+ ds2.stop();
+ br.shutdown();
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NORMAL_STATUS);
+
+ /**
+ * RS1 stops, DS1 should go to not connected status
+ */
+ rs1.remove();
+ sleepAssertStatusEquals(30, ds1, ServerStatus.NOT_CONNECTED_STATUS);
+
+ } finally
+ {
+ // Finalize test
+ endTest();
+ if (bw != null) bw.shutdown();
+ if (br != null) br.shutdown();
+ }
+ }
+
+ /**
+ * Set up the environment.
+ *
+ * @throws Exception
+ * If the environment could not be set up.
+ */
+ @BeforeClass
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ // Note: this test does not use the memory test backend as for having a DS
+ // going into degraded status, we need to send a lot of updates. This makes
+ // the memory test backend crash with OutOfMemoryError. So we prefer here
+ // a backend backed up with a file
+
+ // Clear the backend
+ ReplicationDomain.clearJEBackend(false, "userRoot", EXAMPLE_DN);
+
+ }
+
+ /**
+ * Clean up the environment.
+ *
+ * @throws Exception If the environment could not be set up.
+ */
+ @AfterClass
+ @Override
+ public void classCleanUp() throws Exception
+ {
+ callParanoiaCheck = false;
+ super.classCleanUp();
+
+ // Clear the backend
+ ReplicationDomain.clearJEBackend(false, "userRoot", EXAMPLE_DN);
+
+ paranoiaCheck();
+ }
+
+ /**
+ * Sends a reset genid message through the given replication broker, with the
+ * given new generation id
+ */
+ private void resetGenId(ReplicationBroker rb, long newGenId)
+ {
+ ResetGenerationIdMsg resetMsg = new ResetGenerationIdMsg(newGenId);
+ rb.publish(resetMsg);
+ }
+
+ /**
+ * Utility class for making a full update through a broker. No separated thread
+ * Usage:
+ * BrokerInitializer bi = new BrokerInitializer(rb, sid, nEntries);
+ * bi.initFullUpdate(); // Initializes a full update session by sending InitializeTargetMsg
+ * bi.runFullUpdate(); // loops sending nEntries entries and finalizes the full update by sending the EntryDoneMsg
+ */
+ private class BrokerInitializer
+ {
+
+ private ReplicationBroker rb = null;
+ private short serverId = -1;
+ private long userId = 0;
+ private short destId = -1; // Server id of server to initialize
+ private long nEntries = -1; // Number of entries to send to dest
+ private boolean createReader = false;
+
+ /**
+ * If the BrokerInitializer is to be used for a lot of entries to send
+ * (which is often the case), the reader thread should be enabled to make
+ * the window subsystem work and allow the broker to send as much entries as
+ * he wants. If not enabled, the user is responsible to call the receive
+ * method of the broker himself.
+ */
+ private BrokerReader reader = null;
+
+ /**
+ * Creates a broker initializer with a reader
+ */
+ public BrokerInitializer(ReplicationBroker rb, short serverId)
+ {
+ this(rb, serverId, true);
+ }
+
+ /**
+ * Creates a broker initializer. Also creates a reader according to request
+ */
+ public BrokerInitializer(ReplicationBroker rb, short serverId,
+ boolean createReader)
+ {
+ this.rb = rb;
+ this.serverId = serverId;
+ this.createReader = createReader;
+ }
+
+ /**
+ * Initializes a full update session by sending InitializeTargetMsg
+ */
+ public void initFullUpdate(short destId, long nEntries)
+ {
+ // Also create reader ?
+ if (createReader)
+ {
+ reader = new BrokerReader(rb, serverId);
+ }
+
+ debugInfo("Broker " + serverId + " initializer sending InitializeTargetMsg to server " + destId);
+
+ this.destId = destId;
+ this.nEntries = nEntries;
+
+ // Send init msg to warn dest server it is going do be initialized
+ RoutableMsg initTargetMsg = null;
+ try
+ {
+ initTargetMsg =
+ new InitializeTargetMsg(DN.decode(EXAMPLE_DN), serverId, destId,
+ serverId, nEntries);
+ } catch (DirectoryException ex)
+ {
+ fail("Unable to create init message.");
+ }
+ rb.publish(initTargetMsg);
+
+ // Send top entry for the domain
+ String topEntry = "dn: " + EXAMPLE_DN + "\n"
+ + "objectClass: top\n"
+ + "objectClass: domain\n"
+ + "dc: example\n"
+ + "entryUUID: 11111111-1111-1111-1111-111111111111\n\n";
+ EntryMsg entryMsg = new EntryMsg(serverId, destId, topEntry.getBytes());
+ rb.publish(entryMsg);
+ }
+
+ private EntryMsg createNextEntryMsg()
+ {
+ String userEntryUUID = "11111111-1111-1111-1111-111111111111";
+ long curId = userId++;
+ String userdn = "uid=full_update_user" + curId + "," + EXAMPLE_DN;
+ String entryWithUUIDldif = "dn: " + userdn + "\n" + "objectClass: top\n" +
+ "objectClass: person\n" + "objectClass: organizationalPerson\n" +
+ "objectClass: inetOrgPerson\n" +
+ "uid: full_update_user" + curId + "\n" +
+ "homePhone: 951-245-7634\n" +
+ "description: This is the description for Aaccf Amar.\n" + "st: NC\n" +
+ "mobile: 027-085-0537\n" +
+ "postalAddress: Aaccf Amar$17984 Thirteenth Street" +
+ "$Rockford, NC 85762\n" + "mail: user.1@example.com\n" +
+ "cn: Aaccf Amar\n" + "l: Rockford\n" + "pager: 508-763-4246\n" +
+ "street: 17984 Thirteenth Street\n" + "telephoneNumber: 216-564-6748\n" +
+ "employeeNumber: 1\n" + "sn: Amar\n" + "givenName: Aaccf\n" +
+ "postalCode: 85762\n" + "userPassword: password\n" + "initials: AA\n" +
+ "entryUUID: " + userEntryUUID + "\n\n";
+ // -> WARNING: EntryMsg PDUs are concatenated before calling import on LDIF
+ // file so need \n\n to separate LDIF entries to conform to LDIF file format
+
+ // Create an entry message
+ EntryMsg entryMsg = new EntryMsg(serverId, destId,
+ entryWithUUIDldif.getBytes());
+
+ return entryMsg;
+ }
+
+ /**
+ * Loops sending entries for full update (EntryMsg messages). When
+ * terminates, sends the EntryDoneMsg to finalize full update. Number of
+ * sent entries is determined at initFullUpdate call time.
+ */
+ public void runFullUpdate()
+ {
+ debugInfo("Broker " + serverId + " initializer starting sending entries to server " + destId);
+
+ for(long i = 0 ; i<nEntries ; i++) {
+ EntryMsg entryMsg = createNextEntryMsg();
+ rb.publish(entryMsg);
+ }
+
+ debugInfo("Broker " + serverId + " initializer stopping sending entries");
+
+ debugInfo("Broker " + serverId + " initializer sending EntryDoneMsg");
+ DoneMsg doneMsg = new DoneMsg(serverId, destId);
+ rb.publish(doneMsg);
+
+ if (createReader)
+ {
+ reader.shutdown();
+ }
+
+ debugInfo("Broker " + serverId + " initializer thread is dying");
+ }
+ }
+
+ /**
+ * Thread for sending a lot of changes through a broker.
+ */
+ private class BrokerWriter extends Thread
+ {
+
+ private ReplicationBroker rb = null;
+ private short serverId = -1;
+ private long userId = 0;
+ private AtomicBoolean shutdown = new AtomicBoolean(false);
+ // The writer starts suspended
+ private AtomicBoolean suspended = new AtomicBoolean(true);
+ // Tells a sending session is finished
+ // A session is sending messages between the follow and the pause calls,
+ // or the time a followAndPause method runs.
+ private AtomicBoolean sessionDone = new AtomicBoolean(true);
+ private boolean careAboutAmountOfChanges = false;
+ private int nChangesSent = 0; // Number of sent changes
+ private int nChangesSentLimit = 0;
+ ChangeNumberGenerator gen = null;
+ /**
+ * If the BrokerWriter is to be used for a lot of changes to send (which is
+ * often the case), the reader thread should be enabled to make the window
+ * subsystem work and allow the broker to send as much changes as he wants.
+ * If not enabled, the user is responsible to call the receive method of
+ * the broker himself.
+ */
+ private BrokerReader reader = null;
+
+ /* Creates a broker writer with a reader */
+ public BrokerWriter(ReplicationBroker rb, short serverId)
+ {
+ this(rb, serverId, true);
+ }
+
+ /* Creates a broker writer. Also creates a reader according to request */
+ public BrokerWriter(ReplicationBroker rb, short serverId,
+ boolean createReader)
+ {
+ super("BrokerWriter for broker " + serverId);
+ this.rb = rb;
+ this.serverId = serverId;
+ // Create a Change number generator to generate new change numbers
+ // when we need to send changes
+ gen = new ChangeNumberGenerator(serverId, 0);
+
+ // Start thread (is paused by default so will have to call follow anyway)
+ start();
+
+ // Also create reader ?
+ if (createReader)
+ {
+ reader = new BrokerReader(rb, serverId);
+ }
+ }
+
+ /**
+ * Loops sending changes: add operations creating users with different ids
+ * This starts paused and has to be resumed calling a follow method.
+ */
+ public void run()
+ {
+ boolean dbg1Written = false, dbg2Written;
+ // No stop msg when entering the loop (thread starts with paused writer)
+ dbg2Written = true;
+ while (!shutdown.get())
+ {
+ long startSessionTime = -1;
+ boolean startedNewSession = false;
+ // When not in pause, loop sending changes to RS
+ while (!suspended.get())
+ {
+ startedNewSession = true;
+ if (!dbg1Written)
+ {
+ startSessionTime = System.currentTimeMillis();
+ debugInfo("Broker " + serverId +
+ " writer starting sending changes session at: " + startSessionTime);
+ dbg1Written = true;
+ dbg2Written = false;
+ }
+ AddMsg addMsg = createNextAddMsg();
+ rb.publish(addMsg);
+ // End session if amount of changes sent has been requested
+ if (careAboutAmountOfChanges)
+ {
+ nChangesSent++;
+ if (nChangesSent == nChangesSentLimit)
+ {
+ // Requested number of changes to send sent, end session
+ debugInfo("Broker " + serverId + " writer reached " +
+ nChangesSent + " changes limit");
+ suspended.set(true);
+ break;
+ }
+ }
+ }
+ if (!dbg2Written)
+ {
+ long endSessionTime = System.currentTimeMillis();
+ debugInfo("Broker " + serverId +
+ " writer stopping sending changes session at: " + endSessionTime +
+ " (duration: " + (endSessionTime - startSessionTime) + " ms)");
+ dbg1Written = false;
+ dbg2Written = true;
+ }
+ // Mark session is finished
+ if (startedNewSession)
+ sessionDone.set(true);
+ try
+ {
+ // Writer in pause, sleep a while to let other threads work
+ Thread.sleep(1000);
+ } catch (InterruptedException ex)
+ {
+ /* Don't care */
+ }
+ }
+ debugInfo("Broker " + serverId + " writer thread is dying");
+ }
+
+ /**
+ * Stops the writer thread
+ */
+ public void shutdown()
+ {
+ suspended.set(true); // If were working
+ shutdown.set(true);
+ try
+ {
+ join();
+ } catch (InterruptedException ex)
+ {
+ /* Don't care */
+ }
+
+ // Stop reader if any
+ if (reader != null)
+ {
+ reader.shutdown();
+ }
+ }
+
+ /**
+ * Suspends the writer thread
+ */
+ public void pause()
+ {
+ if (isPaused())
+ return; // Already suspended
+ suspended.set(true);
+ // Wait for all messages sent
+ while (!sessionDone.get())
+ {
+ try
+ {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex)
+ {
+ /* Don't care */
+ }
+ }
+ }
+
+ /**
+ * Test if the writer is suspended
+ */
+ public boolean isPaused()
+ {
+ return (sessionDone.get());
+ }
+
+ /**
+ * Resumes the writer thread until it is paused
+ */
+ public void follow()
+ {
+ sessionDone.set(false);
+ suspended.set(false);
+ }
+
+ /**
+ * Resumes the writer and suspends it after a given amount of ms
+ * If the writer was working it will be paused anyway after the given amount
+ * of time.
+ * -> blocking call
+ */
+ public void followAndPause(long time)
+ {
+ debugInfo("Requested broker writer " + serverId + " to write for " + time + " ms.");
+ pause(); // If however we were already working
+ sessionDone.set(false);
+ suspended.set(false);
+ try
+ {
+ Thread.sleep(time);
+ } catch (InterruptedException ex)
+ {
+ /* Don't care */
+ }
+ pause();
+ }
+
+ /**
+ * Resumes the writer and suspends it after a given amount of changes has been
+ * sent. If the writer was working it will be paused anyway after the given
+ * amount of changes, starting from the current call time.
+ * -> blocking call
+ */
+ public void followAndPause(int nChanges)
+ {
+ debugInfo("Requested broker writer " + serverId + " to write " + nChanges + " change(s).");
+ pause(); // If however we were already working
+
+ // Initialize counter system variables
+ nChangesSent = 0;
+ nChangesSentLimit = nChanges;
+ careAboutAmountOfChanges = true;
+
+ // Start session
+ sessionDone.set(false);
+ suspended.set(false);
+
+ // Wait for all messages sent
+ while (!sessionDone.get())
+ {
+ try
+ {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex)
+ {
+ /* Don't care */
+ }
+ }
+ careAboutAmountOfChanges = false;
+ }
+
+ private AddMsg createNextAddMsg()
+ {
+ String userEntryUUID = "11111111-1111-1111-1111-111111111111";
+ long curId = userId++;
+ String userdn = "uid=user" + curId + "," + EXAMPLE_DN;
+ String entryWithUUIDldif = "dn: " + userdn + "\n" + "objectClass: top\n" +
+ "objectClass: person\n" + "objectClass: organizationalPerson\n" +
+ "objectClass: inetOrgPerson\n" +
+ "uid: user" + curId + "\n" +
+ "homePhone: 951-245-7634\n" +
+ "description: This is the description for Aaccf Amar.\n" + "st: NC\n" +
+ "mobile: 027-085-0537\n" +
+ "postalAddress: Aaccf Amar$17984 Thirteenth Street" +
+ "$Rockford, NC 85762\n" + "mail: user.1@example.com\n" +
+ "cn: Aaccf Amar\n" + "l: Rockford\n" + "pager: 508-763-4246\n" +
+ "street: 17984 Thirteenth Street\n" + "telephoneNumber: 216-564-6748\n" +
+ "employeeNumber: 1\n" + "sn: Amar\n" + "givenName: Aaccf\n" +
+ "postalCode: 85762\n" + "userPassword: password\n" + "initials: AA\n" +
+ "entryUUID: " + userEntryUUID + "\n";
+
+ Entry personWithUUIDEntry = null;
+ try
+ {
+ personWithUUIDEntry = TestCaseUtils.entryFromLdifString(
+ entryWithUUIDldif);
+ } catch (Exception e)
+ {
+ fail(e.getMessage());
+ }
+
+ // Create an update message to add an entry.
+ AddMsg addMsg = new AddMsg(gen.newChangeNumber(),
+ personWithUUIDEntry.getDN().toString(),
+ userEntryUUID,
+ null,
+ personWithUUIDEntry.getObjectClassAttribute(),
+ personWithUUIDEntry.getAttributes(), new ArrayList<Attribute>());
+
+ return addMsg;
+ }
+ }
+
+ /**
+ * This simple reader just throws away the received
+ * messages. It is used on a breaker we want to be able to send or read from some message
+ * with (changes, entries (full update)...). Calling the receive method of the
+ * broker allows to unblock the window mechanism and to send the desired messages.
+ * Calling the updateWindowAfterReplay method allows to send when necessary the
+ * window message to the RS to allow him send other messages he may want to send us.
+ */
+ private class BrokerReader extends Thread
+ {
+
+ private ReplicationBroker rb = null;
+ private short serverId = -1;
+ private boolean shutdown = false;
+ private ReplicationMsg lastMsg = null;
+
+ public BrokerReader(ReplicationBroker rb, short serverId)
+ {
+ super("BrokerReader for broker " + serverId);
+ this.rb = rb;
+ this.serverId = serverId;
+ start();
+ }
+ // Loop reading and throwing update messages
+ public void run()
+ {
+ while (!shutdown)
+ {
+ try
+ {
+ ReplicationMsg msg = rb.receive(); // Allow more messages to be sent by broker writer
+ rb.updateWindowAfterReplay(); // Allow RS to send more messages to broker
+ if (msg != null)
+ debugInfo("Broker " + serverId + " reader received: " + msg);
+ lastMsg = msg;
+ } catch (SocketTimeoutException ex)
+ {
+ if (shutdown)
+ return;
+ }
+ }
+ debugInfo("Broker " + serverId + " reader thread is dying");
+ }
+
+ // Returns last received message from reader
+ // When read, last value is cleared
+ public ReplicationMsg getLastMsg()
+ {
+ ReplicationMsg toReturn = lastMsg;
+ lastMsg = null;
+ return toReturn;
+ }
+
+ // Stops reader thread
+ public void shutdown()
+ {
+ shutdown = true;
+
+ try
+ {
+ join();
+ } catch (InterruptedException ex)
+ {
+ /* Don't care */
+ }
+ }
+ }
+
+ /**
+ * Waits for a long time for an equality condition to be true.
+ * Every second, the equality check is performed. After the provided amount of
+ * seconds, if the equality is false, an assertion error is raised.
+ * This methods ends either because the equality is true or if the timeout
+ * occurs after the provided number of seconds.
+ * This method is convenient when the the equality can only occur after a
+ * period of time which is difficult to establish, but we know it will occur
+ * anyway. This has 2 advantages compared to a classical code like this:
+ * - sleep(some time);
+ * - assertEquals(testedValue, expectedValue);
+ * 1. If the sleep value is too big, this will impact the total time of
+ * running tests uselessly. It may also penalize a fast running machine where
+ * the sleep time value may be unnecessarily to long.
+ * 2. If the sleep value is too small, some slow machines may have the test
+ * fail whereas some additional time would have made the test succeed.
+ * @param secTimeout Number of seconds to wait before failing. The value for
+ * this should be high. A timeout is needed anyway to have the test campaign
+ * finish anyway.
+ * @param testedValue The value we want to test
+ * @param expectedValue The value the tested value should be equal to
+ */
+ private void sleepAssertStatusEquals(int secTimeout, ReplicationDomain testedValue,
+ ServerStatus expectedValue)
+ {
+ int nSec = 0;
+
+ if ((testedValue == null) || (expectedValue == null))
+ fail("sleepAssertStatusEquals: null parameters");
+
+ // Go out of the loop only if equality is obtained or if timeout occurs
+ while (true)
+ {
+ // Sleep 1 second
+ try
+ {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex)
+ {
+ fail("Error sleeping " + stackTraceToSingleLineString(ex));
+ }
+ nSec++;
+
+ // Test equality of values
+ if (testedValue.getStatus().equals(expectedValue))
+ {
+ debugInfo("sleepAssertStatusEquals: equality obtained after "
+ + nSec + " seconds (" + expectedValue + ").");
+ return;
+ }
+
+ if (nSec == secTimeout)
+ {
+ // Timeout reached, end with error
+ fail("sleepAssertStatusEquals: got <" +
+ testedValue.getStatus().toString() + "> where expected <" +
+ expectedValue.toString() + ">");
+ }
+ }
+ }
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java
new file mode 100644
index 0000000..da99b8e
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java
@@ -0,0 +1,1205 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.replication.plugin;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import static org.opends.server.replication.plugin.ReplicationBroker.*;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import static org.opends.server.loggers.ErrorLogger.logError;
+import static org.opends.server.loggers.debug.DebugLogger.getTracer;
+import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
+
+import org.opends.messages.Category;
+import org.opends.messages.Message;
+import org.opends.messages.Severity;
+import org.opends.server.TestCaseUtils;
+import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.replication.ReplicationTestCase;
+import org.opends.server.replication.common.AssuredMode;
+import org.opends.server.replication.common.DSInfo;
+import org.opends.server.replication.common.RSInfo;
+import org.opends.server.replication.common.ServerStatus;
+import org.opends.server.replication.server.ReplServerFakeConfiguration;
+import org.opends.server.replication.server.ReplicationServer;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+import static org.opends.server.TestCaseUtils.*;
+
+/**
+ * Some tests to know if at any time the view DSs and RSs have of the current
+ * topology is accurate, even after some connections, disconnections and
+ * re-connections events.
+ */
+public class TopologyViewTest extends ReplicationTestCase
+{
+ // Server id definitions
+ private static final short DS1_ID = 1;
+ private static final short DS2_ID = 2;
+ private static final short DS3_ID = 3;
+ private static final short DS4_ID = 4;
+ private static final short DS5_ID = 5;
+ private static final short DS6_ID = 6;
+ private static final short RS1_ID = 51;
+ private static final short RS2_ID = 52;
+ private static final short RS3_ID = 53;
+
+ // Group id definitions
+ private static final int DS1_GID = 1;
+ private static final int DS2_GID = 1;
+ private static final int DS3_GID = 2;
+ private static final int DS4_GID = 2;
+ private static final int DS5_GID = 3;
+ private static final int DS6_GID = 3;
+ private static final int RS1_GID = 1;
+ private static final int RS2_GID = 2;
+ private static final int RS3_GID = 3;
+
+ // Assured conf definitions
+ private static final AssuredType DS1_AT = AssuredType.NOT_ASSURED;
+ private static final int DS1_SDL = -1;
+ private static SortedSet<String> DS1_RU = new TreeSet<String>();
+
+ private static final AssuredType DS2_AT = AssuredType.SAFE_READ;
+ private static final int DS2_SDL = -1;
+ private static SortedSet<String> DS2_RU = new TreeSet<String>();
+
+ private static final AssuredType DS3_AT = AssuredType.SAFE_DATA;
+ private static final int DS3_SDL = 1;
+ private static SortedSet<String> DS3_RU = new TreeSet<String>();
+
+ private static final AssuredType DS4_AT = AssuredType.SAFE_READ;
+ private static final int DS4_SDL = -1;
+ private static SortedSet<String> DS4_RU = new TreeSet<String>();
+
+ private static final AssuredType DS5_AT = AssuredType.SAFE_DATA;
+ private static final int DS5_SDL = 2;
+ private static SortedSet<String> DS5_RU = new TreeSet<String>();
+
+ private static final AssuredType DS6_AT = AssuredType.SAFE_READ;
+ private static final int DS6_SDL = -1;
+ private static SortedSet<String> DS6_RU = new TreeSet<String>();
+
+ static
+ {
+ DS2_RU.add("ldap://fake_url_for_ds2");
+
+ DS6_RU.add("ldap://fake_url_for_ds6_A");
+ DS6_RU.add("ldap://fake_url_for_ds6_B");
+ }
+
+ private int rs1Port = -1;
+ private int rs2Port = -1;
+ private int rs3Port = -1;
+ private ReplicationDomain rd1 = null;
+ private ReplicationDomain rd2 = null;
+ private ReplicationDomain rd3 = null;
+ private ReplicationDomain rd4 = null;
+ private ReplicationDomain rd5 = null;
+ private ReplicationDomain rd6 = null;
+ private ReplicationServer rs1 = null;
+ private ReplicationServer rs2 = null;
+ private ReplicationServer rs3 = null;
+
+ // The tracer object for the debug logger
+ private static final DebugTracer TRACER = getTracer();
+
+ private void debugInfo(String s)
+ {
+ logError(Message.raw(Category.SYNC, Severity.NOTICE, s));
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("** TEST **" + s);
+ }
+ }
+
+ private void debugInfo(String message, Exception e)
+ {
+ debugInfo(message + stackTraceToSingleLineString(e));
+ }
+
+ private void initTest()
+ {
+ rs1Port = -1;
+ rs2Port = -1;
+ rs3Port = -1;
+ rd1 = null;
+ rd2 = null;
+ rd3 = null;
+ rd4 = null;
+ rd5 = null;
+ rd6 = null;
+ rs1 = null;
+ rs2 = null;
+ rs3 = null;
+ findFreePorts();
+ }
+
+ private void endTest()
+ {
+ if (rd1 != null)
+ {
+ rd1.shutdown();
+ rd1 = null;
+ }
+
+ if (rd2 != null)
+ {
+ rd2.shutdown();
+ rd2 = null;
+ }
+
+ if (rd3 != null)
+ {
+ rd3.shutdown();
+ rd3 = null;
+ }
+
+ if (rd4 != null)
+ {
+ rd4.shutdown();
+ rd4 = null;
+ }
+
+ if (rd5 != null)
+ {
+ rd5.shutdown();
+ rd5 = null;
+ }
+
+ if (rd6 != null)
+ {
+ rd6.shutdown();
+ rd6 = null;
+ }
+
+ try
+ {
+ // Clear any reference to a domain in synchro plugin
+ MultimasterReplication.deleteDomain(DN.decode(TEST_ROOT_DN_STRING));
+ } catch (DirectoryException ex)
+ {
+ fail("Error deleting reference to domain: " + TEST_ROOT_DN_STRING);
+ }
+
+ if (rs1 != null)
+ {
+ rs1.clearDb();
+ rs1.remove();
+ rs1 = null;
+ }
+
+ if (rs2 != null)
+ {
+ rs2.clearDb();
+ rs2.remove();
+ rs2 = null;
+ }
+
+ if (rs3 != null)
+ {
+ rs3.clearDb();
+ rs3.remove();
+ rs3 = null;
+ }
+ rs1Port = -1;
+ rs2Port = -1;
+ rs3Port = -1;
+ }
+
+ private void sleep(long time)
+ {
+ try
+ {
+ Thread.sleep(time);
+ } catch (InterruptedException ex)
+ {
+ fail("Error sleeping " + stackTraceToSingleLineString(ex));
+ }
+ }
+
+ /**
+ * Check connection of the provided replication domain to the provided
+ * replication server. Waits for connection to be ok up to secTimeout seconds
+ * before failing.
+ */
+ private void checkConnection(int secTimeout, short dsId, short rsId)
+ {
+ int rsPort = -1;
+ ReplicationDomain rd = null;
+ switch (dsId)
+ {
+ case DS1_ID:
+ rd = rd1;
+ break;
+ case DS2_ID:
+ rd = rd2;
+ break;
+ case DS3_ID:
+ rd = rd3;
+ break;
+ case DS4_ID:
+ rd = rd4;
+ break;
+ case DS5_ID:
+ rd = rd5;
+ break;
+ case DS6_ID:
+ rd = rd6;
+ break;
+ default:
+ fail("Unknown replication domain server id.");
+ }
+
+ switch (rsId)
+ {
+ case RS1_ID:
+ rsPort = rs1Port;
+ break;
+ case RS2_ID:
+ rsPort = rs2Port;
+ break;
+ case RS3_ID:
+ rsPort = rs3Port;
+ break;
+ default:
+ fail("Unknown replication server id.");
+ }
+
+ int nSec = 0;
+
+ // Go out of the loop only if connection is verified or if timeout occurs
+ while (true)
+ {
+ // Test connection
+ boolean connected = rd.isConnected();
+ int rdPort = -1;
+ boolean rightPort = false;
+ if (connected)
+ {
+ String serverStr = rd.getReplicationServer();
+ int index = serverStr.lastIndexOf(':');
+ if ((index == -1) || (index >= serverStr.length()))
+ fail("Enable to find port number in: " + serverStr);
+ String rdPortStr = serverStr.substring(index + 1);
+ try
+ {
+ rdPort = (new Integer(rdPortStr)).intValue();
+ } catch (Exception e)
+ {
+ fail("Enable to get an int from: " + rdPortStr);
+ }
+ if (rdPort == rsPort)
+ rightPort = true;
+ }
+ if (connected && rightPort)
+ {
+ // Connection verified
+ debugInfo("checkConnection: connection from domain " + dsId + " to" +
+ " replication server " + rsId + " obtained after "
+ + nSec + " seconds.");
+ return;
+ }
+
+ // Sleep 1 second
+ try
+ {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex)
+ {
+ fail("Error sleeping " + stackTraceToSingleLineString(ex));
+ }
+ nSec++;
+
+ if (nSec > secTimeout)
+ {
+ // Timeout reached, end with error
+ fail("checkConnection: could not verify connection from domain " + dsId
+ + " to replication server " + rsId + " after " + secTimeout + " seconds."
+ + " Domain connected: " + connected + ", connection port: " + rdPort
+ + " (should be: " + rsPort + ")");
+ }
+ }
+ }
+
+ /**
+ * Find needed free TCP ports.
+ */
+ private void findFreePorts()
+ {
+ try
+ {
+ ServerSocket socket1 = TestCaseUtils.bindFreePort();
+ ServerSocket socket2 = TestCaseUtils.bindFreePort();
+ ServerSocket socket3 = TestCaseUtils.bindFreePort();
+ rs1Port = socket1.getLocalPort();
+ rs2Port = socket2.getLocalPort();
+ rs3Port = socket3.getLocalPort();
+ socket1.close();
+ socket2.close();
+ socket3.close();
+ } catch (IOException e)
+ {
+ fail("Unable to determinate some free ports " +
+ stackTraceToSingleLineString(e));
+ }
+ }
+
+ /**
+ * Creates the list of servers to represent the RS topology excluding the
+ * RS whose id is passed.
+ */
+ private SortedSet<String> createRSListExceptOne(short rsIdToExclude)
+ {
+ SortedSet<String> replServers = new TreeSet<String>();
+
+ if (rsIdToExclude != RS1_ID)
+ {
+ replServers.add("localhost:" + rs1Port);
+ }
+ if (rsIdToExclude != RS2_ID)
+ {
+ replServers.add("localhost:" + rs2Port);
+ }
+ if (rsIdToExclude != RS3_ID)
+ {
+ replServers.add("localhost:" + rs3Port);
+ }
+
+ return replServers;
+ }
+
+ /**
+ * Creates a new ReplicationServer.
+ */
+ private ReplicationServer createReplicationServer(short rsId, String testCase)
+ {
+ try
+ {
+ SortedSet<String> replServers = createRSListExceptOne(rsId);
+
+ int rsPort = -1;
+ int groupId = -1;
+ switch (rsId)
+ {
+ case RS1_ID:
+ rsPort = rs1Port;
+ groupId = RS1_GID;
+ break;
+ case RS2_ID:
+ rsPort = rs2Port;
+ groupId = RS2_GID;
+ break;
+ case RS3_ID:
+ rsPort = rs3Port;
+ groupId = RS3_GID;
+ break;
+ default:
+ fail("Unknown replication server id.");
+ }
+
+ String dir = "topologyViewTest" + rsId + testCase + "Db";
+ ReplServerFakeConfiguration conf =
+ new ReplServerFakeConfiguration(rsPort, dir, 0, rsId, 0, 100,
+ replServers, groupId, 1000, 5000);
+ ReplicationServer replicationServer = new ReplicationServer(conf);
+ return replicationServer;
+
+ } catch (Exception e)
+ {
+ fail("createReplicationServer " + stackTraceToSingleLineString(e));
+ }
+ return null;
+ }
+
+ /**
+ * Creates and starts a new ReplicationDomain with the correct list of
+ * know RSs according to DS id
+ */
+ private ReplicationDomain createReplicationDomain(short dsId)
+ {
+ try
+ {
+ SortedSet<String> replServers = new TreeSet<String>();
+ int groupId = -1;
+ AssuredType assuredType = null;
+ int assuredSdLevel = -100;
+ SortedSet<String> refUrls = null;
+
+ // Fill rs list according to defined scenario (see testTopologyChanges
+ // comment)
+ switch (dsId)
+ {
+ case DS1_ID:
+ replServers.add("localhost:" + rs1Port);
+ replServers.add("localhost:" + rs2Port);
+ replServers.add("localhost:" + rs3Port);
+
+ groupId = DS1_GID;
+ assuredType = DS1_AT;
+ assuredSdLevel = DS1_SDL;
+ refUrls = DS1_RU;
+ break;
+ case DS2_ID:
+ replServers.add("localhost:" + rs1Port);
+ replServers.add("localhost:" + rs2Port);
+ replServers.add("localhost:" + rs3Port);
+
+ groupId = DS2_GID;
+ assuredType = DS2_AT;
+ assuredSdLevel = DS2_SDL;
+ refUrls = DS2_RU;
+ break;
+ case DS3_ID:
+ replServers.add("localhost:" + rs2Port);
+
+ groupId = DS3_GID;
+ assuredType = DS3_AT;
+ assuredSdLevel = DS3_SDL;
+ refUrls = DS3_RU;
+ break;
+ case DS4_ID:
+ replServers.add("localhost:" + rs2Port);
+
+ groupId = DS4_GID;
+ assuredType = DS4_AT;
+ assuredSdLevel = DS4_SDL;
+ refUrls = DS4_RU;
+ break;
+ case DS5_ID:
+ replServers.add("localhost:" + rs2Port);
+ replServers.add("localhost:" + rs3Port);
+
+ groupId = DS5_GID;
+ assuredType = DS5_AT;
+ assuredSdLevel = DS5_SDL;
+ refUrls = DS5_RU;
+ break;
+ case DS6_ID:
+ replServers.add("localhost:" + rs2Port);
+ replServers.add("localhost:" + rs3Port);
+
+ groupId = DS6_GID;
+ assuredType = DS6_AT;
+ assuredSdLevel = DS6_SDL;
+ refUrls = DS6_RU;
+ break;
+ default:
+ fail("Unknown replication domain server id.");
+ }
+
+ DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
+ DomainFakeCfg domainConf =
+ new DomainFakeCfg(baseDn, dsId, replServers, assuredType,
+ assuredSdLevel, groupId, 0, refUrls);
+ ReplicationDomain replicationDomain =
+ MultimasterReplication.createNewDomain(domainConf);
+ replicationDomain.start();
+
+ return replicationDomain;
+
+ } catch (Exception e)
+ {
+ fail("createReplicationDomain " + stackTraceToSingleLineString(e));
+ }
+ return null;
+ }
+
+ // Definitions of steps for the test case
+ private static final int STEP_1 = 1;
+ private static final int STEP_2 = 2;
+ private static final int STEP_3 = 3;
+ private static final int STEP_4 = 4;
+ private static final int STEP_5 = 5;
+ private static final int STEP_6 = 6;
+ private static final int STEP_7 = 7;
+ private static final int STEP_8 = 8;
+ private static final int STEP_9 = 9;
+ private static final int STEP_10 = 10;
+ private static final int STEP_11 = 11;
+ private static final int STEP_12 = 12;
+ private static final int STEP_13 = 13;
+ /**
+ * Perform connections/disconnections of DS/RS. Uses various config parameters
+ * that are embedded in topo info to check if they are well transported.
+ * This tests:
+ * - if topo msgs are exchanged when needed and reflect topo reality (who is
+ * connected to who)
+ * - if topo msgs transport config params in terms of assured replication,
+ * group id... that reflect what is configured in the DSs.
+ *
+ * Full topo is:
+ * (GID=group id, A=assured, NA=not assured, SR=safe read, SD=safe data,
+ * SDL=safe data level, RUF=ref urls filled, RUE=ref urls empty)
+ * Except if otherwise stated, RSs and DSs are aware of every others existence
+ * - RS1 with GID=1
+ * - RS2 with GID=2
+ * - RS3 with GID=3
+ * - DS1 with GID=1, NA
+ * - DS2 with GID=1, A, SR, RUF
+ * - DS3 with GID=2, A, SD, SDL=1 (DS3 does not know RS1 and RS3)
+ * - DS4 with GID=2, A, SR, RUE (DS4 does not know RS1 and RS3)
+ * - DS5 with GID=3, A, SD, SDL=2 (DS5 does not know RS1)
+ * - DS6 with GID=3, A, SR, RUF (DS6 does not know RS1)
+ * Scenario is:
+ * - RS1 starts
+ * - DS1 starts and connects to RS1 (check topo view in DS1)
+ * - DS2 starts and connects to RS1 (check topo view in DS1,DS2)
+ * - RS2 starts (check topo view in DS1,DS2)
+ * - DS3 starts and connects to RS2 (check topo view in DS1,DS2,DS3)
+ * - DS4 starts and connects to RS2 (check topo view in DS1,DS2,DS3,DS4)
+ * - DS5 starts and connects to RS2 (check topo view in DS1,DS2,DS3,DS4,DS5)
+ * - RS3 starts (check topo view in DS1,DS2,DS3,DS4,DS5)
+ * - DS6 starts and connects to RS3. DS5 should reconnect to RS3 (as RS with
+ * same GID becomes available) (check topo view in DS1,DS2,DS3,DS4,DS5,DS6)
+ * - DS6 stops (check topo view in DS1,DS2,DS3,DS4,DS5)
+ * - DS6 starts and connects to RS3 (check topo view in DS1,DS2,DS3,DS4,DS5,
+ * DS6)
+ * - RS3 stops. DS5 and DS6 should failover to RS2 as do not know RS1 (check
+ * topo view in DS1,DS2,DS3,DS4,DS5,DS6)
+ * - RS3 starts. DS5 and DS6 should reconnect to RS3 (as RS with same GID
+ * becomes available) (check topo view in DS1,DS2,DS3,DS4,DS5,DS6)
+ * - RS2 stops. DS3 and DS4 do not reconnect to any RS as do not know RS1 and
+ * RS3. This emulates a full RS with his connected DSs crash. (check topo view
+ * in DS1,DS2,DS5,DS6)
+ * @throws Exception If a problem occurred
+ */
+ @Test(enabled = true, groups = "slow")
+ public void testTopologyChanges() throws Exception
+ {
+ String testCase = "testTopologyChanges";
+
+ debugInfo("Starting " + testCase);
+
+ initTest();
+
+ TopoView theoricalTopoView = null;
+
+ try
+ {
+
+ /**
+ * RS1 starts
+ */
+ debugInfo("*** STEP 0 ***");
+ rs1 = createReplicationServer(RS1_ID, testCase);
+
+ /**
+ * DS1 starts and connects to RS1 (check topo view in DS1)
+ */
+ debugInfo("*** STEP 1 ***");
+ rd1 = createReplicationDomain(DS1_ID);
+ checkConnection(30, DS1_ID, RS1_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_1);
+ checkTopoView(new short[] {DS1_ID}, theoricalTopoView);
+
+ /**
+ * DS2 starts and connects to RS1 (check topo view in DS1,DS2)
+ */
+ debugInfo("*** STEP 2 ***");
+ rd2 = createReplicationDomain(DS2_ID);
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_2);
+ checkTopoView(new short[] {DS1_ID, DS2_ID}, theoricalTopoView);
+
+ /**
+ * RS2 starts (check topo view in DS1,DS2)
+ */
+ debugInfo("*** STEP 3 ***");
+ rs2 = createReplicationServer(RS2_ID, testCase);
+ sleep(1000); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_3);
+ checkTopoView(new short[] {DS1_ID, DS2_ID}, theoricalTopoView);
+
+ /**
+ * DS3 starts and connects to RS2 (check topo view in DS1,DS2,DS3)
+ */
+ debugInfo("*** STEP 4 ***");
+ rd3 = createReplicationDomain(DS3_ID);
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ checkConnection(30, DS3_ID, RS2_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_4);
+ checkTopoView(new short[] {DS1_ID, DS2_ID, DS3_ID}, theoricalTopoView);
+
+ /**
+ * DS4 starts and connects to RS2 (check topo view in DS1,DS2,DS3,DS4)
+ */
+ debugInfo("*** STEP 5 ***");
+ rd4 = createReplicationDomain(DS4_ID);
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ checkConnection(30, DS3_ID, RS2_ID);
+ checkConnection(30, DS4_ID, RS2_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_5);
+ checkTopoView(new short[] {DS1_ID, DS2_ID, DS3_ID, DS4_ID},
+ theoricalTopoView);
+
+ /**
+ * DS5 starts and connects to RS2 (check topo view in DS1,DS2,DS3,DS4,DS5)
+ */
+ debugInfo("*** STEP 6 ***");
+ rd5 = createReplicationDomain(DS5_ID);
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ checkConnection(30, DS3_ID, RS2_ID);
+ checkConnection(30, DS4_ID, RS2_ID);
+ checkConnection(30, DS5_ID, RS2_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_6);
+ checkTopoView(new short[] {DS1_ID, DS2_ID, DS3_ID, DS4_ID, DS5_ID},
+ theoricalTopoView);
+
+ /**
+ * RS3 starts. DS5 should reconnect to RS3 (as RS with
+ * same GID becomes available) (check topo view in DS1,DS2,DS3,DS4,DS5)
+ */
+ debugInfo("*** STEP 7 ***");
+ rs3 = createReplicationServer(RS3_ID, testCase);
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ checkConnection(30, DS3_ID, RS2_ID);
+ checkConnection(30, DS4_ID, RS2_ID);
+ checkConnection(30, DS5_ID, RS3_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_7);
+ checkTopoView(new short[] {DS1_ID, DS2_ID, DS3_ID, DS4_ID, DS5_ID},
+ theoricalTopoView);
+
+
+ /**
+ * DS6 starts and connects to RS3 (check topo view in DS1,DS2,DS3,DS4,DS5,
+ * DS6)
+ */
+ debugInfo("*** STEP 8 ***");
+ rd6 = createReplicationDomain(DS6_ID);
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ checkConnection(30, DS3_ID, RS2_ID);
+ checkConnection(30, DS4_ID, RS2_ID);
+ checkConnection(30, DS5_ID, RS3_ID);
+ checkConnection(30, DS6_ID, RS3_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_8);
+ checkTopoView(new short[] {DS1_ID, DS2_ID, DS3_ID, DS4_ID, DS5_ID, DS6_ID},
+ theoricalTopoView);
+
+
+ /**
+ * DS6 stops (check topo view in DS1,DS2,DS3,DS4,DS5)
+ */
+ debugInfo("*** STEP 9 ***");
+ rd6.disable();
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ checkConnection(30, DS3_ID, RS2_ID);
+ checkConnection(30, DS4_ID, RS2_ID);
+ checkConnection(30, DS5_ID, RS3_ID);
+ assertFalse(rd6.isConnected());
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_9);
+ checkTopoView(new short[] {DS1_ID, DS2_ID, DS3_ID, DS4_ID, DS5_ID},
+ theoricalTopoView);
+
+
+ /**
+ * DS6 starts and connects to RS3 (check topo view in DS1,DS2,DS3,DS4,DS5,
+ * DS6)
+ */
+ debugInfo("*** STEP 10 ***");
+ rd6.enable();
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ checkConnection(30, DS3_ID, RS2_ID);
+ checkConnection(30, DS4_ID, RS2_ID);
+ checkConnection(30, DS5_ID, RS3_ID);
+ checkConnection(30, DS6_ID, RS3_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_10);
+ checkTopoView(new short[] {DS1_ID, DS2_ID, DS3_ID, DS4_ID, DS5_ID, DS6_ID},
+ theoricalTopoView);
+
+
+ /**
+ * RS3 stops. DS5 and DS6 should failover to RS2 as do not know RS1 (check
+ * topo view in DS1,DS2,DS3,DS4,DS5,DS6)
+ */
+ debugInfo("*** STEP 11 ***");
+ rs3.remove();
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ checkConnection(30, DS3_ID, RS2_ID);
+ checkConnection(30, DS4_ID, RS2_ID);
+ checkConnection(30, DS5_ID, RS2_ID);
+ checkConnection(30, DS6_ID, RS2_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_11);
+ checkTopoView(new short[] {DS1_ID, DS2_ID, DS3_ID, DS4_ID, DS5_ID, DS6_ID},
+ theoricalTopoView);
+
+
+ /**
+ * RS3 starts. DS5 and DS6 should reconnect to RS3 (as RS with same GID
+ * becomes available) (check topo view in DS1,DS2,DS3,DS4,DS5,DS6)
+ */
+ debugInfo("*** STEP 12 ***");
+ rs3 = createReplicationServer(RS3_ID, testCase);
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ checkConnection(30, DS3_ID, RS2_ID);
+ checkConnection(30, DS4_ID, RS2_ID);
+ checkConnection(30, DS5_ID, RS3_ID);
+ checkConnection(30, DS6_ID, RS3_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_12);
+ checkTopoView(new short[] {DS1_ID, DS2_ID, DS3_ID, DS4_ID, DS5_ID, DS6_ID},
+ theoricalTopoView);
+
+
+ /**
+ * RS2 stops. DS3 and DS4 do not reconnect to any RS as do not know RS1 and
+ * RS3. This emulates a full RS with his connected DSs crash. (check topo
+ * view in DS1,DS2,DS5,DS6)
+ */
+ debugInfo("*** STEP 13 ***");
+ rs2.remove();
+ sleep(500); // Let time to topo msgs being propagated through the network
+ checkConnection(30, DS1_ID, RS1_ID);
+ checkConnection(30, DS2_ID, RS1_ID);
+ checkConnection(30, DS5_ID, RS3_ID);
+ checkConnection(30, DS6_ID, RS3_ID);
+ theoricalTopoView = createTheoreticalTopoViewForStep(STEP_13);
+ checkTopoView(new short[] {DS1_ID, DS2_ID, DS5_ID, DS6_ID},
+ theoricalTopoView);
+
+ } finally
+ {
+ endTest();
+ }
+ }
+
+ /**
+ * Creates RSInfo for the passed RS
+ */
+ private RSInfo createRSInfo(short rsId)
+ {
+ int groupId = -1;
+ switch (rsId)
+ {
+ case RS1_ID:
+ groupId = RS1_GID;
+ break;
+ case RS2_ID:
+ groupId = RS2_GID;
+ break;
+ case RS3_ID:
+ groupId = RS3_GID;
+ break;
+ default:
+ fail("Unknown replication server id.");
+ }
+
+ return new RSInfo(rsId, TEST_DN_WITH_ROOT_ENTRY_GENID, (byte)groupId);
+ }
+
+ /**
+ * Creates DSInfo for the passed DS, connected to the passed RS
+ */
+ private DSInfo createDSInfo(short dsId, short rsId)
+ {
+ ServerStatus status = ServerStatus.NORMAL_STATUS;
+
+ byte groupId = -1;
+ AssuredType assuredType = null;
+ int assuredSdLevel = -100;
+ SortedSet<String> refUrls = null;
+
+ switch (dsId)
+ {
+ case DS1_ID:
+ groupId = DS1_GID;
+ assuredType = DS1_AT;
+ assuredSdLevel = DS1_SDL;
+ refUrls = DS1_RU;
+ break;
+ case DS2_ID:
+ groupId = DS2_GID;
+ assuredType = DS2_AT;
+ assuredSdLevel = DS2_SDL;
+ refUrls = DS2_RU;
+ break;
+ case DS3_ID:
+ groupId = DS3_GID;
+ assuredType = DS3_AT;
+ assuredSdLevel = DS3_SDL;
+ refUrls = DS3_RU;
+ break;
+ case DS4_ID:
+ groupId = DS4_GID;
+ assuredType = DS4_AT;
+ assuredSdLevel = DS4_SDL;
+ refUrls = DS4_RU;
+ break;
+ case DS5_ID:
+ groupId = DS5_GID;
+ assuredType = DS5_AT;
+ assuredSdLevel = DS5_SDL;
+ refUrls = DS5_RU;
+ break;
+ case DS6_ID:
+ groupId = DS6_GID;
+ assuredType = DS6_AT;
+ assuredSdLevel = DS6_SDL;
+ refUrls = DS6_RU;
+ break;
+ default:
+ fail("Unknown replication domain server id.");
+ }
+
+ // Perform necessary conversions
+ boolean assuredFlag = (assuredType != AssuredType.NOT_ASSURED);
+ AssuredMode assMode = ( (assuredType == AssuredType.SAFE_READ) ?
+ AssuredMode.SAFE_READ_MODE : AssuredMode.SAFE_DATA_MODE);
+ List<String> urls = new ArrayList<String>();
+ for(String str : refUrls)
+ {
+ urls.add(str);
+ }
+
+ return new DSInfo(dsId, rsId, TEST_DN_WITH_ROOT_ENTRY_GENID, status, assuredFlag, assMode,
+ (byte)assuredSdLevel, groupId, urls);
+ }
+
+ /**
+ * Creates the topo view to be checked at each step of the test (view that
+ * every concerned DS should have)
+ */
+ private TopoView createTheoreticalTopoViewForStep(int step)
+ {
+ List<DSInfo> dsList = new ArrayList<DSInfo>();
+ List<RSInfo> rsList = new ArrayList<RSInfo>();
+
+ switch (step)
+ {
+ case STEP_1:
+ rsList.add(createRSInfo(RS1_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ break;
+ case STEP_2:
+ rsList.add(createRSInfo(RS1_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ break;
+ case STEP_3:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS2_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ break;
+ case STEP_4:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS2_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ dsList.add(createDSInfo(DS3_ID, RS2_ID));
+ break;
+ case STEP_5:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS2_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ dsList.add(createDSInfo(DS3_ID, RS2_ID));
+ dsList.add(createDSInfo(DS4_ID, RS2_ID));
+ break;
+ case STEP_6:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS2_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ dsList.add(createDSInfo(DS3_ID, RS2_ID));
+ dsList.add(createDSInfo(DS4_ID, RS2_ID));
+ dsList.add(createDSInfo(DS5_ID, RS2_ID));
+ break;
+ case STEP_7:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS2_ID));
+ rsList.add(createRSInfo(RS3_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ dsList.add(createDSInfo(DS3_ID, RS2_ID));
+ dsList.add(createDSInfo(DS4_ID, RS2_ID));
+ dsList.add(createDSInfo(DS5_ID, RS3_ID));
+ break;
+ case STEP_8:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS2_ID));
+ rsList.add(createRSInfo(RS3_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ dsList.add(createDSInfo(DS3_ID, RS2_ID));
+ dsList.add(createDSInfo(DS4_ID, RS2_ID));
+ dsList.add(createDSInfo(DS5_ID, RS3_ID));
+ dsList.add(createDSInfo(DS6_ID, RS3_ID));
+ break;
+ case STEP_9:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS2_ID));
+ rsList.add(createRSInfo(RS3_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ dsList.add(createDSInfo(DS3_ID, RS2_ID));
+ dsList.add(createDSInfo(DS4_ID, RS2_ID));
+ dsList.add(createDSInfo(DS5_ID, RS3_ID));
+ break;
+ case STEP_10:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS2_ID));
+ rsList.add(createRSInfo(RS3_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ dsList.add(createDSInfo(DS3_ID, RS2_ID));
+ dsList.add(createDSInfo(DS4_ID, RS2_ID));
+ dsList.add(createDSInfo(DS5_ID, RS3_ID));
+ dsList.add(createDSInfo(DS6_ID, RS3_ID));
+ break;
+ case STEP_11:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS2_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ dsList.add(createDSInfo(DS3_ID, RS2_ID));
+ dsList.add(createDSInfo(DS4_ID, RS2_ID));
+ dsList.add(createDSInfo(DS5_ID, RS2_ID));
+ dsList.add(createDSInfo(DS6_ID, RS2_ID));
+ break;
+ case STEP_12:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS2_ID));
+ rsList.add(createRSInfo(RS3_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ dsList.add(createDSInfo(DS3_ID, RS2_ID));
+ dsList.add(createDSInfo(DS4_ID, RS2_ID));
+ dsList.add(createDSInfo(DS5_ID, RS3_ID));
+ dsList.add(createDSInfo(DS6_ID, RS3_ID));
+ break;
+ case STEP_13:
+ rsList.add(createRSInfo(RS1_ID));
+ rsList.add(createRSInfo(RS3_ID));
+
+ dsList.add(createDSInfo(DS1_ID, RS1_ID));
+ dsList.add(createDSInfo(DS2_ID, RS1_ID));
+ dsList.add(createDSInfo(DS5_ID, RS3_ID));
+ dsList.add(createDSInfo(DS6_ID, RS3_ID));
+ break;
+ default:
+ fail("Unknown test step: " + step);
+ }
+
+ return new TopoView(dsList, rsList);
+ }
+
+ /**
+ * Get the topo view each DS in the provided ds list has and compares it
+ * with the theoretical topology view that every body should have at the time
+ * this method is called.
+ */
+ private void checkTopoView(short[] dsIdList, TopoView theoricalTopoView)
+ {
+ for(short currentDsId : dsIdList)
+ {
+ ReplicationDomain rd = null;
+
+ switch (currentDsId)
+ {
+ case DS1_ID:
+ rd = rd1;
+ break;
+ case DS2_ID:
+ rd = rd2;
+ break;
+ case DS3_ID:
+ rd = rd3;
+ break;
+ case DS4_ID:
+ rd = rd4;
+ break;
+ case DS5_ID:
+ rd = rd5;
+ break;
+ case DS6_ID:
+ rd = rd6;
+ break;
+ default:
+ fail("Unknown replication domain server id.");
+ }
+
+ /**
+ * Get the topo view of the current analyzed DS
+ */
+ List<DSInfo> internalDsList = rd.getDsList();
+ // Add info for DS itself:
+ // we need to clone the list as we don't want to modify the list kept
+ // inside the DS.
+ List<DSInfo> dsList = new ArrayList<DSInfo>();
+ for (DSInfo aDsInfo : internalDsList)
+ {
+ dsList.add(aDsInfo);
+ }
+ short dsId = rd.getServerId();
+ short rsId = rd.getBroker().getRsServerId();
+ ServerStatus status = rd.getStatus();
+ boolean assuredFlag = rd.isAssured();
+ AssuredMode assuredMode = rd.getAssuredMode();
+ byte safeDataLevel = rd.getAssuredSdLevel();
+ byte groupId = rd.getGroupId();
+ List<String> refUrls = rd.getRefUrls();
+ DSInfo dsInfo = new DSInfo(dsId, rsId, TEST_DN_WITH_ROOT_ENTRY_GENID, status, assuredFlag, assuredMode,
+ safeDataLevel, groupId, refUrls);
+ dsList.add(dsInfo);
+
+ TopoView dsTopoView = new TopoView(dsList, rd.getRsList());
+
+ /**
+ * Compare to what is the expected view
+ */
+
+ assertEquals(dsTopoView, theoricalTopoView);
+ }
+ }
+
+ /**
+ * Bag class representing a view of the topology at a given time
+ * (who is connected to who, what are the config parameters...)
+ */
+ private class TopoView
+ {
+ private List<DSInfo> dsList = null;
+ private List<RSInfo> rsList = null;
+
+ public TopoView(List<DSInfo> dsList, List<RSInfo> rsList)
+ {
+ assertNotNull(dsList);
+ assertNotNull(rsList);
+
+ this.dsList = dsList;
+ this.rsList = rsList;
+ }
+
+ public boolean equals(Object obj)
+ {
+ assertNotNull(obj);
+ assertFalse(obj.getClass() != this.getClass());
+
+ TopoView topoView = (TopoView) obj;
+
+ // Check dsList
+ if (topoView.dsList.size() != dsList.size())
+ return false;
+ for (DSInfo dsInfo : topoView.dsList)
+ {
+ int found = 0;
+ for (DSInfo thisDsInfo : dsList)
+ {
+ if (thisDsInfo.equals(dsInfo))
+ found++;
+ }
+ // Not found
+ if (found == 0)
+ return false;
+ // Should never see twice as dsInfo structure in a dsList
+ assertFalse(found > 1);
+ // Ok, found exactly once in the list, examine next structure
+ }
+
+ // Check rsList
+ if (topoView.rsList.size() != rsList.size())
+ return false;
+ for (RSInfo rsInfo : topoView.rsList)
+ {
+ int found = 0;
+ for (RSInfo thisRsInfo : rsList)
+ {
+ if (thisRsInfo.equals(rsInfo))
+ found++;
+ }
+ // Not found
+ if (found == 0)
+ return false;
+ // Should never see twice as rsInfo structure in a dsList
+ assertFalse(found > 1);
+ // Ok, found exactly once in the list, examine next structure
+ }
+
+ return true;
+ }
+
+ public String toString()
+ {
+ String dsStr = "";
+ for (DSInfo dsInfo : dsList)
+ {
+ dsStr += dsInfo.toString() + "\n----------------------------\n";
+ }
+
+ String rsStr = "";
+ for (RSInfo rsInfo : rsList)
+ {
+ rsStr += rsInfo.toString() + "\n----------------------------\n";
+ }
+
+ return ("TopoView:" +
+ "\n----------------------------\n" + "CONNECTED DS SERVERS:\n" + dsStr +
+ "CONNECTED RS SERVERS:\n" + rsStr);
+ }
+ }
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
new file mode 100644
index 0000000..45d87cf
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
@@ -0,0 +1,615 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ */
+
+package org.opends.server.replication.protocol;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import org.opends.server.core.AddOperationBasis;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ModifyDNOperationBasis;
+import org.opends.server.core.ModifyOperationBasis;
+import org.opends.server.replication.ReplicationTestCase;
+import org.opends.server.replication.common.AssuredMode;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.Attributes;
+import org.opends.server.types.DN;
+import org.opends.server.types.Modification;
+import org.opends.server.types.ModificationType;
+import org.opends.server.types.ObjectClass;
+import org.opends.server.types.Operation;
+import org.opends.server.util.TimeThread;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.opends.server.replication.protocol.OperationContext.SYNCHROCONTEXT;
+
+import static org.testng.Assert.assertEquals;
+
+/**
+ * Test the conversions between the various protocol versions.
+ */
+public class ProtocolCompatibilityTest extends ReplicationTestCase {
+
+ /**
+ * Set up the environment for performing the tests in this Class.
+ *
+ * @throws Exception
+ * If the environment could not be set up.
+ */
+ @BeforeClass
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ // Be sure we use the latest protocol version for these tests
+ ProtocolVersion.resetCurrentVersion();
+ }
+
+ /**
+ * Clean up the environment.
+ *
+ * @throws Exception If the environment could not be set up.
+ */
+ @AfterClass
+ @Override
+ public void classCleanUp() throws Exception
+ {
+ super.classCleanUp();
+ // Do not disturb other tests
+ ProtocolVersion.resetCurrentVersion();
+ }
+
+ @DataProvider(name="createReplServerStartData")
+ public Object [][] createReplServerStartData() throws Exception
+ {
+ DN baseDN = DN.decode("o=test");
+ ServerState state = new ServerState();
+ state.update(new ChangeNumber((long)0, 0,(short)0));
+ Object[] set1 = new Object[] {(short)1, baseDN, 0, "localhost:8989", state, 0L, (byte)0, 0};
+
+ baseDN = DN.decode("dc=example,dc=com");
+ state = new ServerState();
+ state.update(new ChangeNumber((long)75, 5,(short)263));
+ Object[] set2 = new Object[] {(short)16, baseDN, 100, "anotherHost:1025", state, 1245L, (byte)25, 3456};
+
+ return new Object [][] { set1, set2 };
+ }
+
+ /**
+ * Test that various combinations of ReplServerStartMsg encoding and decoding
+ * using protocol V1 and V2 are working.
+ */
+ @Test(dataProvider="createReplServerStartData")
+ public void replServerStartMsgTest(short serverId, DN baseDN, int window,
+ String url, ServerState state, long genId, byte groupId, int degTh) throws Exception
+ {
+ // Create V2 message
+ ReplServerStartMsg msg = new ReplServerStartMsg(serverId,
+ url, baseDN, window, state, ProtocolVersion.getCurrentVersion(), genId, true, groupId, degTh);
+
+ // Check version of message
+ assertEquals(msg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V2);
+
+ // Serialize in V1
+ byte[] v1MsgBytes = msg.getBytes(ProtocolVersion.REPLICATION_PROTOCOL_V1);
+
+ // Un-serialize V1 message
+ ReplServerStartMsg newMsg = new ReplServerStartMsg(v1MsgBytes);
+
+ // Check original version of message
+ assertEquals(newMsg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V1);
+
+ // Check fields common to both versions
+ assertEquals(msg.getGenerationId(), newMsg.getGenerationId());
+ assertEquals(msg.getServerId(), newMsg.getServerId());
+ assertEquals(msg.getServerURL(), newMsg.getServerURL());
+ assertEquals(msg.getBaseDn(), newMsg.getBaseDn());
+ assertEquals(msg.getWindowSize(), newMsg.getWindowSize());
+ assertEquals(msg.getServerState().getMaxChangeNumber((short)1),
+ newMsg.getServerState().getMaxChangeNumber((short)1));
+ assertEquals(msg.getSSLEncryption(), newMsg.getSSLEncryption());
+
+ // Check default value for only V2 fields
+ assertEquals(newMsg.getGroupId(), (byte) -1);
+ assertEquals(newMsg.getDegradedStatusThreshold(), -1);
+
+ // Set again only V2 fields
+ newMsg.setGroupId(groupId);
+ newMsg.setDegradedStatusThreshold(degTh);
+
+ // Serialize in V2 msg
+ ReplServerStartMsg v2Msg = new ReplServerStartMsg(newMsg.getBytes());
+
+ // Check original version of message
+ assertEquals(v2Msg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V2);
+
+ // Check we retrieve original V2 message (V2 fields)
+ assertEquals(msg.getGenerationId(), v2Msg.getGenerationId());
+ assertEquals(msg.getServerId(), v2Msg.getServerId());
+ assertEquals(msg.getServerURL(), v2Msg.getServerURL());
+ assertEquals(msg.getBaseDn(), v2Msg.getBaseDn());
+ assertEquals(msg.getWindowSize(), v2Msg.getWindowSize());
+ assertEquals(msg.getServerState().getMaxChangeNumber((short)1),
+ v2Msg.getServerState().getMaxChangeNumber((short)1));
+ assertEquals(msg.getSSLEncryption(), v2Msg.getSSLEncryption());
+ assertEquals(msg.getGroupId(), v2Msg.getGroupId());
+ assertEquals(msg.getDegradedStatusThreshold(), v2Msg.getDegradedStatusThreshold());
+ }
+
+ @DataProvider(name = "createAddData")
+ public Object[][] createAddData() {
+ return new Object[][] {
+ {"dc=example,dc=com", false, AssuredMode.SAFE_DATA_MODE, (byte)0},
+ {"o=test", true, AssuredMode.SAFE_READ_MODE, (byte)1},
+ {"o=group,dc=example,dc=com", true, AssuredMode.SAFE_READ_MODE, (byte)3}};
+ }
+
+ @Test(dataProvider = "createAddData")
+ public void addMsgTest(String rawDN, boolean isAssured, AssuredMode assuredMode,
+ byte safeDataLevel)
+ throws Exception
+ {
+ // Create V2 message
+ Attribute objectClass = Attributes.create(DirectoryServer
+ .getObjectClassAttributeType(), "organization");
+ HashMap<ObjectClass, String> objectClassList = new HashMap<ObjectClass, String>();
+ objectClassList.put(DirectoryServer.getObjectClass("organization"),
+ "organization");
+
+ ArrayList<Attribute> userAttributes = new ArrayList<Attribute>(1);
+ Attribute attr = Attributes.create("o", "com");
+ userAttributes.add(attr);
+ HashMap<AttributeType, List<Attribute>> userAttList = new HashMap<AttributeType, List<Attribute>>();
+ userAttList.put(attr.getAttributeType(), userAttributes);
+
+
+ ArrayList<Attribute> operationalAttributes = new ArrayList<Attribute>(1);
+ attr = Attributes.create("creatorsName", "dc=creator");
+ operationalAttributes.add(attr);
+ HashMap<AttributeType,List<Attribute>> opList=
+ new HashMap<AttributeType,List<Attribute>>();
+ opList.put(attr.getAttributeType(), operationalAttributes);
+
+ ChangeNumber cn = new ChangeNumber(TimeThread.getTime(),
+ (short) 123, (short) 45);
+
+ AddMsg msg = new AddMsg(cn, rawDN, "thisIsaUniqueID", "parentUniqueId",
+ objectClass, userAttributes,
+ operationalAttributes);
+
+ msg.setAssured(isAssured);
+ msg.setAssuredMode(assuredMode);
+ msg.setSafeDataLevel(safeDataLevel);
+
+ // Check version of message
+ assertEquals(msg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V2);
+
+ // Serialize in V1
+ byte[] v1MsgBytes = msg.getBytes(ProtocolVersion.REPLICATION_PROTOCOL_V1);
+
+ // Un-serialize V1 message
+ AddMsg newMsg = (AddMsg)ReplicationMsg.generateMsg(v1MsgBytes);
+
+ // Check original version of message
+ assertEquals(newMsg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V1);
+
+ // Check fields common to both versions
+ assertEquals(newMsg.getUniqueId(), msg.getUniqueId());
+ assertEquals(newMsg.getDn(), msg.getDn());
+ assertEquals(newMsg.getChangeNumber(), msg.getChangeNumber());
+ assertEquals(newMsg.isAssured(), msg.isAssured());
+ assertEquals(newMsg.getParentUid(), msg.getParentUid());
+
+ // Create an add operation from each message to compare attributes (kept encoded in messages)
+ Operation op = msg.createOperation(connection, rawDN);
+ Operation generatedOperation = newMsg.createOperation(connection, rawDN);
+
+ assertEquals(op.getClass(), AddOperationBasis.class);
+ assertEquals(generatedOperation.getClass(), AddOperationBasis.class);
+ AddOperationBasis addOpBasis = (AddOperationBasis) op;
+ AddOperationBasis genAddOpBasis = (AddOperationBasis) generatedOperation;
+
+ assertEquals(addOpBasis.getRawEntryDN(), genAddOpBasis.getRawEntryDN());
+ assertEquals( addOpBasis.getAttachment(SYNCHROCONTEXT),
+ genAddOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals(addOpBasis.getObjectClasses(), genAddOpBasis.getObjectClasses());
+ assertEquals(addOpBasis.getOperationalAttributes(), genAddOpBasis.getOperationalAttributes());
+ assertEquals(addOpBasis.getUserAttributes(), genAddOpBasis.getUserAttributes());
+
+ // Check default value for only V2 fields
+ assertEquals(newMsg.getAssuredMode(), AssuredMode.SAFE_DATA_MODE);
+ assertEquals(newMsg.getSafeDataLevel(), (byte)-1);
+
+ // Set again only V2 fields
+ newMsg.setAssuredMode(assuredMode);
+ newMsg.setSafeDataLevel(safeDataLevel);
+
+ // Serialize in V2 msg
+ AddMsg v2Msg = (AddMsg)ReplicationMsg.generateMsg(newMsg.getBytes());
+
+ // Check original version of message
+ assertEquals(v2Msg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V2);
+
+ // Check we retrieve original V2 message (V2 fields)
+ assertEquals(msg.getUniqueId(), v2Msg.getUniqueId());
+ assertEquals(msg.getDn(), v2Msg.getDn());
+ assertEquals(msg.getChangeNumber(), v2Msg.getChangeNumber());
+ assertEquals(msg.getParentUid(), v2Msg.getParentUid());
+ assertEquals(msg.isAssured(), v2Msg.isAssured());
+ assertEquals(msg.getAssuredMode(), v2Msg.getAssuredMode());
+ assertEquals(msg.getSafeDataLevel(), v2Msg.getSafeDataLevel());
+
+ // Create an add operation from each message to compare attributes (kept encoded in messages)
+ op = msg.createOperation(connection, rawDN);
+ generatedOperation = v2Msg.createOperation(connection, rawDN);
+
+ assertEquals(op.getClass(), AddOperationBasis.class);
+ assertEquals(generatedOperation.getClass(), AddOperationBasis.class);
+ addOpBasis = (AddOperationBasis) op;
+ genAddOpBasis = (AddOperationBasis) generatedOperation;
+
+ assertEquals(addOpBasis.getRawEntryDN(), genAddOpBasis.getRawEntryDN());
+ assertEquals( addOpBasis.getAttachment(SYNCHROCONTEXT),
+ genAddOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals(addOpBasis.getObjectClasses(), genAddOpBasis.getObjectClasses());
+ assertEquals(addOpBasis.getOperationalAttributes(), genAddOpBasis.getOperationalAttributes());
+ assertEquals(addOpBasis.getUserAttributes(), genAddOpBasis.getUserAttributes());
+ }
+
+ /**
+ * Build some data for the DeleteMsg test below.
+ */
+ @DataProvider(name = "createDeleteData")
+ public Object[][] createDeleteData() {
+ return new Object[][] {
+ {"dc=example,dc=com", false, AssuredMode.SAFE_DATA_MODE, (byte)0},
+ {"dc=delete,dc=an,dc=entry,dc=with,dc=a,dc=long dn", true, AssuredMode.SAFE_READ_MODE, (byte)1},
+ {"o=group,dc=example,dc=com", true, AssuredMode.SAFE_READ_MODE, (byte)3}};
+ }
+
+ /**
+ * Test that various combinations of DeleteMsg encoding and decoding
+ * using protocol V1 and V2 are working.
+ */
+ @Test(dataProvider = "createDeleteData")
+ public void deleteMsgTest(String rawDN, boolean isAssured, AssuredMode assuredMode,
+ byte safeDataLevel)
+ throws Exception
+ {
+ ChangeNumber cn = new ChangeNumber(TimeThread.getTime(),
+ (short) 123, (short) 45);
+ DeleteMsg msg = new DeleteMsg(rawDN, cn, "thisIsaUniqueID");
+
+ msg.setAssured(isAssured);
+ msg.setAssuredMode(assuredMode);
+ msg.setSafeDataLevel(safeDataLevel);
+
+ // Check version of message
+ assertEquals(msg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V2);
+
+ // Serialize in V1
+ byte[] v1MsgBytes = msg.getBytes(ProtocolVersion.REPLICATION_PROTOCOL_V1);
+
+ // Un-serialize V1 message
+ DeleteMsg newMsg = (DeleteMsg)ReplicationMsg.generateMsg(v1MsgBytes);
+
+ // Check original version of message
+ assertEquals(newMsg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V1);
+
+ // Check fields common to both versions
+ assertEquals(newMsg.getUniqueId(), msg.getUniqueId());
+ assertEquals(newMsg.getDn(), msg.getDn());
+ assertEquals(newMsg.getChangeNumber(), msg.getChangeNumber());
+ assertEquals(newMsg.isAssured(), msg.isAssured());
+
+ // Check default value for only V2 fields
+ assertEquals(newMsg.getAssuredMode(), AssuredMode.SAFE_DATA_MODE);
+ assertEquals(newMsg.getSafeDataLevel(), (byte)-1);
+
+ // Set again only V2 fields
+ newMsg.setAssuredMode(assuredMode);
+ newMsg.setSafeDataLevel(safeDataLevel);
+
+ // Serialize in V2 msg
+ DeleteMsg v2Msg = (DeleteMsg)ReplicationMsg.generateMsg(newMsg.getBytes());
+
+ // Check original version of message
+ assertEquals(v2Msg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V2);
+
+ // Check we retrieve original V2 message (V2 fields)
+ assertEquals(msg.getUniqueId(), v2Msg.getUniqueId());
+ assertEquals(msg.getDn(), v2Msg.getDn());
+ assertEquals(msg.getChangeNumber(), v2Msg.getChangeNumber());
+ assertEquals(msg.isAssured(), v2Msg.isAssured());
+ assertEquals(msg.getAssuredMode(), v2Msg.getAssuredMode());
+ assertEquals(msg.getSafeDataLevel(), v2Msg.getSafeDataLevel());
+ }
+
+ /**
+ * Build some data for the ModifyMsg test below.
+ */
+ @DataProvider(name = "createModifyData")
+ public Object[][] createModifyData() {
+ ChangeNumber cn1 = new ChangeNumber(1, (short) 0, (short) 1);
+ ChangeNumber cn2 = new ChangeNumber(TimeThread.getTime(),
+ (short) 123, (short) 45);
+
+ AttributeType type = DirectoryServer.getAttributeType("description");
+
+ Attribute attr1 = Attributes.create("description", "new value");
+ Modification mod1 = new Modification(ModificationType.REPLACE, attr1);
+ List<Modification> mods1 = new ArrayList<Modification>();
+ mods1.add(mod1);
+
+ Attribute attr2 = Attributes.empty("description");
+ Modification mod2 = new Modification(ModificationType.DELETE, attr2);
+ List<Modification> mods2 = new ArrayList<Modification>();
+ mods2.add(mod1);
+ mods2.add(mod2);
+
+ AttributeBuilder builder = new AttributeBuilder(type);
+ List<Modification> mods3 = new ArrayList<Modification>();
+ builder.add("string");
+ builder.add("value");
+ builder.add("again");
+ Attribute attr3 = builder.toAttribute();
+ Modification mod3 = new Modification(ModificationType.ADD, attr3);
+ mods3.add(mod3);
+
+ List<Modification> mods4 = new ArrayList<Modification>();
+ for (int i = 0; i < 10; i++)
+ {
+ Attribute attr = Attributes.create("description", "string"
+ + String.valueOf(i));
+ Modification mod = new Modification(ModificationType.ADD, attr);
+ mods4.add(mod);
+ }
+
+ Attribute attr5 = Attributes.create("namingcontexts", "o=test");
+ Modification mod5 = new Modification(ModificationType.REPLACE, attr5);
+ List<Modification> mods5 = new ArrayList<Modification>();
+ mods5.add(mod5);
+
+ return new Object[][] {
+ { cn1, "dc=test", mods1, false, AssuredMode.SAFE_DATA_MODE, (byte)0},
+ { cn2, "dc=cn2", mods1, true, AssuredMode.SAFE_READ_MODE, (byte)1},
+ { cn2, "dc=test with a much longer dn in case this would "
+ + "make a difference", mods1, true, AssuredMode.SAFE_READ_MODE, (byte)3},
+ { cn2, "dc=test, cn=with a, o=more complex, ou=dn", mods1, false, AssuredMode.SAFE_READ_MODE, (byte)5},
+ { cn2, "cn=use\\, backslash", mods1, true, AssuredMode.SAFE_READ_MODE, (byte)3},
+ { cn2, "dc=test with several mod", mods2, false, AssuredMode.SAFE_DATA_MODE, (byte)16},
+ { cn2, "dc=test with several values", mods3, false, AssuredMode.SAFE_READ_MODE, (byte)3},
+ { cn2, "dc=test with long mod", mods4, true, AssuredMode.SAFE_READ_MODE, (byte)120},
+ { cn2, "dc=testDsaOperation", mods5, true, AssuredMode.SAFE_DATA_MODE, (byte)99},
+ };
+ }
+
+ /**
+ * Test that various combinations of ModifyMsg encoding and decoding
+ * using protocol V1 and V2 are working.
+ */
+ @Test(dataProvider = "createModifyData")
+ public void modifyMsgTest(ChangeNumber changeNumber,
+ String rawdn, List<Modification> mods,
+ boolean isAssured, AssuredMode assuredMode,
+ byte safeDataLevel)
+ throws Exception
+ {
+ // Create V2 message
+ DN dn = DN.decode(rawdn);
+ ModifyMsg msg = new ModifyMsg(changeNumber, dn, mods, "fakeuniqueid");
+
+ msg.setAssured(isAssured);
+ msg.setAssuredMode(assuredMode);
+ msg.setSafeDataLevel(safeDataLevel);
+
+ // Check version of message
+ assertEquals(msg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V2);
+
+ // Serialize in V1
+ byte[] v1MsgBytes = msg.getBytes(ProtocolVersion.REPLICATION_PROTOCOL_V1);
+
+ // Un-serialize V1 message
+ ModifyMsg newMsg = (ModifyMsg)ReplicationMsg.generateMsg(v1MsgBytes);
+
+ // Check original version of message
+ assertEquals(newMsg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V1);
+
+ // Check fields common to both versions
+ assertEquals(newMsg.getUniqueId(), msg.getUniqueId());
+ assertEquals(newMsg.getDn(), msg.getDn());
+ assertEquals(newMsg.getChangeNumber(), msg.getChangeNumber());
+ assertEquals(newMsg.isAssured(), msg.isAssured());
+
+ // Create a modify operation from each message to compare mods (kept encoded in messages)
+ Operation op = msg.createOperation(connection);
+ Operation generatedOperation = newMsg.createOperation(connection);
+
+ assertEquals(op.getClass(), ModifyOperationBasis.class);
+ assertEquals(generatedOperation.getClass(), ModifyOperationBasis.class);
+ ModifyOperationBasis modOpBasis = (ModifyOperationBasis) op;
+ ModifyOperationBasis genModOpBasis = (ModifyOperationBasis) generatedOperation;
+
+ assertEquals(modOpBasis.getRawEntryDN(), genModOpBasis.getRawEntryDN());
+ assertEquals( modOpBasis.getAttachment(SYNCHROCONTEXT),
+ genModOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals(modOpBasis.getModifications(), genModOpBasis.getModifications());
+
+ // Check default value for only V2 fields
+ assertEquals(newMsg.getAssuredMode(), AssuredMode.SAFE_DATA_MODE);
+ assertEquals(newMsg.getSafeDataLevel(), (byte)-1);
+
+ // Set again only V2 fields
+ newMsg.setAssuredMode(assuredMode);
+ newMsg.setSafeDataLevel(safeDataLevel);
+
+ // Serialize in V2 msg
+ ModifyMsg v2Msg = (ModifyMsg)ReplicationMsg.generateMsg(newMsg.getBytes());
+
+ // Check original version of message
+ assertEquals(v2Msg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V2);
+
+ // Check we retrieve original V2 message (V2 fields)
+ assertEquals(msg.getUniqueId(), v2Msg.getUniqueId());
+ assertEquals(msg.getDn(), v2Msg.getDn());
+ assertEquals(msg.getChangeNumber(), v2Msg.getChangeNumber());
+ assertEquals(msg.isAssured(), v2Msg.isAssured());
+ assertEquals(msg.getAssuredMode(), v2Msg.getAssuredMode());
+ assertEquals(msg.getSafeDataLevel(), v2Msg.getSafeDataLevel());
+
+ // Create a modify operation from each message to compare mods (kept encoded in messages)
+ op = msg.createOperation(connection);
+ generatedOperation = v2Msg.createOperation(connection);
+
+ assertEquals(op.getClass(), ModifyOperationBasis.class);
+ assertEquals(generatedOperation.getClass(), ModifyOperationBasis.class);
+ modOpBasis = (ModifyOperationBasis) op;
+ genModOpBasis = (ModifyOperationBasis) generatedOperation;
+
+ assertEquals(modOpBasis.getRawEntryDN(), genModOpBasis.getRawEntryDN());
+ assertEquals( modOpBasis.getAttachment(SYNCHROCONTEXT),
+ genModOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals(modOpBasis.getModifications(), genModOpBasis.getModifications());
+ }
+
+ @DataProvider(name = "createModifyDnData")
+ public Object[][] createModifyDnData() {
+ return new Object[][] {
+ {"dc=test,dc=com", "dc=new", "11111111-1111-1111-1111-111111111111", "22222222-2222-2222-2222-222222222222", false, "dc=change", false, AssuredMode.SAFE_DATA_MODE, (byte)0},
+ {"dc=test,dc=com", "dc=new", "33333333-3333-3333-3333-333333333333", "44444444-4444-4444-4444-444444444444", true, "dc=change", true, AssuredMode.SAFE_READ_MODE, (byte)1},
+ {"dc=test,dc=com", "dc=new", "55555555-5555-5555-5555-555555555555", "66666666-6666-6666-6666-666666666666", false, null, true, AssuredMode.SAFE_READ_MODE, (byte)3},
+ {"dc=delete,dc=an,dc=entry,dc=with,dc=a,dc=long dn",
+ "dc=new", "77777777-7777-7777-7777-777777777777", "88888888-8888-8888-8888-888888888888",true, null, true, AssuredMode.SAFE_DATA_MODE, (byte)99},
+ };
+ }
+
+ /**
+ * Test that various combinations of ModifyDnMsg encoding and decoding
+ * using protocol V1 and V2 are working.
+ */
+ @Test(dataProvider = "createModifyDnData")
+ public void modifyDnTest(String rawDN, String newRdn, String uid, String newParentUid,
+ boolean deleteOldRdn, String newSuperior,
+ boolean isAssured, AssuredMode assuredMode,
+ byte safeDataLevel)
+ throws Exception
+ {
+ // Create V2 message
+ ChangeNumber cn = new ChangeNumber(TimeThread.getTime(),
+ (short) 596, (short) 13);
+ ModifyDNMsg msg = new ModifyDNMsg(rawDN, cn, uid,
+ newParentUid, deleteOldRdn,
+ newSuperior, newRdn);
+
+ msg.setAssured(isAssured);
+ msg.setAssuredMode(assuredMode);
+ msg.setSafeDataLevel(safeDataLevel);
+
+ // Check version of message
+ assertEquals(msg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V2);
+
+ // Serialize in V1
+ byte[] v1MsgBytes = msg.getBytes(ProtocolVersion.REPLICATION_PROTOCOL_V1);
+
+ // Un-serialize V1 message
+ ModifyDNMsg newMsg = (ModifyDNMsg)ReplicationMsg.generateMsg(v1MsgBytes);
+
+ // Check original version of message
+ assertEquals(newMsg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V1);
+
+ // Check fields common to both versions
+ assertEquals(newMsg.getUniqueId(), msg.getUniqueId());
+ assertEquals(newMsg.getDn(), msg.getDn());
+ assertEquals(newMsg.getChangeNumber(), msg.getChangeNumber());
+ assertEquals(newMsg.isAssured(), msg.isAssured());
+ assertEquals(newMsg.getNewRDN(), msg.getNewRDN());
+ assertEquals(newMsg.getNewSuperior(), msg.getNewSuperior());
+ assertEquals(newMsg.getNewSuperiorId(), msg.getNewSuperiorId());
+ assertEquals(newMsg.deleteOldRdn(), msg.deleteOldRdn());
+
+ // Create a modDn operation from each message to compare mods (kept encoded in messages)
+ Operation op = msg.createOperation(connection);
+ Operation generatedOperation = newMsg.createOperation(connection);
+
+ assertEquals(op.getClass(), ModifyDNOperationBasis.class);
+ assertEquals(generatedOperation.getClass(), ModifyDNOperationBasis.class);
+ ModifyDNOperationBasis modDnOpBasis = (ModifyDNOperationBasis) op;
+ ModifyDNOperationBasis genModDnOpBasis = (ModifyDNOperationBasis) generatedOperation;
+
+ assertEquals(modDnOpBasis.getRawEntryDN(), genModDnOpBasis.getRawEntryDN());
+ assertEquals( modDnOpBasis.getAttachment(SYNCHROCONTEXT),
+ genModDnOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals(modDnOpBasis.getModifications(), genModDnOpBasis.getModifications());
+
+ // Check default value for only V2 fields
+ assertEquals(newMsg.getAssuredMode(), AssuredMode.SAFE_DATA_MODE);
+ assertEquals(newMsg.getSafeDataLevel(), (byte)-1);
+
+ // Set again only V2 fields
+ newMsg.setAssuredMode(assuredMode);
+ newMsg.setSafeDataLevel(safeDataLevel);
+
+ // Serialize in V2 msg
+ ModifyDNMsg v2Msg = (ModifyDNMsg)ReplicationMsg.generateMsg(newMsg.getBytes());
+
+ // Check original version of message
+ assertEquals(v2Msg.getVersion(), ProtocolVersion.REPLICATION_PROTOCOL_V2);
+
+ // Check we retrieve original V2 message (V2 fields)
+ assertEquals(msg.getUniqueId(), v2Msg.getUniqueId());
+ assertEquals(msg.getDn(), v2Msg.getDn());
+ assertEquals(msg.getChangeNumber(), v2Msg.getChangeNumber());
+ assertEquals(msg.isAssured(), v2Msg.isAssured());
+ assertEquals(msg.getAssuredMode(), v2Msg.getAssuredMode());
+ assertEquals(msg.getSafeDataLevel(), v2Msg.getSafeDataLevel());
+ assertEquals(msg.getNewRDN(), v2Msg.getNewRDN());
+ assertEquals(msg.getNewSuperior(), v2Msg.getNewSuperior());
+ assertEquals(msg.getNewSuperiorId(), v2Msg.getNewSuperiorId());
+ assertEquals(msg.deleteOldRdn(), v2Msg.deleteOldRdn());
+
+ // Create a modDn operation from each message to compare mods (kept encoded in messages)
+ op = msg.createOperation(connection);
+ generatedOperation = v2Msg.createOperation(connection);
+
+ assertEquals(op.getClass(), ModifyDNOperationBasis.class);
+ assertEquals(generatedOperation.getClass(), ModifyDNOperationBasis.class);
+ modDnOpBasis = (ModifyDNOperationBasis) op;
+ genModDnOpBasis = (ModifyDNOperationBasis) generatedOperation;
+
+ assertEquals(modDnOpBasis.getRawEntryDN(), genModDnOpBasis.getRawEntryDN());
+ assertEquals( modDnOpBasis.getAttachment(SYNCHROCONTEXT),
+ genModDnOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals(modDnOpBasis.getModifications(), genModDnOpBasis.getModifications());
+ }
+}
\ No newline at end of file
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
index 132db39..1946193 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
@@ -35,7 +35,6 @@
import java.util.Iterator;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.UUID;
import java.util.zip.DataFormatException;
@@ -50,28 +49,10 @@
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ServerState;
-import org.opends.server.replication.protocol.AckMessage;
-import org.opends.server.replication.protocol.AddContext;
-import org.opends.server.replication.protocol.AddMsg;
-import org.opends.server.replication.protocol.ReplServerStartMessage;
-import org.opends.server.replication.protocol.DeleteContext;
-import org.opends.server.replication.protocol.DeleteMsg;
-import org.opends.server.replication.protocol.DoneMessage;
-import org.opends.server.replication.protocol.EntryMessage;
-import org.opends.server.replication.protocol.ErrorMessage;
-import org.opends.server.replication.protocol.InitializeRequestMessage;
-import org.opends.server.replication.protocol.InitializeTargetMessage;
-import org.opends.server.replication.protocol.ModifyDNMsg;
-import org.opends.server.replication.protocol.ModifyDnContext;
-import org.opends.server.replication.protocol.ModifyMsg;
-import org.opends.server.replication.protocol.OperationContext;
-import org.opends.server.replication.protocol.ServerStartMessage;
-import org.opends.server.replication.protocol.ReplicationMessage;
-import org.opends.server.replication.protocol.UpdateMessage;
-import org.opends.server.replication.protocol.WindowMessage;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
@@ -83,97 +64,124 @@
import org.opends.server.workflowelement.localbackend.LocalBackendDeleteOperation;
import org.opends.server.workflowelement.localbackend.LocalBackendModifyDNOperation;
import org.opends.messages.Message;
+import org.opends.server.replication.common.AssuredMode;
+import org.opends.server.replication.common.DSInfo;
+import org.opends.server.replication.common.RSInfo;
+import org.opends.server.replication.common.ServerStatus;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
/**
- * Test the contructors, encoders and decoders of the synchronization
- * AckMsg, ModifyMsg, ModifyDnMsg, AddMsg and Delete Msg
+ * Test the constructors, encoders and decoders of the replication protocol
+ * PDUs classes (message classes)
*/
public class SynchronizationMsgTest extends ReplicationTestCase
{
/**
+ * Set up the environment for performing the tests in this Class.
+ *
+ * @throws Exception
+ * If the environment could not be set up.
+ */
+ @BeforeClass
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ // Be sure we use the latest protocol version for these tests
+ ProtocolVersion.resetCurrentVersion();
+ }
+
+ /**
* Build some data for the ModifyMsg test below.
*/
- @DataProvider(name = "modifyEncodeDecode")
- public Object[][] createData() {
+ @DataProvider(name = "createModifyData")
+ public Object[][] createModifyData() {
ChangeNumber cn1 = new ChangeNumber(1, (short) 0, (short) 1);
ChangeNumber cn2 = new ChangeNumber(TimeThread.getTime(),
(short) 123, (short) 45);
AttributeType type = DirectoryServer.getAttributeType("description");
- Attribute attr1 = new Attribute("description", "new value");
+ Attribute attr1 = Attributes.create("description", "new value");
Modification mod1 = new Modification(ModificationType.REPLACE, attr1);
List<Modification> mods1 = new ArrayList<Modification>();
mods1.add(mod1);
- Attribute attr2 =
- new Attribute(DirectoryServer.getAttributeType("description", true));
+ Attribute attr2 = Attributes.empty("description");
Modification mod2 = new Modification(ModificationType.DELETE, attr2);
List<Modification> mods2 = new ArrayList<Modification>();
mods2.add(mod1);
mods2.add(mod2);
+ AttributeBuilder builder = new AttributeBuilder(type);
List<Modification> mods3 = new ArrayList<Modification>();
- LinkedHashSet<AttributeValue> values3 =
- new LinkedHashSet<AttributeValue>();
- values3.add(new AttributeValue(type, "string"));
- values3.add(new AttributeValue(type, "value"));
- values3.add(new AttributeValue(type, "again"));
- Attribute attr3 = new Attribute(type, "description", values3);
+ builder.add("string");
+ builder.add("value");
+ builder.add("again");
+ Attribute attr3 = builder.toAttribute();
Modification mod3 = new Modification(ModificationType.ADD, attr3);
mods3.add(mod3);
List<Modification> mods4 = new ArrayList<Modification>();
- for (int i =0; i< 10; i++)
+ for (int i = 0; i < 10; i++)
{
- LinkedHashSet<AttributeValue> values =
- new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(type, "string" + String.valueOf(i)));
- Attribute attr = new Attribute(type, "description", values);
+ Attribute attr = Attributes.create("description", "string"
+ + String.valueOf(i));
Modification mod = new Modification(ModificationType.ADD, attr);
mods4.add(mod);
}
- Attribute attr5 = new Attribute("namingcontexts", "dc=example");
+ Attribute attr5 = Attributes.create("namingcontexts", TEST_ROOT_DN_STRING);
Modification mod5 = new Modification(ModificationType.REPLACE, attr5);
List<Modification> mods5 = new ArrayList<Modification>();
mods5.add(mod5);
return new Object[][] {
- { cn1, "dc=test", mods1},
- { cn2, "dc=cn2", mods1},
+ { cn1, "dc=test", mods1, false, AssuredMode.SAFE_DATA_MODE, (byte)0},
+ { cn2, "dc=cn2", mods1, true, AssuredMode.SAFE_READ_MODE, (byte)1},
{ cn2, "dc=test with a much longer dn in case this would "
- + "make a difference", mods1},
- { cn2, "dc=test, cn=with a, o=more complex, ou=dn", mods1},
- { cn2, "cn=use\\, backslash", mods1},
- { cn2, "dc=test with several mod", mods2},
- { cn2, "dc=test with several values", mods3},
- { cn2, "dc=test with long mod", mods4},
- { cn2, "dc=testDsaOperation", mods5},
+ + "make a difference", mods1, true, AssuredMode.SAFE_READ_MODE, (byte)3},
+ { cn2, "dc=test, cn=with a, o=more complex, ou=dn", mods1, false, AssuredMode.SAFE_READ_MODE, (byte)5},
+ { cn2, "cn=use\\, backslash", mods1, true, AssuredMode.SAFE_READ_MODE, (byte)3},
+ { cn2, "dc=test with several mod", mods2, false, AssuredMode.SAFE_DATA_MODE, (byte)16},
+ { cn2, "dc=test with several values", mods3, false, AssuredMode.SAFE_READ_MODE, (byte)3},
+ { cn2, "dc=test with long mod", mods4, true, AssuredMode.SAFE_READ_MODE, (byte)120},
+ { cn2, "dc=testDsaOperation", mods5, true, AssuredMode.SAFE_DATA_MODE, (byte)99},
};
}
-
/**
* Create a ModifyMsg from the data provided above.
* The call getBytes() to test the encoding of the Msg and
* create another ModifyMsg from the encoded byte array.
* Finally test that both Msg matches.
*/
- @Test(dataProvider = "modifyEncodeDecode")
- public void modifyEncodeDecode(ChangeNumber changeNumber,
- String rawdn, List<Modification> mods)
+ @Test(dataProvider = "createModifyData")
+ public void modifyMsgTest(ChangeNumber changeNumber,
+ String rawdn, List<Modification> mods,
+ boolean isAssured, AssuredMode assuredMode,
+ byte safeDataLevel)
throws Exception
{
DN dn = DN.decode(rawdn);
InternalClientConnection connection =
InternalClientConnection.getRootConnection();
ModifyMsg msg = new ModifyMsg(changeNumber, dn, mods, "fakeuniqueid");
- ModifyMsg generatedMsg = (ModifyMsg) ReplicationMessage
+
+ msg.setAssured(isAssured);
+ msg.setAssuredMode(assuredMode);
+ msg.setSafeDataLevel(safeDataLevel);
+
+ ModifyMsg generatedMsg = (ModifyMsg) ReplicationMsg
.generateMsg(msg.getBytes());
+ // Test that generated attributes match original attributes.
+ assertEquals(generatedMsg.isAssured(), isAssured);
+ assertEquals(generatedMsg.getAssuredMode(), assuredMode);
+ assertEquals(generatedMsg.getSafeDataLevel(), safeDataLevel);
assertEquals(msg.getChangeNumber(), generatedMsg.getChangeNumber());
@@ -189,39 +197,47 @@
assertEquals(mod1.getRawEntryDN(), mod2.getRawEntryDN());
assertEquals( mod1.getAttachment(SYNCHROCONTEXT),
mod2.getAttachment(SYNCHROCONTEXT));
- /*
- * TODO : test that the generated mod equals the original mod.
- */
-
+ assertEquals(mod1.getModifications(), mod2.getModifications());
}
/**
- * Create a Update Message from the data provided above.
+ * Create an Update Message from the data provided above.
* The call getBytes() to test the encoding of the Msg and
* create another ModifyMsg from the encoded byte array.
- * Finally test that both Msg matches.
+ * Finally test that both Msgs match.
*/
- @Test(dataProvider = "modifyEncodeDecode")
+ @Test(dataProvider = "createModifyData")
public void updateMsgTest(ChangeNumber changeNumber,
- String rawdn, List<Modification> mods)
+ String rawdn, List<Modification> mods,
+ boolean isAssured, AssuredMode assuredMode,
+ byte safeDataLevel)
throws Exception
{
DN dn = DN.decode(rawdn);
ModifyMsg msg = new ModifyMsg(changeNumber, dn, mods, "fakeuniqueid");
- // Check uuid
- assertEquals("fakeuniqueid", msg.getUniqueId());
-
// Check isAssured
assertFalse(msg.isAssured());
- msg.setAssured();
- assertTrue(msg.isAssured());
+ msg.setAssured(isAssured);
+ assertEquals(msg.isAssured(), isAssured);
+
+ // Check assured mode
+ assertEquals(msg.getAssuredMode(), AssuredMode.SAFE_DATA_MODE);
+ msg.setAssuredMode(assuredMode);
+ assertEquals(msg.getAssuredMode(), assuredMode);
+
+ // Check safe data level
+ assertTrue(msg.getSafeDataLevel() == -1);
+ msg.setSafeDataLevel(safeDataLevel);
+ assertTrue(msg.getSafeDataLevel() == safeDataLevel);
// Check equals
- ModifyMsg generatedMsg = (ModifyMsg) ReplicationMessage
+ ModifyMsg generatedMsg = (ModifyMsg) ReplicationMsg
.generateMsg(msg.getBytes());
assertFalse(msg.equals(null));
assertFalse(msg.equals(new Object()));
+
+ // Check change number
assertTrue(msg.equals(generatedMsg));
// Check hashCode
@@ -231,19 +247,30 @@
assertEquals(msg.compareTo(generatedMsg), 0);
// Check Get / Set DN
- assertTrue(dn.equals(DN.decode(msg.getDn())));
+ assertTrue(DN.decode(msg.getDn()).equals(DN.decode(generatedMsg.getDn())));
String fakeDN = "cn=fake cn";
msg.setDn(fakeDN) ;
assertEquals(msg.getDn(), fakeDN) ;
- }
+ // Check uuid
+ assertEquals(msg.getUniqueId(), generatedMsg.getUniqueId());
+
+ // Check assured flag
+ assertEquals(msg.isAssured(), generatedMsg.isAssured());
+
+ // Check assured mode
+ assertEquals(msg.getAssuredMode(), generatedMsg.getAssuredMode());
+
+ // Check safe data level
+ assertEquals(msg.getSafeDataLevel(), generatedMsg.getSafeDataLevel());
+}
/**
* Build some data for the DeleteMsg test below.
*/
- @DataProvider(name = "deleteEncodeDecode")
- public Object[][] createDelData() {
+ @DataProvider(name = "createDeleteData")
+ public Object[][] createDeleteData() {
return new Object[][] {
{"dc=com"},
{"dc=delete,dc=an,dc=entry,dc=with,dc=a,dc=long dn"},
@@ -256,8 +283,8 @@
* create another DeleteMsg from the encoded byte array.
* Finally test that both Msg matches.
*/
- @Test(dataProvider = "deleteEncodeDecode")
- public void deleteEncodeDecode(String rawDN)
+ @Test(dataProvider = "createDeleteData")
+ public void deleteMsgTest(String rawDN)
throws Exception
{
InternalClientConnection connection =
@@ -269,7 +296,7 @@
(short) 123, (short) 45);
op.setAttachment(SYNCHROCONTEXT, new DeleteContext(cn, "uniqueid"));
DeleteMsg msg = new DeleteMsg(op);
- DeleteMsg generatedMsg = (DeleteMsg) ReplicationMessage
+ DeleteMsg generatedMsg = (DeleteMsg) ReplicationMsg
.generateMsg(msg.getBytes());
assertEquals(msg.toString(), generatedMsg.toString());
@@ -285,26 +312,28 @@
assertEquals(op.getRawEntryDN(), mod2.getRawEntryDN());
// Create an update message from this op
- DeleteMsg updateMsg = (DeleteMsg) UpdateMessage.generateMsg(op, true);
+ DeleteMsg updateMsg = (DeleteMsg) UpdateMsg.generateMsg(op);
assertEquals(msg.getChangeNumber(), updateMsg.getChangeNumber());
}
- @DataProvider(name = "modifyDnEncodeDecode")
+ @DataProvider(name = "createModifyDnData")
public Object[][] createModifyDnData() {
return new Object[][] {
- {"dc=test,dc=com", "dc=new", false, "dc=change"},
- {"dc=test,dc=com", "dc=new", true, "dc=change"},
+ {"dc=test,dc=com", "dc=new", false, "dc=change", false, AssuredMode.SAFE_DATA_MODE, (byte)0},
+ {"dc=test,dc=com", "dc=new", true, "dc=change", true, AssuredMode.SAFE_READ_MODE, (byte)1},
// testNG does not like null argument so use "" for the newSuperior
// instead of null
- {"dc=test,dc=com", "dc=new", false, ""},
+ {"dc=test,dc=com", "dc=new", false, "", true, AssuredMode.SAFE_READ_MODE, (byte)3},
{"dc=delete,dc=an,dc=entry,dc=with,dc=a,dc=long dn",
- "dc=new",true, ""},
+ "dc=new",true, "", true, AssuredMode.SAFE_DATA_MODE, (byte)99},
};
}
- @Test(dataProvider = "modifyDnEncodeDecode")
- public void modifyDnEncodeDecode(String rawDN, String newRdn,
- boolean deleteOldRdn, String newSuperior)
+ @Test(dataProvider = "createModifyDnData")
+ public void modifyDnTest(String rawDN, String newRdn,
+ boolean deleteOldRdn, String newSuperior,
+ boolean isAssured, AssuredMode assuredMode,
+ byte safeDataLevel)
throws Exception
{
InternalClientConnection connection =
@@ -321,8 +350,19 @@
LocalBackendModifyDNOperation localOp =
new LocalBackendModifyDNOperation(op);
ModifyDNMsg msg = new ModifyDNMsg(localOp);
- ModifyDNMsg generatedMsg = (ModifyDNMsg) ReplicationMessage
+
+ msg.setAssured(isAssured);
+ msg.setAssuredMode(assuredMode);
+ msg.setSafeDataLevel(safeDataLevel);
+
+ ModifyDNMsg generatedMsg = (ModifyDNMsg) ReplicationMsg
.generateMsg(msg.getBytes());
+
+ // Test that generated attributes match original attributes.
+ assertEquals(generatedMsg.isAssured(), isAssured);
+ assertEquals(generatedMsg.getAssuredMode(), assuredMode);
+ assertEquals(generatedMsg.getSafeDataLevel(), safeDataLevel);
+
Operation generatedOperation = generatedMsg.createOperation(connection);
ModifyDNOperationBasis mod2 = (ModifyDNOperationBasis) generatedOperation;
@@ -333,55 +373,42 @@
assertEquals(op.getRawNewSuperior(), mod2.getRawNewSuperior());
// Create an update message from this op
- ModifyDNMsg updateMsg = (ModifyDNMsg) UpdateMessage.generateMsg(localOp,
- true);
+ ModifyDNMsg updateMsg = (ModifyDNMsg) UpdateMsg.generateMsg(localOp);
assertEquals(msg.getChangeNumber(), updateMsg.getChangeNumber());
}
- @DataProvider(name = "addEncodeDecode")
+ @DataProvider(name = "createAddData")
public Object[][] createAddData() {
return new Object[][] {
- {"dc=test,dc=com"},
- };
+ {"dc=example,dc=com", false, AssuredMode.SAFE_DATA_MODE, (byte)0},
+ {"o=test", true, AssuredMode.SAFE_READ_MODE, (byte)1},
+ {"o=group,dc=example,dc=com", true, AssuredMode.SAFE_READ_MODE, (byte)3}};
}
- @Test(dataProvider = "addEncodeDecode")
- public void addEncodeDecode(String rawDN)
+ @Test(dataProvider = "createAddData")
+ public void addMsgTest(String rawDN, boolean isAssured, AssuredMode assuredMode,
+ byte safeDataLevel)
throws Exception
{
- LinkedHashSet<AttributeValue> ocValues =
- new LinkedHashSet<AttributeValue>();
- ocValues.add(
- new AttributeValue(DirectoryServer.getObjectClassAttributeType(),
- "organization"));
- Attribute objectClass =
- new Attribute(DirectoryServer.getObjectClassAttributeType(),
- "objectClass", ocValues);
- HashMap<ObjectClass,String> objectClassList=
- new HashMap<ObjectClass,String>();
+ Attribute objectClass = Attributes.create(DirectoryServer
+ .getObjectClassAttributeType(), "organization");
+ HashMap<ObjectClass, String> objectClassList = new HashMap<ObjectClass, String>();
objectClassList.put(DirectoryServer.getObjectClass("organization"),
"organization");
- AttributeType org = DirectoryServer.getAttributeType("o", true);
ArrayList<Attribute> userAttributes = new ArrayList<Attribute>(1);
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(org, "com"));
- Attribute attr = new Attribute(org, "o", values);
+ Attribute attr = Attributes.create("o", "com");
userAttributes.add(attr);
- HashMap<AttributeType,List<Attribute>> userAttList=
- new HashMap<AttributeType,List<Attribute>>();
- userAttList.put(org,userAttributes);
+ HashMap<AttributeType, List<Attribute>> userAttList = new HashMap<AttributeType, List<Attribute>>();
+ userAttList.put(attr.getAttributeType(), userAttributes);
ArrayList<Attribute> operationalAttributes = new ArrayList<Attribute>(1);
- org = DirectoryServer.getAttributeType("creatorsname", true);
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(org, "dc=creator"));
- attr = new Attribute(org, "creatorsname", values);
+ attr = Attributes.create("creatorsname", "dc=creator");
operationalAttributes.add(attr);
HashMap<AttributeType,List<Attribute>> opList=
new HashMap<AttributeType,List<Attribute>>();
- opList.put(org,operationalAttributes);
+ opList.put(attr.getAttributeType(), operationalAttributes);
ChangeNumber cn = new ChangeNumber(TimeThread.getTime(),
(short) 123, (short) 45);
@@ -389,19 +416,40 @@
AddMsg msg = new AddMsg(cn, rawDN, "thisIsaUniqueID", "parentUniqueId",
objectClass, userAttributes,
operationalAttributes);
- AddMsg generatedMsg = (AddMsg) ReplicationMessage.generateMsg(msg
+
+ msg.setAssured(isAssured);
+ msg.setAssuredMode(assuredMode);
+ msg.setSafeDataLevel(safeDataLevel);
+
+ AddMsg generatedMsg = (AddMsg) ReplicationMsg.generateMsg(msg
.getBytes());
assertEquals(msg.getBytes(), generatedMsg.getBytes());
assertEquals(msg.toString(), generatedMsg.toString());
- // TODO : should test that generated attributes match original attributes.
+
+ // Test that generated attributes match original attributes.
+ assertEquals(generatedMsg.getParentUid(), msg.getParentUid());
+ assertEquals(generatedMsg.isAssured(), isAssured);
+ assertEquals(generatedMsg.getAssuredMode(), assuredMode);
+ assertEquals(generatedMsg.getSafeDataLevel(), safeDataLevel);
// Create an new Add Operation from the current addMsg
InternalClientConnection connection =
InternalClientConnection.getRootConnection();
- msg.createOperation(connection, rawDN) ;
- // TODO : should test that generated attributes match original attributes.
- // List<LDAPAttribute> rawAtt = addOp.getRawAttributes();
+ Operation op = msg.createOperation(connection, rawDN);
+ Operation generatedOperation = generatedMsg.createOperation(connection, rawDN);
+ assertEquals(op.getClass(), AddOperationBasis.class);
+ assertEquals(generatedOperation.getClass(), AddOperationBasis.class);
+
+ AddOperationBasis addOpBasis = (AddOperationBasis) op;
+ AddOperationBasis genAddOpBasis = (AddOperationBasis) generatedOperation;
+
+ assertEquals(addOpBasis.getRawEntryDN(), genAddOpBasis.getRawEntryDN());
+ assertEquals( addOpBasis.getAttachment(SYNCHROCONTEXT),
+ genAddOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals(addOpBasis.getObjectClasses(), genAddOpBasis.getObjectClasses());
+ assertEquals(addOpBasis.getOperationalAttributes(), genAddOpBasis.getOperationalAttributes());
+ assertEquals(addOpBasis.getUserAttributes(), genAddOpBasis.getUserAttributes());
assertEquals(msg.getBytes(), generatedMsg.getBytes());
assertEquals(msg.toString(), generatedMsg.toString());
@@ -409,64 +457,108 @@
//Create an Add operation and generate and Add msg from it
DN dn = DN.decode(rawDN);
- AddOperation addOpBasis = new AddOperationBasis(connection,
+ AddOperation addOpB = new AddOperationBasis(connection,
(long) 1, 1, null, dn, objectClassList, userAttList, opList);
- LocalBackendAddOperation addOp = new LocalBackendAddOperation(addOpBasis);
+ LocalBackendAddOperation addOp = new LocalBackendAddOperation(addOpB);
OperationContext opCtx = new AddContext(cn, "thisIsaUniqueID",
"parentUniqueId");
addOp.setAttachment(SYNCHROCONTEXT, opCtx);
generatedMsg = new AddMsg(addOp);
+
+ generatedMsg.setAssured(isAssured);
+ generatedMsg.setAssuredMode(assuredMode);
+ generatedMsg.setSafeDataLevel(safeDataLevel);
+
assertEquals(msg.getBytes(), generatedMsg.getBytes());
assertEquals(msg.toString(), generatedMsg.toString());
// TODO : should test that generated attributes match original attributes.
// Create an update message from this op
- AddMsg updateMsg = (AddMsg) UpdateMessage.generateMsg(addOp, true);
+ AddMsg updateMsg = (AddMsg) UpdateMsg.generateMsg(addOp);
assertEquals(msg.getChangeNumber(), updateMsg.getChangeNumber());
-
-
}
/**
* Build some data for the AckMsg test below.
*/
- @DataProvider(name = "ackMsg")
+ @DataProvider(name = "createAckData")
public Object[][] createAckData() {
ChangeNumber cn1 = new ChangeNumber(1, (short) 0, (short) 1);
ChangeNumber cn2 = new ChangeNumber(TimeThread.getTime(),
(short) 123, (short) 45);
+ ArrayList<Short> fservers1 = new ArrayList<Short>();
+ fservers1.add(new Short((short)12345));
+ fservers1.add(new Short((short)-12345));
+ fservers1.add(new Short((short)31657));
+ fservers1.add(new Short((short)-28456));
+ fservers1.add(new Short((short)0));
+ ArrayList<Short> fservers2 = new ArrayList<Short>();
+ ArrayList<Short> fservers3 = new ArrayList<Short>();
+ fservers3.add(new Short((short)0));
+ ArrayList<Short> fservers4 = new ArrayList<Short>();
+ fservers4.add(new Short((short)100));
+ fservers4.add(new Short((short)2000));
+ fservers4.add(new Short((short)30000));
+ fservers4.add(new Short((short)-100));
+ fservers4.add(new Short((short)-2000));
+ fservers4.add(new Short((short)-30000));
+
return new Object[][] {
- {cn1},
- {cn2}
+ {cn1, true, false, false, fservers1},
+ {cn2, false, true, false, fservers2},
+ {cn1, false, false, true, fservers3},
+ {cn2, false, false, false, fservers4},
+ {cn1, true, true, false, fservers1},
+ {cn2, false, true, true, fservers2},
+ {cn1, true, false, true, fservers3},
+ {cn2, true, true, true, fservers4}
};
}
- @Test(dataProvider = "ackMsg")
- public void ackMsg(ChangeNumber cn)
+ @Test(dataProvider = "createAckData")
+ public void ackMsgTest(ChangeNumber cn, boolean hasTimeout, boolean hasWrongStatus,
+ boolean hasReplayError, List<Short> failedServers)
throws Exception
{
- AckMessage msg1, msg2 ;
+ AckMsg msg1, msg2 ;
// Consctructor test (with ChangeNumber)
// Chech that retrieved CN is OK
- msg1 = new AckMessage(cn);
+ msg1 = new AckMsg(cn);
assertEquals(msg1.getChangeNumber().compareTo(cn), 0);
+ // Check default values for error info
+ assertFalse(msg1.hasTimeout());
+ assertFalse(msg1.hasWrongStatus());
+ assertFalse(msg1.hasReplayError());
+ assertTrue(msg1.getFailedServers().size() == 0);
+
+ // Check constructor with error info
+ msg1 = new AckMsg(cn, hasTimeout, hasWrongStatus, hasReplayError, failedServers);
+ assertEquals(msg1.getChangeNumber().compareTo(cn), 0);
+ assertTrue(msg1.hasTimeout() == hasTimeout);
+ assertTrue(msg1.hasWrongStatus() == hasWrongStatus);
+ assertTrue(msg1.hasReplayError() == hasReplayError);
+ assertEquals(msg1.getFailedServers(), failedServers);
+
// Consctructor test (with byte[])
- // Check that retrieved CN is OK
- msg2 = new AckMessage(msg1.getBytes());
+ msg2 = new AckMsg(msg1.getBytes());
assertEquals(msg2.getChangeNumber().compareTo(cn), 0);
+ assertTrue(msg1.hasTimeout() == msg2.hasTimeout());
+ assertTrue(msg1.hasWrongStatus() == msg2.hasWrongStatus());
+ assertTrue(msg1.hasReplayError() == msg2.hasReplayError());
+ assertEquals(msg1.getFailedServers(), msg2.getFailedServers());
// Check invalid bytes for constructor
byte[] b = msg1.getBytes();
- b[0] = ReplicationMessage.MSG_TYPE_ADD_REQUEST ;
+ b[0] = ReplicationMsg.MSG_TYPE_ADD;
try
{
// This should generated an exception
- msg2 = new AckMessage(b);
+ msg2 = new AckMsg(b);
assertTrue(false);
}
catch (DataFormatException e)
@@ -475,29 +567,37 @@
}
// Check that retrieved CN is OK
- msg2 = (AckMessage) ReplicationMessage.generateMsg(msg1.getBytes());
+ msg2 = (AckMsg) ReplicationMsg.generateMsg(msg1.getBytes());
}
- @DataProvider(name="serverStart")
- public Object [][] createServerStartMessageTestData() throws Exception
+ @DataProvider(name="createServerStartData")
+ public Object [][] createServerStartData() throws Exception
{
- DN baseDN = DN.decode("dc=example, dc=com");
+ DN baseDN = DN.decode(TEST_ROOT_DN_STRING);
ServerState state = new ServerState();
- return new Object [][] { {(short)1, baseDN, 100, state} };
+ state.update(new ChangeNumber((long)0, 0,(short)0));
+ Object[] set1 = new Object[] {(short)1, baseDN, 0, state, 0L, false, (byte)0};
+
+ baseDN = DN.decode(TEST_ROOT_DN_STRING);
+ state = new ServerState();
+ state.update(new ChangeNumber((long)75, 5,(short)263));
+ Object[] set2 = new Object[] {(short)16, baseDN, 100, state, 1248L, true, (byte)31};
+
+ return new Object [][] { set1, set2 };
}
+
/**
- * Test that ServerStartMessage encoding and decoding works
- * by checking that : msg == new ServerStartMessage(msg.getBytes()).
+ * Test that ServerStartMsg encoding and decoding works
+ * by checking that : msg == new ServerStartMsg(msg.getBytes()).
*/
- @Test(dataProvider="serverStart")
- public void serverStartMessageTest(short serverId, DN baseDN, int window,
- ServerState state) throws Exception
+ @Test(dataProvider="createServerStartData")
+ public void serverStartMsgTest(short serverId, DN baseDN, int window,
+ ServerState state, long genId, boolean sslEncryption, byte groupId) throws Exception
{
- state.update(new ChangeNumber((long)1, 1,(short)1));
- ServerStartMessage msg = new ServerStartMessage(serverId, baseDN,
- window, window, window, window, window, window, state, (short)1,
- (long)1, true, false);
- ServerStartMessage newMsg = new ServerStartMessage(msg.getBytes());
+ ServerStartMsg msg = new ServerStartMsg(serverId, baseDN,
+ window, window, window, window, window, window, state,
+ ProtocolVersion.getCurrentVersion(), genId, sslEncryption, groupId);
+ ServerStartMsg newMsg = new ServerStartMsg(msg.getBytes());
assertEquals(msg.getServerId(), newMsg.getServerId());
assertEquals(msg.getBaseDn(), newMsg.getBaseDn());
assertEquals(msg.getMaxReceiveDelay(), newMsg.getMaxReceiveDelay());
@@ -511,29 +611,37 @@
newMsg.getServerState().getMaxChangeNumber((short)1));
assertEquals(msg.getVersion(), newMsg.getVersion());
assertEquals(msg.getGenerationId(), newMsg.getGenerationId());
- assertEquals(msg.isHandshakeOnly(), newMsg.isHandshakeOnly());
+ assertTrue(msg.getGroupId() == newMsg.getGroupId());
}
- @DataProvider(name="changelogStart")
- public Object [][] createChangelogStartMessageTestData() throws Exception
+ @DataProvider(name="createReplServerStartData")
+ public Object [][] createReplServerStartData() throws Exception
{
- DN baseDN = DN.decode("dc=example, dc=com");
+ DN baseDN = DN.decode(TEST_ROOT_DN_STRING);
ServerState state = new ServerState();
- return new Object [][] { {(short)1, baseDN, 100, "localhost:8989", state} };
+ state.update(new ChangeNumber((long)0, 0,(short)0));
+ Object[] set1 = new Object[] {(short)1, baseDN, 0, "localhost:8989", state, 0L, (byte)0, 0};
+
+ baseDN = DN.decode(TEST_ROOT_DN_STRING);
+ state = new ServerState();
+ state.update(new ChangeNumber((long)75, 5,(short)263));
+ Object[] set2 = new Object[] {(short)16, baseDN, 100, "anotherHost:1025", state, 1245L, (byte)25, 3456};
+
+ return new Object [][] { set1, set2 };
}
/**
- * Test that changelogStartMessage encoding and decoding works
- * by checking that : msg == new ReplServerStartMessage(msg.getBytes()).
+ * Test that ReplServerStartMsg encoding and decoding works
+ * by checking that : msg == new ReplServerStartMsg(msg.getBytes()).
*/
- @Test(dataProvider="changelogStart")
- public void replserverStartMessageTest(short serverId, DN baseDN, int window,
- String url, ServerState state) throws Exception
+ @Test(dataProvider="createReplServerStartData")
+ public void replServerStartMsgTest(short serverId, DN baseDN, int window,
+ String url, ServerState state, long genId, byte groupId, int degTh) throws Exception
{
- state.update(new ChangeNumber((long)1, 1,(short)1));
- ReplServerStartMessage msg = new ReplServerStartMessage(serverId,
- url, baseDN, window, state, (short)1, (long)1, true);
- ReplServerStartMessage newMsg = new ReplServerStartMessage(msg.getBytes());
+ ReplServerStartMsg msg = new ReplServerStartMsg(serverId,
+ url, baseDN, window, state, ProtocolVersion.getCurrentVersion(), genId,
+ true, groupId, degTh);
+ ReplServerStartMsg newMsg = new ReplServerStartMsg(msg.getBytes());
assertEquals(msg.getServerId(), newMsg.getServerId());
assertEquals(msg.getServerURL(), newMsg.getServerURL());
assertEquals(msg.getBaseDn(), newMsg.getBaseDn());
@@ -543,53 +651,238 @@
assertEquals(msg.getVersion(), newMsg.getVersion());
assertEquals(msg.getGenerationId(), newMsg.getGenerationId());
assertEquals(msg.getSSLEncryption(), newMsg.getSSLEncryption());
+ assertTrue(msg.getGroupId() == newMsg.getGroupId());
+ assertTrue(msg.getDegradedStatusThreshold() ==
+ newMsg.getDegradedStatusThreshold());
}
/**
- * Test that WindowMessageTest encoding and decoding works
- * by checking that : msg == new WindowMessage(msg.getBytes()).
+ * Test that WindowMsg encoding and decoding works
+ * by checking that : msg == new WindowMsg(msg.getBytes()).
*/
@Test()
- public void windowMessageTest() throws Exception
+ public void windowMsgTest() throws Exception
{
- WindowMessage msg = new WindowMessage(123);
- WindowMessage newMsg = new WindowMessage(msg.getBytes());
+ WindowMsg msg = new WindowMsg(123);
+ WindowMsg newMsg = new WindowMsg(msg.getBytes());
assertEquals(msg.getNumAck(), newMsg.getNumAck());
}
/**
- * Test that WindowProbe encoding and decoding works
- * by checking that : new WindowProbe(msg.getBytes()) does not throws
+ * Test that WindowProbeMsg encoding and decoding works
+ * by checking that : new WindowProbeMsg(msg.getBytes()) does not throws
* an exception.
*/
@Test()
- public void windowProbeTest() throws Exception
+ public void windowProbeMsgTest() throws Exception
{
- WindowProbe msg = new WindowProbe();
- new WindowProbe(msg.getBytes());
+ WindowProbeMsg msg = new WindowProbeMsg();
+ new WindowProbeMsg(msg.getBytes());
+ }
+
+ @DataProvider(name="createTopologyData")
+ public Object [][] createTopologyData() throws Exception
+ {
+ List<String> urls1 = new ArrayList<String>();
+ urls1.add("ldap://ldap.iplanet.com/" + TEST_ROOT_DN_STRING + "??sub?(sn=Jensen)");
+ urls1.add("ldaps://ldap.iplanet.com:4041/uid=bjensen,ou=People," +
+ TEST_ROOT_DN_STRING + "?cn,mail,telephoneNumber");
+
+ List<String> urls2 = new ArrayList<String>();
+
+ List<String> urls3 = new ArrayList<String>();
+ urls3.add("ldaps://host:port/dc=foo??sub?(sn=One Entry)");
+
+ List<String> urls4 = new ArrayList<String>();
+ urls4.add("ldaps://host:port/dc=foobar1??sub?(sn=Another Entry 1)");
+ urls4.add("ldaps://host:port/dc=foobar2??sub?(sn=Another Entry 2)");
+
+ DSInfo dsInfo1 = new DSInfo((short)13, (short)26, (long)154631, ServerStatus.FULL_UPDATE_STATUS,
+ false, AssuredMode.SAFE_DATA_MODE, (byte)12, (byte)132, urls1);
+
+ DSInfo dsInfo2 = new DSInfo((short)-436, (short)493, (long)-227896, ServerStatus.DEGRADED_STATUS,
+ true, AssuredMode.SAFE_READ_MODE, (byte)-7, (byte)-265, urls2);
+
+ DSInfo dsInfo3 = new DSInfo((short)2436, (short)591, (long)0, ServerStatus.NORMAL_STATUS,
+ false, AssuredMode.SAFE_READ_MODE, (byte)17, (byte)0, urls3);
+
+ DSInfo dsInfo4 = new DSInfo((short)415, (short)146, (long)0, ServerStatus.BAD_GEN_ID_STATUS,
+ true, AssuredMode.SAFE_DATA_MODE, (byte)2, (byte)15, urls4);
+
+ List<DSInfo> dsList1 = new ArrayList<DSInfo>();
+ dsList1.add(dsInfo1);
+
+ List<DSInfo> dsList2 = new ArrayList<DSInfo>();
+
+ List<DSInfo> dsList3 = new ArrayList<DSInfo>();
+ dsList3.add(dsInfo2);
+
+ List<DSInfo> dsList4 = new ArrayList<DSInfo>();
+ dsList4.add(dsInfo4);
+ dsList4.add(dsInfo3);
+ dsList4.add(dsInfo2);
+ dsList4.add(dsInfo1);
+
+ RSInfo rsInfo1 = new RSInfo((short)4527, (long)45316, (byte)103);
+
+ RSInfo rsInfo2 = new RSInfo((short)4527, (long)0, (byte)0);
+
+ RSInfo rsInfo3 = new RSInfo((short)0, (long)-21113, (byte)98);
+
+ List<RSInfo> rsList1 = new ArrayList<RSInfo>();
+ rsList1.add(rsInfo1);
+
+ List<RSInfo> rsList2 = new ArrayList<RSInfo>();
+ rsList2.add(rsInfo1);
+ rsList2.add(rsInfo2);
+ rsList2.add(rsInfo3);
+
+ return new Object [][] {
+ {dsList1, rsList1},
+ {dsList2, rsList2},
+ {dsList3, rsList1},
+ {dsList3, null},
+ {null, rsList1},
+ {null, null},
+ {dsList4, rsList2}
+ };
}
/**
- * Test ReplServerInfoMessage encoding and decoding.
+ * Test TopologyMsg encoding and decoding.
*/
- @Test()
- public void replServerInfoMessageTest() throws Exception
+ @Test(dataProvider = "createTopologyData")
+ public void topologyMsgTest(List<DSInfo> dsList, List<RSInfo> rsList)
+ throws Exception
{
- List<String> connectedServers = new ArrayList<String>(0);
- connectedServers.add("s1");
- connectedServers.add("s2");
- ReplServerInfoMessage msg =
- new ReplServerInfoMessage(connectedServers, 13);
- ReplServerInfoMessage newMsg = new ReplServerInfoMessage(msg.getBytes());
- assertEquals(msg.getConnectedServers(), newMsg.getConnectedServers());
+ TopologyMsg msg = new TopologyMsg(dsList, rsList);
+ TopologyMsg newMsg = new TopologyMsg(msg.getBytes());
+ assertEquals(msg.getDsList(), newMsg.getDsList());
+ assertEquals(msg.getRsList(), newMsg.getRsList());
+ }
+
+ /**
+ * Provider for the StartSessionMsg test.
+ */
+ @DataProvider(name = "createStartSessionData")
+ public Object[][] createStartSessionData()
+ {
+ List<String> urls1 = new ArrayList<String>();
+ urls1.add("ldap://ldap.iplanet.com/" + TEST_ROOT_DN_STRING + "??sub?(sn=Jensen)");
+ urls1.add("ldaps://ldap.iplanet.com:4041/uid=bjensen,ou=People," +
+ TEST_ROOT_DN_STRING + "?cn,mail,telephoneNumber");
+
+ List<String> urls2 = new ArrayList<String>();
+ urls2.add("ldap://ldap.example.com/" + TEST_ROOT_DN_STRING + "?objectClass?one");
+ urls2.add("ldap://host.example.com/ou=people," + TEST_ROOT_DN_STRING + "???(sn=a*)");
+
+ List<String> urls3 = new ArrayList<String>();
+ urls3.add("ldaps://host:port/dc=foo??sub?(sn=John Doe)");
+ urls3.add("ldap://jnumail1.state.ak.us/o=state.ak.us?mail,departmentnumber"
+ + "?sub?(&(departmentnumber=04*) (l=Juneau))");
+
+ List<String> urls4 = new ArrayList<String>();
+
+ List<String> urls5 = new ArrayList<String>();
+ urls5.add("ldaps://host:port/dc=foo??sub?(sn=One Entry)");
+
+ List<String> urls6 = new ArrayList<String>();
+ urls6.add("ldaps://host:port/dc=foo??sub?(sn=One Entry)");
+ urls6.add("ldaps://host:port/dc=foo??sub?(sn=Second Entry)");
+ urls6.add("ldaps://host:port/dc=foo??sub?(sn=Third Entry)");
+ urls6.add("ldaps://host:port/dc=foo??sub?(sn=Fourth Entry)");
+ urls6.add("ldaps://host:port/dc=foo??sub?(sn=Fifth Entry)");
+
+ return new Object[][]{
+ {ServerStatus.NORMAL_STATUS, urls1, true, AssuredMode.SAFE_DATA_MODE, (byte)1},
+ {ServerStatus.DEGRADED_STATUS, urls2, false, AssuredMode.SAFE_READ_MODE, (byte)123},
+ {ServerStatus.FULL_UPDATE_STATUS, urls3, false, AssuredMode.SAFE_DATA_MODE, (byte)111},
+ {ServerStatus.NORMAL_STATUS, urls4, true, AssuredMode.SAFE_READ_MODE, (byte)-1},
+ {ServerStatus.DEGRADED_STATUS, urls5, true, AssuredMode.SAFE_DATA_MODE, (byte)97},
+ {ServerStatus.FULL_UPDATE_STATUS, urls6, false, AssuredMode.SAFE_READ_MODE, (byte)-13}
+ };
+ }
+
+ /**
+ * Test StartSessionMsg encoding and decoding.
+ */
+ @Test(dataProvider = "createStartSessionData")
+ public void startSessionMsgTest(ServerStatus status, List<String> refUrls,
+ boolean assuredFlag, AssuredMode assuredMode, byte safedataLevel)
+ throws Exception
+ {
+ StartSessionMsg msg = new StartSessionMsg(status, refUrls, assuredFlag,
+ assuredMode, safedataLevel);
+ StartSessionMsg newMsg = new StartSessionMsg(msg.getBytes());
+ assertEquals(msg.getStatus(), newMsg.getStatus());
+ assertTrue(msg.isAssured() == newMsg.isAssured());
+ assertEquals(msg.getAssuredMode(), newMsg.getAssuredMode());
+ assertTrue(msg.getSafeDataLevel() == newMsg.getSafeDataLevel());
+ assertEquals(msg.getReferralsURLs(), newMsg.getReferralsURLs());
+ }
+
+ /**
+ * Provider for the ChangeStatusMsg test
+ */
+ @DataProvider(name = "createChangeStatusData")
+ public Object[][] createChangeStatusData()
+ {
+ return new Object[][]{
+ {ServerStatus.NORMAL_STATUS, ServerStatus.FULL_UPDATE_STATUS},
+ {ServerStatus.DEGRADED_STATUS, ServerStatus.NORMAL_STATUS},
+ {ServerStatus.FULL_UPDATE_STATUS, ServerStatus.DEGRADED_STATUS}
+ };
+ }
+
+ /**
+ * Test ChangeStatusMsg encoding and decoding.
+ */
+ @Test(dataProvider = "createChangeStatusData")
+ public void changeStatusMsgTest(ServerStatus reqStatus, ServerStatus newStatus)
+ throws Exception
+ {
+ ChangeStatusMsg msg = new ChangeStatusMsg(reqStatus, newStatus);
+ ChangeStatusMsg newMsg = new ChangeStatusMsg(msg.getBytes());
+ assertEquals(msg.getRequestedStatus(), newMsg.getRequestedStatus());
+ assertEquals(msg.getNewStatus(), newMsg.getNewStatus());
+ }
+
+ /**
+ * Test HeartbeatMsg encoding and decoding.
+ */
+ @Test
+ public void heartbeatMsgTest() throws Exception
+ {
+ HeartbeatMsg msg = new HeartbeatMsg();
+ HeartbeatMsg newMsg = new HeartbeatMsg(msg.getBytes());
+ }
+
+ /**
+ * Test ResetGenerationIdMsg encoding and decoding.
+ */
+ @Test
+ public void resetGenerationIdMsgTest() throws Exception
+ {
+ ResetGenerationIdMsg msg = new ResetGenerationIdMsg(23657);
+ ResetGenerationIdMsg newMsg = new ResetGenerationIdMsg(msg.getBytes());
assertEquals(msg.getGenerationId(), newMsg.getGenerationId());
}
+
+ /**
+ * Test MonitorRequestMsg encoding and decoding.
+ */
+ @Test
+ public void monitorRequestMsgTest() throws Exception
+ {
+ MonitorRequestMsg msg = new MonitorRequestMsg((short)1,(short)2);
+ MonitorRequestMsg newMsg = new MonitorRequestMsg(msg.getBytes());
+ }
/**
- * Test MonitorMessage
+ * Test MonitorMsg.
*/
@Test()
- public void monitorMessageTest() throws Exception
+ public void monitorMsgTest() throws Exception
{
short sender = 2;
short dest = 3;
@@ -622,15 +915,15 @@
(short) 123, sid3);
s3.update(cn3);
- MonitorMessage msg =
- new MonitorMessage(sender, dest);
+ MonitorMsg msg =
+ new MonitorMsg(sender, dest);
msg.setReplServerDbState(rsState);
msg.setServerState(sid1, s1, now+1, true);
msg.setServerState(sid2, s2, now+2, true);
msg.setServerState(sid3, s3, now+3, false);
byte[] b = msg.getBytes();
- MonitorMessage newMsg = new MonitorMessage(b);
+ MonitorMsg newMsg = new MonitorMsg(b);
assertEquals(rsState, msg.getReplServerDbState());
assertEquals(newMsg.getReplServerDbState().toString(),
@@ -678,11 +971,11 @@
}
/**
- * Test that EntryMessage encoding and decoding works
+ * Test that EntryMsg encoding and decoding works
* by checking that : msg == new EntryMessageTest(msg.getBytes()).
*/
@Test()
- public void entryMessageTest() throws Exception
+ public void entryMsgTest() throws Exception
{
String taskInitFromS2 = new String(
"dn: ds-task-id=" + UUID.randomUUID() +
@@ -690,50 +983,50 @@
"objectclass: top\n" +
"objectclass: ds-task\n" +
"objectclass: ds-task-initialize\n" +
- "ds-task-class-name: org.opends.server.tasks.InitializeTask" +
- "ds-task-initialize-domain-dn: dc=example,dc=com" +
- "ds-task-initialize-source: 1");
+ "ds-task-class-name: org.opends.server.tasks.InitializeTask\n" +
+ "ds-task-initialize-domain-dn: " + TEST_ROOT_DN_STRING + "\n" +
+ "ds-task-initialize-source: 1\n");
short sender = 1;
short target = 2;
byte[] entry = taskInitFromS2.getBytes();
- EntryMessage msg = new EntryMessage(sender, target, entry);
- EntryMessage newMsg = new EntryMessage(msg.getBytes());
+ EntryMsg msg = new EntryMsg(sender, target, entry);
+ EntryMsg newMsg = new EntryMsg(msg.getBytes());
assertEquals(msg.getsenderID(), newMsg.getsenderID());
assertEquals(msg.getDestination(), newMsg.getDestination());
assertEquals(msg.getEntryBytes(), newMsg.getEntryBytes());
}
/**
- * Test that InitializeRequestMessage encoding and decoding works
+ * Test that InitializeRequestMsg encoding and decoding works
*/
@Test()
- public void initializeRequestMessageTest() throws Exception
+ public void initializeRequestMsgTest() throws Exception
{
short sender = 1;
short target = 2;
- InitializeRequestMessage msg = new InitializeRequestMessage(
- DN.decode("dc=example"), sender, target);
- InitializeRequestMessage newMsg = new InitializeRequestMessage(msg.getBytes());
+ InitializeRequestMsg msg = new InitializeRequestMsg(
+ DN.decode(TEST_ROOT_DN_STRING), sender, target);
+ InitializeRequestMsg newMsg = new InitializeRequestMsg(msg.getBytes());
assertEquals(msg.getsenderID(), newMsg.getsenderID());
assertEquals(msg.getDestination(), newMsg.getDestination());
assertTrue(msg.getBaseDn().equals(newMsg.getBaseDn()));
}
/**
- * Test that InitializeTargetMessage encoding and decoding works
+ * Test that InitializeTargetMsg encoding and decoding works
*/
@Test()
- public void initializeTargetMessageTest() throws Exception
+ public void initializeTargetMsgTest() throws Exception
{
short senderID = 1;
short targetID = 2;
short requestorID = 3;
long entryCount = 4;
- DN baseDN = DN.decode("dc=example");
+ DN baseDN = DN.decode(TEST_ROOT_DN_STRING);
- InitializeTargetMessage msg = new InitializeTargetMessage(
+ InitializeTargetMsg msg = new InitializeTargetMsg(
baseDN, senderID, targetID, requestorID, entryCount);
- InitializeTargetMessage newMsg = new InitializeTargetMessage(msg.getBytes());
+ InitializeTargetMsg newMsg = new InitializeTargetMsg(msg.getBytes());
assertEquals(msg.getsenderID(), newMsg.getsenderID());
assertEquals(msg.getDestination(), newMsg.getDestination());
assertEquals(msg.getRequestorID(), newMsg.getRequestorID());
@@ -749,25 +1042,25 @@
}
/**
- * Test that DoneMessage encoding and decoding works
+ * Test that DoneMsg encoding and decoding works
*/
@Test()
- public void doneMessageTest() throws Exception
+ public void doneMsgTest() throws Exception
{
- DoneMessage msg = new DoneMessage((short)1, (short)2);
- DoneMessage newMsg = new DoneMessage(msg.getBytes());
+ DoneMsg msg = new DoneMsg((short)1, (short)2);
+ DoneMsg newMsg = new DoneMsg(msg.getBytes());
assertEquals(msg.getsenderID(), newMsg.getsenderID());
assertEquals(msg.getDestination(), newMsg.getDestination());
}
/**
- * Test that ErrorMessage encoding and decoding works
+ * Test that ErrorMsg encoding and decoding works
*/
@Test()
- public void errorMessageTest() throws Exception
+ public void errorMsgTest() throws Exception
{
- ErrorMessage msg = new ErrorMessage((short)1, (short)2, Message.raw("details"));
- ErrorMessage newMsg = new ErrorMessage(msg.getBytes());
+ ErrorMsg msg = new ErrorMsg((short)1, (short)2, Message.raw("details"));
+ ErrorMsg newMsg = new ErrorMsg(msg.getBytes());
assertEquals(msg.getsenderID(), newMsg.getsenderID());
assertEquals(msg.getDestination(), newMsg.getDestination());
assertEquals(msg.getMsgID(), newMsg.getMsgID());
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/DbHandlerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/DbHandlerTest.java
index 05ceca0..6861761 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/DbHandlerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/DbHandlerTest.java
@@ -37,6 +37,7 @@
import org.opends.server.types.DN;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
+import static org.opends.server.TestCaseUtils.*;
/**
* Test the dbHandler class
@@ -46,77 +47,89 @@
@Test()
void testDbHandlerTrim() throws Exception
{
- TestCaseUtils.startServer();
-
- // find a free port for the replicationServer
- ServerSocket socket = TestCaseUtils.bindFreePort();
- int changelogPort = socket.getLocalPort();
- socket.close();
-
- // configure a ReplicationServer.
- ReplServerFakeConfiguration conf =
- new ReplServerFakeConfiguration(changelogPort, null, 0,
- 2, 0, 100, null);
- ReplicationServer replicationServer = new ReplicationServer(conf);
-
- // create or clean a directory for the dbHandler
- String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
- String path = buildRoot + File.separator + "build" + File.separator +
- "unit-tests" + File.separator + "dbHandler";
- File testRoot = new File(path);
- if (testRoot.exists())
+ File testRoot = null;
+ ReplicationServer replicationServer = null;
+ ReplicationDbEnv dbEnv = null;
+ DbHandler handler = null;
+ try
{
- TestCaseUtils.deleteDirectory(testRoot);
- }
- testRoot.mkdirs();
+ TestCaseUtils.startServer();
- ReplicationDbEnv dbEnv = new ReplicationDbEnv(path, replicationServer);
+ // find a free port for the replicationServer
+ ServerSocket socket = TestCaseUtils.bindFreePort();
+ int changelogPort = socket.getLocalPort();
+ socket.close();
- DbHandler handler =
- new DbHandler(
- (short) 1, DN.decode("o=test"), replicationServer, dbEnv, 5000);
+ // configure a ReplicationServer.
+ ReplServerFakeConfiguration conf =
+ new ReplServerFakeConfiguration(changelogPort, null, 0,
+ 2, 0, 100, null);
+ replicationServer = new ReplicationServer(conf);
- ChangeNumberGenerator gen = new ChangeNumberGenerator((short)1, 0);
- ChangeNumber changeNumber1 = gen.newChangeNumber();
- ChangeNumber changeNumber2 = gen.newChangeNumber();
- ChangeNumber changeNumber3 = gen.newChangeNumber();
+ // create or clean a directory for the dbHandler
+ String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
+ String path = buildRoot + File.separator + "build" + File.separator +
+ "unit-tests" + File.separator + "dbHandler";
+ testRoot = new File(path);
+ if (testRoot.exists())
+ {
+ TestCaseUtils.deleteDirectory(testRoot);
+ }
+ testRoot.mkdirs();
- DeleteMsg update1 = new DeleteMsg("o=test", changeNumber1, "uid");
- DeleteMsg update2 = new DeleteMsg("o=test", changeNumber2, "uid");
- DeleteMsg update3 = new DeleteMsg("o=test", changeNumber3, "uid");
+ dbEnv = new ReplicationDbEnv(path, replicationServer);
- handler.add(update1);
- handler.add(update2);
- handler.add(update3);
+ handler = new DbHandler((short) 1, DN.decode(TEST_ROOT_DN_STRING),
+ replicationServer, dbEnv, 5000);
- // The ChangeNumber should not get purged
- assertEquals(changeNumber1, handler.getFirstChange());
- assertEquals(changeNumber3, handler.getLastChange());
+ ChangeNumberGenerator gen = new ChangeNumberGenerator((short) 1, 0);
+ ChangeNumber changeNumber1 = gen.newChangeNumber();
+ ChangeNumber changeNumber2 = gen.newChangeNumber();
+ ChangeNumber changeNumber3 = gen.newChangeNumber();
- handler.setPurgeDelay(1);
+ DeleteMsg update1 = new DeleteMsg(TEST_ROOT_DN_STRING, changeNumber1,
+ "uid");
+ DeleteMsg update2 = new DeleteMsg(TEST_ROOT_DN_STRING, changeNumber2,
+ "uid");
+ DeleteMsg update3 = new DeleteMsg(TEST_ROOT_DN_STRING, changeNumber3,
+ "uid");
- boolean purged = false;
- int count = 300; // wait at most 60 seconds
- while (!purged && (count>0))
- {
- ChangeNumber firstChange = handler.getFirstChange();
- ChangeNumber lastChange = handler.getLastChange();
- if ((!firstChange.equals(changeNumber3) ||
+ handler.add(update1);
+ handler.add(update2);
+ handler.add(update3);
+
+ // The ChangeNumber should not get purged
+ assertEquals(changeNumber1, handler.getFirstChange());
+ assertEquals(changeNumber3, handler.getLastChange());
+
+ handler.setPurgeDelay(1);
+
+ boolean purged = false;
+ int count = 300; // wait at most 60 seconds
+ while (!purged && (count > 0))
+ {
+ ChangeNumber firstChange = handler.getFirstChange();
+ ChangeNumber lastChange = handler.getLastChange();
+ if ((!firstChange.equals(changeNumber3) ||
(!lastChange.equals(changeNumber3))))
- {
- TestCaseUtils.sleep(100);
+ {
+ TestCaseUtils.sleep(100);
+ } else
+ {
+ purged = true;
+ }
}
- else
- {
- purged = true;
- }
+ } finally
+ {
+ if (handler != null)
+ handler.shutdown();
+ if (dbEnv != null)
+ dbEnv.shutdown();
+ if (replicationServer != null)
+ replicationServer.remove();
+ if (testRoot != null)
+ TestCaseUtils.deleteDirectory(testRoot);
}
-
- handler.shutdown();
- dbEnv.shutdown();
- replicationServer.shutdown();
-
- TestCaseUtils.deleteDirectory(testRoot);
}
/*
@@ -127,68 +140,81 @@
@Test()
void testDbHandlerClear() throws Exception
{
- TestCaseUtils.startServer();
-
- // find a free port for the replicationServer
- ServerSocket socket = TestCaseUtils.bindFreePort();
- int changelogPort = socket.getLocalPort();
- socket.close();
-
- // configure a ReplicationServer.
- ReplServerFakeConfiguration conf =
- new ReplServerFakeConfiguration(changelogPort, null, 0,
- 2, 0, 100, null);
- ReplicationServer replicationServer = new ReplicationServer(conf);
-
- // create or clean a directory for the dbHandler
- String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
- String path = buildRoot + File.separator + "build" + File.separator +
- "unit-tests" + File.separator + "dbHandler";
- File testRoot = new File(path);
- if (testRoot.exists())
+ File testRoot = null;
+ ReplicationServer replicationServer = null;
+ ReplicationDbEnv dbEnv = null;
+ DbHandler handler = null;
+ try
{
- TestCaseUtils.deleteDirectory(testRoot);
+ TestCaseUtils.startServer();
+
+ // find a free port for the replicationServer
+ ServerSocket socket = TestCaseUtils.bindFreePort();
+ int changelogPort = socket.getLocalPort();
+ socket.close();
+
+ // configure a ReplicationServer.
+ ReplServerFakeConfiguration conf =
+ new ReplServerFakeConfiguration(changelogPort, null, 0,
+ 2, 0, 100, null);
+ replicationServer = new ReplicationServer(conf);
+
+ // create or clean a directory for the dbHandler
+ String buildRoot = System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT);
+ String path = buildRoot + File.separator + "build" + File.separator +
+ "unit-tests" + File.separator + "dbHandler";
+ testRoot = new File(path);
+ if (testRoot.exists())
+ {
+ TestCaseUtils.deleteDirectory(testRoot);
+ }
+ testRoot.mkdirs();
+
+ dbEnv = new ReplicationDbEnv(path, replicationServer);
+
+ handler =
+ new DbHandler((short) 1, DN.decode(TEST_ROOT_DN_STRING),
+ replicationServer, dbEnv, 5000);
+
+ // Creates changes added to the dbHandler
+ ChangeNumberGenerator gen = new ChangeNumberGenerator((short) 1, 0);
+ ChangeNumber changeNumber1 = gen.newChangeNumber();
+ ChangeNumber changeNumber2 = gen.newChangeNumber();
+ ChangeNumber changeNumber3 = gen.newChangeNumber();
+
+ DeleteMsg update1 = new DeleteMsg(TEST_ROOT_DN_STRING, changeNumber1,
+ "uid");
+ DeleteMsg update2 = new DeleteMsg(TEST_ROOT_DN_STRING, changeNumber2,
+ "uid");
+ DeleteMsg update3 = new DeleteMsg(TEST_ROOT_DN_STRING, changeNumber3,
+ "uid");
+
+ // Add the changes
+ handler.add(update1);
+ handler.add(update2);
+ handler.add(update3);
+
+ // Check they are here
+ assertEquals(changeNumber1, handler.getFirstChange());
+ assertEquals(changeNumber3, handler.getLastChange());
+
+ // Clear ...
+ handler.clear();
+
+ // Check the db is cleared.
+ assertEquals(null, handler.getFirstChange());
+ assertEquals(null, handler.getLastChange());
+
+ } finally
+ {
+ if (handler != null)
+ handler.shutdown();
+ if (dbEnv != null)
+ dbEnv.shutdown();
+ if (replicationServer != null)
+ replicationServer.remove();
+ if (testRoot != null)
+ TestCaseUtils.deleteDirectory(testRoot);
}
- testRoot.mkdirs();
-
- ReplicationDbEnv dbEnv = new ReplicationDbEnv(path, replicationServer);
-
- DbHandler handler =
- new DbHandler(
- (short) 1, DN.decode("o=test"), replicationServer, dbEnv, 5000);
-
- // Creates changes added to the dbHandler
- ChangeNumberGenerator gen = new ChangeNumberGenerator((short)1, 0);
- ChangeNumber changeNumber1 = gen.newChangeNumber();
- ChangeNumber changeNumber2 = gen.newChangeNumber();
- ChangeNumber changeNumber3 = gen.newChangeNumber();
-
- DeleteMsg update1 = new DeleteMsg("o=test", changeNumber1, "uid");
- DeleteMsg update2 = new DeleteMsg("o=test", changeNumber2, "uid");
- DeleteMsg update3 = new DeleteMsg("o=test", changeNumber3, "uid");
-
- // Add the changes
- handler.add(update1);
- handler.add(update2);
- handler.add(update3);
-
- // Check they are here
- assertEquals(changeNumber1, handler.getFirstChange());
- assertEquals(changeNumber3, handler.getLastChange());
-
- // Clear ...
- handler.clear();
-
- // Check the db is cleared.
- assertEquals(null, handler.getFirstChange());
- assertEquals(null, handler.getLastChange());
-
- handler.shutdown();
- dbEnv.shutdown();
- replicationServer.shutdown();
-
- TestCaseUtils.deleteDirectory(testRoot);
}
-
-
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
index b0183e2..1a38260 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
@@ -49,13 +49,12 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.ChangeNumberGenerator;
import org.opends.server.replication.plugin.ReplicationBroker;
import org.opends.server.replication.plugin.ReplicationDomain;
import org.opends.server.replication.protocol.AddMsg;
-import org.opends.server.replication.protocol.ReplicationMessage;
+import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.replication.protocol.SocketSession;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.Attribute;
@@ -63,6 +62,7 @@
import org.opends.server.types.Entry;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
/**
* Tests for the replicationServer code.
@@ -73,18 +73,17 @@
// The tracer object for the debug logger
private static final DebugTracer TRACER = getTracer();
- private static final String baseDnStr = "dc=example,dc=com";
- private static final String baseSnStr = "genidcom";
+ private static final String baseDnStr = TEST_ROOT_DN_STRING;
+ private static final String testName = "monitorTest";
private static final int WINDOW_SIZE = 10;
- private static final int CHANGELOG_QUEUE_SIZE = 100;
private static final short server1ID = 1;
private static final short server2ID = 2;
private static final short server3ID = 3;
private static final short server4ID = 4;
- private static final short changelog1ID = 11;
- private static final short changelog2ID = 12;
- private static final short changelog3ID = 13;
+ private static final short changelog1ID = 21;
+ private static final short changelog2ID = 22;
+ private static final short changelog3ID = 23;
private DN baseDn;
private ReplicationBroker broker2 = null;
@@ -99,7 +98,7 @@
boolean ssShutdownRequested = false;
protected String[] updatedEntries;
- private static int[] replServerPort = new int[20];
+ private static int[] replServerPort = new int[30];
private void debugInfo(String s)
{
@@ -123,47 +122,11 @@
@BeforeClass
public void setUp() throws Exception
{
- //log("Starting generationIdTest setup: debugEnabled:" + debugEnabled());
-
- // This test suite depends on having the schema available.
- TestCaseUtils.startServer();
+ super.setUp();
baseDn = DN.decode(baseDnStr);
updatedEntries = newLDIFEntries();
-
- // Create an internal connection in order to provide operations
- // to DS to populate the db -
- connection = InternalClientConnection.getRootConnection();
-
- // Synchro provider
- String synchroStringDN = "cn=Synchronization Providers,cn=config";
-
- // Synchro multi-master
- synchroPluginStringDN = "cn=Multimaster Synchronization, "
- + synchroStringDN;
-
- // Synchro suffix
- synchroServerEntry = null;
-
- // Add config entries to the current DS server based on :
- // Add the replication plugin: synchroPluginEntry & synchroPluginStringDN
- // Add synchroServerEntry
- // Add replServerEntry
- configureReplication();
-
- // Change log
- String changeLogStringDN = "cn=Changelog Server, " + synchroPluginStringDN;
- String changeLogLdif = "dn: " + changeLogStringDN + "\n"
- + "objectClass: top\n"
- + "objectClass: ds-cfg-synchronization-changelog-server-config\n"
- + "cn: Changelog Server\n" + "ds-cfg-changelog-port: 8990\n"
- + "ds-cfg-changelog-server-id: 1\n"
- + "ds-cfg-window-size: " + WINDOW_SIZE + "\n"
- + "ds-cfg-changelog-max-queue-size: " + CHANGELOG_QUEUE_SIZE;
- replServerEntry = TestCaseUtils.entryFromLdifString(changeLogLdif);
- replServerEntry = null;
-
}
/*
@@ -175,7 +138,7 @@
{
"dn: " + baseDn + "\n"
+ "objectClass: top\n"
- + "objectClass: domain\n"
+ + "objectClass: organization\n"
+ "entryUUID: 21111111-1111-1111-1111-111111111111\n"
+ "\n",
"dn: ou=People," + baseDn + "\n"
@@ -213,7 +176,7 @@
/**
* Creates a new replicationServer.
* @param changelogId The serverID of the replicationServer to create.
- * @param all Specifies whether to coonect the created replication
+ * @param all Specifies whether to connect the created replication
* server to the other replication servers in the test.
* @return The new created replication server.
*/
@@ -224,28 +187,15 @@
servers = new TreeSet<String>();
try
{
- if (changelogId==changelog1ID)
- {
- if (replServer1!=null)
- return replServer1;
- }
- else if (changelogId==changelog2ID)
- {
- if (replServer2!=null)
- return replServer2;
- }
- else if (changelogId==changelog3ID)
- {
- if (replServer3!=null)
- return replServer3;
- }
if (all)
{
- servers.add("localhost:" + getChangelogPort(changelog1ID));
- servers.add("localhost:" + getChangelogPort(changelog2ID));
+ if (changelogId != changelog1ID)
+ servers.add("localhost:" + getChangelogPort(changelog1ID));
+ if (changelogId != changelog2ID)
+ servers.add("localhost:" + getChangelogPort(changelog2ID));
}
int chPort = getChangelogPort(changelogId);
- String chDir = "genid"+changelogId+suffix+"Db";
+ String chDir = "monitorTest"+changelogId+suffix+"Db";
ReplServerFakeConfiguration conf =
new ReplServerFakeConfiguration(chPort, chDir, 0, changelogId, 0, 100,
servers);
@@ -253,7 +203,6 @@
Thread.sleep(1000);
return replicationServer;
-
}
catch (Exception e)
{
@@ -273,12 +222,11 @@
try
{
// suffix synchronized
- String synchroServerStringDN = synchroPluginStringDN;
String synchroServerLdif =
- "dn: cn=" + baseSnStr + ", cn=domains," + synchroServerStringDN + "\n"
+ "dn: cn=" + testName + ", cn=domains," + SYNCHRO_PLUGIN_DN + "\n"
+ "objectClass: top\n"
+ "objectClass: ds-cfg-replication-domain\n"
- + "cn: " + baseSnStr + "\n"
+ + "cn: " + testName + "\n"
+ "ds-cfg-base-dn: " + baseDnStr + "\n"
+ "ds-cfg-replication-server: localhost:"
+ getChangelogPort(changelogID)+"\n"
@@ -286,26 +234,24 @@
+ "ds-cfg-receive-status: true\n"
+ "ds-cfg-window-size: " + WINDOW_SIZE;
- if (synchroServerEntry == null)
- {
- synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
- DirectoryServer.getConfigHandler().addEntry(synchroServerEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()),
+ synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
+ DirectoryServer.getConfigHandler().addEntry(synchroServerEntry, null);
+ assertNotNull(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()),
"Unable to add the synchronized server");
- configEntryList.add(synchroServerEntry.getDN());
+ configEntryList.add(synchroServerEntry.getDN());
- replDomain = ReplicationDomain.retrievesReplicationDomain(baseDn);
+ replDomain = ReplicationDomain.retrievesReplicationDomain(baseDn);
- }
if (replDomain != null)
{
- debugInfo("ReplicationDomain: Import/Export is running ? " + replDomain.ieRunning());
+ debugInfo("ReplicationDomain: Import/Export is running ? " +
+ replDomain.ieRunning());
}
}
catch(Exception e)
{
debugInfo("connectToReplServer", e);
- fail("connectToReplServer", e);
+ fail("connectToReplServer: " + e.getMessage() + " : " + e.getStackTrace(), e);
}
}
@@ -317,18 +263,20 @@
try
{
// suffix synchronized
- String synchroServerStringDN = "cn=" + baseSnStr + ", cn=domains," +
- synchroPluginStringDN;
- if (synchroServerEntry != null)
- {
- DN synchroServerDN = DN.decode(synchroServerStringDN);
- DirectoryServer.getConfigHandler().deleteEntry(synchroServerDN,null);
- assertTrue(DirectoryServer.getConfigEntry(synchroServerEntry.getDN())==null,
- "Unable to delete the synchronized domain");
- synchroServerEntry = null;
+ String synchroServerStringDN = "cn=" + testName + ", cn=domains," +
+ SYNCHRO_PLUGIN_DN;
+ // Must have called connectServer1ToChangelog previously
+ assertTrue(synchroServerEntry != null);
- configEntryList.remove(configEntryList.indexOf(synchroServerDN));
- }
+ DN synchroServerDN = DN.decode(synchroServerStringDN);
+ DirectoryServer.getConfigHandler().deleteEntry(synchroServerDN, null);
+ assertTrue(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()) ==
+ null,
+ "Unable to delete the synchronized domain");
+ synchroServerEntry = null;
+
+ configEntryList.remove(configEntryList.indexOf(synchroServerDN));
+
}
catch(Exception e)
{
@@ -376,7 +324,7 @@
+ "userPassword: password\n" + "initials: AA\n");
}
- static protected ReplicationMessage createAddMsg(short serverId)
+ static protected ReplicationMsg createAddMsg(short serverId)
{
Entry personWithUUIDEntry = null;
String user1entryUUID;
@@ -427,89 +375,93 @@
return addMsg;
}
- @Test(enabled=false)
+ @Test(enabled=true)
public void testMultiRS() throws Exception
{
String testCase = "testMultiRS";
debugInfo("Starting " + testCase);
- ReplicationDomain.clearJEBackend(false,
- "userRoot",
- baseDn.toNormalizedString());
-
- debugInfo ("Creating 2 RS");
- replServer1 = createReplicationServer(changelog1ID, true, testCase);
- replServer2 = createReplicationServer(changelog2ID, true, testCase);
- replServer3 = createReplicationServer(changelog3ID, true, testCase);
- Thread.sleep(500);
-
- debugInfo("Connecting DS to replServer1");
- connectServer1ToChangelog(changelog1ID);
- Thread.sleep(1500);
-
try
{
- debugInfo("Connecting broker2 to replServer1");
- broker2 = openReplicationSession(baseDn,
+ TestCaseUtils.initializeTestBackend(false);
+
+ debugInfo("Creating 2 RS");
+ replServer1 = createReplicationServer(changelog1ID, true, testCase);
+ replServer2 = createReplicationServer(changelog2ID, true, testCase);
+ replServer3 = createReplicationServer(changelog3ID, true, testCase);
+ Thread.sleep(500);
+
+ debugInfo("Connecting DS to replServer1");
+ connectServer1ToChangelog(changelog1ID);
+ Thread.sleep(1500);
+
+ try
+ {
+ debugInfo("Connecting broker2 to replServer1");
+ broker2 = openReplicationSession(baseDn,
server2ID, 100, getChangelogPort(changelog1ID),
1000, !emptyOldChanges);
- Thread.sleep(1000);
- }
- catch(SocketException se)
- {
- fail("Broker connection is expected to be accepted.");
- }
+ Thread.sleep(1000);
+ } catch (SocketException se)
+ {
+ fail("Broker connection is expected to be accepted.");
+ }
- try
- {
- debugInfo("Connecting broker3 to replServer2");
- broker3 = openReplicationSession(baseDn,
+ try
+ {
+ debugInfo("Connecting broker3 to replServer2");
+ broker3 = openReplicationSession(baseDn,
server3ID, 100, getChangelogPort(changelog2ID),
1000, !emptyOldChanges);
- Thread.sleep(1000);
- }
- catch(SocketException se)
- {
- fail("Broker connection is expected to be accepted.");
- }
+ Thread.sleep(1000);
+ } catch (SocketException se)
+ {
+ fail("Broker connection is expected to be accepted.");
+ }
- try
- {
- debugInfo("Connecting broker4 to replServer2");
- broker4 = openReplicationSession(baseDn,
+ try
+ {
+ debugInfo("Connecting broker4 to replServer2");
+ broker4 = openReplicationSession(baseDn,
server4ID, 100, getChangelogPort(changelog2ID),
1000, !emptyOldChanges);
- Thread.sleep(1000);
- }
- catch(SocketException se)
+ Thread.sleep(1000);
+ } catch (SocketException se)
+ {
+ fail("Broker connection is expected to be accepted.");
+ }
+
+ // Do a bunch of change
+ updatedEntries = newLDIFEntries();
+ this.addTestEntriesToDB(updatedEntries);
+
+ for (int i = 0; i < 200; i++)
+ {
+ String ent1[] =
+ {
+ createEntry(UUID.randomUUID())
+ };
+ this.addTestEntriesToDB(ent1);
+ }
+
+ for (int i = 0; i < 10; i++)
+ {
+ broker3.publish(createAddMsg(server3ID));
+ }
+
+ searchMonitor();
+
+ debugInfo(
+ "Disconnect DS from replServer1 (required in order to DEL entries).");
+ disconnectFromReplServer(changelog1ID);
+
+
+ debugInfo("Successfully ending " + testCase);
+ } finally
{
- fail("Broker connection is expected to be accepted.");
+ debugInfo("Cleaning entries");
+ postTest();
}
-
- // Do a bunch of change
- updatedEntries = newLDIFEntries();
- this.addTestEntriesToDB(updatedEntries);
-
- for (int i = 0; i<200; i++)
- {
- String ent1[] = { createEntry(UUID.randomUUID()) };
- this.addTestEntriesToDB(ent1);
- }
-
- for (int i=0; i<10; i++)
- {
- broker3.publish(createAddMsg(server3ID));
- }
-
- searchMonitor();
-
- debugInfo("Disconnect DS from replServer1 (required in order to DEL entries).");
- disconnectFromReplServer(changelog1ID);
-
- debugInfo("Cleaning entries");
- postTest();
-
- debugInfo("Successfully ending " + testCase);
}
/**
@@ -532,26 +484,39 @@
broker4 = null;
if (replServer1 != null)
+ {
+ replServer1.clearDb();
replServer1.remove();
+ replServer1 = null;
+ }
if (replServer2 != null)
+ {
+ replServer2.clearDb();
replServer2.remove();
+ replServer2 = null;
+ }
if (replServer3 != null)
+ {
+ replServer3.clearDb();
replServer3.remove();
- replServer1 = null;
- replServer2 = null;
- replServer3 = null;
+ replServer3 = null;
+ }
super.cleanRealEntries();
+ // Clean replication server ports
+ for (int i = 0; i < replServerPort.length; i++)
+ {
+ replServerPort[i] = 0;
+ }
+
try
{
- ReplicationDomain.clearJEBackend(false,
- replDomain.getBackend().getBackendID(),
- baseDn.toNormalizedString());
+ TestCaseUtils.initializeTestBackend(false);
}
catch (Exception e) {}
}
-
+
private static final ByteArrayOutputStream oStream =
new ByteArrayOutputStream();
private static final ByteArrayOutputStream eStream =
@@ -563,7 +528,8 @@
String[] args3 =
{
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-Z", "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "cn=monitor",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java
index 7a94e95..a5f21ce 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java
@@ -48,13 +48,28 @@
int windowSize;
private SortedSet<String> servers;
+ /*
+ * Assured mode properties
+ */
+ // Timeout (in milliseconds) when waiting for acknowledgments
+ private long assuredTimeout = 1000;
+
+ // Group id
+ private int groupId = 1;
+
+ // Threshold for status analyzers
+ private int degradedStatusThreshold = 5000;
+
+ /**
+ * Constructor without assured info
+ */
public ReplServerFakeConfiguration(
int port, String dirName, int purgeDelay, int serverId,
int queueSize, int windowSize, SortedSet<String> servers)
{
this.port = port;
this.dirName = dirName;
-
+
if (purgeDelay == 0)
{
this.purgeDelay = 24*60*60;
@@ -86,6 +101,20 @@
this.servers = servers;
}
+
+ /**
+ * Constructor with assured info
+ */
+ public ReplServerFakeConfiguration(
+ int port, String dirName, int purgeDelay, int serverId,
+ int queueSize, int windowSize, SortedSet<String> servers,
+ int groupId, long assuredTimeout, int degradedStatusThreshold)
+ {
+ this(port, dirName, purgeDelay, serverId, queueSize, windowSize, servers);
+ this.groupId = groupId;
+ this.assuredTimeout = assuredTimeout;
+ this.degradedStatusThreshold = degradedStatusThreshold;
+ }
/**
* {@inheritDoc}
@@ -184,4 +213,24 @@
return null;
}
+ public int getGroupId()
+ {
+ return groupId;
+ }
+
+ public long getAssuredTimeout()
+ {
+ return assuredTimeout;
+ }
+
+ public int getDegradedStatusThreshold()
+ {
+ return degradedStatusThreshold;
+ }
+
+ public void setDegradedStatusThreshold(int degradedStatusThreshold)
+ {
+ this.degradedStatusThreshold = degradedStatusThreshold;
+ }
+
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
index 41a5c8b..028601c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
@@ -35,6 +35,7 @@
import org.opends.server.replication.plugin.ReplicationBroker;
import org.opends.server.types.DN;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
/**
* Tests that we can dynamically modify the configuration of replicationServer
@@ -43,14 +44,14 @@
public class ReplicationServerDynamicConfTest extends ReplicationTestCase
{
/**
- * That that the applyConfigurationChange methos of the ReplicationServer
+ * Tests the applyConfigurationChange method of the ReplicationServer
* class.
*/
@Test()
public void replServerApplyChangeTest() throws Exception
{
ReplicationServer replicationServer = null;
-
+
TestCaseUtils.startServer();
try {
@@ -71,7 +72,7 @@
// Most of the configuration change are trivial to apply.
// The interesting change is the change of the replication server port.
// build a new ReplServerFakeConfiguration with a new server port
- // apply this new configuration and check that it is now possible to
+ // apply this new configuration and check that it is now possible to
// connect to this new portnumber.
ReplServerFakeConfiguration newconf =
new ReplServerFakeConfiguration(
@@ -80,16 +81,16 @@
replicationServer.applyConfigurationChange(newconf);
ReplicationBroker broker = openReplicationSession(
- DN.decode("dc=example"), (short) 1, 10, newReplicationServerPort,
+ DN.decode(TEST_ROOT_DN_STRING), (short) 1, 10, newReplicationServerPort,
1000, false);
- // check that the sendWindow is not null to make sure that the
+ // check that the sendWindow is not null to make sure that the
// broker did connect successfully.
assertTrue(broker.getCurrentSendWindow() != 0);
}
- finally
+ finally
{
- replicationServer.shutdown();
+ replicationServer.remove();
}
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
index 97b2663..45560d0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
@@ -48,11 +48,15 @@
import java.util.TreeSet;
import java.util.UUID;
+import org.opends.messages.Category;
+import org.opends.messages.Message;
+import org.opends.messages.Severity;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyDNOperationBasis;
+import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.internal.InternalSearchOperation;
@@ -62,6 +66,7 @@
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ChangeNumberGenerator;
import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.plugin.MultimasterReplication;
import org.opends.server.replication.plugin.ReplicationBroker;
import org.opends.server.replication.plugin.ReplicationServerListener;
@@ -72,13 +77,15 @@
import org.opends.server.replication.protocol.ModifyMsg;
import org.opends.server.replication.protocol.ProtocolSession;
import org.opends.server.replication.protocol.ProtocolVersion;
-import org.opends.server.replication.protocol.ReplServerStartMessage;
+import org.opends.server.replication.protocol.ReplServerStartMsg;
import org.opends.server.replication.protocol.ReplSessionSecurity;
-import org.opends.server.replication.protocol.ReplicationMessage;
-import org.opends.server.replication.protocol.ServerStartMessage;
-import org.opends.server.replication.protocol.UpdateMessage;
-import org.opends.server.replication.protocol.WindowMessage;
-import org.opends.server.replication.protocol.WindowProbe;
+import org.opends.server.replication.protocol.ReplicationMsg;
+import org.opends.server.replication.protocol.ServerStartMsg;
+import org.opends.server.replication.protocol.StartSessionMsg;
+import org.opends.server.replication.protocol.TopologyMsg;
+import org.opends.server.replication.protocol.UpdateMsg;
+import org.opends.server.replication.protocol.WindowMsg;
+import org.opends.server.replication.protocol.WindowProbeMsg;
import org.opends.server.types.*;
import org.opends.server.util.LDIFWriter;
import org.opends.server.util.TimeThread;
@@ -89,6 +96,7 @@
import org.testng.annotations.Test;
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPSearch;
+import static org.opends.server.TestCaseUtils.*;
/**
* Tests for the replicationServer code.
@@ -117,14 +125,26 @@
/**
- * Before starting the tests, start the server and configure a
- * replicationServer.
+ * Set up the environment for performing the tests in this Class.
+ * Replication
+ *
+ * @throws Exception
+ * If the environment could not be set up.
*/
- @BeforeClass()
- public void configure() throws Exception
+ @BeforeClass
+ public void setUp() throws Exception
{
- TestCaseUtils.startServer();
+ super.setUp();
+ // This test suite depends on having the schema available.
+ configure();
+ }
+
+ /**
+ * Start the server and configure a replicationServer.
+ */
+ protected void configure() throws Exception
+ {
// find a free port for the replicationServer
ServerSocket socket = TestCaseUtils.bindFreePort();
replicationServerPort = socket.getLocalPort();
@@ -133,10 +153,10 @@
TestCaseUtils.dsconfig(
"create-replication-server",
"--provider-name", "Multimaster Synchronization",
- "--set", "replication-db-directory:" + "replicationServerTestDb",
+ "--set", "replication-db-directory:" + "replicationServerTestConfigureDb",
"--set", "replication-port:" + replicationServerPort,
- "--set", "replication-server-id:1");
-
+ "--set", "replication-server-id:71");
+
DirectoryServer.getSynchronizationProviders();
for (SynchronizationProvider<?> provider : DirectoryServer
.getSynchronizationProviders()) {
@@ -151,18 +171,14 @@
}
}
}
-
-// ReplServerFakeConfiguration conf =
-// new ReplServerFakeConfiguration(replicationServerPort, null, 0, 1, 0, 0, null);
-// replicationServer = new ReplicationServer(conf);;
}
private void debugInfo(String s)
{
- // ErrorLogger.logError(Message.raw(Category.SYNC, Severity.NOTICE, "** TEST **" + s));
+ ErrorLogger.logError(Message.raw(Category.SYNC, Severity.NOTICE, "** TEST ** " + s));
if (debugEnabled())
{
- TRACER.debugInfo("** TEST **" + s);
+ TRACER.debugInfo("** TEST ** " + s);
}
}
@@ -185,12 +201,34 @@
newClientWithUnknownChanges();
oneWriterMultipleReader();
changelogChaining();
+ stopChangelog();
exportBackend();
backupRestore();
- stopChangelog();
windowProbeTest();
replicationServerConnected();
}
+
+ /**
+ * This test allows to check the behavior of the Replication Server
+ * when the DS disconnect and reconnect again.
+ * In order to stress the protocol in such case, connection and
+ * disconnection is done inside an infinite loop and therefore this
+ * test is disabled and should only be enabled in workspaces but never
+ * committed in the repository.
+ */
+ @Test(enabled=false)
+ public void replicationServerTestLoop() throws Exception
+ {
+ replicationServer.clearDb();
+ changelogBasic();
+ int count = 0;
+ while (true)
+ {
+ count ++;
+ // System.out.println(count);
+ newClient();
+ }
+ }
/**
* Basic test of the replicationServer code :
@@ -212,11 +250,14 @@
* Open a sender session and a receiver session to the replicationServer
*/
server1 = openReplicationSession(
- DN.decode("dc=example,dc=com"), (short) 1, 100, replicationServerPort,
+ DN.decode(TEST_ROOT_DN_STRING), (short) 1, 100, replicationServerPort,
1000, true);
server2 = openReplicationSession(
- DN.decode("dc=example,dc=com"), (short) 2, 100, replicationServerPort,
+ DN.decode(TEST_ROOT_DN_STRING), (short) 2, 100, replicationServerPort,
1000, true);
+
+ assertTrue(server1.isConnected());
+ assertTrue(server2.isConnected());
/*
* Create change numbers for the messages sent from server 1
@@ -247,10 +288,10 @@
* Send and receive a Delete Msg from server 1 to server 2
*/
DeleteMsg msg =
- new DeleteMsg("o=test,dc=example,dc=com", firstChangeNumberServer1,
+ new DeleteMsg("o=example," + TEST_ROOT_DN_STRING, firstChangeNumberServer1,
"uid");
server1.publish(msg);
- ReplicationMessage msg2 = server2.receive();
+ ReplicationMsg msg2 = server2.receive();
server2.updateWindowAfterReplay();
if (msg2 instanceof DeleteMsg)
{
@@ -259,12 +300,13 @@
"ReplicationServer basic : incorrect message body received.");
}
else
- fail("ReplicationServer basic : incorrect message type received.");
+ fail("ReplicationServer basic : incorrect message type received: " +
+ msg2.getClass().toString() + ": content: " + msg2.toString());
/*
* Send and receive a second Delete Msg
*/
- msg = new DeleteMsg("o=test", secondChangeNumberServer1, "uid");
+ msg = new DeleteMsg(TEST_ROOT_DN_STRING, secondChangeNumberServer1, "uid");
server1.publish(msg);
msg2 = server2.receive();
server2.updateWindowAfterReplay();
@@ -275,16 +317,21 @@
"ReplicationServer basic : incorrect message body received.");
}
else
- fail("ReplicationServer basic : incorrect message type received.");
+ fail("ReplicationServer basic : incorrect message type received: " +
+ msg2.getClass().toString() + ": content: " + msg2.toString());
/*
* Send and receive a Delete Msg from server 2 to server 1
*/
msg =
- new DeleteMsg("o=test,dc=example,dc=com", firstChangeNumberServer2,
+ new DeleteMsg("o=example," + TEST_ROOT_DN_STRING, firstChangeNumberServer2,
"other-uid");
server2.publish(msg);
msg2 = server1.receive();
+ if (!(msg2 instanceof TopologyMsg))
+ fail("ReplicationServer basic : incorrect message type received: " +
+ msg2.getClass().toString() + ": content: " + msg2.toString());
+ msg2 = server1.receive();
server1.updateWindowAfterReplay();
if (msg2 instanceof DeleteMsg)
{
@@ -293,12 +340,13 @@
"ReplicationServer basic : incorrect message body received.");
}
else
- fail("ReplicationServer basic : incorrect message type received.");
+ fail("ReplicationServer basic : incorrect message type received: " +
+ msg2.getClass().toString() + ": content: " + msg2.toString());
/*
* Send and receive a second Delete Msg
*/
- msg = new DeleteMsg("o=test", secondChangeNumberServer2, "uid");
+ msg = new DeleteMsg(TEST_ROOT_DN_STRING, secondChangeNumberServer2, "uid");
server2.publish(msg);
msg2 = server1.receive();
server1.updateWindowAfterReplay();
@@ -309,7 +357,10 @@
"ReplicationServer basic : incorrect message body received.");
}
else
- fail("ReplicationServer basic : incorrect message type received.");
+ fail("ReplicationServer basic : incorrect message type received: " +
+ msg2.getClass().toString() + ": content: " + msg2.toString());
+
+ debugInfo("Ending changelogBasic");
}
finally
{
@@ -318,7 +369,6 @@
if (server2 != null)
server2.stop();
}
- debugInfo("Ending changelogBasic");
}
/**
@@ -332,10 +382,12 @@
try {
broker =
- openReplicationSession(DN.decode("dc=example,dc=com"), (short) 3,
+ openReplicationSession(DN.decode(TEST_ROOT_DN_STRING), (short) 3,
100, replicationServerPort, 1000, false);
- ReplicationMessage msg2 = broker.receive();
+ assertTrue(broker.isConnected());
+
+ ReplicationMsg msg2 = broker.receive();
broker.updateWindowAfterReplay();
if (!(msg2 instanceof DeleteMsg))
fail("ReplicationServer basic transmission failed:" + msg2);
@@ -346,13 +398,13 @@
"The first message received by a new client was the wrong one : "
+ del.getChangeNumber() + " instead of " + firstChangeNumberServer1);
}
+ debugInfo("Ending newClient");
}
finally
{
if (broker != null)
broker.stop();
}
- debugInfo("Ending newClient");
}
@@ -371,10 +423,12 @@
*/
try {
broker =
- openReplicationSession(DN.decode("dc=example,dc=com"), (short) 3,
+ openReplicationSession(DN.decode(TEST_ROOT_DN_STRING), (short) 3,
100, replicationServerPort, 5000, state);
- ReplicationMessage msg2 = broker.receive();
+ assertTrue(broker.isConnected());
+
+ ReplicationMsg msg2 = broker.receive();
broker.updateWindowAfterReplay();
if (!(msg2 instanceof DeleteMsg))
{
@@ -420,6 +474,7 @@
*/
private void newClientWithUnknownChanges() throws Exception
{
+ debugInfo("Starting newClientWithUnknownChanges");
/*
* Create a ServerState with wrongChangeNumberServer1
*/
@@ -428,6 +483,7 @@
state.update(secondChangeNumberServer2);
newClientWithChanges(state, secondChangeNumberServer1);
+ debugInfo("Ending newClientWithUnknownChanges");
}
/**
@@ -436,6 +492,7 @@
*/
private void newClientWithChangefromServer1() throws Exception
{
+ debugInfo("Starting newClientWithChangefromServer1");
/*
* Create a ServerState updated with the first change from server 1
*/
@@ -443,6 +500,7 @@
state.update(firstChangeNumberServer1);
newClientWithChanges(state, firstChangeNumberServer2);
+ debugInfo("Ending newClientWithChangefromServer1");
}
/**
@@ -451,6 +509,7 @@
*/
private void newClientWithChangefromServer2() throws Exception
{
+ debugInfo("Starting newClientWithChangefromServer2");
/*
* Create a ServerState updated with the first change from server 1
*/
@@ -458,6 +517,7 @@
state.update(firstChangeNumberServer2);
newClientWithChanges(state, firstChangeNumberServer1);
+ debugInfo("Ending newClientWithChangefromServer2");
}
/**
@@ -466,6 +526,7 @@
*/
private void newClientLateServer1() throws Exception
{
+ debugInfo("Starting newClientLateServer1");
/*
* Create a ServerState updated with the first change from server 1
*/
@@ -474,6 +535,7 @@
state.update(firstChangeNumberServer1);
newClientWithChanges(state, secondChangeNumberServer1);
+ debugInfo("Ending newClientLateServer1");
}
/**
@@ -482,12 +544,14 @@
*/
private void stopChangelog() throws Exception
{
+ debugInfo("Starting stopChangelog");
shutdown();
configure();
newClient();
newClientWithFirstChanges();
newClientWithChangefromServer1();
newClientWithChangefromServer2();
+ debugInfo("Ending stopChangelog");
}
/**
@@ -497,12 +561,14 @@
* ReplicationServer when it needs to distribute the load of
* updates from a single LDAP server to a number of LDAP servers.
*
- * This test i sconfigured by a relatively low stress
+ * This test is configured by a relatively low stress
* but can be changed using TOTAL_MSG and CLIENT_THREADS consts.
*/
private void oneWriterMultipleReader() throws Exception
{
+ debugInfo("Starting oneWriterMultipleReader");
ReplicationBroker server = null;
+ BrokerReader reader = null;
int TOTAL_MSG = 1000; // number of messages to send during the test
int CLIENT_THREADS = 2; // number of threads that will try to read
// the messages
@@ -518,10 +584,12 @@
* Open a sender session
*/
server = openReplicationSession(
- DN.decode("dc=example,dc=com"), (short) 5, 100, replicationServerPort,
+ DN.decode(TEST_ROOT_DN_STRING), (short) 5, 100, replicationServerPort,
1000, 1000, 0, true);
- BrokerReader reader = new BrokerReader(server);
+ assertTrue(server.isConnected());
+
+ reader = new BrokerReader(server);
/*
* Start the client threads.
@@ -529,8 +597,9 @@
for (int i =0; i< CLIENT_THREADS; i++)
{
clientBroker[i] = openReplicationSession(
- DN.decode("dc=example,dc=com"), (short) (100+i), 100, replicationServerPort,
+ DN.decode(TEST_ROOT_DN_STRING), (short) (100+i), 100, replicationServerPort,
1000, true);
+ assertTrue(clientBroker[i].isConnected());
client[i] = new BrokerReader(clientBroker[i]);
}
@@ -547,23 +616,25 @@
for (int i = 0; i< TOTAL_MSG; i++)
{
DeleteMsg msg =
- new DeleteMsg("o=test,dc=example,dc=com", gen.newChangeNumber(),
+ new DeleteMsg("o=example," + TEST_ROOT_DN_STRING, gen.newChangeNumber(),
"uid");
server.publish(msg);
}
-
- for (int i =0; i< CLIENT_THREADS; i++)
- {
- client[i].join();
- reader.join();
- }
+ debugInfo("Ending oneWriterMultipleReader");
}
finally
{
+ if (reader != null)
+ reader.join();
if (server != null)
server.stop();
for (int i =0; i< CLIENT_THREADS; i++)
{
+ if (client[i] != null)
+ client[i].join();
+ }
+ for (int i =0; i< CLIENT_THREADS; i++)
+ {
if (clientBroker[i] != null)
clientBroker[i].stop();
}
@@ -574,40 +645,42 @@
* Stress test from client using the ReplicationBroker API
* to the replicationServer.
*
- * This test allow to investigate the behaviour of the
+ * This test allow to investigate the behavior of the
* ReplicationServer when it needs to distribute the load of
* updates from multiple LDAP server to a number of LDAP servers.
*
- * This test is sconfigured for a relatively low stress
+ * This test is configured for a relatively low stress
* but can be changed using TOTAL_MSG and THREADS consts.
*/
private void multipleWriterMultipleReader() throws Exception
{
- ReplicationBroker server = null;
+ debugInfo("Starting multipleWriterMultipleReader");
final int TOTAL_MSG = 1000; // number of messages to send during the test
final int THREADS = 2; // number of threads that will produce
// and read the messages.
BrokerWriter producer[] = new BrokerWriter[THREADS];
BrokerReader reader[] = new BrokerReader[THREADS];
+ ReplicationBroker broker[] = new ReplicationBroker[THREADS];
try
{
/*
* Start the producer threads.
*/
- for (int i =0; i< THREADS; i++)
+ for (int i = 0; i< THREADS; i++)
{
short serverId = (short) (10+i);
ChangeNumberGenerator gen =
new ChangeNumberGenerator(serverId , (long) 0);
- ReplicationBroker broker =
- openReplicationSession( DN.decode("dc=example,dc=com"), serverId,
+ broker[i] =
+ openReplicationSession( DN.decode(TEST_ROOT_DN_STRING), serverId,
100, replicationServerPort, 1000, 1000, 0, true);
- producer[i] = new BrokerWriter(broker, gen, TOTAL_MSG/THREADS);
- reader[i] = new BrokerReader(broker);
+ assertTrue(broker[i].isConnected());
+ producer[i] = new BrokerWriter(broker[i], gen, TOTAL_MSG/THREADS);
+ reader[i] = new BrokerReader(broker[i]);
}
for (int i =0; i< THREADS; i++)
@@ -619,17 +692,25 @@
{
reader[i].start();
}
-
- for (int i =0; i< THREADS; i++)
- {
- producer[i].join(60000);
- reader[i].join(60000);
- }
+ debugInfo("Ending multipleWriterMultipleReader");
}
finally
{
- if (server != null)
- server.stop();
+ for (int i = 0; i< THREADS; i++)
+ {
+ if (producer[i] != null)
+ producer[i].join();
+ }
+ for (int i = 0; i< THREADS; i++)
+ {
+ if (reader[i] != null)
+ reader[i].join();
+ }
+ for (int i = 0; i< THREADS; i++)
+ {
+ if (broker[i] != null)
+ broker[i].stop();
+ }
}
}
@@ -657,6 +738,7 @@
*/
private void changelogChaining() throws Exception
{
+ debugInfo("Starting changelogChaining");
for (int itest = 0; itest <2; itest++)
{
ReplicationBroker broker2 = null;
@@ -675,7 +757,7 @@
// find a free port
socket = TestCaseUtils.bindFreePort();
changelogPorts[i] = socket.getLocalPort();
- changelogIds[i] = i + 10;
+ changelogIds[i] = i + 80;
brokerIds[i] = (short) (100+i);
if ((itest==0) || (i ==0))
socket.close();
@@ -692,7 +774,7 @@
servers.add(
"localhost:" + ((i == 0) ? changelogPorts[1] : changelogPorts[0]));
ReplServerFakeConfiguration conf =
- new ReplServerFakeConfiguration(changelogPorts[i], "changelogDb"+i, 0,
+ new ReplServerFakeConfiguration(changelogPorts[i], "replicationServerTestChangelogChainingDb"+i, 0,
changelogIds[i], 0, 100, servers);
changelogs[i] = new ReplicationServer(conf);
}
@@ -705,13 +787,16 @@
// and client2 to changelog2
// For itest=1, only create and connect client1 to changelog1
// client2 will be created later
- broker1 = openReplicationSession(DN.decode("dc=example,dc=com"),
+ broker1 = openReplicationSession(DN.decode(TEST_ROOT_DN_STRING),
brokerIds[0], 100, changelogPorts[0], 1000, !emptyOldChanges);
+
+ assertTrue(broker1.isConnected());
if (itest == 0)
{
- broker2 = openReplicationSession(DN.decode("dc=example,dc=com"),
+ broker2 = openReplicationSession(DN.decode(TEST_ROOT_DN_STRING),
brokerIds[1], 100, changelogPorts[0], 1000, !emptyOldChanges);
+ assertTrue(broker2.isConnected());
}
// - Test messages between clients by publishing now
@@ -721,37 +806,37 @@
int ts = 1;
ChangeNumber cn = new ChangeNumber(time, ts++, brokerIds[0]);
- DeleteMsg delMsg = new DeleteMsg("o=test"+itest+",dc=example,dc=com", cn, "uid");
+ DeleteMsg delMsg = new DeleteMsg("o=example" + itest + "," + TEST_ROOT_DN_STRING, cn, "uid");
broker1.publish(delMsg);
String user1entryUUID = "33333333-3333-3333-3333-333333333333";
String baseUUID = "22222222-2222-2222-2222-222222222222";
// - Add
- String lentry = new String("dn: o=test,dc=example,dc=com\n"
+ String lentry = new String("dn: o=example," + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n" + "objectClass: domain\n"
+ "entryUUID: 11111111-1111-1111-1111-111111111111\n");
Entry entry = TestCaseUtils.entryFromLdifString(lentry);
cn = new ChangeNumber(time, ts++, brokerIds[0]);
- AddMsg addMsg = new AddMsg(cn, "o=test,dc=example,dc=com",
+ AddMsg addMsg = new AddMsg(cn, "o=example," + TEST_ROOT_DN_STRING,
user1entryUUID, baseUUID, entry.getObjectClassAttribute(), entry
.getAttributes(), new ArrayList<Attribute>());
broker1.publish(addMsg);
// - Modify
- Attribute attr1 = new Attribute("description", "new value");
+ Attribute attr1 = Attributes.create("description", "new value");
Modification mod1 = new Modification(ModificationType.REPLACE, attr1);
List<Modification> mods = new ArrayList<Modification>();
mods.add(mod1);
cn = new ChangeNumber(time, ts++, brokerIds[0]);
ModifyMsg modMsg = new ModifyMsg(cn, DN
- .decode("o=test,dc=example,dc=com"), mods, "fakeuniqueid");
+ .decode("o=example," + TEST_ROOT_DN_STRING), mods, "fakeuniqueid");
broker1.publish(modMsg);
// - ModifyDN
cn = new ChangeNumber(time, ts++, brokerIds[0]);
ModifyDNOperationBasis op = new ModifyDNOperationBasis(connection, 1, 1, null, DN
- .decode("o=test,dc=example,dc=com"), RDN.decode("o=test2"), true,
+ .decode("o=example," + TEST_ROOT_DN_STRING), RDN.decode("o=example2"), true,
null);
op.setAttachment(SYNCHROCONTEXT, new ModifyDnContext(cn, "uniqueid",
"newparentId"));
@@ -772,14 +857,15 @@
changelogs[1] = new ReplicationServer(conf);
// Connect broker 2 to changelog2
- broker2 = openReplicationSession(DN.decode("dc=example,dc=com"),
+ broker2 = openReplicationSession(DN.decode(TEST_ROOT_DN_STRING),
brokerIds[1], 100, changelogPorts[1], 2000, !emptyOldChanges);
+ assertTrue(broker2.isConnected());
}
// - Check msg receives by broker, through changeLog2
while (ts > 1)
{
- ReplicationMessage msg2;
+ ReplicationMsg msg2;
try
{
msg2 = broker2.receive();
@@ -817,6 +903,10 @@
if (modDNMsg.equals(modDNMsg2))
ts--;
}
+ else if (msg2 instanceof TopologyMsg)
+ {
+ // Nothing to test here.
+ }
else
{
fail("ReplicationServer transmission failed: no expected message" +
@@ -827,6 +917,7 @@
// Check that everything expected has been received
assertTrue(ts == 1, "Broker2 did not receive the complete set of"
+ " expected messages: #msg received " + ts);
+ debugInfo("Ending changelogChaining");
}
finally
{
@@ -844,10 +935,11 @@
/**
* Test that the Replication sends back correctly WindowsUpdate
- * when we send a WindowProbe.
+ * when we send a WindowProbeMsg.
*/
private void windowProbeTest() throws Exception
{
+ debugInfo("Starting windowProbeTest");
final int WINDOW = 10;
/*
* Open a session to the replication server.
@@ -873,24 +965,25 @@
socket.connect(ServerAddr, 500);
ReplSessionSecurity replSessionSecurity = getReplSessionSecurity();
ProtocolSession session =
- replSessionSecurity.createClientSession(serverURL, socket);
+ replSessionSecurity.createClientSession(serverURL, socket,
+ ReplSessionSecurity.HANDSHAKE_TIMEOUT);
boolean sslEncryption =
DirectoryConfig.getCryptoManager().isSslEncryption();
try
{
- // send a ServerStartMessage with an empty ServerState.
- ServerStartMessage msg =
- new ServerStartMessage((short) 1723, DN.decode("dc=example,dc=com"),
+ // send a ServerStartMsg with an empty ServerState.
+ ServerStartMsg msg =
+ new ServerStartMsg((short) 1723, DN.decode(TEST_ROOT_DN_STRING),
0, 0, 0, 0, WINDOW, (long) 5000, new ServerState(),
- ProtocolVersion.currentVersion(), 0, sslEncryption, false);
+ ProtocolVersion.getCurrentVersion(), 0, sslEncryption, (byte)-1);
session.publish(msg);
- // Read the Replication Server state from the ReplServerStartMessage that
+ // Read the Replication Server state from the ReplServerStartMsg that
// comes back.
- ReplServerStartMessage replStartMsg =
- (ReplServerStartMessage) session.receive();
+ ReplServerStartMsg replStartMsg =
+ (ReplServerStartMsg) session.receive();
int serverwindow = replStartMsg.getWindowSize();
ServerState replServerState = replStartMsg.getServerState();
@@ -899,47 +992,73 @@
session.stopEncryption();
}
+ // Send StartSessionMsg
+ StartSessionMsg startSessionMsg =
+ new StartSessionMsg(ServerStatus.NORMAL_STATUS,
+ new ArrayList<String>());
+ session.publish(startSessionMsg);
+
+ // Read the TopologyMsg that should come back.
+ ReplicationMsg repMsg = session.receive();
+ assertTrue(repMsg instanceof TopologyMsg);
+
// close the session
session.close();
+ // Sleep a while so the following connection is not perturbed by some
+ // topo messages signalling first connection has been dropped: let
+ // disocnnection fully happen before, connecting a second session
+ Thread.sleep(2000);
+
// open a new session to the replication Server
socket = new Socket();
socket.setReceiveBufferSize(1000000);
socket.setTcpNoDelay(true);
socket.connect(ServerAddr, 500);
- session = replSessionSecurity.createClientSession(serverURL, socket);
+ session = replSessionSecurity.createClientSession(serverURL, socket, 4000);
- // send a ServerStartMessage containing the ServerState that was just
+ // send a ServerStartMsg containing the ServerState that was just
// received.
- DN baseDn = DN.decode("dc=example,dc=com");
- msg = new ServerStartMessage(
+ DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
+ msg = new ServerStartMsg(
(short) 1724, baseDn,
0, 0, 0, 0, WINDOW, (long) 5000, replServerState,
- ProtocolVersion.currentVersion(),
+ ProtocolVersion.getCurrentVersion(),
ReplicationTestCase.getGenerationId(baseDn),
- sslEncryption, false);
+ sslEncryption, (byte)10);
session.publish(msg);
- // Read the ReplServerStartMessage that come back.
- session.receive();
+ // Read the ReplServerStartMsg that should come back.
+ repMsg = session.receive();
+ assertTrue(repMsg instanceof ReplServerStartMsg);
if (!sslEncryption)
{
session.stopEncryption();
}
- // Now comes the real test : check that the Replication Server
- // answers correctly to a WindowProbe Message.
- session.publish(new WindowProbe());
+ // Send StartSessionMsg
+ startSessionMsg = new StartSessionMsg(ServerStatus.NORMAL_STATUS,
+ new ArrayList<String>());
+ session.publish(startSessionMsg);
- WindowMessage windowMsg = (WindowMessage) session.receive();
+ // Read the TopologyMsg that should come back.
+ repMsg = session.receive();
+ assertTrue(repMsg instanceof TopologyMsg);
+
+ // Now comes the real test : check that the Replication Server
+ // answers correctly to a WindowProbeMsg Message.
+ session.publish(new WindowProbeMsg());
+
+ WindowMsg windowMsg = (WindowMsg) session.receive();
assertEquals(serverwindow, windowMsg.getNumAck());
// check that this did not change the window by sending a probe again.
- session.publish(new WindowProbe());
+ session.publish(new WindowProbeMsg());
- windowMsg = (WindowMessage) session.receive();
+ windowMsg = (WindowMsg) session.receive();
assertEquals(serverwindow, windowMsg.getNumAck());
+ debugInfo("Ending windowProbeTest");
}
finally
{
@@ -947,12 +1066,27 @@
}
}
+ /**
+ * Clean up the environment.
+ *
+ * @throws Exception If the environment could not be set up.
+ */
+ @AfterClass
+
+ public void classCleanUp() throws Exception
+ {
+ callParanoiaCheck = false;
+ super.classCleanUp();
+
+ shutdown();
+
+ paranoiaCheck();
+ }
/**
* After the tests stop the replicationServer.
*/
- @AfterClass()
- public void shutdown() throws Exception
+ protected void shutdown() throws Exception
{
TestCaseUtils.dsconfig(
"delete-replication-server",
@@ -961,7 +1095,7 @@
}
/**
- * This class allows to creater reader thread.
+ * This class allows to create reader thread.
* They continuously reads messages from a replication broker until
* there is nothing left.
* They Count the number of received messages.
@@ -991,7 +1125,7 @@
{
while (true)
{
- ReplicationMessage msg = broker.receive();
+ ReplicationMsg msg = broker.receive();
broker.updateWindowAfterReplay();
if (msg == null)
break;
@@ -1034,7 +1168,7 @@
count--;
DeleteMsg msg =
- new DeleteMsg("o=test,dc=example,dc=com", gen.newChangeNumber(),
+ new DeleteMsg("o=example," + TEST_ROOT_DN_STRING, gen.newChangeNumber(),
"uid");
broker.publish(msg);
}
@@ -1058,7 +1192,7 @@
addTask(restoreTask, ResultCode.SUCCESS, null);
waitTaskState(restoreTask, TaskState.COMPLETED_SUCCESSFULLY, null);
- debugInfo("Ending backupRestore");
+ debugInfo("Ending backupRestore");
}
/*
@@ -1075,42 +1209,47 @@
ReplicationBroker server1 = null;
ReplicationBroker server2 = null;
- try {
+ try
+ {
server1 = openReplicationSession(
- DN.decode("dc=example,dc=com"), (short) 1, 100, replicationServerPort,
- 1000, true);
+ DN.decode(TEST_ROOT_DN_STRING), (short) 1, 100,
+ replicationServerPort,
+ 1000, true);
server2 = openReplicationSession(
- DN.decode("dc=example2,dc=com"), (short) 2, 100, replicationServerPort,
- 1000, true);
- }
- catch(Exception e) {}
+ DN.decode("dc=domain2,dc=com"), (short) 2, 100,
+ replicationServerPort,
+ 1000, true);
- debugInfo("Publish changes");
- List<UpdateMessage> msgs = createChanges("dc=example,dc=com", (short)1);
- for(UpdateMessage msg : msgs )
- {
- server1.publish(msg);
- }
- List<UpdateMessage> msgs2 = createChanges("dc=example2,dc=com", (short)2);
- for(UpdateMessage msg : msgs2 )
- {
- server2.publish(msg);
- }
+ assertTrue(server1.isConnected());
+ assertTrue(server2.isConnected());
- debugInfo("Export all");
- Entry exportTask = createExportAllTask();
- addTask(exportTask, ResultCode.SUCCESS, null);
- waitTaskState(exportTask, TaskState.COMPLETED_SUCCESSFULLY, null);
+ debugInfo("Publish changes");
+ List<UpdateMsg> msgs = createChanges(TEST_ROOT_DN_STRING, (short) 1);
+ for (UpdateMsg msg : msgs)
+ {
+ server1.publish(msg);
+ }
+ List<UpdateMsg> msgs2 = createChanges("dc=domain2,dc=com", (short) 2);
+ for (UpdateMsg msg : msgs2)
+ {
+ server2.publish(msg);
+ }
- debugInfo("Export domain");
- exportTask = createExportDomainTask("dc=example2,dc=com");
- addTask(exportTask, ResultCode.SUCCESS, null);
- waitTaskState(exportTask, TaskState.COMPLETED_SUCCESSFULLY, null);
+ debugInfo("Export all");
+ Entry exportTask = createExportAllTask();
+ addTask(exportTask, ResultCode.SUCCESS, null);
+ waitTaskState(exportTask, TaskState.COMPLETED_SUCCESSFULLY, null);
+ debugInfo("Export domain");
+ exportTask = createExportDomainTask("dc=domain2,dc=com");
+ addTask(exportTask, ResultCode.SUCCESS, null);
+ waitTaskState(exportTask, TaskState.COMPLETED_SUCCESSFULLY, null);
+ } finally {
if (server1 != null)
server1.stop();
if (server2 != null)
server2.stop();
+ }
debugInfo("Ending export");
}
@@ -1180,9 +1319,9 @@
"ds-task-export-include-branch: "+suffix+",dc=replicationChanges");
}
- private List<UpdateMessage> createChanges(String suffix, short serverId)
+ private List<UpdateMsg> createChanges(String suffix, short serverId)
{
- List<UpdateMessage> l = new ArrayList<UpdateMessage>();
+ List<UpdateMsg> l = new ArrayList<UpdateMsg>();
long time = TimeThread.getTime();
int ts = 1;
ChangeNumber cn;
@@ -1199,7 +1338,7 @@
+ "entryUUID: 11111111-1111-1111-1111-111111111111\n");
Entry entry = TestCaseUtils.entryFromLdifString(lentry);
cn = new ChangeNumber(time, ts++, serverId);
- AddMsg addMsg = new AddMsg(cn, "o=test,"+suffix,
+ AddMsg addMsg = new AddMsg(cn, "o=example,"+suffix,
user1entryUUID, baseUUID, entry.getObjectClassAttribute(), entry
.getAttributes(), new ArrayList<Attribute>());
l.add(addMsg);
@@ -1230,11 +1369,11 @@
l.add(addMsg2);
// - Modify
- Attribute attr1 = new Attribute("description", "new value");
+ Attribute attr1 = Attributes.create("description", "new value");
Modification mod1 = new Modification(ModificationType.REPLACE, attr1);
- Attribute attr2 = new Attribute("modifiersName", "cn=Directory Manager,cn=Root DNs,cn=config");
+ Attribute attr2 = Attributes.create("modifiersName", "cn=Directory Manager,cn=Root DNs,cn=config");
Modification mod2 = new Modification(ModificationType.REPLACE, attr2);
- Attribute attr3 = new Attribute("modifyTimestamp", "20070917172420Z");
+ Attribute attr3 = Attributes.create("modifyTimestamp", "20070917172420Z");
Modification mod3 = new Modification(ModificationType.REPLACE, attr3);
List<Modification> mods = new ArrayList<Modification>();
@@ -1243,7 +1382,7 @@
mods.add(mod3);
cn = new ChangeNumber(time, ts++, serverId);
- DN dn = DN.decode("o=test,"+suffix);
+ DN dn = DN.decode("o=example,"+suffix);
ModifyMsg modMsg = new ModifyMsg(cn, dn,
mods, "fakeuniqueid");
l.add(modMsg);
@@ -1259,7 +1398,7 @@
// Del
cn = new ChangeNumber(time, ts++, serverId);
- DeleteMsg delMsg = new DeleteMsg("o=test,"+suffix, cn, "uid");
+ DeleteMsg delMsg = new DeleteMsg("o=example,"+suffix, cn, "uid");
l.add(delMsg);
}
catch(Exception e) {};
@@ -1271,189 +1410,207 @@
* Testing searches on the backend of the replication server.
* @throws Exception
*/
- private void searchBackend() throws Exception
+ // TODO: this test disabled as testReplicationBackendACIs() is failing
+ // : anonymous search returns entries from replication backend whereas it
+ // should not. Probably a previous test in the nightlytests suite is
+ // removing/modifying some ACIs...When problem foound, we have to re-enable
+ // this test.
+ @Test(enabled=false)
+ public void searchBackend() throws Exception
{
debugInfo("Starting searchBackend");
- // General search
- InternalSearchOperation op2 = connection.processSearch(
- new ASN1OctetString("cn=monitor"),
- SearchScope.WHOLE_SUBTREE,
- LDAPFilter.decode("(objectclass=*)"));
- assertEquals(op2.getResultCode(), ResultCode.SUCCESS,
- op2.getErrorMessage().toString());
-
- replicationServer.clearDb();
-
- LDIFWriter ldifWriter = null;
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- LDIFExportConfig exportConfig = new LDIFExportConfig(stream);
- try
- {
- ldifWriter = new LDIFWriter(exportConfig);
- }
- catch (Exception e){}
-
- debugInfo("Create broker");
ReplicationBroker server1 = null;
- try {
+ try
+ {
+
+ // General search
+ InternalSearchOperation op2 = connection.processSearch(
+ new ASN1OctetString("cn=monitor"),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode("(objectclass=*)"));
+ assertEquals(op2.getResultCode(), ResultCode.SUCCESS,
+ op2.getErrorMessage().toString());
+
+ replicationServer.clearDb();
+
+ LDIFWriter ldifWriter = null;
+ ByteArrayOutputStream stream = new ByteArrayOutputStream();
+ LDIFExportConfig exportConfig = new LDIFExportConfig(stream);
+ try
+ {
+ ldifWriter = new LDIFWriter(exportConfig);
+ }
+ catch (Exception e){}
+
+ debugInfo("Create broker");
+
server1 = openReplicationSession(
- DN.decode("dc=example,dc=com"), (short) 1, 100, replicationServerPort,
- 1000, true);
- }
- catch(Exception e) {}
+ DN.decode(TEST_ROOT_DN_STRING), (short) 1, 100, replicationServerPort,
+ 1000, true);
- debugInfo("Publish changes");
- List<UpdateMessage> msgs = createChanges("dc=example,dc=com", (short)1);
- for(UpdateMessage msg : msgs )
- {
- server1.publish(msg);
- }
- Thread.sleep(500);
+ assertTrue(server1.isConnected());
- // Sets manually the association backend-replication server since
- // no config object exist for our replication server.
- ReplicationBackend b =
- (ReplicationBackend)DirectoryServer.getBackend("replicationChanges");
- b.setServer(replicationServer);
- assertEquals(b.getEntryCount(), msgs.size());
- assertTrue(b.entryExists(DN.decode("dc=replicationChanges")));
- SearchFilter filter=SearchFilter.createFilterFromString("(objectclass=*)");
- assertTrue(b.isIndexed(filter));
- InternalClientConnection conn =
- InternalClientConnection.getRootConnection();
- LinkedList<Control> requestControls = new LinkedList<Control>();
- requestControls.add(new Control(OID_INTERNAL_GROUP_MEMBERSHIP_UPDATE,
- false));
- DN baseDN=DN.decode("dc=replicationChanges");
- //Test the group membership control causes search to be skipped.
- InternalSearchOperation internalSearch =
- new InternalSearchOperation(
- conn, InternalClientConnection.nextOperationID(),
- InternalClientConnection.nextMessageID(), requestControls,
- baseDN,
- SearchScope.WHOLE_SUBTREE,
- DereferencePolicy.NEVER_DEREF_ALIASES,
- 0, 0, false, filter, null, null);
- internalSearch.run();
- assertTrue(internalSearch.getResultCode() == ResultCode.SUCCESS);
- assertTrue(internalSearch.getSearchEntries().isEmpty());
-
- // General search
- InternalSearchOperation op = connection.processSearch(
- new ASN1OctetString("dc=oops"),
- SearchScope.WHOLE_SUBTREE,
- LDAPFilter.decode("(changetype=*)"));
- assertEquals(op.getResultCode(), ResultCode.NO_SUCH_OBJECT);
-
- testReplicationBackendACIs();
-
- // General search
- op = connection.processSearch(
- new ASN1OctetString("dc=replicationChanges"),
- SearchScope.WHOLE_SUBTREE,
- LDAPFilter.decode("(changetype=*)"));
-
- debugInfo("Search result");
- LinkedList<SearchResultEntry> entries = op.getSearchEntries();
- if (entries != null)
- {
- for (SearchResultEntry entry : entries)
+ debugInfo("Publish changes");
+ List<UpdateMsg> msgs = createChanges(TEST_ROOT_DN_STRING, (short)1);
+ for(UpdateMsg msg : msgs )
{
- debugInfo(entry.toLDIFString());
- ldifWriter.writeEntry(entry);
+ server1.publish(msg);
}
- }
- debugInfo("\n" + stream.toString());
+ Thread.sleep(500);
- assertEquals(op.getResultCode(), ResultCode.SUCCESS);
- assertEquals(op.getSearchEntries().size(), 5);
+ // Sets manually the association backend-replication server since
+ // no config object exist for our replication server.
+ ReplicationBackend b =
+ (ReplicationBackend)DirectoryServer.getBackend("replicationChanges");
+ b.setServer(replicationServer);
+ assertEquals(b.getEntryCount(), msgs.size());
+ assertTrue(b.entryExists(DN.decode("dc=replicationChanges")));
+ SearchFilter filter=SearchFilter.createFilterFromString("(objectclass=*)");
+ assertTrue(b.isIndexed(filter));
+ InternalClientConnection conn =
+ InternalClientConnection.getRootConnection();
+ LinkedList<Control> requestControls = new LinkedList<Control>();
+ requestControls.add(new Control(OID_INTERNAL_GROUP_MEMBERSHIP_UPDATE,
+ false));
+ DN baseDN=DN.decode("dc=replicationChanges");
+ //Test the group membership control causes search to be skipped.
+ InternalSearchOperation internalSearch =
+ new InternalSearchOperation(
+ conn, InternalClientConnection.nextOperationID(),
+ InternalClientConnection.nextMessageID(), requestControls,
+ baseDN,
+ SearchScope.WHOLE_SUBTREE,
+ DereferencePolicy.NEVER_DEREF_ALIASES,
+ 0, 0, false, filter, null, null);
+ internalSearch.run();
+ assertTrue(internalSearch.getResultCode() == ResultCode.SUCCESS);
+ assertTrue(internalSearch.getSearchEntries().isEmpty());
- debugInfo("Query / filter based on changetype");
- op = connection.processSearch(
- new ASN1OctetString("dc=replicationChanges"),
- SearchScope.WHOLE_SUBTREE,
- LDAPFilter.decode("(changetype=add)"));
- assertEquals(op.getResultCode(), ResultCode.SUCCESS);
- assertTrue(op.getSearchEntries().size() == 2);
-
- op = connection.processSearch(
- new ASN1OctetString("dc=replicationChanges"),
- SearchScope.WHOLE_SUBTREE,
- LDAPFilter.decode("(changetype=modify)"));
- assertEquals(op.getResultCode(), ResultCode.SUCCESS);
- assertTrue(op.getSearchEntries().size() == 1);
-
- op = connection.processSearch(
- new ASN1OctetString("dc=replicationChanges"),
- SearchScope.WHOLE_SUBTREE,
- LDAPFilter.decode("(changetype=moddn)"));
- assertEquals(op.getResultCode(), ResultCode.SUCCESS);
- assertTrue(op.getSearchEntries().size() == 1);
-
- op = connection.processSearch(
- new ASN1OctetString("dc=replicationChanges"),
- SearchScope.WHOLE_SUBTREE,
- LDAPFilter.decode("(changetype=delete)"));
- assertEquals(op.getResultCode(), ResultCode.SUCCESS);
- assertTrue(op.getSearchEntries().size() == 1);
-
- debugInfo("Query / filter based on objectclass");
- op = connection.processSearch(
- new ASN1OctetString("dc=replicationChanges"),
- SearchScope.WHOLE_SUBTREE,
- LDAPFilter.decode("(objectclass=person)"));
- assertEquals(op.getResultCode(), ResultCode.SUCCESS);
- assertEquals(op.getSearchEntries().size(), 1);
-
- debugInfo("Query / searchBase");
- op = connection.processSearch(
- new ASN1OctetString("uid=new person,ou=People,dc=example,dc=com,dc=replicationChanges"),
- SearchScope.WHOLE_SUBTREE,
- LDAPFilter.decode("(changetype=*)"));
- assertEquals(op.getResultCode(), ResultCode.SUCCESS);
- assertEquals(op.getSearchEntries().size(), 2);
-
- debugInfo("Query / 1 attrib");
-
- LinkedHashSet<String> attrs = new LinkedHashSet<String>(1);
- attrs.add("newrdn");
- SearchFilter ALLMATCH;
- ALLMATCH = SearchFilter.createFilterFromString("(changetype=moddn)");
- op =
- connection.processSearch(DN.decode("dc=replicationChanges"),
+ // General search
+ InternalSearchOperation op = connection.processSearch(
+ new ASN1OctetString("dc=oops"),
SearchScope.WHOLE_SUBTREE,
- DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false, ALLMATCH,
- attrs);
- assertEquals(op.getResultCode(), ResultCode.SUCCESS);
- assertEquals(op.getSearchEntries().size(), 1);
- entries = op.getSearchEntries();
- if (entries != null)
- {
- for (SearchResultEntry entry : entries)
+ LDAPFilter.decode("(changetype=*)"));
+ assertEquals(op.getResultCode(), ResultCode.NO_SUCH_OBJECT);
+
+ testReplicationBackendACIs();
+
+ // General search
+ op = connection.processSearch(
+ new ASN1OctetString("dc=replicationChanges"),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode("(changetype=*)"));
+
+ debugInfo("Search result");
+ LinkedList<SearchResultEntry> entries = op.getSearchEntries();
+ if (entries != null)
{
- debugInfo(entry.toLDIFString());
- ldifWriter.writeEntry(entry);
+ for (SearchResultEntry entry : entries)
+ {
+ debugInfo(entry.toLDIFString());
+ ldifWriter.writeEntry(entry);
+ }
}
- }
+ debugInfo("\n" + stream.toString());
- debugInfo("Query / All attribs");
- LinkedHashSet<String> attrs2 = new LinkedHashSet<String>(1);
- attrs.add("*");
- ALLMATCH = SearchFilter.createFilterFromString("(changetype=*)");
- op =
- connection.processSearch(DN.decode("dc=replicationChanges"),
+ assertEquals(op.getResultCode(), ResultCode.SUCCESS);
+ assertEquals(op.getSearchEntries().size(), 5);
+
+ debugInfo("Query / filter based on changetype");
+ op = connection.processSearch(
+ new ASN1OctetString("dc=replicationChanges"),
SearchScope.WHOLE_SUBTREE,
- DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false, ALLMATCH,
- attrs2);
- assertEquals(op.getResultCode(), ResultCode.SUCCESS);
- assertEquals(op.getSearchEntries().size(), 5);
+ LDAPFilter.decode("(changetype=add)"));
+ assertEquals(op.getResultCode(), ResultCode.SUCCESS);
+ assertTrue(op.getSearchEntries().size() == 2);
+ op = connection.processSearch(
+ new ASN1OctetString("dc=replicationChanges"),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode("(changetype=modify)"));
+ assertEquals(op.getResultCode(), ResultCode.SUCCESS);
+ assertTrue(op.getSearchEntries().size() == 1);
- if (server1 != null)
- server1.stop();
+ op = connection.processSearch(
+ new ASN1OctetString("dc=replicationChanges"),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode("(changetype=moddn)"));
+ assertEquals(op.getResultCode(), ResultCode.SUCCESS);
+ assertTrue(op.getSearchEntries().size() == 1);
- debugInfo("Successfully ending searchBackend");
+ op = connection.processSearch(
+ new ASN1OctetString("dc=replicationChanges"),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode("(changetype=delete)"));
+ assertEquals(op.getResultCode(), ResultCode.SUCCESS);
+ assertTrue(op.getSearchEntries().size() == 1);
+
+ debugInfo("Query / filter based on objectclass");
+ op = connection.processSearch(
+ new ASN1OctetString("dc=replicationChanges"),
+ SearchScope.WHOLE_SUBTREE,
+ LDAPFilter.decode("(objectclass=person)"));
+ assertEquals(op.getResultCode(), ResultCode.SUCCESS);
+ assertEquals(op.getSearchEntries().size(), 1);
+
+ /*
+ * It would be nice to be have the abilities to search for
+ * entries in the replication backend using the DN on which the
+ * operation was done as the search criteria.
+ * This is not possible yet, this part of the test is therefore
+ * disabled.
+ *
+ * debugInfo("Query / searchBase");
+ * op = connection.processSearch(
+ * new ASN1OctetString("uid=new person,ou=People,dc=example,dc=com,dc=replicationChanges"),
+ * SearchScope.WHOLE_SUBTREE,
+ * LDAPFilter.decode("(changetype=*)"));
+ * assertEquals(op.getResultCode(), ResultCode.SUCCESS);
+ * assertEquals(op.getSearchEntries().size(), 2);
+ */
+
+ debugInfo("Query / 1 attrib");
+
+ LinkedHashSet<String> attrs = new LinkedHashSet<String>(1);
+ attrs.add("newrdn");
+ SearchFilter ALLMATCH;
+ ALLMATCH = SearchFilter.createFilterFromString("(changetype=moddn)");
+ op =
+ connection.processSearch(DN.decode("dc=replicationChanges"),
+ SearchScope.WHOLE_SUBTREE,
+ DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false, ALLMATCH,
+ attrs);
+ assertEquals(op.getResultCode(), ResultCode.SUCCESS);
+ assertEquals(op.getSearchEntries().size(), 1);
+ entries = op.getSearchEntries();
+ if (entries != null)
+ {
+ for (SearchResultEntry entry : entries)
+ {
+ debugInfo(entry.toLDIFString());
+ ldifWriter.writeEntry(entry);
+ }
+ }
+
+ debugInfo("Query / All attribs");
+ LinkedHashSet<String> attrs2 = new LinkedHashSet<String>(1);
+ attrs.add("*");
+ ALLMATCH = SearchFilter.createFilterFromString("(changetype=*)");
+ op =
+ connection.processSearch(DN.decode("dc=replicationChanges"),
+ SearchScope.WHOLE_SUBTREE,
+ DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false, ALLMATCH,
+ attrs2);
+ assertEquals(op.getResultCode(), ResultCode.SUCCESS);
+ assertEquals(op.getSearchEntries().size(), 5);
+
+ debugInfo("Successfully ending searchBackend");
+
+ } finally {
+ if (server1 != null)
+ server1.stop();
+ }
}
private static final ByteArrayOutputStream oStream =
@@ -1532,28 +1689,28 @@
assertEquals(retVal, 53, "Returned error: " + eStream);
} catch(Exception e) {}
}
-
+
/**
- * Replication Server configuration test of the replication Server code with 2 replication servers involved
- * 2 tests are done here (itest=0 or itest=1)
+ * Replication Server configuration test of the replication Server code with
+ * 2 replication servers involved
*
* Test 1
* - Create replication server 1
- * - Create replication server 2
+ * - Create replication server 2
* - Connect replication server 1 to replication server 2
* - Create and connect client 1 to replication server 1
* - Create and connect client 2 to replication server 2
* - Make client1 publish changes
* - Check that client 2 receives the changes published by client 1
* Then
- * - Change the config of replication server 1 to no more be connected
+ * - Change the config of replication server 1 to no more be connected
* to server 2
* - Make client 1 publish a change
- * - Check that client 2 does not receive the change
+ * - Check that client 2 does not receive the change
*/
- @Test
private void replicationServerConnected() throws Exception
{
+ debugInfo("Starting replicationServerConnected");
ReplicationBroker broker1 = null;
ReplicationBroker broker2 = null;
boolean emptyOldChanges = true;
@@ -1571,7 +1728,7 @@
// find a free port
socket = TestCaseUtils.bindFreePort();
changelogPorts[i] = socket.getLocalPort();
- changelogIds[i] = i + 10;
+ changelogIds[i] = i + 90;
brokerIds[i] = (short) (100+i);
socket.close();
}
@@ -1579,29 +1736,32 @@
for (int i = 0; i <= 1; i++)
{
changelogs[i] = null;
- // create the 2 replicationServer
+ // create the 2 replicationServer
// and connect the first one to the other one
SortedSet<String> servers = new TreeSet<String>();
-
+
// Connect only replicationServer[0] to ReplicationServer[1]
// and not the other way
if (i==0)
servers.add("localhost:" + changelogPorts[1]);
ReplServerFakeConfiguration conf =
- new ReplServerFakeConfiguration(changelogPorts[i], "changelogDb"+i, 0,
+ new ReplServerFakeConfiguration(changelogPorts[i], "replicationServerTestReplicationServerConnectedDb"+i, 0,
changelogIds[i], 0, 100, servers);
changelogs[i] = new ReplicationServer(conf);
}
try
- {
+ {
// Create and connect client1 to changelog1
// and client2 to changelog2
- broker1 = openReplicationSession(DN.decode("dc=example,dc=com"),
+ broker1 = openReplicationSession(DN.decode(TEST_ROOT_DN_STRING),
brokerIds[0], 100, changelogPorts[0], 1000, emptyOldChanges);
-
- broker2 = openReplicationSession(DN.decode("dc=example,dc=com"),
- brokerIds[1], 100, changelogPorts[0], 1000, emptyOldChanges);
+
+ broker2 = openReplicationSession(DN.decode(TEST_ROOT_DN_STRING),
+ brokerIds[1], 100, changelogPorts[1], 1000, emptyOldChanges);
+
+ assertTrue(broker1.isConnected());
+ assertTrue(broker2.isConnected());
// - Test messages between clients by publishing now
long time = TimeThread.getTime();
@@ -1611,31 +1771,31 @@
String baseUUID = "22222222-2222-2222-2222-222222222222";
// - Add
- String lentry = new String("dn: o=test,dc=example,dc=com\n"
+ String lentry = new String("dn: o=example," + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n" + "objectClass: domain\n"
+ "entryUUID: "+ user1entryUUID +"\n");
Entry entry = TestCaseUtils.entryFromLdifString(lentry);
cn = new ChangeNumber(time, ts++, brokerIds[0]);
- AddMsg addMsg = new AddMsg(cn, "o=test,dc=example,dc=com",
+ AddMsg addMsg = new AddMsg(cn, "o=example," + TEST_ROOT_DN_STRING,
user1entryUUID, baseUUID, entry.getObjectClassAttribute(), entry
.getAttributes(), new ArrayList<Attribute>());
broker1.publish(addMsg);
// - Modify
- Attribute attr1 = new Attribute("description", "new value");
+ Attribute attr1 = Attributes.create("description", "new value");
Modification mod1 = new Modification(ModificationType.REPLACE, attr1);
List<Modification> mods = new ArrayList<Modification>();
mods.add(mod1);
cn = new ChangeNumber(time, ts++, brokerIds[0]);
ModifyMsg modMsg = new ModifyMsg(cn, DN
- .decode("o=test,dc=example,dc=com"), mods, "fakeuniqueid");
+ .decode("o=example," + TEST_ROOT_DN_STRING), mods, "fakeuniqueid");
broker1.publish(modMsg);
-
- // - Check msg received by broker, through changeLog2
+
+ // - Check msg received by broker, through changeLog2
while (ts > 1)
{
- ReplicationMessage msg2;
+ ReplicationMsg msg2;
try
{
msg2 = broker2.receive();
@@ -1671,37 +1831,52 @@
// Check that everything expected has been received
assertTrue(ts == 1, "Broker2 did not receive the complete set of"
+ " expected messages: #msg received " + ts);
-
+
// Then change the config to remove replicationServer[1] from
// the configuration of replicationServer[0]
-
- SortedSet<String> servers = new TreeSet<String>();
+
+ SortedSet<String> servers = new TreeSet<String>();
// Configure replicationServer[0] to be disconnected from ReplicationServer[1]
ReplServerFakeConfiguration conf =
new ReplServerFakeConfiguration(changelogPorts[0], "changelogDb0", 0,
changelogIds[0], 0, 100, servers);
changelogs[0].applyConfigurationChange(conf) ;
-
+ // Sleep a while to be sure disconnection occurs
+ sleep(1000);
+
// We expect the receive to end because of a timeout : the link between RS1 & RS2
// should be distroyed by the new configuration
// Send 1 update and check that RS[1] does not receive the message after the timeout
try
- {
+ {
// - Del
cn = new ChangeNumber(time, ts++, brokerIds[0]);
- DeleteMsg delMsg = new DeleteMsg("o=test,dc=example,dc=com", cn, user1entryUUID);
+ DeleteMsg delMsg = new DeleteMsg("o=example," + TEST_ROOT_DN_STRING, cn, user1entryUUID);
broker1.publish(delMsg);
- broker2.receive();
+ // Should receive some TopologyMsg messages for disconnection
+ // between the 2 RSs
+ ReplicationMsg msg = null;
+ while (true)
+ {
+ msg = broker2.receive();
+ if (msg instanceof TopologyMsg)
+ {
+ debugInfo("Broker 2 received: " + msg);
+ } else
+ {
+ fail("Broker: receive successed when it should fail. " +
+ "This broker was disconnected by configuration." +
+ " Received: " + msg);
+ }
+ }
}
catch (SocketTimeoutException soExc)
{
// the receive fail as expected
- return;
+ debugInfo("Ending replicationServerConnected");
+ return;
}
-
- fail("Broker: receive successed when it should fail. "
- + "This broker was disconnected by configuration");
}
finally
{
@@ -1714,5 +1889,16 @@
if (broker2 != null)
broker2.stop();
}
- }
+ }
+
+ private void sleep(long time)
+ {
+ try
+ {
+ Thread.sleep(time);
+ } catch (InterruptedException ex)
+ {
+ fail("Error sleeping " + ex.getMessage());
+ }
+ }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/UpdateComparatorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/UpdateComparatorTest.java
index ab5aa03..7222bc0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/UpdateComparatorTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/UpdateComparatorTest.java
@@ -40,12 +40,13 @@
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.protocol.DeleteContext;
import org.opends.server.replication.protocol.DeleteMsg;
-import org.opends.server.replication.protocol.UpdateMessage;
+import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.UpdateComparator;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.util.TimeThread;
import org.opends.server.workflowelement.localbackend.LocalBackendDeleteOperation;
+import static org.opends.server.TestCaseUtils.*;
@@ -66,14 +67,14 @@
(short) 123, (short) 45);
//
- // Create the update messgae
+ // Create the update message
InternalClientConnection connection =
InternalClientConnection.getRootConnection();
LocalBackendDeleteOperation op = null;
try
{
DeleteOperation opBasis =
- new DeleteOperationBasis(connection, 1, 1,null, DN.decode("dc=com"));
+ new DeleteOperationBasis(connection, 1, 1,null, DN.decode(TEST_ROOT_DN_STRING));
op = new LocalBackendDeleteOperation(opBasis);
}
catch (DirectoryException e)
@@ -100,7 +101,7 @@
*/
@Test(dataProvider = "updateMessageData")
public void updateMessageTest(
- UpdateMessage msg1, UpdateMessage msg2, int expected) throws Exception
+ UpdateMsg msg1, UpdateMsg msg2, int expected) throws Exception
{
assertEquals(UpdateComparator.comparator.compare(msg1, msg2), expected);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
index 738d25c..652ae5b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
@@ -40,7 +40,6 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.MatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.core.SchemaConfigManager;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
@@ -88,7 +87,7 @@
TreeSet<String> invalidOIDs = new TreeSet<String>();
Schema schema = DirectoryServer.getSchema();
- for (AttributeSyntax as : schema.getSyntaxes().values())
+ for (AttributeSyntax<?> as : schema.getSyntaxes().values())
{
if (! isNumericOID(as.getOID()))
{
@@ -126,7 +125,7 @@
TreeSet<String> invalidOIDs = new TreeSet<String>();
Schema schema = DirectoryServer.getSchema();
- for (MatchingRule mr : schema.getMatchingRules().values())
+ for (MatchingRule<?> mr : schema.getMatchingRules().values())
{
if (! isNumericOID(mr.getOID()))
{
@@ -199,7 +198,7 @@
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
AttributeType at = AttributeTypeSyntax.decodeAttributeType(
v.getValue(), DirectoryServer.getSchema(),
@@ -277,7 +276,7 @@
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
ObjectClass oc = ObjectClassSyntax.decodeObjectClass(
v.getValue(), DirectoryServer.getSchema(),
@@ -354,7 +353,7 @@
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
NameForm nf = NameFormSyntax.decodeNameForm(v.getValue(),
DirectoryServer.getSchema(), true);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
index 631af6d..f462b8c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
@@ -26,6 +26,8 @@
*/
package org.opends.server.snmp;
+
+
import com.sun.management.snmp.SnmpEngine;
import com.sun.management.snmp.SnmpOid;
import com.sun.management.snmp.SnmpOidTableSupport;
@@ -45,228 +47,267 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.types.Attributes;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
import org.testng.annotations.Test;
+
+
/**
* An abstract class that all SNMP unit test should extend.
*/
-@Test(enabled=true, groups = {"precommit", "snmp"}, sequential = true)
-public abstract class SNMPConnectionManager extends DirectoryServerTestCase {
+@Test(enabled = true, groups =
+{
+ "precommit", "snmp"
+}, sequential = true)
+public abstract class SNMPConnectionManager extends DirectoryServerTestCase
+{
- /**
- * Snmp Port
- */
- private int snmpPort;
-
- /**
- * Snmp Trap Port
- */
- private int trapSnmpPort;
+ /**
+ * Snmp Port
+ */
+ private int snmpPort;
- /**
- * Set Up the Directory Server
- * @throws java.lang.Exception
- */
- protected void setUp() throws Exception {
-
- // Make sure that the server is up and running.
- TestCaseUtils.restartServer();
- synchronized (this) {
- this.wait(500);
+ /**
+ * Snmp Trap Port
+ */
+ private int trapSnmpPort;
+
+
+
+ /**
+ * Set Up the Directory Server
+ *
+ * @throws java.lang.Exception
+ */
+ protected void setUp() throws Exception
+ {
+
+ // Make sure that the server is up and running.
+ TestCaseUtils.restartServer();
+ synchronized (this)
+ {
+ this.wait(500);
+ }
+ SNMPConnectionHandler snmpHandler = getSNMPConnectionHandler();
+ if (snmpHandler == null)
+ {
+ throw new Exception("Unable to get a SNMP connector");
+ }
+ }
+
+
+
+ /**
+ * Set Down the Directory Server.
+ *
+ * @throws java.lang.Exception
+ */
+ protected void setDown() throws Exception
+ {
+ TestCaseUtils.restartServer();
+ }
+
+
+
+ /**
+ * Gets the Snmp port on which the Connection Handler is listening
+ *
+ * @return
+ */
+ protected int getSnmpPort()
+ {
+ return this.snmpPort;
+ }
+
+
+
+ /**
+ * Gets the Snmp trap port on which the Connection Handler is
+ * listening
+ *
+ * @return
+ */
+ protected int getTrapSnmpPort()
+ {
+ return this.trapSnmpPort;
+ }
+
+
+
+ /**
+ * Gets an SNMP V3 peer agent (proxy)
+ *
+ * @param port
+ * @return
+ */
+ protected SnmpUsmPeer getSnmpV3Peer(int port)
+ {
+
+ try
+ {
+ String host = InetAddress.getLocalHost().getCanonicalHostName();
+ SnmpOidTableSupport oidTable = new DIRECTORY_SERVER_MIBOidTable();
+ SnmpOid.setSnmpOidTable(oidTable);
+
+ SnmpSession session = new SnmpSession("SyncManagerV3 session");
+ SnmpEngine engine = session.getEngine();
+ return new SnmpUsmPeer(engine, host, port);
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+ }
+
+
+
+ /**
+ * Gets an SNMP V2 agent peer (proxy)
+ *
+ * @param port
+ * @return
+ */
+ protected SnmpPeer getSnmpV2Peer(int port)
+ {
+
+ try
+ {
+ String host = InetAddress.getLocalHost().getCanonicalHostName();
+ SnmpOidTableSupport oidTable = new DIRECTORY_SERVER_MIBOidTable();
+ SnmpOid.setSnmpOidTable(oidTable);
+ return new SnmpPeer(host, port);
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+ }
+
+
+
+ /**
+ * Get a reference to the SNMP connection handler.
+ *
+ * @return an SNMP Connection handler
+ * @throws an
+ * Exception is something went wrong.
+ */
+ protected SNMPConnectionHandler getSNMPConnectionHandler() throws Exception
+ {
+ List<ConnectionHandler> handlers = DirectoryServer.getConnectionHandlers();
+ assertNotNull(handlers);
+ SNMPConnectionHandler snmpConnectionHandler = null;
+ for (ConnectionHandler handler : handlers)
+ {
+ if (handler instanceof SNMPConnectionHandler)
+ {
+ snmpConnectionHandler = (SNMPConnectionHandler) handler;
+ break;
+ }
+ }
+
+ if (snmpConnectionHandler == null)
+ {
+ enableSnmp();
+ synchronized (this)
+ {
+ this.wait(500);
+ }
+ for (ConnectionHandler handler : handlers)
+ {
+ if (handler instanceof SNMPConnectionHandler)
+ {
+ snmpConnectionHandler = (SNMPConnectionHandler) handler;
+ break;
}
- SNMPConnectionHandler snmpHandler = getSNMPConnectionHandler();
- if (snmpHandler == null) {
- throw new Exception("Unable to get a SNMP connector");
- }
+ }
}
-
- /**
- * Set Down the Directory Server.
- * @throws java.lang.Exception
- */
- protected void setDown() throws Exception {
- TestCaseUtils.restartServer();
- }
-
- /**
- * Gets the Snmp port on which the Connection Handler is listening
- * @return
- */
- protected int getSnmpPort() {
- return this.snmpPort;
- }
-
- /**
- * Gets the Snmp trap port on which the Connection Handler is listening
- * @return
- */
- protected int getTrapSnmpPort() {
- return this.trapSnmpPort;
- }
+ assertNotNull(snmpConnectionHandler);
+ return snmpConnectionHandler;
+ }
- /**
- * Gets an SNMP V3 peer agent (proxy)
- * @param port
- * @return
- */
- protected SnmpUsmPeer getSnmpV3Peer(int port) {
- try {
- String host = InetAddress.getLocalHost().getCanonicalHostName();
- SnmpOidTableSupport oidTable =
- new DIRECTORY_SERVER_MIBOidTable();
- SnmpOid.setSnmpOidTable(oidTable);
+ /**
+ * Enable SNMP with the port chosen in TestCaseUtils.
+ *
+ * @throws Exception
+ * if the handler cannot be enabled.
+ */
+ protected void enableSnmp() throws Exception
+ {
- SnmpSession session = new SnmpSession("SyncManagerV3 session");
- SnmpEngine engine = session.getEngine();
- return new SnmpUsmPeer(engine, host, port);
- } catch (Exception ex) {
- return null;
- }
- }
+ // Get a free port
+ this.snmpPort = TestCaseUtils.bindFreePort().getLocalPort();
+ this.trapSnmpPort = TestCaseUtils.bindFreePort().getLocalPort();
- /**
- * Gets an SNMP V2 agent peer (proxy)
- * @param port
- * @return
- */
- protected SnmpPeer getSnmpV2Peer(int port) {
+ ArrayList<Modification> mods = new ArrayList<Modification>();
- try {
- String host = InetAddress.getLocalHost().getCanonicalHostName();
- SnmpOidTableSupport oidTable = new DIRECTORY_SERVER_MIBOidTable();
- SnmpOid.setSnmpOidTable(oidTable);
- return new SnmpPeer(host, port);
- } catch (Exception ex) {
- return null;
- }
- }
+ InternalClientConnection conn = InternalClientConnection
+ .getRootConnection();
- /**
- * Get a reference to the SNMP connection handler.
- * @return an SNMP Connection handler
- * @throws an Exception is something went wrong.
- */
- protected SNMPConnectionHandler getSNMPConnectionHandler() throws Exception {
- List<ConnectionHandler> handlers =
- DirectoryServer.getConnectionHandlers();
- assertNotNull(handlers);
- SNMPConnectionHandler snmpConnectionHandler = null;
- for (ConnectionHandler handler : handlers) {
- if (handler instanceof SNMPConnectionHandler) {
- snmpConnectionHandler = (SNMPConnectionHandler) handler;
- break;
- }
- }
+ mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
+ "ds-cfg-listen-port", String.valueOf(this.snmpPort))));
- if (snmpConnectionHandler == null) {
- enableSnmp();
- synchronized (this) {
- this.wait(500);
- }
- for (ConnectionHandler handler : handlers) {
- if (handler instanceof SNMPConnectionHandler) {
- snmpConnectionHandler = (SNMPConnectionHandler) handler;
- break;
- }
- }
- }
- assertNotNull(snmpConnectionHandler);
- return snmpConnectionHandler;
- }
+ mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
+ "ds-cfg-trap-port", String.valueOf(this.trapSnmpPort))));
- /**
- * Enable SNMP with the port chosen in TestCaseUtils.
- *
- * @throws Exception
- * if the handler cannot be enabled.
- */
- protected void enableSnmp() throws Exception {
+ String hosts = InetAddress.getLocalHost().getCanonicalHostName();
- // Get a free port
- this.snmpPort = TestCaseUtils.bindFreePort().getLocalPort();
- this.trapSnmpPort = TestCaseUtils.bindFreePort().getLocalPort();
-
+ mods.add(new Modification(ModificationType.ADD, Attributes.create(
+ "ds-cfg-traps-destination", hosts)));
- ArrayList<Modification> mods = new ArrayList<Modification>();
+ String jarFileLocation = System
+ .getProperty("org.opends.server.snmp.opendmk");
- InternalClientConnection conn =
- InternalClientConnection.getRootConnection();
-
- mods.add(new Modification(ModificationType.REPLACE,
- new org.opends.server.types.Attribute(
- "ds-cfg-listen-port", String.valueOf(this.snmpPort))));
-
- mods.add(new Modification(ModificationType.REPLACE,
- new org.opends.server.types.Attribute(
- "ds-cfg-trap-port", String.valueOf(this.trapSnmpPort))));
-
- String hosts = InetAddress.getLocalHost().getCanonicalHostName();
-
- mods.add(new Modification(ModificationType.ADD,
- new org.opends.server.types.Attribute(
- "ds-cfg-traps-destination", hosts)));
+ mods.add(new Modification(ModificationType.ADD, Attributes.create(
+ "ds-cfg-opendmk-jarfile", jarFileLocation + File.separator
+ + "jdmkrt.jar")));
- String jarFileLocation =
- System.getProperty("org.opends.server.snmp.opendmk");
-
- mods.add(new Modification(ModificationType.ADD,
- new org.opends.server.types.Attribute(
- "ds-cfg-opendmk-jarfile", jarFileLocation + File.separator +
- "jdmkrt.jar")));
-
- ModifyOperationBasis op = new ModifyOperationBasis(
- conn,
- conn.nextOperationID(),
- conn.nextMessageID(),
- new ArrayList<Control>(),
- DN.decode("cn=SNMP Connection Handler,cn=Connection Handlers,cn=config"),
- mods);
- op.run();
-
- mods.clear();
+ ModifyOperationBasis op = new ModifyOperationBasis(conn, conn
+ .nextOperationID(), conn.nextMessageID(), new ArrayList<Control>(), DN
+ .decode("cn=SNMP Connection Handler,cn=Connection Handlers,cn=config"),
+ mods);
+ op.run();
- mods.add(new Modification(ModificationType.REPLACE,
- new org.opends.server.types.Attribute(
- "ds-cfg-enabled", "true")));
-
- op = new ModifyOperationBasis(
- conn,
- conn.nextOperationID(),
- conn.nextMessageID(),
- new ArrayList<Control>(),
- DN.decode("cn=SNMP Connection Handler,cn=Connection Handlers,cn=config"),
- mods);
-
- op.run();
- }
+ mods.clear();
- /**
- * Enable JMX with the port chosen in TestCaseUtils.
- *
- * @throws Exception
- * if the handler cannot be enabled.
- */
- protected void enableJmx() throws Exception {
- ArrayList<Modification> mods = new ArrayList<Modification>();
+ mods.add(new Modification(ModificationType.REPLACE, Attributes
+ .create("ds-cfg-enabled", "true")));
- InternalClientConnection conn = InternalClientConnection.getRootConnection();
- mods.add(new Modification(ModificationType.REPLACE,
- new org.opends.server.types.Attribute(
- "ds-cfg-enabled", "true")));
-
- ModifyOperationBasis op = new ModifyOperationBasis(
- conn,
- conn.nextOperationID(),
- conn.nextMessageID(),
- new ArrayList<Control>(),
- DN.decode("cn=JMX Connection Handler,cn=Connection Handlers,cn=config"),
- mods);
- op.run();
- }
+ op = new ModifyOperationBasis(conn, conn.nextOperationID(), conn
+ .nextMessageID(), new ArrayList<Control>(), DN
+ .decode("cn=SNMP Connection Handler,cn=Connection Handlers,cn=config"),
+ mods);
+
+ op.run();
+ }
+
+
+
+ /**
+ * Enable JMX with the port chosen in TestCaseUtils.
+ *
+ * @throws Exception
+ * if the handler cannot be enabled.
+ */
+ protected void enableJmx() throws Exception
+ {
+ ArrayList<Modification> mods = new ArrayList<Modification>();
+
+ InternalClientConnection conn = InternalClientConnection
+ .getRootConnection();
+ mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
+ "ds-cfg-enabled", "true")));
+
+ ModifyOperationBasis op = new ModifyOperationBasis(conn, conn
+ .nextOperationID(), conn.nextMessageID(), new ArrayList<Control>(), DN
+ .decode("cn=JMX Connection Handler,cn=Connection Handlers,cn=config"),
+ mods);
+ op.run();
+ }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
index 2157e7b..40c765c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
@@ -130,7 +130,7 @@
String taskDNStr =
"ds-task-id=add-single-valid-file,cn=Scheduled Tasks,cn=Tasks";
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -253,7 +253,7 @@
String taskDNStr =
"ds-task-id=add-multiple-valid-files,cn=Scheduled Tasks,cn=Tasks";
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -285,7 +285,7 @@
{
String taskDNStr =
"ds-task-id=add-missing-file-names,cn=Scheduled Tasks,cn=Tasks";
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -309,7 +309,7 @@
{
String taskDNStr =
"ds-task-id=add-missing-file,cn=Scheduled Tasks,cn=Tasks";
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -348,7 +348,7 @@
emptyFile.createNewFile();
String taskDNStr = "ds-task-id=add-empty-file,cn=Scheduled Tasks,cn=Tasks";
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -386,7 +386,7 @@
String taskDNStr =
"ds-task-id=add-invalid-file,cn=Scheduled Tasks,cn=Tasks";
- int resultCode = TestCaseUtils.applyModifications(
+ int resultCode = TestCaseUtils.applyModifications(true,
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
index 47331a1..43086ca 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
@@ -91,7 +91,8 @@
String[] args =
{
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-Z", "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-f", path
@@ -119,7 +120,8 @@
args = new String[]
{
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-Z", "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-f", path
@@ -153,7 +155,8 @@
args = new String[]
{
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-Z", "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-f", path
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java
index 9b18028..84f71cd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java
@@ -80,7 +80,7 @@
{
for (Attribute a : attrList)
{
- for (AttributeValue v : a.getValues())
+ for (AttributeValue v : a)
{
sleepTime = Long.parseLong(v.getStringValue());
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java
index 28a30b0..eddb106 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java
@@ -140,7 +140,8 @@
args = new String[]
{
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-Z", "-X",
"-D", "cn=Admin,o=test",
"-w", "password",
"--noPropertiesFile",
@@ -156,7 +157,8 @@
args = new String[]
{
"-h", localIP,
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-Z", "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"--noPropertiesFile",
@@ -171,7 +173,8 @@
args = new String[]
{
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-Z", "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"--noPropertiesFile",
@@ -267,7 +270,8 @@
args = new String[]
{
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-Z", "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"--noPropertiesFile",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
index 6b73bb3..bfe3470 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
@@ -26,6 +26,8 @@
*/
package org.opends.server.tools;
+
+
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -38,26 +40,36 @@
import org.testng.annotations.AfterClass;
import org.opends.server.tasks.TaskUtils;
+import org.opends.server.types.Attributes;
import org.opends.server.types.Entry;
import org.opends.server.types.DN;
import org.opends.server.types.Attribute;
-public class ImportLDIFTestCase extends ToolsTestCase {
+public class ImportLDIFTestCase extends ToolsTestCase
+{
private File tempDir;
+
private String ldifFilePath;
- String configFilePath ;
+
+ String configFilePath;
+
private String homeDirName;
+
private String beID;
+
private String baseDN = "dc=example,dc=com";
+
+
/**
- * Ensures that the ldif file is created with the entry.
- *
- * @throws Exception If an unexpected problem occurs.
- */
+ * Ensures that the ldif file is created with the entry.
+ *
+ * @throws Exception
+ * If an unexpected problem occurs.
+ */
@BeforeClass
public void setUp() throws Exception
{
@@ -66,31 +78,21 @@
configFilePath = DirectoryServer.getConfigFile();
TaskUtils.disableBackend(beID);
- String entry =
- "dn: dc=example,dc=com\n" +
- "objectclass: domain\n" +
- "objectclass: top\n" +
- "dc: example\n\n" +
- "dn: uid=user.0,dc=example,dc=com\n" +
- "objectClass: person\n" +
- "objectClass: inetorgperson\n" +
- "objectClass: organizationalPerson\n" +
- "objectClass: top\n" +
- "givenName: Aaccf\n" +
- "sn: Amar\n" +
- "cn: Aaccf Amar\n" +
- "employeeNumber: 0\n" +
- "uid: user.0\n" +
- "mail: user.0@example.com\n" +
- "userPassword: password\n" +
- "telephoneNumber: +1 380-535-2354\n" +
- "description: This is the description for Aaccf Amar\n" +
- "creatorsName: cn=Import\n" +
- "modifiersName: cn=Import\n";
+ String entry = "dn: dc=example,dc=com\n" + "objectclass: domain\n"
+ + "objectclass: top\n" + "dc: example\n\n"
+ + "dn: uid=user.0,dc=example,dc=com\n" + "objectClass: person\n"
+ + "objectClass: inetorgperson\n"
+ + "objectClass: organizationalPerson\n" + "objectClass: top\n"
+ + "givenName: Aaccf\n" + "sn: Amar\n" + "cn: Aaccf Amar\n"
+ + "employeeNumber: 0\n" + "uid: user.0\n"
+ + "mail: user.0@example.com\n" + "userPassword: password\n"
+ + "telephoneNumber: +1 380-535-2354\n"
+ + "description: This is the description for Aaccf Amar\n"
+ + "creatorsName: cn=Import\n" + "modifiersName: cn=Import\n";
tempDir = TestCaseUtils.createTemporaryDirectory("importLDIFtest");
homeDirName = tempDir.getAbsolutePath();
- ldifFilePath = homeDirName + File.separator + "entries.ldif";
+ ldifFilePath = homeDirName + File.separator + "entries.ldif";
FileOutputStream ldifFile = new FileOutputStream(ldifFilePath);
PrintStream writer = new PrintStream(ldifFile);
writer.println(entry);
@@ -101,10 +103,11 @@
/**
- * Tests an import of LDIF with only the operational attributes
+ * Tests an import of LDIF with only the operational attributes
* included.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
public void testImportIncludeOnlyOperational() throws Exception
@@ -114,62 +117,75 @@
String[] args =
{
- "-f",configFilePath,
- "--noPropertiesFile",
- "-l",ldifFilePath,
- "-R", rejectFilePath,
- "-n", beID,
- "-i", "+"
+ "-f",
+ configFilePath,
+ "--noPropertiesFile",
+ "-l",
+ ldifFilePath,
+ "-R",
+ rejectFilePath,
+ "-n",
+ beID,
+ "-i",
+ "+"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
- //Expecting a non-empty reject file.
- assertRejectedFile(reject,false);
+ assertEquals(
+ ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
+ // Expecting a non-empty reject file.
+ assertRejectedFile(reject, false);
}
/**
- * Tests an import of LDIF with only thel user attributes
- * included.
+ * Tests an import of LDIF with only thel user attributes included.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
- public void testImportIncludeOnlyUser() throws Exception
+ public void testImportIncludeOnlyUser() throws Exception
{
File reject = File.createTempFile("reject", ".ldif");
String rejectFilePath = reject.getAbsolutePath();
String[] args =
{
- "-f",configFilePath,
- "--noPropertiesFile",
- "-l",ldifFilePath,
- "-R", rejectFilePath,
- "-n", beID,
- "-i", "*"
+ "-f",
+ configFilePath,
+ "--noPropertiesFile",
+ "-l",
+ ldifFilePath,
+ "-R",
+ rejectFilePath,
+ "-n",
+ beID,
+ "-i",
+ "*"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
- //Expecting an empty reject file.
- assertRejectedFile(reject,true);
+ assertEquals(
+ ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
+ // Expecting an empty reject file.
+ assertRejectedFile(reject, true);
- Attribute[] opAttr =
+ Attribute[] opAttr =
{
- new Attribute ("creatorsname", "cn=Import") ,
- new Attribute("modifiersname","cn=Import")
- } ;
- //operational attributes shouldn't be present.
- assertEntry(opAttr,false);
+ Attributes.create("creatorsname", "cn=Import"),
+ Attributes.create("modifiersname", "cn=Import")
+ };
+ // operational attributes shouldn't be present.
+ assertEntry(opAttr, false);
}
/**
- * Tests a simple Import LDIF with none of the attributes
- * excluded or included. It is expected to import the entry(ies)
- * with all the attributes in the ldif file.
+ * Tests a simple Import LDIF with none of the attributes excluded
+ * or included. It is expected to import the entry(ies) with all the
+ * attributes in the ldif file.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
public void testImportDefault() throws Exception
@@ -179,33 +195,41 @@
String rejectFilePath = reject.getAbsolutePath();
String[] args =
{
- "-f", DirectoryServer.getConfigFile(),
- "--noPropertiesFile",
- "-l",ldifFilePath,
- "-n", beID,
- "-R", rejectFilePath
+ "-f",
+ DirectoryServer.getConfigFile(),
+ "--noPropertiesFile",
+ "-l",
+ ldifFilePath,
+ "-n",
+ beID,
+ "-R",
+ rejectFilePath
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
- //Reject file should be empty.
- assertRejectedFile(reject,true);
- //check the presence of some random attributes.
- Attribute[] attr =
+ assertEquals(
+ ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
+ // Reject file should be empty.
+ assertRejectedFile(reject, true);
+ // check the presence of some random attributes.
+ Attribute[] attr =
{
- new Attribute ("description",
- "This is the description for Aaccf Amar"),
- new Attribute("mail","user.0@example.com"),
- new Attribute ("creatorsname", "cn=Import") ,
- new Attribute("modifiersname","cn=Import")
- } ;
- assertEntry(attr,true);
+ Attributes.create("description",
+ "This is the description for Aaccf Amar"),
+ Attributes.create("mail", "user.0@example.com"),
+ Attributes.create("creatorsname", "cn=Import"),
+ Attributes.create("modifiersname", "cn=Import")
+ };
+ assertEntry(attr, true);
}
+
+
/**
- * Tests a simple Import LDIF using base DN with none of the attributes
- * excluded or included. It is expected to import the entry(ies)
- * with all the attributes in the ldif file.
+ * Tests a simple Import LDIF using base DN with none of the
+ * attributes excluded or included. It is expected to import the
+ * entry(ies) with all the attributes in the ldif file.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
public void testImportDefaultBaseDN() throws Exception
@@ -215,69 +239,82 @@
String rejectFilePath = reject.getAbsolutePath();
String[] args =
{
- "-f", DirectoryServer.getConfigFile(),
- "--noPropertiesFile",
- "-l", ldifFilePath,
- "-b", baseDN,
- "-R", rejectFilePath
+ "-f",
+ DirectoryServer.getConfigFile(),
+ "--noPropertiesFile",
+ "-l",
+ ldifFilePath,
+ "-b",
+ baseDN,
+ "-R",
+ rejectFilePath
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
- //Reject file should be empty.
- assertRejectedFile(reject,true);
- //check the presence of some random attributes.
- Attribute[] attr =
+ assertEquals(
+ ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
+ // Reject file should be empty.
+ assertRejectedFile(reject, true);
+ // check the presence of some random attributes.
+ Attribute[] attr =
{
- new Attribute ("description",
- "This is the description for Aaccf Amar"),
- new Attribute("mail","user.0@example.com"),
- new Attribute ("creatorsname", "cn=Import") ,
- new Attribute("modifiersname","cn=Import")
- } ;
- assertEntry(attr,true);
+ Attributes.create("description",
+ "This is the description for Aaccf Amar"),
+ Attributes.create("mail", "user.0@example.com"),
+ Attributes.create("creatorsname", "cn=Import"),
+ Attributes.create("modifiersname", "cn=Import")
+ };
+ assertEntry(attr, true);
}
/**
- * Tests an import of LDIF with all the user attributes included
- * but "description"
+ * Tests an import of LDIF with all the user attributes included but
+ * "description"
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
- public void testImportLDIFIncludeUserExcludeDescription()
- throws Exception
+ public void testImportLDIFIncludeUserExcludeDescription() throws Exception
{
- File reject = File.createTempFile("reject", ".ldif");
- String rejectFilePath = reject.getAbsolutePath();
+ File reject = File.createTempFile("reject", ".ldif");
+ String rejectFilePath = reject.getAbsolutePath();
String[] args =
{
- "-f", DirectoryServer.getConfigFile(),
- "--noPropertiesFile",
- "-l",ldifFilePath,
- "-n", beID,
- "-R",rejectFilePath,
- "-i","*",
- "-e", "description"
+ "-f",
+ DirectoryServer.getConfigFile(),
+ "--noPropertiesFile",
+ "-l",
+ ldifFilePath,
+ "-n",
+ beID,
+ "-R",
+ rejectFilePath,
+ "-i",
+ "*",
+ "-e",
+ "description"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
- assertRejectedFile(reject,true);
+ assertEquals(
+ ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
+ assertRejectedFile(reject, true);
Attribute[] attr =
- {
- new Attribute ("description",
- "This is the description for Aaccf Amar")
+ {
+ Attributes.create("description",
+ "This is the description for Aaccf Amar")
};
- assertEntry(attr,false);
+ assertEntry(attr, false);
}
/**
- * Tests an import of LDIF with all user attributes excluded option.
+ * Tests an import of LDIF with all user attributes excluded option.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
public void testImportLDIFExcludeUser() throws Exception
@@ -286,24 +323,32 @@
String rejectFilePath = reject.getAbsolutePath();
String[] args =
{
- "-f", DirectoryServer.getConfigFile(),
- "--noPropertiesFile",
- "-l",ldifFilePath,
- "-n", beID,
- "-R",rejectFilePath,
- "-e", "*"
+ "-f",
+ DirectoryServer.getConfigFile(),
+ "--noPropertiesFile",
+ "-l",
+ ldifFilePath,
+ "-n",
+ beID,
+ "-R",
+ rejectFilePath,
+ "-e",
+ "*"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
- assertRejectedFile(reject,false);
+ assertEquals(
+ ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
+ assertRejectedFile(reject, false);
}
/**
- * Tests an import of LDIF with all the operational attributes excluded option.
+ * Tests an import of LDIF with all the operational attributes
+ * excluded option.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
public void testImportLDIFExcludeOperational() throws Exception
@@ -313,29 +358,37 @@
String rejectFilePath = reject.getAbsolutePath();
String[] args =
{
- "-f", DirectoryServer.getConfigFile(),
- "--noPropertiesFile",
- "-l",ldifFilePath,
- "-n", beID,
- "-R",rejectFilePath,
- "-e", "+"
+ "-f",
+ DirectoryServer.getConfigFile(),
+ "--noPropertiesFile",
+ "-l",
+ ldifFilePath,
+ "-n",
+ beID,
+ "-R",
+ rejectFilePath,
+ "-e",
+ "+"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
- assertRejectedFile(reject,true);
- Attribute[] attrs = {
- new Attribute ("creatorsname", "cn=Import") ,
- new Attribute("modifiersname","cn=Import")
+ assertEquals(
+ ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
+ assertRejectedFile(reject, true);
+ Attribute[] attrs =
+ {
+ Attributes.create("creatorsname", "cn=Import"),
+ Attributes.create("modifiersname", "cn=Import")
};
- assertEntry(attrs,false);
+ assertEntry(attrs, false);
}
- /**
- * Tests an import of LDIF with all user attributes and
- * one operational attribute included..
+ /**
+ * Tests an import of LDIF with all user attributes and one
+ * operational attribute included..
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
public void testImportLDIFUserAndOperational() throws Exception
@@ -345,29 +398,38 @@
String rejectFilePath = reject.getAbsolutePath();
String[] args =
{
- "-f", DirectoryServer.getConfigFile(),
- "--noPropertiesFile",
- "-l",ldifFilePath,
- "-n", beID,
- "-R",rejectFilePath,
- "-i", "*",
- "-i","creatorsname"
+ "-f",
+ DirectoryServer.getConfigFile(),
+ "--noPropertiesFile",
+ "-l",
+ ldifFilePath,
+ "-n",
+ beID,
+ "-R",
+ rejectFilePath,
+ "-i",
+ "*",
+ "-i",
+ "creatorsname"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
- assertRejectedFile(reject,true);
- Attribute[] attrs = {
- new Attribute ("creatorsname", "cn=Import")
+ assertEquals(
+ ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
+ assertRejectedFile(reject, true);
+ Attribute[] attrs =
+ {
+ Attributes.create("creatorsname", "cn=Import")
};
- assertEntry(attrs,true);
+ assertEntry(attrs, true);
}
- /**
- * Tests an import of LDIF with select user and operational
+ /**
+ * Tests an import of LDIF with select user and operational
* attributes included..
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
public void testImportLDIFSelectiveIncludeAttributes() throws Exception
@@ -377,37 +439,50 @@
String rejectFilePath = reject.getAbsolutePath();
String[] args =
{
- "-f", DirectoryServer.getConfigFile(),
- "--noPropertiesFile",
- "-l",ldifFilePath,
- "-n", beID,
- "-R",rejectFilePath,
- "-i", "cn",
- "-i", "uid",
- "-i", "dc",
- "-i", "sn",
- "-i","creatorsname"
+ "-f",
+ DirectoryServer.getConfigFile(),
+ "--noPropertiesFile",
+ "-l",
+ ldifFilePath,
+ "-n",
+ beID,
+ "-R",
+ rejectFilePath,
+ "-i",
+ "cn",
+ "-i",
+ "uid",
+ "-i",
+ "dc",
+ "-i",
+ "sn",
+ "-i",
+ "creatorsname"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
- assertRejectedFile(reject,true);
- Attribute[] attrsPr = {
- new Attribute ("creatorsname", "cn=Import")
+ assertEquals(
+ ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
+ assertRejectedFile(reject, true);
+ Attribute[] attrsPr =
+ {
+ Attributes.create("creatorsname", "cn=Import")
};
- assertEntry(attrsPr,true);
- Attribute[] attrsAb = {
- new Attribute ("givenname", "Aaccf"),
- new Attribute("employeenumber","0")
+ assertEntry(attrsPr, true);
+ Attribute[] attrsAb =
+ {
+ Attributes.create("givenname", "Aaccf"),
+ Attributes.create("employeenumber", "0")
};
- assertEntry(attrsAb,false);
+ assertEntry(attrsAb, false);
}
/**
- * Tests an import of LDIF with select user and operational
+ * Tests an import of LDIF with select user and operational
* attributes encluded..
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@Test
public void testImportLDIFSelectiveExcludeAttributes() throws Exception
@@ -417,72 +492,88 @@
String rejectFilePath = reject.getAbsolutePath();
String[] args =
{
- "-f", DirectoryServer.getConfigFile(),
- "--noPropertiesFile",
- "-l",ldifFilePath,
- "-n", beID,
- "-R",rejectFilePath,
- "-e", "givenName",
- "-e","creatorsname"
+ "-f",
+ DirectoryServer.getConfigFile(),
+ "--noPropertiesFile",
+ "-l",
+ ldifFilePath,
+ "-n",
+ beID,
+ "-R",
+ rejectFilePath,
+ "-e",
+ "givenName",
+ "-e",
+ "creatorsname"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
- assertRejectedFile(reject,true);
- Attribute[] attrsPr = {
- new Attribute ("modifiersname", "cn=Import"),
- new Attribute("employeenumber","0")
+ assertEquals(
+ ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
+ assertRejectedFile(reject, true);
+ Attribute[] attrsPr =
+ {
+ Attributes.create("modifiersname", "cn=Import"),
+ Attributes.create("employeenumber", "0")
};
- assertEntry(attrsPr,true);
- Attribute[] attrsAb = {
- new Attribute ("creatorsname", "cn=Import"),
- new Attribute("givenname","Aaccf")
+ assertEntry(attrsPr, true);
+ Attribute[] attrsAb =
+ {
+ Attributes.create("creatorsname", "cn=Import"),
+ Attributes.create("givenname", "Aaccf")
};
- assertEntry(attrsAb,false);
+ assertEntry(attrsAb, false);
}
/**
- * Utility method which is called by the testcase for asserting
- * the rejected file.
+ * Utility method which is called by the testcase for asserting the
+ * rejected file.
*
- * @param reject The file to be asserted
- * @param shouldBeEmpty whether the file should be empty.
+ * @param reject
+ * The file to be asserted
+ * @param shouldBeEmpty
+ * whether the file should be empty.
*/
private void assertRejectedFile(File reject, boolean shouldBeEmpty)
{
- if(shouldBeEmpty)
+ if (shouldBeEmpty)
{
- assertEquals(reject.length(),0);
+ assertEquals(reject.length(), 0);
}
else
{
- assertFalse(reject.length()==0);
+ assertFalse(reject.length() == 0);
}
reject.delete();
}
+
/**
- * Utility method which is called by the testcase for asserting
- * the imported entry.
+ * Utility method which is called by the testcase for asserting the
+ * imported entry.
*
- * @param attrs The array of attributes to be asserted.
- * @param assertType the boolean flag for assert type.
- * @throws Exception If an unexpected problem occurs.
+ * @param attrs
+ * The array of attributes to be asserted.
+ * @param assertType
+ * the boolean flag for assert type.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
- private void assertEntry(Attribute[] attrs,boolean assertType) throws Exception
+ private void assertEntry(Attribute[] attrs, boolean assertType)
+ throws Exception
{
- if(attrs != null && attrs.length > 0)
+ if (attrs != null && attrs.length > 0)
{
TaskUtils.enableBackend(beID);
- Entry entry = DirectoryServer.getEntry(DN.decode(
- " uid=user.0,dc=example,dc=com"));
+ Entry entry = DirectoryServer.getEntry(DN
+ .decode(" uid=user.0,dc=example,dc=com"));
TaskUtils.disableBackend(beID);
assertNotNull(entry);
List<Attribute> list = entry.getAttributes();
- for(Attribute a : attrs)
+ for (Attribute a : attrs)
{
- if(assertType)
+ if (assertType)
{
assertTrue(list.contains(a));
}
@@ -499,12 +590,13 @@
/**
* Clean up method.
*
- * @throws Exception If an unexpected problem occurs.
+ * @throws Exception
+ * If an unexpected problem occurs.
*/
@AfterClass
public void cleanUp() throws Exception
{
- //reinstate the backend.
+ // reinstate the backend.
TaskUtils.enableBackend(beID);
TestCaseUtils.deleteDirectory(tempDir);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java
index b63cc0f..381e392 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java
@@ -277,7 +277,8 @@
String[] args =
{
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test"
@@ -298,7 +299,8 @@
{
"invalid-subcommand",
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test"
@@ -336,7 +338,8 @@
{
"get-all",
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "",
"-w", "",
"-b", "uid=test.user,o=test"
@@ -374,7 +377,8 @@
{
"get-all",
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "uid=test.user,o=test",
"-w", "password",
"-b", "uid=test.user,o=test"
@@ -386,86 +390,6 @@
/**
- * Tests the ability to use the manage-account tool when using SSL.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- @Test
- public void testUsingSSL()
- throws Exception
- {
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.addEntry(
- "dn: uid=test.user,o=test",
- "objectClass: top",
- "objectClass: person",
- "objectClass: organizationalPerson",
- "objectClass: inetOrgPerson",
- "uid: test.user",
- "givenName: Test",
- "sn: User",
- "cn: Test User",
- "userPassword: password"
- );
-
- String[] args =
- {
- "get-all",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapsPort()),
- "-Z",
- "-X",
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-b", "uid=test.user,o=test"
- };
-
- assertEquals(ManageAccount.main(args, null, System.err), 0);
- }
-
-
-
- /**
- * Tests the ability to use the manage-account tool when using StartTLS.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- @Test
- public void testUsingStartTLS()
- throws Exception
- {
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.addEntry(
- "dn: uid=test.user,o=test",
- "objectClass: top",
- "objectClass: person",
- "objectClass: organizationalPerson",
- "objectClass: inetOrgPerson",
- "uid: test.user",
- "givenName: Test",
- "sn: User",
- "cn: Test User",
- "userPassword: password"
- );
-
- String[] args =
- {
- "get-all",
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-q",
- "-X",
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-b", "uid=test.user,o=test"
- };
-
- assertEquals(ManageAccount.main(args, null, System.err), 0);
- }
-
-
-
- /**
* Tests the ability to use the manage-account tool when using SASL
* authentication.
*
@@ -493,7 +417,8 @@
{
"get-all",
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-o", "mech=PLAIN",
"-o", "authid=dn:cn=Directory Manager",
"-w", "password",
@@ -535,7 +460,8 @@
{
subCommand,
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test",
@@ -576,7 +502,8 @@
{
subCommand,
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test",
@@ -618,7 +545,8 @@
{
subCommand,
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test",
@@ -660,7 +588,8 @@
{
subCommand,
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test",
@@ -702,7 +631,8 @@
{
subCommand,
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test",
@@ -744,7 +674,8 @@
{
subCommand,
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test"
@@ -785,7 +716,8 @@
{
subCommand,
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test",
@@ -827,7 +759,8 @@
{
subCommand,
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test",
@@ -869,7 +802,8 @@
{
subCommand,
"-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
+ "-X",
"-D", "cn=Directory Manager",
"-w", "password",
"-b", "uid=test.user,o=test",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java
index c89bd7a..c1a4d30 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java
@@ -37,7 +37,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
@@ -75,7 +75,7 @@
InternalClientConnection.getRootConnection();
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.ADD,
- new Attribute("ds-cfg-base-dn", "o=airius.com")));
+ Attributes.create("ds-cfg-base-dn", "o=airius.com")));
String userRootDN = "ds-cfg-backend-id=userRoot,cn=Backends,cn=config";
ModifyOperation modifyOperation =
rootConnection.processModify(DN.decode(userRootDN), mods);
@@ -97,7 +97,7 @@
InternalClientConnection.getRootConnection();
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("ds-cfg-base-dn", "o=airius.com")));
+ Attributes.create("ds-cfg-base-dn", "o=airius.com")));
String userRootDN = "ds-cfg-backend-id=userRoot,cn=Backends,cn=config";
ModifyOperation modifyOperation =
rootConnection.processModify(DN.decode(userRootDN), mods);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java
index c4316ca..0ad6fa5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java
@@ -27,23 +27,22 @@
package org.opends.server.tools;
-import java.util.ArrayList;
+import static org.testng.Assert.*;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import java.util.ArrayList;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
import org.opends.server.types.ResultCode;
-
-import static org.testng.Assert.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
@@ -75,7 +74,7 @@
InternalClientConnection.getRootConnection();
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.ADD,
- new Attribute("ds-cfg-base-dn", "o=airius.com")));
+ Attributes.create("ds-cfg-base-dn", "o=airius.com")));
String userRootDN = "ds-cfg-backend-id=userRoot,cn=Backends,cn=config";
ModifyOperation modifyOperation =
rootConnection.processModify(DN.decode(userRootDN), mods);
@@ -97,7 +96,7 @@
InternalClientConnection.getRootConnection();
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("ds-cfg-base-dn", "o=airius.com")));
+ Attributes.create("ds-cfg-base-dn", "o=airius.com")));
String userRootDN = "ds-cfg-backend-id=userRoot,cn=Backends,cn=config";
ModifyOperation modifyOperation =
rootConnection.processModify(DN.decode(userRootDN), mods);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
index fd6f201..071e3e4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
@@ -106,9 +106,10 @@
"--noPropertiesFile",
"-Q",
"list-connection-handlers",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-D", "malformed",
- "-w", "password"
+ "-w", "password",
+ "-X"
};
assertFalse(DSConfig.main(args, false, null, null)
@@ -127,9 +128,10 @@
"--noPropertiesFile",
"-Q",
"list-connection-handlers",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-D", "cn=Does Not Exist",
- "-w", "password"
+ "-w", "password",
+ "-X"
};
assertFalse(DSConfig.main(args, false, System.out, System.err)
@@ -148,9 +150,10 @@
"--noPropertiesFile",
"-Q",
"list-connection-handlers",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-D", "cn=Directory Manager",
- "-w", "wrongPassword"
+ "-w", "wrongPassword",
+ "-X"
};
assertFalse(DSConfig.main(args, false, System.out, System.err)
@@ -175,9 +178,10 @@
"--noPropertiesFile",
"-Q",
"list-connection-handlers",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-D", "cn=Directory Manager",
"-j", validPasswordFile,
+ "-X"
};
assertEquals(DSConfig.main(args, false, System.out,
@@ -199,38 +203,16 @@
"--noPropertiesFile",
"-Q",
"list-connection-handlers",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-D", "cn=Directory Manager",
- "-j",invalidPasswordFile
+ "-j",invalidPasswordFile,
+ "-X"
};
assertFalse(DSConfig.main(args, false, System.out, System.err)
== SUCCESSFUL.getReturnCode());
}
- /**
- * Tests a list-connection-handlerss over SSL using blind trust.
- */
- @Test()
- public void testListConnectionHandlersSSLBlindTrust()
- {
- String[] args =
- {
- "-n",
- "--noPropertiesFile",
- "-Q",
- "list-connection-handlers",
- "-p", String.valueOf(TestCaseUtils.getServerLdapsPort()),
- "-w", "password",
- "-Z",
- "-X"
- };
-
- assertEquals(DSConfig.main(args, false, System.out,
- System.err), SUCCESSFUL.getReturnCode());
- }
-
-
/**
* Tests list-connection-handlers over SSL using a trust store.
@@ -239,7 +221,7 @@
public void testListConnectionHandlersSSLTrustStore()
{
String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
- "config" + File.separator + "client.truststore";
+ "config" + File.separator + "admin-truststore";
String[] args =
{
@@ -247,9 +229,8 @@
"--noPropertiesFile",
"-Q",
"list-connection-handlers",
- "-p", String.valueOf(TestCaseUtils.getServerLdapsPort()),
+ "-p", String.valueOf(TestCaseUtils.getServerAdminPort()),
"-w", "password",
- "-Z",
"-P", trustStorePath
};
@@ -258,56 +239,6 @@
}
-
- /**
- * Tests a list-connection-handlers using StartTLS with blind trust.
- */
- @Test()
- public void testListConnectionHandlersStartTLSBlindTrust()
- {
- String[] args =
- {
- "-n",
- "--noPropertiesFile",
- "-Q",
- "list-connection-handlers",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-w", "password",
- "-q",
- "-X"
- };
-
- assertEquals(DSConfig.main(args, false, null, System.err),
- SUCCESSFUL.getReturnCode());
- }
-
-
-
- /**
- * Tests a list-connection-handlers using StartTLS with a trust store.
- */
- @Test()
- public void testListConnectionHandlersStartTLSTrustStore()
- {
- String trustStorePath = DirectoryServer.getInstanceRoot() + File.separator +
- "config" + File.separator + "client.truststore";
-
- String[] args =
- {
- "-n",
- "--noPropertiesFile",
- "-Q",
- "list-connection-handlers",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-w", "password",
- "-q",
- "-P", trustStorePath
- };
-
- assertEquals(DSConfig.main(args, false, null, System.err),
- SUCCESSFUL.getReturnCode());
- }
-
/**
* Tests the dsconfig with the "--help" option.
*/
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
new file mode 100644
index 0000000..c0c7606
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
@@ -0,0 +1,2064 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.types;
+
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import org.opends.server.TestCaseUtils;
+import org.opends.server.core.DirectoryServer;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+
+
+/**
+ * This class defines a set of tests for the
+ * org.opends.server.core.AttributeBuilder class.
+ */
+public class AttributeBuilderTest extends TypesTestCase
+{
+
+ // CN attribute type used in all tests.
+ private AttributeType cnType = null;
+
+ // CN attribute value used in all tests.
+ private AttributeValue cnValue = null;
+
+ private final String[] noOptions = new String[] {};
+
+ private final String[] noValues = new String[] {};
+
+ private final String[] oneOption = new String[]
+ {
+ "option1"
+ };
+
+ private final String[] oneValue = new String[]
+ {
+ "value1"
+ };
+
+ private final String[] replaceValues = new String[]
+ {
+ "value2", "value4"
+ };
+
+ private final String[] threeOptions = new String[]
+ {
+ "option1", "option2", "option3"
+ };
+
+ private final String[] threeValues = new String[]
+ {
+ "value1", "value2", "value3"
+ };
+
+ private final String[] twoOptions = new String[]
+ {
+ "option1", "option2"
+ };
+
+ private final String[] twoValues = new String[]
+ {
+ "value1", "value2"
+ };
+
+
+
+ /**
+ * Attribute data provider.
+ *
+ * @return The array of test attributes and their expected state.
+ */
+ @DataProvider(name = "createAttributes")
+ public Object[][] createAttributes()
+ {
+ // Test testCase #, Attribute a, AttributeType type, String name,
+ // String[] options, String[] values.
+
+ return new Object[][]
+ {
+ {
+ 1,
+ Attributes.empty(cnType),
+ cnType,
+ "cn",
+ noOptions,
+ noValues
+ },
+ {
+ 2, Attributes.empty("cn"), cnType, "cn", noOptions, noValues
+ },
+ {
+ 3, Attributes.empty("CN"), cnType, "CN", noOptions, noValues
+ },
+ {
+ 4,
+ Attributes.empty(cnType, "CN"),
+ cnType,
+ "CN",
+ noOptions,
+ noValues
+ },
+ {
+ 5,
+ Attributes.empty(Attributes.empty(cnType, "CN")),
+ cnType,
+ "CN",
+ noOptions,
+ noValues
+ },
+ {
+ 6,
+ Attributes.empty(Attributes.create(cnType, "CN",
+ "john doe")),
+ cnType,
+ "CN",
+ noOptions,
+ noValues
+ },
+ {
+ 7,
+ Attributes.create(cnType, cnValue),
+ cnType,
+ "cn",
+ noOptions,
+ new String[]
+ {
+ cnValue.getStringValue()
+ }
+ },
+ {
+ 8,
+ Attributes.create(cnType, "JOHN DOE"),
+ cnType,
+ "cn",
+ noOptions,
+ new String[]
+ {
+ cnValue.getStringValue()
+ }
+ },
+ {
+ 9,
+ Attributes.create("cn", "JOHN DOE"),
+ cnType,
+ "cn",
+ noOptions,
+ new String[]
+ {
+ cnValue.getStringValue()
+ }
+ },
+ {
+ 10,
+ Attributes.create("CN", "JOHN DOE"),
+ cnType,
+ "CN",
+ noOptions,
+ new String[]
+ {
+ cnValue.getStringValue()
+ }
+ },
+ {
+ 11,
+ Attributes.create(cnType, "CN", cnValue),
+ cnType,
+ "CN",
+ noOptions,
+ new String[]
+ {
+ cnValue.getStringValue()
+ }
+ },
+ {
+ 12,
+ Attributes.create(cnType, "CN", "JOHN DOE"),
+ cnType,
+ "CN",
+ noOptions,
+ new String[]
+ {
+ cnValue.getStringValue()
+ }
+ },
+ {
+ 13,
+ createAttribute(cnType, "cn", noOptions, noValues),
+ cnType,
+ "cn",
+ noOptions,
+ noValues
+ },
+ {
+ 14,
+ createAttribute(cnType, "cn", oneOption, noValues),
+ cnType,
+ "cn",
+ oneOption,
+ noValues
+ },
+ {
+ 15,
+ createAttribute(cnType, "cn", twoOptions, noValues),
+ cnType,
+ "cn",
+ twoOptions,
+ noValues
+ },
+ {
+ 16,
+ createAttribute(cnType, "cn", threeOptions, noValues),
+ cnType,
+ "cn",
+ threeOptions,
+ noValues
+ },
+ {
+ 17,
+ createAttribute(cnType, "cn", noOptions, oneValue),
+ cnType,
+ "cn",
+ noOptions,
+ oneValue
+ },
+ {
+ 18,
+ createAttribute(cnType, "cn", oneOption, oneValue),
+ cnType,
+ "cn",
+ oneOption,
+ oneValue
+ },
+ {
+ 19,
+ createAttribute(cnType, "cn", twoOptions, oneValue),
+ cnType,
+ "cn",
+ twoOptions,
+ oneValue
+ },
+ {
+ 20,
+ createAttribute(cnType, "cn", threeOptions, oneValue),
+ cnType,
+ "cn",
+ threeOptions,
+ oneValue
+ },
+ {
+ 21,
+ createAttribute(cnType, "cn", noOptions, twoValues),
+ cnType,
+ "cn",
+ noOptions,
+ twoValues
+ },
+ {
+ 22,
+ createAttribute(cnType, "cn", oneOption, twoValues),
+ cnType,
+ "cn",
+ oneOption,
+ twoValues
+ },
+ {
+ 23,
+ createAttribute(cnType, "cn", twoOptions, twoValues),
+ cnType,
+ "cn",
+ twoOptions,
+ twoValues
+ },
+ {
+ 24,
+ createAttribute(cnType, "cn", threeOptions, twoValues),
+ cnType,
+ "cn",
+ threeOptions,
+ twoValues
+ },
+ {
+ 25,
+ createAttribute(cnType, "cn", noOptions, threeValues),
+ cnType,
+ "cn",
+ noOptions,
+ threeValues
+ },
+ {
+ 26,
+ createAttribute(cnType, "cn", oneOption, threeValues),
+ cnType,
+ "cn",
+ oneOption,
+ threeValues
+ },
+ {
+ 27,
+ createAttribute(cnType, "cn", twoOptions, threeValues),
+ cnType,
+ "cn",
+ twoOptions,
+ threeValues
+ },
+ {
+ 28,
+ createAttribute(cnType, "cn", threeOptions, threeValues),
+ cnType,
+ "cn",
+ threeOptions,
+ threeValues
+ },
+ {
+ 29,
+ new AttributeBuilder(cnType).toAttribute(),
+ cnType,
+ "cn",
+ noOptions,
+ noValues
+ },
+ {
+ 30,
+ new AttributeBuilder("cn").toAttribute(),
+ cnType,
+ "cn",
+ noOptions,
+ noValues
+ },
+ {
+ 31,
+ new AttributeBuilder("CN").toAttribute(),
+ cnType,
+ "CN",
+ noOptions,
+ noValues
+ },
+ {
+ 32,
+ new AttributeBuilder(cnType, "cn").toAttribute(),
+ cnType,
+ "cn",
+ noOptions,
+ noValues
+ },
+ {
+ 33,
+ new AttributeBuilder(cnType, "CN").toAttribute(),
+ cnType,
+ "CN",
+ noOptions,
+ noValues
+ },
+ {
+ 34,
+ new AttributeBuilder(createAttribute(cnType, "CN", threeOptions,
+ threeValues)).toAttribute(),
+ cnType,
+ "CN",
+ threeOptions,
+ threeValues
+ },
+ {
+ 35,
+ new AttributeBuilder(createAttribute(cnType, "CN", threeOptions,
+ threeValues), false).toAttribute(),
+ cnType,
+ "CN",
+ threeOptions,
+ threeValues
+ },
+ {
+ 36,
+ new AttributeBuilder(createAttribute(cnType, "CN", threeOptions,
+ threeValues), true).toAttribute(),
+ cnType,
+ "CN",
+ threeOptions,
+ noValues
+ },
+ };
+ }
+
+
+
+ /**
+ * Attribute data provider.
+ *
+ * @return The array of test attributes and their expected state.
+ */
+ @DataProvider(name = "createCompareAttributes")
+ public Object[][] createCompareAttributes()
+ {
+ // Test testCase #, Attribute a1, Attribute a2, isEquals.
+
+ return new Object[][]
+ {
+ {
+ 1,
+ Attributes.empty(cnType),
+ Attributes.empty(cnType),
+ true
+ },
+ {
+ 2,
+ Attributes.empty(cnType, "CN"),
+ Attributes.empty(cnType, "cn"),
+ true
+ },
+ {
+ 3,
+ Attributes.empty(cnType),
+ Attributes.empty("CN"),
+ true
+ },
+ {
+ 4, Attributes.empty("cn"), Attributes.empty("cn"), true
+ },
+ {
+ 5, Attributes.empty("cn"), Attributes.empty("CN"), true
+ },
+ {
+ 6, Attributes.empty("CN"), Attributes.empty("cn"), true
+ },
+ {
+ 7,
+ Attributes.empty("CN"),
+ Attributes.empty("description"),
+ false
+ },
+ {
+ 8,
+ Attributes.empty("description"),
+ Attributes.empty("cn"),
+ false
+ },
+ {
+ 9,
+ Attributes.create("CN", "test"),
+ Attributes.create("cn", "test"),
+ true
+ },
+ {
+ 10,
+ Attributes.create("description", "test"),
+ Attributes.create("cn", "test"),
+ false
+ },
+ {
+ 11,
+ Attributes.create("cn", "test1"),
+ Attributes.create("cn", "test2"),
+ false
+ },
+ {
+ 12,
+ Attributes.create("CN", "test"),
+ Attributes.create("cn", "TEST"),
+ true
+ },
+ {
+ 13,
+ Attributes.empty("cn"),
+ Attributes.create("cn", "TEST"),
+ false
+ },
+ {
+ 14,
+ createAttribute(cnType, "cn", noOptions, noValues),
+ createAttribute(cnType, "cn", oneOption, noValues),
+ false
+ },
+ {
+ 15,
+ createAttribute(cnType, "cn", noOptions, noValues),
+ createAttribute(cnType, "cn", twoOptions, noValues),
+ false
+ },
+ {
+ 16,
+ createAttribute(cnType, "cn", oneOption, noValues),
+ createAttribute(cnType, "cn", oneOption, noValues),
+ true
+ },
+ {
+ 17,
+ createAttribute(cnType, "cn", twoOptions, noValues),
+ createAttribute(cnType, "cn", twoOptions, noValues),
+ true
+ },
+ {
+ 18,
+ createAttribute(cnType, "cn", oneOption, noValues),
+ createAttribute(cnType, "cn", noOptions, noValues),
+ false
+ },
+ {
+ 19,
+ createAttribute(cnType, "cn", twoOptions, noValues),
+ createAttribute(cnType, "cn", noOptions, noValues),
+ false
+ },
+ {
+ 20,
+ createAttribute(cnType, "cn", noOptions, noValues),
+ createAttribute(cnType, "cn", noOptions, oneValue),
+ false
+ },
+ {
+ 21,
+ createAttribute(cnType, "cn", noOptions, oneValue),
+ createAttribute(cnType, "cn", noOptions, noValues),
+ false
+ },
+ {
+ 22,
+ createAttribute(cnType, "cn", noOptions, noValues),
+ createAttribute(cnType, "cn", noOptions, twoValues),
+ false
+ },
+ {
+ 23,
+ createAttribute(cnType, "cn", noOptions, twoValues),
+ createAttribute(cnType, "cn", noOptions, noValues),
+ false
+ },
+ {
+ 24,
+ createAttribute(cnType, "cn", noOptions, oneValue),
+ createAttribute(cnType, "cn", noOptions, twoValues),
+ false
+ },
+ {
+ 25,
+ createAttribute(cnType, "cn", noOptions, twoValues),
+ createAttribute(cnType, "cn", noOptions, oneValue),
+ false
+ },
+ {
+ 26,
+ createAttribute(cnType, "cn", oneOption, oneValue),
+ createAttribute(cnType, "cn", oneOption, oneValue),
+ true
+ },
+ {
+ 27,
+ createAttribute(cnType, "cn", twoOptions, twoValues),
+ createAttribute(cnType, "cn", twoOptions, twoValues),
+ true
+ },
+ };
+ }
+
+
+
+ /**
+ * Set up the environment for performing the tests in this suite.
+ *
+ * @throws Exception
+ * If the environment could not be set up.
+ */
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+ // This test suite depends on having the schema available, so
+ // we'll start the server.
+ TestCaseUtils.startServer();
+
+ // Initialize the CN attribute type used in all tests.
+ cnType = DirectoryServer.getAttributeType("cn");
+ Assert.assertNotNull(cnType);
+
+ cnValue = new AttributeValue(cnType, "john doe");
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#addAll(Attribute)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderAddAllAttribute() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ Assert.assertTrue(builder.addAll(createAttribute(cnType, "cn", noOptions,
+ twoValues)));
+ Assert.assertEquals(builder.size(), 2);
+
+ // Add same values.
+ Assert.assertFalse(builder.addAll(createAttribute(cnType, "cn", noOptions,
+ twoValues)));
+ Assert.assertEquals(builder.size(), 2);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 2);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value1")));
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value2")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#addAll(java.util.Collection)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderAddAllAttributeValues() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ // Note duplicate values.
+ Assert.assertTrue(builder.addAll(Arrays.asList(new AttributeValue(cnType,
+ "value1"), new AttributeValue(cnType, "value1"), new AttributeValue(
+ cnType, "value2"))));
+ Assert.assertEquals(builder.size(), 2);
+
+ // Add same values.
+ Assert.assertFalse(builder.addAll(Arrays.asList(new AttributeValue(cnType,
+ "value1"), new AttributeValue(cnType, "value1"), new AttributeValue(
+ cnType, "value2"))));
+ Assert.assertEquals(builder.size(), 2);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 2);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value1")));
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value2")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#add(AttributeValue)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderAddAttributeValue() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ Assert.assertTrue(builder.add(cnValue));
+ Assert.assertEquals(builder.size(), 1);
+
+ Assert.assertFalse(builder.add(cnValue));
+ Assert.assertEquals(builder.size(), 1);
+
+ Assert.assertTrue(builder.add(new AttributeValue(cnType, "jane doe")));
+ Assert.assertEquals(builder.size(), 2);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 2);
+ Assert.assertTrue(a.contains(cnValue));
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "jane doe")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#add(String)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderAddString() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ Assert.assertTrue(builder.add("value1"));
+ Assert.assertEquals(builder.size(), 1);
+
+ Assert.assertFalse(builder.add("value1"));
+ Assert.assertEquals(builder.size(), 1);
+
+ Assert.assertTrue(builder.add("value2"));
+ Assert.assertEquals(builder.size(), 2);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 2);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value1")));
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value2")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#clear()}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderClear() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ builder.addAll(createAttribute(cnType, "cn", noOptions, twoValues));
+ Assert.assertEquals(builder.size(), 2);
+
+ builder.clear();
+ Assert.assertEquals(builder.size(), 0);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertTrue(a.isEmpty());
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#contains(AttributeValue)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderContains() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder();
+
+ builder.addAll(createAttribute(cnType, "cn", noOptions, twoValues));
+
+ Assert.assertTrue(builder.contains(new AttributeValue(cnType, "value1")));
+ Assert.assertTrue(builder.contains(new AttributeValue(cnType, "value2")));
+ Assert.assertFalse(builder.contains(new AttributeValue(cnType, "value3")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#containsAll(java.util.Collection)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderContainsAll() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ builder.addAll(createAttribute(cnType, "cn", noOptions, twoValues));
+
+ AttributeValue av1 = new AttributeValue(cnType, "value1");
+ AttributeValue av2 = new AttributeValue(cnType, "value2");
+ AttributeValue av3 = new AttributeValue(cnType, "value3");
+
+ Assert.assertTrue(builder.containsAll(Collections
+ .<AttributeValue> emptySet()));
+
+ Assert.assertTrue(builder.containsAll(Collections.singleton(av1)));
+ Assert.assertTrue(builder.containsAll(Collections.singleton(av2)));
+ Assert.assertFalse(builder.containsAll(Collections.singleton(av3)));
+
+ Assert.assertTrue(builder.containsAll(Arrays.asList(av1, av2)));
+ Assert.assertFalse(builder.containsAll(Arrays.asList(av1, av3)));
+ Assert.assertFalse(builder.containsAll(Arrays.asList(av2, av3)));
+
+ Assert.assertFalse(builder.containsAll(Arrays.asList(av1, av2, av3)));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#getAttributeType()}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderGetAttributeType() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+ Assert.assertEquals(builder.getAttributeType(), cnType);
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#toAttribute()} throws
+ * IllegalStateException after default constructor.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testAttributeBuilderIllegalStateException1() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder();
+ builder.toAttribute();
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#toAttribute()} throws
+ * IllegalStateException when called twice.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testAttributeBuilderIllegalStateException2() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ try
+ {
+ builder.toAttribute();
+ }
+ catch (IllegalStateException e)
+ {
+ Assert.fail("Got unexpected IllegalStateException");
+ }
+
+ builder.toAttribute();
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#isEmpty()}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderIsEmpty() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ Assert.assertTrue(builder.isEmpty());
+
+ builder.add("value1");
+ Assert.assertFalse(builder.isEmpty());
+
+ builder.add("value2");
+ Assert.assertFalse(builder.isEmpty());
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#iterator()}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderIterator() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ Assert.assertFalse(builder.iterator().hasNext());
+
+ try
+ {
+ builder.iterator().next();
+ Assert.fail("Iteration possible when builder is empty");
+ }
+ catch (NoSuchElementException e)
+ {
+ // Expected.
+ }
+
+ builder.add("value1");
+ Assert.assertTrue(builder.iterator().hasNext());
+ Assert.assertEquals(builder.iterator().next(), new AttributeValue(cnType,
+ "value1"));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#removeAll(Attribute)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderRemoveAllAttribute() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ builder.addAll(createAttribute(cnType, "cn", noOptions, threeValues));
+
+ // Remove existing values.
+ Assert.assertTrue(builder.removeAll(createAttribute(cnType, "cn",
+ noOptions, twoValues)));
+ Assert.assertEquals(builder.size(), 1);
+
+ // Remove removed values.
+ Assert.assertFalse(builder.removeAll(createAttribute(cnType, "cn",
+ noOptions, twoValues)));
+ Assert.assertEquals(builder.size(), 1);
+
+ // Remove nothing.
+ Assert.assertFalse(builder.removeAll(Attributes.empty(cnType)));
+ Assert.assertEquals(builder.size(), 1);
+
+ // Remove non existent value.
+ Assert.assertFalse(builder.removeAll(Attributes.create(cnType,
+ "value4")));
+ Assert.assertEquals(builder.size(), 1);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 1);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value3")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#removeAll(java.util.Collection)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderRemoveAllAttributeValues() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ builder.addAll(createAttribute(cnType, "cn", noOptions, threeValues));
+
+ // Remove existing values.
+ Assert.assertTrue(builder.removeAll(Arrays.asList(new AttributeValue(
+ cnType, "value1"), new AttributeValue(cnType, "value2"))));
+ Assert.assertEquals(builder.size(), 1);
+
+ // Remove removed values.
+ Assert.assertFalse(builder.removeAll(Arrays.asList(new AttributeValue(
+ cnType, "value1"), new AttributeValue(cnType, "value2"))));
+ Assert.assertEquals(builder.size(), 1);
+
+ // Remove nothing.
+ Assert.assertFalse(builder.removeAll(Collections
+ .<AttributeValue> emptySet()));
+ Assert.assertEquals(builder.size(), 1);
+
+ // Remove non existent value.
+ Assert.assertFalse(builder.removeAll(Collections
+ .singleton(new AttributeValue(cnType, "value4"))));
+ Assert.assertEquals(builder.size(), 1);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 1);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value3")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#remove(AttributeValue)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderRemoveAttributeValue() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ builder.addAll(createAttribute(cnType, "cn", noOptions, threeValues));
+
+ Assert.assertTrue(builder.remove(new AttributeValue(cnType, "value1")));
+ Assert.assertEquals(builder.size(), 2);
+
+ // Already removed.
+ Assert.assertFalse(builder.remove(new AttributeValue(cnType, "value1")));
+ Assert.assertEquals(builder.size(), 2);
+
+ // Non existent.
+ Assert.assertFalse(builder.remove(new AttributeValue(cnType, "value4")));
+ Assert.assertEquals(builder.size(), 2);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 2);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value2")));
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value3")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#remove(String)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderRemoveString() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ builder.addAll(createAttribute(cnType, "cn", noOptions, threeValues));
+
+ Assert.assertTrue(builder.remove("value1"));
+ Assert.assertEquals(builder.size(), 2);
+
+ // Already removed.
+ Assert.assertFalse(builder.remove("value1"));
+ Assert.assertEquals(builder.size(), 2);
+
+ // Non existent.
+ Assert.assertFalse(builder.remove("value4"));
+ Assert.assertEquals(builder.size(), 2);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 2);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value2")));
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value3")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#replaceAll(Attribute)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderReplaceAllAttribute() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+ builder.addAll(createAttribute(cnType, "cn", noOptions, threeValues));
+
+ builder.replaceAll(createAttribute(cnType, "cn", noOptions, replaceValues));
+ Assert.assertEquals(builder.size(), 2);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 2);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value2")));
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value4")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#replaceAll(java.util.Collection)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderReplaceAllAttributeValues() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+ builder.addAll(createAttribute(cnType, "cn", noOptions, threeValues));
+
+ // Note duplicate values.
+ builder.replaceAll(Arrays.asList(new AttributeValue(cnType, "value2"),
+ new AttributeValue(cnType, "value2"), new AttributeValue(cnType,
+ "value4")));
+ Assert.assertEquals(builder.size(), 2);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 2);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value2")));
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value4")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#replace(AttributeValue)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderReplaceAttributeValue() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+ builder.addAll(createAttribute(cnType, "cn", noOptions, threeValues));
+
+ builder.replace(new AttributeValue(cnType, "value4"));
+ Assert.assertEquals(builder.size(), 1);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 1);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value4")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#replace(String)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderReplaceString() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+ builder.addAll(createAttribute(cnType, "cn", noOptions, threeValues));
+
+ builder.replace("value4");
+ Assert.assertEquals(builder.size(), 1);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.size(), 1);
+ Assert.assertTrue(a.contains(new AttributeValue(cnType, "value4")));
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#setAttributeType(AttributeType)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderSetAttributeType1() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder();
+
+ Assert.assertNull(builder.getAttributeType());
+
+ builder.setAttributeType(cnType);
+ Assert.assertEquals(builder.getAttributeType(), cnType);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.getAttributeType(), cnType);
+ Assert.assertEquals(a.getName(), "cn");
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#setAttributeType(String)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderSetAttributeType2() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder();
+
+ Assert.assertNull(builder.getAttributeType());
+
+ builder.setAttributeType("cn");
+ Assert.assertEquals(builder.getAttributeType(), cnType);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.getAttributeType(), cnType);
+ Assert.assertEquals(a.getName(), "cn");
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#setAttributeType(String)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderSetAttributeType3() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder();
+
+ Assert.assertNull(builder.getAttributeType());
+
+ builder.setAttributeType("CN");
+ Assert.assertEquals(builder.getAttributeType(), cnType);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.getAttributeType(), cnType);
+ Assert.assertEquals(a.getName(), "CN");
+ }
+
+
+
+ /**
+ * Tests
+ * {@link AttributeBuilder#setAttributeType(AttributeType, String)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderSetAttributeType4() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder();
+
+ Assert.assertNull(builder.getAttributeType());
+
+ builder.setAttributeType(cnType, "CN");
+ Assert.assertEquals(builder.getAttributeType(), cnType);
+
+ Attribute a = builder.toAttribute();
+ Assert.assertEquals(a.getAttributeType(), cnType);
+ Assert.assertEquals(a.getName(), "CN");
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#setOptions(java.util.Collection)}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderSetOptions() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+ builder.setOptions(Arrays.asList(threeOptions));
+ Attribute a = builder.toAttribute();
+
+ Assert.assertTrue(a.getOptions().containsAll(Arrays.asList(threeOptions)));
+ Assert.assertEquals(a.getOptions().size(), threeOptions.length);
+ }
+
+
+
+ /**
+ * Tests {@link AttributeBuilder#size()}.
+ *
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test
+ public void testAttributeBuilderSize() throws Exception
+ {
+ AttributeBuilder builder = new AttributeBuilder(cnType);
+
+ Assert.assertEquals(builder.size(), 0);
+
+ builder.add("value1");
+ Assert.assertEquals(builder.size(), 1);
+
+ builder.add("value2");
+ Assert.assertEquals(builder.size(), 2);
+
+ builder.add("value3");
+ Assert.assertEquals(builder.size(), 3);
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#contains(AttributeValue)}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeContains(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check contains().
+ for (String value : values)
+ {
+ Assert.assertTrue(a.contains(new AttributeValue(type, value)));
+
+ // Assumes internal normalization to lower-case.
+ Assert.assertTrue(a
+ .contains(new AttributeValue(type, value.toUpperCase())));
+ }
+
+ Assert.assertFalse(a.contains(new AttributeValue(type, "xxxx")));
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#containsAll(java.util.Collection)}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeContainsAll(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check containsAll().
+ Set<AttributeValue> expectedValues = new HashSet<AttributeValue>();
+ for (String value : values)
+ {
+ expectedValues.add(new AttributeValue(type, value));
+ }
+
+ Assert.assertTrue(a.containsAll(Collections.<AttributeValue> emptySet()));
+ Assert.assertTrue(a.containsAll(expectedValues));
+
+ if (values.length > 1)
+ {
+ Set<AttributeValue> subSet = new HashSet<AttributeValue>(expectedValues);
+ subSet.remove(subSet.iterator());
+ Assert.assertTrue(a.containsAll(subSet));
+ }
+
+ Set<AttributeValue> bigSet = new HashSet<AttributeValue>(expectedValues);
+ bigSet.add(new AttributeValue(type, "xxxx"));
+ Assert.assertFalse(a.containsAll(bigSet));
+
+ expectedValues.clear();
+ for (String value : values)
+ {
+ // Assumes internal normalization to lower-case.
+ expectedValues.add(new AttributeValue(type, value.toUpperCase()));
+ }
+ Assert.assertTrue(a.containsAll(expectedValues));
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#equals(Object)}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a1
+ * The first attribute.
+ * @param a2
+ * The second attribute.
+ * @param isEqual
+ * The expected result of equals.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createCompareAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeEquals(int testCase, Attribute a1, Attribute a2,
+ boolean isEqual) throws Exception
+ {
+ Assert.assertEquals(a1.equals(a2), isEqual);
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#getAttributeType()}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeGetAttribute(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check type and provided name.
+ Assert.assertEquals(a.getAttributeType(), type);
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#getName()}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeGetName(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ Assert.assertEquals(a.getName(), name);
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#getNameWithOptions()}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeGetNameWithOptions(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check name and options.
+ String[] elements = a.getNameWithOptions().split(";");
+ switch (elements.length)
+ {
+ case 0:
+ Assert.fail("Name and options could not be split: "
+ + a.getNameWithOptions());
+ break;
+ case 1:
+ Assert.assertEquals(elements[0], name);
+ Assert.assertEquals(elements.length - 1 /* 0 */, options.length);
+ break;
+ default:
+ Assert.assertEquals(elements[0], name);
+ Assert.assertEquals(elements.length - 1, options.length);
+
+ List<String> expected = Arrays.asList(options);
+ List<String> actual = Arrays.asList(elements).subList(1, elements.length);
+ Assert.assertTrue(actual.containsAll(expected));
+ break;
+ }
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#getOptions()}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeGetOptions(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check getOptions().
+ Set<String> s = a.getOptions();
+
+ Assert.assertEquals(s.size(), options.length);
+ Assert.assertTrue(s.containsAll(Arrays.asList(options)));
+
+ try
+ {
+ // The option set must be unmodifiable.
+ s.add("xxxx");
+ Assert.fail("getOptions() returned a modifiable option set");
+ }
+ catch (UnsupportedOperationException e)
+ {
+ // Expected exception.
+ }
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#hasAllOptions(java.util.Collection)}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeHasAllOptions(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check hasAllOptions().
+ Assert.assertTrue(a.hasAllOptions(Collections.<String> emptySet()));
+ Assert.assertTrue(a.hasAllOptions(Arrays.asList(options)));
+
+ if (options.length > 1)
+ {
+ Assert.assertTrue(a.hasAllOptions(Arrays.asList(options).subList(1,
+ options.length)));
+ }
+
+ List<String> tmp = new ArrayList<String>(Arrays.asList(options));
+ tmp.add("xxxx");
+ Assert.assertFalse(a.hasAllOptions(tmp));
+
+ tmp.clear();
+ for (String option : options)
+ {
+ // Assumes internal normalization to lower-case.
+ tmp.add(option.toUpperCase());
+ }
+ Assert.assertTrue(a.hasAllOptions(tmp));
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#hashCode()}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a1
+ * The first attribute.
+ * @param a2
+ * The second attribute.
+ * @param isEqual
+ * The expected result of equals.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createCompareAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeHashCode(int testCase, Attribute a1, Attribute a2,
+ boolean isEqual) throws Exception
+ {
+ // The hash code must be equal if the attributes are equal. Hash
+ // codes are not required to be different if the attributes are
+ // different.
+ if (isEqual)
+ {
+ Assert.assertEquals(a1.hashCode(), a2.hashCode());
+ }
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#hasOption(String)}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeHasOption(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check hasOption().
+ for (String option : options)
+ {
+ Assert.assertTrue(a.hasOption(option));
+
+ // Assumes internal normalization to lower-case.
+ Assert.assertTrue(a.hasOption(option.toUpperCase()));
+ }
+
+ Assert.assertFalse(a.hasOption("xxxx"));
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#hasOptions()}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeHasOptions(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check hasOptions().
+ if (options.length == 0)
+ {
+ Assert.assertFalse(a.hasOptions());
+ }
+ else
+ {
+ Assert.assertTrue(a.hasOptions());
+ }
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#isEmpty()}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeIsEmpty(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check isEmpty().
+ if (values.length == 0)
+ {
+ Assert.assertTrue(a.isEmpty());
+ }
+ else
+ {
+ Assert.assertFalse(a.isEmpty());
+ }
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#isVirtual()}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeIsVirtual(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check isVirtual().
+ Assert.assertFalse(a.isVirtual());
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#iterator()}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeIterator(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check iterator().
+ Assert.assertNotNull(a.iterator());
+
+ if (values.length == 0)
+ {
+ Assert.assertFalse(a.iterator().hasNext());
+
+ try
+ {
+ a.iterator().next();
+ Assert
+ .fail("iterator() contains at least one value for empty attribute");
+ }
+ catch (NoSuchElementException e)
+ {
+ // Expected.
+ }
+ }
+ else
+ {
+ // Values must be returned in the correct order.
+ Iterator<AttributeValue> i = a.iterator();
+ for (String value : values)
+ {
+ Assert.assertTrue(i.hasNext());
+
+ AttributeValue v = i.next();
+ Assert.assertEquals(v, new AttributeValue(type, value));
+
+ try
+ {
+ i.remove();
+ Assert.fail("value iterator() supports remove");
+ }
+ catch (UnsupportedOperationException e)
+ {
+ // Expected.
+ }
+ }
+
+ // There should not be any more values.
+ Assert.assertFalse(i.hasNext());
+
+ try
+ {
+ i.next();
+ Assert.fail("iterator() contains too many values");
+ }
+ catch (NoSuchElementException e)
+ {
+ // Expected.
+ }
+ }
+ }
+
+
+
+ /**
+ * Tests that the built attribute is non-null.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes")
+ public void testAttributeNotNull(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Sanity test.
+ Assert.assertNotNull(a);
+ }
+
+
+
+ /**
+ * Tests that the generated attribute is optimized correctly for
+ * storage of attribute options. This test is very implementation
+ * dependent, but because Attributes are so performance sensitive it
+ * is worth doing.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeGetOptions")
+ public void testAttributeOptionOptimization(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ switch (options.length)
+ {
+ case 0:
+ // Attribute must be optimized for zero options.
+ Assert.assertEquals(a.getClass().getName(),
+ "org.opends.server.types.AttributeBuilder$RealAttributeNoOptions");
+ break;
+ case 1:
+ // Attribute must be optimized for single option.
+ Assert.assertEquals(a.getClass().getName(),
+ "org.opends.server.types.AttributeBuilder$RealAttributeSingleOption");
+ break;
+ default:
+ // Attribute must be optimized for many options.
+ Assert.assertEquals(a.getClass().getName(),
+ "org.opends.server.types.AttributeBuilder$RealAttributeManyOptions");
+ break;
+ }
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#optionsEqual(Set)}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeOptionsEquals(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Check optionsEquals.
+ Assert.assertTrue(a
+ .optionsEqual(new HashSet<String>(Arrays.asList(options))));
+
+ if (options.length > 1)
+ {
+ Assert.assertFalse(a.optionsEqual(Collections.singleton(options[0])));
+ }
+
+ Set<String> stmp = new HashSet<String>(Arrays.asList(options));
+ stmp.add("xxxx");
+ Assert.assertFalse(a.optionsEqual(stmp));
+
+ stmp.clear();
+ for (String option : options)
+ {
+ // Assumes internal normalization to lower-case.
+ stmp.add(option.toUpperCase());
+ }
+ Assert.assertTrue(a.optionsEqual(stmp));
+ }
+
+
+
+ /**
+ * Tests {@link Attribute#size()}.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeNotNull")
+ public void testAttributeSize(int testCase, Attribute a, AttributeType type,
+ String name, String[] options, String[] values) throws Exception
+ {
+ // Check size().
+ Assert.assertEquals(a.size(), values.length);
+ }
+
+
+
+ /**
+ * Tests that the generated attribute is optimized correctly for
+ * storage of attribute values. This test is very implementation
+ * dependent, but because Attributes are so performance sensitive it
+ * is worth doing.
+ *
+ * @param testCase
+ * Test case index (useful for debugging).
+ * @param a
+ * The attribute.
+ * @param type
+ * The expected attribute type.
+ * @param name
+ * The expected user provided attribute name.
+ * @param options
+ * The expected attribute options.
+ * @param values
+ * The expected attribute values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "createAttributes", dependsOnMethods = "testAttributeIterator")
+ public void testAttributeValueOptimization(int testCase, Attribute a,
+ AttributeType type, String name, String[] options, String[] values)
+ throws Exception
+ {
+ // Determine the value set implementation class.
+ String iteratorName = a.iterator().getClass().getName();
+ int i = iteratorName.lastIndexOf('$');
+ String className = iteratorName.substring(0, i);
+
+ switch (values.length)
+ {
+ case 0:
+ // Attribute must be optimized for zero values.
+ Assert.assertEquals(className, "java.util.Collections$EmptySet");
+ break;
+ case 1:
+ // Attribute must be optimized for single value.
+ Assert.assertEquals(className, "java.util.Collections$SingletonSet");
+ break;
+ default:
+ // Attribute must be optimized for many values.
+ Assert.assertEquals(className,
+ "java.util.Collections$UnmodifiableCollection");
+ break;
+ }
+ }
+
+
+
+ // Creates a new attribute.
+ private Attribute createAttribute(AttributeType type, String name,
+ String[] options, String[] values)
+ {
+ AttributeBuilder builder = new AttributeBuilder(type, name);
+ for (String option : options)
+ {
+ builder.setOption(option);
+ }
+ for (String value : values)
+ {
+ builder.add(value);
+ }
+ return builder.toAttribute();
+ }
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java
new file mode 100644
index 0000000..72cef67
--- /dev/null
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java
@@ -0,0 +1,288 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2006-2008 Sun Microsystems, Inc.
+ */
+package org.opends.server.types;
+
+
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.opends.server.TestCaseUtils;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+
+
+/**
+ * This class defines a set of tests for the
+ * org.opends.server.core.Attributes class.
+ * <p>
+ * Note that the <code>empty</code> and <code>create</code> methods
+ * are all tested in the {@link AttributeBuilderTest} suit.
+ */
+public class AttributesTest extends TypesTestCase
+{
+
+ /**
+ * Merge attribute data provider.
+ *
+ * @return The array of merge attributes.
+ */
+ @DataProvider(name = "mergeAttributes")
+ public Object[][] mergeAttributes()
+ {
+ // Test testCase #, Attribute a1, Attribute a2, Attribute e,
+ // Attribute d
+
+ return new Object[][]
+ {
+ {
+ 1,
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.create("cn", "one", "two", "three")
+ },
+ {
+ 2,
+ Attributes.empty("cn"),
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.empty("cn")
+ },
+ {
+ 3,
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.empty("cn"),
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.empty("cn")
+ },
+ {
+ 4,
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.create("cn", "two", "three", "four"),
+ Attributes.create("cn", "one", "two", "three", "four"),
+ Attributes.create("cn", "two", "three")
+ },
+ {
+ 5,
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.create("cn", "four", "five", "six"),
+ Attributes.create("cn", "one", "two", "three", "four", "five",
+ "six"),
+ Attributes.empty("cn")
+ },
+ };
+ }
+
+
+
+ /**
+ * Set up the environment for performing the tests in this suite.
+ *
+ * @throws Exception
+ * If the environment could not be set up.
+ */
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+ // This test suite depends on having the schema available, so
+ // we'll start the server.
+ TestCaseUtils.startServer();
+ }
+
+
+
+ /**
+ * Subtract attribute data provider.
+ *
+ * @return The array of subtract attributes.
+ */
+ @DataProvider(name = "subtractAttributes")
+ public Object[][] subtractAttributes()
+ {
+ // Test testCase #, Attribute a1, Attribute a2, Attribute e,
+ // Attribute m
+
+ return new Object[][]
+ {
+ {
+ 1,
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.empty("cn"),
+ Attributes.empty("cn")
+ },
+ {
+ 2,
+ Attributes.empty("cn"),
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.empty("cn"),
+ Attributes.create("cn", "one", "two", "three")
+ },
+ {
+ 3,
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.empty("cn"),
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.empty("cn")
+ },
+ {
+ 4,
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.create("cn", "two", "three", "four"),
+ Attributes.create("cn", "one"),
+ Attributes.create("cn", "four")
+ },
+ {
+ 5,
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.create("cn", "four", "five", "six"),
+ Attributes.create("cn", "one", "two", "three"),
+ Attributes.create("cn", "four", "five", "six")
+ },
+ };
+ }
+
+
+
+ /**
+ * Tests {@link Attributes#merge(Attribute, Attribute)}.
+ *
+ * @param testCase
+ * Test case ID.
+ * @param a1
+ * The first attribute to merge.
+ * @param a2
+ * The second attribute to merge.
+ * @param e
+ * The expected result of the merge.
+ * @param d
+ * The expected set of duplicate values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "mergeAttributes")
+ public void testMerge(int testCase, Attribute a1, Attribute a2, Attribute e,
+ Attribute d) throws Exception
+ {
+ Attribute actual = Attributes.merge(a1, a2);
+ Assert.assertEquals(actual, e);
+ }
+
+
+
+ /**
+ * Tests
+ * {@link Attributes#merge(Attribute, Attribute, java.util.Collection)}
+ * .
+ *
+ * @param testCase
+ * Test case ID.
+ * @param a1
+ * The first attribute to merge.
+ * @param a2
+ * The second attribute to merge.
+ * @param e
+ * The expected result of the merge.
+ * @param d
+ * The expected set of duplicate values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "mergeAttributes")
+ public void testMergeWithDuplicates(int testCase, Attribute a1, Attribute a2,
+ Attribute e, Attribute d) throws Exception
+ {
+ List<AttributeValue> duplicates = new LinkedList<AttributeValue>();
+ Attribute actual = Attributes.merge(a1, a2, duplicates);
+ Assert.assertEquals(actual, e);
+
+ Assert.assertEquals(duplicates.size(), d.size());
+ Assert.assertTrue(d.containsAll(duplicates));
+ }
+
+
+
+ /**
+ * Tests {@link Attributes#subtract(Attribute, Attribute)}.
+ *
+ * @param testCase
+ * Test case ID.
+ * @param a1
+ * The first attribute.
+ * @param a2
+ * The second attribute to be subtracted.
+ * @param e
+ * The expected result of the subtraction.
+ * @param m
+ * The expected set of missing values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "subtractAttributes")
+ public void testSubtract(int testCase, Attribute a1, Attribute a2,
+ Attribute e, Attribute m) throws Exception
+ {
+ Attribute actual = Attributes.subtract(a1, a2);
+ Assert.assertEquals(actual, e);
+ }
+
+
+
+ /**
+ * Tests
+ * {@link Attributes#subtract(Attribute, Attribute, java.util.Collection)}
+ * .
+ *
+ * @param testCase
+ * Test case ID.
+ * @param a1
+ * The first attribute.
+ * @param a2
+ * The second attribute to be subtracted.
+ * @param e
+ * The expected result of the subtraction.
+ * @param m
+ * The expected set of missing values.
+ * @throws Exception
+ * If an unexpected error occurs.
+ */
+ @Test(dataProvider = "subtractAttributes")
+ public void testSubtractWithMissingValues(int testCase, Attribute a1,
+ Attribute a2, Attribute e, Attribute m) throws Exception
+ {
+ List<AttributeValue> missingValues = new LinkedList<AttributeValue>();
+ Attribute actual = Attributes.subtract(a1, a2, missingValues);
+ Assert.assertEquals(actual, e);
+
+ Assert.assertEquals(missingValues.size(), m.size());
+ Assert.assertTrue(m.containsAll(missingValues));
+ }
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
index 56386af..ea4a5ee 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
@@ -28,22 +28,16 @@
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-
-import org.testng.annotations.Test;
-
-import org.opends.server.TestCaseUtils;
-import org.opends.messages.MessageBuilder;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.tools.LDAPModify;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-
+import static org.opends.server.types.AcceptRejectWarn.*;
import static org.testng.Assert.*;
-import static org.opends.server.types.AcceptRejectWarn.*;
+import java.util.LinkedList;
+
+import org.opends.messages.MessageBuilder;
+import org.opends.server.TestCaseUtils;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.tools.LDAPModify;
+import org.testng.annotations.Test;
@@ -411,7 +405,7 @@
"objectClass: domain",
"dc: example");
- e.addAttribute(new Attribute("dc", "foo"),
+ e.addAttribute(Attributes.create("dc", "foo"),
new LinkedList<AttributeValue>());
assertFalse(e.conformsToSchema(null, false, true, true, new MessageBuilder()));
@@ -441,12 +435,11 @@
DirectoryServer.getAttributeType("creatorsname");
assertTrue(creatorsNameType.isOperational());
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(2);
- values.add(new AttributeValue(creatorsNameType, "cn=Directory Manager"));
- values.add(new AttributeValue(creatorsNameType, "cn=Another User"));
-
- e.addAttribute(new Attribute(creatorsNameType, "creatorsName", values),
- new LinkedList<AttributeValue>());
+ AttributeBuilder builder = new AttributeBuilder(creatorsNameType,
+ "creatorsName");
+ builder.add("cn=Directory Manager");
+ builder.add("cn=Another User");
+ e.addAttribute(builder.toAttribute(), new LinkedList<AttributeValue>());
assertFalse(e.conformsToSchema(null, false, true, true, new MessageBuilder()));
}
@@ -1455,7 +1448,7 @@
"sn: User",
"cn: Test User");
- e.addAttribute(new Attribute("name", "foo"),
+ e.addAttribute(Attributes.create("name", "foo"),
new LinkedList<AttributeValue>());
assertFalse(e.conformsToSchema(null, false, true, true, new MessageBuilder()));
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
index f49e82a..16f3b84 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
@@ -66,7 +66,6 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPPasswordModify;
import org.opends.server.tools.LDAPSearch;
-import org.opends.server.tools.dsconfig.DSConfig;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
@@ -201,7 +200,7 @@
"uid: pwreset.target",
"userPassword: password");
- TestCaseUtils.applyModifications(
+ TestCaseUtils.applyModifications(false,
"dn: o=test",
"changetype: modify",
"add: aci",
@@ -559,7 +558,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-size-limit", "2000")));
+ Attributes.create("ds-cfg-size-limit", "2000")));
ModifyOperation modifyOperation =
conn.processModify(DN.decode("cn=config"), mods);
@@ -569,7 +568,7 @@
mods.clear();
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("ds-cfg-size-limit", "1000")));
+ Attributes.create("ds-cfg-size-limit", "1000")));
modifyOperation = conn.processModify(DN.decode("cn=config"), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -806,7 +805,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.ADD,
- new Attribute("attributetypes", attrDefinition)));
+ Attributes.create("attributetypes", attrDefinition)));
ModifyOperation modifyOperation =
conn.processModify(DN.decode("cn=schema"), mods);
@@ -816,7 +815,7 @@
mods.clear();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("attributetypes", attrDefinition)));
+ Attributes.create("attributetypes", attrDefinition)));
modifyOperation = conn.processModify(DN.decode("cn=schema"), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1237,7 +1236,7 @@
// Try to modify the entry to add a description.
ArrayList<Modification> mods = new ArrayList<Modification>(1);
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
ModifyOperationBasis modifyOperation =
new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
@@ -1435,7 +1434,7 @@
// Try to modify the entry to add a description.
ArrayList<Modification> mods = new ArrayList<Modification>(1);
mods.add(new Modification(ModificationType.REPLACE,
- new Attribute("description", "foo")));
+ Attributes.create("description", "foo")));
ModifyOperationBasis modifyOperation =
new ModifyOperationBasis(conn, conn.nextOperationID(), conn.nextMessageID(),
@@ -2422,7 +2421,7 @@
// the client connection reflects that.
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.ADD,
- new Attribute("ds-privilege-name", "config-read")));
+ Attributes.create("ds-privilege-name", "config-read")));
ModifyOperation modifyOperation =
rootConnection.processModify(DN.decode("cn=Test User,o=test"), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2433,7 +2432,7 @@
// immediately.
mods.clear();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("ds-privilege-name", "config-read")));
+ Attributes.create("ds-privilege-name", "config-read")));
modifyOperation =
rootConnection.processModify(DN.decode("cn=Test User,o=test"), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2473,7 +2472,7 @@
ArrayList<Modification> mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.ADD,
- new Attribute("ds-cfg-default-root-privilege-name",
+ Attributes.create("ds-cfg-default-root-privilege-name",
"proxied-auth")));
ModifyOperation modifyOperation =
internalRootConn.processModify(DN.decode("cn=Root DNs,cn=config"),
@@ -2491,7 +2490,7 @@
// Update the set of root privileges to revoke proxied auth.
mods.clear();
mods.add(new Modification(ModificationType.DELETE,
- new Attribute("ds-cfg-default-root-privilege-name",
+ Attributes.create("ds-cfg-default-root-privilege-name",
"proxied-auth")));
modifyOperation =
internalRootConn.processModify(DN.decode("cn=Root DNs,cn=config"),
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
index a79ad83..4b061db 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
@@ -46,7 +46,6 @@
import org.opends.server.schema.RFC3672SubtreeSpecificationSyntax;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeClass;
-import org.testng.annotations.AfterClass;
/**
* This class defines a set of tests for the {@link Entry} class.
@@ -112,16 +111,12 @@
Entry testEntry = new Entry(entryDN, objectClasses, null, null);
// Now add the attribute.
- LinkedHashSet<AttributeValue> attributeValues =
- new LinkedHashSet<AttributeValue>();
+ AttributeBuilder builder = new AttributeBuilder(type);
for (String value : values) {
- AttributeValue attributeValue = new AttributeValue(type, value);
- attributeValues.add(attributeValue);
+ builder.add(value);
}
- Attribute attribute = new Attribute(type, type.getNameOrOID(),
- attributeValues);
ArrayList<Attribute> attributes = new ArrayList<Attribute>();
- attributes.add(attribute);
+ attributes.add(builder.toAttribute());
testEntry.putAttribute(type, attributes);
return testEntry;
@@ -351,7 +346,7 @@
assertTrue(e.hasAttribute(ocType, options));
assertTrue(e.hasAttribute(cnType, options));
assertTrue(e.hasAttribute(nameType, options));
- assertFalse(e.hasAttribute(nameType, false, options));
+ assertFalse(e.hasAttribute(nameType, options, false));
assertFalse(e.hasAttribute(uidType, options));
assertTrue(e.hasAttribute(mnType, options));
@@ -359,7 +354,7 @@
assertTrue(e.hasAttribute(ocType, options));
assertTrue(e.hasAttribute(cnType, options));
assertTrue(e.hasAttribute(nameType, options));
- assertFalse(e.hasAttribute(nameType, false, options));
+ assertFalse(e.hasAttribute(nameType, options, false));
assertFalse(e.hasAttribute(uidType, options));
assertTrue(e.hasAttribute(mnType, options));
@@ -367,7 +362,7 @@
assertFalse(e.hasAttribute(ocType, options));
assertTrue(e.hasAttribute(cnType, options));
assertTrue(e.hasAttribute(nameType, options));
- assertFalse(e.hasAttribute(nameType, false, options));
+ assertFalse(e.hasAttribute(nameType, options, false));
assertFalse(e.hasAttribute(uidType, options));
assertFalse(e.hasAttribute(mnType, options));
@@ -375,7 +370,7 @@
assertFalse(e.hasAttribute(ocType, options));
assertFalse(e.hasAttribute(cnType, options));
assertFalse(e.hasAttribute(nameType, options));
- assertFalse(e.hasAttribute(nameType, false, options));
+ assertFalse(e.hasAttribute(nameType, options, false));
assertFalse(e.hasAttribute(uidType, options));
assertFalse(e.hasAttribute(mnType, options));
@@ -384,7 +379,7 @@
assertFalse(e.hasAttribute(ocType, options));
assertFalse(e.hasAttribute(cnType, options));
assertFalse(e.hasAttribute(nameType, options));
- assertFalse(e.hasAttribute(nameType, false, options));
+ assertFalse(e.hasAttribute(nameType, options, false));
assertFalse(e.hasAttribute(uidType, options));
assertFalse(e.hasAttribute(mnType, options));
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
index cbccfb0..95527d8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
@@ -28,20 +28,16 @@
+import static org.testng.Assert.*;
+
import java.util.Collections;
import java.util.LinkedHashSet;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
import org.opends.server.TestCaseUtils;
-import org.opends.server.admin.std.meta.
- VirtualAttributeCfgDefn.ConflictBehavior;
+import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.ConflictBehavior;
import org.opends.server.extensions.EntryDNVirtualAttributeProvider;
-import org.opends.server.protocols.internal.InternalClientConnection;
-
-import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
@@ -114,8 +110,6 @@
virtualAttributeRule);
assertTrue(virtualAttribute.isVirtual());
- assertTrue(virtualAttribute.duplicate(true).isVirtual());
- assertTrue(virtualAttribute.duplicate(false).isVirtual());
}
@@ -129,26 +123,23 @@
public void testValues()
throws Exception
{
- LinkedHashSet<AttributeValue> values = virtualAttribute.getValues();
- assertEquals(values.size(), 1);
- assertTrue(values.contains(new AttributeValue(entryDNType, "o=test")));
+ assertEquals(virtualAttribute.size(), 1);
+ assertTrue(virtualAttribute.contains(new AttributeValue(entryDNType, "o=test")));
- assertTrue(virtualAttribute.hasValue());
+ assertTrue(!virtualAttribute.isEmpty());
- assertTrue(virtualAttribute.hasValue(new AttributeValue(entryDNType,
+ assertTrue(virtualAttribute.contains(new AttributeValue(entryDNType,
"o=test")));
- assertFalse(virtualAttribute.hasValue(new AttributeValue(entryDNType,
+ assertFalse(virtualAttribute.contains(new AttributeValue(entryDNType,
"o=not test")));
LinkedHashSet<AttributeValue> testValues =
new LinkedHashSet<AttributeValue>();
testValues.add(new AttributeValue(entryDNType, "o=test"));
- assertTrue(virtualAttribute.hasAllValues(testValues));
- assertTrue(virtualAttribute.hasAnyValue(testValues));
+ assertTrue(virtualAttribute.containsAll(testValues));
testValues.add(new AttributeValue(entryDNType, "o=not test"));
- assertFalse(virtualAttribute.hasAllValues(testValues));
- assertTrue(virtualAttribute.hasAnyValue(testValues));
+ assertFalse(virtualAttribute.containsAll(testValues));
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java
index baa4694..183137a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java
@@ -35,6 +35,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
@@ -68,7 +69,7 @@
TestCaseUtils.startServer();
attributes = new HashMap<AttributeType, List<Attribute>>();
- attribute = new Attribute("cn", "hello world");
+ attribute = Attributes.create("cn", "hello world");
ArrayList<Attribute> alist = new ArrayList<Attribute>(1);
alist.add(attribute);
attributes.put(attribute.getAttributeType(), alist);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
index da16085..f281150 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
@@ -32,16 +32,16 @@
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import org.opends.server.TestCaseUtils;
import org.opends.messages.Message;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
@@ -468,7 +468,6 @@
Iterator<RawModification> i;
Modification mod;
Attribute attr;
- LinkedHashSet<AttributeValue> values;
// Change record #1.
change = reader.readChangeRecord(false);
@@ -479,17 +478,16 @@
Assert.assertEquals(add.getDN(), dn);
List<Attribute> attrs = new ArrayList<Attribute>();
+ AttributeBuilder builder = new AttributeBuilder(AT_OC, "objectclass");
+ builder.add(new AttributeValue(AT_OC, "top"));
+ builder.add(new AttributeValue(AT_OC, "person"));
+ builder.add(new AttributeValue(AT_OC, "organizationalPerson"));
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(AT_OC, "top"));
- values.add(new AttributeValue(AT_OC, "person"));
- values.add(new AttributeValue(AT_OC, "organizationalPerson"));
-
- attrs.add(new Attribute(AT_OC, "objectclass", values));
- attrs.add(new Attribute("cn", "Fiona Jensen"));
- attrs.add(new Attribute("sn", "Jensen"));
- attrs.add(new Attribute("uid", "fiona"));
- attrs.add(new Attribute("telephonenumber", "+1 408 555 1212"));
+ attrs.add(builder.toAttribute());
+ attrs.add(Attributes.create("cn", "Fiona Jensen"));
+ attrs.add(Attributes.create("sn", "Jensen"));
+ attrs.add(Attributes.create("uid", "fiona"));
+ attrs.add(Attributes.create("telephonenumber", "+1 408 555 1212"));
Assert.assertTrue(add.getAttributes().containsAll(attrs));
// Change record #2.
@@ -543,7 +541,7 @@
Assert.assertTrue(i.hasNext());
mod = i.next().toModification();
Assert.assertEquals(mod.getModificationType(), ModificationType.ADD);
- attr = new Attribute("postaladdress",
+ attr = Attributes.create("postaladdress",
"123 Anystreet $ Sunnyvale, CA $ 94086");
Assert.assertEquals(mod.getAttribute(), attr);
@@ -551,24 +549,23 @@
mod = i.next().toModification();
Assert.assertEquals(mod.getModificationType(),
ModificationType.DELETE);
- attr = new Attribute(AT_DESCR);
+ attr = Attributes.empty(AT_DESCR);
Assert.assertEquals(mod.getAttribute(), attr);
Assert.assertTrue(i.hasNext());
mod = i.next().toModification();
Assert.assertEquals(mod.getModificationType(),
ModificationType.REPLACE);
- values = new LinkedHashSet<AttributeValue>();
- values.add(new AttributeValue(AT_TELN, "+1 408 555 1234"));
- values.add(new AttributeValue(AT_TELN, "+1 408 555 5678"));
- attr = new Attribute(AT_TELN, "telephonenumber", values);
- Assert.assertEquals(mod.getAttribute(), attr);
+ builder = new AttributeBuilder(AT_TELN, "telephonenumber");
+ builder.add(new AttributeValue(AT_TELN, "+1 408 555 1234"));
+ builder.add(new AttributeValue(AT_TELN, "+1 408 555 5678"));
+ Assert.assertEquals(mod.getAttribute(), builder.toAttribute());
Assert.assertTrue(i.hasNext());
mod = i.next().toModification();
Assert.assertEquals(mod.getModificationType(),
ModificationType.DELETE);
- attr = new Attribute("facsimiletelephonenumber", "+1 408 555 9876");
+ attr = Attributes.create("facsimiletelephonenumber", "+1 408 555 9876");
Assert.assertEquals(mod.getAttribute(), attr);
Assert.assertFalse(i.hasNext());
@@ -588,7 +585,7 @@
mod = i.next().toModification();
Assert.assertEquals(mod.getModificationType(),
ModificationType.REPLACE);
- attr = new Attribute(DirectoryServer
+ attr = Attributes.empty(DirectoryServer
.getAttributeType("postaladdress"));
Assert.assertEquals(mod.getAttribute(), attr);
@@ -605,7 +602,7 @@
mod = i.next().toModification();
Assert.assertEquals(mod.getModificationType(),
ModificationType.DELETE);
- attr = new Attribute(AT_DESCR);
+ attr = Attributes.empty(AT_DESCR);
Assert.assertEquals(mod.getAttribute(), attr);
// Change record #8.
@@ -622,7 +619,7 @@
mod = i.next().toModification();
Assert.assertEquals(mod.getModificationType(),
ModificationType.DELETE);
- attr = new Attribute(AT_DESCR);
+ attr = Attributes.empty(AT_DESCR);
Assert.assertEquals(mod.getAttribute(), attr);
Assert.assertFalse(i.hasNext());
@@ -694,7 +691,7 @@
DN dn = DN.decode("cn=john smith, dc=com");
Assert.assertEquals(add.getDN(), dn);
- Attribute attr = new Attribute("description", TEMP_FILE_STRING);
+ Attribute attr = Attributes.create("description", TEMP_FILE_STRING);
Assert.assertTrue(add.getAttributes().contains(attr));
// Check final state.
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
index 2a9d1c2..8dece2a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
@@ -40,6 +40,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFExportConfig;
@@ -316,7 +317,7 @@
if (atype.equals("objectclass")) {
entry.addObjectClass(DirectoryServer.getObjectClass(avalue));
} else {
- Attribute attr = new Attribute(atype, avalue);
+ Attribute attr = Attributes.create(atype, avalue);
// Assume that there will be no duplicates.
entry.addAttribute(attr, null);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java
index 9ad52e7..0c40bb8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java
@@ -34,6 +34,7 @@
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.types.Attribute;
+import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.ModificationType;
import org.opends.server.types.RawModification;
@@ -70,7 +71,7 @@
// Create a simple set of modifications.
modifications = new ArrayList<RawModification>();
- attribute = new Attribute("cn", "hello world");
+ attribute = Attributes.create("cn", "hello world");
LDAPAttribute lattribute = new LDAPAttribute(attribute);
LDAPModification modification = new LDAPModification(
ModificationType.ADD, lattribute);
--
Gitblit v1.10.0