This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 2b06d7a780f5a0baedd93eda495fdf214d336be1 Author: Alex O'Ree <[email protected]> AuthorDate: Sun Mar 31 12:58:21 2024 -0400 JSPWIKI-1188 rearranges the config loading to support the property replacement --- .../main/java/org/apache/wiki/util/PropertyReader.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java index 9bb591a61..03bf7cfe5 100644 --- a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java +++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java @@ -136,12 +136,6 @@ public final class PropertyReader { // this will add additional properties to the default ones: LOG.debug( "Loading cascading properties..." ); - // now load the cascade (new in 2.5) - loadWebAppPropsCascade( context, props ); - - // sets the JSPWiki working directory (jspwiki.workDir) - setWorkDir( context, props ); - // add system properties beginning with jspwiki... final Map< String, String > sysprops = collectPropertiesFrom( System.getProperties().entrySet().stream() .collect( Collectors.toMap( Object::toString, Object::toString ) ) ); @@ -149,6 +143,15 @@ public final class PropertyReader { // finally, expand the variables (new in 2.5) expandVars( props ); + + + // now load the cascade (new in 2.5) + loadWebAppPropsCascade( context, props ); + + // sets the JSPWiki working directory (jspwiki.workDir) + setWorkDir( context, props ); + + return props; } catch( final Exception e ) {
