ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Moved hal-default.db file into resource folder.

Browse source
This commit is contained in:
Ziver Koc 2021-01-29 21:56:43 +01:00
parent 9ad529d9eb
commit 41b2eb6b07
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build.gradle
View file

@ -12,6 +12,10 @@ allprojects {
mavenLocal() mavenLocal()
mavenCentral() mavenCentral()
jcenter() jcenter()
maven {
url 'https://jitpack.io' // Needed for ffmpeg4j project
}
} }
} }
@ -56,7 +60,6 @@ distributions {
main { main {
contents { contents {
from 'hal.conf.example' from 'hal.conf.example'
from 'hal-default.db'
from 'logging.properties' from 'logging.properties'
from "${buildDir}/resources" from "${buildDir}/resources"

0
hal-default.db → hal-core/resource/resource/hal-default.db Executable file → Normal file
View file

2
hal-core/src/se/hal/HalContext.java
View file

@ -38,7 +38,7 @@ public class HalContext {
private static final String CONF_FILE = "hal.conf"; private static final String CONF_FILE = "hal.conf";
private static final String DB_FILE = "hal.db"; private static final String DB_FILE = "hal.db";
private static final String DEFAULT_DB_FILE = "hal-default.db"; private static final String DEFAULT_DB_FILE = HalContext.RESOURCE_ROOT + "/resource/hal-default.db";
// Variables // Variables
private static DBConnection db; // TODO: Should probably be a db pool as we have multiple threads accessing the DB private static DBConnection db; // TODO: Should probably be a db pool as we have multiple threads accessing the DB

3
hal-core/test/se/hal/daemon/SensorDataAggregationDaemonTest.java
View file

@ -9,11 +9,10 @@ import se.hal.HalContext;
import se.hal.util.UTCTimeUtility; import se.hal.util.UTCTimeUtility;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.db.DBUpgradeHandler; import zutil.db.DBUpgradeHandler;
import zutil.io.file.FileUtil;
import zutil.log.LogUtil; import zutil.log.LogUtil;
public class SensorDataAggregationDaemonTest { public class SensorDataAggregationDaemonTest {
private static final String DEFAULT_DB_FILE = "../hal-default.db"; private static final String DEFAULT_DB_FILE = "resource/resource/hal-default.db";
private static DBConnection db; private static DBConnection db;