From 18320d54c115617483a0912b496cdcc3ecd78b19 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 17 Feb 2014 14:52:00 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 1
opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java | 13
opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java | 16
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java | 20
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java | 4
opendj3-server-dev/src/server/org/opends/server/api/Group.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java | 9
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java | 76 +-
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java | 5
opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java | 23
opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java | 7
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java | 7
opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java | 2
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java | 55 +-
opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java | 21
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java | 20
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java | 8
opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopology.java | 7
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java | 23
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java | 13
opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java | 12
opendj3-server-dev/src/server/org/opends/server/types/DN.java | 14
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/core/SearchOperationWrapper.java | 3
opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java | 9
opendj3-server-dev/src/server/org/opends/server/core/RootDseWorkflowTopology.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java | 9
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java | 11
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java | 2
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java | 19
opendj3-server-dev/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java | 9
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java | 50 +-
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java | 27
opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopologyNode.java | 9
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 1
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java | 16
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java | 11
opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java | 3
opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java | 19
opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java | 5
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java | 43 +
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java | 7
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 10
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java | 18
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java | 24
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java | 10
opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java | 13
opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java | 14
opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java | 11
opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java | 22
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java | 21
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 15
opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupMemberList.java | 7
opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseSearchOperation.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java | 12
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java | 1
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java | 6
opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java | 10
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java | 15
opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 1
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java | 13
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java | 16
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 13
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java | 9
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java | 2
opendj3-server-dev/src/server/org/opends/server/types/Entry.java | 1
opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java | 19
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 26
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java | 4
opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java | 7
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java | 13
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java | 14
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java | 24
opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java | 12
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java | 8
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java | 17
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java | 42
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java | 14
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserAttr.java | 5
opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java | 7
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java | 11
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java | 21
opendj3-server-dev/src/server/org/opends/server/core/SearchOperation.java | 3
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java | 11
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyTest.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java | 12
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java | 2
149 files changed, 663 insertions(+), 643 deletions(-)
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
index cf91b70..4d27fc7 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index 869be4d..2123211 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/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;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
index 6ed2cc3..323caf2 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
+++ b/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.
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index 2e4b616..674288f 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java b/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java
index 28afc5f..8d47398 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/Group.java b/opendj3-server-dev/src/server/org/opends/server/api/Group.java
index 6cea16e..6727156 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/Group.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index 1b4fdbc..9c1e69d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/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.
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
index eb2d5ba..5e21827 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
+++ b/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 =
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
index 017d894..f2dc050 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserAttr.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
index c8adf4d..c5a2bb4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
+++ b/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.
*
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java
index 186ca63..84564a3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java
+++ b/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.
*/
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
index b2e28c9..f78e632 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
index b6c2bc4..087fc6f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java
index a2ec742..51746f1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
index eec028f..f118c74 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
index b9b2be6..3c34295 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
+++ b/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());
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
index a201d4c..2b930bd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
index 448236b..b642ee7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java
index ccc103c..5d682e5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index b28a1fb..047d262 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java
index 86d18f7..90b9eb9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
index 377c05b..32b56aa 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
+++ b/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)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
index 9af8e34..c29154f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
index b7ca2ce..981e507 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java b/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
index 4f5b3eb..0fb2b0e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java b/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java
index f299997..65982dd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java
+++ b/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);
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/RootDseWorkflowTopology.java b/opendj3-server-dev/src/server/org/opends/server/core/RootDseWorkflowTopology.java
index 330da71..86708cf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/RootDseWorkflowTopology.java
+++ b/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.
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/core/SearchOperation.java
index f2f1a56..ed7fcb3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperation.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java
index 3ad2591..bdadeef 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationWrapper.java b/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationWrapper.java
index 3ab9c61..9cfcd48 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationWrapper.java
+++ b/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.
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java b/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java
index 488b138..301c2bc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
index 0601b9f..c8f1ccd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopology.java b/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopology.java
index b7963f9..19176a7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopology.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopologyNode.java b/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopologyNode.java
index 1c2762d..7a3d420 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopologyNode.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java
index 8b0bcd2..fa03e1c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java
index dd7be4e..c6cfb69 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java
+++ b/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)
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index 3b43ec9..8bb1eae 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/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 =
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
index fae7157..112d364 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
+++ b/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)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 22e13c6..06de1cb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
index 0634bbe..0ca31c8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupMemberList.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupMemberList.java
index e4dc936..23ac512 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupMemberList.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java
index 927b718..bd405c6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
index 587d990..1550128 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
index 4693d82..30fa892 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/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)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
index 184967d..661ac41 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
+++ b/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))
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
index 82282f8..2aeba29 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
index d4b4332..054d5f6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java b/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
index 93b2fb9..d6490e2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
index b0d5397..cc39061 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
index 7fc7e9e..025a105 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
+++ b/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)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
index dc11941..a4ab62f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
index 8dbb2bd..c263e09 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 7b37a35..d58f601 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java
index 4992625..bdfd05c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 6e50d2c..727b511 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
index 6f63485..a5cbd30 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
index e721288..e371d44 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
+++ b/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()));
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
index 4cf3ebd..c6b568e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
index 98e98cf..18e034b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
index a1222a0..8dfdd24 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
index 25981c9..473fd00 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
index 97347cf..b3c9fe1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
index 582e1f3..0ca7bc6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 5714ed4..4a162a0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index 21303ef..87e711e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java
index 16ebfd4..da1ce74 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
index 7275e94..f0b7778 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
index ffaff19..7fde8e5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
index bbb3046..fb2b0c0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java
index 91de469..92591db 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java
+++ b/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;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
index c449d84..4b56b59 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/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.
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/DN.java b/opendj3-server-dev/src/server/org/opends/server/types/DN.java
index 6445642..ad63055 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/DN.java
+++ b/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.
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/Entry.java b/opendj3-server-dev/src/server/org/opends/server/types/Entry.java
index 4c7b20d..51d53cf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/Entry.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java b/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java
index b2e02c6..f338cae 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java
+++ b/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");
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java b/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java
index 3140a67..68c3329 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
index fd692e8..3842503 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
index 2987b5f..2b85d05 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
index 8148753..234ec89 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
index 59af40f..75bdea1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
index 223eaf0..f6d63ad 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
index 7b7762f..b3e849c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
index da14be8..4ff4067 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
+++ b/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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
index ca82257..db51060 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
index d93199b..076b7bc 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
index 1a23db0..ae40b1e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/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.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
index 3082ad8..3049655 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
+++ b/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");
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
index 6e7f1bf..9546e1c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
index b87cb01..3c6c8fb 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
+++ b/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 {
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
index 433564e..20333e7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
+++ b/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
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
index f5c7ae9..9598189 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
index 68d47b3..4cf5728 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
index 33d1323..e9649ee 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
+++ b/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
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
index 72fb1e7..eeffa7e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
+++ b/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
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
index 1da628a..f9fdc0e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
+++ b/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.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
index dc7e1cf..a683761 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
+++ b/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.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
index ab80795..23e101a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
+++ b/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
*/
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
index 4d03a27..a8a3a7a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
+++ b/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
{
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java
index aa5f863..918491d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
index 6deea7d..8d6b4da 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
+++ b/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'
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
index 80cfaef..3b43a9d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
index 92078d4..0f6e5a2 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyTest.java
index e976f87..6519956 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
index f79f059..2d5736d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
+++ b/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.
*/
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
index 18b72a1..cead220 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
+++ b/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.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
index 11b39fe..8e32bfe 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
index 2a15cbe..e58eb52 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index 71c96d2..0485a3c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
index 9d4cc3e..b0e10e8 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
+++ b/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.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java
index e602b81..9350bad 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java
+++ b/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.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
index 420ad1b..1c5e5c4 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
index be0caf8..979f098 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
+++ b/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.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
index d2d44e5..54e7658 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
+++ b/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.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
index 9902222..20eefd1 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
index 909c937..c5c0662 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
+++ b/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 {
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
index 9e2df0e..c7706d9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
+++ b/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
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
index 0bf21e3..12a01c4 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
+++ b/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.
*/
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
index f87a882..2cfa679 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
index c6ff209..06d9225 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
index 939e629..38b8888 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
index e44cc99..bfb2933 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
+++ b/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.
*/
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
index 8fb71fe..2243444 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
index 15826ac..672d9b1 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
+++ b/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.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
index 563c262..f84734f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
+++ b/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.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
index 2d7823c..e7531f2 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
+++ b/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.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
index 01a4d95..4867e5e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
+++ b/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
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
index f08d7ad..66070a9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
+++ b/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
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
index e861e25..a47a911 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
+++ b/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.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
index da40f35..3503165 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
+++ b/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
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
index af35b21..9c7b4be 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
+++ b/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.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
index 369187a..709e972 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
+++ b/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
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
index 017301f..cda0ddb 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
+++ b/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
{
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index 2d9fcb0..7af2b26 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 738be33..faee1c1 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
index 8d36e24..73c5868 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
+++ b/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.*;
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index 61498ad..a6e0811 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/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.*;
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
index dc3e183..d724e37 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
index c9da0c0..d868031 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
index ebce0bc..690dad4 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
index a7e80a8..1b8321d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/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.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
index b9e6db3..8ab6967 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
+++ b/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.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
index 63ac41f..94d8450 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
index 88af8e3..bb3210f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
+++ b/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.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
index 053000c..6b50a17 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
index b04bd0f..d0396a7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
index 46e5bb7..e714618 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
+++ b/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.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java
index b0d45fb..5703272 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
index 6b41c67..63ce174 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
+++ b/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;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java
index 57398b7..6e2a69c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java
+++ b/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
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
index 6123d0f..945f88c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
+++ b/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;
--
Gitblit v1.10.0