Fix missing feature configfiles (#9324)

* Update configfile lines for renamed openhab-addons-external artifactId
* Add missing 2.5.x configfiles files which were never merged into the main branch
* Fix configfile lines not aggregated in feature.xml file

Fixes openhab/openhab-distro#1205

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/bundles/org.openhab.binding.exec/src/main/feature/feature.xml b/bundles/org.openhab.binding.exec/src/main/feature/feature.xml
index 19de0c221a9987cff75faaba73e6f90f88995ffa..ff73780e211b3e660cec4363d6561f1f9685cf02 100644 (file)
--- a/bundles/org.openhab.binding.exec/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.exec/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
 
        <feature name="openhab-binding-exec" description="Exec Binding" version="${project.version}">
                <feature>openhab-runtime-base</feature>
-               <configfile finalname="${openhab.conf}/misc/exec.whitelist" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/exec.whitelist</configfile>
+               <configfile finalname="${openhab.conf}/misc/exec.whitelist" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/exec.whitelist</configfile>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.exec/${project.version}</bundle>
        </feature>
 </features>

diff --git a/bundles/org.openhab.binding.leapmotion/src/main/feature/feature.xml b/bundles/org.openhab.binding.leapmotion/src/main/feature/feature.xml
index eeaaf929a3e924e3c45403736367ed02999c223a..4292bff68d6d03e9ffab1713e9563d435059b39a 100644 (file)
--- a/bundles/org.openhab.binding.leapmotion/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.leapmotion/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
        <feature name="openhab-binding-leapmotion" description="LeapMotion Binding" version="${project.version}">
                <feature>openhab-runtime-base</feature>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.leapmotion/${project.version}</bundle>
-               <configfile finalname="${openhab.userdata}/tmp/lib/libLeap.dylib" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/lib/libLeap</configfile>
-               <configfile finalname="${openhab.userdata}/tmp/lib/libLeapJava.dylib" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/lib/libLeapJava</configfile>
+               <configfile finalname="${openhab.userdata}/tmp/lib/libLeap.dylib" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/lib/libLeap</configfile>
+               <configfile finalname="${openhab.userdata}/tmp/lib/libLeapJava.dylib" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/lib/libLeapJava</configfile>
        </feature>
 </features>

diff --git a/bundles/org.openhab.io.openhabcloud/src/main/feature/feature.xml b/bundles/org.openhab.io.openhabcloud/src/main/feature/feature.xml
index 20fb95b9e3830ee94cbd70120dc4773678d3e621..aebf836fc10731924354cf95787b2d7c194add5a 100644 (file)
--- a/bundles/org.openhab.io.openhabcloud/src/main/feature/feature.xml
+++ b/bundles/org.openhab.io.openhabcloud/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
 
        <feature name="openhab-misc-openhabcloud" description="openHAB Cloud Connector" version="${project.version}">
                <feature>openhab-runtime-base</feature>
-               <configfile finalname="${openhab.conf}/services/openhabcloud.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/openhabcloud</configfile>
+               <configfile finalname="${openhab.conf}/services/openhabcloud.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/openhabcloud</configfile>
                <bundle dependency="true">mvn:org.json/json/20180813</bundle>
                <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/3.0.2_1</bundle>
                <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.8.1_1</bundle>

diff --git a/bundles/org.openhab.persistence.dynamodb/src/main/feature/feature.xml b/bundles/org.openhab.persistence.dynamodb/src/main/feature/feature.xml
index 78a0a03b475c7191e4f37f747d5632b61a30af2a..7822ffa43f7b50113ecab2f8cb7dc8bc7e2c21e9 100644 (file)
--- a/bundles/org.openhab.persistence.dynamodb/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.dynamodb/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
        <feature name="openhab-persistence-dynamodb" description="DynamoDB Persistence" version="${project.version}">
                <feature>openhab-runtime-base</feature>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.dynamodb/${project.version}</bundle>
-               <configfile finalname="${openhab.conf}/services/dynamodb.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/dynamodb</configfile>
+               <configfile finalname="${openhab.conf}/services/dynamodb.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/dynamodb</configfile>
        </feature>
 
 </features>

diff --git a/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml b/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml
index 877ec967c295c2b428cc94acbf04a611ac543e4d..f539a8486267a1abc5d06b39c12dd1df80aae910 100644 (file)
--- a/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
        <feature name="openhab-persistence-influxdb" description="InfluxDB Persistence" version="${project.version}">
                <feature>openhab-runtime-base</feature>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.influxdb/${project.version}</bundle>
-               <configfile finalname="${openhab.conf}/services/influxdb.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/influxdb</configfile>
+               <configfile finalname="${openhab.conf}/services/influxdb.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/influxdb</configfile>
        </feature>
 
 </features>

diff --git a/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml b/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml
index 320c6c12fd39efe17bfba0a53b56958f2968de04..0d6d97c2e598d2063563053873cd89dc88ac5a11 100644 (file)
--- a/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml
@@ -4,49 +4,49 @@
 
        <!-- JDBC Persistence for: Apache Derby, H2, HSQLDB, MariaDB, MySQL, PostgreSQL, SQLite -->
        <feature name="openhab-persistence-jdbc-derby" description="JDBC Persistence Apache Derby" version="${project.version}">
-               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc</configfile>
+               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
                <feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
                <bundle start-level="80">mvn:org.apache.derby/derbyclient/${derby.version}</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
        </feature>
 
        <feature name="openhab-persistence-jdbc-h2" description="JDBC Persistence H2" version="${project.version}">
-               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc</configfile>
+               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
                <feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
                <bundle start-level="80">mvn:com.h2database/h2/${h2.version}</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
        </feature>
 
        <feature name="openhab-persistence-jdbc-hsqldb" description="JDBC Persistence HSQLDB" version="${project.version}">
-               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc</configfile>
+               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
                <feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
                <bundle start-level="80">mvn:org.hsqldb/hsqldb/${hsqldb.version}</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
        </feature>
 
        <feature name="openhab-persistence-jdbc-mariadb" description="JDBC Persistence MariaDB" version="${project.version}">
-               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc</configfile>
+               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
                <feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
                <bundle start-level="80">mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.version}</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
        </feature>
 
        <feature name="openhab-persistence-jdbc-mysql" description="JDBC Persistence MySQL" version="${project.version}">
