OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed service pids (#1382) 

Signed-off-by: Kai Kreuzer <kai@openhab.org>
pull/1390/head
Kai Kreuzer 2020-03-01 16:40:01 +01:00 committed by GitHub
parent 5710532b05
commit 0182ce567d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java
View File

@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
*/ */
@NonNullByDefault @NonNullByDefault
@Component(immediate = true, configurationPid = "org.openhab.audio", property = { // @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_CATEGORY + "=system", //
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + AudioManagerImpl.CONFIG_URI, // ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + AudioManagerImpl.CONFIG_URI, //
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Audio" // ConfigurableService.SERVICE_PROPERTY_LABEL + "=Audio" //

2
bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java
View File

@ -87,7 +87,7 @@ import org.slf4j.LoggerFactory;
* @author Henning Sudbrock - added hook for selectively auto-approving inbox entries * @author Henning Sudbrock - added hook for selectively auto-approving inbox entries
*/ */
@Component(immediate = true, configurationPid = "org.openhab.inbox", service = EventSubscriber.class, property = { @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_LABEL + "=Inbox",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:inbox" }) ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:inbox" })
@NonNullByDefault @NonNullByDefault

2
bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java
View File

@ -35,7 +35,7 @@ import org.osgi.service.component.annotations.ReferencePolicy;
* @author Markus Rathgeb - Use HTTP service utility functions * @author Markus Rathgeb - Use HTTP service utility functions
*/ */
@Component(immediate = true, configurationPid = "org.openhab.mdns", property = { @Component(immediate = true, configurationPid = "org.openhab.mdns", property = {
Constants.SERVICE_PID + "=org.openhab.core.mdns" // Constants.SERVICE_PID + "=org.openhab.mdns" //
}) })
public class MDNSAnnouncer { public class MDNSAnnouncer {

2
bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java
View File

@ -24,7 +24,7 @@ import org.osgi.service.component.annotations.Component;
* @author David Graeff - Initial contribution * @author David Graeff - Initial contribution
*/ */
@Component(immediate = true, service = MqttBrokerConnectionServiceInstanceMarker.class, property = { @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_FACTORY_SERVICE + "=true",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=MQTT system broker connection", ConfigurableService.SERVICE_PROPERTY_LABEL + "=MQTT system broker connection",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=MQTT", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=MQTT",

2
bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java
View File

@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
* @author Markus Rathgeb - Synchronize access to broker connections * @author Markus Rathgeb - Synchronize access to broker connections
*/ */
@Component(immediate = true, service = MqttService.class, configurationPid = "org.openhab.mqtt", property = { @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 @NonNullByDefault
public class MqttServiceImpl implements MqttService { public class MqttServiceImpl implements MqttService {
private final Logger logger = LoggerFactory.getLogger(MqttServiceImpl.class); private final Logger logger = LoggerFactory.getLogger(MqttServiceImpl.class);

3
bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java
View File

@ -45,8 +45,7 @@ import com.google.inject.Injector;
* @author Simon Kaufmann - Initial contribution * @author Simon Kaufmann - Initial contribution
*/ */
@Component(immediate = true, service = ModelServer.class, configurationPid = ModelServer.CONFIGURATION_PID, property = { @Component(immediate = true, service = ModelServer.class, configurationPid = ModelServer.CONFIGURATION_PID, property = {
Constants.SERVICE_PID + "=org.openhab.core.lsp", Constants.SERVICE_PID + "=org.openhab.lsp", ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=misc:lsp",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=misc:lsp",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Language Server (LSP)", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Language Server (LSP)",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=misc" }) ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=misc" })
public class ModelServer { public class ModelServer {

2
bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java
View File

@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
* @author Kai Kreuzer - Initial contribution * @author Kai Kreuzer - Initial contribution
*/ */
@Component(immediate = true, service = HumanLanguageInterpreter.class, configurationPid = "org.openhab.rulehli", property = { @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_LABEL + "=Rule Voice Interpreter",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + RuleHumanLanguageInterpreter.CONFIG_URI }) ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + RuleHumanLanguageInterpreter.CONFIG_URI })
public class RuleHumanLanguageInterpreter implements HumanLanguageInterpreter { public class RuleHumanLanguageInterpreter implements HumanLanguageInterpreter {

3
bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java
View File

@ -42,8 +42,7 @@ import org.osgi.service.component.annotations.ReferencePolicy;
* @author Kai Kreuzer - Initial contribution * @author Kai Kreuzer - Initial contribution
*/ */
@Component(immediate = true, configurationPid = "org.openhab.persistence", property = { @Component(immediate = true, configurationPid = "org.openhab.persistence", property = {
Constants.SERVICE_PID + "=org.openhab.core.persistence", Constants.SERVICE_PID + "=org.openhab.persistence", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Persistence", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Persistence",
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + PersistenceServiceRegistryImpl.CONFIG_URI }) ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + PersistenceServiceRegistryImpl.CONFIG_URI })
@NonNullByDefault @NonNullByDefault

2
bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java
View File

@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
* @author Chris Jackson - Initial contribution * @author Chris Jackson - Initial contribution
*/ */
@Component(name = "org.openhab.core.storage.json", configurationPid = "org.openhab.storage.json", property = { // @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_LABEL + "=Json Storage", //
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", // ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", //
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:json_storage", // ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:json_storage", //

2
bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java
View File

@ -22,7 +22,7 @@ import org.osgi.service.component.annotations.Component;
* @author Stefan Triller - Initial contribution * @author Stefan Triller - Initial contribution
*/ */
@Component(immediate = true, service = MagicMultiActionMarker.class, property = { @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_FACTORY_SERVICE + "=true",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=MagicMultiActionsService", ConfigurableService.SERVICE_PROPERTY_LABEL + "=MagicMultiActionsService",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=RuleActions", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=RuleActions",

2
bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java
View File

@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
* @author Stefan Triller - Initial contribution * @author Stefan Triller - Initial contribution
*/ */
@Component(configurationPid = "org.openhab.magicsingleaction", property = { @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_DESCRIPTION_URI + "=automationAction:magicSingleAction",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Magic Single Action Service", ConfigurableService.SERVICE_PROPERTY_LABEL + "=Magic Single Action Service",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=RuleActions" }) ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=RuleActions" })

2
bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java
View File

@ -22,7 +22,7 @@ import org.osgi.service.component.annotations.Component;
*/ */
@Component(immediate = true, service = MagicMultiInstanceServiceMarker.class, property = { @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_FACTORY_SERVICE + "=true",
ConfigurableService.SERVICE_PROPERTY_LABEL + "=MagicMultiInstanceService", ConfigurableService.SERVICE_PROPERTY_LABEL + "=MagicMultiInstanceService",
ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=test", ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=test",

2
bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java
View File

@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory;
* @author Wouter Born - Sort TTS options * @author Wouter Born - Sort TTS options
*/ */
@Component(immediate = true, configurationPid = VoiceManagerImpl.CONFIGURATION_PID, property = { // @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_CATEGORY + "=system", //
ConfigurableService.SERVICE_PROPERTY_LABEL + "=Voice", // ConfigurableService.SERVICE_PROPERTY_LABEL + "=Voice", //
ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + VoiceManagerImpl.CONFIG_URI // ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + VoiceManagerImpl.CONFIG_URI //

2
bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
View File

@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* @author Erdoan Hadzhiyusein - Added time zone * @author Erdoan Hadzhiyusein - Added time zone
*/ */
@Component(immediate = true, configurationPid = I18nProviderImpl.CONFIGURATION_PID, property = { @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.label=Regional Settings", //
"service.config.category=system", // "service.config.category=system", //
"service.config.description.uri=system:i18n" }) "service.config.description.uri=system:i18n" })