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:20:10 UTC
[1/6] git commit: [KARAF-3167] - Document the configfile override
behaviour
Repository: karaf
Updated Branches:
refs/heads/karaf-2.3.x ba29f28ca -> 743e8cde8
refs/heads/karaf-2.x f9302db1b -> 104ed8a9b
refs/heads/master 9e42abd36 -> 4a53ed809
[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/257acf79
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/257acf79
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/257acf79
Branch: refs/heads/master
Commit: 257acf7970f71388bfd675daee15326dcd2ec592
Parents: 4cc7fe8
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 22:02:42 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/257acf79/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).
[6/6] git commit: Merge branch 'karaf-2.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Posted by an...@apache.org.
Merge branch 'karaf-2.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/104ed8a9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/104ed8a9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/104ed8a9
Branch: refs/heads/karaf-2.x
Commit: 104ed8a9b95318ba241d202a4fc4c211f32cac08
Parents: 848f4af f9302db
Author: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 22:19:57 2014 +0200
Committer: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 22:19:57 2014 +0200
----------------------------------------------------------------------
.../src/main/filtered-resources/etc/jre.properties | 6 +++---
pom.xml | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[3/6] git commit: [KARAF-3167] - Document the configfile override
behaviour
Posted by an...@apache.org.
[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/848f4af8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/848f4af8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/848f4af8
Branch: refs/heads/karaf-2.x
Commit: 848f4af85654e7088522fbab67e595df9e71f429
Parents: 0360451
Author: anierbeck <an...@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 22:17:15 2014 +0200
Committer: anierbeck <an...@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 22:17:15 2014 +0200
----------------------------------------------------------------------
manual/src/main/webapp/users-guide/provisioning.conf | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/848f4af8/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 fcd7fd2..90df2c2 100644
--- a/manual/src/main/webapp/users-guide/provisioning.conf
+++ b/manual/src/main/webapp/users-guide/provisioning.conf
@@ -218,9 +218,11 @@ In certain cases it is needed not only to provide configurations for the configu
configuration files e.g. a configuration file for jetty (jetty.xml). It even might be helpful to deploy a configuration
file instead of a configuration for the config admin service since. To achieve this the attribute {{finalname}} shows the
final destination of the {{configfile}}, while the value references the Maven artifact to deploy.
+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.
{code}
-<configfile finalname="/etc/jetty.xml">mvn:org.apache.karaf/apache-karaf/${project.version}/xml/jettyconfig</configfile>
+<configfile finalname="/etc/jetty.xml" override="false">mvn:org.apache.karaf/apache-karaf/${project.version}/xml/jettyconfig</configfile>
{code}
[4/6] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Posted by an...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4a53ed80
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4a53ed80
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4a53ed80
Branch: refs/heads/master
Commit: 4a53ed809145d494650518ac12af338f38f76256
Parents: 257acf7 9e42abd
Author: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 22:19:10 2014 +0200
Committer: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 22:19:10 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 ++--
manual/src/main/webapp/users-guide/cdi.conf | 30 +++++++++++--------
pom.xml | 4 +--
6 files changed, 53 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[2/6] git commit: [KARAF-3167] - Document the configfile override
behaviour
Posted by an...@apache.org.
[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/272acbc0
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/272acbc0
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/272acbc0
Branch: refs/heads/karaf-2.3.x
Commit: 272acbc099a8fa369d785215e783ee4f24c3b2af
Parents: aebeaf9
Author: anierbeck <an...@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 22:13:42 2014 +0200
Committer: anierbeck <an...@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 22:13:42 2014 +0200
----------------------------------------------------------------------
manual/src/main/webapp/users-guide/provisioning.conf | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/272acbc0/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 b6229d4..d03eb55 100644
--- a/manual/src/main/webapp/users-guide/provisioning.conf
+++ b/manual/src/main/webapp/users-guide/provisioning.conf
@@ -223,9 +223,11 @@ In certain cases it is needed not only to provide configurations for the configu
configuration files e.g. a configuration file for jetty (jetty.xml). It even might be helpful to deploy a configuration
file instead of a configuration for the config admin service since. To achieve this the attribute {{finalname}} shows the
final destination of the {{configfile}}, while the value references the Maven artifact to deploy.
+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.
{code}
-<configfile finalname="/etc/jetty.xml">mvn:org.apache.karaf/apache-karaf/${project.version}/xml/jettyconfig</configfile>
+<configfile finalname="/etc/jetty.xml" override="false">mvn:org.apache.karaf/apache-karaf/${project.version}/xml/jettyconfig</configfile>
{code}
[5/6] git commit: Merge branch 'karaf-2.3.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.3.x
Posted by an...@apache.org.
Merge branch 'karaf-2.3.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.3.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/743e8cde
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/743e8cde
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/743e8cde
Branch: refs/heads/karaf-2.3.x
Commit: 743e8cde8a4b431ceaeb4f585ea03cf0b2308e84
Parents: 272acbc ba29f28
Author: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 22:19:37 2014 +0200
Committer: Achim Nierbeck <an...@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 22:19:37 2014 +0200
----------------------------------------------------------------------
.../apache-karaf/src/main/filtered-resources/etc/jre.properties | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------