Skip to content

use system property user.dir for directory image/logs #3260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhua-vmware merged 1 commit into from
Aug 27, 2026
Merged

use system property user.dir for directory image/logs #3260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion g11n-ws/modules/md-data-initdb/src/main/resources/log4j2-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2019-2026 VMware, Inc.
SPDX-License-Identifier: EPL-2.0
-->
<Configuration status="OFF">
<Properties>
<property name="application_name">VIP</property>
<property name="module_name">initdb</property>
<property name="log_path">logs/initdb</property>
<property name="log_path">${sys:user.dir}/logs/initdb</property>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
Expand Down
13 changes: 10 additions & 3 deletions ...les/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/dao/image/CountryFlagDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2023 VMware, Inc.
* Copyright 2019-2026 VMware, Inc.
* SPDX-License-Identifier: EPL-2.0
*/
package com.vmware.i18n.l2.dao.image;
Expand Down Expand Up @@ -33,7 +33,14 @@
@Repository
public class CountryFlagDaoImpl implements ICountryFlagDao {
private static Logger logger = LoggerFactory.getLogger(CountryFlagDaoImpl.class);
private static String basePath = ConstantsKeys.IMAGE + File.separator + ConstantsKeys.FLAGS + File.separator;
private static String basePath = getImageRoot() + File.separator + ConstantsKeys.FLAGS + File.separator;

private static String getImageRoot() {
String userDir = System.getProperty("user.dir");
return (userDir != null && !userDir.isEmpty())
? userDir + File.separator + ConstantsKeys.IMAGE
: ConstantsKeys.IMAGE;
}

@PostConstruct
protected void initZipCountryFlagPattern() {
Expand Down Expand Up @@ -78,7 +85,7 @@ protected void initZipCountryFlagPattern() {

private void writeCountryFlagResult(String sourcePathStr, String fileContent, String newFileNameSuffix) throws IOException {

String pathStr = ConstantsKeys.IMAGE + sourcePathStr;
String pathStr = getImageRoot() + sourcePathStr;
pathStr = pathStr.replaceAll(ConstantsChar.BACKSLASH, Matcher.quoteReplacement(File.separator));
pathStr = pathStr.replaceAll(ConstantsFile.FILE_TYPE_SVG, newFileNameSuffix);
File file = new File(pathStr);
Expand Down
4 changes: 2 additions & 2 deletions g11n-ws/vip-manager-i18n/src/main/resources/log4j2-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2019-2022 VMware, Inc.
Copyright 2019-2026 VMware, Inc.
SPDX-License-Identifier: EPL-2.0
-->
<Configuration status="OFF">
<Properties>
<property name="application_name">Singleton</property>
<property name="module_name">i18nManager</property>
<property name="log_path">${sys:app.log.home:-./logs}/i18n</property>
<property name="log_path">${sys:app.log.home:-${sys:user.dir}/logs}/i18n</property>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
Expand Down
4 changes: 2 additions & 2 deletions g11n-ws/vip-manager-l10n-agent/src/main/resources/log4j2-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2019-2023 VMware, Inc.
Copyright 2019-2026 VMware, Inc.
SPDX-License-Identifier: EPL-2.0
-->
<Configuration status="OFF">
<Properties>
<property name="application_name">VIP</property>
<property name="module_name">L10nAgent</property>
<property name="log_path">${sys:app.log.home:-./logs}/l10nAgent</property>
<property name="log_path">${sys:app.log.home:-${sys:user.dir}/logs}/l10nAgent</property>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
Expand Down
4 changes: 2 additions & 2 deletions g11n-ws/vip-manager-l10n/src/main/resources/log4j2-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2019-2022 VMware, Inc.
Copyright 2019-2026 VMware, Inc.
SPDX-License-Identifier: EPL-2.0
-->
<Configuration status="OFF">
<Properties>
<property name="application_name">VIP</property>
<property name="module_name">L10n</property>
<property name="log_path">${sys:app.log.home:-./logs}/l10n</property>
<property name="log_path">${sys:app.log.home:-${sys:user.dir}/logs}/l10n</property>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
Expand Down
4 changes: 2 additions & 2 deletions g11n-ws/vip-manager-lite-i18n/src/main/resources/log4j2-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2019-2022 VMware, Inc.
Copyright 2019-2026 VMware, Inc.
SPDX-License-Identifier: EPL-2.0
-->
<Configuration status="OFF">
<Properties>
<property name="application_name">Singleton</property>
<property name="module_name">i18nManager</property>
<property name="log_path">${sys:app.log.home:-./logs}/i18n</property>
<property name="log_path">${sys:app.log.home:-${sys:user.dir}/logs}/i18n</property>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
Expand Down
Loading