From 4428824061210c48ce601c15ca3521aec9d87704 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 11 Jan 2016 18:02:45 +0100 Subject: [PATCH] Moved PowerChallenge into Hal Former-commit-id: 34665800518933f0b92723378601a3bafc53fdb0 --- build.xml | 2 +- .../{PowerChallenge.java => HalServer.java} | 22 +++++++++---------- .../{HalClient.java => HalSpeechClient.java} | 2 +- ....java => PCDataSynchronizationClient.java} | 4 ++-- ....java => PCDataSynchronizationDaemon.java} | 6 ++--- ...n.java => SensorDataAggregatorDaemon.java} | 2 +- ...emon.java => SensorDataCleanupDaemon.java} | 2 +- src/se/hal/page/PCHeatMapHttpPage.java | 4 +++- src/se/hal/page/PCOverviewHttpPage.java | 5 +++-- ...ttpPage.java => SensorConfigHttpPage.java} | 8 ++++--- web-resource/index.tmpl | 4 ++-- .../{heatmap.tmpl => pc_heatmap.tmpl} | 0 .../{overview.tmpl => pc_overview.tmpl} | 0 .../{configure.tmpl => sensor_config.tmpl} | 4 ++-- 14 files changed, 35 insertions(+), 30 deletions(-) rename src/se/hal/{PowerChallenge.java => HalServer.java} (82%) rename src/se/hal/{HalClient.java => HalSpeechClient.java} (99%) rename src/se/hal/deamon/{DataSynchronizationClient.java => PCDataSynchronizationClient.java} (97%) rename src/se/hal/deamon/{DataSynchronizationDaemon.java => PCDataSynchronizationDaemon.java} (97%) rename src/se/hal/deamon/{DataAggregatorDaemon.java => SensorDataAggregatorDaemon.java} (99%) rename src/se/hal/deamon/{DataCleanupDaemon.java => SensorDataCleanupDaemon.java} (99%) rename src/se/hal/page/{PCConfigureHttpPage.java => SensorConfigHttpPage.java} (95%) rename web-resource/{heatmap.tmpl => pc_heatmap.tmpl} (100%) rename web-resource/{overview.tmpl => pc_overview.tmpl} (100%) rename web-resource/{configure.tmpl => sensor_config.tmpl} (99%) diff --git a/build.xml b/build.xml index 31c391ab..ae20606d 100755 --- a/build.xml +++ b/build.xml @@ -44,7 +44,7 @@ - + diff --git a/src/se/hal/PowerChallenge.java b/src/se/hal/HalServer.java similarity index 82% rename from src/se/hal/PowerChallenge.java rename to src/se/hal/HalServer.java index 8726b074..68783d93 100755 --- a/src/se/hal/PowerChallenge.java +++ b/src/se/hal/HalServer.java @@ -1,13 +1,13 @@ package se.hal; -import se.hal.deamon.DataAggregatorDaemon; -import se.hal.deamon.DataCleanupDaemon; -import se.hal.deamon.DataSynchronizationClient; -import se.hal.deamon.DataSynchronizationDaemon; +import se.hal.deamon.SensorDataAggregatorDaemon; +import se.hal.deamon.SensorDataCleanupDaemon; +import se.hal.deamon.PCDataSynchronizationClient; +import se.hal.deamon.PCDataSynchronizationDaemon; import se.hal.intf.HalDaemon; import se.hal.intf.HalHttpPage; -import se.hal.page.PCConfigureHttpPage; +import se.hal.page.SensorConfigHttpPage; import se.hal.page.PCHeatMapHttpPage; import se.hal.page.PCOverviewHttpPage; import se.hal.struct.Event; @@ -26,7 +26,7 @@ import java.util.logging.Level; /** * Created by Ziver on 2015-12-03. */ -public class PowerChallenge { +public class HalServer { private static HalDaemon[] daemons; private static HalHttpPage[] pages; @@ -58,10 +58,10 @@ public class PowerChallenge { // init daemons daemons = new HalDaemon[]{ - new DataAggregatorDaemon(), - new DataSynchronizationDaemon(), - new DataSynchronizationClient(), - new DataCleanupDaemon() + new SensorDataAggregatorDaemon(), + new PCDataSynchronizationDaemon(), + new PCDataSynchronizationClient(), + new SensorDataCleanupDaemon() }; // We set only one thread for easier troubleshooting ScheduledExecutorService executor = Executors.newScheduledThreadPool(1); @@ -74,7 +74,7 @@ public class PowerChallenge { pages = new HalHttpPage[]{ new PCOverviewHttpPage(), new PCHeatMapHttpPage(), - new PCConfigureHttpPage() + new SensorConfigHttpPage() }; HttpServer http = new HttpServer(HalContext.getIntegerProperty("http_port")); http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/"))); diff --git a/src/se/hal/HalClient.java b/src/se/hal/HalSpeechClient.java similarity index 99% rename from src/se/hal/HalClient.java rename to src/se/hal/HalSpeechClient.java index e7dafc63..aad48173 100755 --- a/src/se/hal/HalClient.java +++ b/src/se/hal/HalSpeechClient.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; * Date: 2013-12-17 * Time: 10:59 */ -public class HalClient { +public class HalSpeechClient { private static HashMap switches = new HashMap(); diff --git a/src/se/hal/deamon/DataSynchronizationClient.java b/src/se/hal/deamon/PCDataSynchronizationClient.java similarity index 97% rename from src/se/hal/deamon/DataSynchronizationClient.java rename to src/se/hal/deamon/PCDataSynchronizationClient.java index 142c89f2..ea6efbb9 100755 --- a/src/se/hal/deamon/DataSynchronizationClient.java +++ b/src/se/hal/deamon/PCDataSynchronizationClient.java @@ -1,7 +1,7 @@ package se.hal.deamon; import se.hal.HalContext; -import se.hal.deamon.DataSynchronizationDaemon.*; +import se.hal.deamon.PCDataSynchronizationDaemon.*; import se.hal.intf.HalDaemon; import se.hal.struct.Sensor; import se.hal.struct.User; @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -public class DataSynchronizationClient implements HalDaemon { +public class PCDataSynchronizationClient implements HalDaemon { private static final Logger logger = LogUtil.getLogger(); private static final long SYNC_INTERVAL = 5 * 60 * 1000; // 5 min diff --git a/src/se/hal/deamon/DataSynchronizationDaemon.java b/src/se/hal/deamon/PCDataSynchronizationDaemon.java similarity index 97% rename from src/se/hal/deamon/DataSynchronizationDaemon.java rename to src/se/hal/deamon/PCDataSynchronizationDaemon.java index 4d4f4ad5..240c824e 100755 --- a/src/se/hal/deamon/DataSynchronizationDaemon.java +++ b/src/se/hal/deamon/PCDataSynchronizationDaemon.java @@ -1,7 +1,7 @@ package se.hal.deamon; import se.hal.HalContext; -import se.hal.deamon.DataSynchronizationClient.*; +import se.hal.deamon.PCDataSynchronizationClient.*; import se.hal.intf.HalDaemon; import se.hal.struct.Sensor; import se.hal.struct.User; @@ -25,11 +25,11 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.logging.Level; import java.util.logging.Logger; -public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon { +public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon { private static final Logger logger = LogUtil.getLogger(); - public DataSynchronizationDaemon() { + public PCDataSynchronizationDaemon() { super(HalContext.getIntegerProperty("sync_port")); } diff --git a/src/se/hal/deamon/DataAggregatorDaemon.java b/src/se/hal/deamon/SensorDataAggregatorDaemon.java similarity index 99% rename from src/se/hal/deamon/DataAggregatorDaemon.java rename to src/se/hal/deamon/SensorDataAggregatorDaemon.java index 8856065d..79634274 100755 --- a/src/se/hal/deamon/DataAggregatorDaemon.java +++ b/src/se/hal/deamon/SensorDataAggregatorDaemon.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -public class DataAggregatorDaemon implements HalDaemon { +public class SensorDataAggregatorDaemon implements HalDaemon { private static final Logger logger = LogUtil.getLogger(); public void initiate(ScheduledExecutorService executor){ diff --git a/src/se/hal/deamon/DataCleanupDaemon.java b/src/se/hal/deamon/SensorDataCleanupDaemon.java similarity index 99% rename from src/se/hal/deamon/DataCleanupDaemon.java rename to src/se/hal/deamon/SensorDataCleanupDaemon.java index 3eda6786..71a0c47b 100755 --- a/src/se/hal/deamon/DataCleanupDaemon.java +++ b/src/se/hal/deamon/SensorDataCleanupDaemon.java @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -public class DataCleanupDaemon implements HalDaemon { +public class SensorDataCleanupDaemon implements HalDaemon { private static final Logger logger = LogUtil.getLogger(); public void initiate(ScheduledExecutorService executor){ diff --git a/src/se/hal/page/PCHeatMapHttpPage.java b/src/se/hal/page/PCHeatMapHttpPage.java index 8df440f3..6d940771 100755 --- a/src/se/hal/page/PCHeatMapHttpPage.java +++ b/src/se/hal/page/PCHeatMapHttpPage.java @@ -7,6 +7,8 @@ import zutil.parser.Templator; import java.util.Map; public class PCHeatMapHttpPage extends HalHttpPage { + private static final String TEMPLATE = "web-resource/pc_heatmap.tmpl"; + public PCHeatMapHttpPage() { super("Heatmap", "map"); @@ -19,7 +21,7 @@ public class PCHeatMapHttpPage extends HalHttpPage { Map request) throws Exception{ - Templator tmpl = new Templator(FileUtil.find("web-resource/heatmap.tmpl")); + Templator tmpl = new Templator(FileUtil.find(TEMPLATE)); return tmpl; } diff --git a/src/se/hal/page/PCOverviewHttpPage.java b/src/se/hal/page/PCOverviewHttpPage.java index 1c3165b3..c83c6186 100755 --- a/src/se/hal/page/PCOverviewHttpPage.java +++ b/src/se/hal/page/PCOverviewHttpPage.java @@ -16,9 +16,10 @@ import java.util.ArrayList; import java.util.Map; public class PCOverviewHttpPage extends HalHttpPage { + private static final String TEMPLATE = "web-resource/pc_overview.tmpl"; public PCOverviewHttpPage() { - super("Overview", "overview"); + super("Power;Challenge", "powerChallenge"); } @Override @@ -80,7 +81,7 @@ public class PCOverviewHttpPage extends HalHttpPage { ArrayList dayDataList = DBConnection.exec(stmt, new SQLPowerDataBuilder()); - Templator tmpl = new Templator(FileUtil.find("web-resource/overview.tmpl")); + Templator tmpl = new Templator(FileUtil.find(TEMPLATE)); tmpl.set("minData", minDataList); tmpl.set("hourData", hourDataList); tmpl.set("dayData", dayDataList); diff --git a/src/se/hal/page/PCConfigureHttpPage.java b/src/se/hal/page/SensorConfigHttpPage.java similarity index 95% rename from src/se/hal/page/PCConfigureHttpPage.java rename to src/se/hal/page/SensorConfigHttpPage.java index 1527128b..26fd4011 100755 --- a/src/se/hal/page/PCConfigureHttpPage.java +++ b/src/se/hal/page/SensorConfigHttpPage.java @@ -13,7 +13,9 @@ import zutil.ui.Configurator.*; import java.util.Map; -public class PCConfigureHttpPage extends HalHttpPage { +public class SensorConfigHttpPage extends HalHttpPage { + private static final String TEMPLATE = "web-resource/sensor_config.tmpl"; + private class SensorDataParams{ public Class clazz; public ConfigurationParam[] params; @@ -21,7 +23,7 @@ public class PCConfigureHttpPage extends HalHttpPage { private SensorDataParams[] sensorConfigurations; - public PCConfigureHttpPage() { + public SensorConfigHttpPage() { super("Configuration", "config"); sensorConfigurations = new SensorDataParams[ @@ -118,7 +120,7 @@ public class PCConfigureHttpPage extends HalHttpPage { } // Output - Templator tmpl = new Templator(FileUtil.find("web-resource/configure.tmpl")); + Templator tmpl = new Templator(FileUtil.find(TEMPLATE)); tmpl.set("user", localUser); tmpl.set("localSensors", Sensor.getLocalSensors(db)); tmpl.set("localSensorConf", sensorConfigurations); diff --git a/web-resource/index.tmpl b/web-resource/index.tmpl index 08b7e97b..2cc04dd0 100755 --- a/web-resource/index.tmpl +++ b/web-resource/index.tmpl @@ -6,7 +6,7 @@ - Power;Challenge + HAL @@ -26,7 +26,7 @@ - Power;Challenge + HAL