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/AlertHandlerConfigManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/AlertHandlerConfigManager.java b/opends/src/server/org/opends/server/core/AlertHandlerConfigManager.java
index 4479545..20301de 100644
--- a/opends/src/server/org/opends/server/core/AlertHandlerConfigManager.java
+++ b/opends/src/server/org/opends/server/core/AlertHandlerConfigManager.java
@@ -120,7 +120,7 @@
if (configuration.isEnabled())
{
- String className = configuration.getAlertHandlerClass();
+ String className = configuration.getJavaClass();
try
{
AlertHandler handler = loadHandler(className, configuration, true);
@@ -148,7 +148,7 @@
{
// Get the name of the class and make sure we can instantiate it as an
// alert handler.
- String className = configuration.getAlertHandlerClass();
+ String className = configuration.getJavaClass();
try
{
loadHandler(className, configuration, false);
@@ -186,7 +186,7 @@
// Get the name of the class and make sure we can instantiate it as an alert
// handler.
- String className = configuration.getAlertHandlerClass();
+ String className = configuration.getJavaClass();
try
{
alertHandler = loadHandler(className, configuration, true);
@@ -258,7 +258,7 @@
{
// Get the name of the class and make sure we can instantiate it as an
// alert handler.
- String className = configuration.getAlertHandlerClass();
+ String className = configuration.getJavaClass();
try
{
loadHandler(className, configuration, false);
@@ -315,7 +315,7 @@
// then we'll at least need to indicate that administrative action is
// required. If the handler is disabled, then instantiate the class and
// initialize and register it as an alert handler.
- String className = configuration.getAlertHandlerClass();
+ String className = configuration.getJavaClass();
if (existingHandler != null)
{
if (! className.equals(existingHandler.getClass().getName()))
@@ -377,7 +377,7 @@
{
AlertHandlerCfgDefn definition = AlertHandlerCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getAlertHandlerClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends AlertHandler> handlerClass =
propertyDefinition.loadClass(className, AlertHandler.class);
AlertHandler handler = handlerClass.newInstance();
--
Gitblit v1.10.0