From 8140b0a19865e2754ad927906a607a86533f426c Mon Sep 17 00:00:00 2001 From: jvergara <jvergara@localhost> Date: Mon, 13 Jul 2009 09:20:24 +0000 Subject: [PATCH] Fix for issue 4106 (dsreplication should allow to merge disjoint replication topologies) dsreplication allows to merge disjoint topologies. The limitations on the topologies that can be merged are described in the issue report. --- opendj-sdk/opends/src/messages/messages/admin_tool.properties | 62 +++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 16 deletions(-) diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties index 3da2809..550d1c2 100644 --- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties +++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties @@ -680,7 +680,7 @@ also the replication server (changelog and replication port) to be disabled \ you must also specify the '--%s' or '--%s' argument. INFO_REPLICATION_DISABLE_ALL_SUFFIXES_DISABLE_REPLICATION_SERVER=You have \ - chosen to disable all the replicated base DNs on the server '%s'. Do you \ + chosen to disable all the replicated base DN's on the server '%s'. Do you \ want to disable also the replication port '%d'? INFO_DISABLE_REPLICATION_ONE_POINT_OF_FAILURE=You have decided to disable the \ replication server (replication changelog). After disabling the replication \ @@ -702,7 +702,8 @@ server is required in a replication topology and this is the last replication \ server for the following suffixes:%n%s%nReplication will be disabled for \ these servers.%nDo you want to continue? -INFO_REPLICATION_DISABLE_ADS_CONTENTS=Removing registration information +INFO_REPLICATION_REMOVE_ADS_CONTENTS=Removing registration information +INFO_REPLICATION_REMOVE_TRUSTSTORE_CONTENTS=Removing truststore information INFO_REPLICATION_INITIALIZE_ALL_SUFFIX_PROMPT=Initialize base DN %s? INFO_REPLICATION_PRE_EXTERNAL_INITIALIZATION_SUFFIX_PROMPT=Are you going to \ initialize with import-ldif or binary copy base DN %s? @@ -773,21 +774,24 @@ replication server in '%s' but the server already has a replication server \ configured (with replication port '%d'). Do you want to continue? INFO_REPLICATION_CONNECTING=Establishing connections -INFO_REPLICATION_ENABLE_UPDATING_ADS_CONTENTS=Checking Registration information +INFO_REPLICATION_ENABLE_UPDATING_ADS_CONTENTS=Checking registration information INFO_REPLICATION_ENABLE_UPDATING_REPLICATION_SERVER=Updating remote references \ on server %s INFO_REPLICATION_ENABLE_CONFIGURING_REPLICATION_SERVER=Configuring Replication \ port on server %s INFO_REPLICATION_ENABLE_CONFIGURING_BASEDN=Updating replication configuration \ for baseDN %s on server %s -INFO_REPLICATION_ENABLE_CONFIGURING_ADS=Updating Registration configuration \ +INFO_REPLICATION_ENABLE_CONFIGURING_ADS=Updating registration configuration \ on server %s -INFO_ENABLE_REPLICATION_INITIALIZING_ADS=Initializing Registration information \ +INFO_ENABLE_REPLICATION_INITIALIZING_ADS=Initializing registration information \ on server %s with the contents of server %s +INFO_ENABLE_REPLICATION_INITIALIZING_ADS_ALL=Initializing registration \ + information with the contents of server %s INFO_ENABLE_REPLICATION_INITIALIZING_SCHEMA=Initializing schema on server %s \ with the contents of server %s SEVERE_ERR_REPLICATION_ENABLE_SEEDING_TRUSTSTORE=An unexpected error occurred \ - seeding the truststore contents. Details: %s + seeding the truststore contents of server %s with truststore of server %s. \ + Details: %s SEVERE_ERR_INITIALIZING_REPLICATIONID_NOT_FOUND=Error initializing. Could not \ find replication ID in the server %s for base DN %s. SEVERE_ERR_REPLICATION_INITIALIZING_TRIES_COMPLETED=Error initializing. Could \ @@ -798,13 +802,36 @@ replication port on server %s. SEVERE_ERR_REPLICATION_CONFIGURING_BASEDN=Error updating replication \ configuration on base DN %s of server %s. -SEVERE_ERR_REPLICATION_UPDATING_ADS=Error updating Registration information. \ +SEVERE_ERR_REPLICATION_UPDATING_ADS=Error updating registration information. \ Details: %s -SEVERE_ERR_REPLICATION_READING_ADS=Error reading Registration information. \ +SEVERE_ERR_REPLICATION_READING_ADS=Error reading registration information. \ Details: %s SEVERE_ERR_REPLICATION_ADS_MERGE_NOT_SUPPORTED=The registry information found \ - in servers %s and %s is different. This tool does not allow to handle this \ - scenario. + in servers %s and %s could not be merged. Details: %s +SEVERE_ERR_REPLICATION_ENABLE_COMMON_DOMAIN_ID_ARG=Server %s (base DN '%s') \ + and server %s (base DN '%s') have the same domain ID: %d. +SEVERE_ERR_REPLICATION_ENABLE_COMMON_DOMAIN_ID=The following servers in the \ + two topologies have the same domain ID%n%s%n%nThe replication topologies \ + cannot be merged. To fix this problem please refer to the documentation. +SEVERE_ERR_REPLICATION_ENABLE_COMMON_REPLICATION_SERVER_ID_ARG=Server %s \ + and server %s have the same replication server ID: %d. +SEVERE_ERR_REPLICATION_ENABLE_COMMON_REPLICATION_SERVER_ID=The following \ + servers in the two topologies have the same replication server ID%n%s%n%nThe \ + replication topologies cannot be merged. To fix this problem please refer to \ + the documentation. +SEVERE_ERR_REPLICATION_CANNOT_MERGE_WITH_ERRORS=The errors reading the \ + registry information on %s do not allow to do the merge between the \ + replication topologies. You will have to fix the following problems before \ + merging the topologies:%n%s +INFO_REPLICATION_MERGING_REGISTRIES_CONFIRMATION=To be able to configure \ + replication the registration information of servers %s and %s must be \ + merged. If any conflict is detected, the information of server %s will be \ + kept and the information of server %s overridden.%nDo you want to continue? +INFO_REPLICATION_MERGING_REGISTRIES_DESCRIPTION=To be able to configure \ + replication the registration information of servers %s and %s must be \ + merged. If any conflict is detected, the information of server %s will be \ + kept and the information of server %s overridden. +INFO_REPLICATION_MERGING_REGISTRIES_PROGRESS=Merging registration information SEVERE_ERR_REPLICATION_ERROR_READING_CONFIGURATION=Error reading replication \ configuration of server %s.%nDetails: %s INFO_REPLICATION_REMOVING_REFERENCES_ON_REMOTE=Removing references on base DN \ @@ -813,7 +840,10 @@ server %s INFO_REPLICATION_DISABLING_REPLICATION_SERVER=Disabling replication port %s of \ server %s -INFO_REPLICATION_STATUS_NO_BASEDNS=No base DN's found. +INFO_REPLICATION_STATUS_NO_BASEDNS=No replication information for the base \ + DN's found. +INFO_REPLICATION_STATUS_NO_REPLICATION_INFORMATION=No replication information \ + found. INFO_REPLICATION_STATUS_BASEDN=Base DN INFO_REPLICATION_STATUS_IS_REPLICATED=Replication INFO_REPLICATION_STATUS_REPLICATED=%s - Replication Enabled @@ -852,15 +882,15 @@ have a replication server (with changelog and a replication port) but are not \ linked to any server containing replicated data. INFO_REPLICATION_ONLY_ONE_REPLICATION_SERVER_CONFIRM=Only one replication \ - server will be defined for the following base DNs:%n%s%nIt is recommended to \ + server will be defined for the following base DN's:%n%s%nIt is recommended to \ have at least two replication servers (two changelogs) to avoid a single \ point of failure in the replication topology.%nDo you want to continue? INFO_REPLICATION_ONLY_ONE_REPLICATION_SERVER_WARNING=Only one replication \ - server will be defined for the following base DNs:%n%s%nIt is recommended to \ + server will be defined for the following base DN's:%n%s%nIt is recommended to \ have at least two replication servers (two changelogs) to avoid a single \ point of failure in the replication topology. SEVERE_ERR_REPLICATION_NO_REPLICATION_SERVER=No replication server is defined \ - for the following base DNs:%n%s%nAt least one replication server (a \ + for the following base DN's:%n%s%nAt least one replication server (a \ changelog) is required in the replication topology. It is recommended to \ have at least two replication servers (two changelogs) to avoid a single \ point of failure in the replication topology. @@ -1766,7 +1796,7 @@ 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'. + descendant of any of the base DN's 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' \ @@ -1922,7 +1952,7 @@ 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_ALL_BASE_DNS=All Base DNs +INFO_CTRL_PANEL_ALL_BASE_DNS=All Base DN's INFO_CTRL_PANEL_LDAP_FILTER=LDAP Filter: INFO_CTRL_PANEL_USERS_FILTER=Users INFO_CTRL_PANEL_GROUPS_FILTER=Groups -- Gitblit v1.10.0