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/29 15:59:38 UTC
[directory-fortress-core] branch master updated: clarify order of precedence, ant prop files
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 36fbcc58 clarify order of precedence, ant prop files
36fbcc58 is described below
commit 36fbcc58aef2e0269d4f079c85a517b4cea8d362
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Tue Nov 29 09:59:33 2022 -0600
clarify order of precedence, ant prop files
---
README-CONFIG.md | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/README-CONFIG.md b/README-CONFIG.md
index 37306d8d..a1545a96 100644
--- a/README-CONFIG.md
+++ b/README-CONFIG.md
@@ -35,20 +35,20 @@ Fortress uses interpolation to weave values located in source property files int
The list of possible parameters here: [README-PROPERTIES](./README-PROPERTIES.md)
A. Option files containing environment specific values:
- * user.properties
- * [slapd.properties](./slapd.properties.example)
- * [build.properties](./build.properties.example)
+ - user.properties
+ - [slapd.properties](./slapd.properties.example)
+ - [build.properties](./build.properties.example)
B. Source files containing substitution expressions :
- * [fortress.properties.src](./config/fortress.properties.src)
- * [refreshLDAPData.xml.src](./ldap/setup/refreshLDAPData-src.xml)
+ - [fortress.properties.src](./config/fortress.properties.src)
+ - [refreshLDAPData.xml.src](./ldap/setup/refreshLDAPData-src.xml)
C. Target files generated by Fortress:
- * [fortress.properties](./config/fortress.properties)
- * [refreshLDAPData.xml](./ldap/setup/refreshLDAPData.xml)
+ - [fortress.properties](./config/fortress.properties)
+ - [refreshLDAPData.xml](./ldap/setup/refreshLDAPData.xml)
D. Apache Ant script with the mapping rules: A -> B = C:
- * [build-config.xml](./build-config.xml)
+ - [build-config.xml](./build-config.xml)
The substitution parameters found in B, as **@name@**, are placeholders for the actual values found in A.
These are used by an Ant config task (D) to replace values into the actual files (C) needed by Fortress runtime.
@@ -86,26 +86,26 @@ port=389
# Options are openldap or apacheds (default):
ldap.server.type=openldap
```
-*Note: Files from C are generated during build (```mvn install```) and not checked in as source.*
+- Note: Files from C are generated during build (```mvn install```) and not checked in as source.*
-------------------------------------------------------------------------------
## SECTION 2. Fortress Ant Property Files
```
_______________
- ╱ ╲ ┌───────────────────┐
- ╱ ╲_________│Use user.properties│
- ╲ user.properties ╱yes └─────────▽─────────┘
- ╲_______________╱ │
- │no │
- │____________________________▽
+ ╱ ╲ ┌─────┐
+ ╱ ╲_________│ Use │
+ ╲ user.properties ╱yes └─────┘
+ ╲_______________╱
+ │no
+ │
_______▽________
- ╱ ╲ ┌────────────────────┐
- ╱ ╲________│Use slapd.properties│
- ╲ slapd.properties ╱yes └─────────▽──────────┘
- ╲________________╱ │
- │no │
- │____________________________▽
+ ╱ ╲ ┌─────┐
+ ╱ ╲________│ Use │
+ ╲ slapd.properties ╱yes └─────┘
+ ╲________________╱
+ │no
+ │
┌────────▽───────────┐
│Use build.properties│
└────────────────────┘