From 5833fe40996c75adcf1e116104ffe6169c4866e6 Mon Sep 17 00:00:00 2001
From: rhaggard <rhaggard@localhost>
Date: Fri, 01 Feb 2008 18:37:01 +0000
Subject: [PATCH] Uncommitting last changes to configuration .xml files, second try
---
opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerProviderConfiguration.xml | 48 +++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerProviderConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerProviderConfiguration.xml
index b2df8bf..0775180 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerProviderConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/FileBasedTrustManagerProviderConfiguration.xml
@@ -31,12 +31,14 @@
xmlns:adm="http://www.opends.org/admin"
xmlns:ldap="http://www.opends.org/admin-ldap">
<adm:synopsis>
- The file-based trust manager provider determines whether to trust a
- presented certificate based on whether that certificate exists in a
- server trust store file. The trust store file can be in either JKS
- (the default Java key store format) or PKCS#12 (a standard
- certificate format) form.
+ The
+ <adm:user-friendly-name />
+ provider accesses key information in a file on the local filesystem.
</adm:synopsis>
+ <adm:description>
+ Multiple file formats may be supported, depending on the providers
+ supported by the underlying Java runtime.
+ </adm:description>
<adm:profile name="ldap">
<ldap:object-class>
<ldap:name>ds-cfg-file-based-trust-manager-provider</ldap:name>
@@ -56,24 +58,16 @@
<adm:TODO>Should use a file-based property definition?</adm:TODO>
<adm:synopsis>
Specifies the path to the file containing the trust information.
- It can be an absolute path or a path that is relative to the
+ It may be an absolute path, or a path that is relative to the
<adm:product-name />
instance root.
</adm:synopsis>
<adm:description>
- Changes to this configuration attribute take effect the next
+ Changes to this configuration attribute will take effect the next
time that the trust manager is accessed.
</adm:description>
<adm:syntax>
- <adm:string>
- <adm:pattern>
- <adm:regex />
- <adm:usage>STRING</adm:usage>
- <adm:synopsis>
- An absolute path or a path that is relative to the OpenDS Directory Server instance root.
- </adm:synopsis>
- </adm:pattern>
- </adm:string>
+ <adm:string />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -90,25 +84,17 @@
Specifies the format for the data in the trust store file.
</adm:synopsis>
<adm:description>
- Valid values always include 'JKS' and 'PKCS12', but different
- implementations can allow other values as well. If no value is
- provided, then the JVM default value is used. Changes to this
- configuration attribute take effect the next time that the
- trust manager is accessed.
+ Valid values should always include 'JKS' and 'PKCS12', but
+ different implementations may allow other values as well. If no
+ value is provided, then the JVM-default value will be used.
+ Changes to this configuration attribute will take effect the next
+ time that the trust manager is accessed.
</adm:description>
<adm:default-behavior>
<adm:undefined />
</adm:default-behavior>
- <adm:syntax>
- <adm:string>
- <adm:pattern>
- <adm:regex />
- <adm:usage>STRING</adm:usage>
- <adm:synopsis>
- Any key store format supported by the Java runtime environment. The "JKS" and "PKCS12" formats are typically available in Java environments.
- </adm:synopsis>
- </adm:pattern>
- </adm:string>
+ <adm:syntax>
+ <adm:string />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
--
Gitblit v1.10.0