From a28ebc6ff2fc31673d101d7ea8e046f2ed9db330 Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Thu, 25 Apr 2019 11:46:11 -0400
Subject: [PATCH] GT-2740 revision to facilitate test use of ServerAdmin
 utility

---
 .../src/main/java/ghidra/server/ServerAdmin.java | 16 +++++++++++++++-
 .../ghidra/server/remote/ServerTestUtil.java     |  7 ++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
index 530ab9697e..2913e84549 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
@@ -50,7 +50,7 @@ public class ServerAdmin implements GhidraLaunchable {
 	private boolean propertyUsed = false;
 
 	/**
-	 * Main method for running the UserAdmin Application.
+	 * Main method for launching the ServerAdmin Application via GhidraLauncher.
 	 * The following properties may be set:
 	 * <pre>
 	 *   UserAdmin.invocation - identifies the name of the application used when displaying usage text.
@@ -69,6 +69,20 @@ public class ServerAdmin implements GhidraLaunchable {
 			Application.initializeApplication(layout, configuration);
 		}
 
+		execute(args);
+	}
+
+	/**
+	 * Main method for processing ServerAdmin command line arguments.
+	 * The following properties may be set:
+	 * <pre>
+	 *   UserAdmin.invocation - identifies the name of the application used when displaying usage text.
+	 *   UserAdmin.serverDir - identifies the server directory instead of passing on command line.
+	 * </pre>
+	 * @param args command line arguments
+	 */
+	public void execute(String[] args) {
+
 		File serverDir = null;
 
 		int ix = 0;
diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/remote/ServerTestUtil.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/remote/ServerTestUtil.java
index f38f7db0c6..87587d1a16 100644
--- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/remote/ServerTestUtil.java
+++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/remote/ServerTestUtil.java
@@ -40,7 +40,7 @@ import ghidra.framework.store.local.LocalFileSystem;
 import ghidra.framework.store.local.LocalFolderItem;
 import ghidra.net.*;
 import ghidra.program.model.listing.Program;
-import ghidra.server.UserAdmin;
+import ghidra.server.ServerAdmin;
 import ghidra.server.UserManager;
 import ghidra.test.ToyProgramBuilder;
 import ghidra.util.*;
@@ -940,11 +940,12 @@ public class ServerTestUtil {
 	 * @throws Exception
 	 */
 	public static void addPKIUser(File serverRoot, String userName, String dn) throws Exception {
+		ServerAdmin serverAdmin = new ServerAdmin();
 		if (dn != null) {
-			UserAdmin.main(new String[] { serverRoot.getAbsolutePath(), "-dn", userName, dn });
+			serverAdmin.execute(new String[] { serverRoot.getAbsolutePath(), "-dn", userName, dn });
 		}
 		else {
-			UserAdmin.main(new String[] { serverRoot.getAbsolutePath(), "-add", userName });
+			serverAdmin.execute(new String[] { serverRoot.getAbsolutePath(), "-add", userName });
 		}
 	}