From b0cf989c6727f18d0c7ee80b4753ef95d60955ea Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 25 Jun 2007 01:46:55 +0000
Subject: [PATCH] Migrate the monitor provider configuration to the admin framework.

---
 opends/src/server/org/opends/server/backends/MonitorBackend.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/opends/src/server/org/opends/server/backends/MonitorBackend.java b/opends/src/server/org/opends/server/backends/MonitorBackend.java
index 4b04068..85a8eea 100644
--- a/opends/src/server/org/opends/server/backends/MonitorBackend.java
+++ b/opends/src/server/org/opends/server/backends/MonitorBackend.java
@@ -35,6 +35,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 
+import org.opends.server.admin.std.server.MonitorProviderCfg;
 import org.opends.server.api.Backend;
 import org.opends.server.api.MonitorProvider;
 import org.opends.server.config.ConfigEntry;
@@ -425,7 +426,7 @@
     // Get the RDN value and see if it matches the instance name for one of
     // the directory server monitor providers.
     String rdnValue = entryRDN.getAttributeValue(0).getStringValue();
-    MonitorProvider monitorProvider =
+    MonitorProvider<? extends MonitorProviderCfg> monitorProvider =
          DirectoryServer.getMonitorProvider(rdnValue.toLowerCase());
     if (monitorProvider == null)
     {
@@ -664,7 +665,9 @@
    * @return  The monitor entry generated from the information in the provided
    *          monitor provider.
    */
-  private Entry getMonitorEntry(DN entryDN, MonitorProvider monitorProvider)
+  private Entry getMonitorEntry(DN entryDN,
+                     MonitorProvider<? extends MonitorProviderCfg>
+                          monitorProvider)
   {
     HashMap<ObjectClass,String> monitorClasses =
          new LinkedHashMap<ObjectClass,String>(3);
@@ -897,7 +900,7 @@
 
       // Iterate through all of the monitor providers defined in the server.
       // Get an entry for each and compare it against the filter.
-      for (MonitorProvider monitorProvider :
+      for (MonitorProvider<? extends MonitorProviderCfg> monitorProvider :
            DirectoryServer.getMonitorProviders().values())
       {
         DN providerDN = DirectoryServer.getMonitorProviderDN(monitorProvider);

--
Gitblit v1.10.0