From e0fb5443f7fd39feb2856bd06eff17f52a98f49a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Feb 2014 16:42:20 +0000
Subject: [PATCH] SearchScope.java: Renamed SUBORDINATE_SUBTREE to SUBORDINATES to match the SDK.
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java | 4 +-
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java | 12 ++----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/DN.java | 2
opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 4 +-
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopology.java | 5 +-
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java | 3 +
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java | 2
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SearchScope.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java | 4 +-
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java | 8 ++--
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java | 2
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java | 6 +-
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 2
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java | 8 ++--
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java | 6 +-
27 files changed, 45 insertions(+), 49 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index 9f9ba05..2e4b616 100644
--- a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -1137,7 +1137,7 @@
case WHOLE_SUBTREE:
scope = SearchControls.SUBTREE_SCOPE;
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
scope = SearchControls.ONELEVEL_SCOPE;
break;
case SINGLE_LEVEL:
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
index 3d490b4..017d894 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -404,7 +404,7 @@
else if(expression.equalsIgnoreCase("subtree"))
return SearchScope.WHOLE_SUBTREE;
else if(expression.equalsIgnoreCase("subordinate"))
- return SearchScope.SUBORDINATE_SUBTREE;
+ return SearchScope.SUBORDINATES;
else {
LocalizableMessage message =
WARN_ACI_SYNTAX_INVALID_TARGETSCOPE_EXPRESSION.get(expression);
@@ -611,7 +611,7 @@
if(!entryDN.isDescendantOf(targetDN))
return false;
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
if ((entryDN.size() <= targetDN.size()) ||
!entryDN.isDescendantOf(targetDN)) {
return false;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java
index 8c17c0b..186ca63 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java
@@ -322,7 +322,7 @@
DN parent=evalCtx.getClientDN().parent();
if((parent != null) && !parent.equals(urlDN))
return EnumEvalResult.FALSE;
- } else if(scope == SearchScope.SUBORDINATE_SUBTREE) {
+ } else if(scope == SearchScope.SUBORDINATES) {
DN userDN = evalCtx.getClientDN();
if ((userDN.size() <= urlDN.size()) ||
!userDN.isDescendantOf(urlDN)) {
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
index 650e9a4..b9b2be6 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
@@ -1138,7 +1138,7 @@
case WHOLE_SUBTREE:
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
if (subordinateBaseDNs == null)
{
baseMap = DirectoryServer.getPublicNamingContexts();
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
index 35e1043..a201d4c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -4119,7 +4119,7 @@
// match anything since there isn't anything below the schema.
SearchScope scope = searchOperation.getScope();
if ((scope == SearchScope.SINGLE_LEVEL) ||
- (scope == SearchScope.SUBORDINATE_SUBTREE))
+ (scope == SearchScope.SUBORDINATES))
{
return;
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 3c7a93a..b28a1fb 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -1522,7 +1522,7 @@
isInScope = true;
}
}
- else if (searchScope == SearchScope.SUBORDINATE_SUBTREE)
+ else if (searchScope == SearchScope.SUBORDINATES)
{
if ((entryDN.size() >
aBaseDN.size()) &&
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
index 1d98e4f..9af8e34 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -860,7 +860,7 @@
searchScheduledTasks = true;
searchRecurringTasks = true;
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
searchScheduledParent = true;
searchRecurringParent = true;
searchScheduledTasks = true;
@@ -882,7 +882,7 @@
searchScheduledParent = true;
searchScheduledTasks = true;
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
searchScheduledTasks = true;
break;
}
@@ -901,7 +901,7 @@
searchRecurringParent = true;
searchRecurringTasks = true;
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
searchRecurringTasks = true;
break;
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java
index f7a7ea6..f299997 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java
@@ -282,7 +282,7 @@
return;
}
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
if (baseDN.equals(entry.getName()) || (!baseDN.isAncestorOf(
entry.getName())))
{
@@ -390,7 +390,7 @@
return;
}
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
if (baseDN.equals(entry.getName()) || (!baseDN.isAncestorOf(
entry.getName())))
{
@@ -514,7 +514,7 @@
return;
}
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
if (baseDN.equals(oldEntry.getName())
|| (!baseDN.isAncestorOf(oldEntry.getName())))
{
@@ -639,7 +639,7 @@
}
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
oldMatches = ((!baseDN.equals(oldDN)) && baseDN.isAncestorOf(oldDN));
newMatches = ((!baseDN.equals(entry.getName())) && baseDN
.isAncestorOf(entry.getName()));
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopology.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopology.java
index 32b609a..b7963f9 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopology.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/WorkflowTopology.java
@@ -22,14 +22,13 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
-
import org.opends.server.types.DN;
import org.opends.server.types.SearchScope;
-
/**
* This class is the base class used to build the workflow topology.
* A workflow topology is a tree of workflows. Each node in the tree
@@ -123,7 +122,7 @@
return null;
case SINGLE_LEVEL:
return SearchScope.BASE_OBJECT;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
case WHOLE_SUBTREE:
return SearchScope.WHOLE_SUBTREE;
default:
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java
index 7487c12..dd7be4e 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java
@@ -278,7 +278,7 @@
allowRequest =
allowedSearchScopes.contains(AllowedSearchScopes.SUB);
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
allowRequest =
allowedSearchScopes
.contains(AllowedSearchScopes.CHILDREN);
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index 707aad1..3b43ec9 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -1006,7 +1006,7 @@
instanceKeyID + ")";
InternalSearchOperation internalSearch =
internalConnection.processSearch(
- serversDN, SearchScope.SUBORDINATE_SUBTREE,
+ serversDN, SearchScope.SUBORDINATES,
SearchFilter.createFilterFromString(filter));
if (internalSearch.getResultCode() != ResultCode.SUCCESS)
continue;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 1a3fa1d..22e13c6 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -1624,7 +1624,7 @@
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
// We are not interested in the base entry, but we want to check out all
// of its children. Use a recursive process to achieve this.
for (ConfigEntry child : baseEntry.getChildren().values())
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
index b0ea2f6..184967d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
@@ -185,7 +185,7 @@
}
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
if (baseDN.equals(nextDN) || (! baseDN.isAncestorOf(nextDN)))
{
continue;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index af5bde7..6e50d2c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -1253,7 +1253,7 @@
== CheckReferencesScopeCriteria.NAMING_CONTEXT)
{
if (valueEntryDN.matchesBaseAndScope(entryBaseDN,
- SearchScope.SUBORDINATE_SUBTREE))
+ SearchScope.SUBORDINATES))
{
return PluginResult.PreOperation.stopProcessing(
ResultCode.CONSTRAINT_VIOLATION,
@@ -1325,7 +1325,7 @@
for (DN baseDN : baseDNs)
{
- if (dn.matchesBaseAndScope(baseDN, SearchScope.SUBORDINATE_SUBTREE))
+ if (dn.matchesBaseAndScope(baseDN, SearchScope.SUBORDINATES))
{
namingContext = baseDN;
break;
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
index 08ffdd4..25981c9 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
@@ -1935,7 +1935,7 @@
scope = SearchScope.WHOLE_SUBTREE;
break;
case SCOPE_SUBORDINATE_SUBTREE:
- scope = SearchScope.SUBORDINATE_SUBTREE;
+ scope = SearchScope.SUBORDINATES;
break;
default:
LocalizableMessage message =
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index 71fa40f..21303ef 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -235,7 +235,7 @@
attributes.add(REPLICATION_STATE);
InternalSearchOperation op =
conn.processSearch(DN.valueOf("cn=config"),
- SearchScope.SUBORDINATE_SUBTREE,
+ SearchScope.SUBORDINATES,
DereferencePolicy.NEVER_DEREF_ALIASES,
1, 0, false, filter, attributes);
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
index 07efec3..ffaff19 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -130,7 +131,7 @@
searchScope = WHOLE_SUBTREE;
} else if (scope.equalsIgnoreCase("subordinate"))
{
- searchScope = SUBORDINATE_SUBTREE;
+ searchScope = SUBORDINATES;
} else
{
err.println(ERR_SEARCH_INVALID_SEARCH_SCOPE.get(scope));
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
index ae57be3..bbb3046 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
@@ -479,7 +479,7 @@
}
else if (scopeStr.equals(SCOPE_STRING_SUBORDINATE))
{
- searchScope = SearchScope.SUBORDINATE_SUBTREE;
+ searchScope = SearchScope.SUBORDINATES;
}
else
{
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/DN.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/DN.java
index 718d870..6445642 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/DN.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/DN.java
@@ -488,7 +488,7 @@
// This DN must be a descendant of the provided base DN.
return isDescendantOf(baseDN);
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
// This DN must be a descendant of the provided base DN, but
// not equal to it.
return ((! equals(baseDN)) && isDescendantOf(baseDN));
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java
index 4e0ce4d..b2e02c6 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java
@@ -547,7 +547,7 @@
else if (scopeString.equals("subord") ||
scopeString.equals("subordinate"))
{
- scope = SearchScope.SUBORDINATE_SUBTREE;
+ scope = SearchScope.SUBORDINATES;
}
else
{
@@ -1583,7 +1583,7 @@
case WHOLE_SUBTREE:
buffer.append("sub");
break;
- case SUBORDINATE_SUBTREE:
+ case SUBORDINATES:
buffer.append("subordinate");
break;
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SearchScope.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SearchScope.java
index c4a0152..d76c85d 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SearchScope.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SearchScope.java
@@ -75,7 +75,7 @@
* below the entry specified as the search base (but not the search
* base entry itself) should be considered candidates for matching.
*/
- SUBORDINATE_SUBTREE(LDAPConstants.SCOPE_SUBORDINATE_SUBTREE);
+ SUBORDINATES(LDAPConstants.SCOPE_SUBORDINATE_SUBTREE);
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
index 93232d2..d93199b 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
@@ -651,7 +651,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
InternalSearchOperation searchOperation =
- conn.processSearch("o=ldif", SearchScope.SUBORDINATE_SUBTREE,
+ conn.processSearch("o=ldif", SearchScope.SUBORDINATES,
"(uid=user.1)");
assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
assertEquals(searchOperation.getSearchEntries().size(), 1);
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
index d48c9d4..1a23db0 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
@@ -373,7 +373,7 @@
InternalClientConnection.getRootConnection();
InternalSearchOperation searchOperation =
conn.processSearch(DN.valueOf("cn=schema"),
- SearchScope.SUBORDINATE_SUBTREE,
+ SearchScope.SUBORDINATES,
SearchFilter.createFilterFromString(filterString));
assertNotNull(searchOperation);
assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
index f17ce7b..6e7f1bf 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -591,7 +591,7 @@
"ou=People,dc=test,dc=com");
search = conn.processSearch(DN.valueOf("dc=test,dc=com"),
- SearchScope.SUBORDINATE_SUBTREE,
+ SearchScope.SUBORDINATES,
LDAPFilter.decode("(objectClass=*)").toSearchFilter());
result = search.getSearchEntries();
@@ -1294,16 +1294,12 @@
InternalSearchOperation search =
conn.processSearch(DN.valueOf("dc=test,dc=com"),
-
- SearchScope.SUBORDINATE_SUBTREE,
-
+ SearchScope.SUBORDINATES,
DereferencePolicy.NEVER_DEREF_ALIASES,
0,
0,
false,
-
- LDAPFilter.decode("(givenName~=Aaccf)").
- toSearchFilter(),
+ LDAPFilter.decode("(givenName~=Aaccf)").toSearchFilter(),
attribs);
List<SearchResultEntry> result = search.getSearchEntries();
@@ -1476,7 +1472,7 @@
InternalSearchOperation search =
conn.processSearch(DN.valueOf("dc=test,dc=com"),
- SearchScope.SUBORDINATE_SUBTREE,
+ SearchScope.SUBORDINATES,
DereferencePolicy.NEVER_DEREF_ALIASES,
0,
0,
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
index 836f5ed..92078d4 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
@@ -184,19 +184,19 @@
{scopes_all, SearchScope.BASE_OBJECT, true},
{scope_base, SearchScope.BASE_OBJECT, true},
{scope_base, SearchScope.SINGLE_LEVEL, false},
- {scope_base, SearchScope.SUBORDINATE_SUBTREE, false},
+ {scope_base, SearchScope.SUBORDINATES, false},
{scope_base, SearchScope.WHOLE_SUBTREE, false},
{scope_children, SearchScope.BASE_OBJECT, false},
{scope_children, SearchScope.SINGLE_LEVEL, false},
- {scope_children, SearchScope.SUBORDINATE_SUBTREE, true},
+ {scope_children, SearchScope.SUBORDINATES, true},
{scope_children, SearchScope.WHOLE_SUBTREE, false},
{scope_one, SearchScope.BASE_OBJECT, false},
{scope_one, SearchScope.SINGLE_LEVEL, true},
- {scope_one, SearchScope.SUBORDINATE_SUBTREE, false},
+ {scope_one, SearchScope.SUBORDINATES, false},
{scope_one, SearchScope.WHOLE_SUBTREE, false},
{scope_sub, SearchScope.BASE_OBJECT, false},
{scope_sub, SearchScope.SINGLE_LEVEL, false},
- {scope_sub, SearchScope.SUBORDINATE_SUBTREE, false},
+ {scope_sub, SearchScope.SUBORDINATES, false},
{scope_sub, SearchScope.WHOLE_SUBTREE, true}
};
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index 1aa03e7..2d9fcb0 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -561,7 +561,7 @@
{
Thread.sleep(10);
searchOperation = connection.processSearch(
- "dc=replicationchanges", SearchScope.SUBORDINATE_SUBTREE, "(objectclass=*)");
+ "dc=replicationchanges", SearchScope.SUBORDINATES, "(objectclass=*)");
}
while (System.currentTimeMillis() - start <= timeout
&& searchOperation.getResultCode() != ResultCode.SUCCESS
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java
index f689396..b0d45fb 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013 ForgeRock AS
+ * Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.types;
@@ -190,8 +190,8 @@
{ "base", SearchScope.BASE_OBJECT },
{ "one", SearchScope.SINGLE_LEVEL },
{ "sub", SearchScope.WHOLE_SUBTREE },
- { "subord", SearchScope.SUBORDINATE_SUBTREE },
- { "subordinate", SearchScope.SUBORDINATE_SUBTREE },
+ { "subord", SearchScope.SUBORDINATES },
+ { "subordinate", SearchScope.SUBORDINATES },
};
}
--
Gitblit v1.10.0