Renamed namespace "org.eclipse.smarthome" to "org.openhab.core"

distributions/openhab/src/main/resources/bin/update.lst

@@ -51,3 +51,42 @@ DELETEDIR;$OPENHAB_USERDATA/kar
 REPLACE;org.eclipse.smarthome.automation.dto.RuleDTO;org.openhab.core.automation.dto.RuleDTO;$OPENHAB_USERDATA/jsondb/automation_rules.json
 MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/core/i18nprovider.config;$OPENHAB_USERDATA/config/org/eclipse/smarthome/i18n.config
 REPLACE;org.eclipse.smarthome.core.i18nprovider;org.eclipse.smarthome.i18n;$OPENHAB_USERDATA/config/org/eclipse/smarthome/i18n.config
+
+[3.0.0]
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/i18n.config;$OPENHAB_USERDATA/config/org/openhab/i18n.config
+REPLACE;org.eclipse.smarthome.i18n;org.openhab.i18n;$OPENHAB_USERDATA/config/org/openhab/i18n.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/persistence.config;$OPENHAB_USERDATA/config/org/openhab/persistence.config
+REPLACE;org.eclipse.smarthome.persistence;org.openhab.persistence;$OPENHAB_USERDATA/config/org/openhab/persistence.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/audio.config;$OPENHAB_USERDATA/config/org/openhab/audio.config
+REPLACE;org.eclipse.smarthome.audio;org.openhab.audio;$OPENHAB_USERDATA/config/org/openhab/audio.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/voice.config;$OPENHAB_USERDATA/config/org/openhab/voice.config
+REPLACE;org.eclipse.smarthome.voice;org.openhab.voice;$OPENHAB_USERDATA/config/org/openhab/voice.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/inbox.config;$OPENHAB_USERDATA/config/org/openhab/inbox.config
+REPLACE;org.eclipse.smarthome.inbox;org.openhab.inbox;$OPENHAB_USERDATA/config/org/openhab/inbox.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/links.config;$OPENHAB_USERDATA/config/org/openhab/links.config
+REPLACE;org.eclipse.smarthome.links;org.openhab.links;$OPENHAB_USERDATA/config/org/openhab/links.config
+
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/folder.config;$OPENHAB_USERDATA/config/org/openhab/folder.config
+REPLACE;org.eclipse.smarthome.folder;org.openhab.folder;$OPENHAB_USERDATA/config/org/openhab/folder.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/cors.config;$OPENHAB_USERDATA/config/org/openhab/cors.config
+REPLACE;org.eclipse.smarthome.cors;org.openhab.cors;$OPENHAB_USERDATA/config/org/openhab/cors.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/threadpool.config;$OPENHAB_USERDATA/config/org/openhab/threadpool.config
+REPLACE;org.eclipse.smarthome.threadpool;org.openhab.threadpool;$OPENHAB_USERDATA/config/org/openhab/threadpool.config
+
+REPLACE;org.eclipse.smarthome;org.openhab;$OPENHAB_RUNTIME/services.cfg
+
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/autoupdate.config;$OPENHAB_USERDATA/config/org/openhab/autoupdate.config
+REPLACE;org.eclipse.smarthome.autoupdate;org.openhab.autoupdate;$OPENHAB_USERDATA/config/org/openhab/autoupdate.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/chart.config;$OPENHAB_USERDATA/config/org/openhab/chart.config
+REPLACE;org.eclipse.smarthome.chart;org.openhab.chart;$OPENHAB_USERDATA/config/org/openhab/chart.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/lsp.config;$OPENHAB_USERDATA/config/org/openhab/lsp.config
+REPLACE;org.eclipse.smarthome.lsp;org.openhab.lsp;$OPENHAB_USERDATA/config/org/openhab/lsp.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/network.config;$OPENHAB_USERDATA/config/org/openhab/network.config
+REPLACE;org.eclipse.smarthome.network;org.openhab.network;$OPENHAB_USERDATA/config/org/openhab/network.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/rulehli.config;$OPENHAB_USERDATA/config/org/openhab/rulehli.config
+REPLACE;org.eclipse.smarthome.rulehli;org.openhab.rulehli;$OPENHAB_USERDATA/config/org/openhab/rulehli.config
+
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/storage/json.config;$OPENHAB_USERDATA/config/org/openhab/storage/json.config
+REPLACE;org.eclipse.smarthome.storage.json;org.openhab.storage.json;$OPENHAB_USERDATA/config/org/openhab/storage/json.config
+MOVE;$OPENHAB_USERDATA/config/org/eclipse/smarthome/storage/mapdb.config;$OPENHAB_USERDATA/config/org/openhab/storage/mapdb.config
+REPLACE;org.eclipse.smarthome.storage.mapdb;org.openhab.storage.mapdb;$OPENHAB_USERDATA/config/org/openhab/storage/json.config

