specify directories so we do not rely on the current working directory (

openhab#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 <maggu2810@gmail.com>
ConnectorIO · Mar 13, 2019 · 4719489 · 4719489
1 parent 55801cf
commit 4719489
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 2 deletions.
diff --git 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 → demo/app/runtime/conf/icons/none.png b/demo/app/runtime/icons/none.png → demo/app/runtime/conf/icons/none.png
diff --git a/demo/app/runtime/icons/present-off.png → demo/app/runtime/conf/icons/present-off.png b/demo/app/runtime/icons/present-off.png → demo/app/runtime/conf/icons/present-off.png
diff --git a/demo/app/runtime/icons/present.png → demo/app/runtime/conf/icons/present.png b/demo/app/runtime/icons/present.png → demo/app/runtime/conf/icons/present.png
diff --git a/demo/app/runtime/icons/switch-on.png → demo/app/runtime/conf/icons/switch-on.png b/demo/app/runtime/icons/switch-on.png → demo/app/runtime/conf/icons/switch-on.png
diff --git a/demo/app/runtime/icons/switch.png → demo/app/runtime/conf/icons/switch.png b/demo/app/runtime/icons/switch.png → demo/app/runtime/conf/icons/switch.png
diff --git a/demo/app/conf/items/demo.items → demo/app/runtime/conf/items/demo.items b/demo/app/conf/items/demo.items → demo/app/runtime/conf/items/demo.items
diff --git a/demo/app/conf/persistence/mapdb.persist → ...pp/runtime/conf/persistence/mapdb.persist b/demo/app/conf/persistence/mapdb.persist → ...pp/runtime/conf/persistence/mapdb.persist
diff --git a/demo/app/conf/rules/demo.rules → demo/app/runtime/conf/rules/demo.rules b/demo/app/conf/rules/demo.rules → demo/app/runtime/conf/rules/demo.rules
diff --git a/demo/app/conf/sitemaps/demo.sitemap → demo/app/runtime/conf/sitemaps/demo.sitemap b/demo/app/conf/sitemaps/demo.sitemap → demo/app/runtime/conf/sitemaps/demo.sitemap
diff --git a/demo/app/conf/smarthome.cfg → demo/app/runtime/conf/smarthome.cfg b/demo/app/conf/smarthome.cfg → demo/app/runtime/conf/smarthome.cfg
diff --git a/demo/app/conf/sounds/doorbell.mp3 → demo/app/runtime/conf/sounds/doorbell.mp3 b/demo/app/conf/sounds/doorbell.mp3 → demo/app/runtime/conf/sounds/doorbell.mp3
diff --git a/demo/app/conf/things/demo.things → demo/app/runtime/conf/things/demo.things b/demo/app/conf/things/demo.things → demo/app/runtime/conf/things/demo.things
diff --git a/demo/app/conf/transform/de.map → demo/app/runtime/conf/transform/de.map b/demo/app/conf/transform/de.map → demo/app/runtime/conf/transform/de.map
diff --git a/demo/app/conf/transform/en.map → demo/app/runtime/conf/transform/en.map b/demo/app/conf/transform/en.map → demo/app/runtime/conf/transform/en.map
diff --git a/demo/app/logback.xml → demo/app/runtime/logback.xml b/demo/app/logback.xml → demo/app/runtime/logback.xml
@@ -1,4 +1,4 @@
-<configuration>
+<configuration scan="true" scanPeriod="30 seconds">
 
   <!-- defined a console append -->
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -37,5 +37,6 @@
   </root>
 
   <logger name="org.eclipse.smarthome" level="INFO" />
+  <logger name="org.openhab.core" level="INFO" />
 
 </configuration>
diff --git a/demo/app/runtime/userdata/.keep b/demo/app/runtime/userdata/.keep