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/SMTPAlertHandlerConfiguration.xml |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/SMTPAlertHandlerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/SMTPAlertHandlerConfiguration.xml
index 7a2da6b..73eaef1 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/SMTPAlertHandlerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/SMTPAlertHandlerConfiguration.xml
@@ -40,13 +40,12 @@
 
   <adm:profile name="ldap">
     <ldap:object-class>
-      <ldap:oid>1.3.6.1.4.1.26027.1.2.118</ldap:oid>
       <ldap:name>ds-cfg-smtp-alert-handler</ldap:name>
       <ldap:superior>ds-cfg-alert-handler</ldap:superior>
     </ldap:object-class>
   </adm:profile>
 
-  <adm:property-override name="alert-handler-class">
+  <adm:property-override name="java-class">
     <adm:default-behavior>
       <adm:defined>
         <adm:value>
@@ -66,7 +65,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.447</ldap:oid>
         <ldap:name>ds-cfg-sender-address</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -83,7 +81,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.448</ldap:oid>
         <ldap:name>ds-cfg-recipient-address</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -103,7 +100,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.449</ldap:oid>
         <ldap:name>ds-cfg-message-subject</ldap:name>
       </ldap:attribute>
     </adm:profile>
@@ -123,7 +119,6 @@
     </adm:syntax>
     <adm:profile name="ldap">
       <ldap:attribute>
-        <ldap:oid>1.3.6.1.4.1.26027.1.1.450</ldap:oid>
         <ldap:name>ds-cfg-message-body</ldap:name>
       </ldap:attribute>
     </adm:profile>

--
Gitblit v1.10.0