From c93ee25db11a3a624fdc68c3e70f0c39ed0718a4 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Sun, 26 Aug 2007 00:14:04 +0000
Subject: [PATCH] Update configuration definitions to make a few different types of changes:
---
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FingerprintCertificateMapperConfiguration.xml | 8
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TimeLimitLogRotationPolicyConfiguration.xml | 43 +
opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java | 57 --
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml | 20
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml | 8
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SubjectDNToUserAttributeCertificateMapperConfiguration.xml | 7
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileCountLogRetentionPolicyConfiguration.xml | 31 +
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CertificateMapperConfiguration.xml | 12
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedAccessLogPublisherConfiguration.xml | 42 ++
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DseeCompatAccessControlHandlerConfiguration.xml | 14
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedErrorLogPublisherConfiguration.xml | 42 ++
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FixedTimeLogRotationPolicyConfiguration.xml | 31 +
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedDebugLogPublisherConfiguration.xml | 42 ++
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SizeLimitLogRotationPolicyConfiguration.xml | 31 +
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DirectoryStringAttributeSyntaxConfiguration.xml | 10
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FreeDiskSpaceLogRetentionPolicyConfiguration.xml | 31 +
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/PasswordPolicyConfiguration.xml | 21
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogPublisherConfiguration.xml | 39 +
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ExactMatchIdentityMapperConfiguration.xml | 7
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogRetentionPolicyConfiguration.xml | 43 +
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/PasswordModifyExtendedOperationHandlerConfiguration.xml | 9
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SizeLimitLogRetentionPolicyConfiguration.xml | 45 +
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java | 102 ----
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DebugTargetConfiguration.xml | 40 +
opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java | 69 ---
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CharacterSetPasswordValidatorConfiguration.xml | 2
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml | 34 +
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ConnectionHandlerConfiguration.xml | 14
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/GlobalConfiguration.xml | 6
opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 68 ---
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ExternalSASLMechanismHandlerConfiguration.xml | 12
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogRotationPolicyConfiguration.xml | 31 +
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml | 44 +
opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java | 52 --
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RegularExpressionIdentityMapperConfiguration.xml | 4
opendj-sdk/opends/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java | 58 --
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DictionaryPasswordValidatorConfiguration.xml | 2
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TelephoneNumberAttributeSyntaxConfiguration.xml | 10
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml | 50 ++
39 files changed, 748 insertions(+), 443 deletions(-)
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml
index 52efe9c..e16e5c3 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml
@@ -1,4 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+! CDDL HEADER START
+!
+! The contents of this file are subject to the terms of the
+! Common Development and Distribution License, Version 1.0 only
+! (the "License"). You may not use this file except in compliance
+! with the License.
+!
+! You can obtain a copy of the license at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+! See the License for the specific language governing permissions
+! and limitations under the License.
+!
+! When distributing Covered Code, include this CDDL HEADER in each
+! file and include the License file at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+! add the following below this CDDL HEADER, with the fields enclosed
+! by brackets "[]" replaced with your own identifying information:
+! Portions Copyright [yyyy] [name of copyright owner]
+!
+! CDDL HEADER END
+!
+!
+! Portions Copyright 2007 Sun Microsystems, Inc.
+! -->
+
<adm:managed-object name="access-log-publisher"
plural-name="access-log-publishers"
package="org.opends.server.admin.std"
@@ -6,11 +33,13 @@
abstract="true"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name />
are reponsible for distributing access log messages from the access logger
to a destination.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.23</ldap:oid>
@@ -18,6 +47,7 @@
<ldap:superior>ds-cfg-logger</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property name="java-implementation-class" mandatory="true">
<adm:synopsis>
The fully-qualified name of the Java class that provides the
@@ -38,10 +68,11 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="suppress-internal-operations">
<adm:synopsis>
Omit access messages generated by internal operations.
- Except for Synchronization operations that are controlled
+ Except for Synchronization operations that are controlled
by the ds-cfg-suppress-synchronization-operations property.
</adm:synopsis>
<adm:default-behavior>
@@ -61,6 +92,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="suppress-synchronization-operations">
<adm:synopsis>
Omit access messages generated by synchronization operations.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
index 1d98303..8118f0d 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
@@ -45,14 +45,24 @@
</ldap:object-class>
</adm:profile>
+ <adm:property-override name="syntax-class">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ org.opends.server.schema.AttributeTypeSyntax
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
<adm:property name="strip-syntax-minimum-upper-bound" mandatory="false">
<adm:synopsis>
Indicate whether the suggested minimum upper bound appended
- to an attribute's syntax OID in it's schema definition Attribute Type
- Description is stripped off. When retrieving the server's schema, some APIs
- (JNDI) fail in their syntax lookup methods because they don't parse this value
- correctly. This configuration option allows the server to be configured to
- provide schema definitions these APIs can parse correctly.
+ to an attribute's syntax OID in it's schema definition Attribute Type
+ Description is stripped off. When retrieving the server's schema, some APIs
+ (JNDI) fail in their syntax lookup methods because they don't parse this value
+ correctly. This configuration option allows the server to be configured to
+ provide schema definitions these APIs can parse correctly.
</adm:synopsis>
<adm:default-behavior>
<adm:defined>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CertificateMapperConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CertificateMapperConfiguration.xml
index 8d2316d..616f8b8 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CertificateMapperConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CertificateMapperConfiguration.xml
@@ -30,14 +30,17 @@
package="org.opends.server.admin.std"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name />
are responsible for establishing a mapping between a client
certificate and the entry for the user that corresponds to that
certificate.
</adm:synopsis>
+
<adm:tag name="security"/>
<adm:tag name="user-management"/>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.12</ldap:oid>
@@ -45,6 +48,7 @@
<ldap:superior>top</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property name="enabled" mandatory="true">
<adm:synopsis>
Indicate whether the
@@ -61,19 +65,13 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="mapper-class" mandatory="true">
<adm:synopsis>
The fully-qualified name of the Java class that provides the
<adm:user-friendly-name />
implementation.
</adm:synopsis>
- <adm:default-behavior>
- <adm:defined>
- <adm:value>
- org.opends.server.extensions.SubjectEqualsDNCertificateMapper
- </adm:value>
- </adm:defined>
- </adm:default-behavior>
<adm:syntax>
<adm:java-class>
<adm:instance-of>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CharacterSetPasswordValidatorConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CharacterSetPasswordValidatorConfiguration.xml
index e56b4cb..d397af5 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CharacterSetPasswordValidatorConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CharacterSetPasswordValidatorConfiguration.xml
@@ -46,7 +46,7 @@
<ldap:superior>ds-cfg-password-validator</ldap:superior>
</ldap:object-class>
</adm:profile>
-
+
<adm:property-override name="validator-class">
<adm:default-behavior>
<adm:defined>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ConnectionHandlerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ConnectionHandlerConfiguration.xml
index a535505..fca0c80 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ConnectionHandlerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ConnectionHandlerConfiguration.xml
@@ -31,13 +31,16 @@
package="org.opends.server.admin.std" abstract="true"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name />
are responsible for handling all interaction with the clients,
including accepting the connections, reading requests, and sending
responses.
</adm:synopsis>
+
<adm:tag name="core"/>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.13</ldap:oid>
@@ -45,6 +48,7 @@
<ldap:superior>top</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property name="enabled" mandatory="true">
<adm:synopsis>
Indicate whether the
@@ -61,6 +65,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="java-implementation-class" mandatory="true" advanced="true">
<adm:synopsis>
The fully-qualified name of the Java class that provides the
@@ -81,6 +86,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="allowed-clients" multi-valued="true">
<adm:synopsis>
This property specifies a set of address masks that may be used to
@@ -96,7 +102,8 @@
<adm:alias>
<adm:synopsis>
All clients with addresses that do not match an address on the
- deny list will be allowed.
+ deny list will be allowed. If there is no deny list, then all clients
+ will be allowed.
</adm:synopsis>
</adm:alias>
</adm:default-behavior>
@@ -110,6 +117,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="denied-clients" multi-valued="true">
<adm:synopsis>
This property specifies a set of address masks that may be used to
@@ -128,8 +136,8 @@
<adm:default-behavior>
<adm:alias>
<adm:synopsis>
- All clients with addresses that do match an address on the
- allow list will be allowed.
+ If an allow list is specified, then only clients with addresses on the
+ allow list will be allowed. Otherwise, all clients will be allowed.
</adm:synopsis>
</adm:alias>
</adm:default-behavior>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml
index 32b92a8..3a3dcf2 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml
@@ -1,15 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Portions Copyright 2007 Sun Microsystems, Inc.
+ ! -->
+
<adm:managed-object name="debug-log-publisher"
- plural-name="debug-log-publishers"
- package="org.opends.server.admin.std" extends="log-publisher"
- abstract="true" xmlns:adm="http://www.opends.org/admin"
- xmlns:ldap="http://www.opends.org/admin-ldap"
- xmlns:cli="http://www.opends.org/admin-cli">
+plural-name="debug-log-publishers"
+package="org.opends.server.admin.std" extends="log-publisher"
+abstract="true" xmlns:adm="http://www.opends.org/admin"
+xmlns:ldap="http://www.opends.org/admin-ldap"
+xmlns:cli="http://www.opends.org/admin-cli">
+
<adm:synopsis>
<adm:user-friendly-plural-name />
are responsible for distributing debug log messages from the debug
logger to a destination.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.25</ldap:oid>
@@ -17,6 +46,7 @@
<ldap:superior>ds-cfg-logger</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:relation name="debug-target">
<adm:one-to-many naming-property="debug-scope"/>
<adm:profile name="ldap">
@@ -29,6 +59,7 @@
</cli:relation>
</adm:profile>
</adm:relation>
+
<adm:property name="java-implementation-class" mandatory="true">
<adm:synopsis>
The fully-qualified name of the Java class that provides the
@@ -49,6 +80,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="default-debug-level" mandatory="true">
<adm:synopsis>
The lowest severity level of debug messages to log when none of
@@ -97,6 +129,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="default-debug-category" multi-valued="true">
<adm:synopsis>
The debug message categories to be logged when none of the
@@ -105,7 +138,8 @@
<adm:default-behavior>
<adm:alias>
<adm:synopsis>
- Messages with any category will be logged.
+ Messages with any category will be logged if they have a sufficient
+ debug level.
</adm:synopsis>
</adm:alias>
</adm:default-behavior>
@@ -147,6 +181,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="default-omit-method-entry-arguments">
<adm:synopsis>
Property to indicate whether to include method arguments in debug
@@ -169,6 +204,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="default-omit-method-return-value">
<adm:synopsis>
Property to indicate whether to include the return value in debug
@@ -189,6 +225,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="default-include-throwable-cause">
<adm:synopsis>
Property to indicate whether to include the cause of exceptions in
@@ -209,6 +246,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="default-throwable-stack-frames">
<adm:synopsis>
Property to indicate the number of stack frames to include in the
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DebugTargetConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DebugTargetConfiguration.xml
index 9a7d94d..5486bb6 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DebugTargetConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DebugTargetConfiguration.xml
@@ -1,14 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+! CDDL HEADER START
+!
+! The contents of this file are subject to the terms of the
+! Common Development and Distribution License, Version 1.0 only
+! (the "License"). You may not use this file except in compliance
+! with the License.
+!
+! You can obtain a copy of the license at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+! See the License for the specific language governing permissions
+! and limitations under the License.
+!
+! When distributing Covered Code, include this CDDL HEADER in each
+! file and include the License file at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+! add the following below this CDDL HEADER, with the fields enclosed
+! by brackets "[]" replaced with your own identifying information:
+! Portions Copyright [yyyy] [name of copyright owner]
+!
+! CDDL HEADER END
+!
+!
+! Portions Copyright 2007 Sun Microsystems, Inc.
+! -->
+
<adm:managed-object name="debug-target"
plural-name="debug-targets"
package="org.opends.server.admin.std"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name />
define the types of messages logged by the debug logPublisher.
</adm:synopsis>
+
<adm:tag name="logging"/>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.101</ldap:oid>
@@ -16,6 +46,7 @@
<ldap:superior>top</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property name="debug-scope" mandatory="true" read-only="true">
<adm:synopsis>
The fully-qualified OpenDS Java package, class, or method affected by
@@ -47,6 +78,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="debug-level" mandatory="true">
<adm:synopsis>
The lowest severity level of debug messages to log.
@@ -92,6 +124,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="debug-category" multi-valued="true">
<adm:synopsis>
The debug message categories to be logged.
@@ -99,7 +132,8 @@
<adm:default-behavior>
<adm:alias>
<adm:synopsis>
- Messages with any category will be logged.
+ Messages with any category will be logged if they have a sufficient
+ debug level.
</adm:synopsis>
</adm:alias>
</adm:default-behavior>
@@ -159,6 +193,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="omit-method-entry-arguments">
<adm:synopsis>
Property to indicate whether to include method arguments in debug
@@ -181,6 +216,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="omit-method-return-value">
<adm:synopsis>
Property to indicate whether to include the return value in debug
@@ -203,6 +239,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="include-throwable-cause">
<adm:synopsis>
Property to indicate whether to include the cause of exceptions in
@@ -225,6 +262,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="throwable-stack-frames">
<adm:synopsis>
Property to indicate the number of stack frames to include in the stack
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DictionaryPasswordValidatorConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DictionaryPasswordValidatorConfiguration.xml
index 60173ac..f67f888 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DictionaryPasswordValidatorConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DictionaryPasswordValidatorConfiguration.xml
@@ -44,7 +44,7 @@
<ldap:superior>ds-cfg-password-validator</ldap:superior>
</ldap:object-class>
</adm:profile>
-
+
<adm:property-override name="validator-class">
<adm:default-behavior>
<adm:defined>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DirectoryStringAttributeSyntaxConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DirectoryStringAttributeSyntaxConfiguration.xml
index 3cf730b..ed78a59 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DirectoryStringAttributeSyntaxConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DirectoryStringAttributeSyntaxConfiguration.xml
@@ -46,6 +46,16 @@
</ldap:object-class>
</adm:profile>
+ <adm:property-override name="syntax-class">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ org.opends.server.schema.DirectoryStringSyntax
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
<adm:property name="allow-zero-length-values" mandatory="false">
<adm:synopsis>
Indicate whether zero-length (i.e., empty string) values will be allowed.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DseeCompatAccessControlHandlerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DseeCompatAccessControlHandlerConfiguration.xml
index f542fe0..43d0183 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DseeCompatAccessControlHandlerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/DseeCompatAccessControlHandlerConfiguration.xml
@@ -31,11 +31,13 @@
package="org.opends.server.admin.std" extends="access-control-handler"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
The
<adm:user-friendly-name />
is the provider class for the dseecompt ACI.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.87</ldap:oid>
@@ -43,6 +45,7 @@
<ldap:superior>ds-cfg-access-control-handler</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="acl-handler-class">
<adm:default-behavior>
<adm:defined>
@@ -52,19 +55,22 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="global-aci" mandatory="false"
multi-valued="true">
<adm:synopsis>
+ Defines a global access control rule, which will always be interpreted for
+ any entry anywhere in the server (although it may be overridden by more
+ specific access control rules placed in the data).
</adm:synopsis>
<adm:description>
</adm:description>
<adm:default-behavior>
<adm:alias>
<adm:synopsis>
- Defines a global access control rule, which will always be
- interpreted for any entry anywhere in the server (although it
- may be overridden by more specific access control rules placed
- in the data).
+ No global ACIs will be defined, which means that no access will be
+ allowed for any data in the server unless granted by access control
+ rules in the user data.
</adm:synopsis>
</adm:alias>
</adm:default-behavior>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
index 067875c..5b5ca39 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
@@ -1,16 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Portions Copyright 2007 Sun Microsystems, Inc.
+ ! -->
+
<adm:managed-object name="error-log-publisher"
- plural-name="error-log-publishers"
- package="org.opends.server.admin.std"
- extends="log-publisher"
- abstract="true"
- xmlns:adm="http://www.opends.org/admin"
- xmlns:ldap="http://www.opends.org/admin-ldap">
+plural-name="error-log-publishers"
+package="org.opends.server.admin.std"
+extends="log-publisher"
+abstract="true"
+xmlns:adm="http://www.opends.org/admin"
+xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name />
are reponsible for distributing error log messages from the error logger to
a destination.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.24</ldap:oid>
@@ -18,6 +47,7 @@
<ldap:superior>ds-cfg-logger</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property name="java-implementation-class" mandatory="true">
<adm:synopsis>
The fully-qualified name of the Java class that provides the
@@ -38,6 +68,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="default-severity" multi-valued="true">
<adm:synopsis>
Property to specify the default severity levels for the logger.
@@ -125,6 +156,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="override-severity" multi-valued="true">
<adm:synopsis>
Property to specify the override severity levels for the logger
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ExactMatchIdentityMapperConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ExactMatchIdentityMapperConfiguration.xml
index bef9871..d81feb7 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ExactMatchIdentityMapperConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ExactMatchIdentityMapperConfiguration.xml
@@ -31,12 +31,14 @@
package="org.opends.server.admin.std" extends="identity-mapper"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
The
<adm:user-friendly-name />
maps an identifier string to user entries by searching for the entry
containing a specified attribute whose value is the provided identifer.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.45</ldap:oid>
@@ -44,6 +46,7 @@
<ldap:superior>ds-cfg-identity-mapper</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="mapper-class">
<adm:default-behavior>
<adm:defined>
@@ -53,6 +56,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="match-attribute" mandatory="true" multi-valued="true">
<adm:synopsis>
Specifies the attribute to use to perform the mapping.
@@ -67,7 +71,7 @@
entry.
</adm:description>
<adm:syntax>
- <adm:string />
+ <adm:attribute-type />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -76,6 +80,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="match-base-dn" mandatory="false" multi-valued="true">
<adm:synopsis>
Specifies the set of base DNs below which to search for users.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ExternalSASLMechanismHandlerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ExternalSASLMechanismHandlerConfiguration.xml
index 7bcaff9..1e52dd9 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ExternalSASLMechanismHandlerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/ExternalSASLMechanismHandlerConfiguration.xml
@@ -26,16 +26,18 @@
! Portions Copyright 2007 Sun Microsystems, Inc.
! -->
-<adm:managed-object name="external-sasl-mechanism-handler"
+<adm:managed-object name="external-sasl-mechanism-handler"
plural-name="external-sasl-mechanism-handlers"
package="org.opends.server.admin.std" extends="sasl-mechanism-handler"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
The
<adm:user-friendly-name />
is used to perform all processing related to SASL EXTERNAL authentication.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.44</ldap:oid>
@@ -43,6 +45,7 @@
<ldap:superior>ds-cfg-sasl-mechanism-handler</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="handler-class">
<adm:default-behavior>
<adm:defined>
@@ -52,6 +55,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="certificate-validation-policy" mandatory="true">
<adm:synopsis>
Indicates whether to attempt to validate the peer certificate against a
@@ -97,13 +101,14 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="certificate-attribute" mandatory="false">
<adm:synopsis>
Specifies the attribute that should hold user certificates.
</adm:synopsis>
<adm:description>
Specifies the name of the attribute that will be used to hold the
- certificate information in user entries for the purpose of validation.
+ certificate information in user entries for the purpose of validation.
This must specify the name of a valid attribute type defined in the
server schema. Changes to this configuration attribute will take effect
immediately.
@@ -114,7 +119,7 @@
</adm:defined>
</adm:default-behavior>
<adm:syntax>
- <adm:string />
+ <adm:attribute-type />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -123,6 +128,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="certificate-mapper-dn" mandatory="true">
<adm:synopsis>
Specifies the DN of the certificate mapper to use.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedAccessLogPublisherConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedAccessLogPublisherConfiguration.xml
index f3c8b69..6eaa7bc 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedAccessLogPublisherConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedAccessLogPublisherConfiguration.xml
@@ -1,13 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+! CDDL HEADER START
+!
+! The contents of this file are subject to the terms of the
+! Common Development and Distribution License, Version 1.0 only
+! (the "License"). You may not use this file except in compliance
+! with the License.
+!
+! You can obtain a copy of the license at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+! See the License for the specific language governing permissions
+! and limitations under the License.
+!
+! When distributing Covered Code, include this CDDL HEADER in each
+! file and include the License file at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+! add the following below this CDDL HEADER, with the fields enclosed
+! by brackets "[]" replaced with your own identifying information:
+! Portions Copyright [yyyy] [name of copyright owner]
+!
+! CDDL HEADER END
+!
+!
+! Portions Copyright 2007 Sun Microsystems, Inc.
+! -->
+
<adm:managed-object name="file-based-access-log-publisher"
plural-name="file-based-access-log-publishers"
package="org.opends.server.admin.std" extends="access-log-publisher"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name />
publish access messages to the file system.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.26</ldap:oid>
@@ -15,6 +44,7 @@
<ldap:superior>ds-cfg-access-logger</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="java-implementation-class">
<adm:default-behavior>
<adm:defined>
@@ -24,6 +54,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="asynchronous" mandatory="true">
<adm:synopsis>
Indicate whether the
@@ -40,6 +71,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="queue-size">
<adm:synopsis>
The maximum number of log records that can be stored in the
@@ -53,7 +85,7 @@
</adm:defined>
</adm:default-behavior>
<adm:syntax>
- <adm:integer />
+ <adm:integer lower-limit="1" />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -62,6 +94,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="log-file" mandatory="true">
<adm:synopsis>
The file name to use for the log files generated by the
@@ -78,6 +111,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="log-file-mode" mandatory="true">
<adm:synopsis>
The UNIX permissions of the log files created by this
@@ -104,6 +138,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="time-interval">
<adm:synopsis>
This property specifies the interval to check whether
@@ -126,6 +161,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="buffer-size">
<adm:synopsis>
This property specifies the log file buffer size.
@@ -147,6 +183,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="auto-flush">
<adm:synopsis>
This property specifies whether to flush the writer after every log
@@ -170,6 +207,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="append">
<adm:synopsis>
This property specifies whether to append to existing log files.
@@ -191,6 +229,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="rotation-policy-dn" multi-valued="true">
<adm:synopsis>
The retention policy to use for the <adm:user-friendly-name />. When
@@ -218,6 +257,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="retention-policy-dn" multi-valued="true">
<adm:synopsis>
The retention policy to use for the <adm:user-friendly-name />. When
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedDebugLogPublisherConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedDebugLogPublisherConfiguration.xml
index 6241e86..c793d74 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedDebugLogPublisherConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedDebugLogPublisherConfiguration.xml
@@ -1,13 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+! CDDL HEADER START
+!
+! The contents of this file are subject to the terms of the
+! Common Development and Distribution License, Version 1.0 only
+! (the "License"). You may not use this file except in compliance
+! with the License.
+!
+! You can obtain a copy of the license at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+! See the License for the specific language governing permissions
+! and limitations under the License.
+!
+! When distributing Covered Code, include this CDDL HEADER in each
+! file and include the License file at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+! add the following below this CDDL HEADER, with the fields enclosed
+! by brackets "[]" replaced with your own identifying information:
+! Portions Copyright [yyyy] [name of copyright owner]
+!
+! CDDL HEADER END
+!
+!
+! Portions Copyright 2007 Sun Microsystems, Inc.
+! -->
+
<adm:managed-object name="file-based-debug-log-publisher"
plural-name="file-based-debug-log-publishers"
package="org.opends.server.admin.std" extends="debug-log-publisher"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name />
publish debug messages to the file system.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.27</ldap:oid>
@@ -15,6 +44,7 @@
<ldap:superior>ds-cfg-debug-logger</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="java-implementation-class">
<adm:default-behavior>
<adm:defined>
@@ -24,6 +54,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="asynchronous" mandatory="true">
<adm:synopsis>
Indicate whether the
@@ -40,6 +71,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="queue-size">
<adm:synopsis>
The maximum number of log records that can be stored in the
@@ -53,7 +85,7 @@
</adm:defined>
</adm:default-behavior>
<adm:syntax>
- <adm:integer />
+ <adm:integer lower-limit="1" />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -62,6 +94,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="log-file" mandatory="true">
<adm:synopsis>
The file name to use for the log files generated by the
@@ -78,6 +111,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="log-file-mode" mandatory="true">
<adm:synopsis>
The UNIX permissions of the log files created by this
@@ -104,6 +138,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="time-interval">
<adm:synopsis>
This property specifies the interval to check whether
@@ -126,6 +161,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="buffer-size">
<adm:synopsis>
This property specifies the log file buffer size.
@@ -147,6 +183,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="auto-flush">
<adm:synopsis>
This property specifies whether to flush the writer after every log
@@ -170,6 +207,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="append">
<adm:synopsis>
This property specifies whether to append to existing log files.
@@ -191,6 +229,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="rotation-policy-dn" multi-valued="true">
<adm:synopsis>
The retention policy to use for the <adm:user-friendly-name />. When
@@ -218,6 +257,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="retention-policy-dn" multi-valued="true">
<adm:synopsis>
The retention policy to use for the <adm:user-friendly-name />. When
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedErrorLogPublisherConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedErrorLogPublisherConfiguration.xml
index c0aed67..2c83e1b 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedErrorLogPublisherConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileBasedErrorLogPublisherConfiguration.xml
@@ -1,13 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+! CDDL HEADER START
+!
+! The contents of this file are subject to the terms of the
+! Common Development and Distribution License, Version 1.0 only
+! (the "License"). You may not use this file except in compliance
+! with the License.
+!
+! You can obtain a copy of the license at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+! See the License for the specific language governing permissions
+! and limitations under the License.
+!
+! When distributing Covered Code, include this CDDL HEADER in each
+! file and include the License file at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+! add the following below this CDDL HEADER, with the fields enclosed
+! by brackets "[]" replaced with your own identifying information:
+! Portions Copyright [yyyy] [name of copyright owner]
+!
+! CDDL HEADER END
+!
+!
+! Portions Copyright 2007 Sun Microsystems, Inc.
+! -->
+
<adm:managed-object name="file-based-error-log-publisher"
plural-name="file-based-error-log-publishers"
package="org.opends.server.admin.std" extends="error-log-publisher"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name />
publish error messages to the file system.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.28</ldap:oid>
@@ -15,6 +44,7 @@
<ldap:superior>ds-cfg-error-logger</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="java-implementation-class">
<adm:default-behavior>
<adm:defined>
@@ -24,6 +54,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="asynchronous" mandatory="true">
<adm:synopsis>
Indicate whether the
@@ -40,6 +71,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="queue-size">
<adm:synopsis>
The maximum number of log records that can be stored in the
@@ -53,7 +85,7 @@
</adm:defined>
</adm:default-behavior>
<adm:syntax>
- <adm:integer />
+ <adm:integer lower-limit="1" />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -62,6 +94,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="log-file" mandatory="true">
<adm:synopsis>
The file name to use for the log files generated by the
@@ -78,6 +111,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="log-file-mode" mandatory="true">
<adm:synopsis>
The UNIX permissions of the log files created by this
@@ -104,6 +138,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="time-interval">
<adm:synopsis>
This property specifies the interval to check whether
@@ -126,6 +161,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="buffer-size">
<adm:synopsis>
This property specifies the log file buffer size.
@@ -147,6 +183,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="auto-flush">
<adm:synopsis>
This property specifies whether to flush the writer after every log
@@ -170,6 +207,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="append">
<adm:synopsis>
This property specifies whether to append to existing log files.
@@ -191,6 +229,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="rotation-policy-dn" multi-valued="true">
<adm:synopsis>
The retention policy to use for the <adm:user-friendly-name />. When
@@ -218,6 +257,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="retention-policy-dn" multi-valued="true">
<adm:synopsis>
The retention policy to use for the <adm:user-friendly-name />. When
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileCountLogRetentionPolicyConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileCountLogRetentionPolicyConfiguration.xml
index 0fb2dc8..28d9ea7 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileCountLogRetentionPolicyConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FileCountLogRetentionPolicyConfiguration.xml
@@ -1,4 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+! CDDL HEADER START
+!
+! The contents of this file are subject to the terms of the
+! Common Development and Distribution License, Version 1.0 only
+! (the "License"). You may not use this file except in compliance
+! with the License.
+!
+! You can obtain a copy of the license at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+! See the License for the specific language governing permissions
+! and limitations under the License.
+!
+! When distributing Covered Code, include this CDDL HEADER in each
+! file and include the License file at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+! add the following below this CDDL HEADER, with the fields enclosed
+! by brackets "[]" replaced with your own identifying information:
+! Portions Copyright [yyyy] [name of copyright owner]
+!
+! CDDL HEADER END
+!
+!
+! Portions Copyright 2007 Sun Microsystems, Inc.
+! -->
+
<adm:managed-object
name="file-count-log-retention-policy"
plural-name="file-count-log-retention-policies"
@@ -6,9 +33,11 @@
extends="log-retention-policy"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
Retention policy based on the number of rotated log files on disk.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.103</ldap:oid>
@@ -16,6 +45,7 @@
<ldap:superior>ds-cfg-log-retention-policy</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="java-implementation-class">
<adm:default-behavior>
<adm:defined>
@@ -25,6 +55,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="number-of-files" mandatory="true">
<adm:synopsis>
Number of log files to retain before the oldest ones will be cleaned.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FingerprintCertificateMapperConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FingerprintCertificateMapperConfiguration.xml
index c3cc5d2..a852f02 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FingerprintCertificateMapperConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FingerprintCertificateMapperConfiguration.xml
@@ -31,12 +31,14 @@
package="org.opends.server.admin.std" extends="certificate-mapper"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
The
<adm:user-friendly-name />
maps client certificates to user entries by looking for the MD5 or SHA1
fingerprint in a specified attribute of user entries.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.86</ldap:oid>
@@ -44,6 +46,7 @@
<ldap:superior>ds-cfg-certificate-mapper</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="mapper-class">
<adm:default-behavior>
<adm:defined>
@@ -53,6 +56,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="fingerprint-attribute" mandatory="true">
<adm:synopsis>
Specifies the attribute in which to look for the fingerprint.
@@ -62,7 +66,7 @@
match the MD5 or SHA1 representation of the certificate fingerprint.
</adm:description>
<adm:syntax>
- <adm:string />
+ <adm:attribute-type />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -71,6 +75,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="fingerprint-algorithm" mandatory="true">
<adm:synopsis>
Specifies the certificate fingerprint algorithm.
@@ -101,6 +106,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="user-base-dn" mandatory="false" multi-valued="true">
<adm:synopsis>
Specifies the set of base DNs below which to search for users.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FixedTimeLogRotationPolicyConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FixedTimeLogRotationPolicyConfiguration.xml
index c18ffc3..f4bbbe1 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FixedTimeLogRotationPolicyConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FixedTimeLogRotationPolicyConfiguration.xml
@@ -1,4 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+! CDDL HEADER START
+!
+! The contents of this file are subject to the terms of the
+! Common Development and Distribution License, Version 1.0 only
+! (the "License"). You may not use this file except in compliance
+! with the License.
+!
+! You can obtain a copy of the license at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+! See the License for the specific language governing permissions
+! and limitations under the License.
+!
+! When distributing Covered Code, include this CDDL HEADER in each
+! file and include the License file at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+! add the following below this CDDL HEADER, with the fields enclosed
+! by brackets "[]" replaced with your own identifying information:
+! Portions Copyright [yyyy] [name of copyright owner]
+!
+! CDDL HEADER END
+!
+!
+! Portions Copyright 2007 Sun Microsystems, Inc.
+! -->
+
<adm:managed-object
name="fixed-time-log-rotation-policy"
plural-name="fixed-time-log-rotation-policies"
@@ -6,9 +33,11 @@
extends="log-rotation-policy"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
Rotation policy based on fixed time of day.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.109</ldap:oid>
@@ -16,6 +45,7 @@
<ldap:superior>ds-cfg-log-rotation-policy</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="java-implementation-class">
<adm:default-behavior>
<adm:defined>
@@ -25,6 +55,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="time-of-day" multi-valued="true" mandatory="true">
<adm:synopsis>
The time of day which log rotation should occur.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FreeDiskSpaceLogRetentionPolicyConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
index 3efd51b..afd8515 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
@@ -1,4 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+! CDDL HEADER START
+!
+! The contents of this file are subject to the terms of the
+! Common Development and Distribution License, Version 1.0 only
+! (the "License"). You may not use this file except in compliance
+! with the License.
+!
+! You can obtain a copy of the license at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+! See the License for the specific language governing permissions
+! and limitations under the License.
+!
+! When distributing Covered Code, include this CDDL HEADER in each
+! file and include the License file at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+! add the following below this CDDL HEADER, with the fields enclosed
+! by brackets "[]" replaced with your own identifying information:
+! Portions Copyright [yyyy] [name of copyright owner]
+!
+! CDDL HEADER END
+!
+!
+! Portions Copyright 2007 Sun Microsystems, Inc.
+! -->
+
<adm:managed-object
name="free-disk-space-log-retention-policy"
plural-name="free-disk-space-log-retention-policies"
@@ -6,10 +33,12 @@
extends="log-retention-policy"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
Retention policy based on the free disk space available.
This policy is only available on Java 6.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.105</ldap:oid>
@@ -17,6 +46,7 @@
<ldap:superior>ds-cfg-log-retention-policy</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="java-implementation-class">
<adm:default-behavior>
<adm:defined>
@@ -26,6 +56,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="free-disk-space" mandatory="true">
<adm:synopsis>
The size of free disk space needed.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/GlobalConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/GlobalConfiguration.xml
index a177cf7..0949ecb 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/GlobalConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/GlobalConfiguration.xml
@@ -30,13 +30,13 @@
package="org.opends.server.admin.std"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
-
+
<adm:user-friendly-name>Global Configuration</adm:user-friendly-name>
-
+
<adm:user-friendly-plural-name>
Global Configurations
</adm:user-friendly-plural-name>
-
+
<adm:synopsis>
The global configuration contains properties that affect the overall
operation of the
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml
index cd53869..bfb781a 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LDAPConnectionHandlerConfiguration.xml
@@ -30,12 +30,14 @@
package="org.opends.server.admin.std" extends="connection-handler"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
The
<adm:user-friendly-name />
is used to interact with clients using LDAP. In particular, it
provides full support for LDAPv3 and limited support for LDAPv2.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.14</ldap:oid>
@@ -290,7 +292,7 @@
</adm:description>
<adm:default-behavior>
<adm:defined>
- <adm:value>5mib</adm:value>
+ <adm:value>5 megabytes</adm:value>
</adm:defined>
</adm:default-behavior>
<adm:syntax>
@@ -324,7 +326,7 @@
</adm:requires-admin-action>
<adm:default-behavior>
<adm:defined>
- <adm:value>1</adm:value>
+ <adm:value>2</adm:value>
</adm:defined>
</adm:default-behavior>
<adm:syntax>
@@ -354,7 +356,7 @@
</adm:description>
<adm:default-behavior>
<adm:defined>
- <adm:value>true</adm:value>
+ <adm:value>false</adm:value>
</adm:defined>
</adm:default-behavior>
<adm:syntax>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogPublisherConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogPublisherConfiguration.xml
index 50dd4ba..1db1fb2 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogPublisherConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogPublisherConfiguration.xml
@@ -1,15 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Portions Copyright 2007 Sun Microsystems, Inc.
+ ! -->
+
<adm:managed-object name="log-publisher"
- plural-name="log-publishers"
- package="org.opends.server.admin.std" abstract="true"
- xmlns:adm="http://www.opends.org/admin"
- xmlns:ldap="http://www.opends.org/admin-ldap">
+plural-name="log-publishers"
+package="org.opends.server.admin.std" abstract="true"
+xmlns:adm="http://www.opends.org/admin"
+xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name />
are reponsible for distributing log messages from different loggers to
a destination.
</adm:synopsis>
+
<adm:tag name="logging"/>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.22</ldap:oid>
@@ -17,6 +47,7 @@
<ldap:superior>top</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property name="enabled" mandatory="true">
<adm:synopsis>
Indicate whether the
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogRetentionPolicyConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogRetentionPolicyConfiguration.xml
index 0ff664a..6af3b37 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogRetentionPolicyConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogRetentionPolicyConfiguration.xml
@@ -1,16 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Portions Copyright 2007 Sun Microsystems, Inc.
+ ! -->
+
<adm:managed-object
- name="log-retention-policy"
- plural-name="log-retention-policies"
- package="org.opends.server.admin.std"
- abstract="true"
- xmlns:adm="http://www.opends.org/admin"
- xmlns:ldap="http://www.opends.org/admin-ldap">
+name="log-retention-policy"
+plural-name="log-retention-policies"
+package="org.opends.server.admin.std"
+abstract="true"
+xmlns:adm="http://www.opends.org/admin"
+xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name /> are used to specify when log files should
be cleaned.
</adm:synopsis>
+
<adm:tag name="logging"/>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.102</ldap:oid>
@@ -18,6 +48,7 @@
<ldap:superior>top</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property name="java-implementation-class" mandatory="true">
<adm:synopsis>
The fully-qualified name of the Java class that provides the
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogRotationPolicyConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogRotationPolicyConfiguration.xml
index 058eb8f..b92ebe8 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogRotationPolicyConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/LogRotationPolicyConfiguration.xml
@@ -1,4 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+! CDDL HEADER START
+!
+! The contents of this file are subject to the terms of the
+! Common Development and Distribution License, Version 1.0 only
+! (the "License"). You may not use this file except in compliance
+! with the License.
+!
+! You can obtain a copy of the license at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+! See the License for the specific language governing permissions
+! and limitations under the License.
+!
+! When distributing Covered Code, include this CDDL HEADER in each
+! file and include the License file at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+! add the following below this CDDL HEADER, with the fields enclosed
+! by brackets "[]" replaced with your own identifying information:
+! Portions Copyright [yyyy] [name of copyright owner]
+!
+! CDDL HEADER END
+!
+!
+! Portions Copyright 2007 Sun Microsystems, Inc.
+! -->
+
<adm:managed-object
name="log-rotation-policy"
plural-name="log-rotation-policies"
@@ -6,11 +33,14 @@
abstract="true"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
<adm:user-friendly-plural-name /> are used to specify when log files should
be rotated.
</adm:synopsis>
+
<adm:tag name="logging"/>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.106</ldap:oid>
@@ -18,6 +48,7 @@
<ldap:superior>top</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property name="java-implementation-class" mandatory="true">
<adm:synopsis>
The fully-qualified name of the Java class that provides the
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/PasswordModifyExtendedOperationHandlerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/PasswordModifyExtendedOperationHandlerConfiguration.xml
index 33b7a84..9376e1f 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/PasswordModifyExtendedOperationHandlerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/PasswordModifyExtendedOperationHandlerConfiguration.xml
@@ -33,10 +33,12 @@
extends="extended-operation-handler"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
The <adm:user-friendly-name /> provides the ability for end users to change
their own passwords, or for administrators to reset user passwords.
</adm:synopsis>
+
<adm:description>
The password modify extended operation is defined in RFC 3062. It includes
the ability for users to provide their current password for further
@@ -44,6 +46,7 @@
includes the ability to generate a new password if the user doesn't provide
one.
</adm:description>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.74</ldap:oid>
@@ -51,6 +54,7 @@
<ldap:superior>ds-cfg-extended-operation-handler</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="java-implementation-class">
<adm:default-behavior>
<adm:defined>
@@ -60,6 +64,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="identity-mapper-dn" mandatory="true">
<adm:synopsis>
Specifies the DN of the configuration entry for the identity mapper that
@@ -72,7 +77,9 @@
effect immediately.
</adm:description>
<adm:syntax>
- <adm:dn />
+ <adm:dn>
+ <adm:base>cn=identity mappers,cn=config</adm:base>
+ </adm:dn>
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/PasswordPolicyConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/PasswordPolicyConfiguration.xml
index 447b814..1222414 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/PasswordPolicyConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/PasswordPolicyConfiguration.xml
@@ -50,11 +50,12 @@
</adm:synopsis>
<adm:description>
Specifies the attribute type used to hold user passwords. This
- attribute type must be defined in the server schema. Changes to
- this configuration attribute will take effect immediately.
+ attribute type must be defined in the server schema, and it must have
+ either the user password or auth password syntax. Changes to this
+ configuration attribute will take effect immediately.
</adm:description>
<adm:syntax>
- <adm:oid />
+ <adm:attribute-type />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -131,7 +132,9 @@
<adm:undefined />
</adm:default-behavior>
<adm:syntax>
- <adm:dn />
+ <adm:dn>
+ <adm:base>cn=password validators,cn=config</adm:base>
+ </adm:dn>
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -157,7 +160,9 @@
<adm:undefined />
</adm:default-behavior>
<adm:syntax>
- <adm:dn />
+ <adm:dn>
+ <adm:base>cn=account status notification handlers,cn=config</adm:base>
+ </adm:dn>
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -339,7 +344,9 @@
<adm:undefined />
</adm:default-behavior>
<adm:syntax>
- <adm:dn />
+ <adm:dn>
+ <adm:base>cn=password generators,cn=config</adm:base>
+ </adm:dn>
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -841,7 +848,7 @@
<adm:undefined />
</adm:default-behavior>
<adm:syntax>
- <adm:oid />
+ <adm:attribute-type />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RegularExpressionIdentityMapperConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RegularExpressionIdentityMapperConfiguration.xml
index 43b72c1..5f700e2 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RegularExpressionIdentityMapperConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/RegularExpressionIdentityMapperConfiguration.xml
@@ -31,6 +31,7 @@
package="org.opends.server.admin.std" extends="identity-mapper"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
The
<adm:user-friendly-name />
@@ -45,6 +46,7 @@
string matches the provided pattern, then the given ID string will be used
without any alteration.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.121</ldap:oid>
@@ -77,7 +79,7 @@
value in exactly one entry.
</adm:description>
<adm:syntax>
- <adm:string />
+ <adm:attribute-type />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SizeLimitLogRetentionPolicyConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SizeLimitLogRetentionPolicyConfiguration.xml
index 09c0eb9..4e564be 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SizeLimitLogRetentionPolicyConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SizeLimitLogRetentionPolicyConfiguration.xml
@@ -1,15 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Portions Copyright 2007 Sun Microsystems, Inc.
+ ! -->
+
<adm:managed-object
- name="size-limit-log-retention-policy"
- plural-name="size-limit-log-retention-policies"
- package="org.opends.server.admin.std"
- extends="log-retention-policy"
- xmlns:adm="http://www.opends.org/admin"
- xmlns:ldap="http://www.opends.org/admin-ldap">
+name="size-limit-log-retention-policy"
+plural-name="size-limit-log-retention-policies"
+package="org.opends.server.admin.std"
+extends="log-retention-policy"
+xmlns:adm="http://www.opends.org/admin"
+xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
Retention policy based on the amount of space taken by the log
- files on disk.
+ files on disk.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.104</ldap:oid>
@@ -17,6 +46,7 @@
<ldap:superior>ds-cfg-log-retention-policy</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="java-implementation-class">
<adm:default-behavior>
<adm:defined>
@@ -26,6 +56,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="disk-space-used" mandatory="true">
<adm:synopsis>
The maximum total disk space used by the log files.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SizeLimitLogRotationPolicyConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SizeLimitLogRotationPolicyConfiguration.xml
index 8c7135c..ff2ebcd 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SizeLimitLogRotationPolicyConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SizeLimitLogRotationPolicyConfiguration.xml
@@ -1,4 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+! CDDL HEADER START
+!
+! The contents of this file are subject to the terms of the
+! Common Development and Distribution License, Version 1.0 only
+! (the "License"). You may not use this file except in compliance
+! with the License.
+!
+! You can obtain a copy of the license at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+! See the License for the specific language governing permissions
+! and limitations under the License.
+!
+! When distributing Covered Code, include this CDDL HEADER in each
+! file and include the License file at
+! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+! add the following below this CDDL HEADER, with the fields enclosed
+! by brackets "[]" replaced with your own identifying information:
+! Portions Copyright [yyyy] [name of copyright owner]
+!
+! CDDL HEADER END
+!
+!
+! Portions Copyright 2007 Sun Microsystems, Inc.
+! -->
+
<adm:managed-object
name="size-limit-log-rotation-policy"
plural-name="size-limit-log-rotation-policies"
@@ -6,9 +33,11 @@
extends="log-rotation-policy"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
Rotation policy based on the size of the log file.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.107</ldap:oid>
@@ -16,6 +45,7 @@
<ldap:superior>ds-cfg-log-rotation-policy</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="java-implementation-class">
<adm:default-behavior>
<adm:defined>
@@ -25,6 +55,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="file-size-limit" mandatory="true">
<adm:synopsis>
The size of the file when rotation takes place.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SubjectDNToUserAttributeCertificateMapperConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
index f969260..c114c6c 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
@@ -31,12 +31,14 @@
package="org.opends.server.admin.std" extends="certificate-mapper"
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
The
<adm:user-friendly-name />
maps client certificates to user entries by looking for the certificate
subject DN in a specified attribute of user entries.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.84</ldap:oid>
@@ -44,6 +46,7 @@
<ldap:superior>ds-cfg-certificate-mapper</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="mapper-class">
<adm:default-behavior>
<adm:defined>
@@ -53,6 +56,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="subject-attribute" mandatory="true">
<adm:synopsis>
Specifies the attribute in which to look for the subject DN.
@@ -62,7 +66,7 @@
match the certificate subject DN.
</adm:description>
<adm:syntax>
- <adm:string />
+ <adm:attribute-type />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -71,6 +75,7 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+
<adm:property name="user-base-dn" mandatory="false" multi-valued="true">
<adm:synopsis>
Specifies the set of base DNs below which to search for users.
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TelephoneNumberAttributeSyntaxConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TelephoneNumberAttributeSyntaxConfiguration.xml
index e04acf8..83c9b3c 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TelephoneNumberAttributeSyntaxConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TelephoneNumberAttributeSyntaxConfiguration.xml
@@ -45,6 +45,16 @@
</ldap:object-class>
</adm:profile>
+ <adm:property-override name="syntax-class">
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ org.opends.server.schema.TelephoneNumberSyntax
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ </adm:property-override>
+
<adm:property name="strict-format" mandatory="false">
<adm:synopsis>
Indicates whether to require telephone number values to strictly comply
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TimeLimitLogRotationPolicyConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TimeLimitLogRotationPolicyConfiguration.xml
index 61e682c..591daf2 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TimeLimitLogRotationPolicyConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TimeLimitLogRotationPolicyConfiguration.xml
@@ -1,14 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ !
+ ! Portions Copyright 2007 Sun Microsystems, Inc.
+ ! -->
+
<adm:managed-object
- name="time-limit-log-rotation-policy"
- plural-name="time-limit-log-rotation-policies"
- package="org.opends.server.admin.std"
- extends="log-rotation-policy"
- xmlns:adm="http://www.opends.org/admin"
- xmlns:ldap="http://www.opends.org/admin-ldap">
+name="time-limit-log-rotation-policy"
+plural-name="time-limit-log-rotation-policies"
+package="org.opends.server.admin.std"
+extends="log-rotation-policy"
+xmlns:adm="http://www.opends.org/admin"
+xmlns:ldap="http://www.opends.org/admin-ldap">
+
<adm:synopsis>
Rotation policy based on the time since last rotation.
</adm:synopsis>
+
<adm:profile name="ldap">
<ldap:object-class>
<ldap:oid>1.3.6.1.4.1.26027.1.2.108</ldap:oid>
@@ -16,6 +45,7 @@
<ldap:superior>ds-cfg-log-rotation-policy</ldap:superior>
</ldap:object-class>
</adm:profile>
+
<adm:property-override name="java-implementation-class">
<adm:default-behavior>
<adm:defined>
@@ -25,6 +55,7 @@
</adm:defined>
</adm:default-behavior>
</adm:property-override>
+
<adm:property name="rotation-interval" mandatory="true">
<adm:synopsis>
The time interval between rotations.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
index e34864a..ed44124 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
@@ -267,69 +267,28 @@
// Get the password attribute. If specified, it must have either the
// user password or auth password syntax.
- String passwordAttr = configuration.getPasswordAttribute();
- try
+ passwordAttribute = configuration.getPasswordAttribute();
+ String syntaxOID = passwordAttribute.getSyntaxOID();
+ if (syntaxOID.equals(SYNTAX_AUTH_PASSWORD_OID))
{
- if (passwordAttr == null)
- {
- this.passwordAttribute = null;
- this.authPasswordSyntax = false;
- // FIXME: clearly this is an error, but I have not found an example
- // where it is handled (in a very cursory survey of calls to
- // ConfigEntry.getConfigAttribute).
- // Let it fall through and be caught by holistic validation.
- }
- else
- {
- String lowerName = toLowerCase(passwordAttr);
- AttributeType pwAttrType = DirectoryServer.getAttributeType(lowerName);
- if (pwAttrType == null)
- {
- Message message = ERR_PWPOLICY_UNDEFINED_PASSWORD_ATTRIBUTE.get(
- String.valueOf(configEntryDN), String.valueOf(passwordAttr));
- throw new ConfigException(message);
- }
-
- String syntaxOID = pwAttrType.getSyntaxOID();
- if (syntaxOID.equals(SYNTAX_AUTH_PASSWORD_OID))
- {
- this.passwordAttribute = pwAttrType;
- this.authPasswordSyntax = true;
- }
- else if (syntaxOID.equals(SYNTAX_USER_PASSWORD_OID))
- {
- this.passwordAttribute = pwAttrType;
- this.authPasswordSyntax = false;
- }
- else
- {
- String syntax = pwAttrType.getSyntax().getSyntaxName();
- if ((syntax == null) || (syntax.length() == 0))
- {
- syntax = syntaxOID;
- }
-
- Message message = ERR_PWPOLICY_INVALID_PASSWORD_ATTRIBUTE_SYNTAX.
- get(String.valueOf(configEntryDN), String.valueOf(passwordAttr),
- String.valueOf(syntax));
- throw new ConfigException(message);
- }
- }
+ authPasswordSyntax = true;
}
- catch (ConfigException ce)
+ else if (syntaxOID.equals(SYNTAX_USER_PASSWORD_OID))
{
- throw ce;
+ authPasswordSyntax = false;
}
- catch (Exception e)
+ else
{
- if (debugEnabled())
+ String syntax = passwordAttribute.getSyntax().getSyntaxName();
+ if ((syntax == null) || (syntax.length() == 0))
{
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ syntax = syntaxOID;
}
- Message message = ERR_PWPOLICY_CANNOT_DETERMINE_PASSWORD_ATTRIBUTE.get(
- String.valueOf(configEntryDN), getExceptionMessage(e));
- throw new InitializationException(message, e);
+ Message message = ERR_PWPOLICY_INVALID_PASSWORD_ATTRIBUTE_SYNTAX.
+ get(String.valueOf(configEntryDN), passwordAttribute.getNameOrOID(),
+ String.valueOf(syntax));
+ throw new ConfigException(message);
}
@@ -668,39 +627,8 @@
// the server schema. It does not need to have a generalized time syntax
// because the value that it will store will not necessarily conform to this
// format.
- String lastLoginTimeAtt = configuration.getLastLoginTimeAttribute();
- try
- {
- if (lastLoginTimeAtt != null)
- {
- String lowerName = toLowerCase(lastLoginTimeAtt);
- AttributeType attrType = DirectoryServer.getAttributeType(lowerName);
- if (attrType == null)
- {
- Message message = ERR_PWPOLICY_UNDEFINED_LAST_LOGIN_TIME_ATTRIBUTE.
- get(String.valueOf(configEntryDN),
- String.valueOf(lastLoginTimeAtt));
- throw new ConfigException(message);
- }
+ lastLoginTimeAttribute = configuration.getLastLoginTimeAttribute();
- this.lastLoginTimeAttribute = attrType;
- }
- }
- catch (ConfigException ce)
- {
- throw ce;
- }
- catch (Exception e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
-
- Message message = ERR_PWPOLICY_CANNOT_DETERMINE_LAST_LOGIN_TIME_ATTR.get(
- String.valueOf(configEntryDN), getExceptionMessage(e));
- throw new InitializationException(message, e);
- }
// Get the last login time format. If specified, it must be a valid format
// string.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
index 793ce21..799faea 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -35,7 +35,6 @@
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
-import java.util.SortedSet;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.ExactMatchIdentityMapperCfg;
@@ -120,22 +119,8 @@
// Get the attribute types to use for the searches.
- SortedSet<String> attrNames = currentConfig.getMatchAttribute();
- attributeTypes = new AttributeType[attrNames.size()];
- int i=0;
- for (String name : attrNames)
- {
- AttributeType type = DirectoryServer.getAttributeType(toLowerCase(name),
- false);
- if (type == null)
- {
- Message message =
- ERR_EXACTMAP_UNKNOWN_ATTR.get(String.valueOf(configEntryDN), name);
- throw new ConfigException(message);
- }
-
- attributeTypes[i++] = type;
- }
+ attributeTypes =
+ currentConfig.getMatchAttribute().toArray(new AttributeType[0]);
// Create the attribute list to include in search requests. We want to
@@ -314,24 +299,9 @@
ExactMatchIdentityMapperCfg configuration,
List<Message> unacceptableReasons)
{
+ // If we've gotten to this point, then the configuration should be
+ // acceptable.
boolean configAcceptable = true;
-
- // Make sure that the set of attribute types is acceptable.
- SortedSet<String> attributeNames = configuration.getMatchAttribute();
- for (String name : attributeNames)
- {
- AttributeType t = DirectoryServer.getAttributeType(toLowerCase(name),
- false);
- if (t == null)
- {
-
- unacceptableReasons.add(ERR_EXACTMAP_UNKNOWN_ATTR.get(
- String.valueOf(configuration.dn()), name));
- configAcceptable = false;
- }
- }
-
-
return configAcceptable;
}
@@ -348,34 +318,9 @@
ArrayList<Message> messages = new ArrayList<Message>();
- // Get the attribute types to use for the searches.
- SortedSet<String> attrNames = configuration.getMatchAttribute();
- AttributeType[] newAttributeTypes = new AttributeType[attrNames.size()];
- int i=0;
- for (String name : attrNames)
- {
- AttributeType type = DirectoryServer.getAttributeType(toLowerCase(name),
- false);
- if (type == null)
- {
- if (resultCode == ResultCode.SUCCESS)
- {
- resultCode = ResultCode.NO_SUCH_ATTRIBUTE;
- }
-
- messages.add(ERR_EXACTMAP_UNKNOWN_ATTR.get(
- String.valueOf(configEntryDN), name));
- }
-
- newAttributeTypes[i++] = type;
- }
-
-
- if (resultCode == ResultCode.SUCCESS)
- {
- attributeTypes = newAttributeTypes;
- currentConfig = configuration;
- }
+ attributeTypes =
+ configuration.getMatchAttribute().toArray(new AttributeType[0]);
+ currentConfig = configuration;
return new ConfigChangeResult(resultCode, adminActionRequired, messages);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 826e558..d166374 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -143,18 +143,12 @@
// Get the attribute type to use for validating the certificates. If none
// is provided, then default to the userCertificate type.
- String attrTypeName = configuration.getCertificateAttribute();
- if (attrTypeName == null)
- {
- attrTypeName = DEFAULT_VALIDATION_CERT_ATTRIBUTE;
- }
- certificateAttributeType =
- DirectoryServer.getAttributeType(toLowerCase(attrTypeName), false);
+ certificateAttributeType = configuration.getCertificateAttribute();
if (certificateAttributeType == null)
{
- Message message = ERR_SASLEXTERNAL_UNKNOWN_CERT_ATTR.get(
- String.valueOf(attrTypeName), String.valueOf(configEntryDN));
- throw new ConfigException(message);
+ certificateAttributeType =
+ DirectoryServer.getAttributeType(DEFAULT_VALIDATION_CERT_ATTRIBUTE,
+ true);
}
@@ -478,24 +472,6 @@
boolean configAcceptable = true;
DN cfgEntryDN = configuration.dn();
- // Get the attribute type to use for validating the certificates. If none
- // is provided, then default to the userCertificate type.
- String attrTypeName = configuration.getCertificateAttribute();
- if (attrTypeName != null)
- {
- attrTypeName = DEFAULT_VALIDATION_CERT_ATTRIBUTE;
- }
- AttributeType newCertificateType =
- DirectoryServer.getAttributeType(toLowerCase(attrTypeName), false);
- if (newCertificateType == null)
- {
- unacceptableReasons.add(ERR_SASLEXTERNAL_UNKNOWN_CERT_ATTR.get(
- String.valueOf(attrTypeName),
- String.valueOf(cfgEntryDN)));
- configAcceptable = false;
- }
-
-
// Make sure that the configured certificate mapper is valid.
CertificateMapper certificateMapper =
DirectoryServer.getCertificateMapper(
@@ -545,24 +521,12 @@
// Get the attribute type to use for validating the certificates. If none
// is provided, then default to the userCertificate type.
- String attrTypeName = configuration.getCertificateAttribute();
- if (attrTypeName == null)
- {
- attrTypeName = DEFAULT_VALIDATION_CERT_ATTRIBUTE;
- }
- AttributeType newCertificateType =
- DirectoryServer.getAttributeType(toLowerCase(attrTypeName), false);
+ AttributeType newCertificateType = configuration.getCertificateAttribute();
if (newCertificateType == null)
{
- if (resultCode == ResultCode.SUCCESS)
- {
- resultCode = ResultCode.NO_SUCH_ATTRIBUTE;
- }
-
-
- messages.add(ERR_SASLEXTERNAL_UNKNOWN_CERT_ATTR.get(
- String.valueOf(attrTypeName),
- String.valueOf(configEntryDN)));
+ newCertificateType =
+ DirectoryServer.getAttributeType(DEFAULT_VALIDATION_CERT_ATTRIBUTE,
+ true);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
index c7b3a71..d74ccbb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -82,8 +82,7 @@
*/
private static final DebugTracer TRACER = getTracer();
- // The attribute type that will be used to map the certificate's fingerprint.
- private AttributeType fingerprintAttributeType;
+
// The DN of the configuration entry for this certificate mapper.
private DN configEntryDN;
@@ -121,18 +120,6 @@
configEntryDN = configuration.dn();
- // Get the attribute type that will be used to hold the fingerprint.
- String attrName = configuration.getFingerprintAttribute();
- fingerprintAttributeType =
- DirectoryServer.getAttributeType(toLowerCase(attrName), false);
- if (fingerprintAttributeType == null)
- {
- Message message =
- ERR_FCM_NO_SUCH_ATTR.get(String.valueOf(configEntryDN), attrName);
- throw new ConfigException(message);
- }
-
-
// Get the algorithm that will be used to generate the fingerprint.
switch (configuration.getFingerprintAlgorithm())
{
@@ -164,7 +151,7 @@
throws DirectoryException
{
FingerprintCertificateMapperCfg config = currentConfig;
- AttributeType fingerprintAttributeType = this.fingerprintAttributeType;
+ AttributeType fingerprintAttributeType = config.getFingerprintAttribute();
String fingerprintAlgorithm = this.fingerprintAlgorithm;
// Make sure that a peer certificate was provided.
@@ -289,23 +276,9 @@
FingerprintCertificateMapperCfg configuration,
List<Message> unacceptableReasons)
{
+ // If we've gotten to this point, then the configuration should be
+ // acceptable.
boolean configAcceptable = true;
- DN cfgEntryDN = configuration.dn();
-
- // Make sure that the fingerprint attribute is defined in the server schema.
- String attrName = configuration.getFingerprintAttribute();
- AttributeType newFingerprintType =
- DirectoryServer.getAttributeType(toLowerCase(attrName),
- false);
- if (newFingerprintType == null)
- {
- unacceptableReasons.add(ERR_FCM_NO_SUCH_ATTR.get(
- String.valueOf(cfgEntryDN),
- attrName));
- configAcceptable = false;
- }
-
-
return configAcceptable;
}
@@ -322,23 +295,6 @@
ArrayList<Message> messages = new ArrayList<Message>();
- // Make sure that the fingerprint attribute is defined in the server schema.
- String attrName = configuration.getFingerprintAttribute();
- AttributeType newFingerprintType =
- DirectoryServer.getAttributeType(toLowerCase(attrName),
- false);
- if (newFingerprintType == null)
- {
- if (resultCode == ResultCode.SUCCESS)
- {
- resultCode = ResultCode.NO_SUCH_ATTRIBUTE;
- }
-
- messages.add(ERR_FCM_NO_SUCH_ATTR.get(
- String.valueOf(configEntryDN), attrName));
- }
-
-
// Get the algorithm that will be used to generate the fingerprint.
String newFingerprintAlgorithm = null;
switch (configuration.getFingerprintAlgorithm())
@@ -354,9 +310,8 @@
if (resultCode == ResultCode.SUCCESS)
{
- fingerprintAttributeType = newFingerprintType;
- fingerprintAlgorithm = newFingerprintAlgorithm;
- currentConfig = configuration;
+ fingerprintAlgorithm = newFingerprintAlgorithm;
+ currentConfig = configuration;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
index 81675be..9fe1fed 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
@@ -34,7 +34,6 @@
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
-import java.util.SortedSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -146,22 +145,8 @@
// Get the attribute types to use for the searches.
- SortedSet<String> attrNames = currentConfig.getMatchAttribute();
- attributeTypes = new AttributeType[attrNames.size()];
- int i=0;
- for (String name : attrNames)
- {
- AttributeType type = DirectoryServer.getAttributeType(toLowerCase(name),
- false);
- if (type == null)
- {
- Message message = ERR_REGEXMAP_UNKNOWN_ATTR.get(
- String.valueOf(configEntryDN), name);
- throw new ConfigException(message);
- }
-
- attributeTypes[i++] = type;
- }
+ attributeTypes =
+ currentConfig.getMatchAttribute().toArray(new AttributeType[0]);
// Create the attribute list to include in search requests. We want to
@@ -353,21 +338,6 @@
configAcceptable = false;
}
- // Make sure that the set of attribute types is acceptable.
- SortedSet<String> attributeNames = configuration.getMatchAttribute();
- for (String name : attributeNames)
- {
- AttributeType t = DirectoryServer.getAttributeType(toLowerCase(name),
- false);
- if (t == null)
- {
- Message message = ERR_REGEXMAP_UNKNOWN_ATTR.get(
- String.valueOf(configuration.dn()), name);
- unacceptableReasons.add(message);
- configAcceptable = false;
- }
- }
-
return configAcceptable;
}
@@ -406,28 +376,8 @@
}
- // Get the attribute types to use for the searches.
- SortedSet<String> attrNames = configuration.getMatchAttribute();
- AttributeType[] newAttributeTypes = new AttributeType[attrNames.size()];
- int i=0;
- for (String name : attrNames)
- {
- AttributeType type = DirectoryServer.getAttributeType(toLowerCase(name),
- false);
- if (type == null)
- {
- if (resultCode == ResultCode.SUCCESS)
- {
- resultCode = ResultCode.NO_SUCH_ATTRIBUTE;
- }
-
- Message message = ERR_REGEXMAP_UNKNOWN_ATTR.get(
- String.valueOf(configEntryDN), name);
- messages.add(message);
- }
-
- newAttributeTypes[i++] = type;
- }
+ AttributeType[] newAttributeTypes =
+ configuration.getMatchAttribute().toArray(new AttributeType[0]);
if (resultCode == ResultCode.SUCCESS)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 2cb3990..5650705 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -32,7 +32,6 @@
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import javax.security.auth.x500.X500Principal;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -83,9 +82,6 @@
*/
private static final DebugTracer TRACER = getTracer();
- // The attribute type that will be used to map the certificate's subject.
- private AttributeType subjectAttributeType;
-
// The DN of the configuration entry for this certificate mapper.
private DN configEntryDN;
@@ -118,18 +114,6 @@
currentConfig = configuration;
configEntryDN = configuration.dn();
-
-
- // Get the attribute type that will be used to hold the fingerprint.
- String attrName = configuration.getSubjectAttribute();
- subjectAttributeType =
- DirectoryServer.getAttributeType(toLowerCase(attrName), false);
- if (subjectAttributeType == null)
- {
- Message message =
- ERR_SDTUACM_NO_SUCH_ATTR.get(String.valueOf(configEntryDN), attrName);
- throw new ConfigException(message);
- }
}
@@ -152,7 +136,7 @@
{
SubjectDNToUserAttributeCertificateMapperCfg config =
currentConfig;
- AttributeType subjectAttributeType = this.subjectAttributeType;
+ AttributeType subjectAttributeType = config.getSubjectAttribute();
// Make sure that a peer certificate was provided.
@@ -255,23 +239,9 @@
configuration,
List<Message> unacceptableReasons)
{
+ // If we've gotten to this point, then the configuration should be
+ // acceptable.
boolean configAcceptable = true;
- DN cfgEntryDN = configuration.dn();
-
- // Make sure that the subject attribute is defined in the server schema.
- String attrName = configuration.getSubjectAttribute();
- AttributeType newSubjectType =
- DirectoryServer.getAttributeType(toLowerCase(attrName),
- false);
- if (newSubjectType == null)
- {
- unacceptableReasons.add(ERR_SDTUACM_NO_SUCH_ATTR.get(
- String.valueOf(cfgEntryDN),
- attrName));
- configAcceptable = false;
- }
-
-
return configAcceptable;
}
@@ -284,36 +254,8 @@
SubjectDNToUserAttributeCertificateMapperCfg
configuration)
{
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
-
-
- // Make sure that the fingerprint attribute is defined in the server schema.
- String attrName = configuration.getSubjectAttribute();
- AttributeType newSubjectType =
- DirectoryServer.getAttributeType(toLowerCase(attrName),
- false);
- if (newSubjectType == null)
- {
- if (resultCode == ResultCode.SUCCESS)
- {
- resultCode = ResultCode.NO_SUCH_ATTRIBUTE;
- }
-
- messages.add(ERR_SDTUACM_NO_SUCH_ATTR.get(
- String.valueOf(configEntryDN), attrName));
- }
-
-
- if (resultCode == ResultCode.SUCCESS)
- {
- subjectAttributeType = newSubjectType;
- currentConfig = configuration;
- }
-
-
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ currentConfig = configuration;
+ return new ConfigChangeResult(ResultCode.SUCCESS, false);
}
}
--
Gitblit v1.10.0