OPENDJ-3089 Replace all imports of server Schema by SDK Schema

Nicolas Capponi

12.25.2016 02832b95c56bf90edf38581b9cacc7bb63c964bd

OPENDJ-3089 Replace all imports of server Schema by SDK Schema

 opendj-server-legacy/replace.rb

@@ -415,10 +415,21 @@
        '\1',
      ]
  }
  
  ## Replacements for Schema
  SDK_SCHEMA = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
      [
         /import org.opends.server.types.Schema;/,
        'import org.forgerock.opendj.ldap.schema.Schema;',
      ]
  }

  ###############################  List of replacements to run #################################

  REPLACEMENTS = [ NEW_CONFIG ]
  REPLACEMENTS = [ SDK_SCHEMA ]

  ################################### Processing methods ########################################


 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java

@@ -38,7 +38,7 @@
import org.opends.guitools.controlpanel.util.ConfigFromConnection;
import org.opends.quicksetup.UserData;
import org.opends.server.tools.tasks.TaskEntry;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

import com.forgerock.opendj.util.OperatingSystem;


 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java

@@ -58,7 +58,7 @@
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.Modification;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;


 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java

@@ -42,7 +42,7 @@
import org.opends.guitools.controlpanel.ui.ProgressDialog;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/**
 * The task that is in charge of modifying an attribute definition (and all

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java

@@ -58,7 +58,7 @@
import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.AdminToolMessages;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** The task that is called when we must modify an entry. */
public class ModifyEntryTask extends Task

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java

@@ -39,7 +39,7 @@
import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/**
 * The task that is in charge of modifying an object class definition (and all

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java

@@ -54,7 +54,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.HostPort;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.SetupUtils;

import com.forgerock.opendj.cli.CommandBuilder;

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java

@@ -84,7 +84,7 @@
import org.opends.server.types.LDAPException;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.RawFilter;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/**
 * Abstract class used to re-factor some code between the classes that are used

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java

@@ -39,7 +39,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** Panel containing information about an attribute syntax. */
public class AttributeSyntaxPanel extends SchemaElementPanel

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java

@@ -43,7 +43,7 @@
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/**
 * Panel that is displayed in the dialog where the user can specify the value

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java

@@ -32,7 +32,7 @@
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** The panel used to display a binary value. */
public class BinaryValuePanel extends StatusGenericPanel

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java

@@ -79,7 +79,7 @@
import org.opends.guitools.controlpanel.ui.nodes.DndBrowserNodes;
import org.opends.guitools.controlpanel.util.LDAPEntryReader;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.ServerConstants;

/**

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java

@@ -99,7 +99,7 @@
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.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** The pane that is displayed when the user clicks on 'Browse Schema'. */
class BrowseSchemaPanel extends StatusGenericPanel

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java

@@ -86,7 +86,7 @@
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.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;


 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java

@@ -81,7 +81,7 @@
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.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;


 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java

@@ -36,7 +36,7 @@
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

import static org.opends.messages.AdminToolMessages.*;


 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java

@@ -63,7 +63,7 @@
import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;


 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java

@@ -52,7 +52,7 @@
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.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** Panel that appears when the user defines a new index. */
public class NewIndexPanel extends AbstractIndexPanel

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java

@@ -67,7 +67,7 @@
import org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;


 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java

@@ -37,7 +37,7 @@
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.ui.components.AddRemovePanel;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/**
 * This is the class used to edit the object class of a given entry, it displays

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java

@@ -36,7 +36,7 @@
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** The panel on the right of the 'Manage Schema' panel. */
public class SchemaBrowserRightPanel extends StatusGenericPanel

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java

@@ -30,7 +30,7 @@
import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.guitools.controlpanel.event.SchemaElementSelectionEvent;
import org.opends.guitools.controlpanel.event.SchemaElementSelectionListener;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/**
 * Abstract class used to re-factor some code among the panels that display the

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java

@@ -35,7 +35,7 @@
import org.opends.guitools.controlpanel.ui.renderer.
 SchemaElementComboBoxCellRenderer;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/**
 * This is a class where the user can choose from a list of available object

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java

@@ -97,7 +97,7 @@
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** The panel displaying a simplified view of an entry. */
class SimplifiedViewEntryPanel extends ViewEntryPanel

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java

@@ -44,7 +44,7 @@
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.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** The panel that displays a standard attribute definition. */
class StandardAttributePanel extends SchemaElementPanel

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java

@@ -50,7 +50,7 @@
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.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** The panel that displays a standard object class definition. */
public class StandardObjectClassPanel extends SchemaElementPanel

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java

@@ -102,7 +102,7 @@
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.quicksetup.ui.CustomHTMLEditorKit;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;


 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java

@@ -66,7 +66,7 @@
import org.opends.guitools.controlpanel.ui.renderer.LDAPEntryTableCellRenderer;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.ServerConstants;

/** The panel displaying a table view of an LDAP entry. */

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java

@@ -54,7 +54,7 @@
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.Base64;

/**

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java

@@ -49,7 +49,7 @@
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.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** A panel that can be used to select one (or several) object classes. */
public class SuperiorObjectClassesEditor extends JPanel

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java

@@ -34,7 +34,7 @@
import org.opends.guitools.controlpanel.ui.components.BinaryCellPanel;
import org.opends.guitools.controlpanel.ui.components.ObjectClassCellPanel;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** The renderer used by the table in the 'Attribute View' of the LDAP entry browser. */
public class LDAPEntryTableCellRenderer extends SelectableTableCellRenderer

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java

@@ -129,7 +129,7 @@
import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.HostPort;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.SchemaUtils;
import org.opends.server.util.SchemaUtils.PasswordType;
import org.opends.server.util.ServerConstants;

 opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java

@@ -153,7 +153,7 @@
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
import org.opends.server.types.RestoreConfig;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.types.VirtualAttributeRule;
import org.opends.server.types.WritabilityMode;
import org.opends.server.util.ActivateOnceSDKSchemaIsUsed;

 opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java

@@ -50,7 +50,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.types.Schema.SchemaUpdater;

import static org.forgerock.opendj.ldap.schema.SchemaValidationPolicy.*;

 opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java

@@ -22,7 +22,7 @@
import org.opends.server.loggers.CommonAudit;
import org.opends.server.types.CryptoManager;
import org.opends.server.types.DirectoryEnvironmentConfig;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;

/** Context for the server, giving access to global properties of the server. */
public interface ServerContext

 opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java

@@ -37,7 +37,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.Attributes;
import org.opends.server.types.Entry;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.types.VirtualAttributeRule;

import static org.opends.messages.ExtensionMessages.*;

 opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java

@@ -66,7 +66,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.opends.server.types.RawFilter;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.types.operation.PostOperationExtendedOperation;
import org.opends.server.types.operation.PreOperationModifyOperation;


 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -142,7 +142,7 @@
import org.opends.server.types.Operation;
import org.opends.server.types.OperationType;
import org.opends.server.types.RawModification;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchResultReference;

 opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java

@@ -96,7 +96,7 @@
import org.opends.server.types.FilePermission;
import org.opends.server.types.InitializationException;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.LDIFReader;

 opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java

@@ -37,7 +37,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.Schema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.LDIFReader;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;