distributions/openhab/src/main/resources/conf/services/runtime.cfg

@@ -4,47 +4,47 @@
 # The ISO 639 alpha-2 or alpha-3 language code (if there is no alpha-2 one).
 # Example: "en" (English), "de" (German), "ja" (Japanese), "kok" (Konkani)
 #
-#org.eclipse.smarthome.i18n:language=
+#org.openhab.i18n:language=
 
 # The region that should be used.
 # ISO 3166 alpha-2 country code or UN M.49 numeric-3 area code.
 # Example: "US" (United States), "DE" (Germany), "FR" (France), "029" (Caribbean)
 #
-#org.eclipse.smarthome.i18n:region=
+#org.openhab.i18n:region=
 
 ################ PERSISTENCE ####################
 
 # The persistence service to use if no other is specified.
 #
-#org.eclipse.smarthome.persistence:default=
+#org.openhab.persistence:default=
 
 ################### AUDIO #######################
 
 # This parameter defines the default audio source to use (if not set, the first available one will be used.
 #
-#org.eclipse.smarthome.audio:defaultSource=
+#org.openhab.audio:defaultSource=
 
 # This parameter defines the default audio sink to use (if not set, the first available one will be used.
 #
-#org.eclipse.smarthome.audio:defaultSink=
+#org.openhab.audio:defaultSink=
 
 ##################### VOICE #####################
 
 # This parameter defines the default text-to-speech service to use (if not set, the first available one will be used.
 #
-#org.eclipse.smarthome.voice:defaultTTS=
+#org.openhab.voice:defaultTTS=
 
 # This parameter defines the default speech-to-text service to use (if not set, the first available one will be used.
 #
-#org.eclipse.smarthome.voice:defaultSTT=
+#org.openhab.voice:defaultSTT=
 
 # The default voice to use if no specific TTS service or voice is specified.
 #
-#org.eclipse.smarthome.voice:defaultVoice=
+#org.openhab.voice:defaultVoice=
 
 # The default human language interpreter to use if no other is specified.
 #
-#org.eclipse.smarthome.voice:defaultHLI=
+#org.openhab.voice:defaultHLI=
 
 ################### EPHEMERIS ###################
 
@@ -76,11 +76,11 @@ org.openhab.ephemeris:dayset-school=[MONDAY,TUESDAY,WEDNESDAY,THURSDAY,FRIDAY]
 # Setting this to true will automatically approve all inbox entries and create Things for them,
 # so that they are immediately available in the system (default is false)
 #
-#org.eclipse.smarthome.inbox:autoApprove=true
+#org.openhab.inbox:autoApprove=true
 
 # This setting allows to switch between a "simple" and an "advanced" mode for item management.
 # In simple mode (autoLinks=true), links and their according items are automatically created for new Things.
 # In advanced mode (autoLinks=false), the user has the full control about which items channels are linked to.
 # Existing links will remain untouched. (default is true)
 #
-#org.eclipse.smarthome.links:autoLinks=false
+#org.openhab.links:autoLinks=false

