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/MonitorConfigManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/MonitorConfigManager.java b/opends/src/server/org/opends/server/core/MonitorConfigManager.java
index afe4761..0b97dc8 100644
--- a/opends/src/server/org/opends/server/core/MonitorConfigManager.java
+++ b/opends/src/server/org/opends/server/core/MonitorConfigManager.java
@@ -120,7 +120,7 @@
if (monitorConfig.isEnabled())
{
- String className = monitorConfig.getMonitorClass();
+ String className = monitorConfig.getJavaClass();
try
{
MonitorProvider<? extends MonitorProviderCfg> monitor =
@@ -154,7 +154,7 @@
{
// Get the name of the class and make sure we can instantiate it as a
// monitor provider.
- String className = configuration.getMonitorClass();
+ String className = configuration.getJavaClass();
try
{
loadMonitor(className, null);
@@ -193,7 +193,7 @@
// Get the name of the class and make sure we can instantiate it as a
// monitor provider.
- String className = configuration.getMonitorClass();
+ String className = configuration.getJavaClass();
try
{
monitor = loadMonitor(className, configuration);
@@ -270,7 +270,7 @@
{
// Get the name of the class and make sure we can instantiate it as a
// monitor provider.
- String className = configuration.getMonitorClass();
+ String className = configuration.getJavaClass();
try
{
loadMonitor(className, null);
@@ -329,7 +329,7 @@
// changed then we'll at least need to indicate that administrative action
// is required. If the monitor is disabled, then instantiate the class and
// initialize and register it as a monitor provider.
- String className = configuration.getMonitorClass();
+ String className = configuration.getJavaClass();
if (existingMonitor != null)
{
if (! className.equals(existingMonitor.getClass().getName()))
@@ -394,7 +394,7 @@
MonitorProviderCfgDefn definition =
MonitorProviderCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getMonitorClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends MonitorProvider> providerClass =
propertyDefinition.loadClass(className, MonitorProvider.class);
MonitorProvider monitor = providerClass.newInstance();
--
Gitblit v1.10.0