From e3acbc5e70b15dc5ca1134cd0ae4501b424d160f Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 15 Jun 2007 08:18:40 +0000
Subject: [PATCH] Partial fix for issue 1426: improve support for required admin actions.

---
 opends/src/admin/defn/org/opends/server/admin/std/Package.xml |  156 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 92 insertions(+), 64 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/Package.xml b/opends/src/admin/defn/org/opends/server/admin/std/Package.xml
index c84c67c..d92243c 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/Package.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/Package.xml
@@ -1,31 +1,30 @@
 <?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:package name="org.opends.server.admin.std"
   xmlns:adm="http://www.opends.org/admin"
   xmlns:ldap="http://www.opends.org/admin-ldap">
@@ -101,9 +100,7 @@
     </adm:requires-admin-action>
     <adm:default-behavior>
       <adm:alias>
-        <adm:synopsis>
-          Let the server decide.
-        </adm:synopsis>
+        <adm:synopsis>Let the server decide.</adm:synopsis>
       </adm:alias>
     </adm:default-behavior>
     <adm:syntax>
@@ -122,10 +119,16 @@
       <adm:user-friendly-name />
       .
     </adm:synopsis>
-    <adm:description>
-      Changes to this configuration attribute will take effect the next
-      time that the key manager is accessed.
-    </adm:description>
+    <adm:requires-admin-action>
+      <adm:none>
+        <adm:synopsis>
+          Changes to this property will take effect the next time that
+          the
+          <adm:user-friendly-name />
+          is accessed.
+        </adm:synopsis>
+      </adm:none>
+    </adm:requires-admin-action>
     <adm:default-behavior>
       <adm:defined>
         <adm:value>jks</adm:value>
@@ -149,10 +152,16 @@
       <adm:user-friendly-name />
       .
     </adm:synopsis>
-    <adm:description>
-      Changes to this configuration attribute will take effect the next
-      time that the key manager is accessed.
-    </adm:description>
+    <adm:requires-admin-action>
+      <adm:none>
+        <adm:synopsis>
+          Changes to this property will take effect the next time that
+          the
+          <adm:user-friendly-name />
+          is accessed.
+        </adm:synopsis>
+      </adm:none>
+    </adm:requires-admin-action>
     <adm:default-behavior>
       <adm:undefined />
     </adm:default-behavior>
@@ -173,10 +182,16 @@
       <adm:user-friendly-name />
       .
     </adm:synopsis>
-    <adm:description>
-      Changes to this configuration attribute will take effect the next
-      time that the key manager is accessed.
-    </adm:description>
+    <adm:requires-admin-action>
+      <adm:none>
+        <adm:synopsis>
+          Changes to this property will take effect the next time that
+          the
+          <adm:user-friendly-name />
+          is accessed.
+        </adm:synopsis>
+      </adm:none>
+    </adm:requires-admin-action>
     <adm:default-behavior>
       <adm:undefined />
     </adm:default-behavior>
@@ -198,10 +213,16 @@
       <adm:user-friendly-name />
       .
     </adm:synopsis>
-    <adm:description>
-      Changes to this configuration attribute will take effect the next
-      time that the key manager is accessed.
-    </adm:description>
+    <adm:requires-admin-action>
+      <adm:none>
+        <adm:synopsis>
+          Changes to this property will take effect the next time that
+          the
+          <adm:user-friendly-name />
+          is accessed.
+        </adm:synopsis>
+      </adm:none>
+    </adm:requires-admin-action>
     <adm:default-behavior>
       <adm:undefined />
     </adm:default-behavior>
@@ -222,11 +243,15 @@
       <adm:user-friendly-name />
       .
     </adm:synopsis>
-    <adm:description>
-      Changes to this attribute will take effect immediately, but only
-      for subsequent attempts to access the key manager provider for
-      associated client connections.
-    </adm:description>
+    <adm:requires-admin-action>
+      <adm:none>
+        <adm:synopsis>
+          Changes to this property will take effect immediately, but
+          only for subsequent attempts to access the key manager
+          provider for associated client connections.
+        </adm:synopsis>
+      </adm:none>
+    </adm:requires-admin-action>
     <adm:default-behavior>
       <adm:undefined />
     </adm:default-behavior>
@@ -249,11 +274,15 @@
       <adm:user-friendly-name />
       .
     </adm:synopsis>
-    <adm:description>
-      Changes to this attribute will take effect immediately, but only
-      for subsequent attempts to access the trust manager provider for
-      associated client connections.
-    </adm:description>
+    <adm:requires-admin-action>
+      <adm:none>
+        <adm:synopsis>
+          Changes to this property will take effect immediately, but
+          only for subsequent attempts to access the trust manager
+          provider for associated client connections.
+        </adm:synopsis>
+      </adm:none>
+    </adm:requires-admin-action>
     <adm:default-behavior>
       <adm:undefined />
     </adm:default-behavior>
@@ -269,11 +298,11 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
-  <adm:property name="include-filter" mandatory="false" multi-valued="true">
+  <adm:property name="include-filter" mandatory="false"
+    multi-valued="true">
     <adm:synopsis>
-      The set of filters that define the entries that should be
-      included in the cache.
+      The set of filters that define the entries that should be included
+      in the cache.
     </adm:synopsis>
     <adm:default-behavior>
       <adm:undefined />
@@ -288,11 +317,11 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
-  <adm:property name="exclude-filter" mandatory="false" multi-valued="true">
+  <adm:property name="exclude-filter" mandatory="false"
+    multi-valued="true">
     <adm:synopsis>
-      The set of filters that define the entries that should be
-      excluded from the cache.
+      The set of filters that define the entries that should be excluded
+      from the cache.
     </adm:synopsis>
     <adm:default-behavior>
       <adm:undefined />
@@ -307,5 +336,4 @@
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-
 </adm:package>

--
Gitblit v1.10.0