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

Jean-Noel Rouvignac
14.13.2014 f24b1a1660fbe70491fd88557a00c519605ac77f
OPENDJ-1308 Migrate schema support

Replaced ConditionResult by the SDK equivalent.
Minor API change: ConditionResult.inverseOf() has been renamed to not().
2 files deleted
55 files modified
772 ■■■■■ changed files
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/ApproximateMatchingRule.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/Backend.java 7 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/EqualityMatchingRule.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java 12 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java 10 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java 22 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java 12 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java 22 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java 1 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java 24 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java 14 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/NullIndex.java 47 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java 35 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java 10 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java 22 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java 1 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java 10 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java 7 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java 15 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java 7 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java 4 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java 7 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java 1 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/Attribute.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java 12 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/CollectiveVirtualAttribute.java 15 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/ConditionResult.java 114 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java 25 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/VirtualAttribute.java 16 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java 12 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java 35 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java 17 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java 16 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java 15 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java 67 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java 7 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
@@ -48,7 +48,7 @@
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.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryEnvironmentConfig;
import org.opends.server.types.DirectoryException;
opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
@@ -26,19 +26,15 @@
 */
package org.opends.server.api;
import java.util.Collection;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
/**
 * This class provides default implementation of MatchingRule. A
 * matching rule implemented by a Directory Server module must extend
opendj3-server-dev/src/server/org/opends/server/api/ApproximateMatchingRule.java
@@ -28,7 +28,7 @@
import org.opends.server.types.ConditionResult;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ByteSequence;
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
@@ -29,19 +29,19 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.OP_ATTR_ACCOUNT_DISABLED;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import static org.opends.server.util.StaticUtils.toLowerCase;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.core.DirectoryServer;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.StaticUtils.*;
opendj3-server-dev/src/server/org/opends/server/api/Backend.java
@@ -25,15 +25,13 @@
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.api;
import org.forgerock.i18n.LocalizableMessage;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.Configuration;
import org.opends.server.config.ConfigException;
import org.opends.server.core.AddOperation;
@@ -58,7 +56,6 @@
import org.opends.server.types.RestoreConfig;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.WritabilityMode;
import org.opends.server.types.ConditionResult;
import static org.opends.messages.BackendMessages.*;
opendj3-server-dev/src/server/org/opends/server/api/EqualityMatchingRule.java
@@ -26,12 +26,8 @@
 */
package org.opends.server.api;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ConditionResult;
/**
 * This class defines the set of methods and structures that must be
opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
@@ -32,8 +32,8 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java
@@ -32,13 +32,17 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.VirtualAttributeCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
import org.opends.server.types.VirtualAttributeRule;
/**
 * This class defines the set of methods and structures that must be
opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
@@ -26,12 +26,14 @@
 */
package org.opends.server.backends;
import java.io.File;
import java.util.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.BackupBackendCfg;
@@ -43,19 +45,15 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.schema.BooleanSyntax;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.forgerock.util.Reject;
import org.opends.server.types.*;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
/**
 * This class defines a backend used to present information about Directory
 * Server backups.  It will not actually store anything, but upon request will
@@ -1131,6 +1129,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isConfigurationChangeAcceptable(
       BackupBackendCfg cfg, List<LocalizableMessage> unacceptableReasons)
  {
@@ -1145,6 +1144,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConfigChangeResult applyConfigurationChange(BackupBackendCfg cfg)
  {
    ResultCode         resultCode          = ResultCode.SUCCESS;
@@ -1186,6 +1186,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException {
    throw new UnsupportedOperationException("Operation not supported.");
  }
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
@@ -31,6 +31,9 @@
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.LDIFBackendCfg;
@@ -39,10 +42,11 @@
import org.opends.server.config.ConfigException;
import org.opends.server.controls.SubtreeDeleteControl;
import org.opends.server.core.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.*;
import org.forgerock.util.Reject;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;
import org.opends.server.util.StaticUtils;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.util.ServerConstants.*;
opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java
@@ -50,7 +50,7 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.ConditionResult;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
@@ -26,18 +26,12 @@
 */
