[infrastructure] correctly adding configfiles to features (openhab#7187)

Signed-off-by: Kai Kreuzer <[email protected]>
markus7017 · May 29, 2020 · f8b210b · f8b210b
1 parent 2184cbd
commit f8b210b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 27 deletions.
diff --git a/bundles/org.openhab.binding.leapmotion/src/main/feature/feature.xml b/bundles/org.openhab.binding.leapmotion/src/main/feature/feature.xml
@@ -5,5 +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>
     </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
@@ -4,6 +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>
         <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.voice.voicerss/src/main/feature/feature.xml b/bundles/org.openhab.voice.voicerss/src/main/feature/feature.xml
@@ -4,6 +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>
         <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
@@ -8,7 +8,7 @@
     <version>2.5.3-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.openhab.addons.features.karaf.openhab-addons-external</artifactId>
+  <artifactId>openhab-addons-external</artifactId>
   <packaging>pom</packaging>
 
   <name>openHAB Add-ons :: Features :: Karaf :: Add-ons External</name>
@@ -28,11 +28,6 @@
             <phase>package</phase>
             <configuration>
               <artifacts>
-                <artifact>
-                  <file>src/main/resources/conf/cometvisu.cfg</file>
-                  <type>cfg</type>
-                  <classifier>cometvisu</classifier>
-                </artifact>
                 <artifact>
                   <file>src/main/resources/conf/voicerss.cfg</file>
                   <type>cfg</type>

diff --git a/features/openhab-addons-external/src/main/resources/conf/cometvisu.cfg b/features/openhab-addons-external/src/main/resources/conf/cometvisu.cfg