You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2020/03/10 04:01:29 UTC
[airavata-mft] branch master updated: Adding spring config dir
argument for startup scripts
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
The following commit(s) were added to refs/heads/master by this push:
new f806e73 Adding spring config dir argument for startup scripts
f806e73 is described below
commit f806e73b03dcc9437d769f21567d32d7c7ba385e
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Tue Mar 10 00:01:07 2020 -0400
Adding spring config dir argument for startup scripts
---
agent/src/main/resources/distribution/bin/agent-daemon.sh | 2 +-
agent/src/main/resources/distribution/bin/agent.sh | 2 +-
api/service/src/main/resources/distribution/bin/api-service-daemon.sh | 2 +-
api/service/src/main/resources/distribution/bin/api-service.sh | 2 +-
controller/src/main/resources/distribution/bin/controller-daemon.sh | 2 +-
controller/src/main/resources/distribution/bin/controller.sh | 2 +-
.../src/main/resources/distribution/bin/resource-service-daemon.sh | 2 +-
.../server/src/main/resources/distribution/bin/resource-service.sh | 2 +-
.../server/src/main/resources/distribution/bin/secret-service-daemon.sh | 2 +-
.../server/src/main/resources/distribution/bin/secret-service.sh | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/agent/src/main/resources/distribution/bin/agent-daemon.sh b/agent/src/main/resources/distribution/bin/agent-daemon.sh
index 807874a..7ac99ae 100644
--- a/agent/src/main/resources/distribution/bin/agent-daemon.sh
+++ b/agent/src/main/resources/distribution/bin/agent-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/agent/src/main/resources/distribution/bin/agent.sh b/agent/src/main/resources/distribution/bin/agent.sh
index b1c1c96..2b560d5 100644
--- a/agent/src/main/resources/distribution/bin/agent.sh
+++ b/agent/src/main/resources/distribution/bin/agent.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/api/service/src/main/resources/distribution/bin/api-service-daemon.sh b/api/service/src/main/resources/distribution/bin/api-service-daemon.sh
index e80f1e1..341770e 100644
--- a/api/service/src/main/resources/distribution/bin/api-service-daemon.sh
+++ b/api/service/src/main/resources/distribution/bin/api-service-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/api/service/src/main/resources/distribution/bin/api-service.sh b/api/service/src/main/resources/distribution/bin/api-service.sh
index 323cf8c..ccd77b5 100644
--- a/api/service/src/main/resources/distribution/bin/api-service.sh
+++ b/api/service/src/main/resources/distribution/bin/api-service.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/controller/src/main/resources/distribution/bin/controller-daemon.sh b/controller/src/main/resources/distribution/bin/controller-daemon.sh
index 302430e..306119f 100644
--- a/controller/src/main/resources/distribution/bin/controller-daemon.sh
+++ b/controller/src/main/resources/distribution/bin/controller-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/controller/src/main/resources/distribution/bin/controller.sh b/controller/src/main/resources/distribution/bin/controller.sh
index 859e6d7..5aef420 100644
--- a/controller/src/main/resources/distribution/bin/controller.sh
+++ b/controller/src/main/resources/distribution/bin/controller.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/services/resource-service/server/src/main/resources/distribution/bin/resource-service-daemon.sh b/services/resource-service/server/src/main/resources/distribution/bin/resource-service-daemon.sh
index 3e92f78..b7272e7 100644
--- a/services/resource-service/server/src/main/resources/distribution/bin/resource-service-daemon.sh
+++ b/services/resource-service/server/src/main/resources/distribution/bin/resource-service-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/services/resource-service/server/src/main/resources/distribution/bin/resource-service.sh b/services/resource-service/server/src/main/resources/distribution/bin/resource-service.sh
index 6d9b06b..0d88366 100644
--- a/services/resource-service/server/src/main/resources/distribution/bin/resource-service.sh
+++ b/services/resource-service/server/src/main/resources/distribution/bin/resource-service.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/services/secret-service/server/src/main/resources/distribution/bin/secret-service-daemon.sh b/services/secret-service/server/src/main/resources/distribution/bin/secret-service-daemon.sh
index 4a02c0f..f4978a3 100644
--- a/services/secret-service/server/src/main/resources/distribution/bin/secret-service-daemon.sh
+++ b/services/secret-service/server/src/main/resources/distribution/bin/secret-service-daemon.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/services/secret-service/server/src/main/resources/distribution/bin/secret-service.sh b/services/secret-service/server/src/main/resources/distribution/bin/secret-service.sh
index 1c2abaf..ae729be 100644
--- a/services/secret-service/server/src/main/resources/distribution/bin/secret-service.sh
+++ b/services/secret-service/server/src/main/resources/distribution/bin/secret-service.sh
@@ -23,7 +23,7 @@ CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
-JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dspring.config.location=${AIRAVATA_HOME}/conf/ -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""