From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/admin/defn/org/opends/server/admin/std/FileBasedErrorLogPublisherConfiguration.xml | 57 ++++++++++++++++++++-------------------------------------
1 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/FileBasedErrorLogPublisherConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/FileBasedErrorLogPublisherConfiguration.xml
index 7305930..ecc2be7 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/FileBasedErrorLogPublisherConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/FileBasedErrorLogPublisherConfiguration.xml
@@ -39,13 +39,12 @@
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>1.3.6.1.4.1.26027.1.2.28</ldap:oid>
- <ldap:name>ds-cfg-file-based-error-logger</ldap:name>
- <ldap:superior>ds-cfg-error-logger</ldap:superior>
+ <ldap:name>ds-cfg-file-based-error-log-publisher</ldap:name>
+ <ldap:superior>ds-cfg-error-log-publisher</ldap:superior>
</ldap:object-class>
</adm:profile>
- <adm:property-override name="java-implementation-class">
+ <adm:property-override name="java-class">
<adm:default-behavior>
<adm:defined>
<adm:value>
@@ -66,8 +65,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.358</ldap:oid>
- <ldap:name>ds-cfg-asynchronous-writes</ldap:name>
+ <ldap:name>ds-cfg-asynchronous</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -89,8 +87,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.378</ldap:oid>
- <ldap:name>ds-cfg-log-queue-size</ldap:name>
+ <ldap:name>ds-cfg-queue-size</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -106,13 +103,12 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.59</ldap:oid>
<ldap:name>ds-cfg-log-file</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="log-file-mode" mandatory="true">
+ <adm:property name="log-file-permissions" mandatory="true">
<adm:synopsis>
The UNIX permissions of the log files created by this
<adm:user-friendly-name />.
@@ -133,8 +129,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.359</ldap:oid>
- <ldap:name>ds-cfg-log-file-mode</ldap:name>
+ <ldap:name>ds-cfg-log-file-permissions</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -156,8 +151,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.109</ldap:oid>
- <ldap:name>ds-cfg-thread-time-interval</ldap:name>
+ <ldap:name>ds-cfg-time-interval</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -178,7 +172,6 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.110</ldap:oid>
<ldap:name>ds-cfg-buffer-size</ldap:name>
</ldap:attribute>
</adm:profile>
@@ -202,8 +195,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.360</ldap:oid>
- <ldap:name>ds-cfg-writer-auto-flush</ldap:name>
+ <ldap:name>ds-cfg-auto-flush</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
@@ -224,15 +216,14 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.361</ldap:oid>
- <ldap:name>ds-cfg-writer-append</ldap:name>
+ <ldap:name>ds-cfg-append</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="rotation-policy-dn" multi-valued="true">
+ <adm:property name="rotation-policy" multi-valued="true">
<adm:synopsis>
- The retention policy to use for the <adm:user-friendly-name />. When
+ The rotation policy to use for the <adm:user-friendly-name />. When
multiple policies are used, rotation will occur if any policy's conditions
are met.
</adm:synopsis>
@@ -244,21 +235,17 @@
</adm:alias>
</adm:default-behavior>
<adm:syntax>
- <adm:dn>
- <adm:base>
- cn=Log Rotation Policies,cn=config
- </adm:base>
- </adm:dn>
+ <adm:aggregation parent-path="/"
+ relation-name="log-rotation-policy" />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.90</ldap:oid>
- <ldap:name>ds-cfg-rotation-policy-dn</ldap:name>
+ <ldap:name>ds-cfg-rotation-policy</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
- <adm:property name="retention-policy-dn" multi-valued="true">
+ <adm:property name="retention-policy" multi-valued="true">
<adm:synopsis>
The retention policy to use for the <adm:user-friendly-name />. When
multiple policies are used, log files will be cleaned when any of the
@@ -272,17 +259,13 @@
</adm:alias>
</adm:default-behavior>
<adm:syntax>
- <adm:dn>
- <adm:base>
- cn=Log Retention Policies,cn=config
- </adm:base>
- </adm:dn>
+ <adm:aggregation parent-path="/"
+ relation-name="log-retention-policy" />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>1.3.6.1.4.1.26027.1.1.91</ldap:oid>
- <ldap:name>ds-cfg-retention-policy-dn</ldap:name>
+ <ldap:name>ds-cfg-retention-policy</ldap:name>
</ldap:attribute>
</adm:profile>
</adm:property>
-</adm:managed-object>
\ No newline at end of file
+</adm:managed-object>
--
Gitblit v1.10.0