opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -51,7 +51,7 @@ import org.opends.server.types.DereferencePolicy; import org.opends.server.types.LDAPException; import org.opends.server.types.RawFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.opends.messages.ProtocolMessages.*; opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -84,7 +84,7 @@ import org.forgerock.opendj.ldap.ByteString; import org.opends.server.types.DereferencePolicy; import org.opends.server.types.LDAPException; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.util.Base64; import org.w3c.dom.Document; opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
@@ -22,8 +22,8 @@ * * * Copyright 2008-2010 Sun Microsystems, Inc. * Portions Copyright 2014 ForgeRock AS */ package org.opends.guitools.controlpanel.browser; import java.util.ArrayList; @@ -40,7 +40,7 @@ import org.opends.guitools.controlpanel.event.ReferralAuthenticationListener; import org.opends.server.types.DN; import org.opends.server.types.LDAPURL; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; /** * An LDAPConnectionPool is a pool of LDAPConnection. opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -27,8 +27,6 @@ package org.opends.guitools.controlpanel.browser; import static org.opends.messages.AdminToolMessages.*; import java.util.ArrayList; import java.util.Set; @@ -44,6 +42,7 @@ import javax.swing.SwingUtilities; import javax.swing.tree.TreeNode; import org.forgerock.opendj.ldap.SearchScope; import org.opends.admin.ads.util.ConnectionUtils; import org.opends.guitools.controlpanel.ui.nodes.BasicNode; import org.opends.messages.AdminToolMessages; @@ -53,7 +52,8 @@ import org.opends.server.types.LDAPURL; import org.opends.server.types.OpenDsException; import org.opends.server.types.RDN; import org.opends.server.types.SearchScope; import static org.opends.messages.AdminToolMessages.*; /** * The class that is in charge of doing the LDAP searches required to update a @@ -301,6 +301,7 @@ { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { controller.expandNode(node); @@ -890,6 +891,7 @@ { SwingUtilities.invokeAndWait(new Runnable() { @Override public void run() { for (int i=0; i<getNode().getChildCount(); i++) @@ -1129,7 +1131,7 @@ int scope; if (url.getScope() != null) { switch (url.getScope()) switch (url.getScope().asEnum()) { case BASE_OBJECT: scope = SearchControls.OBJECT_SCOPE; opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java
@@ -50,7 +50,7 @@ import org.opends.server.types.ModificationType; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchResultEntry; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; opendj3-server-dev/src/server/org/opends/server/api/Group.java
@@ -41,7 +41,7 @@ import org.opends.server.types.InitializationException; import org.opends.server.types.MemberList; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -27,18 +27,12 @@ */ package org.opends.server.authorization.dseecompat; import static org.opends.messages.AccessControlMessages.*; import static org.opends.server.authorization.dseecompat.Aci.*; import static org.opends.server.authorization.dseecompat.EnumEvalReason.*; import static org.opends.server.config.ConfigConstants.*; import static org.opends.server.schema.SchemaConstants.*; import static org.opends.server.util.ServerConstants.*; import static org.opends.server.util.StaticUtils.*; import java.util.*; import java.util.concurrent.locks.Lock; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.std.server.DseeCompatAccessControlHandlerCfg; import org.opends.server.api.AccessControlHandler; import org.opends.server.api.ClientConnection; @@ -47,13 +41,20 @@ import org.opends.server.config.ConfigException; import org.opends.server.controls.GetEffectiveRightsRequestControl; 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.protocols.ldap.LDAPControl; import org.opends.server.types.*; import org.opends.server.workflowelement.localbackend.*; import static org.opends.messages.AccessControlMessages.*; import static org.opends.server.authorization.dseecompat.Aci.*; import static org.opends.server.authorization.dseecompat.EnumEvalReason.*; import static org.opends.server.config.ConfigConstants.*; import static org.opends.server.schema.SchemaConstants.*; import static org.opends.server.util.ServerConstants.*; import static org.opends.server.util.StaticUtils.*; /** * The AciHandler class performs the main processing for the dseecompat * package. opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -24,34 +24,30 @@ * Copyright 2008-2010 Sun Microsystems, Inc. * Portions Copyright 2011-2014 ForgeRock AS */ package org.opends.server.authorization.dseecompat; import org.forgerock.i18n.LocalizableMessage; import org.opends.server.workflowelement.localbackend.*; import org.opends.server.api.BackendInitializationListener; import org.opends.server.api.Backend; import org.opends.server.api.AlertGenerator; import org.opends.server.api.plugin.InternalDirectoryServerPlugin; import org.opends.server.api.plugin.PluginResult; import org.opends.server.api.plugin.PluginType; import org.opends.server.api.plugin.PluginResult.PostOperation; import org.opends.server.types.operation.*; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPControl; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.types.*; import static org.opends.messages.AccessControlMessages.*; import org.opends.server.core.DirectoryServer; import static org.opends.server.util.ServerConstants.*; import java.util.*; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.api.AlertGenerator; import org.opends.server.api.Backend; import org.opends.server.api.BackendInitializationListener; import org.opends.server.api.plugin.InternalDirectoryServerPlugin; import org.opends.server.api.plugin.PluginResult; import org.opends.server.api.plugin.PluginResult.PostOperation; import org.opends.server.api.plugin.PluginType; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPControl; import org.opends.server.types.*; import org.opends.server.types.operation.*; import org.opends.server.workflowelement.localbackend.LocalBackendSearchOperation; import static org.opends.messages.AccessControlMessages.*; import static org.opends.server.util.ServerConstants.*; /** * The AciListenerManager updates an ACI list after each modification @@ -96,6 +92,7 @@ /** * {@inheritDoc} */ @Override public void doPostSynchronization( PostSynchronizationAddOperation addOperation) { @@ -111,6 +108,7 @@ /** * {@inheritDoc} */ @Override public void doPostSynchronization( PostSynchronizationDeleteOperation deleteOperation) { @@ -126,6 +124,7 @@ /** * {@inheritDoc} */ @Override public void doPostSynchronization( PostSynchronizationModifyDNOperation modifyDNOperation) { @@ -141,6 +140,7 @@ /** * {@inheritDoc} */ @Override public void doPostSynchronization( PostSynchronizationModifyOperation modifyOperation) { @@ -157,6 +157,7 @@ /** * {@inheritDoc} */ @Override public PostOperation doPostOperation( PostOperationAddOperation addOperation) { @@ -176,6 +177,7 @@ /** * {@inheritDoc} */ @Override public PostOperation doPostOperation( PostOperationDeleteOperation deleteOperation) { @@ -195,6 +197,7 @@ /** * {@inheritDoc} */ @Override public PostOperation doPostOperation( PostOperationModifyDNOperation modifyDNOperation) { @@ -215,6 +218,7 @@ /** * {@inheritDoc} */ @Override public PostOperation doPostOperation( PostOperationModifyOperation modifyOperation) { @@ -412,6 +416,7 @@ * find all aci attribute type values that it may contain and add them * to the ACI list. */ @Override public void performBackendInitializationProcessing(Backend backend) { // Check to make sure that the backend has a presence index defined @@ -485,6 +490,7 @@ * attribute type values associated with entries in the provided * backend. */ @Override public void performBackendFinalizationProcessing(Backend backend) { aciList.removeAci(backend); @@ -499,6 +505,7 @@ * @return The fully-qualified name of the Java class for this alert * generator implementation. */ @Override public String getClassName() { return CLASS_NAME; @@ -513,6 +520,7 @@ * @return The DN of the configuration entry containing the Access * Control configuration information. */ @Override public DN getComponentEntryDN() { return this.configurationDN; @@ -530,6 +538,7 @@ * @return Information about the set of alerts that this generator may * produce. */ @Override public LinkedHashMap<String, String> getAlerts() { LinkedHashMap<String, String> alerts = opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -35,7 +35,7 @@ import org.forgerock.i18n.LocalizableMessage; import org.opends.server.types.AttributeType; import org.opends.server.types.DN; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; /** * This class represents target part of an ACI's syntax. This is the part @@ -592,7 +592,7 @@ targetDN=targets.getTarget().getDN(); } //Check if the scope is correct. switch(targets.getTargetScope()) { switch(targets.getTargetScope().asEnum()) { case BASE_OBJECT: if(!targetDN.equals(entryDN)) return false; opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
@@ -26,18 +26,19 @@ */ package org.opends.server.authorization.dseecompat; import static org.opends.messages.AccessControlMessages.*; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.types.*; import static org.opends.messages.AccessControlMessages.*; /* * TODO Evaluate making this class more efficient. * opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java
@@ -26,16 +26,17 @@ */ package org.opends.server.authorization.dseecompat; import static org.opends.messages.AccessControlMessages.*; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.core.DirectoryServer; import org.opends.server.types.*; import static org.opends.messages.AccessControlMessages.*; /** * This class represents the userdn keyword in a bind rule. */ opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
@@ -33,6 +33,7 @@ import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; 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/LDIFBackend.java
@@ -33,6 +33,7 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; 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/MemoryBackend.java
@@ -64,7 +64,7 @@ import org.opends.server.types.RestoreConfig; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.util.LDIFException; import org.opends.server.util.LDIFReader; import org.opends.server.util.LDIFWriter; opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
@@ -31,6 +31,7 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; 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/RootDSEBackend.java
@@ -1100,7 +1100,7 @@ SearchFilter filter = searchOperation.getFilter(); switch (searchOperation.getScope()) switch (searchOperation.getScope().asEnum()) { case BASE_OBJECT: Entry dseEntry = getRootDSE(searchOperation.getClientConnection()); opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -57,6 +57,7 @@ import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.opendj.ldap.schema.ObjectClassType; import org.forgerock.util.Reject; import org.opends.server.admin.Configuration; opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
@@ -57,6 +57,7 @@ import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; 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
@@ -26,13 +26,13 @@ */ package org.opends.server.backends.jeb; import java.io.UnsupportedEncodingException; import java.util.*; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.core.DirectoryServer; import org.opends.server.core.SearchOperation; import org.opends.server.types.*; @@ -42,6 +42,7 @@ 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/EntryContainer.java
@@ -27,17 +27,15 @@ */ package org.opends.server.backends.jeb; import static org.opends.messages.JebMessages.*; import static org.opends.server.util.StaticUtils.*; import com.sleepycat.je.*; import java.util.*; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; 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.SearchScope; import org.opends.server.admin.server.ConfigurationAddListener; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.server.ConfigurationDeleteListener; @@ -51,13 +49,16 @@ import org.opends.server.config.ConfigException; import org.opends.server.controls.*; import org.opends.server.core.*; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.protocols.ldap.LDAPResultCode; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.util.ServerConstants; import org.opends.server.util.StaticUtils; import com.sleepycat.je.*; import static org.opends.messages.JebMessages.*; import static org.opends.server.util.StaticUtils.*; /** * Storage container for LDAP entries. Each base DN of a JE backend is given * its own entry container. The entry container is the object that implements opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java
@@ -25,25 +25,25 @@ * Portions Copyright 2011-2014 ForgeRock AS */ package org.opends.server.backends.jeb; import org.forgerock.i18n.LocalizableMessage; import java.util.Map; import java.util.Iterator; import java.util.LinkedList; import java.util.Map; import java.util.TreeMap; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.controls.VLVRequestControl; import org.opends.server.controls.VLVResponseControl; import org.opends.server.core.DirectoryServer; import org.opends.server.core.SearchOperation; import org.opends.server.protocols.ldap.LDAPResultCode; import org.opends.server.types.*; import static org.opends.messages.JebMessages.*; import static org.opends.server.util.StaticUtils.*; import com.sleepycat.je.LockMode; import static org.opends.messages.JebMessages.*; import static org.opends.server.util.StaticUtils.*; /** * This class provides a mechanism for sorting the contents of an entry ID set opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
@@ -25,40 +25,36 @@ * Portions Copyright 2011-2014 ForgeRock AS */ package org.opends.server.backends.jeb; import org.forgerock.i18n.LocalizableMessage; import com.sleepycat.je.*; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.ldap.ByteSequence; import org.opends.server.admin.std.server.LocalDBVLVIndexCfg; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.core.DirectoryServer; import org.opends.server.core.SearchOperation; import static org.opends.messages.JebMessages. NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD; import static org.opends.messages.JebMessages. ERR_ENTRYIDSORTER_NEGATIVE_START_POS; import static org.opends.messages.JebMessages. ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR; import static org.opends.messages.JebMessages. ERR_JEB_CONFIG_VLV_INDEX_BAD_FILTER; import org.opends.server.util.StaticUtils; import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString; import org.opends.server.api.OrderingMatchingRule; import org.opends.server.config.ConfigException; import org.opends.server.protocols.ldap.LDAPResultCode; import org.opends.server.controls.VLVRequestControl; import org.opends.server.controls.VLVResponseControl; import org.opends.server.controls.ServerSideSortRequestControl; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; 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.ByteSequence; import org.forgerock.opendj.ldap.SearchScope.Enum; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn.Scope; import org.opends.server.admin.std.server.LocalDBVLVIndexCfg; import org.opends.server.api.OrderingMatchingRule; import org.opends.server.config.ConfigException; import org.opends.server.controls.ServerSideSortRequestControl; import org.opends.server.controls.VLVRequestControl; import org.opends.server.controls.VLVResponseControl; import org.opends.server.core.DirectoryServer; import org.opends.server.core.SearchOperation; import org.opends.server.protocols.ldap.LDAPResultCode; 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.StaticUtils.*; /** * This class represents a VLV index. Each database record is a sorted list * of entry IDs followed by sets of attribute values used to sort the entries. @@ -125,7 +121,7 @@ * @param config The VLV index config object to use for this VLV * index. * @param state The state database to persist vlvIndex state info. * @param env The JE Environemnt * @param env The JE Environment * @param entryContainer The database entryContainer holding this vlvIndex. * @throws com.sleepycat.je.DatabaseException * If an error occurs in the JE database. @@ -141,7 +137,7 @@ this.config = config; this.baseDN = config.getBaseDN(); this.scope = SearchScope.valueOf(config.getScope().name()); this.scope = valueOf(config.getScope()); this.sortedSetCapacity = config.getMaxBlockSize(); try @@ -237,6 +233,19 @@ this.config.addChangeListener(this); } private SearchScope valueOf(Scope cfgScope) { final Enum toFind = SearchScope.Enum.valueOf(cfgScope.name()); for (SearchScope scope : SearchScope.values()) { if (scope.asEnum() == toFind) { return scope; } } return null; } /** * {@inheritDoc} */ @@ -1580,7 +1589,6 @@ for (AttributeValue v : values) { byte[] vBytes; if(v == null) { builder.appendBERLength(0); @@ -1689,6 +1697,7 @@ /** * {@inheritDoc} */ @Override public synchronized boolean isConfigurationChangeAcceptable( LocalDBVLVIndexCfg cfg, List<LocalizableMessage> unacceptableReasons) @@ -1755,6 +1764,7 @@ /** * {@inheritDoc} */ @Override public synchronized ConfigChangeResult applyConfigurationChange( LocalDBVLVIndexCfg cfg) { opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -43,6 +43,7 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.util.Reject; import org.opends.server.admin.Configuration; import org.opends.server.admin.server.ConfigurationChangeListener; @@ -844,7 +845,7 @@ if (baseDN.equals(taskRootDN)) { switch (searchScope) switch (searchScope.asEnum()) { case BASE_OBJECT: searchRoot = true; @@ -870,7 +871,7 @@ } else if (baseDN.equals(scheduledTaskParentDN)) { switch (searchScope) switch (searchScope.asEnum()) { case BASE_OBJECT: searchScheduledParent = true; @@ -889,7 +890,7 @@ } else if (baseDN.equals(recurringTaskParentDN)) { switch (searchScope) switch (searchScope.asEnum()) { case BASE_OBJECT: searchRecurringParent = true; opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
@@ -48,6 +48,9 @@ import javax.management.ObjectName; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.std.server.MonitorProviderCfg; import org.opends.server.api.AlertGenerator; import org.opends.server.api.ClientConnection; @@ -55,19 +58,17 @@ import org.opends.server.api.InvokableComponent; import org.opends.server.api.MonitorProvider; import org.opends.server.core.DirectoryServer; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.jmx.Credential; import org.opends.server.protocols.jmx.JmxClientConnection; import org.opends.server.protocols.ldap.LDAPFilter; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import static org.opends.messages.ConfigMessages.*; import static org.opends.server.util.ServerConstants.*; import static org.opends.server.util.StaticUtils.*; /** * This class defines a JMX MBean that can be registered with the Directory * Server to provide monitoring and statistical information, provide read and/or opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
@@ -32,6 +32,9 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.util.Utils; import org.opends.server.admin.ClassPropertyDefinition; import org.opends.server.admin.server.ConfigurationAddListener; import org.opends.server.admin.server.ConfigurationChangeListener; @@ -49,14 +52,12 @@ import org.opends.server.api.plugin.PluginResult.PostOperation; import org.opends.server.api.plugin.PluginType; import org.opends.server.config.ConfigException; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.util.Utils; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPControl; import org.opends.server.types.*; import org.opends.server.types.operation.*; import org.opends.server.workflowelement.localbackend.*; import org.opends.server.workflowelement.localbackend.LocalBackendSearchOperation; import static org.opends.messages.ConfigMessages.*; import static org.opends.messages.CoreMessages.*; opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java
@@ -43,7 +43,7 @@ import org.opends.server.types.Entry; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; @@ -262,7 +262,7 @@ } // Make sure that the entry is within our target scope. switch (scope) switch (scope.asEnum()) { case BASE_OBJECT: if (!baseDN.equals(entry.getName())) @@ -370,7 +370,7 @@ } // Make sure that the entry is within our target scope. switch (scope) switch (scope.asEnum()) { case BASE_OBJECT: if (!baseDN.equals(entry.getName())) @@ -494,7 +494,7 @@ } // Make sure that the entry is within our target scope. switch (scope) switch (scope.asEnum()) { case BASE_OBJECT: if (!baseDN.equals(oldEntry.getName())) @@ -607,7 +607,7 @@ boolean oldMatches = false; boolean newMatches = false; switch (scope) switch (scope.asEnum()) { case BASE_OBJECT: oldMatches = baseDN.equals(oldDN); opendj3-server-dev/src/server/org/opends/server/core/RootDseWorkflowTopology.java
@@ -26,13 +26,12 @@ */ package org.opends.server.core; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.core.networkgroups.NetworkGroupNamingContexts; import org.opends.server.types.*; /** * This class implements the workflow node that handles the root DSE entry. * As opposed to the WorkflowTopologyNode class, the root DSE node has no @@ -74,6 +73,7 @@ * @throws CanceledOperationException if this operation should * be cancelled. */ @Override public void execute(Operation operation) throws CanceledOperationException { // Execute the operation. opendj3-server-dev/src/server/org/opends/server/core/SearchOperation.java
@@ -29,9 +29,10 @@ import java.util.List; import java.util.Set; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.controls.MatchedValuesControl; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; /** * This interface defines an operation used to search for entries opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java
@@ -29,16 +29,17 @@ import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.api.AuthenticationPolicyState; import org.opends.server.api.ClientConnection; import org.opends.server.api.plugin.PluginResult; import org.opends.server.controls.AccountUsableResponseControl; import org.opends.server.controls.MatchedValuesControl; import org.opends.server.core.networkgroups.NetworkGroup; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.protocols.ldap.LDAPFilter; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.types.operation.PostResponseSearchOperation; import org.opends.server.types.operation.PreParseSearchOperation; import org.opends.server.types.operation.SearchEntrySearchOperation; opendj3-server-dev/src/server/org/opends/server/core/SearchOperationWrapper.java
@@ -29,9 +29,10 @@ import java.util.List; import java.util.Set; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.controls.MatchedValuesControl; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; /** * This abstract class wraps/decorates a given search operation. opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java
@@ -26,13 +26,13 @@ */ package org.opends.server.core; import org.opends.server.api.ClientConnection; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.api.ClientConnection; import org.opends.server.api.Backend; import org.opends.server.api.BackendInitializationListener; import org.opends.server.api.DITCacheMap; @@ -43,7 +43,6 @@ import org.opends.server.api.plugin.PluginResult.PreOperation; import org.opends.server.api.plugin.PluginType; import org.opends.server.controls.SubentriesControl; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.types.*; @@ -59,14 +58,11 @@ import org.opends.server.types.operation.PreOperationDeleteOperation; import org.opends.server.types.operation.PreOperationModifyDNOperation; import org.opends.server.types.operation.PreOperationModifyOperation; import org.opends.server.workflowelement.localbackend. LocalBackendSearchOperation; import org.opends.server.workflowelement.localbackend.LocalBackendSearchOperation; import static org.opends.messages.CoreMessages.*; import static org.opends.server.util.ServerConstants.*; import static org.opends.server.config.ConfigConstants.*; import static org.opends.server.util.ServerConstants.*; /** * This class provides a mechanism for interacting with subentries defined in @@ -303,6 +299,7 @@ * {@inheritDoc} In this case, the server will search the backend to find * all subentries that it may contain and register them with this manager. */ @Override public void performBackendInitializationProcessing(Backend backend) { InternalClientConnection conn = @@ -619,6 +616,7 @@ * {@inheritDoc} In this case, the server will de-register * all subentries associated with the provided backend. */ @Override public void performBackendFinalizationProcessing(Backend backend) { lock.writeLock().lock(); opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
@@ -32,6 +32,9 @@ import java.util.concurrent.ConcurrentMap; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.util.Utils; import org.opends.server.admin.ClassPropertyDefinition; import org.opends.server.admin.server.ConfigurationAddListener; import org.opends.server.admin.server.ConfigurationChangeListener; @@ -42,9 +45,8 @@ import org.opends.server.admin.std.server.VirtualAttributeCfg; import org.opends.server.api.VirtualAttributeProvider; import org.opends.server.config.ConfigException; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.util.Utils; import org.opends.server.types.*; import static org.opends.messages.ConfigMessages.*; import static org.opends.server.util.StaticUtils.*; opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopology.java
@@ -27,7 +27,7 @@ package org.opends.server.core; import org.opends.server.types.DN; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; /** * This class is the base class used to build the workflow topology. @@ -113,10 +113,9 @@ */ protected SearchScope elaborateScopeForSearchInSubordinates( SearchScope currentScope ) SearchScope currentScope) { switch (currentScope) switch (currentScope.asEnum()) { case BASE_OBJECT: return null; opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopologyNode.java
@@ -26,13 +26,15 @@ */ package org.opends.server.core; import java.util.ArrayList; import org.opends.server.types.*; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.CanceledOperationException; import org.opends.server.types.DN; import org.opends.server.types.Operation; import org.opends.server.types.OperationType; import org.opends.server.workflowelement.WorkflowElement; /** * This class implements a workflow node. A workflow node is used * to build a tree of workflows (aka workflow topology). Each node @@ -94,6 +96,7 @@ * @throws CanceledOperationException if this operation should * be canceled. */ @Override public void execute(Operation operation) throws CanceledOperationException { // Execute the operation opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java
@@ -38,7 +38,7 @@ import org.opends.server.types.Attributes; import org.opends.server.types.InitializationException; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.opends.server.protocols.ldap.LDAPConstants.*; import static org.opends.messages.ProtocolMessages.*; opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java
@@ -26,21 +26,14 @@ */ package org.opends.server.core.networkgroups; import static org.opends.messages.ConfigMessages.*; import static org.opends.messages.CoreMessages.*; import java.util.ArrayList; import java.util.List; import java.util.Set; import org.forgerock.i18n.LocalizableMessage; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.meta. RequestFilteringQOSPolicyCfgDefn.AllowedOperations; import org.opends.server.admin.std.meta. RequestFilteringQOSPolicyCfgDefn.AllowedSearchScopes; import org.opends.server.admin.std.meta.RequestFilteringQOSPolicyCfgDefn.AllowedOperations; import org.opends.server.admin.std.meta.RequestFilteringQOSPolicyCfgDefn.AllowedSearchScopes; import org.opends.server.admin.std.server.RequestFilteringQOSPolicyCfg; import org.opends.server.api.QOSPolicyFactory; import org.opends.server.config.ConfigException; @@ -59,7 +52,8 @@ import org.opends.server.types.operation.PreParseOperation; import org.opends.server.types.operation.PreParseSearchOperation; import static org.opends.messages.ConfigMessages.*; import static org.opends.messages.CoreMessages.*; /** * This class defines a factory for creating user configurable request @@ -114,6 +108,7 @@ /** * {@inheritDoc} */ @Override public ConfigChangeResult applyConfigurationChange( RequestFilteringQOSPolicyCfg configuration) { @@ -133,6 +128,7 @@ /** * {@inheritDoc} */ @Override public boolean isConfigurationChangeAcceptable( RequestFilteringQOSPolicyCfg configuration, List<LocalizableMessage> unacceptableReasons) @@ -264,7 +260,7 @@ // Check the search scope if (!allowedSearchScopes.isEmpty()) { switch (searchOp.getScope()) switch (searchOp.getScope().asEnum()) { case BASE_OBJECT: allowRequest = @@ -642,6 +638,7 @@ /** * {@inheritDoc} */ @Override public RequestFilteringPolicy createQOSPolicy( RequestFilteringQOSPolicyCfg configuration) throws ConfigException, InitializationException @@ -662,6 +659,7 @@ /** * {@inheritDoc} */ @Override public boolean isConfigurationAcceptable( RequestFilteringQOSPolicyCfg configuration, List<LocalizableMessage> unacceptableReasons) opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -50,6 +50,7 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.util.Reject; import org.opends.admin.ads.ADSContext; import org.opends.server.admin.server.ConfigurationChangeListener; @@ -1030,6 +1031,7 @@ new LDAPConnectionOptions(); PrintStream nullPrintStream = new PrintStream(new OutputStream() { @Override public void write ( int b ) { } }); LDAPConnection connection = opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
@@ -24,37 +24,34 @@ * Copyright 2008-2010 Sun Microsystems, Inc. * Portions Copyright 2014 ForgeRock AS */ package org.opends.server.crypto; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.admin.ads.ADSContext; import org.opends.server.api.Backend; import org.opends.server.api.BackendInitializationListener; import org.opends.server.api.ChangeNotificationListener; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.config.ConfigConstants; import org.opends.server.controls.EntryChangeNotificationControl; import org.opends.server.controls.PersistentSearchChangeType; import org.opends.server.core.AddOperation; import org.opends.server.core.DeleteOperation; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPControl; import org.opends.server.types.*; import org.opends.server.types.operation.PostResponseAddOperation; import org.opends.server.types.operation.PostResponseDeleteOperation; import org.opends.server.types.operation.PostResponseModifyOperation; import org.opends.server.types.operation.PostResponseModifyDNOperation; import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString; import static org.opends.server.util.ServerConstants.OC_TOP; import static org.opends.server.util.ServerConstants. OID_ENTRY_CHANGE_NOTIFICATION; import org.opends.server.config.ConfigConstants; import static org.opends.server.config.ConfigConstants.OC_CRYPTO_INSTANCE_KEY; import static org.opends.server.config.ConfigConstants.OC_CRYPTO_CIPHER_KEY; import static org.opends.server.config.ConfigConstants.OC_CRYPTO_MAC_KEY; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPControl; import org.opends.server.controls.PersistentSearchChangeType; import org.opends.server.controls.EntryChangeNotificationControl; import org.opends.server.core.DirectoryServer; import org.opends.server.core.DeleteOperation; import org.opends.server.core.AddOperation; import static org.opends.messages.CoreMessages.*; import org.opends.admin.ads.ADSContext; import static org.opends.server.config.ConfigConstants.*; import static org.opends.server.util.ServerConstants.*; import static org.opends.server.util.StaticUtils.*; import java.util.LinkedHashSet; import java.util.ArrayList; @@ -235,6 +232,7 @@ /** * {@inheritDoc} */ @Override public void performBackendInitializationProcessing(Backend backend) { DN[] baseDNs = backend.getBaseDNs(); @@ -253,6 +251,7 @@ /** * {@inheritDoc} */ @Override public void performBackendFinalizationProcessing(Backend backend) { // No implementation required. @@ -473,6 +472,7 @@ /** * {@inheritDoc} */ @Override public void handleAddOperation(PostResponseAddOperation addOperation, Entry entry) { @@ -522,6 +522,7 @@ /** * {@inheritDoc} */ @Override public void handleDeleteOperation(PostResponseDeleteOperation deleteOperation, Entry entry) { @@ -548,6 +549,7 @@ /** * {@inheritDoc} */ @Override public void handleModifyOperation(PostResponseModifyOperation modifyOperation, Entry oldEntry, Entry newEntry) { @@ -623,6 +625,7 @@ /** * {@inheritDoc} */ @Override public void handleModifyDNOperation( PostResponseModifyDNOperation modifyDNOperation, Entry oldEntry, Entry newEntry) opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -35,14 +35,14 @@ import java.io.OutputStream; import java.security.MessageDigest; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.zip.Deflater; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.crypto.Mac; import org.forgerock.i18n.LocalizableMessage; @@ -50,6 +50,7 @@ import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.util.Utils; import org.opends.server.admin.Configuration; import org.opends.server.api.AlertGenerator; @@ -1590,7 +1591,7 @@ // accordingly. Also get the filter since we will need it in all cases. SearchScope scope = searchOperation.getScope(); SearchFilter filter = searchOperation.getFilter(); switch (scope) switch (scope.asEnum()) { case BASE_OBJECT: // We are only interested in the base entry itself. See if it matches opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
@@ -51,7 +51,7 @@ import org.opends.server.types.MemberList; import org.opends.server.types.ObjectClass; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.opends.messages.ExtensionMessages.*; import static org.opends.server.config.ConfigConstants.*; opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupMemberList.java
@@ -22,11 +22,10 @@ * * * Copyright 2008 Sun Microsystems, Inc. * Portions Copyright 2014 ForgeRock AS */ package org.opends.server.extensions; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -42,9 +41,7 @@ import org.opends.server.types.MemberList; import org.opends.server.types.MembershipException; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; /** * This class defines a mechanism that may be used to iterate over the opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java
@@ -46,7 +46,7 @@ import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchResultEntry; import org.opends.server.types.SearchResultReference; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.opends.messages.ExtensionMessages.*; opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
@@ -31,6 +31,7 @@ import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.std.server.EntryDNVirtualAttributeCfg; import org.opends.server.api.VirtualAttributeProvider; import org.opends.server.core.DirectoryServer; opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -25,9 +25,6 @@ * Portions Copyright 2014 ForgeRock AS */ package org.opends.server.extensions; import org.forgerock.i18n.LocalizableMessage; import java.util.ArrayList; import java.util.Collection; @@ -37,6 +34,8 @@ import java.util.List; import java.util.Set; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.server.ExactMatchIdentityMapperCfg; import org.opends.server.admin.std.server.IdentityMapperCfg; @@ -47,8 +46,8 @@ import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.types.*; import static org.opends.messages.ExtensionMessages.*; import static org.opends.messages.ExtensionMessages.*; /** * This class provides an implementation of a Directory Server identity mapper @@ -95,6 +94,7 @@ /** * {@inheritDoc} */ @Override public void initializeIdentityMapper( ExactMatchIdentityMapperCfg configuration) throws ConfigException, InitializationException @@ -142,6 +142,7 @@ /** * Performs any finalization that may be necessary for this identity mapper. */ @Override public void finalizeIdentityMapper() { currentConfig.removeExactMatchChangeListener(this); @@ -164,6 +165,7 @@ * multiple user entries that could map to the * provided ID. */ @Override public Entry getEntryForID(String id) throws DirectoryException { @@ -294,6 +296,7 @@ /** * {@inheritDoc} */ @Override public boolean isConfigurationChangeAcceptable( ExactMatchIdentityMapperCfg configuration, List<LocalizableMessage> unacceptableReasons) @@ -330,6 +333,7 @@ /** * {@inheritDoc} */ @Override public ConfigChangeResult applyConfigurationChange( ExactMatchIdentityMapperCfg configuration) { opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
@@ -25,15 +25,16 @@ * Portions Copyright 2011-2014 ForgeRock AS */ package org.opends.server.extensions; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.i18n.LocalizableMessage; import java.util.Iterator; import java.util.ArrayList; import java.util.Iterator; 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.SearchScope; import org.opends.server.types.DirectoryConfig; import org.opends.server.types.DirectoryException; import org.opends.server.types.DN; @@ -41,13 +42,9 @@ import org.opends.server.types.MemberList; import org.opends.server.types.MembershipException; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.i18n.slf4j.LocalizedLogger; import static org.opends.messages.ExtensionMessages.*; import static org.forgerock.util.Reject.*; import static org.opends.messages.ExtensionMessages.*; /** * This class provides an implementation of the {@code MemberList} class that @@ -169,7 +166,7 @@ // based on base DN and scope. if (baseDN != null) { switch (scope) switch (scope.asEnum()) { case BASE_OBJECT: if (! baseDN.equals(nextDN)) opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -26,15 +26,16 @@ */ package org.opends.server.extensions; import java.security.MessageDigest; import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.*; import javax.security.auth.x500.X500Principal; import static org.opends.messages.ExtensionMessages.*; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.server.CertificateMapperCfg; import org.opends.server.admin.std.server.FingerprintCertificateMapperCfg; @@ -42,14 +43,12 @@ import org.opends.server.api.CertificateMapper; import org.opends.server.config.ConfigException; import org.opends.server.core.DirectoryServer; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.types.*; import static org.opends.server.util.StaticUtils.bytesToColonDelimitedHex; import static org.opends.server.util.StaticUtils.getExceptionMessage; import static org.opends.messages.ExtensionMessages.*; import static org.opends.server.util.StaticUtils.*; /** * This class implements a very simple Directory Server certificate mapper that opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
@@ -31,6 +31,7 @@ import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.std.server.IsMemberOfVirtualAttributeCfg; import org.opends.server.api.Group; import org.opends.server.api.VirtualAttributeProvider; opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
@@ -41,10 +41,10 @@ import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.DecodeException; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.meta. LDAPPassThroughAuthenticationPolicyCfgDefn.MappingPolicy; import org.opends.server.admin.std.server.*; import org.opends.server.admin.std.meta.LDAPPassThroughAuthenticationPolicyCfgDefn.MappingPolicy; import org.opends.server.admin.std.server.LDAPPassThroughAuthenticationPolicyCfg; import org.opends.server.api.*; import org.opends.server.config.ConfigException; import org.opends.server.core.DirectoryServer; opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
@@ -32,23 +32,24 @@ import java.util.List; import org.forgerock.i18n.LocalizableMessage; import org.opends.server.admin.std.server. PasswordPolicyStateExtendedOperationHandlerCfg; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.io.ASN1; import org.forgerock.opendj.io.ASN1Reader; import org.forgerock.opendj.io.ASN1Writer; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.std.server.PasswordPolicyStateExtendedOperationHandlerCfg; import org.opends.server.api.AuthenticationPolicy; import org.opends.server.api.ClientConnection; import org.opends.server.api.ExtendedOperationHandler; import org.opends.server.config.ConfigException; import org.opends.server.core.*; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.io.ASN1; import org.forgerock.opendj.io.ASN1Reader; import org.forgerock.opendj.io.ASN1Writer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.schema.GeneralizedTimeSyntax; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import static org.opends.messages.CoreMessages.*; import static org.opends.messages.ExtensionMessages.*; import static org.opends.server.util.ServerConstants.*; opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
@@ -26,8 +26,6 @@ */ package org.opends.server.extensions; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -39,9 +37,11 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.server.RegularExpressionIdentityMapperCfg; import org.opends.server.admin.std.server.IdentityMapperCfg; import org.opends.server.admin.std.server.RegularExpressionIdentityMapperCfg; import org.opends.server.api.Backend; import org.opends.server.api.IdentityMapper; import org.opends.server.config.ConfigException; @@ -49,9 +49,8 @@ import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.types.*; import static org.opends.messages.ExtensionMessages.*; import org.forgerock.i18n.LocalizableMessage; import static org.opends.messages.ExtensionMessages.*; /** * This class provides an implementation of a Directory Server identity mapper @@ -105,6 +104,7 @@ /** * {@inheritDoc} */ @Override public void initializeIdentityMapper( RegularExpressionIdentityMapperCfg configuration) throws ConfigException, InitializationException @@ -318,6 +318,7 @@ /** * {@inheritDoc} */ @Override public boolean isConfigurationChangeAcceptable( RegularExpressionIdentityMapperCfg configuration, List<LocalizableMessage> unacceptableReasons) @@ -367,6 +368,7 @@ /** * {@inheritDoc} */ @Override public ConfigChangeResult applyConfigurationChange( RegularExpressionIdentityMapperCfg configuration) { opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
@@ -62,7 +62,7 @@ import org.opends.server.types.ObjectClass; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.opends.messages.ExtensionMessages.*; import static org.opends.server.protocols.internal.InternalClientConnection.*; opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
@@ -27,29 +27,28 @@ */ package org.opends.server.extensions; import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.*; import javax.security.auth.x500.X500Principal; import static org.opends.messages.ExtensionMessages.*; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.server.CertificateMapperCfg; import org.opends.server.admin.std.server .SubjectAttributeToUserAttributeCertificateMapperCfg; import org.opends.server.admin.std.server.SubjectAttributeToUserAttributeCertificateMapperCfg; import org.opends.server.api.Backend; import org.opends.server.api.CertificateMapper; import org.opends.server.config.ConfigException; import org.opends.server.core.DirectoryServer; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.types.*; import static org.opends.server.util.StaticUtils.toLowerCase; import static org.opends.messages.ExtensionMessages.*; import static org.opends.server.util.StaticUtils.*; /** * This class implements a very simple Directory Server certificate mapper that opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -26,31 +26,30 @@ */ package org.opends.server.extensions; import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import javax.security.auth.x500.X500Principal; import static org.opends.messages.ExtensionMessages.*; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.server.CertificateMapperCfg; import org.opends.server.admin.std.server .SubjectDNToUserAttributeCertificateMapperCfg; import org.opends.server.admin.std.server.SubjectDNToUserAttributeCertificateMapperCfg; import org.opends.server.api.Backend; import org.opends.server.api.CertificateMapper; import org.opends.server.config.ConfigException; import org.opends.server.core.DirectoryServer; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.types.*; import static org.opends.messages.ExtensionMessages.*; /** * This class implements a very simple Directory Server certificate mapper that opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java
@@ -49,7 +49,7 @@ import org.opends.server.types.ObjectClass; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.opends.messages.ExtensionMessages.*; import static org.opends.server.config.ConfigConstants.*; opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -27,11 +27,6 @@ */ package org.opends.server.plugins; import java.util.Iterator; import org.opends.server.types.operation.PreOperationAddOperation; import org.opends.server.types.operation.PreOperationModifyOperation; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -41,6 +36,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.LinkedList; @@ -49,34 +45,36 @@ import java.util.Set; import org.forgerock.i18n.LocalizableMessage; import org.opends.server.admin.std.server.ReferentialIntegrityPluginCfg; import org.opends.server.admin.std.server.PluginCfg; import org.opends.server.admin.std.meta.PluginCfgDefn; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.meta.ReferentialIntegrityPluginCfgDefn .CheckReferencesScopeCriteria; import org.opends.server.admin.std.meta.PluginCfgDefn; import org.opends.server.admin.std.meta.ReferentialIntegrityPluginCfgDefn.CheckReferencesScopeCriteria; import org.opends.server.admin.std.server.PluginCfg; import org.opends.server.admin.std.server.ReferentialIntegrityPluginCfg; import org.opends.server.api.Backend; import org.opends.server.api.DirectoryThread; import org.opends.server.api.ServerShutdownListener; import org.opends.server.api.plugin.*; import org.opends.server.api.plugin.DirectoryServerPlugin; import org.opends.server.api.plugin.PluginResult; import org.opends.server.api.plugin.PluginType; import org.opends.server.config.ConfigException; import org.opends.server.core.DeleteOperation; import org.opends.server.core.DirectoryServer; import org.opends.server.core.ModifyOperation; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.types.*; import org.opends.server.types.operation.SubordinateModifyDNOperation; import org.opends.server.types.operation.PostOperationModifyDNOperation; import org.opends.server.types.operation.PostOperationDeleteOperation; import org.opends.server.types.operation.PreOperationAddOperation; import org.opends.server.types.operation.PreOperationModifyOperation; import static org.opends.messages.PluginMessages.*; import static org.opends.server.schema.SchemaConstants.*; import static org.opends.server.util.StaticUtils.*; /** * This class implements a Directory Server post operation plugin that performs * Referential Integrity processing on successful delete and modify DN opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -30,6 +30,8 @@ import java.util.concurrent.ConcurrentHashMap; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.meta.PluginCfgDefn; import org.opends.server.admin.std.server.PluginCfg; @@ -41,7 +43,6 @@ import org.opends.server.api.plugin.PluginResult.PreOperation; import org.opends.server.config.ConfigException; import org.opends.server.core.DirectoryServer; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.schema.SchemaConstants; opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
@@ -439,7 +439,7 @@ SearchOperationBasis operation = new SearchOperationBasis(clientConnection, messageID, messageID, to(request.getControls()), valueOf(request.getName()), to(request.getScope()), to(request.getDereferenceAliasesPolicy()), request.getScope(), to(request.getDereferenceAliasesPolicy()), request.getSizeLimit(), request.getTimeLimit(), request.isTypesOnly(), to(request.getFilter()), new LinkedHashSet<String>(request.getAttributes())); opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -32,13 +32,14 @@ import java.util.concurrent.atomic.AtomicLong; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.api.ClientConnection; import org.opends.server.api.ConnectionHandler; import org.opends.server.core.*; import org.opends.server.core.networkgroups.NetworkGroup; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.util.AddChangeRecordEntry; import org.opends.server.util.DeleteChangeRecordEntry; import org.opends.server.util.ModifyChangeRecordEntry; opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
@@ -30,10 +30,11 @@ import java.util.List; import java.util.Set; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.api.ClientConnection; import org.opends.server.core.SearchOperationBasis; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; /** * This class defines a subclass of the core search operation that is opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
@@ -28,7 +28,8 @@ import java.net.InetAddress; import java.util.*; import java.util.concurrent.atomic.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import javax.management.Notification; import javax.management.NotificationListener; @@ -36,17 +37,19 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; import org.opends.server.api.*; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.api.ClientConnection; import org.opends.server.api.ConnectionHandler; import org.opends.server.core.*; import org.opends.server.core.networkgroups.NetworkGroup; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.protocols.internal.InternalSearchListener; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPFilter; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import static org.opends.messages.ProtocolMessages.*; import static org.opends.messages.ProtocolMessages.*; /** * This class defines the set of methods and structures that must be implemented opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
@@ -26,15 +26,18 @@ */ package org.opends.server.protocols.ldap; import org.forgerock.opendj.io.ASN1; import org.forgerock.opendj.io.ASN1Reader; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.io.ASN1; import org.forgerock.opendj.io.ASN1Reader; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.*; import static org.opends.messages.ProtocolMessages.*; import static org.opends.server.protocols.ldap.LDAPResultCode.*; import static org.opends.server.protocols.ldap.LDAPConstants.*; import static org.opends.server.protocols.ldap.LDAPResultCode.*; import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashSet; opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
@@ -553,7 +553,7 @@ searchRequests.getAndIncrement(); SearchRequestProtocolOp s = (SearchRequestProtocolOp)message .getProtocolOp(); switch (s.getScope()) switch (s.getScope().asEnum()) { case BASE_OBJECT: // we don't count base object searches as opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
@@ -36,7 +36,7 @@ import org.forgerock.opendj.ldap.ByteString; import org.opends.server.types.DereferencePolicy; import org.opends.server.types.RawFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.opends.server.protocols.ldap.LDAPConstants.*; import static org.opends.server.util.ServerConstants.*; opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -41,6 +41,7 @@ import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.DecodeException; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.IsolationPolicy; import org.opends.server.admin.std.server.ExternalChangelogDomainCfg; opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -27,12 +27,13 @@ package org.opends.server.replication.plugin; import java.util.ArrayList; import org.forgerock.i18n.slf4j.LocalizedLogger; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.core.DirectoryServer; import org.opends.server.core.ModifyOperationBasis; import org.opends.server.protocols.internal.InternalClientConnection; @@ -42,7 +43,7 @@ import org.opends.server.replication.common.CSN; import org.opends.server.replication.common.ServerState; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import static org.opends.messages.ReplicationMessages.*; /** @@ -375,7 +376,6 @@ * and an ordering index for historical attribute */ public final void checkAndUpdateServerState() { LocalizableMessage message; InternalSearchOperation op; CSN serverStateMaxCsn; CSN dbMaxCsn; opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java
@@ -36,6 +36,7 @@ import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.util.Reject; import org.opends.server.admin.Configuration; import org.opends.server.admin.server.ServerManagementContext; opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -35,8 +35,9 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.*; import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.ConflictBehavior; import org.opends.server.admin.std.server.ReplicationServerCfg; import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg; import org.opends.server.api.*; @@ -47,7 +48,10 @@ import org.opends.server.replication.common.*; import org.opends.server.replication.plugin.MultimasterReplication; import org.opends.server.replication.protocol.*; import org.opends.server.replication.server.changelog.api.*; import org.opends.server.replication.server.changelog.api.ChangeNumberIndexDB; import org.opends.server.replication.server.changelog.api.ChangeNumberIndexRecord; import org.opends.server.replication.server.changelog.api.ChangelogDB; import org.opends.server.replication.server.changelog.api.ChangelogException; import org.opends.server.replication.server.changelog.je.JEChangelogDB; import org.opends.server.types.*; import org.opends.server.util.LDIFReader; opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
@@ -29,11 +29,11 @@ import java.io.PrintStream; import org.opends.server.types.DereferencePolicy; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.opends.messages.ToolMessages.*; import static org.opends.server.types.DereferencePolicy.*; import static org.opends.server.types.SearchScope.*; import static org.forgerock.opendj.ldap.SearchScope.*; opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
@@ -25,6 +25,7 @@ * Portions Copyright 2013-2014 ForgeRock AS */ package org.opends.server.tools; import java.io.BufferedReader; import java.io.FileReader; import java.io.OutputStream; @@ -35,6 +36,7 @@ import java.util.LinkedList; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.core.DirectoryServer; import org.opends.server.extensions.ConfigFileHandler; import org.opends.server.loggers.JDKLogging; @@ -52,8 +54,6 @@ import static org.opends.server.util.ServerConstants.*; import static org.opends.server.util.StaticUtils.*; /** * This class provides a program that may be used to search LDIF files. It is * modeled after the LDAPSearch tool, with the primary differencing being that opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java
@@ -72,7 +72,7 @@ import org.opends.server.types.RawAttribute; import org.opends.server.types.RawModification; import org.opends.server.types.SearchResultEntry; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.util.StaticUtils; /** opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -26,13 +26,6 @@ package org.opends.server.tools.upgrade; import static org.opends.messages.ToolMessages.*; import static org.opends.server.tools.upgrade.FileManager.copy; import static org.opends.server.tools.upgrade.Installation .CURRENT_CONFIG_FILE_NAME; import static org.opends.server.tools.upgrade.Upgrade.*; import static org.opends.server.tools.upgrade.UpgradeUtils.*; import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -41,20 +34,23 @@ import java.util.List; import java.util.Set; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import javax.security.auth.callback.ConfirmationCallback; import javax.security.auth.callback.TextOutputCallback; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.Filter; import org.opends.server.tools.RebuildIndex; import org.opends.server.util.BuildVersion; import org.opends.server.util.ChangeOperationType; import com.forgerock.opendj.cli.ClientException; import com.forgerock.opendj.cli.ReturnCode; import org.opends.server.tools.RebuildIndex; import org.opends.server.util.BuildVersion; import org.opends.server.util.ChangeOperationType; import static org.opends.messages.ToolMessages.*; import static org.opends.server.tools.upgrade.FileManager.*; import static org.opends.server.tools.upgrade.Installation.*; import static org.opends.server.tools.upgrade.UpgradeUtils.*; /** * Factory methods for create new upgrade tasks. opendj3-server-dev/src/server/org/opends/server/types/DN.java
@@ -26,22 +26,22 @@ */ package org.opends.server.types; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.ldap.ByteSequenceReader; import java.io.Serializable; import java.util.LinkedList; 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.ByteSequenceReader; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.core.DirectoryServer; import static org.forgerock.util.Reject.*; import static org.opends.messages.SchemaMessages.*; import static org.opends.server.config.ConfigConstants.*; import static org.opends.server.util.StaticUtils.*; import static org.forgerock.util.Reject.*; /** * This class defines a data structure for storing and interacting @@ -474,7 +474,7 @@ */ public boolean matchesBaseAndScope(DN baseDN, SearchScope scope) { switch (scope) switch (scope.asEnum()) { case BASE_OBJECT: // The base DN must equal this DN. opendj3-server-dev/src/server/org/opends/server/types/Entry.java
@@ -38,6 +38,7 @@ import org.forgerock.opendj.ldap.ByteSequenceReader; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.opendj.ldap.schema.ObjectClassType; import org.opends.server.api.AttributeValueDecoder; import org.opends.server.api.CompressedSchema; opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java
@@ -32,8 +32,9 @@ import java.util.StringTokenizer; import org.forgerock.i18n.LocalizableMessage; import org.opends.server.core.DirectoryServer; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.core.DirectoryServer; import static org.opends.messages.UtilityMessages.*; import static org.opends.server.types.ResultCode.*; @@ -1256,8 +1257,8 @@ scope = SearchScope.BASE_OBJECT; } return (entry.matchesBaseAndScope(getBaseDN(), scope) && getFilter().matchesEntry(entry)); return entry.matchesBaseAndScope(getBaseDN(), scope) && getFilter().matchesEntry(entry); } @@ -1572,7 +1573,7 @@ } buffer.append("?"); switch (scope) switch (scope.asEnum()) { case BASE_OBJECT: buffer.append("base"); opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java
@@ -29,13 +29,14 @@ import java.util.Collection; import java.util.Set; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.util.Utils; import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn; import org.opends.server.admin.std.server.VirtualAttributeCfg; import org.opends.server.api.Group; import org.opends.server.api.VirtualAttributeProvider; import org.opends.server.core.DirectoryServer; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.util.Utils; import static org.forgerock.util.Reject.*; opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
@@ -34,7 +34,7 @@ import org.opends.server.types.DereferencePolicy; import org.opends.server.types.DN; import org.opends.server.types.RawFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.SearchFilter; opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
@@ -26,13 +26,14 @@ */ package org.opends.server.types.operation; import java.util.Set; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.DN; import org.opends.server.types.DereferencePolicy; import org.opends.server.types.RawFilter; import org.opends.server.types.SearchFilter; /** * This class defines a set of methods that are available for use by opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
@@ -26,8 +26,6 @@ */ package org.opends.server.types.operation; import java.util.List; import java.util.Set; @@ -37,12 +35,10 @@ import org.opends.server.types.DN; import org.opends.server.types.Entry; import org.opends.server.types.RawFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchResultReference; /** * This class defines a set of methods that are available for use by * pre-operation plugins for search operations. Note that this opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
@@ -26,14 +26,12 @@ */ package org.opends.server.types.operation; import java.util.List; import java.util.Set; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.*; /** * This class defines a set of methods that are available for use by opendj3-server-dev/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
@@ -26,13 +26,14 @@ */ package org.opends.server.types.operation; import java.util.Set; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.DN; import org.opends.server.types.DereferencePolicy; import org.opends.server.types.RawFilter; import org.opends.server.types.SearchFilter; /** * This class defines a set of methods that are available for use by opendj3-server-dev/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
@@ -26,13 +26,14 @@ */ package org.opends.server.types.operation; import java.util.Set; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.DN; import org.opends.server.types.DereferencePolicy; import org.opends.server.types.RawFilter; import org.opends.server.types.SearchFilter; /** * This class defines a set of methods that are available for use by opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
@@ -30,12 +30,14 @@ 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.SearchScope; import org.opends.server.api.ClientConnection; import org.opends.server.api.plugin.PluginResult; import org.opends.server.config.ConfigConstants; import org.opends.server.controls.*; import org.opends.server.core.*; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.replication.common.CSN; import org.opends.server.replication.common.MultiDomainServerState; import org.opends.server.replication.plugin.MultimasterReplication; @@ -43,7 +45,6 @@ import org.opends.server.replication.server.ECLServerHandler; import org.opends.server.replication.server.ReplicationServer; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.types.operation.PostOperationSearchOperation; import org.opends.server.types.operation.PreOperationSearchOperation; import org.opends.server.types.operation.SearchEntrySearchOperation; @@ -52,10 +53,8 @@ import static org.opends.messages.CoreMessages.*; import static org.opends.server.config.ConfigConstants.*; import static org.opends.server.replication.protocol.StartECLSessionMsg .ECLRequestType.*; import static org.opends.server.replication.protocol.StartECLSessionMsg .Persistent.*; import static org.opends.server.replication.protocol.StartECLSessionMsg.ECLRequestType.*; import static org.opends.server.replication.protocol.StartECLSessionMsg.Persistent.*; import static org.opends.server.util.LDIFWriter.*; import static org.opends.server.util.ServerConstants.*; import static org.opends.server.util.StaticUtils.*; opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
@@ -28,12 +28,12 @@ import java.util.List; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.api.Backend; import org.opends.server.api.ClientConnection; import org.opends.server.api.plugin.PluginResult; import org.opends.server.controls.*; import org.opends.server.core.*; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.types.*; import org.opends.server.types.operation.PostOperationSearchOperation; import org.opends.server.types.operation.PreOperationSearchOperation; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
@@ -49,7 +49,7 @@ 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.forgerock.opendj.ldap.SearchScope; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
@@ -29,6 +29,7 @@ import java.io.File; import java.util.Map; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.config.ConfigException; import org.opends.server.core.*; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
@@ -54,7 +54,7 @@ @Test(groups = { "precommit", "jeb" }, sequential = true) public abstract class JebTestCase extends DirectoryServerTestCase { private TreeMap<DN,Entry> entryTreeMap = new TreeMap<DN,Entry>(); int numEntries; private int numEntries; /** * This method takes an MakeLDIF template and a number of entries to create @@ -83,11 +83,7 @@ for(int i =0; i<numEntries;i++) { Entry entry = reader.readEntry(false); entryTreeMap.put(entry.getName(), entry); AddOperation addOperation = connection.processAdd(entry.getName(), entry.getObjectClasses(), entry.getUserAttributes(), entry.getOperationalAttributes()); AddOperation addOperation = connection.processAdd(entry); assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS, "Add of this entry was not successful"); } opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -29,6 +29,7 @@ import java.util.*; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.admin.server.AdminTestCaseUtils; import org.opends.server.admin.std.meta.LocalDBBackendCfgDefn; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
@@ -26,66 +26,70 @@ */ package org.opends.server.backends.jeb; import org.opends.server.TestCaseUtils; import java.util.ArrayList; import java.util.List; import java.util.TreeSet; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.DirectoryServerTestCase; import static org.opends.server.util.ServerConstants.OID_SERVER_SIDE_SORT_RESPONSE_CONTROL; import static org.opends.server.util.ServerConstants.OID_VLV_RESPONSE_CONTROL; import org.opends.server.TestCaseUtils; import org.opends.server.controls.ServerSideSortRequestControl; import org.opends.server.controls.VLVRequestControl; import org.opends.server.controls.ServerSideSortResponseControl; import org.opends.server.controls.VLVRequestControl; import org.opends.server.controls.VLVResponseControl; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPResultCode; import org.opends.server.protocols.ldap.LDAPControl; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.ldap.LDAPResultCode; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.testng.annotations.AfterClass; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; import java.util.*; public class TestVLVIndex extends DirectoryServerTestCase { SortOrder sortOrder; private SortOrder sortOrder; private String beID="indexRoot"; private String beID="indexRoot"; private BackendImpl be; // The DN for "Aaccf Johnson" DN aaccfJohnsonDN; private DN aaccfJohnsonDN; // The DN for "Aaron Zimmerman" DN aaronZimmermanDN; private DN aaronZimmermanDN; // The DN for "Albert Smith" DN albertSmithDN; private DN albertSmithDN; // The DN for "Albert Zimmerman" DN albertZimmermanDN; private DN albertZimmermanDN; // The DN for "lowercase mcgee" DN lowercaseMcGeeDN; private DN lowercaseMcGeeDN; // The DN for "Mararet Jones" DN margaretJonesDN; private DN margaretJonesDN; // The DN for "Mary Jones" DN maryJonesDN; private DN maryJonesDN; // The DN for "Sam Zweck" DN samZweckDN; private DN samZweckDN; // The DN for "Zorro" DN zorroDN; private DN zorroDN; // The DN for suffix DN suffixDN; private DN suffixDN; TreeSet<SortValues> expectedSortedValues; private TreeSet<SortValues> expectedSortedValues; List<Entry> entries; private List<Entry> entries; @BeforeClass public void setUp() throws Exception { opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
@@ -26,28 +26,23 @@ */ package org.opends.server.controls; import java.net.Socket; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.protocols.ldap.*; import org.opends.server.types.*; import org.opends.server.util.StaticUtils; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.opends.server.TestCaseUtils; import org.opends.server.protocols.ldap.*; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.util.StaticUtils; import static org.testng.Assert.*; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; /** * This class contains test cases that verify the appropriate handling of the opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
@@ -29,10 +29,13 @@ import java.util.*; import org.forgerock.i18n.LocalizableMessage; import org.opends.server.TestCaseUtils; import org.opends.server.core.ModifyOperation; 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.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.core.ModifyOperation; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPAttribute; @@ -41,8 +44,6 @@ import org.opends.server.protocols.ldap.LDAPReader; import org.opends.server.tools.LDAPSearch; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
@@ -48,7 +48,7 @@ import org.opends.server.types.Entry; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.SortKey; import org.opends.server.types.SortOrder; import org.testng.annotations.BeforeClass; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
@@ -26,30 +26,27 @@ */ package org.opends.server.controls; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; import java.util.ArrayList; import java.util.List; import org.forgerock.opendj.io.ASN1; import org.forgerock.opendj.io.ASN1Reader; import org.forgerock.opendj.io.ASN1Writer; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPResultCode; import org.opends.server.protocols.ldap.LDAPControl; import org.forgerock.opendj.io.ASN1Writer; import org.forgerock.opendj.io.ASN1; import org.forgerock.opendj.io.ASN1Reader; import org.opends.server.protocols.ldap.LDAPResultCode; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; /** * This class contains a number of test cases for the virtual list view request opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
@@ -26,16 +26,13 @@ */ package org.opends.server.core; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; import java.net.Socket; import java.util.ArrayList; import java.util.LinkedHashSet; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.plugins.DelayPreOpPlugin; import org.opends.server.plugins.DisconnectClientPlugin; @@ -44,11 +41,12 @@ 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.opends.server.util.StaticUtils; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; /** * A set of test cases for abandon operations opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
@@ -45,7 +45,7 @@ import org.opends.server.types.ModificationType; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.testng.Assert.*; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
@@ -60,7 +60,7 @@ import org.opends.server.types.RDN; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
@@ -26,10 +26,6 @@ */ package org.opends.server.core; import static org.opends.server.TestCaseUtils.*; import static org.opends.server.protocols.ldap.LDAPConstants.*; import static org.testng.Assert.*; import java.net.Socket; import java.util.ArrayList; import java.util.Arrays; @@ -37,6 +33,8 @@ import java.util.concurrent.locks.Lock; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.api.Backend; import org.opends.server.plugins.DisconnectClientPlugin; @@ -48,13 +46,16 @@ import org.opends.server.tools.LDAPModify; import org.opends.server.tools.LDAPWriter; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.util.Base64; import org.opends.server.util.ServerConstants; import org.opends.server.util.StaticUtils; import org.opends.server.workflowelement.localbackend.LocalBackendModifyOperation; import org.testng.annotations.*; import static org.opends.server.TestCaseUtils.*; import static org.opends.server.protocols.ldap.LDAPConstants.*; import static org.testng.Assert.*; /** * A set of test cases for modify operations */ opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
@@ -26,32 +26,33 @@ */ package org.opends.server.core; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; import java.io.IOException; import java.net.Socket; import java.util.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.DecodeException; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.controls.MatchedValuesControl; import org.opends.server.controls.MatchedValuesFilter; import org.opends.server.controls.SubentriesControl; import org.opends.server.plugins.InvocationCounterPlugin; import org.forgerock.opendj.ldap.DecodeException; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.*; import org.opends.server.tools.LDAPModify; import org.opends.server.tools.LDAPWriter; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.util.ServerConstants; import org.opends.server.util.StaticUtils; 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.*; @SuppressWarnings("javadoc") public class SearchOperationTestCase extends OperationTestCase { opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java
@@ -31,6 +31,8 @@ import java.util.LinkedHashSet; import java.util.List; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; @@ -40,7 +42,6 @@ import org.opends.server.tools.LDAPDelete; import org.opends.server.tools.LDAPModify; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.util.StaticUtils; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
@@ -26,13 +26,10 @@ */ package org.opends.server.core; import static org.opends.server.util.StaticUtils.createEntry; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import java.util.ArrayList; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.api.Backend; import org.opends.server.api.ClientConnection; @@ -44,14 +41,14 @@ import org.opends.server.protocols.ldap.LDAPFilter; import org.opends.server.protocols.ldap.LDAPModification; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.util.StaticUtils; import org.opends.server.util.UtilTestCase; import org.opends.server.workflowelement.localbackend.LocalBackendWorkflowElement; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static org.opends.server.util.StaticUtils.*; import static org.testng.Assert.*; /** * This class tests the 'manual' workflow configuration mode. The 'auto' opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
@@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Collections; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.DirectoryServerTestCase; import org.opends.server.TestCaseUtils; import org.opends.server.admin.std.meta.NetworkGroupCfgDefn.AllowedAuthMethod; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
@@ -47,7 +47,7 @@ import org.opends.server.types.Modification; import org.opends.server.types.ModificationType; import org.opends.server.types.OperationType; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.operation.PreParseAddOperation; import org.opends.server.types.operation.PreParseBindOperation; import org.opends.server.types.operation.PreParseCompareOperation; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyTest.java
@@ -37,7 +37,7 @@ import org.opends.server.protocols.ldap.LDAPFilter; import org.opends.server.types.DN; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
@@ -26,8 +26,6 @@ */ package org.opends.server.crypto; import static org.testng.Assert.*; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -45,9 +43,10 @@ import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapName; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.SearchScope; import org.opends.admin.ads.ADSContext; import org.opends.admin.ads.util.ConnectionUtils; import org.forgerock.i18n.LocalizableMessage; import org.opends.server.TestCaseUtils; import org.opends.server.config.ConfigConstants; import org.opends.server.core.DirectoryServer; @@ -62,6 +61,8 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import static org.testng.Assert.*; /** This class tests the CryptoManager. */ opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
@@ -24,24 +24,26 @@ * Copyright 2008 Sun Microsystems, Inc. * Portions Copyright 2014 ForgeRock AS */ package org.opends.server.crypto; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.opends.server.TestCaseUtils; import org.opends.server.schema.DirectoryStringSyntax; import org.opends.server.config.ConfigConstants; import org.opends.server.types.*; import java.util.LinkedHashSet; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.core.ExtendedOperation; import org.forgerock.opendj.ldap.SearchScope; import org.opends.admin.ads.ADSContext; import org.opends.server.TestCaseUtils; import org.opends.server.config.ConfigConstants; import org.opends.server.core.DirectoryServer; import org.opends.server.util.ServerConstants; import org.opends.server.core.ExtendedOperation; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.admin.ads.ADSContext; import org.opends.server.schema.DirectoryStringSyntax; import org.opends.server.types.*; import org.opends.server.util.ServerConstants; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static org.testng.Assert.*; import java.util.LinkedHashSet; /** * A set of test cases for the symmetric key extended operation. opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
@@ -72,7 +72,7 @@ import org.opends.server.types.RawAttribute; import org.opends.server.types.RawModification; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
@@ -72,7 +72,7 @@ import org.opends.server.types.RawModification; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.VirtualAttributeRule; import org.opends.server.util.StaticUtils; import org.testng.annotations.BeforeClass; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -34,6 +34,7 @@ import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn; import org.opends.server.core.DirectoryServer; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
@@ -26,8 +26,6 @@ */ package org.opends.server.extensions; import java.util.Collections; import java.util.LinkedHashSet; import java.util.LinkedList; @@ -35,10 +33,7 @@ import java.util.Set; import java.util.UUID; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn; import org.opends.server.core.AddOperation; @@ -47,12 +42,13 @@ import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPControl; import org.opends.server.types.*; 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.opends.server.util.StaticUtils.*; import static org.testng.Assert.*; /** * A set of test cases for the entryUUID virtual attribute provider. opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java
@@ -21,7 +21,7 @@ * CDDL HEADER END * * * Copyright 2013 ForgeRock AS * Copyright 2013-2014 ForgeRock AS */ package org.opends.server.extensions; @@ -33,7 +33,7 @@ import org.opends.server.types.DereferencePolicy; import org.opends.server.types.Entry; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.testng.Assert.*; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
@@ -52,7 +52,7 @@ import org.opends.server.types.DereferencePolicy; import org.opends.server.types.Entry; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.VirtualAttributeRule; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
@@ -26,28 +26,26 @@ */ package org.opends.server.extensions; import org.opends.server.types.*; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.TestCaseUtils; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.DirectoryServerTestCase; import static org.opends.server.util.StaticUtils.*; import static org.opends.server.util.ServerConstants.OID_REAL_ATTRS_ONLY; import static org.opends.server.util.ServerConstants.OID_VIRTUAL_ATTRS_ONLY; import org.opends.server.TestCaseUtils; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPControl; import org.opends.server.core.DirectoryServer; 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.assertNotNull; import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertEquals; import java.util.List; import java.util.LinkedHashSet; import java.util.LinkedList; import static org.opends.server.util.ServerConstants.*; import static org.opends.server.util.StaticUtils.*; import static org.testng.Assert.*; public class HasSubordinatesVirtualAttributeProviderTestCase extends DirectoryServerTestCase { // The attribute type for the hasSubordinates attribute. opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
@@ -26,16 +26,11 @@ */ package org.opends.server.extensions; import java.util.*; import java.util.ArrayList; import static org.testng.Assert.*; import java.util.Collections; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn; import org.opends.server.core.DeleteOperation; @@ -47,8 +42,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.forgerock.opendj.ldap.ConditionResult; import org.opends.server.types.Control; import org.opends.server.types.DN; import org.opends.server.types.DereferencePolicy; @@ -56,14 +49,13 @@ import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchResultEntry; import org.opends.server.types.SearchScope; import org.opends.server.types.VirtualAttributeRule; import org.opends.server.workflowelement.localbackend.LocalBackendSearchOperation; 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 isMemberOf virtual attribute provider. opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
@@ -37,6 +37,7 @@ import org.forgerock.opendj.io.ASN1Writer; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.admin.server.ConfigurationChangeListener; import org.opends.server.admin.std.meta.LDAPPassThroughAuthenticationPolicyCfgDefn.MappingPolicy; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
@@ -26,28 +26,25 @@ */ package org.opends.server.extensions; import org.opends.server.types.*; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.TestCaseUtils; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.DirectoryServerTestCase; import org.opends.server.TestCaseUtils; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPControl; import static org.opends.server.util.ServerConstants.OID_REAL_ATTRS_ONLY; import static org.opends.server.util.ServerConstants.OID_VIRTUAL_ATTRS_ONLY; import org.opends.server.core.DirectoryServer; 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.assertNotNull; import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertEquals; import java.util.*; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; @SuppressWarnings("javadoc") public class NumSubordinatesVirtualAttributeProviderTestCase extends DirectoryServerTestCase { opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
@@ -26,22 +26,23 @@ */ package org.opends.server.extensions; import org.testng.annotations.BeforeMethod; import org.opends.server.schema.GeneralizedTimeSyntax; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import org.forgerock.i18n.LocalizableMessage; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.schema.GeneralizedTimeSyntax; import org.opends.server.types.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import static org.testng.Assert.*; public class PasswordExpirationTimeVirtualAttributeProviderTestCase opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
@@ -26,12 +26,9 @@ */ package org.opends.server.extensions; 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.ByteStringBuilder; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.api.SASLMechanismHandler; import org.opends.server.core.AddOperation; @@ -42,13 +39,15 @@ import org.opends.server.protocols.ldap.LDAPFilter; import org.opends.server.schema.SchemaConstants; import org.opends.server.tools.LDAPSearch; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.opends.server.types.AuthenticationInfo; import org.opends.server.types.Entry; import org.opends.server.types.ResultCode; 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 PLAIN SASL mechanism handler. */ opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
@@ -52,7 +52,7 @@ import org.opends.server.types.DereferencePolicy; import org.opends.server.types.Entry; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.VirtualAttributeRule; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
@@ -52,7 +52,7 @@ import org.opends.server.types.DereferencePolicy; import org.opends.server.types.Entry; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.VirtualAttributeRule; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
@@ -51,7 +51,7 @@ import org.opends.server.types.ModificationType; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
@@ -26,14 +26,10 @@ */ package org.opends.server.extensions; import java.util.LinkedHashSet; import java.util.List; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.core.DeleteOperation; import org.opends.server.core.DirectoryServer; @@ -41,10 +37,11 @@ import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.tools.LDAPModify; import org.opends.server.types.*; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static org.testng.Assert.*; /** * A set of test cases for the user-defined virtual attribute provider. */ opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
@@ -32,6 +32,7 @@ import java.util.Set; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.core.DirectoryServer; import org.opends.server.core.GroupManager; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
@@ -26,24 +26,24 @@ */ package org.opends.server.monitors; import java.util.ArrayList; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.DN; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchResultEntry; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.testng.annotations.AfterClass; import org.opends.server.TestCaseUtils; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.types.*; import static org.testng.Assert.*; /** * Interacts with the Directory Server monitor providers by retrieving the * monitor entries with internal searches. @@ -51,7 +51,7 @@ public class InternalSearchMonitorTestCase extends MonitorTestCase { static TestMonitorProvider testMonitorProvider = new TestMonitorProvider(); private static TestMonitorProvider testMonitorProvider = new TestMonitorProvider(); /** * Ensures that the Directory Server is started. opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
@@ -53,7 +53,7 @@ import org.opends.server.types.Entry; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.testng.Assert.*; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
@@ -25,32 +25,33 @@ * Portions copyright 2011 profiq s.r.o. * Portions Copyright 2014 ForgeRock AS */ package org.opends.server.plugins; import org.testng.annotations.*; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.admin.server.AdminTestCaseUtils; import org.opends.server.admin.std.meta.ReferentialIntegrityPluginCfgDefn; import org.opends.server.admin.std.server.ReferentialIntegrityPluginCfg; import org.opends.server.api.Group; import org.opends.server.api.plugin.PluginType; import org.opends.server.config.ConfigException; import org.opends.server.controls.SubtreeDeleteControl; import org.opends.server.admin.std.server.ReferentialIntegrityPluginCfg; import org.opends.server.admin.std.meta.ReferentialIntegrityPluginCfgDefn; import org.opends.server.admin.server.AdminTestCaseUtils; import org.opends.server.api.plugin.PluginType; import org.opends.server.api.Group; import static org.testng.Assert.assertEquals; import org.opends.server.core.*; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.types.*; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.HashSet; import org.testng.annotations.*; import static org.testng.Assert.*; /** * Unit test to test Referential Integrity plugin. */ public class ReferentialIntegrityPluginTestCase extends PluginTestCase { //Config DNs and attributes. opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
@@ -26,19 +26,13 @@ */ package org.opends.server.protocols.internal; import static org.opends.server.util.ServerConstants.OID_WHO_AM_I_REQUEST; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import java.util.ArrayList; import java.util.LinkedHashSet; import org.opends.server.TestCaseUtils; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.core.AddOperation; import org.opends.server.core.BindOperation; import org.opends.server.core.CompareOperation; @@ -51,12 +45,12 @@ import org.opends.server.protocols.ldap.LDAPFilter; import org.opends.server.protocols.ldap.LDAPModification; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; 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.*; /** * This class defines a set of tests for the opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
@@ -26,10 +26,10 @@ */ package org.opends.server.protocols.internal; import java.util.ArrayList; import java.util.Hashtable; import java.util.LinkedHashSet; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.directory.Attribute; @@ -41,21 +41,19 @@ import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.ldap.*; import org.opends.server.tools.LDAPReader; import org.opends.server.tools.LDAPWriter; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import static org.testng.Assert.*; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; /** * This class provides a number of tests to cover the internal LDAP socket opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
@@ -26,21 +26,19 @@ */ package org.opends.server.protocols.internal; import java.util.ArrayList; import java.util.LinkedHashSet; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.protocols.ldap.LDAPFilter; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static org.testng.Assert.*; /** * This class defines a set of tests for the * org.opends.server.protocols.internal.InternalSearchOperation class. opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
@@ -26,15 +26,6 @@ */ package org.opends.server.protocols.jmx; import static org.opends.messages.ProtocolMessages.*; 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 static org.testng.Assert.fail; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -42,8 +33,10 @@ import java.util.HashMap; import java.util.UUID; import org.opends.server.TestCaseUtils; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.backends.task.Task; import org.opends.server.backends.task.TaskBackend; import org.opends.server.backends.task.TaskState; @@ -61,17 +54,17 @@ import org.opends.server.core.ModifyOperation; import org.opends.server.core.ModifyOperationBasis; import org.opends.server.core.SchemaConfigManager; import org.opends.server.protocols.ldap.LDAPFilter; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.LDAPFilter; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import static org.opends.messages.ProtocolMessages.*; import static org.testng.Assert.*; /** * This class provides a set of test cases for the Directory Server JMX @@ -97,6 +90,7 @@ * * @throws Exception If an unexpected problem occurs. */ @Override @BeforeClass(alwaysRun = true) public void setUp() throws Exception opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
@@ -24,33 +24,36 @@ * Copyright 2008 Sun Microsystems, Inc. * Portions Copyright 2012-2014 ForgeRock AS */ package org.opends.server.protocols.ldap; import java.io.BufferedReader; import java.io.FileReader; import java.io.File; import java.io.FileReader; import java.net.Socket; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.api.Backend; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.tools.*; import org.opends.server.tools.LDAPModify; import org.opends.server.tools.LDAPSearch; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.util.Base64; import org.opends.server.util.StaticUtils; import org.testng.annotations.*; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static org.testng.Assert.*; /* * This class defines a set of testcases for testing the ;binary transfer * option functionality across different protocol versions of LDAP. /** * This class defines a set of test cases for testing the binary transfer option * functionality across different protocol versions of LDAP. */ public class LDAPBinaryOptionTestCase extends LdapTestCase { // Exported LDIF file. opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
@@ -26,24 +26,20 @@ */ package org.opends.server.protocols.ldap ; import java.net.Socket; import java.util.ArrayList; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.tools.LDAPWriter; import org.opends.server.types.*; import org.opends.server.util.StaticUtils; import org.forgerock.opendj.ldap.ByteString; import static org.testng.Assert.*; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static org.opends.server.util.ServerConstants.*; import static org.testng.Assert.*; /** * This class provides a number of tests to ensure that the server interacts opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
@@ -24,39 +24,39 @@ * Copyright 2006-2009 Sun Microsystems, Inc. * Portions Copyright 2014 ForgeRock AS */ package org.opends.server.protocols.ldap; import org.testng.annotations.Test; import org.opends.server.types.*; import java.util.Arrays; import java.util.LinkedHashSet; import org.forgerock.opendj.io.ASN1; import org.forgerock.opendj.io.ASN1Reader; import org.forgerock.opendj.io.ASN1Writer; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.io.*; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.types.DereferencePolicy; import org.opends.server.types.LDAPException; import org.testng.annotations.Test; import static org.opends.server.protocols.ldap.LDAPConstants.*; import static org.testng.Assert.*; import java.util.LinkedHashSet; import java.util.Arrays; /** * Test class for LDAP Search protocol operation classes. */ public class TestSearchProtocolOp extends LdapTestCase { ByteString baseDN = ByteString.valueOf("dc=example,dc=COM"); SearchScope scope = SearchScope.WHOLE_SUBTREE; DereferencePolicy dereferencePolicy = DereferencePolicy.DEREF_IN_SEARCHING; int sizeLimit = Integer.MAX_VALUE; int timeLimit = Integer.MAX_VALUE; boolean typesOnly = true; LDAPFilter filter; String[] attrArray = new String[] { "description", "cn", "cn;optionA" }; LinkedHashSet<String> attributes = new LinkedHashSet<String>(Arrays.asList(attrArray)); private ByteString baseDN = ByteString.valueOf("dc=example,dc=COM"); private SearchScope scope = SearchScope.WHOLE_SUBTREE; private DereferencePolicy dereferencePolicy = DereferencePolicy.DEREF_IN_SEARCHING; private int sizeLimit = Integer.MAX_VALUE; private int timeLimit = Integer.MAX_VALUE; private boolean typesOnly = true; private LDAPFilter filter; private LinkedHashSet<String> attributes = new LinkedHashSet<String>( Arrays.asList("description", "cn", "cn;optionA")); public TestSearchProtocolOp() throws Exception { opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -33,6 +33,7 @@ import org.assertj.core.api.Assertions; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.backends.MemoryBackend; import org.opends.server.core.DirectoryServer; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -31,6 +31,7 @@ import org.assertj.core.api.Assertions; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.backends.task.TaskState; import org.opends.server.core.AddOperation; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
@@ -50,7 +50,7 @@ import org.testng.annotations.Test; import static org.opends.server.TestCaseUtils.*; import static org.opends.server.types.SearchScope.*; import static org.forgerock.opendj.ldap.SearchScope.*; import static org.testng.Assert.*; /** opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -31,6 +31,8 @@ import org.assertj.core.api.Assertions; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.DirectoryServerTestCase; import org.opends.server.TestCaseUtils; import org.opends.server.admin.std.server.ReplicationDomainCfg; @@ -39,7 +41,6 @@ import org.opends.server.core.AddOperation; import org.opends.server.core.DeleteOperation; import org.opends.server.core.DirectoryServer; 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.ServerState; @@ -56,11 +57,11 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static org.forgerock.opendj.ldap.SearchScope.*; import static org.opends.server.TestCaseUtils.*; import static org.opends.server.config.ConfigConstants.*; import static org.opends.server.schema.DirectoryStringSyntax.*; import static org.opends.server.types.ResultCode.*; import static org.opends.server.types.SearchScope.*; import static org.testng.Assert.*; /** opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
@@ -37,6 +37,7 @@ import org.assertj.core.data.MapEntry; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.core.AddOperation; import org.opends.server.core.DeleteOperation; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
@@ -31,6 +31,7 @@ import java.util.UUID; import org.assertj.core.api.Assertions; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
@@ -34,6 +34,9 @@ import java.util.*; import org.assertj.core.api.Assertions; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.admin.std.server.ExternalChangelogDomainCfg; import org.opends.server.api.Backend; @@ -43,7 +46,6 @@ import org.opends.server.controls.PersistentSearchChangeType; import org.opends.server.controls.PersistentSearchControl; import org.opends.server.core.*; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.server.plugins.InvocationCounterPlugin; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.protocols.ldap.*; @@ -62,7 +64,6 @@ import org.opends.server.tools.LDAPSearch; import org.opends.server.tools.LDAPWriter; import org.opends.server.types.*; import org.forgerock.opendj.ldap.ByteString; import org.opends.server.util.LDIFWriter; import org.opends.server.util.TimeThread; import org.opends.server.workflowelement.externalchangelog.ECLSearchOperation; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
@@ -66,7 +66,7 @@ import static org.opends.server.TestCaseUtils.*; import static org.opends.server.replication.protocol.OperationContext.*; import static org.opends.server.types.ResultCode.*; import static org.opends.server.types.SearchScope.*; import static org.forgerock.opendj.ldap.SearchScope.*; import static org.opends.server.util.ServerConstants.*; import static org.opends.server.util.StaticUtils.*; import static org.testng.Assert.*; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
@@ -42,7 +42,7 @@ import org.opends.server.types.Control; import org.opends.server.types.DereferencePolicy; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import static org.testng.Assert.*; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
@@ -48,7 +48,7 @@ import org.opends.server.types.ResultCode; import org.opends.server.types.SearchFilter; import org.opends.server.types.SearchResultEntry; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
@@ -45,7 +45,7 @@ import org.opends.server.types.Entry; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchResultEntry; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import static org.testng.Assert.*; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
@@ -41,7 +41,7 @@ import org.opends.server.types.DereferencePolicy; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchResultEntry; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.testng.annotations.DataProvider; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
@@ -48,7 +48,7 @@ import org.opends.server.types.DirectoryException; import org.opends.server.types.ResultCode; import org.opends.server.types.SearchResultEntry; import org.opends.server.types.SearchScope; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.util.TimeThread; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
@@ -24,26 +24,25 @@ * Copyright 2006-2008 Sun Microsystems, Inc. * Portions Copyright 2014 ForgeRock AS */ package org.opends.server.tasks; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; import java.util.ArrayList; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.DirectoryServerTestCase; import org.opends.server.schema.DirectoryStringSyntax; import static org.opends.server.config.ConfigConstants. ATTR_TASK_COMPLETION_TIME; import static org.opends.server.config.ConfigConstants.ATTR_TASK_STATE; import static org.opends.server.config.ConfigConstants.ATTR_TASK_LOG_MESSAGES; import org.opends.server.backends.task.Task; import org.opends.server.backends.task.TaskBackend; import org.opends.server.backends.task.TaskState; import org.opends.server.core.AddOperation; import org.opends.server.core.DirectoryServer; import org.opends.server.protocols.internal.InternalClientConnection; import org.opends.server.protocols.internal.InternalSearchOperation; import org.opends.server.backends.task.*; import org.opends.server.schema.DirectoryStringSyntax; import org.opends.server.types.*; import java.util.ArrayList; import org.testng.annotations.Test; import static org.opends.server.config.ConfigConstants.*; import static org.testng.Assert.*; /** * A base class for all tasks test cases. opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java
@@ -25,6 +25,7 @@ */ package org.opends.server.types; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
@@ -26,7 +26,6 @@ */ package org.opends.server.types; import org.forgerock.opendj.ldap.ByteString; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -34,6 +33,8 @@ import java.util.*; import java.util.concurrent.CopyOnWriteArraySet; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.admin.std.meta.GlobalCfgDefn.DisabledPrivilege; import org.opends.server.admin.std.meta.RootDNCfgDefn; opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java
@@ -29,20 +29,17 @@ import java.util.Collections; import java.util.LinkedHashSet; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.ConflictBehavior; import org.opends.server.extensions.EntryDNVirtualAttributeProvider; import org.opends.server.protocols.internal.InternalClientConnection; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.opends.server.TestCaseUtils; import org.opends.server.admin.std.meta. VirtualAttributeCfgDefn.ConflictBehavior; import org.opends.server.extensions.EntryDNVirtualAttributeProvider; import org.opends.server.protocols.internal.InternalClientConnection; import static org.testng.Assert.*; /** * This class provides a set of test cases for virtual attribute rules, which * link a virtual attribute provider implementation with an attribute type and a opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
@@ -31,6 +31,7 @@ import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ConditionResult; import org.forgerock.opendj.ldap.SearchScope; import org.opends.server.TestCaseUtils; import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.ConflictBehavior; import org.opends.server.extensions.EntryDNVirtualAttributeProvider; @@ -51,7 +52,7 @@ // The virtual attribute instance that will be used for all the testing. private VirtualAttribute virtualAttribute; // The virutal attribute rule that will be used for the testing. // The virtual attribute rule that will be used for the testing. private VirtualAttributeRule virtualAttributeRule;