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/DebugLogPublisherConfiguration.xml |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml
index 3a3dcf2..fbb04ad 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/DebugLogPublisherConfiguration.xml
@@ -41,9 +41,8 @@
 
   <adm:profile name="ldap">
     <ldap:object-class>
-      <ldap:oid>1.3.6.1.4.1.26027.1.2.25</ldap:oid>
-      <ldap:name>ds-cfg-debug-logger</ldap:name>
-      <ldap:superior>ds-cfg-logger</ldap:superior>
+      <ldap:name>ds-cfg-debug-log-publisher</ldap:name>
+      <ldap:superior>ds-cfg-log-publisher</ldap:superior>
     </ldap:object-class>
   </adm:profile>
 
@@ -60,7 +59,7 @@
     </adm:profile>
   </adm:relation>
 
-  <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 />
@@ -75,8 +74,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>
@@ -124,7 +122,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.345</ldap:oid>
         <ldap:name>ds-cfg-default-debug-level</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -176,7 +173,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.346</ldap:oid>
         <ldap:name>ds-cfg-default-debug-category</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -197,7 +193,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.347</ldap:oid>
         <ldap:name>
           ds-cfg-default-omit-method-entry-arguments
         </ldap:name>
@@ -220,7 +215,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.348</ldap:oid>
         <ldap:name>ds-cfg-default-omit-method-return-value</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -241,7 +235,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.349</ldap:oid>
         <ldap:name>ds-cfg-default-include-throwable-cause</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -262,7 +255,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.350</ldap:oid>
         <ldap:name>ds-cfg-default-throwable-stack-frames</ldap:name>
       </ldap:attribute>
     </adm:profile>

--
Gitblit v1.10.0