diff --git a/demo/app/.classpath b/demo/app/.classpath deleted file mode 100644 index 372f1810d..000000000 --- a/demo/app/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/demo/app/.project b/demo/app/.project deleted file mode 100644 index d49d74089..000000000 --- a/demo/app/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.openhab.core.demo.app - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/demo/app/app.bndrun b/demo/app/app.bndrun deleted file mode 100644 index 64e23b295..000000000 --- a/demo/app/app.bndrun +++ /dev/null @@ -1,182 +0,0 @@ --standalone: \ - ../../bom/runtime-index/target/index.xml;name="org.openhab.core.bom.runtime-index",\ - ../../bom/openhab-core-index/target/local-index.xml;name="org.openhab.core.bom.openhab-core-index" - --resolve.effective: active - -feature.logging: \ - bnd.identity;id='org.apache.felix.log',\ - bnd.identity;id='org.apache.felix.logback' - -feature.debug: \ - osgi.identity;filter:='(osgi.identity=org.apache.felix.webconsole)',\ - osgi.identity;filter:='(osgi.identity=org.apache.felix.webconsole.plugins.ds)',\ - osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)',\ - osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.runtime)',\ - osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)' - -feature.openhab-base: \ - bnd.identity;id='org.openhab.core.config.core',\ - bnd.identity;id='org.openhab.core.config.discovery',\ - bnd.identity;id='org.openhab.core.config.dispatch',\ - bnd.identity;id='org.openhab.core.config.xml',\ - bnd.identity;id='org.openhab.core',\ - bnd.identity;id='org.openhab.core.storage.mapdb',\ - bnd.identity;id='org.openhab.core.binding.xml',\ - bnd.identity;id='org.openhab.core.id',\ - bnd.identity;id='org.openhab.core.semantics',\ - bnd.identity;id='org.openhab.core.scheduler',\ - bnd.identity;id='org.openhab.core.thing',\ - bnd.identity;id='org.openhab.core.thing.xml',\ - bnd.identity;id='org.openhab.core.transform',\ - bnd.identity;id='org.openhab.core.audio',\ - bnd.identity;id='org.openhab.core.voice',\ - bnd.identity;id='org.openhab.core.io.console',\ - bnd.identity;id='org.openhab.core.io.monitor',\ - bnd.identity;id='org.openhab.core.io.net',\ - bnd.identity;id='org.openhab.core.io.http',\ - bnd.identity;id='org.openhab.core.io.rest',\ - bnd.identity;id='org.openhab.core.io.rest.optimize',\ - bnd.identity;id='org.openhab.core.io.rest.core',\ - bnd.identity;id='org.openhab.core.io.rest.sse' - -feature.openhab-model-runtime-all: \ - bnd.identity;id='org.openhab.core.model.item.runtime',\ - bnd.identity;id='org.openhab.core.model.persistence.runtime',\ - bnd.identity;id='org.openhab.core.model.rule.runtime',\ - bnd.identity;id='org.openhab.core.model.script.runtime',\ - bnd.identity;id='org.openhab.core.model.sitemap.runtime',\ - bnd.identity;id='org.openhab.core.model.thing.runtime' - --runrequires: \ - bnd.identity;id='org.eclipse.equinox.metatype',\ - ${feature.logging},\ - ${feature.debug},\ - ${feature.openhab-base},\ - ${feature.openhab-model-runtime-all},\ - bnd.identity;id='org.openhab.core.io.console.rfc147' - --runfw: org.eclipse.osgi --runee: JavaSE-1.8 - --runproperties: \ - osgi.console=,\ - osgi.console.enable.builtin=false,\ - 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' - -# -# done -# - --runbundles: \ - org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - com.eclipsesource.jaxrs.jersey-all;version='[2.22.2,2.22.3)',\ - com.eclipsesource.jaxrs.publisher;version='[5.3.1,5.3.2)',\ - com.google.gson;version='[2.8.2,2.8.3)',\ - com.google.guava;version='[21.0.0,21.0.1)',\ - com.google.inject;version='[3.0.0,3.0.1)',\ - javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - joda-time;version='[2.9.2,2.9.3)',\ - log4j;version='[1.2.17,1.2.18)',\ - org.antlr.runtime;version='[3.2.0,3.2.1)',\ - org.apache.commons.collections;version='[3.2.1,3.2.2)',\ - org.apache.commons.exec;version='[1.1.0,1.1.1)',\ - org.apache.commons.fileupload;version='[1.3.3,1.3.4)',\ - org.apache.commons.io;version='[2.2.0,2.2.1)',\ - org.apache.commons.lang;version='[2.6.0,2.6.1)',\ - org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\ - org.apache.felix.gogo.command;version='[1.0.2,1.0.3)',\ - org.apache.felix.gogo.runtime;version='[1.0.10,1.0.11)',\ - org.apache.felix.gogo.shell;version='[1.0.0,1.0.1)',\ - org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ - org.apache.felix.inventory;version='[1.0.4,1.0.5)',\ - org.apache.felix.log;version='[1.2.0,1.2.1)',\ - org.apache.felix.logback;version='[1.0.0,1.0.1)',\ - org.apache.felix.scr;version='[2.1.10,2.1.11)',\ - org.apache.felix.webconsole;version='[4.3.4,4.3.5)',\ - org.apache.felix.webconsole.plugins.ds;version='[2.0.8,2.0.9)',\ - org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ - org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ - org.eclipse.emf.common;version='[2.12.0,2.12.1)',\ - org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\ - org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\ - org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.eclipse.equinox.metatype;version='[1.4.500,1.4.501)',\ - org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\ - org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\ - org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\ - org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\ - org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\ - org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\ - org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\ - org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\ - org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\ - org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\ - org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\ - org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\ - org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\ - org.eclipse.xtext;version='[2.17.0,2.17.1)',\ - org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\ - org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\ - org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\ - org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ - org.mapdb.mapdb;version='[1.0.9,1.0.10)',\ - org.objectweb.asm;version='[7.0.0,7.0.1)',\ - org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\ - org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\ - org.openhab.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.audio;version='[2.5.0,2.5.1)',\ - org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.dispatch;version='[2.5.0,2.5.1)',\ - org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.id;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.console.rfc147;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.http;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.monitor;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.net;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.rest;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.rest.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.rest.optimize;version='[2.5.0,2.5.1)',\ - org.openhab.core.io.rest.sse;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.core;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.item;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.sitemap.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.model.thing.runtime;version='[2.5.0,2.5.1)',\ - org.openhab.core.persistence;version='[2.5.0,2.5.1)',\ - org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\ - org.openhab.core.semantics;version='[2.5.0,2.5.1)',\ - org.openhab.core.storage.mapdb;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing;version='[2.5.0,2.5.1)',\ - org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\ - org.openhab.core.transform;version='[2.5.0,2.5.1)',\ - org.openhab.core.voice;version='[2.5.0,2.5.1)',\ - org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\ - org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ - org.osgi.service.metatype;version='[1.4.0,1.4.1)',\ - slf4j.api;version='[1.7.25,1.7.26)',\ - tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\ - tec.uom.se;version='[1.0.8,1.0.9)' diff --git a/demo/app/pom.xml b/demo/app/pom.xml deleted file mode 100644 index 6e199eaca..000000000 --- a/demo/app/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 4.0.0 - - - org.openhab.core.demo - org.openhab.core.reactor.demo - 2.5.0-SNAPSHOT - - - org.openhab.core.demo.app - - openHAB Core :: Demo :: App - - - - org.openhab.core.bom - org.openhab.core.bom.runtime-index - ${project.version} - pom - provided - - - org.openhab.core.bom - org.openhab.core.bom.openhab-core-index - ${project.version} - pom - provided - - - - - - - biz.aQute.bnd - bnd-maven-plugin - - - - biz.aQute.bnd - bnd-export-maven-plugin - - false - - app.bndrun - - - - - biz.aQute.bnd - bnd-resolver-maven-plugin - - - app.bndrun - - - - - - diff --git a/demo/app/runtime/conf/icons/none.png b/demo/app/runtime/conf/icons/none.png deleted file mode 100644 index 79e9a33be..000000000 Binary files a/demo/app/runtime/conf/icons/none.png and /dev/null differ diff --git a/demo/app/runtime/conf/icons/present-off.png b/demo/app/runtime/conf/icons/present-off.png deleted file mode 100644 index cdc3c16d1..000000000 Binary files a/demo/app/runtime/conf/icons/present-off.png and /dev/null differ diff --git a/demo/app/runtime/conf/icons/present.png b/demo/app/runtime/conf/icons/present.png deleted file mode 100644 index ce7d2fde6..000000000 Binary files a/demo/app/runtime/conf/icons/present.png and /dev/null differ diff --git a/demo/app/runtime/conf/icons/switch-on.png b/demo/app/runtime/conf/icons/switch-on.png deleted file mode 100644 index d409fa25c..000000000 Binary files a/demo/app/runtime/conf/icons/switch-on.png and /dev/null differ diff --git a/demo/app/runtime/conf/icons/switch.png b/demo/app/runtime/conf/icons/switch.png deleted file mode 100644 index a1f90cf5a..000000000 Binary files a/demo/app/runtime/conf/icons/switch.png and /dev/null differ diff --git a/demo/app/runtime/conf/items/demo.items b/demo/app/runtime/conf/items/demo.items deleted file mode 100644 index 677f17496..000000000 --- a/demo/app/runtime/conf/items/demo.items +++ /dev/null @@ -1,22 +0,0 @@ -Group:Switch:OR(ON,OFF) DemoSwitchGroup [ "home-group" ] - -Switch DemoSwitch (DemoSwitchGroup) -Dimmer DemoDimmer (DemoSwitchGroup) -Rollershutter DemoRollershutter -Color DemoColor (DemoSwitchGroup) -DateTime DemoDateTime -Location DemoLocation -String DemoString -Contact DemoContact -Number DemoNumber -Image DemoImage - -Color MagicColor { channel="magic:color-light:magicColor:color" } -Switch MagicOnOff { channel="magic:onoff-light:magicOnOff:switch" } -Dimmer MagicDimmer { channel="magic:dimmable-light:magicDimmer:brightness" } - -Group Weather "Weather Information" - -Number:Temperature Weather_Temperature "Outside Temperature [%.1f °C]" (Weather) { channel="yahooweather:weather:berlin:temperature" } -Number:Pressure Weather_Pressure "Pressure [%.1f %unit%]" (Weather) { channel="yahooweather:weather:berlin:pressure" } -Number:Dimensionless Weather_Humidity "Humidity [%.1f %unit%]" (Weather) { channel="yahooweather:weather:berlin:humidity" } diff --git a/demo/app/runtime/conf/persistence/mapdb.persist b/demo/app/runtime/conf/persistence/mapdb.persist deleted file mode 100644 index ce5dfe2cc..000000000 --- a/demo/app/runtime/conf/persistence/mapdb.persist +++ /dev/null @@ -1,15 +0,0 @@ -// persistence strategies have a name and a definition and are referred to in the "Items" section -Strategies { - // if no strategy is specified for an item entry below, the default list will be used - default = everyChange, restoreOnStartup -} - -/* - * Each line in this section defines for which item(s) which strategy(ies) should be applied. - * You can list single items, use "*" for all items or "groupitem*" for all members of a group - * item (excl. the group item itself). - */ -Items { - // log all weather data on every change - Weather*; -} diff --git a/demo/app/runtime/conf/rules/demo.rules b/demo/app/runtime/conf/rules/demo.rules deleted file mode 100644 index 479783058..000000000 --- a/demo/app/runtime/conf/rules/demo.rules +++ /dev/null @@ -1,10 +0,0 @@ -rule "Initialize demo items" -when - System started -then - DemoLocation.postUpdate("52,9") - DemoContact.postUpdate(OPEN) - DemoString.postUpdate("Hello SmartHome!") - DemoDateTime.postUpdate(new DateTimeType()) - DemoNumber.postUpdate(12.34) -end diff --git a/demo/app/runtime/conf/sitemaps/demo.sitemap b/demo/app/runtime/conf/sitemaps/demo.sitemap deleted file mode 100644 index 6391c66e2..000000000 --- a/demo/app/runtime/conf/sitemaps/demo.sitemap +++ /dev/null @@ -1,21 +0,0 @@ -sitemap demo label="Demo Sitemap" { - Frame label="Demo Items" { - Text item=DemoContact label="Contact [MAP(en.map):%s]" - Text item=DemoString label="Message [%s]" - Text item=DemoDateTime label="Date [%1$tA, %1$td.%1$tm.%1$tY]" - Group item=DemoSwitchGroup icon=icon1 - } - Frame label="Magic Test Items" { - Colorpicker item=MagicColor - Switch item=MagicOnOff - Slider item=MagicDimmer - } - Frame label="Location" { - Mapview item=DemoLocation height=10 - } - Frame label="Weather" { - Text item=Weather_Temperature - Text item=Weather_Pressure - Text item=Weather_Humidity - } -} diff --git a/demo/app/runtime/conf/smarthome.cfg b/demo/app/runtime/conf/smarthome.cfg deleted file mode 100644 index ed67c4529..000000000 --- a/demo/app/runtime/conf/smarthome.cfg +++ /dev/null @@ -1,29 +0,0 @@ -org.eclipse.smarthome.folder:items=items -org.eclipse.smarthome.folder:sitemaps=sitemap -org.eclipse.smarthome.folder:rules=rules -org.eclipse.smarthome.folder:scripts=script -org.eclipse.smarthome.folder:persistence=persist -org.eclipse.smarthome.folder:things=things - -org.eclipse.smarthome.classicui:defaultSitemap=demo - -org.eclipse.smarthome.basicui:defaultSitemap=demo -org.eclipse.smarthome.basicui:enableIcons=true -org.eclipse.smarthome.basicui:condensedLayout=false -org.eclipse.smarthome.basicui:capitalizeValues=false - -org.jupnp:threadPoolSize=20 - -# Set the rest api to be under /rest -com.eclipsesource.jaxrs.connector:root=/rest -com.eclipsesource.jaxrs.swagger.config:swagger.basePath=/rest -com.eclipsesource.jaxrs.swagger.config:swagger.info.title=ESH REST API -com.eclipsesource.jaxrs.swagger.config:swagger.info.version=1.0 - -# Uncomment to enable rest api CORS requests -# org.eclipse.smarthome.cors:enable=true - -# Configuration of thread pool sizes -org.eclipse.smarthome.threadpool:thingHandler=3 -org.eclipse.smarthome.threadpool:discovery=3 -org.eclipse.smarthome.threadpool:safeCall=3 diff --git a/demo/app/runtime/conf/sounds/doorbell.mp3 b/demo/app/runtime/conf/sounds/doorbell.mp3 deleted file mode 100644 index 7a8a5a365..000000000 Binary files a/demo/app/runtime/conf/sounds/doorbell.mp3 and /dev/null differ diff --git a/demo/app/runtime/conf/things/demo.things b/demo/app/runtime/conf/things/demo.things deleted file mode 100644 index 09cacdd1a..000000000 --- a/demo/app/runtime/conf/things/demo.things +++ /dev/null @@ -1,3 +0,0 @@ -magic:color-light:magicColor -magic:onoff-light:magicOnOff -magic:dimmable-light:magicDimmer diff --git a/demo/app/runtime/conf/transform/de.map b/demo/app/runtime/conf/transform/de.map deleted file mode 100644 index b01ba976a..000000000 --- a/demo/app/runtime/conf/transform/de.map +++ /dev/null @@ -1,4 +0,0 @@ -CLOSED=zu -OPEN=offen -undefined=undefiniert --=- diff --git a/demo/app/runtime/conf/transform/en.map b/demo/app/runtime/conf/transform/en.map deleted file mode 100644 index 324349a38..000000000 --- a/demo/app/runtime/conf/transform/en.map +++ /dev/null @@ -1,4 +0,0 @@ -CLOSED=closed -OPEN=open -undefined=unknown --=- \ No newline at end of file diff --git a/demo/app/runtime/logback.xml b/demo/app/runtime/logback.xml deleted file mode 100644 index 0653c3a6e..000000000 --- a/demo/app/runtime/logback.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - %d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/demo/app/runtime/userdata/.keep b/demo/app/runtime/userdata/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/demo/app/src/main/java/config/package-info.java b/demo/app/src/main/java/config/package-info.java deleted file mode 100644 index 417b4793c..000000000 --- a/demo/app/src/main/java/config/package-info.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * Copyright (c) 2010-2019 Contributors to the openHAB project - * - * See the NOTICE file(s) distributed with this work for additional - * information. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0 - * - * SPDX-License-Identifier: EPL-2.0 - */ -//@RequireConfigurator -package config; - -//import org.osgi.service.configurator.annotations.RequireConfigurator; diff --git a/demo/app/src/main/resources/OSGI-INF/configurator/configuration.json b/demo/app/src/main/resources/OSGI-INF/configurator/configuration.json deleted file mode 100644 index 7a73a41bf..000000000 --- a/demo/app/src/main/resources/OSGI-INF/configurator/configuration.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/demo/pom.xml b/demo/pom.xml deleted file mode 100644 index 6040ef663..000000000 --- a/demo/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - 4.0.0 - - - org.openhab.core - org.openhab.core.reactor - 2.5.0-SNAPSHOT - - - org.openhab.core.demo - org.openhab.core.reactor.demo - pom - - openHAB Core :: Demo - - - app - - - diff --git a/pom.xml b/pom.xml index 15919a675..402e1920f 100644 --- a/pom.xml +++ b/pom.xml @@ -772,7 +772,6 @@ Import-Package: \\ bom - demo bundles features tools