You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2018/03/01 07:50:49 UTC
deltaspike git commit: DELTASPIKE-1308 document user.home ConfigSource
Repository: deltaspike
Updated Branches:
refs/heads/master b34dc691b -> 42d21481d
DELTASPIKE-1308 document user.home ConfigSource
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/42d21481
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/42d21481
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/42d21481
Branch: refs/heads/master
Commit: 42d21481ddff8417c45f2dc0d223303edf25dda6
Parents: b34dc69
Author: Mark Struberg <st...@apache.org>
Authored: Thu Mar 1 08:50:19 2018 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Mar 1 08:50:19 2018 +0100
----------------------------------------------------------------------
documentation/src/main/asciidoc/configuration.adoc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/42d21481/documentation/src/main/asciidoc/configuration.adoc
----------------------------------------------------------------------
diff --git a/documentation/src/main/asciidoc/configuration.adoc b/documentation/src/main/asciidoc/configuration.adoc
index 3d955cd..6ccd2d0 100644
--- a/documentation/src/main/asciidoc/configuration.adoc
+++ b/documentation/src/main/asciidoc/configuration.adoc
@@ -49,7 +49,7 @@ Currently this is, for example, used to configure the value of the current <<pro
used in the expressions for `@Exclude`, 'Deactivatable', etc. DeltaSpike
needs such a low-level approach for several features internally, but
users can utilize it for their own needs as well. This is done by using
-the `ConfigResolver` which resolves and caches `ConfigSource`s per
+the `ConfigResolver` which resolves and caches ConfigSources per
application.
@@ -461,7 +461,9 @@ By default there are implementations for the following configuration sources
* System properties (deltaspike_ordinal = 400)
* Environment properties (deltaspike_ordinal = 300)
* JNDI values (deltaspike_ordinal = 200, the base name is "java:comp/env/deltaspike/")
-* Properties file values (apache-deltaspike.properties) (deltaspike_ordinal = 100, default filename is "META-INF/apache-deltaspike.properties")
+* All apache-deltaspike.properties files on the classpath (deltaspike_ordinal = 100, default filename is "META-INF/apache-deltaspike.properties")
+* A property file in user.home `~/.deltaspike/apache-deltaspike.properties` (if exists, deltaspike_ordinal = 100)
+
*It is possible to change this order and to add custom configuration sources.*