From 813d48ca05480925c687181273b31c4635b8e014 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Fri, 7 Aug 2015 14:46:01 +0000 Subject: [PATCH] Initial impl of configuration page --- resources/WebContent/page/ConfigPage.tmpl | 18 +++-- src/wa/server/page/ConfigPage.java | 2 + src/wa/server/plugin/WAServiceConfig.java | 24 +++++-- src/wa/server/plugin/apache/ApacheConfig.java | 19 ++--- .../apache/ApacheConfigVirtualHost.java | 72 +++++++++++-------- 5 files changed, 80 insertions(+), 55 deletions(-) diff --git a/resources/WebContent/page/ConfigPage.tmpl b/resources/WebContent/page/ConfigPage.tmpl index 143573e..409146c 100644 --- a/resources/WebContent/page/ConfigPage.tmpl +++ b/resources/WebContent/page/ConfigPage.tmpl @@ -4,14 +4,18 @@
- - - + {{#headers}}{{#headers}} - {{! #data}} + {{#data}} - - + {{#params}} + + {{/params}} - {{! /data}} + {{/data}}
ServiceDescriptionActionsService
{{.getName()}}{{.getValue()}} + {{#.isTypeBoolean()}} + + {{/.isTypeBoolean()}} + {{^.isTypeBoolean()}}{{.getValue()}}{{/.isTypeBoolean()}} + {{^.enabled}}{{/.enabled}} @@ -19,7 +23,7 @@
diff --git a/src/wa/server/page/ConfigPage.java b/src/wa/server/page/ConfigPage.java index db5399d..d95e18b 100644 --- a/src/wa/server/page/ConfigPage.java +++ b/src/wa/server/page/ConfigPage.java @@ -61,6 +61,8 @@ public class ConfigPage implements WAPage{ Map request) { try { Templator tmpl = new Templator(FileUtil.find(TMPL_FILE)); + tmpl.set("headers", null); + tmpl.set("data", null); return tmpl; } catch (IOException e) { log.log(Level.SEVERE, null, e); diff --git a/src/wa/server/plugin/WAServiceConfig.java b/src/wa/server/plugin/WAServiceConfig.java index 5634941..666b583 100644 --- a/src/wa/server/plugin/WAServiceConfig.java +++ b/src/wa/server/plugin/WAServiceConfig.java @@ -1,12 +1,24 @@ package wa.server.plugin; -import java.io.IOException; -import java.sql.SQLException; - -import zutil.db.DBConnection; public interface WAServiceConfig { + /** + * @return the String name of this configuration type + */ public String getName(); - public void read() throws SQLException; - public void save() throws IOException; + + /** + * Read in current configuration data + */ + public void read() throws Exception; + + /** + * Save configured data to disk or database + */ + public void save() throws Exception; + + /** + * Configure service with current configuration data + */ + public void configure() throws Exception; } diff --git a/src/wa/server/plugin/apache/ApacheConfig.java b/src/wa/server/plugin/apache/ApacheConfig.java index 293eada..6e6d4f0 100644 --- a/src/wa/server/plugin/apache/ApacheConfig.java +++ b/src/wa/server/plugin/apache/ApacheConfig.java @@ -19,18 +19,9 @@ public class ApacheConfig{ private static final String STATIC_PRE_CONF = "wa/server/plugin/apache/apache_default.config"; // Configuration data - List vhosts; + List vhosts; - public ApacheConfig(){ - vhosts = new LinkedList(); - } - - - public void read() throws SQLException { - DBConnection db = WAConstants.getDB(); - //vhosts = ApacheConfigVirtualHost.load(db, ApacheConfigVirtualHost.class); - } public void save() throws IOException { @@ -47,7 +38,7 @@ public class ApacheConfig{ out.println(FileUtil.getContent(new File(STATIC_PRE_CONF))); out.println("######################################"); out.println("# vhost.php"); - for(ApacheConfigVirtualHost vhost : vhosts){ + for(ApacheConfigVirtualHost.VirtualHostData vhost : vhosts){ if(vhost.isSSL()) writeSSLVhost(out, vhost); else @@ -57,7 +48,7 @@ public class ApacheConfig{ out.close(); } - private void writeVhost(PrintStream out, ApacheConfigVirtualHost conf) throws IOException{ + private void writeVhost(PrintStream out, ApacheConfigVirtualHost.VirtualHostData conf) throws IOException{ out.println(""); out.println(" ServerName "+conf.getDomain()+":80"); out.println(" DocumentRoot "+conf.getPath()); @@ -65,7 +56,7 @@ public class ApacheConfig{ out.println(""); } - private void writeSSLVhost(PrintStream out, ApacheConfigVirtualHost conf) throws IOException{ + private void writeSSLVhost(PrintStream out, ApacheConfigVirtualHost.VirtualHostData conf) throws IOException{ out.println(""); out.println(" ServerName "+conf.getDomain()+":80"); out.println(" RewriteEngine On"); @@ -83,7 +74,7 @@ public class ApacheConfig{ out.println(""); } - private void writeTomcatVhost(PrintStream out, ApacheConfigVirtualHost conf) throws IOException{ + private void writeTomcatVhost(PrintStream out, ApacheConfigVirtualHost.VirtualHostData conf) throws IOException{ out.println(""); out.println(" ServerName "+conf.getDomain()+":80"); out.println(" "); diff --git a/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java b/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java index f9ababa..b824bd9 100644 --- a/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java +++ b/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java @@ -2,38 +2,19 @@ package wa.server.plugin.apache; import wa.server.WAConstants; import wa.server.plugin.WAServiceConfig; +import zutil.db.DBConnection; import zutil.db.bean.DBBean; -import zutil.db.bean.DBBean.DBTable;;import java.io.IOException; -import java.sql.SQLException; +import zutil.db.bean.DBBean.DBTable; + +import java.util.ArrayList; +import java.util.List; + -@DBTable(WAConstants.DB_TABLE_PREFIX+"_apache_vhost") public class ApacheConfigVirtualHost implements WAServiceConfig{ public static final String CONFIG_NAME = "Apache Virtual Host"; - protected String domain; - protected String path; - protected boolean ssl; + private List vhosts = new ArrayList<>(); - - - public String getDomain() { - return domain; - } - public void setDomain(String domain) { - this.domain = domain; - } - public String getPath() { - return path; - } - public void setPath(String path) { - this.path = path; - } - public boolean isSSL() { - return ssl; - } - public void setSSL(boolean ssl) { - this.ssl = ssl; - } @Override public String getName() { @@ -41,12 +22,47 @@ public class ApacheConfigVirtualHost implements WAServiceConfig{ } @Override - public void read() throws SQLException { + public void read() throws Exception { + DBConnection db = WAConstants.getDB(); + vhosts = DBBean.load(db, VirtualHostData.class); + } + + @Override + public void save() throws Exception { } @Override - public void save() throws IOException { + public void configure() throws Exception { } + + + @DBTable(WAConstants.DB_TABLE_PREFIX + "_apache_vhost") + public static class VirtualHostData extends DBBean{ + protected String domain; + protected String path; + protected boolean ssl; + + + + public String getDomain() { + return domain; + } + public void setDomain(String domain) { + this.domain = domain; + } + public String getPath() { + return path; + } + public void setPath(String path) { + this.path = path; + } + public boolean isSSL() { + return ssl; + } + public void setSSL(boolean ssl) { + this.ssl = ssl; + } + } }