From 43b463611b11b775a7350a5dd2020fa78a569631 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 21 Jul 2014 13:20:59 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1206 : Create a new ReplicationBackend/ChangelogBackend to support cn=changelog CR-4052
---
opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java | 10 -----
opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationWrapper.java | 15 -------
opendj-sdk/opends/src/messages/messages/core.properties | 5 --
opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java | 14 -------
opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java | 18 ---------
5 files changed, 1 insertions(+), 61 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/core.properties b/opendj-sdk/opends/src/messages/messages/core.properties
index a854126..c180ed8 100644
--- a/opendj-sdk/opends/src/messages/messages/core.properties
+++ b/opendj-sdk/opends/src/messages/messages/core.properties
@@ -1429,7 +1429,4 @@
SEVERE_ERR_PWPOLICY_REJECT_DUE_TO_UNKNOWN_VALIDATOR_LOG_747=The password for \
user %s could not be validated because the password policy subentry %s is \
referring to an unknown password validator (%s). Please make sure the password \
- policy subentry only refers to validators that exist on all replicas
-MILD_ERR_SEARCH_UNSUPPORTED_CRITICAL_CONTROL_ECL_COOKIE_EXCHANGE_748=The search request \
- cannot be processed because the backend "%s" does not support the Changelog Exchange Control \
- (oid: 1.3.6.1.4.1.26027.1.5.4)
\ No newline at end of file
+ policy subentry only refers to validators that exist on all replicas
\ No newline at end of file
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java
index 00b3676..6b5cc6f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java
@@ -29,7 +29,6 @@
import java.util.List;
import java.util.Set;
-import org.opends.server.controls.ExternalChangelogRequestControl;
import org.opends.server.controls.MatchedValuesControl;
import org.opends.server.types.*;
@@ -489,21 +488,4 @@
*/
public abstract void setProxiedAuthorizationDN(DN proxiedAuthorizationDN);
- /**
- * Retrieves the external changelog request control.
- *
- * @return the external changelog request control, or {@code null}
- * if the control has not been requested.
- */
- public abstract ExternalChangelogRequestControl getECLRequestControl();
-
- /**
- * Sets the external changelog request control.
- * <p>
- * It should be set only when searching the external changelog.
- *
- * @param control
- * The external changelog request control.
- */
- public abstract void setECLRequestControl(ExternalChangelogRequestControl control);
}
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 296488e..a694fcc 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
@@ -1081,20 +1081,6 @@
this.matchedValuesControl = controls;
}
- /** {@inheritDoc} */
- @Override
- public ExternalChangelogRequestControl getECLRequestControl()
- {
- return eclRequestControl;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setECLRequestControl(ExternalChangelogRequestControl control)
- {
- eclRequestControl = control;
- }
-
/**
* {@inheritDoc}
*/
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationWrapper.java b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationWrapper.java
index 9bae780..b76ff58 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationWrapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationWrapper.java
@@ -29,7 +29,6 @@
import java.util.List;
import java.util.Set;
-import org.opends.server.controls.ExternalChangelogRequestControl;
import org.opends.server.controls.MatchedValuesControl;
import org.opends.server.types.*;
@@ -493,18 +492,4 @@
getOperation().setProxiedAuthorizationDN(proxiedAuthorizationDN);
}
- /** {@inheritDoc} */
- @Override
- public ExternalChangelogRequestControl getECLRequestControl()
- {
- return getOperation().getECLRequestControl();
- }
-
- /** {@inheritDoc} */
- @Override
- public void setECLRequestControl(ExternalChangelogRequestControl control)
- {
- getOperation().setECLRequestControl(control);
- }
-
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
index 00970f5..6b46f37 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
@@ -526,16 +526,6 @@
{
// Do nothing here and let AciHandler deal with it.
}
- else if (OID_ECL_COOKIE_EXCHANGE_CONTROL.equals(oid))
- {
- if (c.isCritical() && !backendSupportsControl(oid))
- {
- throw new DirectoryException(
- ResultCode.UNAVAILABLE_CRITICAL_EXTENSION,
- ERR_SEARCH_UNSUPPORTED_CRITICAL_CONTROL_ECL_COOKIE_EXCHANGE.get(backend.getBackendID()));
- }
- setECLRequestControl(getRequestControl(ExternalChangelogRequestControl.DECODER));
- }
// NYI -- Add support for additional controls.
else if (c.isCritical() && !backendSupportsControl(oid))
--
Gitblit v1.10.0