Merge pull request #3839 from kaikreuzer/knx

made the KNX binding work by activating all components at bundle startup
openhab · Jan 18, 2016 · b7d4f50 · b7d4f50
2 parents 9107165 + 2f4022e
commit b7d4f50
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/bundles/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF
@@ -35,7 +35,10 @@ Service-Component: OSGI-INF/knxconnection.xml, OSGI-INF/knxbinding.xml, OSGI-INF
 Bundle-ClassPath: lib/calimero-rxtx-2.0a3.jar,
  lib/calimero-core-2.2.0-SNAPSHOT.jar,
  .
-Export-Package: org.openhab.binding.knx.config,tuwien.auto.calimero,tu
- wien.auto.calimero.datapoint,tuwien.auto.calimero.exception,tuwien.au
- to.calimero.link
+Export-Package: org.openhab.binding.knx.config,
+ tuwien.auto.calimero,
+ tuwien.auto.calimero.datapoint,
+ tuwien.auto.calimero.exception,
+ tuwien.auto.calimero.link,
+ tuwien.auto.calimero.process
 
diff --git a/bundles/binding/org.openhab.binding.knx/OSGI-INF/knxbinding.xml b/bundles/binding/org.openhab.binding.knx/OSGI-INF/knxbinding.xml
@@ -9,7 +9,7 @@
     http://www.eclipse.org/legal/epl-v10.html
 
 -->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.openhab.binding.knx">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" immediate="true" name="org.openhab.binding.knx">
    <implementation class="org.openhab.binding.knx.internal.bus.KNXBinding"/>
    <reference bind="addBindingProvider" cardinality="1..n" interface="org.openhab.binding.knx.config.KNXBindingProvider" name="KNXBindingProvider" policy="dynamic" unbind="removeBindingProvider"/>
    <reference bind="addKNXTypeMapper" cardinality="1..n" interface="org.openhab.binding.knx.config.KNXTypeMapper" name="KNXTypeMapper" policy="dynamic" unbind="removeKNXTypeMapper"/>

diff --git a/bundles/binding/org.openhab.binding.knx/OSGI-INF/knxconnection.xml b/bundles/binding/org.openhab.binding.knx/OSGI-INF/knxconnection.xml
@@ -9,7 +9,7 @@
     http://www.eclipse.org/legal/epl-v10.html
 
 -->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.openhab.binding.knx.config">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.openhab.binding.knx.config">
    <implementation class="org.openhab.binding.knx.internal.connection.KNXConnection"/>
    <service>
       <provide interface="org.osgi.service.cm.ManagedService"/>

diff --git a/bundles/binding/org.openhab.binding.knx/OSGI-INF/knxcoretypemapper.xml b/bundles/binding/org.openhab.binding.knx/OSGI-INF/knxcoretypemapper.xml
@@ -9,7 +9,7 @@
     http://www.eclipse.org/legal/epl-v10.html
 
 -->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.openhab.binding.knx.typemapper">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="true" name="org.openhab.binding.knx.typemapper">
    <implementation class="org.openhab.binding.knx.internal.dpt.KNXCoreTypeMapper"/>
    <service>
       <provide interface="org.openhab.binding.knx.config.KNXTypeMapper"/>

diff --git a/bundles/binding/org.openhab.binding.knx/OSGI-INF/knxgenericbindingprovider.xml b/bundles/binding/org.openhab.binding.knx/OSGI-INF/knxgenericbindingprovider.xml
@@ -9,7 +9,7 @@
     http://www.eclipse.org/legal/epl-v10.html
 
 -->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.openhab.binding.knx.genericbindingprovider">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.openhab.binding.knx.genericbindingprovider">
    <implementation class="org.openhab.binding.knx.internal.config.KNXGenericBindingProvider"/>
    <service>
       <provide interface="org.openhab.model.item.binding.BindingConfigReader"/>