From 8d695e5535cfc25303e8db106f13fa1565e72055 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 29 Apr 2014 13:28:36 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1343 Migrate dsconfig - Fixed copyright(s) and replaced OID for fullVendorVersion to 1.3.6.1.4.1.36733.2.1.1.141
---
opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java | 2 +-
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java | 5 +++--
opendj3-server-dev/resource/schema/00-core.ldif | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java
index d970971..574b7e6 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2014 ForgeRock AS
*/
package org.forgerock.opendj.ldap;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java
index 53f4bce..d32c5db 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions copyright 2014 ForgeRock AS
*/
package org.forgerock.opendj.ldap.schema;
@@ -267,7 +268,7 @@
private static final AttributeType FACSIMILE_TELEPHONE_NUMBER_ATTRIBUTE_TYPE
= CoreSchemaImpl.getInstance().getAttributeType("2.5.4.23");
private static final AttributeType FULL_VENDOR_VERSION_ATTRIBUTE_TYPE
- = CoreSchemaImpl.getInstance().getAttributeType("1.3.6.1.4.1.36733.2.1.1.136");
+ = CoreSchemaImpl.getInstance().getAttributeType("1.3.6.1.4.1.36733.2.1.1.141");
private static final AttributeType GENERATION_QUALIFIER_ATTRIBUTE_TYPE
= CoreSchemaImpl.getInstance().getAttributeType("2.5.4.44");
private static final AttributeType GIVEN_NAME_ATTRIBUTE_TYPE
@@ -612,7 +613,7 @@
}
/**
- * Returns a reference to the {@code Full Vendor Version} which has the OID {@code 1.3.6.1.4.1.36733.2.1.1.136}.
+ * Returns a reference to the {@code Full Vendor Version} which has the OID {@code 1.3.6.1.4.1.36733.2.1.1.141}.
*
* @return A reference to the {@code Full Vendor Version}.
*/
diff --git a/opendj3-server-dev/resource/schema/00-core.ldif b/opendj3-server-dev/resource/schema/00-core.ldif
index 1fd2c84..61f2058 100644
--- a/opendj3-server-dev/resource/schema/00-core.ldif
+++ b/opendj3-server-dev/resource/schema/00-core.ldif
@@ -21,7 +21,7 @@
#
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2011-2012 ForgeRock AS
+# Portions Copyright 2011-2014 ForgeRock AS
# Portions Copyright 2013-2014 Manuel Gaupp
#
#
@@ -532,7 +532,7 @@
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
X-ORIGIN 'RFC 2985' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.136 NAME 'fullVendorVersion'
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.141 NAME 'fullVendorVersion'
EQUALITY 1.3.6.1.4.1.1466.109.114.1 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation X-ORIGIN 'OpenDJ Directory Server' )
objectClasses: ( 2.5.6.0 NAME 'top' ABSTRACT MUST objectClass
--
Gitblit v1.10.0