package org.opends.server.backends;
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.getExceptionMessage;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import java.util.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.MonitorBackendCfg;
@@ -46,14 +40,16 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.LDIFWriter;
import org.opends.server.util.TimeThread;
import org.forgerock.util.Reject;
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
/**
 * This class defines a backend to hold Directory Server monitor entries. It
@@ -121,6 +117,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConfigChangeResult applyConfigurationChange(
      final MonitorBackendCfg backendCfg)
  {
@@ -563,6 +560,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isConfigurationChangeAcceptable(
      final MonitorBackendCfg backendCfg,
      final List<LocalizableMessage> unacceptableReasons)
opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java
@@ -48,7 +48,7 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.ConditionResult;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
@@ -26,8 +26,6 @@
 */
package org.opends.server.backends;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -45,6 +43,9 @@
import javax.net.ssl.SSLParameters;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.RootDSEBackendCfg;
@@ -59,20 +60,15 @@
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.core.WorkflowTopologyNode;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.LDIFWriter;
import org.forgerock.util.Reject;
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.ConfigMessages.
     ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
/**
 * This class defines a backend to hold the Directory Server root DSE.  It is a
 * kind of meta-backend in that it will dynamically generate the root DSE entry
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -56,6 +56,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ConfigurationChangeListener;
@@ -95,7 +96,6 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
/**
 * This class defines a backend to hold the Directory Server schema information.
 * It is a kind of meta-backend in that it doesn't actually hold any data but
opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
@@ -26,13 +26,6 @@
 */
package org.opends.server.backends;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -61,6 +54,10 @@
import javax.net.ssl.TrustManagerFactory;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.TrustStoreBackendCfg;
@@ -72,14 +69,15 @@
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.FilePermission;
import org.opends.server.util.CertificateManager;
import org.opends.server.util.SetupUtils;
import org.forgerock.util.Reject;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
/**
 * This class defines a backend used to provide an LDAP view of public keys
@@ -945,6 +943,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isConfigurationChangeAcceptable(
       TrustStoreBackendCfg configuration, List<LocalizableMessage> unacceptableReasons)
  {
@@ -1065,6 +1064,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConfigChangeResult applyConfigurationChange(TrustStoreBackendCfg cfg)
  {
    ResultCode        resultCode          = ResultCode.SUCCESS;
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -40,6 +40,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ConfigurationChangeListener;
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java
@@ -27,21 +27,21 @@
package org.opends.server.backends.jeb;
import com.sleepycat.je.*;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.StaticUtils;
import java.io.UnsupportedEncodingException;
import java.util.*;
import static org.opends.server.util.ServerConstants.ATTR_REFERRAL_URL;
import static org.opends.messages.JebMessages.
     NOTE_JEB_REFERRAL_RESULT_MESSAGE;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
import org.opends.server.util.StaticUtils;
import com.sleepycat.je.*;
import static org.opends.messages.JebMessages.*;
import static org.opends.server.util.ServerConstants.*;
/**
 * This class represents the referral database which contains URIs from referral
 * entries.  The key is the DN of the referral entry and the value is that of a
opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
@@ -26,16 +26,20 @@
 */
package org.opends.server.backends.jeb;
import java.util.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.backends.jeb.importLDIF.ImportIDSet;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
import org.opends.server.util.StaticUtils;
import com.sleepycat.je.*;
import org.opends.server.types.*;
import org.opends.server.util.StaticUtils;
import org.opends.server.backends.jeb.importLDIF.ImportIDSet;
import static org.opends.messages.JebMessages.*;
import java.util.*;
/**
 * Represents an index implemented by a JE database in which each key maps to
 * a set of entry IDs.  The key is a byte array, and is constructed from some
opendj3-server-dev/src/server/org/opends/server/backends/jeb/NullIndex.java
@@ -20,26 +20,21 @@
 *
 * CDDL HEADER END
 *
 *      Copyright 2011 ForgeRock AS
 *      Copyright 2011-2014 ForgeRock AS
 */
