You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2016/07/16 02:38:49 UTC
directory-fortress-core git commit: verbiage
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 6110cd477 -> 23cd0aa19
verbiage
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/23cd0aa1
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/23cd0aa1
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/23cd0aa1
Branch: refs/heads/master
Commit: 23cd0aa19de04c25af5ba25472a5f141f6b261ac
Parents: 6110cd4
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Jul 15 21:38:41 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Jul 15 21:38:41 2016 -0500
----------------------------------------------------------------------
README-CONFIG.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/23cd0aa1/README-CONFIG.md
----------------------------------------------------------------------
diff --git a/README-CONFIG.md b/README-CONFIG.md
index aeb541b..9d56fa1 100644
--- a/README-CONFIG.md
+++ b/README-CONFIG.md
@@ -25,7 +25,7 @@
* SECTION 2. Fortress Ant Property Files.
* SECTION 3. Fortress Configuration Artifacts.
* SECTION 4. Fortress Configuration Overrides.
- * SECTION 5. Precedence of Artifacts found in the Fortress Configuration Subsystem.
+ * SECTION 5. Order Artifacts found in the Fortress Configuration Subsystem.
* SECTION 6. Configuration Subsystem Usage.
-------------------------------------------------------------------------------
@@ -97,13 +97,14 @@ The ant config task, **init-fortress-config**, uses the values found within the
* fortress.port
___________________________________________________________________________________
-## SECTION 5. Precedence of Artifacts found in the Fortress Configuration Subsystem
+## SECTION 5. Order Artifacts found in the Fortress Configuration Subsystem
This subsystem has been hard wired to the following order:
1. fortress.properties file - found on the classpath of that name.
2. Java system properties - to override any of the 14 properties listed above.
3. LDAP configuration node - found by config coordinates set in the fortress.properties file itself.
+Properties found in LDAP config node will override Java system properties which will override fortress.properties.
__________________________________________________________________________________
## SECTION 6. Configuration Subsystem Usage