diff --git a/build.gradle b/build.gradle index 59d0630c..a5cc6ef6 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,7 @@ task copyRecources(type: Copy) { } project.subprojects.each { subProject -> - from "${subProject.projectDir}/resource" + from "${subProject.projectDir}/resources" } into("${buildDir}/resources") diff --git a/hal-core/resource/resource/hal-core-reference.db b/hal-core/resources/hal-core-reference.db similarity index 100% rename from hal-core/resource/resource/hal-core-reference.db rename to hal-core/resources/hal-core-reference.db diff --git a/hal-core/resource/resource/web/api/docs.html b/hal-core/resources/web/api/docs.html similarity index 100% rename from hal-core/resource/resource/web/api/docs.html rename to hal-core/resources/web/api/docs.html diff --git a/hal-core/resource/resource/web/api/openapi.json b/hal-core/resources/web/api/openapi.json similarity index 100% rename from hal-core/resource/resource/web/api/openapi.json rename to hal-core/resources/web/api/openapi.json diff --git a/hal-core/resource/resource/web/css/bootstrap-switch.css b/hal-core/resources/web/css/bootstrap-switch.css similarity index 100% rename from hal-core/resource/resource/web/css/bootstrap-switch.css rename to hal-core/resources/web/css/bootstrap-switch.css diff --git a/hal-core/resource/resource/web/css/bootstrap-switch.min.css b/hal-core/resources/web/css/bootstrap-switch.min.css similarity index 100% rename from hal-core/resource/resource/web/css/bootstrap-switch.min.css rename to hal-core/resources/web/css/bootstrap-switch.min.css diff --git a/hal-core/resource/resource/web/css/bootstrap-theme.css b/hal-core/resources/web/css/bootstrap-theme.css similarity index 100% rename from hal-core/resource/resource/web/css/bootstrap-theme.css rename to hal-core/resources/web/css/bootstrap-theme.css diff --git a/hal-core/resource/resource/web/css/bootstrap-theme.min.css b/hal-core/resources/web/css/bootstrap-theme.min.css similarity index 100% rename from hal-core/resource/resource/web/css/bootstrap-theme.min.css rename to hal-core/resources/web/css/bootstrap-theme.min.css diff --git a/hal-core/resource/resource/web/css/bootstrap.css b/hal-core/resources/web/css/bootstrap.css similarity index 100% rename from hal-core/resource/resource/web/css/bootstrap.css rename to hal-core/resources/web/css/bootstrap.css diff --git a/hal-core/resource/resource/web/css/bootstrap.min.css b/hal-core/resources/web/css/bootstrap.min.css similarity index 100% rename from hal-core/resource/resource/web/css/bootstrap.min.css rename to hal-core/resources/web/css/bootstrap.min.css diff --git a/hal-core/resource/resource/web/css/c3.css b/hal-core/resources/web/css/c3.css similarity index 100% rename from hal-core/resource/resource/web/css/c3.css rename to hal-core/resources/web/css/c3.css diff --git a/hal-core/resource/resource/web/css/c3.min.css b/hal-core/resources/web/css/c3.min.css similarity index 100% rename from hal-core/resource/resource/web/css/c3.min.css rename to hal-core/resources/web/css/c3.min.css diff --git a/hal-core/resource/resource/web/css/hal.css b/hal-core/resources/web/css/hal.css similarity index 100% rename from hal-core/resource/resource/web/css/hal.css rename to hal-core/resources/web/css/hal.css diff --git a/hal-core/resource/resource/web/css/jquery.filer.css b/hal-core/resources/web/css/jquery.filer.css similarity index 100% rename from hal-core/resource/resource/web/css/jquery.filer.css rename to hal-core/resources/web/css/jquery.filer.css diff --git a/hal-core/resource/resource/web/event_config.tmpl b/hal-core/resources/web/event_config.tmpl similarity index 100% rename from hal-core/resource/resource/web/event_config.tmpl rename to hal-core/resources/web/event_config.tmpl diff --git a/hal-core/resource/resource/web/event_detail.tmpl b/hal-core/resources/web/event_detail.tmpl similarity index 100% rename from hal-core/resource/resource/web/event_detail.tmpl rename to hal-core/resources/web/event_detail.tmpl diff --git a/hal-core/resource/resource/web/event_overview.tmpl b/hal-core/resources/web/event_overview.tmpl similarity index 100% rename from hal-core/resource/resource/web/event_overview.tmpl rename to hal-core/resources/web/event_overview.tmpl diff --git a/hal-core/resource/resource/web/fonts/glyphicons-halflings-regular.eot b/hal-core/resources/web/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from hal-core/resource/resource/web/fonts/glyphicons-halflings-regular.eot rename to hal-core/resources/web/fonts/glyphicons-halflings-regular.eot diff --git a/hal-core/resource/resource/web/fonts/glyphicons-halflings-regular.svg b/hal-core/resources/web/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from hal-core/resource/resource/web/fonts/glyphicons-halflings-regular.svg rename to hal-core/resources/web/fonts/glyphicons-halflings-regular.svg diff --git a/hal-core/resource/resource/web/fonts/glyphicons-halflings-regular.ttf b/hal-core/resources/web/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from hal-core/resource/resource/web/fonts/glyphicons-halflings-regular.ttf rename to hal-core/resources/web/fonts/glyphicons-halflings-regular.ttf diff --git a/hal-core/resource/resource/web/fonts/glyphicons-halflings-regular.woff b/hal-core/resources/web/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from hal-core/resource/resource/web/fonts/glyphicons-halflings-regular.woff rename to hal-core/resources/web/fonts/glyphicons-halflings-regular.woff diff --git a/hal-core/resource/resource/web/fonts/glyphicons-halflings-regular.woff2 b/hal-core/resources/web/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from hal-core/resource/resource/web/fonts/glyphicons-halflings-regular.woff2 rename to hal-core/resources/web/fonts/glyphicons-halflings-regular.woff2 diff --git a/hal-core/resource/resource/web/img/lightbulb_off.svg b/hal-core/resources/web/img/lightbulb_off.svg similarity index 100% rename from hal-core/resource/resource/web/img/lightbulb_off.svg rename to hal-core/resources/web/img/lightbulb_off.svg diff --git a/hal-core/resource/resource/web/img/lightbulb_on.svg b/hal-core/resources/web/img/lightbulb_on.svg similarity index 100% rename from hal-core/resource/resource/web/img/lightbulb_on.svg rename to hal-core/resources/web/img/lightbulb_on.svg diff --git a/hal-core/resource/resource/web/img/temperature.svg b/hal-core/resources/web/img/temperature.svg similarity index 100% rename from hal-core/resource/resource/web/img/temperature.svg rename to hal-core/resources/web/img/temperature.svg diff --git a/hal-core/resource/resource/web/js/hal.js b/hal-core/resources/web/js/hal.js similarity index 100% rename from hal-core/resource/resource/web/js/hal.js rename to hal-core/resources/web/js/hal.js diff --git a/hal-core/resource/resource/web/js/lib/bootstrap-colorpicker.LICENSE b/hal-core/resources/web/js/lib/bootstrap-colorpicker.LICENSE similarity index 100% rename from hal-core/resource/resource/web/js/lib/bootstrap-colorpicker.LICENSE rename to hal-core/resources/web/js/lib/bootstrap-colorpicker.LICENSE diff --git a/hal-core/resource/resource/web/js/lib/bootstrap-colorpicker.js b/hal-core/resources/web/js/lib/bootstrap-colorpicker.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/bootstrap-colorpicker.js rename to hal-core/resources/web/js/lib/bootstrap-colorpicker.js diff --git a/hal-core/resource/resource/web/js/lib/bootstrap-colorpicker.min.js b/hal-core/resources/web/js/lib/bootstrap-colorpicker.min.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/bootstrap-colorpicker.min.js rename to hal-core/resources/web/js/lib/bootstrap-colorpicker.min.js diff --git a/hal-core/resource/resource/web/js/lib/bootstrap-switch.LICENSE b/hal-core/resources/web/js/lib/bootstrap-switch.LICENSE similarity index 100% rename from hal-core/resource/resource/web/js/lib/bootstrap-switch.LICENSE rename to hal-core/resources/web/js/lib/bootstrap-switch.LICENSE diff --git a/hal-core/resource/resource/web/js/lib/bootstrap-switch.js b/hal-core/resources/web/js/lib/bootstrap-switch.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/bootstrap-switch.js rename to hal-core/resources/web/js/lib/bootstrap-switch.js diff --git a/hal-core/resource/resource/web/js/lib/bootstrap-switch.min.js b/hal-core/resources/web/js/lib/bootstrap-switch.min.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/bootstrap-switch.min.js rename to hal-core/resources/web/js/lib/bootstrap-switch.min.js diff --git a/hal-core/resource/resource/web/js/lib/bootstrap.js b/hal-core/resources/web/js/lib/bootstrap.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/bootstrap.js rename to hal-core/resources/web/js/lib/bootstrap.js diff --git a/hal-core/resource/resource/web/js/lib/bootstrap.min.js b/hal-core/resources/web/js/lib/bootstrap.min.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/bootstrap.min.js rename to hal-core/resources/web/js/lib/bootstrap.min.js diff --git a/hal-core/resource/resource/web/js/lib/c3.LICENSE b/hal-core/resources/web/js/lib/c3.LICENSE similarity index 100% rename from hal-core/resource/resource/web/js/lib/c3.LICENSE rename to hal-core/resources/web/js/lib/c3.LICENSE diff --git a/hal-core/resource/resource/web/js/lib/c3.js b/hal-core/resources/web/js/lib/c3.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/c3.js rename to hal-core/resources/web/js/lib/c3.js diff --git a/hal-core/resource/resource/web/js/lib/c3.min.js b/hal-core/resources/web/js/lib/c3.min.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/c3.min.js rename to hal-core/resources/web/js/lib/c3.min.js diff --git a/hal-core/resource/resource/web/js/lib/d3.LICENSE b/hal-core/resources/web/js/lib/d3.LICENSE similarity index 100% rename from hal-core/resource/resource/web/js/lib/d3.LICENSE rename to hal-core/resources/web/js/lib/d3.LICENSE diff --git a/hal-core/resource/resource/web/js/lib/d3.js b/hal-core/resources/web/js/lib/d3.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/d3.js rename to hal-core/resources/web/js/lib/d3.js diff --git a/hal-core/resource/resource/web/js/lib/jquery-1.11.3.min.js b/hal-core/resources/web/js/lib/jquery-1.11.3.min.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/jquery-1.11.3.min.js rename to hal-core/resources/web/js/lib/jquery-1.11.3.min.js diff --git a/hal-core/resource/resource/web/js/lib/jquery.filer.js b/hal-core/resources/web/js/lib/jquery.filer.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/jquery.filer.js rename to hal-core/resources/web/js/lib/jquery.filer.js diff --git a/hal-core/resource/resource/web/js/lib/jquery.filer.min.js b/hal-core/resources/web/js/lib/jquery.filer.min.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/jquery.filer.min.js rename to hal-core/resources/web/js/lib/jquery.filer.min.js diff --git a/hal-core/resource/resource/web/js/lib/moment.LICENSE.txt b/hal-core/resources/web/js/lib/moment.LICENSE.txt similarity index 100% rename from hal-core/resource/resource/web/js/lib/moment.LICENSE.txt rename to hal-core/resources/web/js/lib/moment.LICENSE.txt diff --git a/hal-core/resource/resource/web/js/lib/moment.js b/hal-core/resources/web/js/lib/moment.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/moment.js rename to hal-core/resources/web/js/lib/moment.js diff --git a/hal-core/resource/resource/web/js/lib/svg.LICENSE b/hal-core/resources/web/js/lib/svg.LICENSE similarity index 100% rename from hal-core/resource/resource/web/js/lib/svg.LICENSE rename to hal-core/resources/web/js/lib/svg.LICENSE diff --git a/hal-core/resource/resource/web/js/lib/svg.draggable.LICENSE.txt b/hal-core/resources/web/js/lib/svg.draggable.LICENSE.txt similarity index 100% rename from hal-core/resource/resource/web/js/lib/svg.draggable.LICENSE.txt rename to hal-core/resources/web/js/lib/svg.draggable.LICENSE.txt diff --git a/hal-core/resource/resource/web/js/lib/svg.draggable.js b/hal-core/resources/web/js/lib/svg.draggable.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/svg.draggable.js rename to hal-core/resources/web/js/lib/svg.draggable.js diff --git a/hal-core/resource/resource/web/js/lib/svg.draggable.min.js b/hal-core/resources/web/js/lib/svg.draggable.min.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/svg.draggable.min.js rename to hal-core/resources/web/js/lib/svg.draggable.min.js diff --git a/hal-core/resource/resource/web/js/lib/svg.js b/hal-core/resources/web/js/lib/svg.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/svg.js rename to hal-core/resources/web/js/lib/svg.js diff --git a/hal-core/resource/resource/web/js/lib/svg.min.js b/hal-core/resources/web/js/lib/svg.min.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/svg.min.js rename to hal-core/resources/web/js/lib/svg.min.js diff --git a/hal-core/resource/resource/web/js/lib/svg.title.js b/hal-core/resources/web/js/lib/svg.title.js similarity index 100% rename from hal-core/resource/resource/web/js/lib/svg.title.js rename to hal-core/resources/web/js/lib/svg.title.js diff --git a/hal-core/resource/resource/web/js/map.js b/hal-core/resources/web/js/map.js similarity index 100% rename from hal-core/resource/resource/web/js/map.js rename to hal-core/resources/web/js/map.js diff --git a/hal-core/resource/resource/web/main_alerts.tmpl b/hal-core/resources/web/main_alerts.tmpl similarity index 100% rename from hal-core/resource/resource/web/main_alerts.tmpl rename to hal-core/resources/web/main_alerts.tmpl diff --git a/hal-core/resource/resource/web/main_index.tmpl b/hal-core/resources/web/main_index.tmpl similarity index 100% rename from hal-core/resource/resource/web/main_index.tmpl rename to hal-core/resources/web/main_index.tmpl diff --git a/hal-core/resource/resource/web/main_nav.tmpl b/hal-core/resources/web/main_nav.tmpl similarity index 100% rename from hal-core/resource/resource/web/main_nav.tmpl rename to hal-core/resources/web/main_nav.tmpl diff --git a/hal-core/resource/resource/web/main_nav_side.tmpl b/hal-core/resources/web/main_nav_side.tmpl similarity index 100% rename from hal-core/resource/resource/web/main_nav_side.tmpl rename to hal-core/resources/web/main_nav_side.tmpl diff --git a/hal-core/resource/resource/web/map.tmpl b/hal-core/resources/web/map.tmpl similarity index 100% rename from hal-core/resource/resource/web/map.tmpl rename to hal-core/resources/web/map.tmpl diff --git a/hal-core/resource/resource/web/plugin_config.tmpl b/hal-core/resources/web/plugin_config.tmpl similarity index 100% rename from hal-core/resource/resource/web/plugin_config.tmpl rename to hal-core/resources/web/plugin_config.tmpl diff --git a/hal-core/resource/resource/web/property_config.tmpl b/hal-core/resources/web/property_config.tmpl similarity index 100% rename from hal-core/resource/resource/web/property_config.tmpl rename to hal-core/resources/web/property_config.tmpl diff --git a/hal-core/resource/resource/web/room_config.tmpl b/hal-core/resources/web/room_config.tmpl similarity index 100% rename from hal-core/resource/resource/web/room_config.tmpl rename to hal-core/resources/web/room_config.tmpl diff --git a/hal-core/resource/resource/web/sensor_config.tmpl b/hal-core/resources/web/sensor_config.tmpl similarity index 100% rename from hal-core/resource/resource/web/sensor_config.tmpl rename to hal-core/resources/web/sensor_config.tmpl diff --git a/hal-core/resource/resource/web/sensor_detail.tmpl b/hal-core/resources/web/sensor_detail.tmpl similarity index 100% rename from hal-core/resource/resource/web/sensor_detail.tmpl rename to hal-core/resources/web/sensor_detail.tmpl diff --git a/hal-core/resource/resource/web/sensor_overview.tmpl b/hal-core/resources/web/sensor_overview.tmpl similarity index 100% rename from hal-core/resource/resource/web/sensor_overview.tmpl rename to hal-core/resources/web/sensor_overview.tmpl diff --git a/hal-core/resource/resource/web/startup.tmpl b/hal-core/resources/web/startup.tmpl similarity index 100% rename from hal-core/resource/resource/web/startup.tmpl rename to hal-core/resources/web/startup.tmpl diff --git a/hal-core/resource/resource/web/trigger.tmpl b/hal-core/resources/web/trigger.tmpl similarity index 100% rename from hal-core/resource/resource/web/trigger.tmpl rename to hal-core/resources/web/trigger.tmpl diff --git a/hal-core/resource/resource/web/user_config.tmpl b/hal-core/resources/web/user_config.tmpl similarity index 100% rename from hal-core/resource/resource/web/user_config.tmpl rename to hal-core/resources/web/user_config.tmpl diff --git a/hal-core/src/se/hal/HalContext.java b/hal-core/src/se/hal/HalContext.java index 9bb8a075..6be27698 100644 --- a/hal-core/src/se/hal/HalContext.java +++ b/hal-core/src/se/hal/HalContext.java @@ -32,13 +32,13 @@ public class HalContext { static { if (FileUtil.find("build/resources/") != null) RESOURCE_ROOT = "build/resources"; - else if (FileUtil.find("resource/resource/") != null) - RESOURCE_ROOT = "resource"; + else if (FileUtil.find("resources/") != null) + RESOURCE_ROOT = "resources"; else RESOURCE_ROOT = "."; } - public static final String RESOURCE_WEB_ROOT = HalContext.RESOURCE_ROOT + "/resource/web"; + public static final String RESOURCE_WEB_ROOT = HalContext.RESOURCE_ROOT + "/web"; private static final String CONF_FILE = "hal.conf"; static final String DB_FILE = "hal.db"; diff --git a/hal-core/src/se/hal/HalCoreDatabaseUpgrader.java b/hal-core/src/se/hal/HalCoreDatabaseUpgrader.java index 7f5a4b7c..5e08bbbf 100644 --- a/hal-core/src/se/hal/HalCoreDatabaseUpgrader.java +++ b/hal-core/src/se/hal/HalCoreDatabaseUpgrader.java @@ -14,7 +14,7 @@ public class HalCoreDatabaseUpgrader extends HalDatabaseUpgrader { private static final Logger logger = LogUtil.getLogger(); private static final int REFERENCE_DB_VERSION = 17; - private static final String REFERENCE_DB_PATH = HalContext.RESOURCE_ROOT + "/resource/hal-core-reference.db"; + private static final String REFERENCE_DB_PATH = HalContext.RESOURCE_ROOT + "/hal-core-reference.db"; private static final int CLEAR_INTERNAL_AGGR_DATA_DB_VERSION = 11; private static final int CLEAR_EXTERNAL_AGGR_DATA_DB_VERSION = 0; diff --git a/hal-core/test/se/hal/daemon/SensorDataAggregationDaemonTest.java b/hal-core/test/se/hal/daemon/SensorDataAggregationDaemonTest.java index 06128a46..b42cfd12 100644 --- a/hal-core/test/se/hal/daemon/SensorDataAggregationDaemonTest.java +++ b/hal-core/test/se/hal/daemon/SensorDataAggregationDaemonTest.java @@ -11,7 +11,7 @@ import zutil.log.LogUtil; import java.sql.PreparedStatement; public class SensorDataAggregationDaemonTest { - private static final String DEFAULT_DB_FILE = "resource/resource/hal-core-reference.db"; + private static final String DEFAULT_DB_FILE = HalContext.RESOURCE_ROOT + "/hal-core-reference.db"; private static DBConnection db; @@ -28,7 +28,7 @@ public class SensorDataAggregationDaemonTest { db = new DBConnection(DBConnection.DBMS.SQLite, ":memory:"); HalContext.setDB(db); - //upgrade the database to latest version + //upgrade the database to the latest version System.out.println("Upgrading in-memory database to latest version"); DBConnection referenceDB = new DBConnection(DBConnection.DBMS.SQLite, DEFAULT_DB_FILE); final DBUpgradeHandler handler = new DBUpgradeHandler(referenceDB); diff --git a/plugins/hal-nvr/resource/resource/bin/linux/ffmpeg b/plugins/hal-nvr/resources/bin/linux/ffmpeg similarity index 100% rename from plugins/hal-nvr/resource/resource/bin/linux/ffmpeg rename to plugins/hal-nvr/resources/bin/linux/ffmpeg diff --git a/plugins/hal-nvr/resource/resource/bin/mac/ffmpeg b/plugins/hal-nvr/resources/bin/mac/ffmpeg similarity index 100% rename from plugins/hal-nvr/resource/resource/bin/mac/ffmpeg rename to plugins/hal-nvr/resources/bin/mac/ffmpeg diff --git a/plugins/hal-nvr/resource/resource/bin/win/ffmpeg.exe b/plugins/hal-nvr/resources/bin/win/ffmpeg.exe similarity index 100% rename from plugins/hal-nvr/resource/resource/bin/win/ffmpeg.exe rename to plugins/hal-nvr/resources/bin/win/ffmpeg.exe diff --git a/plugins/hal-nvr/resource/resource/hal-nvr-reference.db b/plugins/hal-nvr/resources/hal-nvr-reference.db similarity index 100% rename from plugins/hal-nvr/resource/resource/hal-nvr-reference.db rename to plugins/hal-nvr/resources/hal-nvr-reference.db diff --git a/plugins/hal-nvr/resource/resource/web/camera_config.tmpl b/plugins/hal-nvr/resources/web/camera_config.tmpl similarity index 100% rename from plugins/hal-nvr/resource/resource/web/camera_config.tmpl rename to plugins/hal-nvr/resources/web/camera_config.tmpl diff --git a/plugins/hal-nvr/resource/resource/web/camera_detail.tmpl b/plugins/hal-nvr/resources/web/camera_detail.tmpl similarity index 100% rename from plugins/hal-nvr/resource/resource/web/camera_detail.tmpl rename to plugins/hal-nvr/resources/web/camera_detail.tmpl diff --git a/plugins/hal-nvr/resource/resource/web/camera_monitor.tmpl b/plugins/hal-nvr/resources/web/camera_monitor.tmpl similarity index 100% rename from plugins/hal-nvr/resource/resource/web/camera_monitor.tmpl rename to plugins/hal-nvr/resources/web/camera_monitor.tmpl diff --git a/plugins/hal-nvr/resource/resource/web/camera_overview.tmpl b/plugins/hal-nvr/resources/web/camera_overview.tmpl similarity index 100% rename from plugins/hal-nvr/resource/resource/web/camera_overview.tmpl rename to plugins/hal-nvr/resources/web/camera_overview.tmpl diff --git a/plugins/hal-nvr/resource/resource/web/css/video-js.min.css b/plugins/hal-nvr/resources/web/css/video-js.min.css similarity index 100% rename from plugins/hal-nvr/resource/resource/web/css/video-js.min.css rename to plugins/hal-nvr/resources/web/css/video-js.min.css diff --git a/plugins/hal-nvr/resource/resource/web/fonts/VideoJS.svg b/plugins/hal-nvr/resources/web/fonts/VideoJS.svg similarity index 100% rename from plugins/hal-nvr/resource/resource/web/fonts/VideoJS.svg rename to plugins/hal-nvr/resources/web/fonts/VideoJS.svg diff --git a/plugins/hal-nvr/resource/resource/web/fonts/VideoJS.ttf b/plugins/hal-nvr/resources/web/fonts/VideoJS.ttf similarity index 100% rename from plugins/hal-nvr/resource/resource/web/fonts/VideoJS.ttf rename to plugins/hal-nvr/resources/web/fonts/VideoJS.ttf diff --git a/plugins/hal-nvr/resource/resource/web/fonts/VideoJS.woff b/plugins/hal-nvr/resources/web/fonts/VideoJS.woff similarity index 100% rename from plugins/hal-nvr/resource/resource/web/fonts/VideoJS.woff rename to plugins/hal-nvr/resources/web/fonts/VideoJS.woff diff --git a/plugins/hal-nvr/resource/resource/web/js/lib/video.min.js b/plugins/hal-nvr/resources/web/js/lib/video.min.js similarity index 100% rename from plugins/hal-nvr/resource/resource/web/js/lib/video.min.js rename to plugins/hal-nvr/resources/web/js/lib/video.min.js diff --git a/plugins/hal-nvr/resource/resource/web/js/lib/videojs-http-streaming.min.js b/plugins/hal-nvr/resources/web/js/lib/videojs-http-streaming.min.js similarity index 100% rename from plugins/hal-nvr/resource/resource/web/js/lib/videojs-http-streaming.min.js rename to plugins/hal-nvr/resources/web/js/lib/videojs-http-streaming.min.js diff --git a/plugins/hal-nvr/src/se/hal/plugin/nvr/NVRDatabaseUpgrader.java b/plugins/hal-nvr/src/se/hal/plugin/nvr/NVRDatabaseUpgrader.java index 8297290b..4c2229b2 100644 --- a/plugins/hal-nvr/src/se/hal/plugin/nvr/NVRDatabaseUpgrader.java +++ b/plugins/hal-nvr/src/se/hal/plugin/nvr/NVRDatabaseUpgrader.java @@ -8,7 +8,7 @@ import se.hal.intf.HalDatabaseUpgrader; */ public class NVRDatabaseUpgrader extends HalDatabaseUpgrader { private static final int REFERENCE_DB_VERSION = 2; - private static final String REFERENCE_DB_PATH = HalContext.RESOURCE_ROOT + "/resource/hal-nvr-reference.db"; + private static final String REFERENCE_DB_PATH = HalContext.RESOURCE_ROOT + "/hal-nvr-reference.db"; public NVRDatabaseUpgrader() { diff --git a/plugins/hal-nvr/src/se/hal/plugin/nvr/rtsp/RTSPCameraRecorder.java b/plugins/hal-nvr/src/se/hal/plugin/nvr/rtsp/RTSPCameraRecorder.java index ff352dbc..b3e6b126 100644 --- a/plugins/hal-nvr/src/se/hal/plugin/nvr/rtsp/RTSPCameraRecorder.java +++ b/plugins/hal-nvr/src/se/hal/plugin/nvr/rtsp/RTSPCameraRecorder.java @@ -21,7 +21,7 @@ import java.util.logging.Logger; public class RTSPCameraRecorder implements Runnable { private static final Logger logger = LogUtil.getLogger(); - private static final File FFMPEG_BINARY_PATH = FileUtil.find(HalContext.RESOURCE_ROOT + "/resource/bin/"); + private static final File FFMPEG_BINARY_PATH = FileUtil.find(HalContext.RESOURCE_ROOT + "/bin/"); private RTSPCameraConfig camera; private String storagePath; diff --git a/plugins/hal-powerchallenge/resource/resource/web/pc_heatmap.tmpl b/plugins/hal-powerchallenge/resources/web/pc_heatmap.tmpl similarity index 100% rename from plugins/hal-powerchallenge/resource/resource/web/pc_heatmap.tmpl rename to plugins/hal-powerchallenge/resources/web/pc_heatmap.tmpl diff --git a/plugins/hal-powerchallenge/resource/resource/web/pc_overview.tmpl b/plugins/hal-powerchallenge/resources/web/pc_overview.tmpl similarity index 100% rename from plugins/hal-powerchallenge/resource/resource/web/pc_overview.tmpl rename to plugins/hal-powerchallenge/resources/web/pc_overview.tmpl diff --git a/plugins/hal-powerchallenge/src/se/hal/plugin/powerchallenge/page/PCHeatMapWebPage.java b/plugins/hal-powerchallenge/src/se/hal/plugin/powerchallenge/page/PCHeatMapWebPage.java index c34b0f98..f73a2ab4 100644 --- a/plugins/hal-powerchallenge/src/se/hal/plugin/powerchallenge/page/PCHeatMapWebPage.java +++ b/plugins/hal-powerchallenge/src/se/hal/plugin/powerchallenge/page/PCHeatMapWebPage.java @@ -32,7 +32,7 @@ import zutil.parser.Templator; import java.util.Map; public class PCHeatMapWebPage extends HalWebPage { - private static final String TEMPLATE = HalContext.RESOURCE_ROOT + "/resource/web/pc_heatmap.tmpl"; + private static final String TEMPLATE = HalContext.RESOURCE_ROOT + "/web/pc_heatmap.tmpl"; public PCHeatMapWebPage() { diff --git a/plugins/hal-zigbee/resource/resource/hal-zigbee-reference.db b/plugins/hal-zigbee/resources/hal-zigbee-reference.db similarity index 100% rename from plugins/hal-zigbee/resource/resource/hal-zigbee-reference.db rename to plugins/hal-zigbee/resources/hal-zigbee-reference.db diff --git a/plugins/hal-zigbee/resource/resource/web/zigbee_network.tmpl b/plugins/hal-zigbee/resources/web/zigbee_network.tmpl similarity index 100% rename from plugins/hal-zigbee/resource/resource/web/zigbee_network.tmpl rename to plugins/hal-zigbee/resources/web/zigbee_network.tmpl diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigbeeHalDatabaseUpgrader.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigbeeHalDatabaseUpgrader.java index 195fb674..1575cf1c 100644 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigbeeHalDatabaseUpgrader.java +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigbeeHalDatabaseUpgrader.java @@ -8,7 +8,7 @@ import se.hal.intf.HalDatabaseUpgrader; */ public class ZigbeeHalDatabaseUpgrader extends HalDatabaseUpgrader { private static final int REFERENCE_DB_VERSION = 1; - private static final String REFERENCE_DB_PATH = HalContext.RESOURCE_ROOT + "/resource/hal-zigbee-reference.db"; + private static final String REFERENCE_DB_PATH = HalContext.RESOURCE_ROOT + "/hal-zigbee-reference.db"; public ZigbeeHalDatabaseUpgrader() { diff --git a/plugins/hal-zwave/resource/resource/config/2gig/ct100.xml b/plugins/hal-zwave/resources/config/2gig/ct100.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/2gig/ct100.xml rename to plugins/hal-zwave/resources/config/2gig/ct100.xml diff --git a/plugins/hal-zwave/resource/resource/config/2gig/ct30.xml b/plugins/hal-zwave/resources/config/2gig/ct30.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/2gig/ct30.xml rename to plugins/hal-zwave/resources/config/2gig/ct30.xml diff --git a/plugins/hal-zwave/resource/resource/config/BeNext/1poleswitch.xml b/plugins/hal-zwave/resources/config/BeNext/1poleswitch.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/BeNext/1poleswitch.xml rename to plugins/hal-zwave/resources/config/BeNext/1poleswitch.xml diff --git a/plugins/hal-zwave/resource/resource/config/BeNext/2poleswitch.xml b/plugins/hal-zwave/resources/config/BeNext/2poleswitch.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/BeNext/2poleswitch.xml rename to plugins/hal-zwave/resources/config/BeNext/2poleswitch.xml diff --git a/plugins/hal-zwave/resource/resource/config/BeNext/AlarmSound.xml b/plugins/hal-zwave/resources/config/BeNext/AlarmSound.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/BeNext/AlarmSound.xml rename to plugins/hal-zwave/resources/config/BeNext/AlarmSound.xml diff --git a/plugins/hal-zwave/resource/resource/config/BeNext/BuiltinDimmer.xml b/plugins/hal-zwave/resources/config/BeNext/BuiltinDimmer.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/BeNext/BuiltinDimmer.xml rename to plugins/hal-zwave/resources/config/BeNext/BuiltinDimmer.xml diff --git a/plugins/hal-zwave/resource/resource/config/BeNext/DoorSensor.xml b/plugins/hal-zwave/resources/config/BeNext/DoorSensor.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/BeNext/DoorSensor.xml rename to plugins/hal-zwave/resources/config/BeNext/DoorSensor.xml diff --git a/plugins/hal-zwave/resource/resource/config/BeNext/EnergySwitch.xml b/plugins/hal-zwave/resources/config/BeNext/EnergySwitch.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/BeNext/EnergySwitch.xml rename to plugins/hal-zwave/resources/config/BeNext/EnergySwitch.xml diff --git a/plugins/hal-zwave/resource/resource/config/BeNext/Molite.xml b/plugins/hal-zwave/resources/config/BeNext/Molite.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/BeNext/Molite.xml rename to plugins/hal-zwave/resources/config/BeNext/Molite.xml diff --git a/plugins/hal-zwave/resource/resource/config/BeNext/PluginDimmer.xml b/plugins/hal-zwave/resources/config/BeNext/PluginDimmer.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/BeNext/PluginDimmer.xml rename to plugins/hal-zwave/resources/config/BeNext/PluginDimmer.xml diff --git a/plugins/hal-zwave/resource/resource/config/BeNext/TagReader.xml b/plugins/hal-zwave/resources/config/BeNext/TagReader.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/BeNext/TagReader.xml rename to plugins/hal-zwave/resources/config/BeNext/TagReader.xml diff --git a/plugins/hal-zwave/resource/resource/config/act/lfm20.xml b/plugins/hal-zwave/resources/config/act/lfm20.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/act/lfm20.xml rename to plugins/hal-zwave/resources/config/act/lfm20.xml diff --git a/plugins/hal-zwave/resource/resource/config/act/zdm230.xml b/plugins/hal-zwave/resources/config/act/zdm230.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/act/zdm230.xml rename to plugins/hal-zwave/resources/config/act/zdm230.xml diff --git a/plugins/hal-zwave/resource/resource/config/act/zdw103.xml b/plugins/hal-zwave/resources/config/act/zdw103.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/act/zdw103.xml rename to plugins/hal-zwave/resources/config/act/zdw103.xml diff --git a/plugins/hal-zwave/resource/resource/config/act/zdw232.xml b/plugins/hal-zwave/resources/config/act/zdw232.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/act/zdw232.xml rename to plugins/hal-zwave/resources/config/act/zdw232.xml diff --git a/plugins/hal-zwave/resource/resource/config/act/zir010.xml b/plugins/hal-zwave/resources/config/act/zir010.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/act/zir010.xml rename to plugins/hal-zwave/resources/config/act/zir010.xml diff --git a/plugins/hal-zwave/resource/resource/config/act/zrp110.xml b/plugins/hal-zwave/resources/config/act/zrp110.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/act/zrp110.xml rename to plugins/hal-zwave/resources/config/act/zrp110.xml diff --git a/plugins/hal-zwave/resource/resource/config/act/zrw103.xml b/plugins/hal-zwave/resources/config/act/zrw103.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/act/zrw103.xml rename to plugins/hal-zwave/resources/config/act/zrw103.xml diff --git a/plugins/hal-zwave/resource/resource/config/aeon_labs/alms.xml b/plugins/hal-zwave/resources/config/aeon_labs/alms.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/aeon_labs/alms.xml rename to plugins/hal-zwave/resources/config/aeon_labs/alms.xml diff --git a/plugins/hal-zwave/resource/resource/config/aeon_labs/doorwindow.xml b/plugins/hal-zwave/resources/config/aeon_labs/doorwindow.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/aeon_labs/doorwindow.xml rename to plugins/hal-zwave/resources/config/aeon_labs/doorwindow.xml diff --git a/plugins/hal-zwave/resource/resource/config/aeon_labs/hem.xml b/plugins/hal-zwave/resources/config/aeon_labs/hem.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/aeon_labs/hem.xml rename to plugins/hal-zwave/resources/config/aeon_labs/hem.xml diff --git a/plugins/hal-zwave/resource/resource/config/aeon_labs/hemg2.xml b/plugins/hal-zwave/resources/config/aeon_labs/hemg2.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/aeon_labs/hemg2.xml rename to plugins/hal-zwave/resources/config/aeon_labs/hemg2.xml diff --git a/plugins/hal-zwave/resource/resource/config/aeon_labs/keyfob.xml b/plugins/hal-zwave/resources/config/aeon_labs/keyfob.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/aeon_labs/keyfob.xml rename to plugins/hal-zwave/resources/config/aeon_labs/keyfob.xml diff --git a/plugins/hal-zwave/resource/resource/config/aeon_labs/minimote.xml b/plugins/hal-zwave/resources/config/aeon_labs/minimote.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/aeon_labs/minimote.xml rename to plugins/hal-zwave/resources/config/aeon_labs/minimote.xml diff --git a/plugins/hal-zwave/resource/resource/config/aeon_labs/recessed_doorsensor.xml b/plugins/hal-zwave/resources/config/aeon_labs/recessed_doorsensor.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/aeon_labs/recessed_doorsensor.xml rename to plugins/hal-zwave/resources/config/aeon_labs/recessed_doorsensor.xml diff --git a/plugins/hal-zwave/resource/resource/config/aeon_labs/ses.xml b/plugins/hal-zwave/resources/config/aeon_labs/ses.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/aeon_labs/ses.xml rename to plugins/hal-zwave/resources/config/aeon_labs/ses.xml diff --git a/plugins/hal-zwave/resource/resource/config/danfoss/living.xml b/plugins/hal-zwave/resources/config/danfoss/living.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/danfoss/living.xml rename to plugins/hal-zwave/resources/config/danfoss/living.xml diff --git a/plugins/hal-zwave/resource/resource/config/danfoss/z.xml b/plugins/hal-zwave/resources/config/danfoss/z.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/danfoss/z.xml rename to plugins/hal-zwave/resources/config/danfoss/z.xml diff --git a/plugins/hal-zwave/resource/resource/config/device_classes.xml b/plugins/hal-zwave/resources/config/device_classes.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/device_classes.xml rename to plugins/hal-zwave/resources/config/device_classes.xml diff --git a/plugins/hal-zwave/resource/resource/config/device_classes.xsd b/plugins/hal-zwave/resources/config/device_classes.xsd similarity index 100% rename from plugins/hal-zwave/resource/resource/config/device_classes.xsd rename to plugins/hal-zwave/resources/config/device_classes.xsd diff --git a/plugins/hal-zwave/resource/resource/config/device_configuration.xsd b/plugins/hal-zwave/resources/config/device_configuration.xsd similarity index 100% rename from plugins/hal-zwave/resource/resource/config/device_configuration.xsd rename to plugins/hal-zwave/resources/config/device_configuration.xsd diff --git a/plugins/hal-zwave/resource/resource/config/duwi/ZWES1000.xml b/plugins/hal-zwave/resources/config/duwi/ZWES1000.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/duwi/ZWES1000.xml rename to plugins/hal-zwave/resources/config/duwi/ZWES1000.xml diff --git a/plugins/hal-zwave/resource/resource/config/eurotronic/eur_stellaz.xml b/plugins/hal-zwave/resources/config/eurotronic/eur_stellaz.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/eurotronic/eur_stellaz.xml rename to plugins/hal-zwave/resources/config/eurotronic/eur_stellaz.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspring/an145.xml b/plugins/hal-zwave/resources/config/everspring/an145.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspring/an145.xml rename to plugins/hal-zwave/resources/config/everspring/an145.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspring/an158.xml b/plugins/hal-zwave/resources/config/everspring/an158.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspring/an158.xml rename to plugins/hal-zwave/resources/config/everspring/an158.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspring/se812.xml b/plugins/hal-zwave/resources/config/everspring/se812.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspring/se812.xml rename to plugins/hal-zwave/resources/config/everspring/se812.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspring/sf812.xml b/plugins/hal-zwave/resources/config/everspring/sf812.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspring/sf812.xml rename to plugins/hal-zwave/resources/config/everspring/sf812.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspring/sm103.xml b/plugins/hal-zwave/resources/config/everspring/sm103.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspring/sm103.xml rename to plugins/hal-zwave/resources/config/everspring/sm103.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspring/sp103.xml b/plugins/hal-zwave/resources/config/everspring/sp103.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspring/sp103.xml rename to plugins/hal-zwave/resources/config/everspring/sp103.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspring/sp814.xml b/plugins/hal-zwave/resources/config/everspring/sp814.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspring/sp814.xml rename to plugins/hal-zwave/resources/config/everspring/sp814.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspring/st814.xml b/plugins/hal-zwave/resources/config/everspring/st814.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspring/st814.xml rename to plugins/hal-zwave/resources/config/everspring/st814.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspring/st815.xml b/plugins/hal-zwave/resources/config/everspring/st815.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspring/st815.xml rename to plugins/hal-zwave/resources/config/everspring/st815.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspring/tse03.xml b/plugins/hal-zwave/resources/config/everspring/tse03.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspring/tse03.xml rename to plugins/hal-zwave/resources/config/everspring/tse03.xml diff --git a/plugins/hal-zwave/resource/resource/config/everspringct/hsm02.xml b/plugins/hal-zwave/resources/config/everspringct/hsm02.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/everspringct/hsm02.xml rename to plugins/hal-zwave/resources/config/everspringct/hsm02.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgbs001.xml b/plugins/hal-zwave/resources/config/fibaro/fgbs001.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgbs001.xml rename to plugins/hal-zwave/resources/config/fibaro/fgbs001.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgd211.xml b/plugins/hal-zwave/resources/config/fibaro/fgd211.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgd211.xml rename to plugins/hal-zwave/resources/config/fibaro/fgd211.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgfs101.xml b/plugins/hal-zwave/resources/config/fibaro/fgfs101.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgfs101.xml rename to plugins/hal-zwave/resources/config/fibaro/fgfs101.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgk001.xml b/plugins/hal-zwave/resources/config/fibaro/fgk001.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgk001.xml rename to plugins/hal-zwave/resources/config/fibaro/fgk001.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgms.xml b/plugins/hal-zwave/resources/config/fibaro/fgms.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgms.xml rename to plugins/hal-zwave/resources/config/fibaro/fgms.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgr221.xml b/plugins/hal-zwave/resources/config/fibaro/fgr221.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgr221.xml rename to plugins/hal-zwave/resources/config/fibaro/fgr221.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgrgbwm441.xml b/plugins/hal-zwave/resources/config/fibaro/fgrgbwm441.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgrgbwm441.xml rename to plugins/hal-zwave/resources/config/fibaro/fgrgbwm441.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgrm222.xml b/plugins/hal-zwave/resources/config/fibaro/fgrm222.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgrm222.xml rename to plugins/hal-zwave/resources/config/fibaro/fgrm222.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgs211.xml b/plugins/hal-zwave/resources/config/fibaro/fgs211.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgs211.xml rename to plugins/hal-zwave/resources/config/fibaro/fgs211.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgs221.xml b/plugins/hal-zwave/resources/config/fibaro/fgs221.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgs221.xml rename to plugins/hal-zwave/resources/config/fibaro/fgs221.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgss101.xml b/plugins/hal-zwave/resources/config/fibaro/fgss101.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgss101.xml rename to plugins/hal-zwave/resources/config/fibaro/fgss101.xml diff --git a/plugins/hal-zwave/resource/resource/config/fibaro/fgwpe.xml b/plugins/hal-zwave/resources/config/fibaro/fgwpe.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/fibaro/fgwpe.xml rename to plugins/hal-zwave/resources/config/fibaro/fgwpe.xml diff --git a/plugins/hal-zwave/resource/resource/config/frostdale/fdn2nxx.xml b/plugins/hal-zwave/resources/config/frostdale/fdn2nxx.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/frostdale/fdn2nxx.xml rename to plugins/hal-zwave/resources/config/frostdale/fdn2nxx.xml diff --git a/plugins/hal-zwave/resource/resource/config/ge/dimmer.xml b/plugins/hal-zwave/resources/config/ge/dimmer.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/ge/dimmer.xml rename to plugins/hal-zwave/resources/config/ge/dimmer.xml diff --git a/plugins/hal-zwave/resource/resource/config/ge/dimmer_module.xml b/plugins/hal-zwave/resources/config/ge/dimmer_module.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/ge/dimmer_module.xml rename to plugins/hal-zwave/resources/config/ge/dimmer_module.xml diff --git a/plugins/hal-zwave/resource/resource/config/ge/relay.xml b/plugins/hal-zwave/resources/config/ge/relay.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/ge/relay.xml rename to plugins/hal-zwave/resources/config/ge/relay.xml diff --git a/plugins/hal-zwave/resource/resource/config/greenwave/powernode1.xml b/plugins/hal-zwave/resources/config/greenwave/powernode1.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/greenwave/powernode1.xml rename to plugins/hal-zwave/resources/config/greenwave/powernode1.xml diff --git a/plugins/hal-zwave/resource/resource/config/greenwave/powernode6.xml b/plugins/hal-zwave/resources/config/greenwave/powernode6.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/greenwave/powernode6.xml rename to plugins/hal-zwave/resources/config/greenwave/powernode6.xml diff --git a/plugins/hal-zwave/resource/resource/config/homeseer/hsm100.xml b/plugins/hal-zwave/resources/config/homeseer/hsm100.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/homeseer/hsm100.xml rename to plugins/hal-zwave/resources/config/homeseer/hsm100.xml diff --git a/plugins/hal-zwave/resource/resource/config/homeseer/ztroller.xml b/plugins/hal-zwave/resources/config/homeseer/ztroller.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/homeseer/ztroller.xml rename to plugins/hal-zwave/resources/config/homeseer/ztroller.xml diff --git a/plugins/hal-zwave/resource/resource/config/honeywell/th8320zw1000.xml b/plugins/hal-zwave/resources/config/honeywell/th8320zw1000.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/honeywell/th8320zw1000.xml rename to plugins/hal-zwave/resources/config/honeywell/th8320zw1000.xml diff --git a/plugins/hal-zwave/resource/resource/config/horstmann/hrt4zw.xml b/plugins/hal-zwave/resources/config/horstmann/hrt4zw.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/horstmann/hrt4zw.xml rename to plugins/hal-zwave/resources/config/horstmann/hrt4zw.xml diff --git a/plugins/hal-zwave/resource/resource/config/intermatic/ca8900.xml b/plugins/hal-zwave/resources/config/intermatic/ca8900.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/intermatic/ca8900.xml rename to plugins/hal-zwave/resources/config/intermatic/ca8900.xml diff --git a/plugins/hal-zwave/resource/resource/config/leviton/rzi10.xml b/plugins/hal-zwave/resources/config/leviton/rzi10.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/leviton/rzi10.xml rename to plugins/hal-zwave/resources/config/leviton/rzi10.xml diff --git a/plugins/hal-zwave/resource/resource/config/leviton/vrcpg.xml b/plugins/hal-zwave/resources/config/leviton/vrcpg.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/leviton/vrcpg.xml rename to plugins/hal-zwave/resources/config/leviton/vrcpg.xml diff --git a/plugins/hal-zwave/resource/resource/config/leviton/vrf01.xml b/plugins/hal-zwave/resources/config/leviton/vrf01.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/leviton/vrf01.xml rename to plugins/hal-zwave/resources/config/leviton/vrf01.xml diff --git a/plugins/hal-zwave/resource/resource/config/leviton/vri06.xml b/plugins/hal-zwave/resources/config/leviton/vri06.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/leviton/vri06.xml rename to plugins/hal-zwave/resources/config/leviton/vri06.xml diff --git a/plugins/hal-zwave/resource/resource/config/leviton/vri10.xml b/plugins/hal-zwave/resources/config/leviton/vri10.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/leviton/vri10.xml rename to plugins/hal-zwave/resources/config/leviton/vri10.xml diff --git a/plugins/hal-zwave/resource/resource/config/manufacturer_specific.xml b/plugins/hal-zwave/resources/config/manufacturer_specific.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/manufacturer_specific.xml rename to plugins/hal-zwave/resources/config/manufacturer_specific.xml diff --git a/plugins/hal-zwave/resource/resource/config/manufacturer_specific.xsd b/plugins/hal-zwave/resources/config/manufacturer_specific.xsd similarity index 100% rename from plugins/hal-zwave/resource/resource/config/manufacturer_specific.xsd rename to plugins/hal-zwave/resources/config/manufacturer_specific.xsd diff --git a/plugins/hal-zwave/resource/resource/config/northq/nq92021.xml b/plugins/hal-zwave/resources/config/northq/nq92021.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/northq/nq92021.xml rename to plugins/hal-zwave/resources/config/northq/nq92021.xml diff --git a/plugins/hal-zwave/resource/resource/config/options.xml b/plugins/hal-zwave/resources/config/options.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/options.xml rename to plugins/hal-zwave/resources/config/options.xml diff --git a/plugins/hal-zwave/resource/resource/config/options.xsd b/plugins/hal-zwave/resources/config/options.xsd similarity index 100% rename from plugins/hal-zwave/resource/resource/config/options.xsd rename to plugins/hal-zwave/resources/config/options.xsd diff --git a/plugins/hal-zwave/resource/resource/config/philio/psm02.xml b/plugins/hal-zwave/resources/config/philio/psm02.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/philio/psm02.xml rename to plugins/hal-zwave/resources/config/philio/psm02.xml diff --git a/plugins/hal-zwave/resource/resource/config/rcs/em52-zw.xml b/plugins/hal-zwave/resources/config/rcs/em52-zw.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/rcs/em52-zw.xml rename to plugins/hal-zwave/resources/config/rcs/em52-zw.xml diff --git a/plugins/hal-zwave/resource/resource/config/rcs/pm12-zw.xml b/plugins/hal-zwave/resources/config/rcs/pm12-zw.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/rcs/pm12-zw.xml rename to plugins/hal-zwave/resources/config/rcs/pm12-zw.xml diff --git a/plugins/hal-zwave/resource/resource/config/rcs/therm0005.xml b/plugins/hal-zwave/resources/config/rcs/therm0005.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/rcs/therm0005.xml rename to plugins/hal-zwave/resources/config/rcs/therm0005.xml diff --git a/plugins/hal-zwave/resource/resource/config/rcs/therm0007.xml b/plugins/hal-zwave/resources/config/rcs/therm0007.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/rcs/therm0007.xml rename to plugins/hal-zwave/resources/config/rcs/therm0007.xml diff --git a/plugins/hal-zwave/resource/resource/config/rcs/therm0009.xml b/plugins/hal-zwave/resources/config/rcs/therm0009.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/rcs/therm0009.xml rename to plugins/hal-zwave/resources/config/rcs/therm0009.xml diff --git a/plugins/hal-zwave/resource/resource/config/remotec/zurc.xml b/plugins/hal-zwave/resources/config/remotec/zurc.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/remotec/zurc.xml rename to plugins/hal-zwave/resources/config/remotec/zurc.xml diff --git a/plugins/hal-zwave/resource/resource/config/remotec/zxt-120.xml b/plugins/hal-zwave/resources/config/remotec/zxt-120.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/remotec/zxt-120.xml rename to plugins/hal-zwave/resources/config/remotec/zxt-120.xml diff --git a/plugins/hal-zwave/resource/resource/config/schlagelink/itemp.xml b/plugins/hal-zwave/resources/config/schlagelink/itemp.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/schlagelink/itemp.xml rename to plugins/hal-zwave/resources/config/schlagelink/itemp.xml diff --git a/plugins/hal-zwave/resource/resource/config/trane/TZEMT400AB32MAA.xml b/plugins/hal-zwave/resources/config/trane/TZEMT400AB32MAA.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/trane/TZEMT400AB32MAA.xml rename to plugins/hal-zwave/resources/config/trane/TZEMT400AB32MAA.xml diff --git a/plugins/hal-zwave/resource/resource/config/trane/TZEMT400BB32MAA.xml b/plugins/hal-zwave/resources/config/trane/TZEMT400BB32MAA.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/trane/TZEMT400BB32MAA.xml rename to plugins/hal-zwave/resources/config/trane/TZEMT400BB32MAA.xml diff --git a/plugins/hal-zwave/resource/resource/config/vision/zs5101eu.xml b/plugins/hal-zwave/resources/config/vision/zs5101eu.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/vision/zs5101eu.xml rename to plugins/hal-zwave/resources/config/vision/zs5101eu.xml diff --git a/plugins/hal-zwave/resource/resource/config/vitrum/vitrumBS.xml b/plugins/hal-zwave/resources/config/vitrum/vitrumBS.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/vitrum/vitrumBS.xml rename to plugins/hal-zwave/resources/config/vitrum/vitrumBS.xml diff --git a/plugins/hal-zwave/resource/resource/config/waynedalton/WDTC-20.xml b/plugins/hal-zwave/resources/config/waynedalton/WDTC-20.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/waynedalton/WDTC-20.xml rename to plugins/hal-zwave/resources/config/waynedalton/WDTC-20.xml diff --git a/plugins/hal-zwave/resource/resource/config/wenzhou/tz66d.xml b/plugins/hal-zwave/resources/config/wenzhou/tz66d.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/wenzhou/tz66d.xml rename to plugins/hal-zwave/resources/config/wenzhou/tz66d.xml diff --git a/plugins/hal-zwave/resource/resource/config/wenzhou/tz88.xml b/plugins/hal-zwave/resources/config/wenzhou/tz88.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/wenzhou/tz88.xml rename to plugins/hal-zwave/resources/config/wenzhou/tz88.xml diff --git a/plugins/hal-zwave/resource/resource/config/zwave.me/ZME_06433.xml b/plugins/hal-zwave/resources/config/zwave.me/ZME_06433.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/zwave.me/ZME_06433.xml rename to plugins/hal-zwave/resources/config/zwave.me/ZME_06433.xml diff --git a/plugins/hal-zwave/resource/resource/config/zwave.me/ZME_06436.xml b/plugins/hal-zwave/resources/config/zwave.me/ZME_06436.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/zwave.me/ZME_06436.xml rename to plugins/hal-zwave/resources/config/zwave.me/ZME_06436.xml diff --git a/plugins/hal-zwave/resource/resource/config/zwave.me/ZME_WCD2.xml b/plugins/hal-zwave/resources/config/zwave.me/ZME_WCD2.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/zwave.me/ZME_WCD2.xml rename to plugins/hal-zwave/resources/config/zwave.me/ZME_WCD2.xml diff --git a/plugins/hal-zwave/resource/resource/config/zwave.me/kfob.xml b/plugins/hal-zwave/resources/config/zwave.me/kfob.xml similarity index 100% rename from plugins/hal-zwave/resource/resource/config/zwave.me/kfob.xml rename to plugins/hal-zwave/resources/config/zwave.me/kfob.xml diff --git a/plugins/hal-zwave/resource/resource/config/zwcfg.xsd b/plugins/hal-zwave/resources/config/zwcfg.xsd similarity index 100% rename from plugins/hal-zwave/resource/resource/config/zwcfg.xsd rename to plugins/hal-zwave/resources/config/zwcfg.xsd diff --git a/plugins/hal-zwave/resource/resource/config/zwscene.xsd b/plugins/hal-zwave/resources/config/zwscene.xsd similarity index 100% rename from plugins/hal-zwave/resource/resource/config/zwscene.xsd rename to plugins/hal-zwave/resources/config/zwscene.xsd