From 883c4b7810dcabba4ebe2924ca0757485f5312da Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Fri, 15 Jun 2007 21:55:02 +0000
Subject: [PATCH] - Add a few more unit tests for important classes. This also includes some plumbing for getting the quicksetup tests' workspace server configured enough so that it is startable and stoppable for testing.
---
opends/src/statuspanel/org/opends/statuspanel/StatusCli.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java b/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java
index c3729ef..8c9471a 100644
--- a/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java
+++ b/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java
@@ -40,8 +40,8 @@
import javax.swing.table.TableModel;
-import org.opends.quicksetup.CurrentInstallStatus;
import org.opends.quicksetup.Installation;
+import org.opends.quicksetup.QuickSetupLog;
import org.opends.quicksetup.util.Utils;
import org.opends.server.core.DirectoryServer;
@@ -52,8 +52,6 @@
import static org.opends.server.tools.ToolConstants.*;
import org.opends.server.util.PasswordReader;
-import static org.opends.server.messages.ToolMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
/**
* The class used to provide some CLI interface to display status.
@@ -90,6 +88,7 @@
*/
public static void main(String[] args)
{
+ QuickSetupLog.disableConsoleLogging();
StatusCli cli = new StatusCli(args);
System.exit(cli.run());
}
@@ -274,7 +273,8 @@
}
else
{
- boolean isServerRunning = CurrentInstallStatus.isServerRunning();
+ boolean isServerRunning =
+ Installation.getLocal().getStatus().isServerRunning();
/* This is required to retrieve the ldap url to be used by the
* ConfigFromLDAP class.
*/
@@ -397,7 +397,7 @@
ServerStatusDescriptor desc = new ServerStatusDescriptor();
desc.setAuthenticated((dn != null) && (pwd != null));
- if (CurrentInstallStatus.isServerRunning())
+ if (Installation.getLocal().getStatus().isServerRunning())
{
desc.setStatus(ServerStatusDescriptor.ServerStatus.STARTED);
}
--
Gitblit v1.10.0