From 89f82b86392535aa2918a485f6bf614d1d60045b Mon Sep 17 00:00:00 2001 From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com> Date: Fri, 03 Jun 2016 10:30:48 +0000 Subject: [PATCH] OPENDJ-3038 Moved SomeSchemaElement to org.opends.guitools.controlpanel.datamodel --- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java | 1 - opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SomeSchemaElement.java | 3 ++- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java index 31d6ce8..fa0f227 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java @@ -31,7 +31,6 @@ import org.forgerock.opendj.ldap.schema.ObjectClass; import org.opends.guitools.controlpanel.util.ConfigFromDirContext; import org.opends.quicksetup.UserData; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.tools.tasks.TaskEntry; import org.opends.server.types.Schema; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SomeSchemaElement.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SomeSchemaElement.java similarity index 98% rename from opendj-server-legacy/src/main/java/org/opends/server/schema/SomeSchemaElement.java rename to opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SomeSchemaElement.java index 51936d9..f2306f4 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SomeSchemaElement.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SomeSchemaElement.java @@ -13,7 +13,7 @@ * * Copyright 2015-2016 ForgeRock AS. */ -package org.opends.server.schema; +package org.opends.guitools.controlpanel.datamodel; import static org.opends.server.util.ServerConstants.*; @@ -28,6 +28,7 @@ import org.forgerock.opendj.ldap.schema.SchemaElement; import org.opends.server.config.ConfigConstants; import org.opends.server.core.ServerContext; +import org.opends.server.schema.ServerSchemaElement; import org.opends.server.util.RemoveOnceSDKSchemaIsUsed; /** diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java index d2b183b..91e5eea 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java @@ -45,12 +45,12 @@ import org.forgerock.opendj.ldap.schema.SchemaBuilder; import org.forgerock.opendj.ldap.schema.SchemaElement; import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.ui.ColorAndFontConstants; import org.opends.guitools.controlpanel.ui.ProgressDialog; import org.opends.guitools.controlpanel.util.Utilities; import org.opends.server.config.ConfigConstants; import org.opends.server.core.DirectoryServer; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.Attributes; import org.opends.server.types.Entry; import org.opends.server.types.ExistingFileBehavior; diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java index e25b99e..18d74ab 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java @@ -36,10 +36,10 @@ import org.forgerock.opendj.ldap.schema.ObjectClass; import org.forgerock.opendj.ldap.schema.SchemaBuilder; import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.ui.ColorAndFontConstants; import org.opends.guitools.controlpanel.ui.ProgressDialog; import org.opends.guitools.controlpanel.util.Utilities; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.OpenDsException; import org.opends.server.types.Schema; diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java index 6f6c97d..d03b86d 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java @@ -42,12 +42,12 @@ import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.MatchingRule; import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.ui.ColorAndFontConstants; import org.opends.guitools.controlpanel.ui.ProgressDialog; import org.opends.guitools.controlpanel.util.Utilities; import org.opends.server.config.ConfigConstants; import org.opends.server.core.DirectoryServer; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.Attributes; import org.opends.server.types.DirectoryException; import org.opends.server.types.Entry; diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java index 7514b71..b00a0f4 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java @@ -69,6 +69,7 @@ import org.opends.guitools.controlpanel.datamodel.CategorizedComboBoxElement; import org.opends.guitools.controlpanel.datamodel.IndexDescriptor; import org.opends.guitools.controlpanel.datamodel.ServerDescriptor; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor; import org.opends.guitools.controlpanel.datamodel.VLVSortOrder; import org.opends.guitools.controlpanel.ui.components.TitlePanel; @@ -80,7 +81,6 @@ import org.opends.quicksetup.Installation; import org.opends.server.config.ConfigException; import org.opends.server.protocols.ldap.LDAPFilter; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.FilterType; import org.opends.server.types.LDAPException; import org.opends.server.types.OpenDsException; diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java index 6523126..27ff96a 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java @@ -73,6 +73,7 @@ import org.opends.guitools.controlpanel.browser.IconPool; import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo; import org.opends.guitools.controlpanel.datamodel.ServerDescriptor; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent; import org.opends.guitools.controlpanel.event.ConfigurationElementCreatedEvent; import org.opends.guitools.controlpanel.event.ConfigurationElementCreatedListener; @@ -98,7 +99,6 @@ import org.opends.guitools.controlpanel.util.LowerCaseComparator; import org.opends.guitools.controlpanel.util.Utilities; import org.opends.guitools.controlpanel.util.ViewPositions; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.Schema; /** The pane that is displayed when the user clicks on 'Browse Schema'. */ diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java index c4faebe..857d327 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java @@ -71,6 +71,7 @@ import org.forgerock.opendj.ldap.schema.SchemaBuilder; import org.forgerock.opendj.ldap.schema.Syntax; import org.opends.guitools.controlpanel.datamodel.ServerDescriptor; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent; import org.opends.guitools.controlpanel.event.ConfigurationElementCreatedListener; import org.opends.guitools.controlpanel.event.ScrollPaneBorderListener; @@ -83,7 +84,6 @@ import org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer; import org.opends.guitools.controlpanel.util.LowerCaseComparator; import org.opends.guitools.controlpanel.util.Utilities; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.Schema; import org.opends.server.util.ServerConstants; import org.opends.server.util.StaticUtils; diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java index 32c78fa..f3203f9 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java @@ -65,6 +65,7 @@ import org.forgerock.opendj.ldap.schema.ObjectClassType; import org.forgerock.opendj.ldap.schema.SchemaBuilder; import org.opends.guitools.controlpanel.datamodel.ServerDescriptor; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.datamodel.SortableListModel; import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent; import org.opends.guitools.controlpanel.event.ConfigurationElementCreatedListener; @@ -80,7 +81,6 @@ import org.opends.guitools.controlpanel.ui.components.TitlePanel; import org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer; import org.opends.guitools.controlpanel.util.Utilities; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.Schema; import org.opends.server.util.ServerConstants; import org.opends.server.util.StaticUtils; diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java index 0a75a72..a66d049 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java @@ -49,10 +49,10 @@ import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo; import org.opends.guitools.controlpanel.datamodel.IndexDescriptor; import org.opends.guitools.controlpanel.datamodel.ServerDescriptor; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent; import org.opends.guitools.controlpanel.task.Task; import org.opends.guitools.controlpanel.util.Utilities; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.Schema; /** Panel that appears when the user defines a new index. */ diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java index 57eb288..154e3d9 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java @@ -40,11 +40,11 @@ import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.MatchingRule; import org.forgerock.opendj.ldap.schema.ObjectClass; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent; import org.opends.guitools.controlpanel.ui.components.TitlePanel; import org.opends.guitools.controlpanel.util.LowerCaseComparator; import org.opends.guitools.controlpanel.util.Utilities; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.Schema; /** The panel that displays a standard attribute definition. */ diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java index 949b069..a7e659c 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java @@ -44,11 +44,11 @@ import org.forgerock.i18n.LocalizableMessageBuilder; import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.ObjectClass; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent; import org.opends.guitools.controlpanel.ui.components.TitlePanel; import org.opends.guitools.controlpanel.util.LowerCaseComparator; import org.opends.guitools.controlpanel.util.Utilities; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.Schema; /** The panel that displays a standard object class definition. */ diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java index 7c32f23..9b5ff9a 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java @@ -104,6 +104,7 @@ import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo; import org.opends.guitools.controlpanel.datamodel.CustomSearchResult; import org.opends.guitools.controlpanel.datamodel.MonitoringAttributes; +import org.opends.guitools.controlpanel.datamodel.SomeSchemaElement; import org.opends.guitools.controlpanel.datamodel.SortableTableModel; import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor; import org.opends.guitools.controlpanel.event.ClickTooltipDisplayer; @@ -119,7 +120,6 @@ import org.opends.server.config.ConfigurationHandler; import org.opends.server.core.LockFileManager; import org.opends.server.schema.SchemaConstants; -import org.opends.server.schema.SomeSchemaElement; import org.opends.server.types.OpenDsException; import org.opends.server.types.Schema; import org.opends.server.util.SchemaUtils; -- Gitblit v1.10.0