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/ReplicationServerConfiguration.xml |  138 ++++++++++++++++++++++-----------------------
 1 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
index 81e4af8..ff45ade 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
@@ -1,73 +1,68 @@
 <?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.
- ! -->
-
+  ! 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="replication-server"
-  plural-name="replication-servers" package="org.opends.server.admin.std"
+  plural-name="replication-servers"
+  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 />
-    is the server to which Multimaster Domain connects to publish and
-    receive changes to or from other Multimaster Domains.
+    <adm:user-friendly-plural-name />
+    are used to publish updates to Directory Servers within a
+    Replication Domain.
   </adm:synopsis>
-  <adm:tag name="replication"/>
+  <adm:tag name="replication" />
   <adm:profile name="ldap">
     <ldap:object-class>
-      <ldap:name>
-        ds-cfg-replication-server
-      </ldap:name>
+      <ldap:name>ds-cfg-replication-server</ldap:name>
       <ldap:superior>top</ldap:superior>
     </ldap:object-class>
   </adm:profile>
-  <adm:property name="replication-server" multi-valued="true"
-    mandatory="false">
+  <adm:property name="replication-server" multi-valued="true">
     <adm:synopsis>
-      Specifies the addresses of the replication server to which this
+      Specifies the addresses of other
+      <adm:user-friendly-plural-name />
+      to which this
       <adm:user-friendly-name />
       should try to connect at startup time.
     </adm:synopsis>
     <adm:description>
       Addresses must be specified using the syntax: hostname:port
     </adm:description>
-    <adm:requires-admin-action>
-      <adm:none />
-    </adm:requires-admin-action>
     <adm:default-behavior>
       <adm:undefined />
     </adm:default-behavior>
     <adm:syntax>
       <adm:string>
         <adm:pattern>
-          <adm:regex>.+:[0-9]+</adm:regex>
+          <adm:regex>^.+:[0-9]+$</adm:regex>
           <adm:usage>HOST:PORT</adm:usage>
           <adm:synopsis>
-            A hostname, followed by a ":" followed by a port number.
+            A host name followed by a ":" and a port number.
           </adm:synopsis>
         </adm:pattern>
       </adm:string>
@@ -78,17 +73,18 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="replication-server-id" multi-valued="false"
-    mandatory="true" read-only="true">
+  <adm:property name="replication-server-id" mandatory="true"
+    read-only="true">
     <adm:synopsis>
-      Specifies the server ID of this Replication Server
+      Specifies a unique identifier for the
+      <adm:user-friendly-name />
+      .
     </adm:synopsis>
     <adm:description>
-      Each Replication Server must have a different server ID.
+      Each
+      <adm:user-friendly-name />
+      must have a different server ID.
     </adm:description>
-    <adm:requires-admin-action>
-      <adm:none />
-    </adm:requires-admin-action>
     <adm:syntax>
       <adm:integer lower-limit="1" upper-limit="65535"></adm:integer>
     </adm:syntax>
@@ -98,11 +94,13 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="window-size" mandatory="false"
-    multi-valued="false">
+  <adm:property name="window-size" advanced="true">
     <adm:synopsis>
-      Specifies the window size that will this Domain must use when
-      communicating with replication servers.
+      Specifies the window size that the
+      <adm:user-friendly-name />
+      will use when communicating with other
+      <adm:user-friendly-plural-name />
+      .
     </adm:synopsis>
     <adm:default-behavior>
       <adm:defined>
@@ -118,11 +116,10 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="queue-size" mandatory="false"
-    multi-valued="false">
+  <adm:property name="queue-size" advanced="true">
     <adm:synopsis>
       Specifies the number of changes that will be kept in memory for
-      each LDAP server in the topology.
+      each Directory Server in the Replication Domain.
     </adm:synopsis>
     <adm:default-behavior>
       <adm:defined>
@@ -130,7 +127,7 @@
       </adm:defined>
     </adm:default-behavior>
     <adm:syntax>
-      <adm:integer></adm:integer>
+      <adm:integer />
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
@@ -138,15 +135,17 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="replication-db-directory" mandatory="false"
-    hidden="false" multi-valued="false" read-only="true">
+  <adm:property name="replication-db-directory" mandatory="true"
+    read-only="true">
     <adm:synopsis>
       The path where the
       <adm:user-friendly-name />
       will store all persistent information.
     </adm:synopsis>
     <adm:default-behavior>
-      <adm:undefined />
+      <adm:defined>
+        <adm:value>changelogDb</adm:value>
+      </adm:defined>
     </adm:default-behavior>
     <adm:syntax>
       <adm:string></adm:string>
@@ -157,7 +156,7 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="replication-purge-delay" multi-valued="false">
+  <adm:property name="replication-purge-delay" advanced="true">
     <adm:synopsis>
       The time (in seconds) after which the
       <adm:user-friendly-name />
@@ -177,19 +176,16 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-  <adm:property name="replication-port" mandatory="true"
-    multi-valued="false">
+  <adm:property name="replication-port" mandatory="true">
     <adm:synopsis>
       The port on which this
-      <adm:user-friendly-name></adm:user-friendly-name>
-      will wait for connections from other Replication Servers or LDAP
-      Servers or from LDAP servers.
+      <adm:user-friendly-name />
+      will wait for connections from other
+      <adm:user-friendly-plural-name />
+      or Directory Servers.
     </adm:synopsis>
-    <adm:requires-admin-action>
-      <adm:none />
-    </adm:requires-admin-action>
     <adm:syntax>
-      <adm:integer></adm:integer>
+      <adm:integer lower-limit="1" upper-limit="65535" />
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>

--
Gitblit v1.10.0