From f0dec3227a1ba5a1e15d8f34445aae8862f3ae91 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 10 Mar 2014 15:15:05 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support
---
opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml | 7 +-
opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml | 95 +++++--------------------------
opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml | 29 +++++++++
3 files changed, 49 insertions(+), 82 deletions(-)
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml b/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml
index c6c6ac6..f229d2d 100644
--- a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml
+++ b/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml
@@ -23,7 +23,7 @@
!
!
! Copyright 2007-2008 Sun Microsystems, Inc.
- ! Portions Copyright 2011 ForgeRock AS
+ ! Portions Copyright 2011-2014 ForgeRock AS
! -->
<adm:managed-object name="debug-target" plural-name="debug-targets"
package="org.forgerock.opendj.server.config"
@@ -37,7 +37,7 @@
Debug targets allow for fine-grain control of which messages are logged
based on the package, class, or method that generated the message. Each
debug target configuration entry resides below the entry with RDN of
- "cn=Debug Target" immediately below the parent ds-cfg-debug-log-publisher
+ "cn=Debug Target" immediately below the parent ds-cfg-debug-log-publisher
entry.
</adm:description>
<adm:tag name="logging" />
@@ -51,7 +51,7 @@
<adm:synopsis>
Specifies the fully-qualified <adm:product-name /> Java package, class, or method affected
by the settings in this target definition. Use the number
- character (#) to separate the class name and the method name
+ character (#) to separate the class name and the method name
(that is, org.opends.server.core.DirectoryServer#startUp).
</adm:synopsis>
<adm:syntax>
@@ -74,98 +74,37 @@
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="debug-level" mandatory="true">
+ <adm:property name="enabled" mandatory="true">
<adm:synopsis>
- Specifies the lowest severity level of debug messages to log.
+ Indicates whether the
+ <adm:user-friendly-name />
+ is enabled.
</adm:synopsis>
<adm:syntax>
- <adm:enumeration>
- <adm:value name="disabled">
- <adm:synopsis>No messages are logged.</adm:synopsis>
- </adm:value>
- <adm:value name="error">
- <adm:synopsis>
- Messages with severity level of ERROR or higher are
- logged.
- </adm:synopsis>
- </adm:value>
- <adm:value name="warning">
- <adm:synopsis>
- Messages with severity level of WARNING or higher are
- logged.
- </adm:synopsis>
- </adm:value>
- <adm:value name="info">
- <adm:synopsis>
- Messages with severity level of INFO or higher are
- logged.
- </adm:synopsis>
- </adm:value>
- <adm:value name="verbose">
- <adm:synopsis>
- Messages with severity level of VERBOSE or higher are
- logged.
- </adm:synopsis>
- </adm:value>
- <adm:value name="all">
- <adm:synopsis>
- Messages with any severity level are logged.
- </adm:synopsis>
- </adm:value>
- </adm:enumeration>
+ <adm:boolean />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:name>ds-cfg-debug-level</ldap:name>
+ <ldap:name>ds-cfg-enabled</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="debug-category" multi-valued="true">
+ <adm:property name="debug-exceptions-only">
<adm:synopsis>
- Specifies the debug message categories to be logged.
+ Indicates whether only logs with exception
+ should be logged.
</adm:synopsis>
<adm:default-behavior>
- <adm:alias>
- <adm:synopsis>
- Messages with any category are logged if they have a
- sufficient debug level.
- </adm:synopsis>
- </adm:alias>
+ <adm:defined>
+ <adm:value>false</adm:value>
+ </adm:defined>
</adm:default-behavior>
<adm:syntax>
- <adm:enumeration>
- <adm:value name="caught">
- <adm:synopsis>Exception caught</adm:synopsis>
- </adm:value>
- <adm:value name="constructor">
- <adm:synopsis>Constructor entry</adm:synopsis>
- </adm:value>
- <adm:value name="data">
- <adm:synopsis>Raw data dump</adm:synopsis>
- </adm:value>
- <adm:value name="database-access">
- <adm:synopsis>Access to a backend database.</adm:synopsis>
- </adm:value>
- <adm:value name="enter">
- <adm:synopsis>Method entry</adm:synopsis>
- </adm:value>
- <adm:value name="exit">
- <adm:synopsis>Method exit</adm:synopsis>
- </adm:value>
- <adm:value name="message">
- <adm:synopsis>Arbitrary debug message</adm:synopsis>
- </adm:value>
- <adm:value name="protocol">
- <adm:synopsis>Protocol element dump</adm:synopsis>
- </adm:value>
- <adm:value name="thrown">
- <adm:synopsis>Exception thrown from method</adm:synopsis>
- </adm:value>
- </adm:enumeration>
+ <adm:boolean />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:name>ds-cfg-debug-category</ldap:name>
+ <ldap:name>ds-cfg-debug-exceptions-only</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml b/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml
index ae490b7..1037a27 100644
--- a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml
+++ b/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml
@@ -23,6 +23,7 @@
!
!
! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Portions Copyright 2014 ForgeRock AS.
! -->
<adm:managed-object name="file-based-debug-log-publisher"
plural-name="file-based-debug-log-publishers"
@@ -43,7 +44,7 @@
<adm:default-behavior>
<adm:defined>
<adm:value>
- org.opends.server.loggers.debug.TextDebugLogPublisher
+ org.opends.server.loggers.TextDebugLogPublisher
</adm:value>
</adm:defined>
</adm:default-behavior>
@@ -139,7 +140,7 @@
</adm:property>
<adm:property name="time-interval" advanced="true">
<adm:synopsis>
- Specifies the interval at which to check whether the log files
+ Specifies the interval at which to check whether the log files
need to be rotated.
</adm:synopsis>
<adm:default-behavior>
@@ -252,7 +253,7 @@
<adm:default-behavior>
<adm:alias>
<adm:synopsis>
- No retention policy is used and log files are never
+ No retention policy is used and log files are never
cleaned.
</adm:synopsis>
</adm:alias>
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml b/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml
index fbe3a60..73d7b2b 100644
--- a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml
+++ b/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml
@@ -23,7 +23,7 @@
!
!
! Copyright 2007-2010 Sun Microsystems, Inc.
- ! Portions copyright 2011-2013 ForgeRock AS
+ ! Portions copyright 2011-2014 ForgeRock AS
! -->
<adm:managed-object name="replication-server"
plural-name="replication-servers"
@@ -327,4 +327,31 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+ <adm:property name="compute-change-number" mandatory="false">
+ <adm:synopsis>
+ Whether the replication server will compute change numbers.
+ </adm:synopsis>
+ <adm:description>
+ This boolean tells the replication server to compute change numbers for
+ each replicated change by maintaining a change number index database.
+ Changenumbers are computed according to
+ http://tools.ietf.org/html/draft-good-ldap-changelog-04.
+ Note this functionality has an impact on CPU, disk accesses and storage.
+ If changenumbers are not required, it is advisable to set this value to
+ false.
+ </adm:description>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>true</adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:boolean />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:name>ds-cfg-compute-change-number</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
</adm:managed-object>
--
Gitblit v1.10.0