demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix issues with configuration PIDs (#1727)

Browse Source 
* Fixes warnings about "using different service PIDs"
* Fixes missing default values

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2020-10-18 18:02:13 +02:00 committed by GitHub
parent 3d88e91952
commit 4c31c0b3ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
*/
@NonNullByDefault
@Component(configurationPid = "org.openhab.magic", service = ConfigOptionProvider.class, immediate = true, //
property = Constants.SERVICE_PID + "=org.openhab.core.magic")
property = Constants.SERVICE_PID + "=org.openhab.magic")
@ConfigurableService(category = "test", label = "Magic", description_uri = "test:magic")
public class MagicServiceImpl implements MagicService {
private final Logger logger = LoggerFactory.getLogger(MagicServiceImpl.class);

2
bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
View File

@ -66,7 +66,7 @@ import org.osgi.service.http.HttpService;
* @author Holger Reichert - Support for themes, DPI, legend hiding
*/
@Component(immediate = true, service = ChartServlet.class, configurationPid = "org.openhab.chart", //
property = Constants.SERVICE_PID + "=org.openhab.core.chart")
property = Constants.SERVICE_PID + "=org.openhab.chart")
@ConfigurableService(category = "system", label = "Charts", description_uri = ChartServlet.CONFIG_URI)
public class ChartServlet extends SmartHomeServlet {

2
bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetUtil.java
View File

@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* @author Gary Tse - Network address change listener
* @author Tim Roberts - Added primary address change to network address change listener
*/
@Component(configurationPid = "org.openhab.network", property = { "service.pid=org.openhab.core.network",
@Component(configurationPid = "org.openhab.network", property = { "service.pid=org.openhab.network",
"service.config.description.uri=system:network", "service.config.label=Network Settings",
"service.config.category=system" })
@NonNullByDefault

6
features/karaf/openhab-core/src/main/feature/feature.xml
View File

@ -120,7 +120,7 @@
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.http.auth.basic/${project.version}</bundle>
<feature>openhab-core-io-http-auth</feature>
<config name="org.openhab.core.auth">
<config name="org.openhab.auth">
enabled = true
</config>
</feature>
@ -397,10 +397,10 @@
<!-- It is temperarily disabled due to https://github.com/openhab/openhab-core/issues/422 -->
<!-- <bundle start-level="30">mvn:org.openhab.core.bundles/org.openhab.ui.start/${project.version}</bundle> -->
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.karaf/${project.version}</bundle>
<config name="org.openhab.core.audio">
<config name="org.openhab.audio">
defaultSink = enhancedjavasound
</config>
<config name="org.openhab.core.voice">
<config name="org.openhab.voice">
defaultHLI = rulehli
</config>
</feature>