package org.opends.server.backends.jeb;
import java.util.List;
import java.util.Set;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.backends.jeb.importLDIF.ImportIDSet;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
import com.sleepycat.je.*;
/**
 * A null index which replaces id2children and id2subtree when they have been
 * disabled.
@@ -75,6 +70,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean insertID(IndexBuffer buffer, byte[] keyBytes, EntryID entryID)
  {
    return true;
@@ -85,6 +81,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean insertID(Transaction txn, DatabaseEntry key, EntryID entryID)
      throws DatabaseException
  {
@@ -96,6 +93,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void insert(DatabaseEntry key, ImportIDSet importIdSet,
      DatabaseEntry data) throws DatabaseException
  {
@@ -107,6 +105,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void delete(DatabaseEntry key, ImportIDSet importIdSet,
      DatabaseEntry data) throws DatabaseException
  {
@@ -118,6 +117,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public synchronized boolean insert(ImportIDSet importIDSet,
      Set<byte[]> keySet, DatabaseEntry keyData, DatabaseEntry data)
      throws DatabaseException
@@ -130,6 +130,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  void updateKey(Transaction txn, DatabaseEntry key, EntryIDSet deletedIDs,
      EntryIDSet addedIDs) throws DatabaseException
  {
@@ -141,6 +142,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean removeID(IndexBuffer buffer, byte[] keyBytes, EntryID entryID)
  {
    return true;
@@ -151,6 +153,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void removeID(Transaction txn, DatabaseEntry key, EntryID entryID)
      throws DatabaseException
  {
@@ -162,6 +165,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void delete(Transaction txn, Set<byte[]> keySet, EntryID entryID)
      throws DatabaseException
  {
@@ -173,6 +177,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void delete(IndexBuffer buffer, byte[] keyBytes)
  {
    // Do nothing.
@@ -183,6 +188,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConditionResult containsID(Transaction txn, DatabaseEntry key,
      EntryID entryID) throws DatabaseException
  {
@@ -194,6 +200,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public EntryIDSet readKey(DatabaseEntry key, Transaction txn,
      LockMode lockMode)
  {
@@ -205,6 +212,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void writeKey(Transaction txn, DatabaseEntry key,
      EntryIDSet entryIDList) throws DatabaseException
  {
@@ -216,6 +224,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public EntryIDSet readRange(byte[] lower, byte[] upper,
      boolean lowerIncluded, boolean upperIncluded)
  {
@@ -227,6 +236,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public int getEntryLimitExceededCount()
  {
    return 0;
@@ -237,6 +247,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void closeCursor() throws DatabaseException
  {
    // Do nothing.
@@ -247,6 +258,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean addEntry(IndexBuffer buffer, EntryID entryID, Entry entry)
      throws DatabaseException, DirectoryException
  {
@@ -258,6 +270,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean addEntry(Transaction txn, EntryID entryID, Entry entry)
      throws DatabaseException, DirectoryException
  {
@@ -269,6 +282,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void removeEntry(IndexBuffer buffer, EntryID entryID, Entry entry)
      throws DatabaseException, DirectoryException
  {
@@ -280,6 +294,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void removeEntry(Transaction txn, EntryID entryID, Entry entry)
      throws DatabaseException, DirectoryException
  {
@@ -291,6 +306,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void modifyEntry(Transaction txn, EntryID entryID, Entry oldEntry,
      Entry newEntry, List<Modification> mods) throws DatabaseException
  {
@@ -302,6 +318,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void modifyEntry(IndexBuffer buffer, EntryID entryID, Entry oldEntry,
      Entry newEntry, List<Modification> mods) throws DatabaseException
  {
@@ -313,6 +330,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean setIndexEntryLimit(int indexEntryLimit)
  {
    return false;
@@ -323,6 +341,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public int getIndexEntryLimit()
  {
    return 0;
@@ -333,6 +352,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public synchronized void setTrusted(Transaction txn, boolean trusted)
      throws DatabaseException
  {
@@ -344,6 +364,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public synchronized boolean isTrusted()
  {
    return true;
@@ -354,6 +375,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public synchronized boolean isRebuildRunning()
  {
    return false;
@@ -364,6 +386,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public synchronized void setRebuildStatus(boolean rebuildRunning)
  {
    // Do nothing.
@@ -374,6 +397,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean getMaintainCount()
  {
    return false;
@@ -384,6 +408,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void open() throws DatabaseException
  {
    // Do nothing.
@@ -394,6 +419,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  synchronized void close() throws DatabaseException
  {
    // Do nothing.
@@ -404,6 +430,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  protected OperationStatus put(Transaction txn, DatabaseEntry key,
      DatabaseEntry data) throws DatabaseException
  {
@@ -415,6 +442,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  protected OperationStatus read(Transaction txn, DatabaseEntry key,
      DatabaseEntry data, LockMode lockMode) throws DatabaseException
  {
@@ -426,6 +454,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  protected OperationStatus insert(Transaction txn, DatabaseEntry key,
      DatabaseEntry data) throws DatabaseException
  {
@@ -437,6 +466,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  protected OperationStatus delete(Transaction txn, DatabaseEntry key)
      throws DatabaseException
  {
@@ -448,6 +478,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public Cursor openCursor(Transaction txn, CursorConfig cursorConfig)
      throws DatabaseException
  {
@@ -459,6 +490,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public long getRecordCount() throws DatabaseException
  {
    return 0;
@@ -469,6 +501,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public PreloadStats preload(PreloadConfig config) throws DatabaseException
  {
    return new PreloadStats();
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -25,25 +25,24 @@
 *      Portions Copyright 2011-2014 ForgeRock AS
 */
