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/ErrorLogPublisherConfiguration.xml |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
index 7b09aed..e494743 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/ErrorLogPublisherConfiguration.xml
@@ -42,13 +42,12 @@
 
   <adm:profile name="ldap">
     <ldap:object-class>
-      <ldap:oid>1.3.6.1.4.1.26027.1.2.24</ldap:oid>
-      <ldap:name>ds-cfg-error-logger</ldap:name>
-      <ldap:superior>ds-cfg-logger</ldap:superior>
+      <ldap:name>ds-cfg-error-log-publisher</ldap:name>
+      <ldap:superior>ds-cfg-log-publisher</ldap:superior>
     </ldap:object-class>
   </adm:profile>
 
-  <adm:property name="java-implementation-class" mandatory="true">
+  <adm:property name="java-class" mandatory="true">
     <adm:synopsis>
       The fully-qualified name of the Java class that provides the
       <adm:user-friendly-name />
@@ -63,8 +62,7 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.60</ldap:oid>
-        <ldap:name>ds-cfg-logger-class</ldap:name>
+        <ldap:name>ds-cfg-java-class</ldap:name>
       </ldap:attribute>
     </adm:profile>
   </adm:property>
@@ -158,7 +156,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.31</ldap:oid>
         <ldap:name>ds-cfg-default-severity</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -188,9 +185,8 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.74</ldap:oid>
         <ldap:name>ds-cfg-override-severity</ldap:name>
       </ldap:attribute>
     </adm:profile>
   </adm:property>
-</adm:managed-object>
\ No newline at end of file
+</adm:managed-object>

--
Gitblit v1.10.0