From d4f344ab8b20c4e4c71bdde512ce3f840ba70df6 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 24 Mar 2011 13:16:54 +0000
Subject: [PATCH] Fix for OPENDJ-100 : control-panel displays schema elements as Custom schema when using remote connection to a server. Standard schema is defined based on the X-ORIGIN and specific strings.
---
opendj-sdk/opends/resource/schema/03-changelog.ldif | 2 +-
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/resource/schema/03-changelog.ldif b/opendj-sdk/opends/resource/schema/03-changelog.ldif
index f1c469a..9074593 100644
--- a/opendj-sdk/opends/resource/schema/03-changelog.ldif
+++ b/opendj-sdk/opends/resource/schema/03-changelog.ldif
@@ -65,7 +65,7 @@
DESC 'the time when the change was processed'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
- X-ORIGIN 'Sun DSEE6 Directory Server' )
+ X-ORIGIN 'Sun Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.42.2.27.9.1.724 NAME 'replicaIdentifier'
DESC 'the OpenDS replication domain server identifier for the change'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index d33ac2e..da637f6 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.util;
@@ -2067,7 +2068,8 @@
private final static String[] configurationSchemaOrigins =
{
- "OpenDS Directory Server", "Sun Directory Server"
+ "OpenDJ Directory Server", "OpenDS Directory Server",
+ "Sun Directory Server", "Microsoft Active Directory"
};
private final static String[] standardSchemaOrigins =
--
Gitblit v1.10.0