package org.opends.server.backends.jeb;
import com.sleepycat.je.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.ServerConstants;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.JebMessages.*;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
import com.sleepycat.je.*;
import static org.opends.messages.JebMessages.*;
/**
 * This class is used to run an index verification process on the backend.
 */
@@ -1163,18 +1162,21 @@
            Set<byte[]> dummySet = new AbstractSet<byte[]>()
            {
              @Override
              public Iterator<byte[]> iterator()
              {
                // The set is always empty.
                return Collections.<byte[]>emptySet().iterator();
              }
              @Override
              public int size()
              {
                // The set is always empty.
                return 0;
              }
              @Override
              public boolean add(byte[] e)
              {
                if (Arrays.equals(e, value)) {
@@ -1980,6 +1982,7 @@
    /**
     * The action to be performed by this timer task.
     */
    @Override
    public void run()
    {
      long latestCount = keyCount;
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -41,6 +41,9 @@
import javax.crypto.Mac;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.TaskBackendCfg;
@@ -48,10 +51,11 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.*;
import org.forgerock.util.Reject;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java
@@ -26,34 +26,32 @@
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
import org.opends.server.api.ApproximateMatchingRule;
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.core.DirectoryServer;
import org.forgerock.opendj.io.*;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.forgerock.util.Reject;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.util.StaticUtils.*;
/**
 * This class defines a filter that may be used in conjunction with the matched
 * values control to indicate which particular values of a multivalued attribute
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -33,16 +33,18 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.meta.PasswordPolicyCfgDefn;
import org.opends.server.api.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.schema.SchemaConstants.*;
@@ -493,7 +495,7 @@
      return; // requested state matches current state
    }
    this.isDisabled = ConditionResult.inverseOf(this.isDisabled);
    this.isDisabled = ConditionResult.not(this.isDisabled);
    AttributeType type =
         DirectoryServer.getAttributeType(OP_ATTR_ACCOUNT_DISABLED, true);
@@ -1623,8 +1625,7 @@
      return;  // requested state matches current state
    }
    this.mustChangePassword =
            ConditionResult.inverseOf(this.mustChangePassword);
    this.mustChangePassword = ConditionResult.not(this.mustChangePassword);
    AttributeType type =
         DirectoryServer.getAttributeType(OP_ATTR_PWPOLICY_RESET_REQUIRED_LC);
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -49,6 +49,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Utils;
import org.opends.server.admin.Configuration;
import org.opends.server.api.AlertGenerator;
opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
@@ -27,23 +27,24 @@
import static org.opends.messages.ExtensionMessages.*;
import java.util.*;
import java.util.zip.Adler32;
import java.util.zip.CRC32;
import java.util.zip.Checksum;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.EntityTagVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.StaticUtils;
import static org.opends.messages.ExtensionMessages.*;
/**
@@ -65,6 +66,7 @@
    /**
     * {@inheritDoc}
     */
    @Override
    public int compare(final Attribute a1, final Attribute a2)
    {
      return a1.getNameWithOptions().compareTo(a2.getNameWithOptions());
@@ -89,6 +91,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConfigChangeResult applyConfigurationChange(
      final EntityTagVirtualAttributeCfg configuration)
  {
@@ -193,6 +196,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isConfigurationChangeAcceptable(
      final EntityTagVirtualAttributeCfg configuration,
      final List<LocalizableMessage> unacceptableReasons)
opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
@@ -28,13 +28,15 @@
import java.util.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.EntryDNVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.util.ServerConstants.*;
/**
opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
@@ -32,12 +32,14 @@
import java.util.UUID;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.EntryUUIDVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
opendj3-server-dev/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
@@ -31,13 +31,14 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.
        GoverningStructureRuleVirtualAttributeCfg;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.GoverningStructureRuleVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
/**
opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
@@ -31,14 +31,16 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.HasSubordinatesVirtualAttributeCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
/**
opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
@@ -28,14 +28,16 @@
import java.util.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.IsMemberOfVirtualAttributeCfg;
import org.opends.server.api.Group;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.util.ServerConstants.*;
/**
opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java
@@ -25,9 +25,6 @@
 *      Portions Copyright 2011-2014 ForgeRock AS
 */
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
import java.util.Collection;
import java.util.Collections;
@@ -35,6 +32,10 @@
import java.util.List;
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.MemberVirtualAttributeCfg;
import org.opends.server.api.Group;
@@ -44,8 +45,6 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -55,10 +54,6 @@
import org.opends.server.types.ResultCode;
import org.opends.server.types.VirtualAttributeRule;
import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
 * This class implements a virtual attribute provider that works in conjunction
 * with virtual static groups to generate the values for the member or
@@ -347,6 +342,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isConfigurationChangeAcceptable(
                      MemberVirtualAttributeCfg configuration,
                      List<LocalizableMessage> unacceptableReasons)
@@ -360,6 +356,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConfigChangeResult applyConfigurationChange(
                                 MemberVirtualAttributeCfg configuration)
  {
opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
@@ -31,14 +31,16 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.NumSubordinatesVirtualAttributeCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
/**
opendj3-server-dev/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
@@ -31,12 +31,13 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.
        StructuralObjectClassVirtualAttributeCfg;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.StructuralObjectClassVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
/**
opendj3-server-dev/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
@@ -31,12 +31,14 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.SubschemaSubentryVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
/**
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java
@@ -33,6 +33,10 @@
import java.util.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.admin.std.server.*;
@@ -41,7 +45,6 @@
import org.opends.server.backends.jeb.BackupManager;
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.replication.common.CSN;
@@ -52,9 +55,7 @@
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.*;
import org.forgerock.util.Reject;
import static java.util.Collections.*;
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
@@ -26,24 +26,20 @@
 */
package org.opends.server.schema;
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
import static org.opends.server.schema.SchemaConstants.*;
/**
 * This class implements the authPasswordMatch matching rule defined in RFC
 * 3112.
opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -24,11 +24,8 @@
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2012-2014 ForgeRock AS
 */
package org.opends.server.schema;
import java.nio.CharBuffer;
import java.text.CollationKey;
import java.text.Collator;
@@ -38,6 +35,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.CollationMatchingRuleCfgDefn.MatchingRuleType;
import org.opends.server.admin.std.server.CollationMatchingRuleCfg;
@@ -55,8 +53,6 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
/**
 * This class is a factory class for Collation matching rules. It
 * creates different matching rules based on the configuration entries.
opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
@@ -36,6 +36,7 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
@@ -37,7 +37,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConditionResult;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.types.DirectoryException;
import static org.opends.server.schema.SchemaConstants.*;
opendj3-server-dev/src/server/org/opends/server/types/Attribute.java
@@ -26,13 +26,13 @@
 */
package org.opends.server.types;
import org.forgerock.opendj.ldap.ByteString;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
/**
 * This class defines a data structure for storing and interacting
@@ -110,6 +110,7 @@
   *         attribute that is equal to this attribute, or
   *         <CODE>false</CODE> if not.
   */
  @Override
  boolean equals(Object o);
@@ -191,6 +192,7 @@
   *
   * @return The hash code for this attribute.
   */
  @Override
  int hashCode();
@@ -246,6 +248,7 @@
   *
   * @return An iterator over the attribute values in this attribute.
   */
  @Override
  Iterator<AttributeValue> iterator();
@@ -313,6 +316,7 @@
   *
   * @return A one-line string representation of this attribute.
   */
  @Override
  String toString();
opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java
@@ -26,10 +26,6 @@
 */
package org.opends.server.types;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.util.StaticUtils.*;
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Collection;
@@ -42,13 +38,17 @@
import java.util.SortedSet;
import java.util.TreeSet;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.util.Reject;
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.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.util.Reject;
import static org.opends.server.util.StaticUtils.*;
/**
 * This class provides an interface for creating new non-virtual
opendj3-server-dev/src/server/org/opends/server/types/CollectiveVirtualAttribute.java
@@ -27,11 +27,13 @@
package org.opends.server.types;
import org.forgerock.opendj.ldap.ByteString;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
/**
 * This class defines a collective virtual attribute, which is a
 * special kind of attribute whose values do not actually exist
@@ -55,6 +57,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConditionResult approximatelyEqualTo(AttributeValue value) {
    return attribute.approximatelyEqualTo(value);
  }
@@ -62,6 +65,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean contains(AttributeValue value) {
    return attribute.contains(value);
  }
@@ -69,6 +73,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public AttributeType getAttributeType() {
    return attribute.getAttributeType();
  }
@@ -76,6 +81,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public Set<String> getOptions() {
    return attribute.getOptions();
  }
@@ -83,6 +89,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConditionResult greaterThanOrEqualTo(AttributeValue value) {
    return attribute.greaterThanOrEqualTo(value);
  }
@@ -90,6 +97,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isVirtual() {
    return true;
  }
@@ -97,6 +105,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public Iterator<AttributeValue> iterator() {
    return attribute.iterator();
  }
@@ -104,6 +113,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConditionResult lessThanOrEqualTo(AttributeValue value) {
    return attribute.lessThanOrEqualTo(value);
  }
@@ -111,6 +121,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConditionResult matchesSubstring(ByteString subInitial,
          List<ByteString> subAny, ByteString subFinal) {
    return attribute.matchesSubstring(subInitial, subAny, subFinal);
@@ -119,6 +130,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public int size() {
    return attribute.size();
  }
@@ -126,6 +138,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void toString(StringBuilder buffer) {
    attribute.toString(buffer);
  }
opendj3-server-dev/src/server/org/opends/server/types/ConditionResult.java
File was deleted
opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
@@ -27,11 +27,6 @@
 */
package org.opends.server.types;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.i18n.LocalizableMessage;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedList;
@@ -41,15 +36,18 @@
import java.util.Collection;
import java.util.Collections;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.api.MatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
/**
 * This class defines a data structure for storing and interacting
@@ -835,9 +833,9 @@
    {
      boolean hasEscape = false;
      byte[] valueBytes = getBytes(valueStr);
      for (int i=0; i < valueBytes.length; i++)
      for (byte valueByte : valueBytes)
      {
        if (valueBytes[i] == 0x5C) // The backslash character
        if (valueByte == 0x5C) // The backslash character
        {
          hasEscape = true;
          break;
@@ -1889,9 +1887,9 @@
    byte[] valueBytes = getBytes(filterString.substring(equalPos+1,
                                                        endPos));
    boolean hasEscape = false;
    for (int i=0; i < valueBytes.length; i++)
    for (byte valueByte : valueBytes)
    {
      if (valueBytes[i] == 0x5C)
      if (valueByte == 0x5C)
      {
        hasEscape = true;
        break;
@@ -3590,6 +3588,7 @@
   * @return  <CODE>true</CODE> if the provide object is equal to this
   *          search filter, or <CODE>false</CODE> if it is not.
   */
  @Override
  public boolean equals(Object o)
  {
    if (o == null)
@@ -3915,6 +3914,7 @@
   *
   * @return  The hash code for this search filter.
   */
  @Override
  public int hashCode()
  {
    switch (filterType)
@@ -4037,6 +4037,7 @@
   *
   * @return  A string representation of this search filter.
   */
  @Override
  public String toString()
  {
    StringBuilder buffer = new StringBuilder();
opendj3-server-dev/src/server/org/opends/server/types/VirtualAttribute.java
@@ -26,17 +26,16 @@
 */
package org.opends.server.types;
import org.forgerock.opendj.ldap.ByteString;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.api.VirtualAttributeProvider;
/**
 * This class defines a virtual attribute, which is a special kind of
 * attribute whose values do not actually exist in persistent storage
@@ -91,6 +90,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConditionResult approximatelyEqualTo(AttributeValue value)
  {
    return provider.approximatelyEqualTo(entry, rule, value);
@@ -101,6 +101,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean contains(AttributeValue value)
  {
    return provider.hasValue(entry, rule, value);
@@ -122,6 +123,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public AttributeType getAttributeType()
  {
    return attributeType;
@@ -143,6 +145,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public Set<String> getOptions()
  {
    return Collections.emptySet();
@@ -167,6 +170,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConditionResult greaterThanOrEqualTo(AttributeValue value)
  {
    return provider.greaterThanOrEqualTo(entry, rule, value);
@@ -221,6 +225,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isVirtual()
  {
    return true;
@@ -231,6 +236,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public Iterator<AttributeValue> iterator()
  {
    Set<AttributeValue> values = provider.getValues(entry, rule);
@@ -242,6 +248,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConditionResult lessThanOrEqualTo(AttributeValue value)
  {
    return provider.lessThanOrEqualTo(entry, rule, value);
@@ -252,6 +259,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ConditionResult matchesSubstring(ByteString subInitial,
      List<ByteString> subAny, ByteString subFinal)
  {
@@ -275,6 +283,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public int size()
  {
    if (!provider.isMultiValued())
@@ -292,6 +301,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void toString(StringBuilder buffer)
  {
    buffer.append("VirtualAttribute(");
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
@@ -26,17 +26,12 @@
 */
package org.opends.server.backends;
import java.io.File;
import java.util.UUID;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.Backend;
import org.opends.server.backends.LDIFBackend;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.AddOperation;
@@ -50,17 +45,16 @@
import org.opends.server.tasks.TasksTestCase;
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchScope;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
/**
 * A set of test cases for the LDIF backend.
 */
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -26,12 +26,9 @@
 */
package org.opends.server.backends.jeb;
import static org.assertj.core.api.Assertions.*;
import static org.opends.server.types.ConditionResult.*;
import static org.testng.Assert.*;
import java.util.*;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.LocalDBBackendCfgDefn;
@@ -54,6 +51,10 @@
import com.sleepycat.je.DatabaseEntry;
import com.sleepycat.je.LockMode;
import static org.assertj.core.api.Assertions.*;
import static org.forgerock.opendj.ldap.ConditionResult.*;
import static org.testng.Assert.*;
/**
 * BackendImpl Tester.
 */
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
@@ -25,15 +25,6 @@
 */
package org.opends.server.extensions;
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashSet;
@@ -44,6 +35,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.EntityTagVirtualAttributeCfgDefn.ChecksumAlgorithm;
@@ -69,8 +62,6 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
@@ -87,7 +78,9 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import static java.util.Collections.*;
import static org.testng.Assert.*;
/**
 * A set of test cases for the entity tag virtual attribute provider.
@@ -110,6 +103,7 @@
    @Override
    public void addChangeListener(
        final ConfigurationChangeListener<VirtualAttributeCfg> listener)
    {
@@ -119,6 +113,7 @@
    @Override
    public void addEntityTagChangeListener(
        final ConfigurationChangeListener<EntityTagVirtualAttributeCfg> listener)
    {
@@ -127,6 +122,7 @@
    @Override
    public Class<? extends EntityTagVirtualAttributeCfg> configurationClass()
    {
      // Not needed.
@@ -135,6 +131,7 @@
    @Override
    public DN dn()
    {
      // Not needed.
@@ -143,6 +140,7 @@
    @Override
    public AttributeType getAttributeType()
    {
      // Not needed.
@@ -151,6 +149,7 @@
    @Override
    public SortedSet<DN> getBaseDN()
    {
      // Not needed.
@@ -159,6 +158,7 @@
    @Override
    public ChecksumAlgorithm getChecksumAlgorithm()
    {
      return ChecksumAlgorithm.ADLER_32;
@@ -166,6 +166,7 @@
    @Override
    public ConflictBehavior getConflictBehavior()
    {
      // Not needed.
@@ -174,6 +175,7 @@
    @Override
    public SortedSet<AttributeType> getExcludedAttribute()
    {
      return excludedAttributes;
@@ -181,6 +183,7 @@
    @Override
    public SortedSet<String> getFilter()
    {
      // Not needed.
@@ -189,6 +192,7 @@
    @Override
    public SortedSet<DN> getGroupDN()
    {
      // Not needed.
@@ -197,6 +201,7 @@
    @Override
    public String getJavaClass()
    {
      // Not needed.
@@ -205,6 +210,7 @@
    @Override
    public Scope getScope()
    {
      // Not needed.
@@ -213,6 +219,7 @@
    @Override
    public boolean isEnabled()
    {
      return true;
@@ -220,6 +227,7 @@
    @Override
    public void removeChangeListener(
        final ConfigurationChangeListener<VirtualAttributeCfg> listener)
    {
@@ -229,6 +237,7 @@
    @Override
    public void removeEntityTagChangeListener(
        final ConfigurationChangeListener<EntityTagVirtualAttributeCfg> listener)
    {
@@ -547,6 +556,7 @@
      /**
       * {@inheritDoc}
       */
      @Override
      public void appendErrorMessage(final LocalizableMessage message)
      {
        this.message = new LocalizableMessageBuilder(message);
@@ -557,6 +567,7 @@
      /**
       * {@inheritDoc}
       */
      @Override
      public LocalizableMessageBuilder getErrorMessage()
      {
        return message;
@@ -567,6 +578,7 @@
      /**
       * @return the resultCode
       */
      @Override
      public ResultCode getResultCode()
      {
        return resultCode;
@@ -577,6 +589,7 @@
      /**
       * {@inheritDoc}
       */
      @Override
      public void setResultCode(final ResultCode resultCode)
      {
        this.resultCode = resultCode;
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -26,18 +26,14 @@
 */
package org.opends.server.extensions;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
import org.opends.server.core.DirectoryServer;
@@ -45,14 +41,13 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.workflowelement.localbackend.LocalBackendSearchOperation;
import static org.testng.Assert.*;
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.*;
/**
 * A set of test cases for the entryDN virtual attribute provider.
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
@@ -48,7 +48,7 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
@@ -26,10 +26,6 @@
 */
package org.opends.server.extensions;
import static org.opends.server.extensions.LDAPPassThroughAuthenticationPolicyFactory.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.testng.Assert.*;
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
@@ -37,6 +33,10 @@
import java.util.concurrent.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.LDAPPassThroughAuthenticationPolicyCfgDefn.MappingPolicy;
@@ -49,8 +49,6 @@
import org.opends.server.extensions.LDAPPassThroughAuthenticationPolicyFactory.ConnectionFactory;
import org.opends.server.extensions.LDAPPassThroughAuthenticationPolicyFactory.ConnectionPool;
import org.opends.server.extensions.LDAPPassThroughAuthenticationPolicyFactory.LDAPConnectionFactory;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.protocols.ldap.*;
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.schema.GeneralizedTimeSyntax;
@@ -58,14 +56,16 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static org.opends.server.extensions.LDAPPassThroughAuthenticationPolicyFactory.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.testng.Assert.*;
/**
 * Test LDAP authentication mappingPolicy implementation.
 */
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
@@ -26,17 +26,12 @@
 */
package org.opends.server.extensions;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.GroupManager;
@@ -44,10 +39,12 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
/**
 * A set of test cases for the virtual static group implementation and the
 * member virtual attribute provider.
@@ -360,7 +357,7 @@
    VirtualStaticGroup groupImplementation = new VirtualStaticGroup();
    try
    {
      VirtualStaticGroup groupInstance = groupImplementation.newInstance(entry);
      groupImplementation.newInstance(entry);
    }
    finally
    {
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
@@ -30,7 +30,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AcceptRejectWarn;
import org.opends.server.types.ConditionResult;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.types.DirectoryException;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
@@ -42,7 +42,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.DirectoryException;
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java
File was deleted
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
@@ -26,19 +26,18 @@
 */
package org.opends.server.types;
import org.forgerock.opendj.ldap.ByteString;
import static org.testng.Assert.*;
import java.util.Collections;
import java.util.LinkedHashSet;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.ConflictBehavior;
import org.opends.server.extensions.EntryDNVirtualAttributeProvider;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
/**
 * This class provides a set of test cases for virtual attributes.