From 9e088f8c622094deb6844046064f5ab57f2b5ce7 Mon Sep 17 00:00:00 2001 From: J-N-K Date: Thu, 25 May 2023 08:37:50 +0200 Subject: [PATCH] Move LSP service from misc to system (#3626) This is needed to clean-up UI. The categories should be used for add-ons while core services should use `system`. Signed-off-by: Jan N. Klug --- .../org/openhab/core/model/lsp/internal/ModelServer.java | 4 ++-- .../src/main/resources/OH-INF/config/lsp.xml | 2 +- .../src/main/resources/OH-INF/i18n/lsp.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_cs.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_da.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_de.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_el.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_fi.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_fr.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_he.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_hu.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_it.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_nl.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_no.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_pl.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_pt.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_ru.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_sl.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_sv.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_uk.properties | 6 +++--- .../src/main/resources/OH-INF/i18n/lsp_zh.properties | 6 +++--- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java index 1e4e4e3ad..7880c12c6 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java +++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java @@ -48,12 +48,12 @@ import com.google.inject.Injector; */ @Component(immediate = true, service = ModelServer.class, configurationPid = ModelServer.CONFIGURATION_PID, // property = Constants.SERVICE_PID + "=org.openhab.lsp") -@ConfigurableService(category = "misc", label = "Language Server (LSP)", description_uri = ModelServer.CONFIG_URI) +@ConfigurableService(category = "system", label = "Language Server (LSP)", description_uri = ModelServer.CONFIG_URI) @NonNullByDefault public class ModelServer { public static final String CONFIGURATION_PID = "org.openhab.lsp"; - protected static final String CONFIG_URI = "misc:lsp"; + protected static final String CONFIG_URI = "system:lsp"; private static final String KEY_PORT = "port"; private static final int DEFAULT_PORT = 5007; diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/lsp.xml b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/lsp.xml index 507810d6e..70b29e257 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/lsp.xml +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/lsp.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd"> - + The port the language server listens to. diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp.properties index e6bee1709..a1fb00d9e 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Port -misc.config.lsp.port.description = The port the language server listens to. +system.config.lsp.port.label = Port +system.config.lsp.port.description = The port the language server listens to. -service.misc.lsp.label = Language Server (LSP) +service.system.lsp.label = Language Server (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_cs.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_cs.properties index 6c2af8f9c..04831656f 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_cs.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_cs.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Port -misc.config.lsp.port.description = Port, který jazykový server používá. +system.config.lsp.port.label = Port +system.config.lsp.port.description = Port, který jazykový server používá. -service.misc.lsp.label = Jazykový server (LSP) +service.system.lsp.label = Jazykový server (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_da.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_da.properties index 1953d0fba..ab39460d8 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_da.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_da.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Port -misc.config.lsp.port.description = Porten som sprogserveren lytter til. +system.config.lsp.port.label = Port +system.config.lsp.port.description = Porten som sprogserveren lytter til. -service.misc.lsp.label = Sprogserver (LSP) +service.system.lsp.label = Sprogserver (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_de.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_de.properties index 319ecee5c..eff3513e2 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_de.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_de.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Port -misc.config.lsp.port.description = Der Port, auf den der Sprachserver lauscht. +system.config.lsp.port.label = Port +system.config.lsp.port.description = Der Port, auf den der Sprachserver lauscht. -service.misc.lsp.label = Sprachserver (LSP) +service.system.lsp.label = Sprachserver (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_el.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_el.properties index ee8da43f5..8b21b7fe5 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_el.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_el.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Θύρα -misc.config.lsp.port.description = Η θύρα που ακούει ο διακομιστής γλώσσας. +system.config.lsp.port.label = Θύρα +system.config.lsp.port.description = Η θύρα που ακούει ο διακομιστής γλώσσας. -service.misc.lsp.label = Διακομιστής Γλώσσας (LSP) +service.system.lsp.label = Διακομιστής Γλώσσας (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_fi.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_fi.properties index daae62c58..a7394a0ea 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_fi.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_fi.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Portti -misc.config.lsp.port.description = Portti, jota kieli palvelin kuuntelee. +system.config.lsp.port.label = Portti +system.config.lsp.port.description = Portti, jota kieli palvelin kuuntelee. -service.misc.lsp.label = Kielipalvelin (LSP) +service.system.lsp.label = Kielipalvelin (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_fr.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_fr.properties index cdcabf0ef..af911827b 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_fr.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_fr.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Port -misc.config.lsp.port.description = Le port d'écoute du serveur de langage. +system.config.lsp.port.label = Port +system.config.lsp.port.description = Le port d'écoute du serveur de langage. -service.misc.lsp.label = Serveur de langage (LSP) +service.system.lsp.label = Serveur de langage (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_he.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_he.properties index 2710e0d5d..94590ad95 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_he.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_he.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = יציאה -misc.config.lsp.port.description = הפורט ששרת השפה יאזין אליו. +system.config.lsp.port.label = יציאה +system.config.lsp.port.description = הפורט ששרת השפה יאזין אליו. -service.misc.lsp.label = שרת השפה (LSP) +service.system.lsp.label = שרת השפה (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_hu.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_hu.properties index 85f26e990..ce2337df0 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_hu.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_hu.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Port -misc.config.lsp.port.description = A nyelvi kiszolgáló portja. +system.config.lsp.port.label = Port +system.config.lsp.port.description = A nyelvi kiszolgáló portja. -service.misc.lsp.label = Nyelvi kiszolgáló (LSP) +service.system.lsp.label = Nyelvi kiszolgáló (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_it.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_it.properties index db03a4d8a..fcc0176b2 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_it.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_it.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Porta -misc.config.lsp.port.description = La porta usata dal server della traduzione. +system.config.lsp.port.label = Porta +system.config.lsp.port.description = La porta usata dal server della traduzione. -service.misc.lsp.label = Server Traduzione (LSP) +service.system.lsp.label = Server Traduzione (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_nl.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_nl.properties index 8f82d4b9c..9652114f6 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_nl.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_nl.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Poort -misc.config.lsp.port.description = De poort waarnaar de taalserver luistert. +system.config.lsp.port.label = Poort +system.config.lsp.port.description = De poort waarnaar de taalserver luistert. -service.misc.lsp.label = Taalserver (LSP) +service.system.lsp.label = Taalserver (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_no.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_no.properties index ae862f5d5..e59cd166d 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_no.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_no.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Port -misc.config.lsp.port.description = Porten språkserveren lytter til. +system.config.lsp.port.label = Port +system.config.lsp.port.description = Porten språkserveren lytter til. -service.misc.lsp.label = Språkserver (LSP) +service.system.lsp.label = Språkserver (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_pl.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_pl.properties index 08b30d212..87f3a245c 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_pl.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_pl.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Port -misc.config.lsp.port.description = Port na którym nasłuchuje serwer języka. +system.config.lsp.port.label = Port +system.config.lsp.port.description = Port na którym nasłuchuje serwer języka. -service.misc.lsp.label = Serwer języka (LSP) +service.system.lsp.label = Serwer języka (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_pt.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_pt.properties index 8e0ff0328..09382c0de 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_pt.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_pt.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Porta -misc.config.lsp.port.description = A porta que o servidor de idioma escuta. +system.config.lsp.port.label = Porta +system.config.lsp.port.description = A porta que o servidor de idioma escuta. -service.misc.lsp.label = Servidor de Idioma (LSP) +service.system.lsp.label = Servidor de Idioma (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_ru.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_ru.properties index 5ca338e72..e14e07a7d 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_ru.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_ru.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Порт -misc.config.lsp.port.description = Порт языкового сервера. +system.config.lsp.port.label = Порт +system.config.lsp.port.description = Порт языкового сервера. -service.misc.lsp.label = Языковой сервер (LSP) +service.system.lsp.label = Языковой сервер (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_sl.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_sl.properties index 7bd4363f6..c56b851aa 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_sl.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_sl.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Vrata -misc.config.lsp.port.description = Vrata, ki jim prisluškuje jezikovni strežnik. +system.config.lsp.port.label = Vrata +system.config.lsp.port.description = Vrata, ki jim prisluškuje jezikovni strežnik. -service.misc.lsp.label = jezikovni strežnik (LSP) +service.system.lsp.label = jezikovni strežnik (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_sv.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_sv.properties index 3008b5aaf..3e40c8061 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_sv.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_sv.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Port -misc.config.lsp.port.description = Porten som språkservern lyssnar på. +system.config.lsp.port.label = Port +system.config.lsp.port.description = Porten som språkservern lyssnar på. -service.misc.lsp.label = Språkserver (LSP) +service.system.lsp.label = Språkserver (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_uk.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_uk.properties index b0e70c659..11727d036 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_uk.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_uk.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = Порт -misc.config.lsp.port.description = Порт, до якого слухає мова. +system.config.lsp.port.label = Порт +system.config.lsp.port.description = Порт, до якого слухає мова. -service.misc.lsp.label = Мовний сервер (LSP) +service.system.lsp.label = Мовний сервер (LSP) diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_zh.properties b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_zh.properties index 9d89949c6..7cac582d0 100644 --- a/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_zh.properties +++ b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/i18n/lsp_zh.properties @@ -1,4 +1,4 @@ -misc.config.lsp.port.label = 端口 -misc.config.lsp.port.description = 语言服务器监听的端口。 +system.config.lsp.port.label = 端口 +system.config.lsp.port.description = 语言服务器监听的端口。 -service.misc.lsp.label = 语言服务器 (LSP) +service.system.lsp.label = 语言服务器 (LSP)