From ec5d349ae0f1140eecfbcb7595936eadceb6abbe Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 23 Nov 2015 07:10:39 +0000
Subject: [PATCH] Set send-email-as-html parameter as optional, with default value of false.
---
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml | 2 +-
opendj-server-legacy/resource/schema/02-config.ldif | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml
index 2152d81..a7e353a 100644
--- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml
+++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml
@@ -146,7 +146,7 @@
</adm:profile>
</adm:property>
<adm:property name="send-email-as-html"
- mandatory="true" advanced="true">
+ mandatory="false" advanced="true">
<adm:synopsis>
Indicates whether an email notification message should be sent as HTML.
</adm:synopsis>
diff --git a/opendj-server-legacy/resource/schema/02-config.ldif b/opendj-server-legacy/resource/schema/02-config.ldif
index 8cd7ef4..867d159 100644
--- a/opendj-server-legacy/resource/schema/02-config.ldif
+++ b/opendj-server-legacy/resource/schema/02-config.ldif
@@ -5074,11 +5074,11 @@
STRUCTURAL
MUST ( ds-cfg-sender-address $
ds-cfg-send-message-without-end-user-address $
- ds-cfg-message-template-file $
- ds-cfg-send-email-as-html )
+ ds-cfg-message-template-file )
MAY ( ds-cfg-email-address-attribute-type $
ds-cfg-recipient-address $
- ds-cfg-message-subject )
+ ds-cfg-message-subject $
+ ds-cfg-send-email-as-html )
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.121
NAME 'ds-task-reset-generation-id'
--
Gitblit v1.10.0