diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java index add76bd64f..d91f8a5d31 100644 --- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java +++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; */ @NonNullByDefault @Component(immediate = true, configurationPid = "org.openhab.audio", property = { // - Constants.SERVICE_PID + "=org.openhab.core.audio", // + Constants.SERVICE_PID + "=org.openhab.audio", // ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", // ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + AudioManagerImpl.CONFIG_URI, // ConfigurableService.SERVICE_PROPERTY_LABEL + "=Audio" // diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java index 7be9a0c34a..8a13f3f400 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java @@ -87,7 +87,7 @@ import org.slf4j.LoggerFactory; * @author Henning Sudbrock - added hook for selectively auto-approving inbox entries */ @Component(immediate = true, configurationPid = "org.openhab.inbox", service = EventSubscriber.class, property = { - Constants.SERVICE_PID + "=org.openhab.core.inbox", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", + Constants.SERVICE_PID + "=org.openhab.inbox", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Inbox", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:inbox" }) @NonNullByDefault diff --git a/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java b/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java index 097f8e6491..6c8b1fc026 100644 --- a/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java +++ b/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java @@ -35,7 +35,7 @@ import org.osgi.service.component.annotations.ReferencePolicy; * @author Markus Rathgeb - Use HTTP service utility functions */ @Component(immediate = true, configurationPid = "org.openhab.mdns", property = { - Constants.SERVICE_PID + "=org.openhab.core.mdns" // + Constants.SERVICE_PID + "=org.openhab.mdns" // }) public class MDNSAnnouncer { diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java index 3bd858b177..a23dd59af4 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java @@ -24,7 +24,7 @@ import org.osgi.service.component.annotations.Component; * @author David Graeff - Initial contribution */ @Component(immediate = true, service = MqttBrokerConnectionServiceInstanceMarker.class, property = { - Constants.SERVICE_PID + "=org.openhab.core.mqttbroker", + Constants.SERVICE_PID + "=org.openhab.mqttbroker", ConfigurableService.SERVICE_PROPERTY_FACTORY_SERVICE + "=true", ConfigurableService.SERVICE_PROPERTY_LABEL + "=MQTT system broker connection", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=MQTT", diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java index 30c1f7226f..88e6df610d 100644 --- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java +++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; * @author Markus Rathgeb - Synchronize access to broker connections */ @Component(immediate = true, service = MqttService.class, configurationPid = "org.openhab.mqtt", property = { - Constants.SERVICE_PID + "=org.openhab.core.mqtt" }) + Constants.SERVICE_PID + "=org.openhab.mqtt" }) @NonNullByDefault public class MqttServiceImpl implements MqttService { private final Logger logger = LoggerFactory.getLogger(MqttServiceImpl.class); 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 340feb66af..b8e2fe6b48 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 @@ -45,8 +45,7 @@ import com.google.inject.Injector; * @author Simon Kaufmann - Initial contribution */ @Component(immediate = true, service = ModelServer.class, configurationPid = ModelServer.CONFIGURATION_PID, property = { - Constants.SERVICE_PID + "=org.openhab.core.lsp", - ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=misc:lsp", + Constants.SERVICE_PID + "=org.openhab.lsp", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=misc:lsp", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Language Server (LSP)", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=misc" }) public class ModelServer { diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java index 299b0db3aa..248e1e6e0b 100644 --- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java +++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; * @author Kai Kreuzer - Initial contribution */ @Component(immediate = true, service = HumanLanguageInterpreter.class, configurationPid = "org.openhab.rulehli", property = { - Constants.SERVICE_PID + "=org.openhab.core.rulehli", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=voice", + Constants.SERVICE_PID + "=org.openhab.rulehli", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=voice", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Rule Voice Interpreter", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + RuleHumanLanguageInterpreter.CONFIG_URI }) public class RuleHumanLanguageInterpreter implements HumanLanguageInterpreter { diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java index 5b93545899..3facb630dc 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java @@ -42,8 +42,7 @@ import org.osgi.service.component.annotations.ReferencePolicy; * @author Kai Kreuzer - Initial contribution */ @Component(immediate = true, configurationPid = "org.openhab.persistence", property = { - Constants.SERVICE_PID + "=org.openhab.core.persistence", - ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", + Constants.SERVICE_PID + "=org.openhab.persistence", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Persistence", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + PersistenceServiceRegistryImpl.CONFIG_URI }) @NonNullByDefault diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java index 86f7682e65..a8d4f1f0fb 100644 --- a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java +++ b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; * @author Chris Jackson - Initial contribution */ @Component(name = "org.openhab.core.storage.json", configurationPid = "org.openhab.storage.json", property = { // - Constants.SERVICE_PID + "=org.openhab.core.storage.json", // + Constants.SERVICE_PID + "=org.openhab.storage.json", // ConfigurableService.SERVICE_PROPERTY_LABEL + "=Json Storage", // ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", // ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:json_storage", // diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java index 91aefbbcb5..1ac0d1faa0 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java @@ -22,7 +22,7 @@ import org.osgi.service.component.annotations.Component; * @author Stefan Triller - Initial contribution */ @Component(immediate = true, service = MagicMultiActionMarker.class, property = { - Constants.SERVICE_PID + "=org.openhab.core.MagicMultiAction", + Constants.SERVICE_PID + "=org.openhab.MagicMultiAction", ConfigurableService.SERVICE_PROPERTY_FACTORY_SERVICE + "=true", ConfigurableService.SERVICE_PROPERTY_LABEL + "=MagicMultiActionsService", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=RuleActions", diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java index e6a1cb3b4c..a50a9796ba 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; * @author Stefan Triller - Initial contribution */ @Component(configurationPid = "org.openhab.magicsingleaction", property = { - Constants.SERVICE_PID + "=org.openhab.core.automation.action.magicSingleActionService", + Constants.SERVICE_PID + "=org.openhab.automation.action.magicSingleActionService", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=automationAction:magicSingleAction", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Magic Single Action Service", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=RuleActions" }) diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java index 5bade4e565..0b53cfd476 100644 --- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java +++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java @@ -22,7 +22,7 @@ import org.osgi.service.component.annotations.Component; */ @Component(immediate = true, service = MagicMultiInstanceServiceMarker.class, property = { - Constants.SERVICE_PID + "=org.openhab.core.magicMultiInstance", + Constants.SERVICE_PID + "=org.openhab.magicMultiInstance", ConfigurableService.SERVICE_PROPERTY_FACTORY_SERVICE + "=true", ConfigurableService.SERVICE_PROPERTY_LABEL + "=MagicMultiInstanceService", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=test", diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java index c086084fda..25df8c7188 100644 --- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java +++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java @@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory; * @author Wouter Born - Sort TTS options */ @Component(immediate = true, configurationPid = VoiceManagerImpl.CONFIGURATION_PID, property = { // - Constants.SERVICE_PID + "=org.openhab.core.voice", // + Constants.SERVICE_PID + "=org.openhab.voice", // ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", // ConfigurableService.SERVICE_PROPERTY_LABEL + "=Voice", // ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + VoiceManagerImpl.CONFIG_URI // diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java index 8c309ec6c1..f7d6bb1df3 100644 --- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java +++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; * @author Erdoan Hadzhiyusein - Added time zone */ @Component(immediate = true, configurationPid = I18nProviderImpl.CONFIGURATION_PID, property = { - Constants.SERVICE_PID + "=org.openhab.core.i18n", // + Constants.SERVICE_PID + "=org.openhab.i18n", // "service.config.label=Regional Settings", // "service.config.category=system", // "service.config.description.uri=system:i18n" })