(airavata) branch agent-framewok-refactoring updated: Setting trust store paths as vm arguments

[dimuthuupe]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch agent-framewok-refactoring
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/agent-framewok-refactoring by 
this push:
     new ce82e61a43 Setting trust store paths as vm arguments
ce82e61a43 is described below

commit ce82e61a43e8d03382d2074f268c39f03056956d
Author: Dimuthu Wannipurage <dimut...@gatech.edu>
AuthorDate: Mon Sep 16 21:40:11 2024 -0400

    Setting trust store paths as vm arguments
---
 .../src/main/resources/distribution/bin/agent-service-daemon.sh       | 4 ++--
 .../src/main/resources/distribution/bin/agent-service.sh              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service-daemon.sh
 
b/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service-daemon.sh
index 58d12bba30..b5d8f699e2 100755
--- 
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service-daemon.sh
+++ 
b/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service-daemon.sh
@@ -23,8 +23,8 @@ CWD="$PWD"
 cd ${AIRAVATA_HOME}/bin
 LOGO_FILE="logo.txt"
 
-JAVA_OPTS="--airavata.server.truststore.path=${AIRAVATA_HOME}/conf/truststore.jks
 -Dspring.config.location=${AIRAVATA_HOME}/conf/ 
-Dairavata.home=${AIRAVATA_HOME} 
-Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
-AIRAVATA_COMMAND="--airavata.server.truststore.path=${AIRAVATA_HOME}/conf/truststore.jks"
+JAVA_OPTS="-Dairavata.server.truststore.path=${AIRAVATA_HOME}/conf/truststore.jks
 -Dspring.config.location=${AIRAVATA_HOME}/conf/ 
-Dairavata.home=${AIRAVATA_HOME} 
-Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
+AIRAVATA_COMMAND=""
 EXTRA_ARGS=""
 SERVERS=""
 LOGO=true
diff --git 
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh
 
b/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh
index d0006811c4..11bd1d16c2 100755
--- 
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh
+++ 
b/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh
@@ -23,8 +23,8 @@ CWD="$PWD"
 cd ${AIRAVATA_HOME}/bin
 LOGO_FILE="logo.txt"
 
-JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ 
-Dairavata.home=${AIRAVATA_HOME} 
-Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
-AIRAVATA_COMMAND="--airavata.server.truststore.path=${AIRAVATA_HOME}/conf/truststore.jks"
+JAVA_OPTS="-Dairavata.server.truststore.path=${AIRAVATA_HOME}/conf/truststore.jks
 -Dspring.config.location=${AIRAVATA_HOME}/conf/ 
-Dairavata.home=${AIRAVATA_HOME} 
-Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
+AIRAVATA_COMMAND=""
 EXTRA_ARGS=""
 SERVERS=""
 IS_SUBSET=false