From f4a5896f6a012775fb3fb23f6cf4cc4660a28de9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Apr 2013 07:48:30 +0000
Subject: [PATCH] SchemaConstants.java: Added NO_ATTRIBUTES for OID "1.1".
---
opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java | 4 +
opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 7 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java | 5 +
opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java | 5 +
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java | 5 +
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java | 4 +
opends/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java | 11 +--
opends/src/ads/org/opends/admin/ads/ServerDescriptor.java | 4
opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java | 9 +--
opends/src/server/org/opends/server/schema/SchemaConstants.java | 26 ++++++++
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java | 4 +
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java | 5 +
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java | 4 +
opends/src/ads/org/opends/admin/ads/ADSContext.java | 5 +
opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java | 6 +
opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java | 5 +
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java | 11 ++-
opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java | 5 +
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java | 13 ++--
opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 10 +--
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java | 5 +
opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java | 5 +
22 files changed, 101 insertions(+), 57 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/ADSContext.java b/opends/src/ads/org/opends/admin/ads/ADSContext.java
index eb22631..34ea7b1 100644
--- a/opends/src/ads/org/opends/admin/ads/ADSContext.java
+++ b/opends/src/ads/org/opends/admin/ads/ADSContext.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.admin.ads;
@@ -67,6 +67,7 @@
import org.opends.messages.Message;
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.util.Utils;
+import org.opends.server.schema.SchemaConstants;
/**
@@ -2274,7 +2275,7 @@
SearchControls sc = new SearchControls();
sc.setSearchScope(SearchControls.OBJECT_SCOPE);
- sc.setReturningAttributes(new String[] {"1.1"});
+ sc.setReturningAttributes(new String[] { SchemaConstants.NO_ATTRIBUTES });
NamingEnumeration<SearchResult> sr =
getDirContext().search(dn, "(objectclass=*)", sc);
result = false;
diff --git a/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java b/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
index d02b8cb..6cf14d0 100644
--- a/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
+++ b/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
@@ -50,6 +50,7 @@
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.util.Utils;
+import org.opends.server.schema.SchemaConstants;
/**
* The object of this class represent an OpenDS server.
@@ -1415,8 +1416,7 @@
{
SearchControls sc = new SearchControls();
sc.setSearchScope(SearchControls.ONELEVEL_SCOPE);
- String[] attList = {"1.1"};
- sc.setReturningAttributes(attList);
+ sc.setReturningAttributes(new String[] { SchemaConstants.NO_ATTRIBUTES });
NamingEnumeration<SearchResult> ne = ctx.search(TRUSTSTORE_DN,
"(objectclass=ds-cfg-instance-key)", sc);
ArrayList<String> dnsToDelete = new ArrayList<String>();
diff --git a/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java b/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
index b854d97..48422b7 100644
--- a/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opends/src/ads/org/opends/admin/ads/util/ConnectionUtils.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.admin.ads.util;
@@ -55,6 +55,8 @@
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.TrustManager;
+import org.opends.server.schema.SchemaConstants;
+
/**
* Class providing some utilities to create LDAP connections using JNDI and
* to manage entries retrieved using JNDI.
@@ -629,7 +631,7 @@
searchControls.setSearchScope(
SearchControls. OBJECT_SCOPE);
searchControls.setReturningAttributes(
- new String[] {"1.1"});
+ new String[] { SchemaConstants.NO_ATTRIBUTES });
NamingEnumeration<SearchResult> sr =
ctx.search("cn=config", "objectclass=*", searchControls);
try
diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index ca0b89c..ff836a1 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.dsml.protocol;
@@ -76,6 +76,7 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.protocols.ldap.SearchRequestProtocolOp;
+import org.opends.server.schema.SchemaConstants;
import org.opends.server.tools.LDAPConnection;
import org.opends.server.tools.LDAPConnectionException;
import org.opends.server.tools.LDAPConnectionOptions;
@@ -260,7 +261,7 @@
throws LDAPConnectionException
{
LinkedHashSet<String>attributes = new LinkedHashSet<String>(1);
- attributes.add("1.1");
+ attributes.add(SchemaConstants.NO_ATTRIBUTES);
ArrayList<org.opends.server.types.Control> controls =
new ArrayList<org.opends.server.types.Control>(1);
org.opends.server.types.Control proxyAuthzControl =
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index 740bbb5..29936e2 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -48,6 +48,7 @@
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
import org.opends.messages.AdminToolMessages;
+import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.LDAPURL;
@@ -352,7 +353,7 @@
{
SearchControls ctls = controller.getBasicSearchControls();
ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- ctls.setReturningAttributes(new String[]{"1.1"});
+ ctls.setReturningAttributes(new String[] { SchemaConstants.NO_ATTRIBUTES });
ctls.setCountLimit(1);
NamingEnumeration<SearchResult> s = ctx.search(new LdapName(node.getDN()),
controller.getFilter(),
@@ -701,8 +702,8 @@
// It's enough to know if the entry has children or not.
SearchControls ctls = controller.getBasicSearchControls();
ctls.setCountLimit(1);
- String[] attrs = {"1.1"};
- ctls.setReturningAttributes(attrs);
+ ctls.setReturningAttributes(
+ new String[] { SchemaConstants.NO_ATTRIBUTES });
if (useCustomFilter())
{
ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index d3541b8..d65d996 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.guitools.controlpanel.task;
@@ -60,6 +61,7 @@
import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.Message;
+import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
@@ -362,7 +364,8 @@
ctls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
String filter =
"(|(objectClass=*)(objectclass=ldapsubentry))";
- ctls.setReturningAttributes(new String[] {"1.1"});
+ ctls.setReturningAttributes(
+ new String[] { SchemaConstants.NO_ATTRIBUTES });
NamingEnumeration<SearchResult> entryDNs =
ctx.search(Utilities.getJNDIName(dnToRemove.toString()), filter, ctls);
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
index b30d736..0481541 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -23,8 +23,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
@@ -99,6 +99,7 @@
import org.opends.messages.MessageBuilder;
import org.opends.messages.MessageDescriptor;
import org.opends.quicksetup.ui.CustomHTMLEditorKit;
+import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.ObjectClassType;
import org.opends.server.types.OpenDsException;
@@ -110,9 +111,7 @@
* GenericDialog and specifies the kind of buttons that this dialog has. The
* StatusGenericPanel is also notified when the dialog is displayed (through
* the toBeDisplayed method)
- *
*/
-
public abstract class StatusGenericPanel extends JPanel
implements ConfigChangeListener
{
@@ -2072,9 +2071,7 @@
SearchControls ctls = new SearchControls();
ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
ctls.setReturningAttributes(
- new String[] {
- "1.1"
- });
+ new String[] { SchemaConstants.NO_ATTRIBUTES });
String filter = BrowserController.ALL_OBJECTS_FILTER;
NamingEnumeration<SearchResult> result =
getInfo().getDirContext().search(Utilities.getJNDIName(dn),
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index 484d3c6..3eb91c1 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -23,9 +23,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.util;
import static org.opends.messages.AdminToolMessages.*;
@@ -128,8 +127,7 @@
import org.opends.server.util.StaticUtils;
/**
- * An static class that provides miscellaneous functions.
- *
+ * A static class that provides miscellaneous functions.
*/
public class Utilities
{
@@ -2488,8 +2486,8 @@
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope(
SearchControls. OBJECT_SCOPE);
- searchControls.setReturningAttributes(
- new String[] {"1.1"});
+ searchControls
+ .setReturningAttributes(new String[] { SchemaConstants.NO_ATTRIBUTES });
NamingEnumeration<SearchResult> sr =
ctx.search("cn=config", "objectclass=*", searchControls);
try
diff --git a/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java b/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
index bbe90b8..7764f2a 100644
--- a/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
+++ b/opends/src/server/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.admin.client.ldap;
@@ -53,6 +54,7 @@
import org.opends.server.admin.client.AuthenticationException;
import org.opends.server.admin.client.AuthenticationNotSupportedException;
import org.opends.server.admin.client.CommunicationException;
+import org.opends.server.schema.SchemaConstants;
@@ -232,7 +234,8 @@
String filter = "(objectClass=*)";
SearchControls controls = new SearchControls();
controls.setSearchScope(SearchControls.OBJECT_SCOPE);
- controls.setReturningAttributes(new String[]{"1.1"});
+ controls
+ .setReturningAttributes(new String[] { SchemaConstants.NO_ATTRIBUTES });
try {
NamingEnumeration<SearchResult> results = dirContext.search(dn, filter,
controls);
diff --git a/opends/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java b/opends/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
index 500f1e1..de20da4 100644
--- a/opends/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
+++ b/opends/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
@@ -22,9 +22,8 @@
* CDDL HEADER END
*
*
- * Copyright 2011 ForgeRock AS.
+ * Copyright 2011-2013 ForgeRock AS.
*/
-
package org.opends.server.extensions;
@@ -62,6 +61,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.*;
import org.opends.server.schema.GeneralizedTimeSyntax;
+import org.opends.server.schema.SchemaConstants;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
@@ -2282,12 +2282,11 @@
/**
* Attribute list for searches requesting no attributes.
*/
- static final LinkedHashSet<String> NO_ATTRIBUTES;
-
+ static final LinkedHashSet<String> NO_ATTRIBUTES = new LinkedHashSet<String>(
+ 1);
static
{
- NO_ATTRIBUTES = new LinkedHashSet<String>(1);
- NO_ATTRIBUTES.add("1.1");
+ NO_ATTRIBUTES.add(SchemaConstants.NO_ATTRIBUTES);
}
// The provider which should be used by policies to create LDAP connections.
diff --git a/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
index d70b5c8..80e770e 100644
--- a/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -53,6 +53,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
+import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
@@ -115,7 +116,7 @@
new LinkedHashSet<String>(1);
static
{
- SEARCH_ATTRS.add("1.1");
+ SEARCH_ATTRS.add(SchemaConstants.NO_ATTRIBUTES);
}
diff --git a/opends/src/server/org/opends/server/schema/SchemaConstants.java b/opends/src/server/org/opends/server/schema/SchemaConstants.java
index 8decf70..8435ca6 100644
--- a/opends/src/server/org/opends/server/schema/SchemaConstants.java
+++ b/opends/src/server/org/opends/server/schema/SchemaConstants.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.schema;
@@ -32,10 +32,34 @@
/**
* This class defines a number of constants used by Directory Server schema
* elements, like matching rules, syntaxes, attribute types, and objectclasses.
+ * <p>
+ * Here is a definition for the prefixes:
+ * <dl>
+ * <dt>AMR</dt>
+ * <dd>Approximate Matching Rule</dd>
+ * <dt>EMR</dt>
+ * <dd>Equality Matching Rule</dd>
+ * <dt>OMR</dt>
+ * <dd>Ordering Matching Rule</dd>
+ * <dt>SMR</dt>
+ * <dd>Syntax Matching Rule</dd>
+ * </dl>
+ * </p>
*/
public class SchemaConstants
{
/**
+ * RFC 2251, Section 4.5.1: 'If the client does not want any attributes
+ * returned, it can specify a list containing only the attribute with OID
+ * "1.1". This OID was chosen arbitrarily and does not correspond to any
+ * attribute in use.'
+ *
+ * @see <a href="http://www.rfc-editor.org/rfc/rfc2251.txt"
+ * >RFC 2251 for LDAP v3</a>
+ */
+ public static final String NO_ATTRIBUTES = "1.1";
+
+ /**
* The IANA-assigned base OID for all things under the OpenDS umbrella.
*/
private static final String OID_OPENDS_BASE = "1.3.6.1.4.1.26027";
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index ef4f36c..3e47b9c 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -45,6 +45,7 @@
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.schema.SchemaConstants;
import org.opends.server.types.*;
import org.opends.server.workflowelement.localbackend.LocalBackendSearchOperation;
@@ -188,7 +189,7 @@
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
- attrList.add("1.1");
+ attrList.add(SchemaConstants.NO_ATTRIBUTES);
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
index 2d4e338..59538f5 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -47,6 +47,7 @@
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.schema.SchemaConstants;
import org.opends.server.types.*;
import static org.testng.Assert.*;
@@ -232,7 +233,7 @@
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
- attrList.add("1.1");
+ attrList.add(SchemaConstants.NO_ATTRIBUTES);
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
index 65c4bb2..55bbd37 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -44,6 +44,7 @@
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.schema.SchemaConstants;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
@@ -127,9 +128,9 @@
);
assertTrue(resultCode == 0);
}
-
-
-
+
+
+
/**
* Retrieves a set of entry DNs for use in testing the
* governingStructureRule virtual attribute.
@@ -250,7 +251,7 @@
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
- attrList.add("1.1");
+ attrList.add(SchemaConstants.NO_ATTRIBUTES);
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
index 32f5771..59aa1c1 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
@@ -23,9 +23,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.extensions;
+import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.*;
import org.opends.server.TestCaseUtils;
import org.opends.server.DirectoryServerTestCase;
@@ -276,7 +278,7 @@
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
- attrList.add("1.1");
+ attrList.add(SchemaConstants.NO_ATTRIBUTES);
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
index 2a4cfe9..68b2ab7 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
@@ -23,10 +23,11 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.extensions;
+import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.*;
import org.opends.server.TestCaseUtils;
import org.opends.server.DirectoryServerTestCase;
@@ -278,7 +279,7 @@
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
- attrList.add("1.1");
+ attrList.add(SchemaConstants.NO_ATTRIBUTES);
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
index 3ef4cfd..945be58 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -40,6 +41,7 @@
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.schema.SchemaConstants;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.*;
@@ -429,7 +431,7 @@
"-b", "",
"-s", "base",
"(objectClass=*)",
- "1.1"
+ SchemaConstants.NO_ATTRIBUTES
};
assertEquals(LDAPSearch.mainSearch(args, false, null, System.err), 0);
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
index 0539475..d477384 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -44,6 +44,7 @@
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.schema.SchemaConstants;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
@@ -134,14 +135,14 @@
public Object[][] getTestEntryDNOC()
throws Exception
{
- return new Object[][] {
+ return new Object[][] {
{DN.decode("o=test"), "structuralObjectClass=organization"},
{DN.decode("dc=example,dc=com"), "structuralObjectClass=domain"},
};
}
-
-
-
+
+
+
/**
* Tests the {@code getEntry} method for the specified entry to ensure that
* the entry returned includes the structuralObjectClass operational
@@ -218,7 +219,7 @@
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
- attrList.add("1.1");
+ attrList.add(SchemaConstants.NO_ATTRIBUTES);
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
index 69ceeea..b5680f7 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -44,6 +44,7 @@
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.schema.SchemaConstants;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
@@ -196,7 +197,7 @@
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
- attrList.add("1.1");
+ attrList.add(SchemaConstants.NO_ATTRIBUTES);
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
index 3f50236..f83e151 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -41,6 +42,7 @@
import org.opends.server.plugins.DelayPreOpPlugin;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
+import org.opends.server.schema.SchemaConstants;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.Attributes;
import org.opends.server.types.Control;
@@ -127,7 +129,7 @@
"-b", "",
"-s", "base",
"(objectClass=*)",
- "1.1"
+ SchemaConstants.NO_ATTRIBUTES
};
for (int i=0; i < 7; i++)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
index b32478d..4f1f283 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.types;
@@ -38,6 +39,7 @@
import java.util.Set;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.schema.SchemaConstants;
import org.opends.server.util.ServerConstants;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
@@ -1629,7 +1631,7 @@
@DataProvider(name = "superiorData")
public Object[][] createSuperiorData() {
ObjectClassBuilder builder = new ObjectClassBuilder(
- "parent1", "1.1");
+ "parent1", SchemaConstants.NO_ATTRIBUTES);
builder.setObjectClassType(ObjectClassType.ABSTRACT);
ObjectClass parent1 = builder.getInstance();
--
Gitblit v1.10.0