-               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc</configfile>
+               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
                <feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
                <bundle start-level="80">mvn:mysql/mysql-connector-java/${mysql.version}</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
        </feature>
 
        <feature name="openhab-persistence-jdbc-postgresql" description="JDBC Persistence PostgreSQL" version="${project.version}">
-               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc</configfile>
+               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
                <feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
                <bundle start-level="80">mvn:org.postgresql/postgresql/${postgresql.version}</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
        </feature>
 
        <feature name="openhab-persistence-jdbc-sqlite" description="JDBC Persistence SQLite" version="${project.version}">
-               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc</configfile>
+               <configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
                <feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
                <bundle start-level="80">mvn:org.xerial/sqlite-jdbc/${sqlite.version}</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>

diff --git a/bundles/org.openhab.persistence.jpa/src/main/feature/feature.xml b/bundles/org.openhab.persistence.jpa/src/main/feature/feature.xml
index 05652505a539e0f09292703596ee9ebdcc26987d..f17a9b7b47e20552d47a6b3ca7b4399b210411fe 100644 (file)
--- a/bundles/org.openhab.persistence.jpa/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.jpa/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
        <feature name="openhab-persistence-jpa" description="JPA Persistence" version="${project.version}">
                <feature>openhab-runtime-base</feature>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jpa/${project.version}</bundle>
-               <configfile finalname="${openhab.conf}/services/jpa.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jpa</configfile>
+               <configfile finalname="${openhab.conf}/services/jpa.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jpa</configfile>
        </feature>
 
 </features>

diff --git a/bundles/org.openhab.persistence.rrd4j/src/main/feature/feature.xml b/bundles/org.openhab.persistence.rrd4j/src/main/feature/feature.xml
index dc241df196d7ceed4056618ed472e9ec86c01ff6..0a6f589fd708d9840f3b8edd6809c38444a60eea 100644 (file)
--- a/bundles/org.openhab.persistence.rrd4j/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.rrd4j/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
        <feature name="openhab-persistence-rrd4j" description="RRD4j Persistence" version="${project.version}">
                <feature>openhab-runtime-base</feature>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.rrd4j/${project.version}</bundle>