distributions/openhab/src/main/resources/runtime/services.cfg

@@ -1,16 +1,16 @@
 # This file defines required service configurations.
 # It can be overridden by user specific configurations in conf/services folder.
 
-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.openhab.folder:items=items
+org.openhab.folder:sitemaps=sitemap
+org.openhab.folder:rules=rules
+org.openhab.folder:scripts=script
+org.openhab.folder:persistence=persist
+org.openhab.folder:things=things
 
 # Configuration of thread pool sizes
-org.eclipse.smarthome.threadpool:thingHandler=5
-org.eclipse.smarthome.threadpool:discovery=5
-org.eclipse.smarthome.threadpool:safeCall=10
+org.openhab.threadpool:thingHandler=5
+org.openhab.threadpool:discovery=5
+org.openhab.threadpool:safeCall=10
 
-org.eclipse.smarthome.autoupdate:sendOptimisticUpdates=true
+org.openhab.autoupdate:sendOptimisticUpdates=true

distributions/openhab/src/main/resources/userdata/etc/org.ops4j.pax.logging.cfg

@@ -25,9 +25,6 @@ log4j2.logger.audit.appenderRef.audit.ref = AUDIT
 log4j2.logger.openhab.name = org.openhab
 log4j2.logger.openhab.level = INFO
 
-log4j2.logger.smarthome.name = org.eclipse.smarthome
-log4j2.logger.smarthome.level = INFO
-
 log4j2.logger.smarthomeItemStateEvent.name = smarthome.event.ItemStateEvent
 log4j2.logger.smarthomeItemStateEvent.level = ERROR
 log4j2.logger.smarthomeItemAddedEvent.name = smarthome.event.ItemAddedEvent

features/distro/src/main/feature/feature.xml

@@ -14,7 +14,7 @@
  <configfile finalname="${openhab.conf}/services/basicui.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-basicui</configfile>
  <configfile finalname="${openhab.conf}/services/classicui.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-classicui</configfile>
  <configfile finalname="${openhab.conf}/services/logging.cfg" override="false">mvn:${project.groupId}/distro-resources/${project.version}/cfg/services-logging</configfile>
- <config name="org.eclipse.smarthome.persistence">
+ <config name="org.openhab.persistence">
  default = rrd4j
  </config>
  <config name="org.openhab.addons" append="true">
@@ -40,7 +40,7 @@
  ui = paper,habpanel
  misc = ruleengine
  </config>
- <config name="org.eclipse.smarthome.links">
+ <config name="org.openhab.links">
  autoLinks = true
  </config>
  </feature>
@@ -51,7 +51,7 @@
  package = standard
  ui = basic,paper,habpanel,homebuilder
  </config>
- <config name="org.eclipse.smarthome.links">
+ <config name="org.openhab.links">
  autoLinks = false
  </config>
  </feature>
@@ -63,7 +63,7 @@
  ui = classic,basic,paper,habpanel,habmin,restdocs
  transformation = map,regex,xslt,exec,javascript,scale,xpath,jsonpath
  </config>
- <config name="org.eclipse.smarthome.links">
+ <config name="org.openhab.links">
  autoLinks = false
  </config>
  </feature>

launch/app/app.bndrun

@@ -55,13 +55,7 @@ feature.openhab-model-runtime-all: \
  bnd.identity;id='org.openhab.core.automation.module.media',\
  bnd.identity;id='org.openhab.core.automation.module.script',\
  bnd.identity;id='org.openhab.core.automation.module.script.rulesupport',\
- bnd.identity;id='org.openhab.core.automation.rest',\
- bnd.identity;id='org.openhab.ui.basic',\
- bnd.identity;id='org.openhab.ui.paper',\
- bnd.identity;id='org.openhab.core.ui.icon',\
- bnd.identity;id='org.openhab.transform.map',\
- bnd.identity;id='org.openhab.ui.iconset.classic',\
- bnd.identity;id='org.openhab.ui.restdocs'
+ bnd.identity;id='org.openhab.core.automation.rest'
 
 -runfw: org.eclipse.osgi
 
