From c0e70d3331588291e6e2c5905d5142d98f03bbae Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 07 Nov 2016 15:05:30 +0000
Subject: [PATCH] OPENDJ-3417 Update configuration file and configuration schema with local backend
---
opendj-server-legacy/resource/schema/02-config.ldif | 29 +++++++++++++++++------------
opendj-server-legacy/tests/unit-tests-testng/resource/config-changes.ldif | 7 +++++++
opendj-server-legacy/resource/config/config.ldif | 6 ++++++
3 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/resource/config/config.ldif b/opendj-server-legacy/resource/config/config.ldif
index edab57e..1693b9b 100644
--- a/opendj-server-legacy/resource/config/config.ldif
+++ b/opendj-server-legacy/resource/config/config.ldif
@@ -188,6 +188,7 @@
dn: ds-cfg-backend-id=backup,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-backup-backend
ds-cfg-enabled: true
ds-cfg-java-class: org.opends.server.backends.BackupBackend
@@ -199,6 +200,7 @@
dn: ds-cfg-backend-id=ads-truststore,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-trust-store-backend
ds-cfg-backend-id: ads-truststore
ds-cfg-enabled: true
@@ -212,6 +214,7 @@
dn: ds-cfg-backend-id=monitor,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-monitor-backend
ds-cfg-enabled: true
ds-cfg-java-class: org.opends.server.backends.MonitorBackend
@@ -222,6 +225,7 @@
dn: ds-cfg-backend-id=schema,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-schema-backend
ds-cfg-enabled: true
ds-cfg-java-class: org.opends.server.backends.SchemaBackend
@@ -233,6 +237,7 @@
dn: ds-cfg-backend-id=tasks,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-task-backend
ds-cfg-enabled: true
ds-cfg-java-class: org.opends.server.backends.task.TaskBackend
@@ -245,6 +250,7 @@
dn: ds-cfg-backend-id=adminRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-ldif-backend
ds-cfg-backend-id: adminRoot
ds-cfg-enabled: true
diff --git a/opendj-server-legacy/resource/schema/02-config.ldif b/opendj-server-legacy/resource/schema/02-config.ldif
index 88d734d..7d9f1fe 100644
--- a/opendj-server-legacy/resource/schema/02-config.ldif
+++ b/opendj-server-legacy/resource/schema/02-config.ldif
@@ -4028,19 +4028,18 @@
MUST ( ds-cfg-backend-id $
ds-cfg-base-dn $
ds-cfg-java-class $
- ds-cfg-enabled $
- ds-cfg-writability-mode )
+ ds-cfg-enabled )
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.8
NAME 'ds-cfg-schema-backend'
- SUP ds-cfg-backend
+ SUP ds-cfg-local-backend
STRUCTURAL
MAY ( ds-cfg-schema-entry-dn $
ds-cfg-show-all-attributes )
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.9
NAME 'ds-cfg-task-backend'
- SUP ds-cfg-backend
+ SUP ds-cfg-local-backend
STRUCTURAL
MAY ( ds-cfg-task-backing-file $
ds-cfg-task-retention-time $
@@ -4693,7 +4692,7 @@
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.67
NAME 'ds-cfg-backup-backend'
- SUP ds-cfg-backend
+ SUP ds-cfg-local-backend
STRUCTURAL
MAY ds-cfg-backup-directory
X-ORIGIN 'OpenDS Directory Server' )
@@ -5199,12 +5198,12 @@
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.126
NAME 'ds-cfg-memory-backend'
- SUP ds-cfg-backend
+ SUP ds-cfg-local-backend
STRUCTURAL
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.127
NAME 'ds-cfg-monitor-backend'
- SUP ds-cfg-backend
+ SUP ds-cfg-local-backend
STRUCTURAL
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.128
@@ -5360,7 +5359,7 @@
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.158
NAME 'ds-cfg-config-file-handler-backend'
- SUP ds-cfg-backend
+ SUP ds-cfg-local-backend
STRUCTURAL
X-DEPRECATED-SINCE '3.5.0'
X-ORIGIN 'OpenDS Directory Server' )
@@ -5387,7 +5386,7 @@
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.161
NAME 'ds-cfg-trust-store-backend'
- SUP ds-cfg-backend
+ SUP ds-cfg-local-backend
STRUCTURAL
MAY ( ds-cfg-trust-store-type $
ds-cfg-trust-store-file $
@@ -5456,7 +5455,7 @@
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.172
NAME 'ds-cfg-ldif-backend'
- SUP ds-cfg-backend
+ SUP ds-cfg-local-backend
STRUCTURAL
MUST ds-cfg-ldif-file
MAY ds-cfg-is-private-backend
@@ -5608,7 +5607,7 @@
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.200
NAME 'ds-cfg-null-backend'
- SUP ds-cfg-backend
+ SUP ds-cfg-local-backend
STRUCTURAL
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.201
@@ -5837,7 +5836,7 @@
X-ORIGIN 'OpenDJ Directory Server' )
objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.22
NAME 'ds-cfg-pluggable-backend'
- SUP ds-cfg-backend
+ SUP ds-cfg-local-backend
STRUCTURAL
MAY ( ds-cfg-index-entry-limit $
ds-cfg-preload-time-limit $
@@ -6104,3 +6103,9 @@
ds-cfg-ignore-white-space $
ds-cfg-indexed-field )
X-ORIGIN 'OpenDJ Directory Server' )
+objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.54
+ NAME 'ds-cfg-local-backend'
+ SUP ds-cfg-backend
+ STRUCTURAL
+ MUST ( ds-cfg-writability-mode )
+ X-ORIGIN 'OpenDJ Directory Server' )
diff --git a/opendj-server-legacy/tests/unit-tests-testng/resource/config-changes.ldif b/opendj-server-legacy/tests/unit-tests-testng/resource/config-changes.ldif
index 5be305f..cbf7a86 100644
--- a/opendj-server-legacy/tests/unit-tests-testng/resource/config-changes.ldif
+++ b/opendj-server-legacy/tests/unit-tests-testng/resource/config-changes.ldif
@@ -435,6 +435,7 @@
changetype: add
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-pluggable-backend
objectClass: ds-cfg-je-backend
ds-cfg-enabled: false
@@ -454,6 +455,7 @@
changetype: add
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-pluggable-backend
objectClass: ds-cfg-je-backend
ds-cfg-enabled: true
@@ -812,6 +814,7 @@
changetype: add
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-pluggable-backend
objectClass: ds-cfg-je-backend
ds-cfg-enabled: false
@@ -983,6 +986,7 @@
changetype: add
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-pluggable-backend
objectClass: ds-cfg-je-backend
ds-cfg-enabled: false
@@ -1151,6 +1155,7 @@
changetype: add
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-pluggable-backend
objectClass: ds-cfg-je-backend
ds-cfg-enabled: false
@@ -1350,6 +1355,7 @@
changetype: add
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-pluggable-backend
objectClass: ds-cfg-je-backend
ds-cfg-enabled: false
@@ -1585,6 +1591,7 @@
changetype: add
objectClass: top
objectClass: ds-cfg-backend
+objectClass: ds-cfg-local-backend
objectClass: ds-cfg-ldif-backend
ds-cfg-backend-id: ldifRoot
ds-cfg-enabled: true
--
Gitblit v1.10.0