diff --git a/resource/index.tmpl b/resource/index.tmpl new file mode 100644 index 00000000..ad5f5877 --- /dev/null +++ b/resource/index.tmpl @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/se/koc/hal/PowerChallenge.java b/src/se/koc/hal/PowerChallenge.java index b2f45e0f..3b033dde 100755 --- a/src/se/koc/hal/PowerChallenge.java +++ b/src/se/koc/hal/PowerChallenge.java @@ -4,8 +4,11 @@ package se.koc.hal; import se.koc.hal.deamon.DataAggregatorDaemon; import se.koc.hal.deamon.HalDaemon; import zutil.db.DBConnection; +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 java.util.Timer; import java.util.logging.Level; @@ -35,5 +38,9 @@ public class PowerChallenge { for(HalDaemon daemon : daemons){ daemon.initiate(daemonTimer); } + + HttpServer http = new HttpServer(8080); + http.setDefaultPage(new HttpFilePage(FileUtil.find("resource/"))); + http.setPage("/", new PowerChallengeHttpPage()); } } diff --git a/src/se/koc/hal/PowerChallengeHttpPage.java b/src/se/koc/hal/PowerChallengeHttpPage.java new file mode 100644 index 00000000..a191711c --- /dev/null +++ b/src/se/koc/hal/PowerChallengeHttpPage.java @@ -0,0 +1,23 @@ +package se.koc.hal; + +import java.io.IOException; +import java.util.Map; + +import zutil.net.http.HttpHeaderParser; +import zutil.net.http.HttpPage; +import zutil.net.http.HttpPrintStream; +import zutil.parser.Templator; + +public class PowerChallengeHttpPage implements HttpPage { + + @Override + public void respond(HttpPrintStream out, HttpHeaderParser client_info, + Map session, Map cookie, + Map request) throws IOException { + + Templator tmpl = new Templator("resource/index.tmpl"); + + out.print(tmpl.compile()); + } + +} diff --git a/src/se/koc/hal/deamon/DataAggregatorDaemon.java b/src/se/koc/hal/deamon/DataAggregatorDaemon.java index 535e80d2..5cb752db 100755 --- a/src/se/koc/hal/deamon/DataAggregatorDaemon.java +++ b/src/se/koc/hal/deamon/DataAggregatorDaemon.java @@ -73,7 +73,7 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon { new DayAggregator()); - logger.fine("Done aggrigating"); + logger.fine("Done aggregation"); } catch (SQLException e) { e.printStackTrace(); }