From 09cf0ade4fd10e5e1e7aa7b220e0b7a616a89cfc Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Switch imports from old config to new config

---
 opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java |   37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java
index d3caab6..4a44075 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java
@@ -62,22 +62,21 @@
 import org.forgerock.json.resource.RequestHandler;
 import org.forgerock.opendj.config.ConfigurationFramework;
 import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.admin.server.ServerManagementContext;
-import org.opends.server.admin.std.server.CsvFileAccessLogPublisherCfg;
-import org.opends.server.admin.std.server.CsvFileHTTPAccessLogPublisherCfg;
-import org.opends.server.admin.std.server.ExternalAccessLogPublisherCfg;
-import org.opends.server.admin.std.server.ExternalHTTPAccessLogPublisherCfg;
-import org.opends.server.admin.std.server.FileCountLogRetentionPolicyCfg;
-import org.opends.server.admin.std.server.FixedTimeLogRotationPolicyCfg;
-import org.opends.server.admin.std.server.FreeDiskSpaceLogRetentionPolicyCfg;
-import org.opends.server.admin.std.server.LogPublisherCfg;
-import org.opends.server.admin.std.server.LogRetentionPolicyCfg;
-import org.opends.server.admin.std.server.LogRotationPolicyCfg;
-import org.opends.server.admin.std.server.RootCfg;
-import org.opends.server.admin.std.server.SizeLimitLogRetentionPolicyCfg;
-import org.opends.server.admin.std.server.SizeLimitLogRotationPolicyCfg;
-import org.opends.server.admin.std.server.TimeLimitLogRotationPolicyCfg;
-import org.opends.server.config.ConfigEntry;
+import org.forgerock.opendj.server.config.server.CsvFileAccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.CsvFileHTTPAccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.ExternalAccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.ExternalHTTPAccessLogPublisherCfg;
+import org.forgerock.opendj.server.config.server.FileCountLogRetentionPolicyCfg;
+import org.forgerock.opendj.server.config.server.FixedTimeLogRotationPolicyCfg;
+import org.forgerock.opendj.server.config.server.FreeDiskSpaceLogRetentionPolicyCfg;
+import org.forgerock.opendj.server.config.server.LogPublisherCfg;
+import org.forgerock.opendj.server.config.server.LogRetentionPolicyCfg;
+import org.forgerock.opendj.server.config.server.LogRotationPolicyCfg;
+import org.forgerock.opendj.server.config.server.RootCfg;
+import org.forgerock.opendj.server.config.server.SizeLimitLogRetentionPolicyCfg;
+import org.forgerock.opendj.server.config.server.SizeLimitLogRotationPolicyCfg;
+import org.forgerock.opendj.server.config.server.TimeLimitLogRotationPolicyCfg;
+import org.opends.server.types.Entry;
 import org.opends.server.core.DirectoryServer;
 import org.forgerock.opendj.ldap.DN;
 import org.opends.server.util.StaticUtils;
@@ -504,7 +503,7 @@
   private void addCsvHandlerRotationConfig(PublisherConfig publisher, CsvConfigData config,
       CsvAuditEventHandlerConfiguration auditConfig) throws ConfigException
   {
-    RootCfg root = ServerManagementContext.getInstance().getRootConfiguration();
+    RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
     SortedSet<String> rotationPolicies = config.getRotationPolicies();
     if (rotationPolicies.isEmpty())
     {
@@ -542,7 +541,7 @@
   private void addCsvHandlerRetentionConfig(PublisherConfig publisher, CsvConfigData config,
       CsvAuditEventHandlerConfiguration auditConfig) throws ConfigException
   {
-    RootCfg root = ServerManagementContext.getInstance().getRootConfiguration();
+    RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
     SortedSet<String> retentionPolicies = config.getRetentionPolicies();
     if (retentionPolicies.isEmpty())
     {
@@ -707,7 +706,7 @@
     PublisherConfig(LogPublisherCfg config) throws ConfigException
     {
       this.config = config;
-      ConfigEntry configEntry = DirectoryServer.getConfigEntry(config.dn());
+      Entry configEntry = DirectoryServer.getConfigEntry(config.dn());
       if (configEntry.hasObjectClass("ds-cfg-csv-file-access-log-publisher"))
       {
         auditType = AuditType.CSV;

--
Gitblit v1.10.0