-               <configfile finalname="${openhab.conf}/services/rrd4j.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/rrd4j</configfile>
+               <configfile finalname="${openhab.conf}/services/rrd4j.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/rrd4j</configfile>
        </feature>
 
 </features>

diff --git a/bundles/org.openhab.transform.exec/src/main/feature/feature.xml b/bundles/org.openhab.transform.exec/src/main/feature/feature.xml
index c4960a9139ddc5959d4b970c6bdf1e2fa7162479..be0a4087d24b321e068f61a87de43911cf4439cf 100644 (file)
--- a/bundles/org.openhab.transform.exec/src/main/feature/feature.xml
+++ b/bundles/org.openhab.transform.exec/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
 
        <feature name="openhab-transformation-exec" description="Exec Transformation" version="${project.version}">
                <feature>openhab-runtime-base</feature>
-               <configfile finalname="${openhab.conf}/misc/exec.whitelist" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/exec.whitelist</configfile>
+               <configfile finalname="${openhab.conf}/misc/exec.whitelist" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/exec.whitelist</configfile>
                <bundle start-level="75">mvn:org.openhab.addons.bundles/org.openhab.transform.exec/${project.version}</bundle>
        </feature>
 </features>

diff --git a/bundles/org.openhab.voice.voicerss/src/main/feature/feature.xml b/bundles/org.openhab.voice.voicerss/src/main/feature/feature.xml
index 1300eb7334fb15010448a350a763909435586498..20e49aa16cb62d754fc052bfc71c487a6499b48e 100644 (file)
--- a/bundles/org.openhab.voice.voicerss/src/main/feature/feature.xml
+++ b/bundles/org.openhab.voice.voicerss/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
 
        <feature name="openhab-voice-voicerss" description="VoiceRSS Text-to-Speech" version="${project.version}">
                <feature>openhab-runtime-base</feature>
-               <configfile finalname="${openhab.conf}/services/voicerss.cfg" override="false">mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/voicerss</configfile>
+               <configfile finalname="${openhab.conf}/services/voicerss.cfg" override="false">mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/voicerss</configfile>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.voice.voicerss/${project.version}</bundle>
        </feature>
 </features>

diff --git a/features/openhab-addons-external/pom.xml b/features/openhab-addons-external/pom.xml
index efc68cb9cd2a2b75ddc5aa75311009f1f591c146..b70aadba532b3f394de8f4b6e95ee5b667b001a3 100644 (file)
--- a/features/openhab-addons-external/pom.xml
+++ b/features/openhab-addons-external/pom.xml
@@ -35,6 +35,11 @@
                   <type>cfg</type>
                   <classifier>dynamodb</classifier>
                 </artifact>
+                <artifact>
+                  <file>src/main/resources/conf/exec.whitelist</file>
+                  <type>cfg</type>
+                  <classifier>exec.whitelist</classifier>
+                </artifact>
                 <artifact>
                   <file>src/main/resources/conf/influxdb.cfg</file>
                   <type>cfg</type>
@@ -55,11 +60,31 @@
                   <type>cfg</type>
                   <classifier>mapdb</classifier>
                 </artifact>
+                <artifact>
+                  <file>src/main/resources/conf/openhabcloud.cfg</file>
+                  <type>cfg</type>
+                  <classifier>openhabcloud</classifier>
+                </artifact>
                 <artifact>
                   <file>src/main/resources/conf/rrd4j.cfg</file>
                   <type>cfg</type>
                   <classifier>rrd4j</classifier>
                 </artifact>
+                <artifact>
+                  <file>src/main/resources/conf/voicerss.cfg</file>
+                  <type>cfg</type>
+                  <classifier>voicerss</classifier>
+                </artifact>
+                <artifact>
+                  <file>src/main/resources/lib/libLeap.dylib</file>
+                  <type>lib</type>
+                  <classifier>libLeap</classifier>
+                </artifact>
+                <artifact>
+                  <file>src/main/resources/lib/libLeapJava.dylib</file>
+                  <type>lib</type>
+                  <classifier>libLeapJava</classifier>
+                </artifact>
               </artifacts>
             </configuration>
           </execution>

