From 1d34162bb53d8dad95e92744eabaa246d1953585 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Wed, 27 May 2015 12:21:38 +0000
Subject: [PATCH] Moved some util classes from webadmin to zutil

---
 src/wa/server/plugin/apache/ApacheInstaller.java | 3 +--
 src/wa/server/plugin/apache/ApacheService.java   | 7 -------
 src/wa/server/plugin/apache/ApacheStatus.java    | 2 +-
 src/wa/server/plugin/hwstatus/NetStatus.java     | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/wa/server/plugin/apache/ApacheInstaller.java b/src/wa/server/plugin/apache/ApacheInstaller.java
index 431a131..0c9e80d 100644
--- a/src/wa/server/plugin/apache/ApacheInstaller.java
+++ b/src/wa/server/plugin/apache/ApacheInstaller.java
@@ -23,8 +23,7 @@
 package wa.server.plugin.apache;
 
 import wa.server.plugin.WAInstaller;
-import wa.server.util.AptGet;
-import zutil.osal.OSAbstractionLayer;
+import zutil.osal.app.linux.AptGet;
 
 /**
  * Created by Ziver on 2014-11-09.
diff --git a/src/wa/server/plugin/apache/ApacheService.java b/src/wa/server/plugin/apache/ApacheService.java
index a8ac665..1e1097d 100644
--- a/src/wa/server/plugin/apache/ApacheService.java
+++ b/src/wa/server/plugin/apache/ApacheService.java
@@ -25,15 +25,8 @@ package wa.server.plugin.apache;
 import wa.server.plugin.WAInstaller;
 import wa.server.plugin.WAService;
 import wa.server.plugin.WAServiceStatus;
-import wa.server.util.AptGet;
-import wa.server.util.Ps;
-import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
-import zutil.osal.OSAbstractionLayer;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
diff --git a/src/wa/server/plugin/apache/ApacheStatus.java b/src/wa/server/plugin/apache/ApacheStatus.java
index abd8b23..d6993a4 100644
--- a/src/wa/server/plugin/apache/ApacheStatus.java
+++ b/src/wa/server/plugin/apache/ApacheStatus.java
@@ -23,7 +23,7 @@
 package wa.server.plugin.apache;
 
 import wa.server.plugin.WAServiceStatus;
-import wa.server.util.Ps;
+import zutil.osal.app.linux.Ps;
 import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
 import zutil.osal.OSAbstractionLayer;
diff --git a/src/wa/server/plugin/hwstatus/NetStatus.java b/src/wa/server/plugin/hwstatus/NetStatus.java
index 86712d1..e220dbb 100644
--- a/src/wa/server/plugin/hwstatus/NetStatus.java
+++ b/src/wa/server/plugin/hwstatus/NetStatus.java
@@ -25,7 +25,7 @@ package wa.server.plugin.hwstatus;
 import org.hyperic.sigar.*;
 import org.hyperic.sigar.cmd.Shell;
 import wa.server.plugin.WAStatus;
-import wa.server.util.ThroughputCalculator;
+import zutil.net.ThroughputCalculator;
 import zutil.io.file.FileUtil;
 import zutil.parser.DataNode;