diff --git a/gradlew b/gradlew old mode 100755 new mode 100644 diff --git a/hal-core/resource/resource/web/main_index.tmpl b/hal-core/resource/resource/web/main_index.tmpl index d77ac16a..5f2cd06f 100644 --- a/hal-core/resource/resource/web/main_index.tmpl +++ b/hal-core/resource/resource/web/main_index.tmpl @@ -32,7 +32,7 @@
- + HAL diff --git a/hal-core/resource/resource/web/startup.tmpl b/hal-core/resource/resource/web/startup.tmpl new file mode 100644 index 00000000..457d3223 --- /dev/null +++ b/hal-core/resource/resource/web/startup.tmpl @@ -0,0 +1,25 @@ + + + + + HAL is initializing... + + + + + + + +
+
+
+ + + HAL + + is initializing... +
+
+
+ + \ No newline at end of file diff --git a/hal-core/src/se/hal/HalServer.java b/hal-core/src/se/hal/HalServer.java index 6b4dcb36..110d22f6 100644 --- a/hal-core/src/se/hal/HalServer.java +++ b/hal-core/src/se/hal/HalServer.java @@ -4,6 +4,7 @@ package se.hal; import se.hal.daemon.HalExternalWebDaemon; import se.hal.intf.*; import se.hal.page.HalAlertManager; +import se.hal.page.StartupWebPage; import se.hal.struct.PluginConfig; import zutil.db.DBConnection; import zutil.io.file.FileUtil; @@ -50,11 +51,13 @@ public class HalServer { // init logging LogUtil.readConfiguration("logging.properties"); + http = new HttpServer(HalContext.getIntegerProperty(HalContext.CONFIG_HTTP_PORT)); + http.setDefaultPage(new StartupWebPage()); + http.start(); + // init variables pluginManager = new PluginManager(); daemonExecutor = Executors.newScheduledThreadPool(1); // We set only one thread for easier troubleshooting for now - http = new HttpServer(HalContext.getIntegerProperty(HalContext.CONFIG_HTTP_PORT)); - http.start(); // Upgrade database HalDatabaseUpgradeManager.initialize(pluginManager); @@ -125,6 +128,7 @@ public class HalServer { http.setDefaultPage(new HttpFilePage(FileUtil.find(HalContext.RESOURCE_WEB_ROOT))); http.setPage("/", new HttpRedirectPage("/map")); http.setPage(HalAlertManager.getInstance().getUrl(), HalAlertManager.getInstance()); + for (Iterator it = pluginManager.getSingletonIterator(HalJsonPage.class); it.hasNext(); ) registerPage(it.next()); for (Iterator it = pluginManager.getSingletonIterator(HalWebPage.class); it.hasNext(); ) diff --git a/hal-core/src/se/hal/page/StartupWebPage.java b/hal-core/src/se/hal/page/StartupWebPage.java new file mode 100644 index 00000000..67d33ef8 --- /dev/null +++ b/hal-core/src/se/hal/page/StartupWebPage.java @@ -0,0 +1,34 @@ +package se.hal.page; + +import se.hal.HalContext; +import zutil.io.file.FileUtil; +import zutil.net.http.HttpHeader; +import zutil.net.http.HttpPage; +import zutil.net.http.HttpPrintStream; +import zutil.parser.Templator; + +import java.io.IOException; +import java.util.Map; + + +public class StartupWebPage implements HttpPage { + private static final String TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/startup.tmpl"; + + + @Override + public void respond(HttpPrintStream out, HttpHeader headers, Map session, Map cookie, Map request) throws IOException { + if (headers.getRequestURL().endsWith("bootstrap.min.css")) { + printFileContents(HalContext.RESOURCE_WEB_ROOT + "/css/bootstrap.min.css", out); + } else if (headers.getRequestURL().endsWith("hal.css")) { + printFileContents(HalContext.RESOURCE_WEB_ROOT + "/css/hal.css", out); + } else { + Templator tmpl = new Templator(FileUtil.find(TEMPLATE)); + out.print(tmpl.compile()); + } + } + + private void printFileContents(String path, HttpPrintStream out) throws IOException { + out.setHeader(HttpHeader.HEADER_CONTENT_TYPE, "text/css"); + out.print(FileUtil.getContent(HalContext.RESOURCE_WEB_ROOT + path)); + } +} diff --git a/run.sh b/run.sh old mode 100755 new mode 100644