fixed configuration file loading

CondormanFr · Nov 29, 2014 · 925d605 · 925d605
1 parent e89b59e
commit 925d605
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/bundles/config/org.openhab.config.core/OSGI-INF/configdispatcher.xml b/bundles/config/org.openhab.config.core/OSGI-INF/configdispatcher.xml
@@ -10,8 +10,12 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.openhab.config.core">
-   <implementation class="org.openhab.config.core.ConfigDispatcher"/>
-
-   <property name="service.pid" type="String" value="org.openhab.config.dispatcher"/>
-
+	<implementation class="org.openhab.config.core.ConfigDispatcher"/>
+
+	<service>
+		<provide interface="org.osgi.service.cm.ManagedService" />
+	</service>
+
+	<property name="service.pid" type="String" value="org.openhab.mainconfig"/>
+
 </scr:component>
diff --git a/...onfig/org.openhab.config.core/src/main/java/org/openhab/config/core/ConfigDispatcher.java b/...onfig/org.openhab.config.core/src/main/java/org/openhab/config/core/ConfigDispatcher.java
@@ -70,7 +70,7 @@
  * @author Thomas.Eichstaedt-Engelen
  * @since 0.3.0
  */
-public class ConfigDispatcher {
+public class ConfigDispatcher implements ManagedService {
 
 	private static final Logger logger = LoggerFactory.getLogger(ConfigDispatcher.class);