diff --git a/src/wa/server/page/ServicePage.java b/src/wa/server/page/ServicePage.java index 7c972d7..4f2a7f7 100644 --- a/src/wa/server/page/ServicePage.java +++ b/src/wa/server/page/ServicePage.java @@ -24,6 +24,7 @@ package wa.server.page; import wa.server.WAContext; import wa.server.page.struct.WANavigation; +import wa.server.plugin.WAConfiguration; import wa.server.plugin.WAService; import wa.server.plugin.WAServiceStatus; import zutil.io.file.FileUtil; @@ -56,8 +57,11 @@ public class ServicePage implements WAPage { WANavigation nav = new WANavigation(NAVIGATION_NAME, this); for(WAService plugin : services) { - nav.addSubNav(new WANavigation(plugin.getName(), plugin)); statuses.add(new ServiceStatusPage(plugin.getStatus())); + nav.addSubNav(new WANavigation(plugin.getName(), plugin)); + for(WAConfiguration conf : plugin.getConfigurations()){ + + } } WANavigation.addRootNav(nav); } diff --git a/src/wa/server/plugin/WAConfigurator.java b/src/wa/server/plugin/WAConfiguration.java similarity index 83% rename from src/wa/server/plugin/WAConfigurator.java rename to src/wa/server/plugin/WAConfiguration.java index 9231bba..70d2c2f 100644 --- a/src/wa/server/plugin/WAConfigurator.java +++ b/src/wa/server/plugin/WAConfiguration.java @@ -5,7 +5,7 @@ import java.sql.SQLException; import zutil.db.DBConnection; -public interface WAConfigurator { +public interface WAConfiguration { public void read(DBConnection db) throws SQLException; public void save(DBConnection db) throws IOException; } diff --git a/src/wa/server/plugin/WAService.java b/src/wa/server/plugin/WAService.java index a189f12..ce71221 100644 --- a/src/wa/server/plugin/WAService.java +++ b/src/wa/server/plugin/WAService.java @@ -13,4 +13,9 @@ public interface WAService { * @return a installer object that will install the service or null if the installer is not available */ public WAInstaller getInstaller(); + + /** + * @return a array of configuration objects + */ + public WAConfiguration[] getConfigurations(); } diff --git a/src/wa/server/plugin/apache/ApacheConfigurator.java b/src/wa/server/plugin/apache/ApacheConfiguration.java similarity index 93% rename from src/wa/server/plugin/apache/ApacheConfigurator.java rename to src/wa/server/plugin/apache/ApacheConfiguration.java index ec9bb24..e39b075 100644 --- a/src/wa/server/plugin/apache/ApacheConfigurator.java +++ b/src/wa/server/plugin/apache/ApacheConfiguration.java @@ -8,12 +8,12 @@ import java.util.LinkedList; import java.util.List; import wa.server.WAConstants; -import wa.server.plugin.WAConfigurator; +import wa.server.plugin.WAConfiguration; import wa.server.util.ConfigFileUtil; import zutil.db.DBConnection; import zutil.io.file.FileUtil; -public class ApacheConfigurator implements WAConfigurator { +public class ApacheConfiguration implements WAConfiguration { private static final String APACHE_CONF_FILE = "wa_apache_vhost.conf"; private static final String APACHE_MAIN_CONFIG_FILE = "/etc/apache2/apache2.conf"; private static final String STATIC_PRE_CONF = "wa/server/plugin/apache/apache_default.config"; @@ -22,7 +22,7 @@ public class ApacheConfigurator implements WAConfigurator { List vhosts; - public ApacheConfigurator(){ + public ApacheConfiguration(){ vhosts = new LinkedList(); } diff --git a/src/wa/server/plugin/apache/ApacheService.java b/src/wa/server/plugin/apache/ApacheService.java index cfb5340..e0e09f9 100644 --- a/src/wa/server/plugin/apache/ApacheService.java +++ b/src/wa/server/plugin/apache/ApacheService.java @@ -22,6 +22,7 @@ package wa.server.plugin.apache; +import wa.server.plugin.WAConfiguration; import wa.server.plugin.WAInstaller; import wa.server.plugin.WAService; import wa.server.plugin.WAServiceStatus; @@ -57,4 +58,9 @@ public class ApacheService implements WAService { installer = new ApacheInstaller(); return installer; } + + @Override + public WAConfiguration[] getConfigurations() { + return new WAConfiguration[0]; + } }