[karaf-cellar] branch master updated: Use ${karaf.etc} property instead of hardcoding "etc" on configfile elem

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-cellar.git


The following commit(s) were added to refs/heads/master by this push:
     new 6e4eaa9  Use ${karaf.etc} property instead of hardcoding "etc" on configfile elem
     new 7d2d6f0  Merge pull request #65 from SourcePond/master
6e4eaa9 is described below

commit 6e4eaa9a09109e609347ddc2ccb9786cf9141e27
Author: Roland Hauser <so...@gmail.com>
AuthorDate: Mon Jul 8 14:32:44 2019 +0200

    Use ${karaf.etc} property instead of hardcoding "etc" on configfile elem
---
 assembly/src/main/resources/features.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml
index c546c32..f4f7c65 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -21,13 +21,13 @@
     <feature name="cellar-core" description="Karaf clustering core" version="${project.version}">
         <feature>aries-proxy</feature>
         <feature>shell</feature>
-        <configfile finalname="/etc/org.apache.karaf.cellar.groups.cfg">mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/cfg/groups</configfile>
-        <configfile finalname="/etc/org.apache.karaf.cellar.node.cfg">mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/cfg/node</configfile>
+        <configfile finalname="${karaf.etc}/org.apache.karaf.cellar.groups.cfg">mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/cfg/groups</configfile>
+        <configfile finalname="${karaf.etc}/org.apache.karaf.cellar.node.cfg">mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/cfg/node</configfile>
         <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.core/${project.version}</bundle>
     </feature>
 
     <feature name="hazelcast" description="In memory data grid" version="${hazelcast.version}">
-        <configfile finalname="/etc/hazelcast.xml">mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/xml/hazelcast</configfile>
+        <configfile finalname="${karaf.etc}/hazelcast.xml">mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/xml/hazelcast</configfile>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
         <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.2</bundle>
         <bundle>mvn:com.hazelcast/hazelcast-all/${hazelcast.version}</bundle>