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

Zuitil updates

Browse source
This commit is contained in:
Ziver Koc 2015-12-08 21:51:28 +01:00
parent 6e901569dc
commit b67842ead5
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,14 +25,12 @@ package wa.server.page;
import wa.server.WAContext; import wa.server.WAContext;
import wa.server.plugin.WAConfigEntry; import wa.server.plugin.WAConfigEntry;
import wa.server.plugin.WAServiceConfig; import wa.server.plugin.WAServiceConfig;
import wa.server.plugin.apache.ApacheConfigVirtualHost;
import zutil.db.bean.Configurator;
import zutil.db.bean.DBBean;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;
import zutil.log.LogUtil; import zutil.log.LogUtil;
import zutil.net.http.HttpHeaderParser; import zutil.net.http.HttpHeaderParser;
import zutil.parser.DataNode; import zutil.parser.DataNode;
import zutil.parser.Templator; import zutil.parser.Templator;
import zutil.ui.Configurator;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

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

@ -5,10 +5,10 @@ import wa.server.plugin.WAConfigEntry;
import wa.server.plugin.WAServiceConfig; import wa.server.plugin.WAServiceConfig;
import wa.server.util.ConfigFileUtil; import wa.server.util.ConfigFileUtil;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.db.bean.Configurator.Configurable;
import zutil.db.bean.DBBean; import zutil.db.bean.DBBean;
import zutil.db.bean.DBBean.DBTable; import zutil.db.bean.DBBean.DBTable;
import zutil.io.IOUtil; import zutil.io.IOUtil;
import zutil.ui.Configurator;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
@ -69,12 +69,12 @@ public class ApacheConfigVirtualHost implements WAServiceConfig{
@DBTable(WAConstants.DB_TABLE_PREFIX + "_apache_vhost") @DBTable(WAConstants.DB_TABLE_PREFIX + "_apache_vhost")
public static class ApacheVirtualHostEntry extends WAConfigEntry { public static class ApacheVirtualHostEntry extends WAConfigEntry {
@Configurable("Domain") @Configurator.Configurable("Domain")
protected String domain; protected String domain;
protected transient String domain_old; protected transient String domain_old;
@Configurable("DocRoot") @Configurator.Configurable("DocRoot")
protected String path; protected String path;
@Configurable("SSL") @Configurator.Configurable("SSL")
protected boolean ssl; protected boolean ssl;