mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
opendj-server-legacy/src/main/java/org/opends/server/api/MonitorProvider.java
@@ -16,8 +16,6 @@ */ package org.opends.server.api; import static org.opends.server.util.ServerConstants.*; import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -27,10 +25,10 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.config.server.ConfigException; import org.forgerock.opendj.server.config.server.MonitorProviderCfg; import org.opends.server.core.DirectoryServer; import org.opends.server.types.InitializationException; import org.forgerock.opendj.ldap.schema.CoreSchema; import org.forgerock.opendj.ldap.schema.ObjectClass; import org.forgerock.opendj.server.config.server.MonitorProviderCfg; import org.opends.server.types.InitializationException; /** * This class defines the set of methods and structures that must be @@ -157,7 +155,7 @@ */ public ObjectClass getMonitorObjectClass() { return DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC); return CoreSchema.getExtensibleObjectObjectClass(); }
@@ -47,6 +47,7 @@ import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.CoreSchema; import org.forgerock.opendj.ldap.schema.ObjectClass; import org.forgerock.opendj.server.config.server.BackupBackendCfg; import org.opends.server.api.Backend; import org.opends.server.core.AddOperation; @@ -70,7 +71,6 @@ import org.opends.server.types.LDIFExportConfig; import org.opends.server.types.LDIFImportConfig; import org.opends.server.types.LDIFImportResult; import org.forgerock.opendj.ldap.schema.ObjectClass; import org.opends.server.types.RestoreConfig; import org.opends.server.types.SearchFilter; @@ -580,7 +580,7 @@ LinkedHashMap<ObjectClass, String> ocMap = new LinkedHashMap<>(3); ocMap.put(CoreSchema.getTopObjectClass(), OC_TOP); ocMap.put(DirectoryServer.getObjectClass(OC_BACKUP_INFO), OC_BACKUP_INFO); ocMap.put(DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC), OC_EXTENSIBLE_OBJECT); ocMap.put(CoreSchema.getExtensibleObjectObjectClass(), OC_EXTENSIBLE_OBJECT); LinkedHashMap<AttributeType, List<Attribute>> opAttrs = new LinkedHashMap<>(0); LinkedHashMap<AttributeType, List<Attribute>> userAttrs = new LinkedHashMap<>(); opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -53,6 +53,8 @@ import org.forgerock.opendj.ldap.ResultCode; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.CoreSchema; import org.forgerock.opendj.ldap.schema.ObjectClass; import org.opends.server.api.Backend; import org.opends.server.config.ConfigConstants; import org.opends.server.controls.EntryChangelogNotificationControl; @@ -102,7 +104,6 @@ import org.opends.server.types.LDIFImportConfig; import org.opends.server.types.LDIFImportResult; import org.opends.server.types.Modification; import org.forgerock.opendj.ldap.schema.ObjectClass; import org.opends.server.types.Privilege; import org.opends.server.types.RawAttribute; import org.opends.server.types.RestoreConfig; @@ -176,7 +177,7 @@ CHANGELOG_ROOT_OBJECT_CLASSES = new LinkedHashMap<>(2); static { CHANGELOG_ROOT_OBJECT_CLASSES.put(DirectoryServer.getObjectClass(OC_TOP), OC_TOP); CHANGELOG_ROOT_OBJECT_CLASSES.put(CoreSchema.getTopObjectClass(), OC_TOP); CHANGELOG_ROOT_OBJECT_CLASSES.put(DirectoryServer.getObjectClass("container"), "container"); } @@ -185,7 +186,7 @@ CHANGELOG_ENTRY_OBJECT_CLASSES = new LinkedHashMap<>(2); static { CHANGELOG_ENTRY_OBJECT_CLASSES.put(DirectoryServer.getObjectClass(OC_TOP), OC_TOP); CHANGELOG_ENTRY_OBJECT_CLASSES.put(CoreSchema.getTopObjectClass(), OC_TOP); CHANGELOG_ENTRY_OBJECT_CLASSES.put(DirectoryServer.getObjectClass(OC_CHANGELOG_ENTRY), OC_CHANGELOG_ENTRY); }
@@ -49,6 +49,8 @@ import org.forgerock.opendj.ldap.ResultCode; import org.forgerock.opendj.ldap.SearchScope; import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.CoreSchema; import org.forgerock.opendj.ldap.schema.ObjectClass; import org.forgerock.opendj.server.config.server.MonitorBackendCfg; import org.forgerock.util.Reject; import org.opends.server.api.Backend; @@ -72,7 +74,6 @@ import org.opends.server.types.LDIFExportConfig; import org.opends.server.types.LDIFImportConfig; import org.opends.server.types.LDIFImportResult; import org.forgerock.opendj.ldap.schema.ObjectClass; import org.opends.server.types.RestoreConfig; import org.opends.server.types.SearchFilter; import org.opends.server.util.DynamicConstants; @@ -193,7 +194,7 @@ addAll(userDefinedAttributes, configEntry.getOperationalAttributes().values()); // Construct the set of objectclasses to include in the base monitor entry. monitorObjectClasses.put(DirectoryServer.getObjectClass(OC_TOP), OC_TOP); monitorObjectClasses.put(CoreSchema.getTopObjectClass(), OC_TOP); monitorObjectClasses.put(DirectoryServer.getObjectClass(OC_MONITOR_ENTRY), OC_MONITOR_ENTRY); // Create the set of base DNs that we will handle. In this case, it's just @@ -560,7 +561,7 @@ */ private Entry getBaseMonitorEntry() { final ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC); final ObjectClass extensibleObjectOC = CoreSchema.getExtensibleObjectObjectClass(); final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(extensibleObjectOC, OC_EXTENSIBLE_OBJECT); final HashMap<AttributeType, List<Attribute>> monitorUserAttrs = new LinkedHashMap<>(); opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
@@ -16,6 +16,7 @@ */ package org.opends.server.backends; import static org.forgerock.opendj.ldap.schema.CoreSchema.*; import static org.forgerock.util.Reject.*; import static org.opends.messages.BackendMessages.*; import static org.opends.messages.ConfigMessages.*; @@ -47,6 +48,7 @@ import org.forgerock.opendj.ldap.DN; import org.forgerock.opendj.ldap.ResultCode; import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.ObjectClass; import org.forgerock.opendj.server.config.server.RootDSEBackendCfg; import org.forgerock.util.Reject; import org.forgerock.util.Utils; @@ -72,7 +74,6 @@ import org.opends.server.types.LDIFExportConfig; import org.opends.server.types.LDIFImportConfig; import org.opends.server.types.LDIFImportResult; import org.forgerock.opendj.ldap.schema.ObjectClass; import org.opends.server.types.RestoreConfig; import org.opends.server.types.SearchFilter; import org.opends.server.util.BuildVersion; @@ -220,7 +221,7 @@ // Construct the set of objectclasses to include in the root DSE entry. dseObjectClasses = new HashMap<>(2); dseObjectClasses.put(DirectoryServer.getObjectClass(OC_TOP), OC_TOP); dseObjectClasses.put(getTopObjectClass(), OC_TOP); dseObjectClasses.put(DirectoryServer.getObjectClass(OC_ROOT_DSE), OC_ROOT_DSE); // Set the backend ID for this backend. The identifier needs to be opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
@@ -58,6 +58,7 @@ import org.forgerock.opendj.ldap.RDN; import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.CoreSchema; import org.forgerock.opendj.ldap.schema.ObjectClass; import org.forgerock.util.Reject; import org.opends.messages.ToolMessages; import org.opends.server.core.DirectoryServer; @@ -66,7 +67,6 @@ import org.opends.server.types.AttributeBuilder; import org.opends.server.types.Entry; import org.opends.server.types.IdentifiedException; import org.forgerock.opendj.ldap.schema.ObjectClass; import com.forgerock.opendj.cli.Argument; import com.forgerock.opendj.cli.ArgumentException; @@ -1971,8 +1971,7 @@ // then we'll need to include the extensibleObject class. if (!structuralClass.isRequiredOrOptional(attrType) && !extensibleObjectAdded) { ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC); objectClasses.put(extensibleObjectOC, OC_EXTENSIBLE_OBJECT); objectClasses.put(CoreSchema.getTopObjectClass(), OC_EXTENSIBLE_OBJECT); extensibleObjectAdded = true; }
