From f237b5163c79c4cd07943c019a33b4da2905e736 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Feb 2014 14:47:40 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java | 26 ++++--
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java | 28 ++++--
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java | 2
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java | 26 +++---
/dev/null | 93 -----------------------
opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java | 12 +-
opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java | 26 ++++--
opendj3-server-dev/src/server/org/opends/server/types/Entry.java | 12 +-
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java | 4
15 files changed, 87 insertions(+), 153 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
index d2d7962..bb8dc36 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -90,7 +90,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.ObjectClass;
-import org.opends.server.types.ObjectClassType;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.types.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
index 7d070d0..01ad7d4 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
@@ -77,7 +77,7 @@
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.AttributeType;
import org.opends.server.types.ObjectClass;
-import org.opends.server.types.ObjectClassType;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.types.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
index d9f8bbd..846d438 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
@@ -46,7 +46,7 @@
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.ObjectClass;
-import org.opends.server.types.ObjectClassType;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.types.Schema;
/**
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
index 7393dd4..c5ef4e4 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -100,7 +100,7 @@
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.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.types.OpenDsException;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index a3f3894..0d9e369 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -60,7 +60,7 @@
import org.opends.server.types.Attributes;
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
-import org.opends.server.types.ObjectClassType;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.RDN;
import org.opends.server.types.Schema;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
index 124746a..94efd51 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
@@ -37,7 +37,7 @@
import org.opends.server.api.MatchingRule;
import org.forgerock.opendj.ldap.schema.AttributeUsage;
import org.opends.server.types.CommonSchemaElements;
-import org.opends.server.types.ObjectClassType;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
/**
* The cell renderer to be used to render schema elements in a combo box.
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 bb1a971..35e1043 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.schema.ObjectClassType;
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/core/DirectoryServer.java b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
index 69d89cd..fbe4356 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -26,16 +26,6 @@
*/
package org.opends.server.core;
-import static org.opends.messages.ConfigMessages.*;
-import static org.opends.messages.CoreMessages.*;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.DynamicConstants.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-import static org.forgerock.util.Reject.*;
-
import java.io.*;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
@@ -53,6 +43,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.AttributeUsage;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.forgerock.util.Reject;
import org.forgerock.util.Utils;
import org.opends.server.admin.AdministrationConnector;
@@ -86,6 +77,9 @@
import org.opends.server.tools.ConfigureWindowsService;
import org.opends.server.types.*;
import org.opends.server.util.*;
+import org.opends.server.workflowelement.WorkflowElement;
+import org.opends.server.workflowelement.WorkflowElementConfigManager;
+import org.opends.server.workflowelement.localbackend.LocalBackendWorkflowElement;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
@@ -93,9 +87,15 @@
import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
-import org.opends.server.workflowelement.WorkflowElement;
-import org.opends.server.workflowelement.WorkflowElementConfigManager;
-import org.opends.server.workflowelement.localbackend.*;
+import static org.forgerock.util.Reject.*;
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.messages.CoreMessages.*;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.config.ConfigConstants.*;
+import static org.opends.server.schema.SchemaConstants.*;
+import static org.opends.server.util.DynamicConstants.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
/**
* This class defines the core of the Directory Server. It manages the startup
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
index 6c717ac..c8fbe89 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
@@ -25,15 +25,17 @@
* Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.schema;
-import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
@@ -42,17 +44,12 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteSequence;
+
import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements the DIT content rule description syntax, which is used
* to hold DIT content rule definitions in the server schema. The format of
@@ -93,6 +90,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException, InitializationException
{
@@ -129,6 +127,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getSyntaxName()
{
return SYNTAX_DIT_CONTENT_RULE_NAME;
@@ -139,6 +138,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getOID()
{
return SYNTAX_DIT_CONTENT_RULE_OID;
@@ -149,6 +149,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getDescription()
{
return SYNTAX_DIT_CONTENT_RULE_DESCRIPTION;
@@ -159,6 +160,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public EqualityMatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
@@ -169,6 +171,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public OrderingMatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
@@ -179,6 +182,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public SubstringMatchingRule getSubstringMatchingRule()
{
return defaultSubstringMatchingRule;
@@ -189,6 +193,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ApproximateMatchingRule getApproximateMatchingRule()
{
// There is no approximate matching rule by default.
@@ -200,6 +205,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
{
@@ -1430,6 +1436,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isBinary()
{
return false;
@@ -1440,6 +1447,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isHumanReadable()
{
return true;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
index 0cee6e1..5b9cc94 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
@@ -25,15 +25,17 @@
* Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.schema;
-import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
@@ -42,17 +44,12 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteSequence;
+
import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements the name form description syntax, which is used to
* hold name form definitions in the server schema. The format of this syntax
@@ -92,6 +89,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException, InitializationException
{
@@ -128,6 +126,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getSyntaxName()
{
return SYNTAX_NAME_FORM_NAME;
@@ -138,6 +137,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getOID()
{
return SYNTAX_NAME_FORM_OID;
@@ -148,6 +148,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getDescription()
{
return SYNTAX_NAME_FORM_DESCRIPTION;
@@ -158,6 +159,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public EqualityMatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
@@ -168,6 +170,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public OrderingMatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
@@ -178,6 +181,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public SubstringMatchingRule getSubstringMatchingRule()
{
return defaultSubstringMatchingRule;
@@ -188,6 +192,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ApproximateMatchingRule getApproximateMatchingRule()
{
// There is no approximate matching rule by default.
@@ -199,6 +204,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
{
@@ -1268,6 +1274,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isBinary()
{
return false;
@@ -1278,6 +1285,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isHumanReadable()
{
return true;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
index a6995e5..c4d6aac 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -25,9 +25,6 @@
* Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
-import org.forgerock.i18n.LocalizableMessage;
-
-
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
@@ -36,6 +33,11 @@
import java.util.Map;
import java.util.Set;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
@@ -44,18 +46,13 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteSequence;
+
import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.LocalizableMessageBuilder;
+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 static org.opends.server.config.ConfigConstants.*;
-
-
/**
* This class implements the object class description syntax, which is used to
@@ -96,6 +93,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException, InitializationException
{
@@ -132,6 +130,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getSyntaxName()
{
return SYNTAX_OBJECTCLASS_NAME;
@@ -142,6 +141,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getOID()
{
return SYNTAX_OBJECTCLASS_OID;
@@ -152,6 +152,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getDescription()
{
return SYNTAX_OBJECTCLASS_DESCRIPTION;
@@ -162,6 +163,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public EqualityMatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
@@ -172,6 +174,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public OrderingMatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
@@ -182,6 +185,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public SubstringMatchingRule getSubstringMatchingRule()
{
return defaultSubstringMatchingRule;
@@ -192,6 +196,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ApproximateMatchingRule getApproximateMatchingRule()
{
// There is no approximate matching rule by default.
@@ -203,6 +208,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
{
@@ -1477,6 +1483,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isBinary()
{
return false;
@@ -1487,6 +1494,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isHumanReadable()
{
return true;
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 cde6519..4c7b20d 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
@@ -26,11 +26,6 @@
*/
package org.opends.server.types;
-import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.ldap.ByteStringBuilder;
-import org.forgerock.opendj.ldap.ByteSequenceReader;
-
import java.io.BufferedWriter;
import java.io.IOException;
import java.util.*;
@@ -38,6 +33,12 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.api.AttributeValueDecoder;
import org.opends.server.api.CompressedSchema;
import org.opends.server.api.ProtocolElement;
@@ -45,7 +46,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PluginConfigManager;
import org.opends.server.core.SubentryManager;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.SubEntry.CollectiveConflictBehavior;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFWriter;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java b/opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java
index 76f669a..8992874 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java
@@ -26,7 +26,6 @@
*/
package org.opends.server.types;
-import org.forgerock.opendj.ldap.ByteString;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -36,13 +35,13 @@
import java.util.Map;
import java.util.Set;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.schema.ObjectClassSyntax;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import static org.opends.server.util.ServerConstants.*;
import static org.forgerock.util.Reject.*;
-
-
+import static org.opends.server.util.ServerConstants.*;
/**
* This class defines a data structure for storing and interacting
@@ -276,6 +275,7 @@
*
* @return The definition string used to create this objectclass.
*/
+ @Override
public String getDefinition()
{
return definition;
@@ -309,6 +309,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ObjectClass recreateFromDefinition(Schema schema)
throws DirectoryException
{
@@ -520,6 +521,7 @@
* @param buffer The buffer to which the information should be
* appended.
*/
+ @Override
protected void toStringContent(StringBuilder buffer) {
if (!superiorClasses.isEmpty()) {
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/ObjectClassType.java b/opendj3-server-dev/src/server/org/opends/server/types/ObjectClassType.java
deleted file mode 100644
index 7bf7f2e..0000000
--- a/opendj3-server-dev/src/server/org/opends/server/types/ObjectClassType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-package org.opends.server.types;
-
-
-
-/**
- * This enumeration defines the set of possible objectclass types that
- * may be used, as defined in RFC 2252.
- */
-@org.opends.server.types.PublicAPI(
- stability=org.opends.server.types.StabilityLevel.UNCOMMITTED,
- mayInstantiate=false,
- mayExtend=false,
- mayInvoke=true)
-public enum ObjectClassType
-{
- /**
- * The objectclass type that to use for classes declared "abstract".
- */
- ABSTRACT("ABSTRACT"),
-
-
-
- /**
- * The objectclass type that to use for classes declared
- * "structural".
- */
- STRUCTURAL("STRUCTURAL"),
-
-
-
- /**
- * The objectclass type that to use for classes declared
- * "auxiliary".
- */
- AUXILIARY("AUXILIARY");
-
-
-
- // The string representation of this objectclass type.
- String typeString;
-
-
-
- /**
- * Creates a new objectclass type with the provided string
- * representation.
- *
- * @param typeString The string representation for this
- * objectclass type.
- */
- private ObjectClassType(String typeString)
- {
- this.typeString = typeString;
- }
-
-
-
- /**
- * Retrieves a string representation of this objectclass type.
- *
- * @return A string representation of this objectclass type.
- */
- public String toString()
- {
- return typeString;
- }
-}
-
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
index 91ebb66..8becac9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
@@ -35,6 +35,7 @@
import java.util.Map;
import java.util.Set;
+import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.core.DirectoryServer;
import org.opends.server.schema.SchemaConstants;
import org.opends.server.util.ServerConstants;
@@ -43,8 +44,6 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-
-
/**
* This class defines a set of tests for the
* {@link org.opends.server.types.ObjectClass} class.
@@ -73,6 +72,7 @@
/**
* {@inheritDoc}
*/
+ @Override
protected void resetBuilder() {
this.superior = null;
this.objectClassType = ObjectClassType.STRUCTURAL;
--
Gitblit v1.10.0