From 8d561c6302c14c270341f6eeaa12b9b0acc404ce Mon Sep 17 00:00:00 2001
From: Jiang Hua <jiang.hua@broadcom.com>
Date: Wed, 26 Aug 2026 13:58:43 -0700
Subject: [PATCH] use system property user.dir for directory image/logs

---
 .../src/main/resources/log4j2-spring.xml            |  6 +++++-
 .../i18n/l2/dao/image/CountryFlagDaoImpl.java       | 13 ++++++++++---
 .../src/main/resources/log4j2-spring.xml            |  4 ++--
 .../src/main/resources/log4j2-spring.xml            |  4 ++--
 .../src/main/resources/log4j2-spring.xml            |  4 ++--
 .../src/main/resources/log4j2-spring.xml            |  4 ++--
 6 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/g11n-ws/modules/md-data-initdb/src/main/resources/log4j2-spring.xml b/g11n-ws/modules/md-data-initdb/src/main/resources/log4j2-spring.xml
index 6743c9488..d39b3a61a 100644
--- a/g11n-ws/modules/md-data-initdb/src/main/resources/log4j2-spring.xml
+++ b/g11n-ws/modules/md-data-initdb/src/main/resources/log4j2-spring.xml
@@ -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">
diff --git a/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/dao/image/CountryFlagDaoImpl.java b/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/dao/image/CountryFlagDaoImpl.java
index 2a5af876c..c44a88cc5 100644
--- a/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/dao/image/CountryFlagDaoImpl.java
+++ b/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/dao/image/CountryFlagDaoImpl.java
@@ -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;
@@ -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() {
@@ -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);
diff --git a/g11n-ws/vip-manager-i18n/src/main/resources/log4j2-spring.xml b/g11n-ws/vip-manager-i18n/src/main/resources/log4j2-spring.xml
index c43de30ff..c45309438 100644
--- a/g11n-ws/vip-manager-i18n/src/main/resources/log4j2-spring.xml
+++ b/g11n-ws/vip-manager-i18n/src/main/resources/log4j2-spring.xml
@@ -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">
diff --git a/g11n-ws/vip-manager-l10n-agent/src/main/resources/log4j2-spring.xml b/g11n-ws/vip-manager-l10n-agent/src/main/resources/log4j2-spring.xml
index 2adfb4493..0f63caf29 100644
--- a/g11n-ws/vip-manager-l10n-agent/src/main/resources/log4j2-spring.xml
+++ b/g11n-ws/vip-manager-l10n-agent/src/main/resources/log4j2-spring.xml
@@ -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">
diff --git a/g11n-ws/vip-manager-l10n/src/main/resources/log4j2-spring.xml b/g11n-ws/vip-manager-l10n/src/main/resources/log4j2-spring.xml
index ebf168a4f..b0c0f3e90 100644
--- a/g11n-ws/vip-manager-l10n/src/main/resources/log4j2-spring.xml
+++ b/g11n-ws/vip-manager-l10n/src/main/resources/log4j2-spring.xml
@@ -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">
diff --git a/g11n-ws/vip-manager-lite-i18n/src/main/resources/log4j2-spring.xml b/g11n-ws/vip-manager-lite-i18n/src/main/resources/log4j2-spring.xml
index c43de30ff..c45309438 100644
--- a/g11n-ws/vip-manager-lite-i18n/src/main/resources/log4j2-spring.xml
+++ b/g11n-ws/vip-manager-lite-i18n/src/main/resources/log4j2-spring.xml
@@ -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">