diff --git a/features/openhab-addons-external/src/main/resources/conf/exec.whitelist b/features/openhab-addons-external/src/main/resources/conf/exec.whitelist
new file mode 100644 (file)
index 0000000..93a2960
--- /dev/null
+++ b/features/openhab-addons-external/src/main/resources/conf/exec.whitelist
@@ -0,0 +1,2 @@
+# For security reasons all commands that are used by the exec binding or transformation need to be whitelisted.
+# Every command needs to be listed on a separate line below.

diff --git a/features/openhab-addons-external/src/main/resources/conf/openhabcloud.cfg b/features/openhab-addons-external/src/main/resources/conf/openhabcloud.cfg
new file mode 100644 (file)
index 0000000..4fe2c83
--- /dev/null
+++ b/features/openhab-addons-external/src/main/resources/conf/openhabcloud.cfg
@@ -0,0 +1,19 @@
+############################## openHAB Cloud Connector #############################
+
+# The URL of the openHAB Cloud service to connect to.
+# Optional, default is set to the service offered by the openHAB Foundation
+# (https://myopenhab.org/)
+#baseURL=
+
+# Defines the mode in which you want to operate the connector.
+# Possible values are:
+# - notification: Only push notifications are enabled, no remote access is allowed.
+# - remote: Push notifications and remote access are enabled.
+# Optional, default is 'remote'.
+#mode=
+
+# A comma-separated list of items to be exposed to external services like IFTTT.
+# Events of those items are pushed to the openHAB Cloud and commands received for
+# these items from the openHAB Cloud service are accepted and sent to the local bus.
+# Optional, default is an empty list.
+#expose=

diff --git a/features/openhab-addons-external/src/main/resources/conf/voicerss.cfg b/features/openhab-addons-external/src/main/resources/conf/voicerss.cfg
new file mode 100644 (file)
index 0000000..3c43f5a
--- /dev/null
+++ b/features/openhab-addons-external/src/main/resources/conf/voicerss.cfg
@@ -0,0 +1,5 @@
+######################## VoiceRSS Text-to-Speech Engine ########################
+
+# API key you got when you subscribed to the Voice RSS service
+# Open your profile to get the value: http://www.voicerss.org/personel/
+#apiKey=1234567890

diff --git a/features/openhab-addons-external/src/main/resources/lib/libLeap.dylib b/features/openhab-addons-external/src/main/resources/lib/libLeap.dylib
new file mode 100644 (file)
index 0000000..5b7ba73
Binary files /dev/null and b/features/openhab-addons-external/src/main/resources/lib/libLeap.dylib differ

diff --git a/features/openhab-addons-external/src/main/resources/lib/libLeapJava.dylib b/features/openhab-addons-external/src/main/resources/lib/libLeapJava.dylib
new file mode 100644 (file)
index 0000000..63d30eb
Binary files /dev/null and b/features/openhab-addons-external/src/main/resources/lib/libLeapJava.dylib differ

diff --git a/features/openhab-addons/pom.xml b/features/openhab-addons/pom.xml
index 563af490bc65b3f6da74058d25c9fac2b51d84b5..28fd45d100cb3842fae74273a57cccc91c011a3f 100644 (file)
--- a/features/openhab-addons/pom.xml
+++ b/features/openhab-addons/pom.xml
@@ -52,7 +52,8 @@
                   </fileset>
                   <filterchain>
                     <linecontainsRegExp>
-                      <regexp pattern="(feature&gt;)|(feature\s)|(bundle&gt;)|(bundle\s)"/>
+                      <regexp
+                        pattern="(feature&gt;)|(feature\s)|(bundle&gt;)|(bundle\s)|(configfile&gt;)|(configfile\s)"/>
                     </linecontainsRegExp>
                   </filterchain>
                   <footer file="src/main/resources/footer.xml" filtering="no"/>