test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-05 04:38:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-9385 Ability to use Java system properties in paths to property files

Browse Source
This commit is contained in:
Konstantin Krivopustov 2017-08-30 16:15:20 +04:00
parent db7dc92279
commit a5f0e19589
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/global/src/com/haulmont/cuba/core/sys/AbstractWebAppContextLoader.java
View File

@ -21,6 +21,7 @@ import ch.qos.logback.classic.LoggerContext;
import com.google.common.base.Splitter;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.text.StrSubstitutor;
import org.apache.commons.lang.text.StrTokenizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -140,6 +141,7 @@ public abstract class AbstractWebAppContextLoader extends AbstractAppContextLoad
tokenizer.setQuoteChar('"');
for (String str : tokenizer.getTokenArray()) {
log.trace("Processing properties location: {}", str);
str = StrSubstitutor.replaceSystemProperties(str);
InputStream stream = null;
try {
if (ResourceUtils.isUrl(str) || str.startsWith(ResourceLoader.CLASSPATH_URL_PREFIX)) {