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/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
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();
+ }
}
--
Gitblit v1.10.0