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

Nicolas Capponi
21.20.2014 b367c9116aa754542377720f8ba8680191d04ce2
Checkpoint commit for OPENDJ-1206 : Create a new ReplicationBackend/ChangelogBackend 
to support cn=changelog
CR-4052

Revert previous changes corresponding to CR-4052 as a better approach is to implement
the processing of "Changelog Exchange Control" directly in the changelog backend.
5 files modified
62 ■■■■■ changed files
opends/src/messages/messages/core.properties 5 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/core/SearchOperation.java 18 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/core/SearchOperationBasis.java 14 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/core/SearchOperationWrapper.java 15 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java 10 ●●●●● patch | view | raw | blame | history
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)
 policy subentry only refers to validators that exist on all replicas
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);
}
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}
   */
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);
  }
}
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))