ziver/webadmin
1
0
Fork 0
Code Pull requests Releases Activity

Zutil updates

Browse source
This commit is contained in:
Ziver Koc 2016-03-04 17:55:30 +01:00
parent 7e957bc34e
commit 7bf6896473
22 changed files with 55 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/wa/server/WAAbstractPage.java
View file

@ -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<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) throws IOException {

4
src/wa/server/WAConstants.java Normal file → Executable file
View file

@ -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";

3
src/wa/server/WebAdminServer.java Normal file → Executable file
View file

@ -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;

6
src/wa/server/page/ConfigPage.java
View file

@ -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<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) {
@ -108,7 +108,7 @@ public class ConfigPage implements WAPage{
@Override
public DataNode jsonResponse(WAContext context,
HttpHeaderParser client_info,
HttpHeader client_info,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) {

1
src/wa/server/page/LogPage.java
View file

@ -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;

8
src/wa/server/page/ServicePage.java
View file

@ -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<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) {
@ -116,7 +116,7 @@ public class ServicePage implements WAPage {
}
public DataNode jsonResponse(WAContext context,
HttpHeaderParser client_info,
HttpHeader client_info,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request){

6
src/wa/server/page/ServiceStatusPage.java Normal file → Executable file
View file

@ -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<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) {
@ -80,7 +80,7 @@ public class ServiceStatusPage implements WAPage {
}
public DataNode jsonResponse(WAContext context,
HttpHeaderParser client_info,
HttpHeader client_info,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request){

6
src/wa/server/page/StatusPage.java Normal file → Executable file
View file

@ -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<String, Object> session,
Map<String, String> cookie,
Map<String, String> request) {
@ -65,7 +65,7 @@ public class StatusPage implements WAPage {
}
public DataNode jsonResponse(WAContext context,
HttpHeaderParser client_info,
HttpHeader client_info,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request){

6
src/wa/server/page/WAPage.java Normal file → Executable file
View file

@ -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<String, Object> session,
Map<String, String> cookie,
Map<String, String> request);
public DataNode jsonResponse(WAContext context,
HttpHeaderParser client_info,
HttpHeader client_info,
Map<String, Object> session,
Map<String, String> cookie,
Map<String, String> request);

2
src/wa/server/page/struct/WAAlert.java Normal file → Executable file
View file

@ -22,8 +22,6 @@
package wa.server.page.struct;
import java.sql.Struct;
/**
* Created by Ziver on 2015-04-03.
*/

4
src/wa/server/plugin/apache/ApacheConfigVirtualHost.java
View file

@ -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;

2
src/wa/server/plugin/apache/ApacheStatus.java Normal file → Executable file
View file

@ -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;

1
src/wa/server/plugin/hwstatus/HDDStatus.java Normal file → Executable file
View file

@ -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;

2
src/wa/server/plugin/hwstatus/NetStatus.java Normal file → Executable file
View file

@ -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;

4
src/wa/server/plugin/tomcat/TomcatConfigApplication.java
View file

@ -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 {

6
src/wa/server/util/ConfigFileUtil.java Normal file → Executable file
View file

@ -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{