@@ -151,7 +145,6 @@ feature.openhab-model-runtime-all: \
  org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
  org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
  org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
- org.eclipse.jetty.proxy;version='[9.4.20,9.4.21)',\
  org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
  org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
  org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
@@ -173,7 +166,6 @@ feature.openhab-model-runtime-all: \
  org.openhab.core.automation.module.script.rulesupport;version='[3.0.0,3.0.1)',\
  org.openhab.core.automation.rest;version='[3.0.0,3.0.1)',\
  org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
- org.openhab.core.boot;version='[3.0.0,3.0.1)',\
  org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
  org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
  org.openhab.core.config.dispatch;version='[3.0.0,3.0.1)',\
@@ -188,7 +180,6 @@ feature.openhab-model-runtime-all: \
  org.openhab.core.io.rest;version='[3.0.0,3.0.1)',\
  org.openhab.core.io.rest.core;version='[3.0.0,3.0.1)',\
  org.openhab.core.io.rest.optimize;version='[3.0.0,3.0.1)',\
- org.openhab.core.io.rest.sitemap;version='[3.0.0,3.0.1)',\
  org.openhab.core.io.rest.sse;version='[3.0.0,3.0.1)',\
  org.openhab.core.model.core;version='[3.0.0,3.0.1)',\
  org.openhab.core.model.item;version='[3.0.0,3.0.1)',\
@@ -210,15 +201,7 @@ feature.openhab-model-runtime-all: \
  org.openhab.core.thing;version='[3.0.0,3.0.1)',\
  org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
  org.openhab.core.transform;version='[3.0.0,3.0.1)',\
- org.openhab.core.ui;version='[3.0.0,3.0.1)',\
- org.openhab.core.ui.icon;version='[3.0.0,3.0.1)',\
  org.openhab.core.voice;version='[3.0.0,3.0.1)',\
- org.openhab.transform.map;version='[3.0.0,3.0.1)',\
- org.openhab.ui.basic;version='[3.0.0,3.0.1)',\
- org.openhab.ui.dashboard;version='[3.0.0,3.0.1)',\
- org.openhab.ui.iconset.classic;version='[3.0.0,3.0.1)',\
- org.openhab.ui.paper;version='[3.0.0,3.0.1)',\
- org.openhab.ui.restdocs;version='[3.0.0,3.0.1)',\
  slf4j.simple;version='[1.7.21,1.7.22)',\
  org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
  org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\

launch/app/pom.xml

@@ -41,12 +41,6 @@
  <type>pom</type>
  <scope>runtime</scope>
  </dependency>
- <dependency>
- <groupId>org.openhab.addons.bundles</groupId>
- <artifactId>org.openhab.transform.map</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
 
 <!-- uncomment this and add the name of your binding that you want to work on
  <dependency>

launch/app/runtime/conf/smarthome.cfg

@@ -1,9 +1,9 @@
-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.openhab.folder:items=items
+org.openhab.folder:sitemaps=sitemap
+org.openhab.folder:rules=rules
+org.openhab.folder:scripts=script
+org.openhab.folder:persistence=persist
+org.openhab.folder:things=things
 
 org.openhab.classicui:defaultSitemap=demo
 
@@ -21,9 +21,9 @@ com.eclipsesource.jaxrs.swagger.config:swagger.info.title=openHAB 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
+# org.openhab.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
+org.openhab.threadpool:thingHandler=3
+org.openhab.threadpool:discovery=3
+org.openhab.threadpool:safeCall=3

launch/app/runtime/logback.xml

@@ -38,7 +38,6 @@
  <appender-ref ref="STDOUT" />
  </root>
 
- <logger name="org.eclipse.smarthome" level="INFO" />
  <logger name="org.openhab.core" level="INFO" />
 
 </configuration>