From 47194895ac2606aadfb412e1e7c1c49540098d1b Mon Sep 17 00:00:00 2001 From: Markus Rathgeb Date: Wed, 13 Mar 2019 20:14:52 +0100 Subject: [PATCH] specify directories so we do not rely on the current working directory (#640) * specify directories so we do not rely on the current working directory The current working directory has been changed between Bnd 4.1.0 and 4.2.0 and we should not rely on a specific choosen one. We should set the appropriate directories ourself. Signed-off-by: Markus Rathgeb --- demo/app/app.bndrun | 4 +++- demo/app/runtime/{ => conf}/icons/none.png | Bin demo/app/runtime/{ => conf}/icons/present-off.png | Bin demo/app/runtime/{ => conf}/icons/present.png | Bin demo/app/runtime/{ => conf}/icons/switch-on.png | Bin demo/app/runtime/{ => conf}/icons/switch.png | Bin demo/app/{ => runtime}/conf/items/demo.items | 0 .../{ => runtime}/conf/persistence/mapdb.persist | 0 demo/app/{ => runtime}/conf/rules/demo.rules | 0 demo/app/{ => runtime}/conf/sitemaps/demo.sitemap | 0 demo/app/{ => runtime}/conf/smarthome.cfg | 0 demo/app/{ => runtime}/conf/sounds/doorbell.mp3 | Bin demo/app/{ => runtime}/conf/things/demo.things | 0 demo/app/{ => runtime}/conf/transform/de.map | 0 demo/app/{ => runtime}/conf/transform/en.map | 0 demo/app/{ => runtime}/logback.xml | 3 ++- demo/app/runtime/userdata/.keep | 0 17 files changed, 5 insertions(+), 2 deletions(-) rename demo/app/runtime/{ => conf}/icons/none.png (100%) rename demo/app/runtime/{ => conf}/icons/present-off.png (100%) rename demo/app/runtime/{ => conf}/icons/present.png (100%) rename demo/app/runtime/{ => conf}/icons/switch-on.png (100%) rename demo/app/runtime/{ => conf}/icons/switch.png (100%) rename demo/app/{ => runtime}/conf/items/demo.items (100%) rename demo/app/{ => runtime}/conf/persistence/mapdb.persist (100%) rename demo/app/{ => runtime}/conf/rules/demo.rules (100%) rename demo/app/{ => runtime}/conf/sitemaps/demo.sitemap (100%) rename demo/app/{ => runtime}/conf/smarthome.cfg (100%) rename demo/app/{ => runtime}/conf/sounds/doorbell.mp3 (100%) rename demo/app/{ => runtime}/conf/things/demo.things (100%) rename demo/app/{ => runtime}/conf/transform/de.map (100%) rename demo/app/{ => runtime}/conf/transform/en.map (100%) rename demo/app/{ => runtime}/logback.xml (90%) create mode 100644 demo/app/runtime/userdata/.keep diff --git a/demo/app/app.bndrun b/demo/app/app.bndrun index 89a27ca97..742ed2756 100644 --- a/demo/app/app.bndrun +++ b/demo/app/app.bndrun @@ -62,7 +62,9 @@ feature.openhab-model-runtime-all: \ -runproperties: \ osgi.console=,\ osgi.console.enable.builtin=false,\ - logback.configurationFile=file:${.}/logback.xml + logback.configurationFile=file:${.}/runtime/logback.xml,\ + smarthome.configdir=${.}/runtime/conf,\ + smarthome.userdata=${.}/runtime/userdata -runblacklist: bnd.identity;id='org.apache.aries.javax.jax.rs-api' diff --git a/demo/app/runtime/icons/none.png b/demo/app/runtime/conf/icons/none.png similarity index 100% rename from demo/app/runtime/icons/none.png rename to demo/app/runtime/conf/icons/none.png diff --git a/demo/app/runtime/icons/present-off.png b/demo/app/runtime/conf/icons/present-off.png similarity index 100% rename from demo/app/runtime/icons/present-off.png rename to demo/app/runtime/conf/icons/present-off.png diff --git a/demo/app/runtime/icons/present.png b/demo/app/runtime/conf/icons/present.png similarity index 100% rename from demo/app/runtime/icons/present.png rename to demo/app/runtime/conf/icons/present.png diff --git a/demo/app/runtime/icons/switch-on.png b/demo/app/runtime/conf/icons/switch-on.png similarity index 100% rename from demo/app/runtime/icons/switch-on.png rename to demo/app/runtime/conf/icons/switch-on.png diff --git a/demo/app/runtime/icons/switch.png b/demo/app/runtime/conf/icons/switch.png similarity index 100% rename from demo/app/runtime/icons/switch.png rename to demo/app/runtime/conf/icons/switch.png diff --git a/demo/app/conf/items/demo.items b/demo/app/runtime/conf/items/demo.items similarity index 100% rename from demo/app/conf/items/demo.items rename to demo/app/runtime/conf/items/demo.items diff --git a/demo/app/conf/persistence/mapdb.persist b/demo/app/runtime/conf/persistence/mapdb.persist similarity index 100% rename from demo/app/conf/persistence/mapdb.persist rename to demo/app/runtime/conf/persistence/mapdb.persist diff --git a/demo/app/conf/rules/demo.rules b/demo/app/runtime/conf/rules/demo.rules similarity index 100% rename from demo/app/conf/rules/demo.rules rename to demo/app/runtime/conf/rules/demo.rules diff --git a/demo/app/conf/sitemaps/demo.sitemap b/demo/app/runtime/conf/sitemaps/demo.sitemap similarity index 100% rename from demo/app/conf/sitemaps/demo.sitemap rename to demo/app/runtime/conf/sitemaps/demo.sitemap diff --git a/demo/app/conf/smarthome.cfg b/demo/app/runtime/conf/smarthome.cfg similarity index 100% rename from demo/app/conf/smarthome.cfg rename to demo/app/runtime/conf/smarthome.cfg diff --git a/demo/app/conf/sounds/doorbell.mp3 b/demo/app/runtime/conf/sounds/doorbell.mp3 similarity index 100% rename from demo/app/conf/sounds/doorbell.mp3 rename to demo/app/runtime/conf/sounds/doorbell.mp3 diff --git a/demo/app/conf/things/demo.things b/demo/app/runtime/conf/things/demo.things similarity index 100% rename from demo/app/conf/things/demo.things rename to demo/app/runtime/conf/things/demo.things diff --git a/demo/app/conf/transform/de.map b/demo/app/runtime/conf/transform/de.map similarity index 100% rename from demo/app/conf/transform/de.map rename to demo/app/runtime/conf/transform/de.map diff --git a/demo/app/conf/transform/en.map b/demo/app/runtime/conf/transform/en.map similarity index 100% rename from demo/app/conf/transform/en.map rename to demo/app/runtime/conf/transform/en.map diff --git a/demo/app/logback.xml b/demo/app/runtime/logback.xml similarity index 90% rename from demo/app/logback.xml rename to demo/app/runtime/logback.xml index 02413a533..0653c3a6e 100644 --- a/demo/app/logback.xml +++ b/demo/app/runtime/logback.xml @@ -1,4 +1,4 @@ - + @@ -37,5 +37,6 @@ + diff --git a/demo/app/runtime/userdata/.keep b/demo/app/runtime/userdata/.keep new file mode 100644 index 000000000..e69de29bb