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/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
index bff4937..f4207d4 100644
--- a/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
+++ b/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
@@ -133,7 +133,7 @@
       if (config.isEnabled())
       {
         // Load the notification handler implementation class.
-        String className = config.getNotificationHandlerClass();
+        String className = config.getJavaClass();
         loadAndInstallNotificationHandler (className, config);
       }
     }
@@ -156,7 +156,7 @@
     {
       // Get the name of the class and make sure we can instantiate it as an
       // entry cache.
-      String className = configuration.getNotificationHandlerClass();
+      String className = configuration.getJavaClass();
       try
       {
         // Load the class but don't initialize it.
@@ -208,7 +208,7 @@
     // If the current notification handler is already enabled then we
     // don't do anything unless the class has changed in which case we
     // should indicate that administrative action is required.
-    String newClassName = configuration.getNotificationHandlerClass();
+    String newClassName = configuration.getJavaClass();
     if (handler != null)
     {
       String curClassName = handler.getClass().getName();
@@ -264,7 +264,7 @@
     {
       // Get the name of the class and make sure we can instantiate it as
       // an entry cache.
-      String className = configuration.getNotificationHandlerClass();
+      String className = configuration.getJavaClass();
       try
       {
         // Load the class but don't initialize it.
@@ -301,7 +301,7 @@
     if (configuration.isEnabled())
     {
       // Instantiate the class as an entry cache and initialize it.
-      String className = configuration.getNotificationHandlerClass();
+      String className = configuration.getJavaClass();
       try
       {
         loadAndInstallNotificationHandler (className, configuration);
@@ -421,7 +421,7 @@
 
       definition = AccountStatusNotificationHandlerCfgDefn.getInstance();
       propertyDefinition =
-          definition.getNotificationHandlerClassPropertyDefinition();
+          definition.getJavaClassPropertyDefinition();
       handlerClass = propertyDefinition.loadClass(
           className,
           AccountStatusNotificationHandler.class

--
Gitblit v1.10.0