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 2022/11/26 18:33:34 UTC
[directory-fortress-core] branch master updated: + property diagram
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git
The following commit(s) were added to refs/heads/master by this push:
new 9566fbf6 + property diagram
9566fbf6 is described below
commit 9566fbf6a60f98bc3a57509ab3469585fa2d8ead
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Sat Nov 26 12:33:28 2022 -0600
+ property diagram
---
README-CONFIG.md | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/README-CONFIG.md b/README-CONFIG.md
index d289ca42..504f4ba7 100644
--- a/README-CONFIG.md
+++ b/README-CONFIG.md
@@ -95,15 +95,17 @@ ldap.server.type=openldap
_______________
╱ ╲ ┌───────────────────┐
╱ ╲_________│Use user.properties│
- ╲ user.properties ╱yes └───────────────────┘
- ╲_______________╱
- │no
+ ╲ user.properties ╱yes └─────────▽─────────┘
+ ╲_______________╱ │
+ │no │
+ │____________________________▽
_______▽________
╱ ╲ ┌────────────────────┐
╱ ╲________│Use slapd.properties│
- ╲ slapd.properties ╱yes └────────────────────┘
- ╲________________╱
- │no
+ ╲ slapd.properties ╱yes └─────────▽──────────┘
+ ╲________________╱ │
+ │no │
+ │____________________________▽
┌────────▽───────────┐
│Use build.properties│
└────────────────────┘
@@ -159,10 +161,30 @@ The ant config task, **init-fortress-config**, uses the values found within the
___________________________________________________________________________________
## SECTION 5. Order Artifacts found in the Fortress Configuration Subsystem
+```
+ ___________
+ ╱ ╲ ┌────┐
+ ╱ ╲_________│Use │
+ ╲ config node ╱yes └──▽─┘
+ ╲___________╱ │
+ │no │
+ │_________________▽
+ _______▽_________
+ ╱ ╲ ┌────┐
+ ╱ ╲_____│Use │
+ ╲ system properties ╱yes └──▽─┘
+ ╲________________╱ │
+ │no │
+ │___________________▽
+ ┌────────▽──────────────┐
+ │Use fortress.properties│
+ └───────────────────────┘
+```
+
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.
+ 3. LDAP configuration node - found by config coordinates set in the fortress.properties or system properties.
Properties found in LDAP config node will override Java system properties which will override fortress.properties.
__________________________________________________________________________________