From 7bf689647370281647816c1482112848f57db61c Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Fri, 4 Mar 2016 17:55:30 +0100 Subject: [PATCH] Zutil updates --- src/examples/CpuInfo.java | 2 +- src/examples/Df.java | 12 +++------- src/examples/Iostat.java | 12 +++------- src/examples/Netstat.java | 10 ++++----- src/examples/ServerStatus.java | 22 ++++--------------- src/examples/Version.java | 11 +++++----- src/wa/server/WAAbstractPage.java | 8 ++++--- src/wa/server/WAConstants.java | 4 ++-- src/wa/server/WebAdminServer.java | 3 +-- src/wa/server/page/ConfigPage.java | 6 ++--- src/wa/server/page/LogPage.java | 1 - src/wa/server/page/ServicePage.java | 8 +++---- src/wa/server/page/ServiceStatusPage.java | 6 ++--- src/wa/server/page/StatusPage.java | 6 ++--- src/wa/server/page/WAPage.java | 6 ++--- src/wa/server/page/struct/WAAlert.java | 2 -- .../apache/ApacheConfigVirtualHost.java | 4 +++- src/wa/server/plugin/apache/ApacheStatus.java | 2 +- src/wa/server/plugin/hwstatus/HDDStatus.java | 1 - src/wa/server/plugin/hwstatus/NetStatus.java | 2 +- .../tomcat/TomcatConfigApplication.java | 4 ++-- src/wa/server/util/ConfigFileUtil.java | 6 ++--- 22 files changed, 55 insertions(+), 83 deletions(-) mode change 100644 => 100755 src/examples/CpuInfo.java mode change 100644 => 100755 src/examples/Df.java mode change 100644 => 100755 src/examples/Iostat.java mode change 100644 => 100755 src/examples/Netstat.java mode change 100644 => 100755 src/examples/ServerStatus.java mode change 100644 => 100755 src/examples/Version.java mode change 100644 => 100755 src/wa/server/WAConstants.java mode change 100644 => 100755 src/wa/server/WebAdminServer.java mode change 100644 => 100755 src/wa/server/page/ServiceStatusPage.java mode change 100644 => 100755 src/wa/server/page/StatusPage.java mode change 100644 => 100755 src/wa/server/page/WAPage.java mode change 100644 => 100755 src/wa/server/page/struct/WAAlert.java mode change 100644 => 100755 src/wa/server/plugin/apache/ApacheStatus.java mode change 100644 => 100755 src/wa/server/plugin/hwstatus/HDDStatus.java mode change 100644 => 100755 src/wa/server/plugin/hwstatus/NetStatus.java mode change 100644 => 100755 src/wa/server/util/ConfigFileUtil.java diff --git a/src/examples/CpuInfo.java b/src/examples/CpuInfo.java old mode 100644 new mode 100755 index 35b55a2..fa9eeec --- a/src/examples/CpuInfo.java +++ b/src/examples/CpuInfo.java @@ -20,8 +20,8 @@ package test; import org.hyperic.sigar.CpuPerc; import org.hyperic.sigar.Sigar; -import org.hyperic.sigar.SigarLoader; import org.hyperic.sigar.SigarException; +import org.hyperic.sigar.SigarLoader; import org.hyperic.sigar.cmd.Shell; import org.hyperic.sigar.cmd.SigarCommandBase; diff --git a/src/examples/Df.java b/src/examples/Df.java old mode 100644 new mode 100755 index 7b072a7..b236af0 --- a/src/examples/Df.java +++ b/src/examples/Df.java @@ -18,20 +18,14 @@ package test; -import java.util.ArrayList; - -import org.hyperic.sigar.Sigar; -import org.hyperic.sigar.SigarException; -import org.hyperic.sigar.FileSystem; -import org.hyperic.sigar.FileSystemMap; -import org.hyperic.sigar.FileSystemUsage; -import org.hyperic.sigar.NfsFileSystem; - +import org.hyperic.sigar.*; import org.hyperic.sigar.cmd.Shell; import org.hyperic.sigar.cmd.SigarCommandBase; import org.hyperic.sigar.shell.FileCompleter; import org.hyperic.sigar.util.GetlineCompleter; +import java.util.ArrayList; + /** * Report filesytem disk space usage. */ diff --git a/src/examples/Iostat.java b/src/examples/Iostat.java old mode 100644 new mode 100755 index 0d882ae..ba26b86 --- a/src/examples/Iostat.java +++ b/src/examples/Iostat.java @@ -18,20 +18,14 @@ package test; -import java.util.ArrayList; - -import org.hyperic.sigar.Sigar; -import org.hyperic.sigar.SigarException; -import org.hyperic.sigar.FileSystem; -import org.hyperic.sigar.FileSystemMap; -import org.hyperic.sigar.FileSystemUsage; -import org.hyperic.sigar.DiskUsage; - +import org.hyperic.sigar.*; import org.hyperic.sigar.cmd.Shell; import org.hyperic.sigar.cmd.SigarCommandBase; import org.hyperic.sigar.shell.FileCompleter; import org.hyperic.sigar.util.GetlineCompleter; +import java.util.ArrayList; + /** * Report filesytem disk space usage. */ diff --git a/src/examples/Netstat.java b/src/examples/Netstat.java old mode 100644 new mode 100755 index d5fb238..b4a550a --- a/src/examples/Netstat.java +++ b/src/examples/Netstat.java @@ -18,17 +18,17 @@ package test; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; - -import org.hyperic.sigar.SigarException; import org.hyperic.sigar.NetConnection; import org.hyperic.sigar.NetFlags; +import org.hyperic.sigar.SigarException; import org.hyperic.sigar.Tcp; import org.hyperic.sigar.cmd.Shell; import org.hyperic.sigar.cmd.SigarCommandBase; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; + /** * Display network connections. */ diff --git a/src/examples/ServerStatus.java b/src/examples/ServerStatus.java old mode 100644 new mode 100755 index 7263973..63b13bd --- a/src/examples/ServerStatus.java +++ b/src/examples/ServerStatus.java @@ -1,27 +1,13 @@ package wa.servlet; -import java.io.IOException; -import java.io.PrintWriter; +import org.hyperic.sigar.*; +import org.hyperic.sigar.cmd.Shell; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import org.hyperic.sigar.CpuPerc; -import org.hyperic.sigar.FileSystem; -import org.hyperic.sigar.FileSystemUsage; -import org.hyperic.sigar.Mem; -import org.hyperic.sigar.NetFlags; -import org.hyperic.sigar.NetInterfaceConfig; -import org.hyperic.sigar.NetInterfaceStat; -import org.hyperic.sigar.NetRoute; -import org.hyperic.sigar.ProcCpu; -import org.hyperic.sigar.ProcUtil; -import org.hyperic.sigar.Sigar; -import org.hyperic.sigar.SigarException; -import org.hyperic.sigar.CpuInfo; -import org.hyperic.sigar.Swap; -import org.hyperic.sigar.cmd.Shell; +import java.io.IOException; +import java.io.PrintWriter; /** * Generates an XML with the status of the server, extended diff --git a/src/examples/Version.java b/src/examples/Version.java old mode 100644 new mode 100755 index 5d5bf54..aff8cb2 --- a/src/examples/Version.java +++ b/src/examples/Version.java @@ -18,20 +18,19 @@ package test; -import java.io.File; -import java.io.PrintStream; -import java.net.InetAddress; -import java.net.UnknownHostException; - import org.hyperic.sigar.OperatingSystem; import org.hyperic.sigar.Sigar; import org.hyperic.sigar.SigarException; import org.hyperic.sigar.SigarLoader; - import org.hyperic.sigar.cmd.Shell; import org.hyperic.sigar.cmd.SigarCommandBase; import org.hyperic.sigar.win32.LocaleInfo; +import java.io.File; +import java.io.PrintStream; +import java.net.InetAddress; +import java.net.UnknownHostException; + /** * Display Sigar, java and system version information. */ diff --git a/src/wa/server/WAAbstractPage.java b/src/wa/server/WAAbstractPage.java index 692c7a1..34b69e7 100755 --- a/src/wa/server/WAAbstractPage.java +++ b/src/wa/server/WAAbstractPage.java @@ -28,7 +28,7 @@ import wa.server.page.WAPage; import wa.server.page.struct.WANavigation; import zutil.io.file.FileUtil; import zutil.log.LogUtil; -import zutil.net.http.HttpHeaderParser; +import zutil.net.http.HttpHeader; import zutil.net.http.HttpPage; import zutil.net.http.HttpPrintStream; import zutil.parser.DataNode; @@ -37,7 +37,9 @@ import zutil.parser.json.JSONWriter; import zutil.plugin.PluginManager; import java.io.IOException; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; @@ -68,7 +70,7 @@ public class WAAbstractPage implements HttpPage{ @Override public final synchronized void respond(HttpPrintStream out, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request) throws IOException { diff --git a/src/wa/server/WAConstants.java b/src/wa/server/WAConstants.java old mode 100644 new mode 100755 index 05e9273..772d76c --- a/src/wa/server/WAConstants.java +++ b/src/wa/server/WAConstants.java @@ -1,11 +1,11 @@ package wa.server; -import java.io.File; - import zutil.db.DBConnection; import zutil.osal.OSAbstractionLayer; import zutil.osal.OSAbstractionLayer.OSType; +import java.io.File; + public class WAConstants { public static final String DB_FILE_NAME = "webadmin.db"; diff --git a/src/wa/server/WebAdminServer.java b/src/wa/server/WebAdminServer.java old mode 100644 new mode 100755 index a0a5311..a1f2e08 --- a/src/wa/server/WebAdminServer.java +++ b/src/wa/server/WebAdminServer.java @@ -1,11 +1,10 @@ package wa.server; -import wa.server.page.StatusPage; import zutil.io.file.FileUtil; import zutil.log.CompactLogFormatter; import zutil.log.LogUtil; import zutil.net.http.HttpServer; -import zutil.net.http.pages.HttpFilePage; +import zutil.net.http.page.HttpFilePage; import zutil.plugin.PluginManager; import java.util.logging.Level; diff --git a/src/wa/server/page/ConfigPage.java b/src/wa/server/page/ConfigPage.java index 9b247ef..fa6e566 100755 --- a/src/wa/server/page/ConfigPage.java +++ b/src/wa/server/page/ConfigPage.java @@ -27,7 +27,7 @@ import wa.server.plugin.WAConfigEntry; import wa.server.plugin.WAServiceConfig; import zutil.io.file.FileUtil; import zutil.log.LogUtil; -import zutil.net.http.HttpHeaderParser; +import zutil.net.http.HttpHeader; import zutil.parser.DataNode; import zutil.parser.Templator; import zutil.ui.Configurator; @@ -59,7 +59,7 @@ public class ConfigPage implements WAPage{ @Override public Templator htmlResponse(WAContext context, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request) { @@ -108,7 +108,7 @@ public class ConfigPage implements WAPage{ @Override public DataNode jsonResponse(WAContext context, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request) { diff --git a/src/wa/server/page/LogPage.java b/src/wa/server/page/LogPage.java index 20353ba..3289432 100755 --- a/src/wa/server/page/LogPage.java +++ b/src/wa/server/page/LogPage.java @@ -24,7 +24,6 @@ package wa.server.page; import wa.server.plugin.WALog; import zutil.net.http.HttpHeader; -import zutil.net.http.HttpHeaderParser; import zutil.net.http.HttpPage; import zutil.net.http.HttpPrintStream; import zutil.parser.DataNode; diff --git a/src/wa/server/page/ServicePage.java b/src/wa/server/page/ServicePage.java index cc23337..369dc10 100755 --- a/src/wa/server/page/ServicePage.java +++ b/src/wa/server/page/ServicePage.java @@ -24,11 +24,11 @@ package wa.server.page; import wa.server.WAContext; import wa.server.page.struct.WANavigation; -import wa.server.plugin.WAServiceConfig; import wa.server.plugin.WAService; +import wa.server.plugin.WAServiceConfig; import zutil.io.file.FileUtil; import zutil.log.LogUtil; -import zutil.net.http.HttpHeaderParser; +import zutil.net.http.HttpHeader; import zutil.parser.DataNode; import zutil.parser.Templator; import zutil.plugin.PluginManager; @@ -80,7 +80,7 @@ public class ServicePage implements WAPage { @Override public Templator htmlResponse(WAContext context, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request) { @@ -116,7 +116,7 @@ public class ServicePage implements WAPage { } public DataNode jsonResponse(WAContext context, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request){ diff --git a/src/wa/server/page/ServiceStatusPage.java b/src/wa/server/page/ServiceStatusPage.java old mode 100644 new mode 100755 index 055e9c6..51249d6 --- a/src/wa/server/page/ServiceStatusPage.java +++ b/src/wa/server/page/ServiceStatusPage.java @@ -27,7 +27,7 @@ import wa.server.page.struct.WANavigation; import wa.server.plugin.WAServiceStatus; import zutil.io.file.FileUtil; import zutil.log.LogUtil; -import zutil.net.http.HttpHeaderParser; +import zutil.net.http.HttpHeader; import zutil.parser.DataNode; import zutil.parser.Templator; import zutil.plugin.PluginManager; @@ -64,7 +64,7 @@ public class ServiceStatusPage implements WAPage { @Override public Templator htmlResponse(WAContext context, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request) { @@ -80,7 +80,7 @@ public class ServiceStatusPage implements WAPage { } public DataNode jsonResponse(WAContext context, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request){ diff --git a/src/wa/server/page/StatusPage.java b/src/wa/server/page/StatusPage.java old mode 100644 new mode 100755 index 902ce2a..4d434b4 --- a/src/wa/server/page/StatusPage.java +++ b/src/wa/server/page/StatusPage.java @@ -25,7 +25,7 @@ package wa.server.page; import wa.server.WAContext; import wa.server.page.struct.WANavigation; import wa.server.plugin.WAStatus; -import zutil.net.http.HttpHeaderParser; +import zutil.net.http.HttpHeader; import zutil.parser.DataNode; import zutil.parser.Templator; import zutil.plugin.PluginManager; @@ -52,7 +52,7 @@ public class StatusPage implements WAPage { @Override public Templator htmlResponse(WAContext context, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request) { @@ -65,7 +65,7 @@ public class StatusPage implements WAPage { } public DataNode jsonResponse(WAContext context, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request){ diff --git a/src/wa/server/page/WAPage.java b/src/wa/server/page/WAPage.java old mode 100644 new mode 100755 index f3cec46..567b1cf --- a/src/wa/server/page/WAPage.java +++ b/src/wa/server/page/WAPage.java @@ -23,7 +23,7 @@ package wa.server.page; import wa.server.WAContext; -import zutil.net.http.HttpHeaderParser; +import zutil.net.http.HttpHeader; import zutil.parser.DataNode; import zutil.parser.Templator; @@ -35,13 +35,13 @@ import java.util.Map; public interface WAPage { public abstract Templator htmlResponse(WAContext context, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request); public DataNode jsonResponse(WAContext context, - HttpHeaderParser client_info, + HttpHeader client_info, Map session, Map cookie, Map request); diff --git a/src/wa/server/page/struct/WAAlert.java b/src/wa/server/page/struct/WAAlert.java old mode 100644 new mode 100755 index 99d1598..7567da0 --- a/src/wa/server/page/struct/WAAlert.java +++ b/src/wa/server/page/struct/WAAlert.java @@ -22,8 +22,6 @@ package wa.server.page.struct; -import java.sql.Struct; - /** * Created by Ziver on 2015-04-03. */ diff --git a/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java b/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java index 56573c9..ccd3567 100755 --- a/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java +++ b/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java @@ -10,7 +10,9 @@ import zutil.db.bean.DBBean.DBTable; import zutil.io.IOUtil; import zutil.ui.Configurator; -import java.io.*; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.PrintStream; import java.util.ArrayList; import java.util.List; diff --git a/src/wa/server/plugin/apache/ApacheStatus.java b/src/wa/server/plugin/apache/ApacheStatus.java old mode 100644 new mode 100755 index 02faff4..91e17d2 --- a/src/wa/server/plugin/apache/ApacheStatus.java +++ b/src/wa/server/plugin/apache/ApacheStatus.java @@ -23,10 +23,10 @@ package wa.server.plugin.apache; import wa.server.plugin.WAServiceStatus; -import zutil.osal.app.linux.Ps; import zutil.io.file.FileUtil; import zutil.log.LogUtil; import zutil.osal.OSAbstractionLayer; +import zutil.osal.app.linux.Ps; import java.io.File; import java.io.IOException; diff --git a/src/wa/server/plugin/hwstatus/HDDStatus.java b/src/wa/server/plugin/hwstatus/HDDStatus.java old mode 100644 new mode 100755 index 64bf151..b54dd6e --- a/src/wa/server/plugin/hwstatus/HDDStatus.java +++ b/src/wa/server/plugin/hwstatus/HDDStatus.java @@ -30,7 +30,6 @@ import org.hyperic.sigar.cmd.Shell; import wa.server.plugin.WAStatus; import zutil.io.file.FileUtil; import zutil.parser.DataNode; -import zutil.parser.Templator; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/src/wa/server/plugin/hwstatus/NetStatus.java b/src/wa/server/plugin/hwstatus/NetStatus.java old mode 100644 new mode 100755 index e220dbb..d6381b0 --- a/src/wa/server/plugin/hwstatus/NetStatus.java +++ b/src/wa/server/plugin/hwstatus/NetStatus.java @@ -25,8 +25,8 @@ package wa.server.plugin.hwstatus; import org.hyperic.sigar.*; import org.hyperic.sigar.cmd.Shell; import wa.server.plugin.WAStatus; -import zutil.net.ThroughputCalculator; import zutil.io.file.FileUtil; +import zutil.net.ThroughputCalculator; import zutil.parser.DataNode; import java.io.IOException; diff --git a/src/wa/server/plugin/tomcat/TomcatConfigApplication.java b/src/wa/server/plugin/tomcat/TomcatConfigApplication.java index de1030c..00a9218 100755 --- a/src/wa/server/plugin/tomcat/TomcatConfigApplication.java +++ b/src/wa/server/plugin/tomcat/TomcatConfigApplication.java @@ -21,10 +21,10 @@ */ package wa.server.plugin.tomcat; -import java.io.PrintStream; - import wa.server.plugin.apache.ApacheConfigVirtualHost.ApacheVirtualHostEntry; +import java.io.PrintStream; + public class TomcatConfigApplication { diff --git a/src/wa/server/util/ConfigFileUtil.java b/src/wa/server/util/ConfigFileUtil.java old mode 100644 new mode 100755 index a16b200..d62883d --- a/src/wa/server/util/ConfigFileUtil.java +++ b/src/wa/server/util/ConfigFileUtil.java @@ -1,11 +1,11 @@ package wa.server.util; -import java.io.File; -import java.io.IOException; - import wa.server.WAConstants; import zutil.io.file.FileUtil; +import java.io.File; +import java.io.IOException; + public class ConfigFileUtil { public static void writeBetweenBoundary(File file, String commentChar, String data) throws IOException{