You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2014/08/13 22:18:52 UTC
[1/2] git commit: [KARAF-3167] - Document the configfile override
behaviour
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 16ba19141 -> 2797a40aa
[KARAF-3167] - Document the configfile override behaviour
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/66140ecd
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/66140ecd
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/66140ecd
Branch: refs/heads/karaf-3.0.x
Commit: 66140ecdb3e2f641afc81eff6d77bf649125770a
Parents: 62a1cef
Author: anierbeck <an...@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 21:59:52 2014 +0200
Committer: anierbeck <an...@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 21:59:52 2014 +0200
----------------------------------------------------------------------
manual/src/main/webapp/users-guide/provisioning.conf | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/66140ecd/manual/src/main/webapp/users-guide/provisioning.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/provisioning.conf b/manual/src/main/webapp/users-guide/provisioning.conf
index 6090e09..78f9897 100644
--- a/manual/src/main/webapp/users-guide/provisioning.conf
+++ b/manual/src/main/webapp/users-guide/provisioning.conf
@@ -201,12 +201,14 @@ h2. Feature configuration files
Instead of using the {{<config/>}} element, a feature can specify {{<configfile/>}} elements.
{code:lang=xml}
-<configfile finalname="/etc/myfile.cfg">URL</configfile>
+<configfile finalname="/etc/myfile.cfg" override="false">URL</configfile>
{code}
Instead of directly manipulating the Apache Karaf configuration layer (as when using the {{<config/>}} element), the
{{<configfile/>}} element takes directly a file specified by a URL, and copy the file in the location specified by the
-{{finalname}} attribute. The location is relative from the {{KARAF_BASE}} variable.
+{{finalname}} attribute. The location is relative from the {{KARAF_BASE}} variable. If the file is already present at
+the desired location it is kept and the deployment of the configuration file is skipped, as a already existing file might
+contain customization. This behaviour can be overriden by {{override}} set to true.
The file URL is any URL supported by Apache Karaf (see the [Artifacts repositories and URLs|urls] of the user guide for details).
[2/2] git commit: Merge branch 'karaf-3.0.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Posted by an...@apache.org.
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2797a40a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2797a40a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2797a40a
Branch: refs/heads/karaf-3.0.x
Commit: 2797a40aa3c3d5b023fbb153504ab281435dd175
Parents: 66140ec 16ba191
Author: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 22:18:36 2014 +0200
Committer: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 22:18:36 2014 +0200
----------------------------------------------------------------------
.../resources/etc/jre.properties | 6 ++--
client/pom.xml | 5 ----
.../org/apache/karaf/client/ClientConfig.java | 31 +++++++++++++++++---
.../test-karaf-home/etc/jre.properties | 6 ++--
pom.xml | 4 +--
5 files changed, 35 insertions(+), 17 deletions(-)
----------------------------------------------------------------------