From e958eb5bcfc9feccbda7c0841b05939506143ad8 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 16 Nov 2007 10:47:40 +0000
Subject: [PATCH] Advanced properties phase 1: tag advanced properties and perform various clean-up to the XML definitions:

---
 opends/src/admin/defn/org/opends/server/admin/std/CryptoManagerConfiguration.xml |  104 ++++++++++++++++++++++++++--------------------------
 1 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/CryptoManagerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/CryptoManagerConfiguration.xml
index 559635e..4a11f3b 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/CryptoManagerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/CryptoManagerConfiguration.xml
@@ -1,50 +1,49 @@
 <?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="crypto-manager"
-  plural-name="crypto-managers"
+  ! 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="crypto-manager" plural-name="crypto-managers"
   package="org.opends.server.admin.std"
   xmlns:adm="http://www.opends.org/admin"
   xmlns:ldap="http://www.opends.org/admin-ldap">
   <adm:synopsis>
     The
     <adm:user-friendly-name />
-    provides hashing, encryption and other kinds of cryptographic operations.
-    It also contains methods for compressing and decompressing data.
+    provides a common interface for performing compression,
+    decompression, hashing, encryption and other kinds of cryptographic
+    operations.
   </adm:synopsis>
-  <adm:tag name="security"/>
+  <adm:tag name="security" />
   <adm:profile name="ldap">
     <ldap:object-class>
       <ldap:name>ds-cfg-crypto-manager</ldap:name>
       <ldap:superior>top</ldap:superior>
     </ldap:object-class>
   </adm:profile>
-  <adm:property name="digest-algorithm" multi-valued="false" advanced="false">
+  <adm:property name="digest-algorithm" advanced="true">
     <adm:synopsis>
       The preferred message digest algorithm for the Directory Server.
     </adm:synopsis>
@@ -71,7 +70,7 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="mac-algorithm" multi-valued="false" advanced="false">
+  <adm:property name="mac-algorithm" advanced="true">
     <adm:synopsis>
       The preferred MAC algorithm for the Directory Server.
     </adm:synopsis>
@@ -98,7 +97,7 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="mac-key-length" multi-valued="false" advanced="false">
+  <adm:property name="mac-key-length" advanced="true">
     <adm:synopsis>
       The preferred key length in bits for the preferred MAC algorithm.
     </adm:synopsis>
@@ -125,18 +124,21 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="cipher-transformation" multi-valued="false" advanced="false">
+  <adm:property name="cipher-transformation" advanced="true">
     <adm:synopsis>
-      The preferred cipher for the Directory Server, to be specified using the
-      syntax algorithm/mode/padding. The full transformation is required:
-      specifying only an algorithm and allowing the cipher provider to supply
-      the default mode and padding is not supported, because there is no
-      guarantee these default values will be the same among different
-      implementations. Some cipher algorithms, including RC4 and ARCFOUR, do not
-      have a mode or padding, and hence must be specified using NONE for the
+      The preferred cipher for the Directory Server, to be specified
+      using the syntax algorithm/mode/padding.
+    </adm:synopsis>
+    <adm:description>
+      The full transformation is required: specifying only an algorithm
+      and allowing the cipher provider to supply the default mode and
+      padding is not supported, because there is no guarantee these
+      default values will be the same among different implementations.
+      Some cipher algorithms, including RC4 and ARCFOUR, do not have a
+      mode or padding, and hence must be specified using NONE for the
       mode field and NoPadding for the padding field. For example,
       RC4/NONE/NoPadding.
-    </adm:synopsis>
+    </adm:description>
     <adm:requires-admin-action>
       <adm:none>
         <adm:synopsis>
@@ -160,7 +162,7 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="cipher-key-length" multi-valued="false" advanced="false">
+  <adm:property name="cipher-key-length" advanced="true">
     <adm:synopsis>
       The preferred key length in bits for the preferred cipher.
     </adm:synopsis>
@@ -204,7 +206,8 @@
     <adm:default-behavior>
       <adm:alias>
         <adm:synopsis>
-          Uses the default set of SSL protocols provided by the server's JVM.
+          Uses the default set of SSL protocols provided by the server's
+          JVM.
         </adm:synopsis>
       </adm:alias>
     </adm:default-behavior>
@@ -248,10 +251,10 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="ssl-encryption" multi-valued="false">
+  <adm:property name="ssl-encryption">
     <adm:synopsis>
-      Specifies whether SSL/TLS is used to provide encrypted communication
-      between two OpenDS server components.
+      Specifies whether SSL/TLS is used to provide encrypted
+      communication between two OpenDS server components.
     </adm:synopsis>
     <adm:requires-admin-action>
       <adm:none>
@@ -264,9 +267,7 @@
     </adm:requires-admin-action>
     <adm:default-behavior>
       <adm:defined>
-        <adm:value>
-          false
-        </adm:value>
+        <adm:value>false</adm:value>
       </adm:defined>
     </adm:default-behavior>
     <adm:syntax>
@@ -280,4 +281,3 @@
   </adm:property>
   <adm:property-reference name="ssl-cert-nickname" />
 </adm:managed-object>
-

--
Gitblit v1.10.0