From 41b2eb6b07474af620f9263d16714e0fc47a4db5 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 29 Jan 2021 21:56:43 +0100
Subject: [PATCH] Moved hal-default.db file into resource folder.

---
 build.gradle                                        |   5 ++++-
 .../resource/resource/hal-default.db                | Bin
 hal-core/src/se/hal/HalContext.java                 |   2 +-
 .../hal/daemon/SensorDataAggregationDaemonTest.java |   3 +--
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename hal-default.db => hal-core/resource/resource/hal-default.db (100%)
 mode change 100755 => 100644

diff --git a/build.gradle b/build.gradle
index 0726e36e..21a950bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,10 @@ allprojects {
         mavenLocal()
         mavenCentral()
         jcenter()
+
+        maven {
+            url 'https://jitpack.io' // Needed for ffmpeg4j project
+        }
     }
 }
 
@@ -56,7 +60,6 @@ distributions {
     main {
         contents {
             from 'hal.conf.example'
-            from 'hal-default.db'
             from 'logging.properties'
 
             from "${buildDir}/resources"
diff --git a/hal-default.db b/hal-core/resource/resource/hal-default.db
old mode 100755
new mode 100644
similarity index 100%
rename from hal-default.db
rename to hal-core/resource/resource/hal-default.db
diff --git a/hal-core/src/se/hal/HalContext.java b/hal-core/src/se/hal/HalContext.java
index 8471baa9..0c79fa20 100644
--- a/hal-core/src/se/hal/HalContext.java
+++ b/hal-core/src/se/hal/HalContext.java
@@ -38,7 +38,7 @@ public class HalContext {
 
     private static final String CONF_FILE       = "hal.conf";
     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
     private static DBConnection db; // TODO: Should probably be a db pool as we have multiple threads accessing the DB
diff --git a/hal-core/test/se/hal/daemon/SensorDataAggregationDaemonTest.java b/hal-core/test/se/hal/daemon/SensorDataAggregationDaemonTest.java
index d719f654..17126e78 100644
--- a/hal-core/test/se/hal/daemon/SensorDataAggregationDaemonTest.java
+++ b/hal-core/test/se/hal/daemon/SensorDataAggregationDaemonTest.java
@@ -9,11 +9,10 @@ import se.hal.HalContext;
 import se.hal.util.UTCTimeUtility;
 import zutil.db.DBConnection;
 import zutil.db.DBUpgradeHandler;
-import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
 
 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;