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/09 19:29:28 UTC
[airavata-mft] branch master updated: Adding support to override
conf files
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 333ae46 Adding support to override conf files
333ae46 is described below
commit 333ae46943f410497f12ee64f6ff25217f45d9f3
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Mon Mar 9 15:29:14 2020 -0400
Adding support to override conf files
---
.../main/java/org/apache/airavata/mft/agent/AppConfig.java | 5 +++++
.../src/main/java/org/apache/airavata/mft/agent/MFTAgent.java | 5 ++++-
agent/src/main/resources/distribution/bin/agent-daemon.sh | 2 +-
agent/src/main/resources/distribution/bin/agent.sh | 2 +-
.../src/main/java/org/apache/airavata/mft/api/AppConfig.java | 11 +++++++++--
.../org/apache/airavata/mft/api/handler/MFTApiHandler.java | 5 +++++
.../src/main/resources/distribution/bin/api-service-daemon.sh | 2 +-
.../src/main/resources/distribution/bin/api-service.sh | 2 +-
.../java/org/apache/airavata/mft/controller/AppConfig.java | 5 +++++
.../org/apache/airavata/mft/controller/MFTController.java | 7 ++++---
.../src/main/resources/distribution/bin/controller-daemon.sh | 2 +-
controller/src/main/resources/distribution/bin/controller.sh | 2 +-
.../org/apache/airavata/mft/resource/server/AppConfig.java | 5 +++++
.../server/backend/airavata/AiravataResourceBackend.java | 5 +++++
.../mft/resource/server/backend/sql/SQLResourceBackend.java | 5 +++++
.../resources/distribution/bin/resource-service-daemon.sh | 2 +-
.../src/main/resources/distribution/bin/resource-service.sh | 2 +-
.../java/org/apache/airavata/mft/secret/server/AppConfig.java | 5 +++++
.../secret/server/backend/airavata/AiravataSecretBackend.java | 5 +++++
.../mft/secret/server/backend/sql/SQLSecretBackend.java | 5 +++++
.../main/resources/distribution/bin/secret-service-daemon.sh | 2 +-
.../src/main/resources/distribution/bin/secret-service.sh | 2 +-
.../airavata/mft/transport/scp/SCPMetadataCollector.java | 7 +++++++
23 files changed, 79 insertions(+), 16 deletions(-)
diff --git a/agent/src/main/java/org/apache/airavata/mft/agent/AppConfig.java b/agent/src/main/java/org/apache/airavata/mft/agent/AppConfig.java
index cb0c5f8..54ff40f 100644
--- a/agent/src/main/java/org/apache/airavata/mft/agent/AppConfig.java
+++ b/agent/src/main/java/org/apache/airavata/mft/agent/AppConfig.java
@@ -20,8 +20,13 @@ package org.apache.airavata.mft.agent;
import org.apache.airavata.mft.admin.MFTConsulClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
@Configuration
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
public class AppConfig {
@org.springframework.beans.factory.annotation.Value("${consul.host}")
diff --git a/agent/src/main/java/org/apache/airavata/mft/agent/MFTAgent.java b/agent/src/main/java/org/apache/airavata/mft/agent/MFTAgent.java
index 7712d06..06c301f 100644
--- a/agent/src/main/java/org/apache/airavata/mft/agent/MFTAgent.java
+++ b/agent/src/main/java/org/apache/airavata/mft/agent/MFTAgent.java
@@ -52,7 +52,10 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-@PropertySource("classpath:application.properties")
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
public class MFTAgent implements CommandLineRunner {
diff --git a/agent/src/main/resources/distribution/bin/agent-daemon.sh b/agent/src/main/resources/distribution/bin/agent-daemon.sh
index 0abb8af..807874a 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="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dapp.conf.dir=${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 49f43e4..b1c1c96 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="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dapp.conf.dir=${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/java/org/apache/airavata/mft/api/AppConfig.java b/api/service/src/main/java/org/apache/airavata/mft/api/AppConfig.java
index 1d0e3e3..2130250 100644
--- a/api/service/src/main/java/org/apache/airavata/mft/api/AppConfig.java
+++ b/api/service/src/main/java/org/apache/airavata/mft/api/AppConfig.java
@@ -22,17 +22,24 @@ import org.apache.airavata.mft.admin.models.TransferRequest;
import org.apache.airavata.mft.api.service.TransferApiRequest;
import org.dozer.DozerBeanMapper;
import org.dozer.loader.api.BeanMappingBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
@Configuration
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
public class AppConfig {
@org.springframework.beans.factory.annotation.Value("${consul.host}")
- String consulHost;
+ public String consulHost;
@org.springframework.beans.factory.annotation.Value("${consul.port}")
- Integer consulPort;
+ public Integer consulPort;
@Bean
public MFTConsulClient mftConsulClient() {
diff --git a/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java b/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java
index d686afc..4022459 100644
--- a/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java
+++ b/api/service/src/main/java/org/apache/airavata/mft/api/handler/MFTApiHandler.java
@@ -29,11 +29,16 @@ import org.lognet.springboot.grpc.GRpcService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.PropertySource;
import java.util.List;
import java.util.Optional;
@GRpcService
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
public class MFTApiHandler extends MFTApiServiceGrpc.MFTApiServiceImplBase {
private static final Logger logger = LoggerFactory.getLogger(MFTApiHandler.class);
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 8d2fc09..e80f1e1 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="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dapp.conf.dir=${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 6428adf..323cf8c 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="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dapp.conf.dir=${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/java/org/apache/airavata/mft/controller/AppConfig.java b/controller/src/main/java/org/apache/airavata/mft/controller/AppConfig.java
index 203b50b..701d26a 100644
--- a/controller/src/main/java/org/apache/airavata/mft/controller/AppConfig.java
+++ b/controller/src/main/java/org/apache/airavata/mft/controller/AppConfig.java
@@ -20,8 +20,13 @@ package org.apache.airavata.mft.controller;
import org.apache.airavata.mft.admin.MFTConsulClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
@Configuration
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
public class AppConfig {
@org.springframework.beans.factory.annotation.Value("${consul.host}")
diff --git a/controller/src/main/java/org/apache/airavata/mft/controller/MFTController.java b/controller/src/main/java/org/apache/airavata/mft/controller/MFTController.java
index af24221..49f7456 100644
--- a/controller/src/main/java/org/apache/airavata/mft/controller/MFTController.java
+++ b/controller/src/main/java/org/apache/airavata/mft/controller/MFTController.java
@@ -19,8 +19,6 @@ package org.apache.airavata.mft.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.KeyValueClient;
import com.orbitz.consul.cache.ConsulCache;
import com.orbitz.consul.cache.KVCache;
import com.orbitz.consul.model.kv.Value;
@@ -43,7 +41,10 @@ import java.util.List;
import java.util.Optional;
import java.util.concurrent.Semaphore;
-@PropertySource("classpath:application.properties")
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
@SpringBootApplication()
@ComponentScan(basePackages = {"org.apache.airavata.mft"})
@EntityScan("org.apache.airavata.mft.api.db.entities")
diff --git a/controller/src/main/resources/distribution/bin/controller-daemon.sh b/controller/src/main/resources/distribution/bin/controller-daemon.sh
index d1e425a..302430e 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="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dapp.conf.dir=${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 ec0eaf5..859e6d7 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="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogback.configurationFile=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dapp.conf.dir=${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/java/org/apache/airavata/mft/resource/server/AppConfig.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/AppConfig.java
index dce3d7a..f052004 100644
--- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/AppConfig.java
+++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/AppConfig.java
@@ -22,8 +22,13 @@ import org.apache.airavata.mft.resource.server.backend.airavata.AiravataResource
import org.apache.airavata.mft.resource.server.backend.sql.SQLResourceBackend;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
@Configuration
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
public class AppConfig {
@Bean
public ResourceBackend resourceBackend() {
diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/airavata/AiravataResourceBackend.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/airavata/AiravataResourceBackend.java
index a51ef21..4fb63c2 100644
--- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/airavata/AiravataResourceBackend.java
+++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/airavata/AiravataResourceBackend.java
@@ -28,9 +28,14 @@ import org.apache.airavata.registry.api.RegistryService;
import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.PropertySource;
import java.util.Optional;
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
public class AiravataResourceBackend implements ResourceBackend {
private static final Logger logger = LoggerFactory.getLogger(AiravataResourceBackend.class);
diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/SQLResourceBackend.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/SQLResourceBackend.java
index 1ffabe3..9c50af1 100644
--- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/SQLResourceBackend.java
+++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/SQLResourceBackend.java
@@ -27,9 +27,14 @@ import org.apache.airavata.mft.resource.server.backend.sql.repository.SCPStorage
import org.apache.airavata.mft.resource.service.*;
import org.dozer.DozerBeanMapper;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.PropertySource;
import java.util.Optional;
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
public class SQLResourceBackend implements ResourceBackend {
@Autowired
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 59ad4e4..3e92f78 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="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dapp.conf.dir=${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 695f917..6d9b06b 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="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dapp.conf.dir=${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/java/org/apache/airavata/mft/secret/server/AppConfig.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/AppConfig.java
index 4937125..f60a578 100644
--- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/AppConfig.java
+++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/AppConfig.java
@@ -22,8 +22,13 @@ import org.apache.airavata.mft.secret.server.backend.airavata.AiravataSecretBack
import org.apache.airavata.mft.secret.server.backend.sql.SQLSecretBackend;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
@Configuration
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
public class AppConfig {
@Bean
diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/airavata/AiravataSecretBackend.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/airavata/AiravataSecretBackend.java
index d749d7e..b4733db 100644
--- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/airavata/AiravataSecretBackend.java
+++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/airavata/AiravataSecretBackend.java
@@ -22,9 +22,14 @@ import org.apache.airavata.credential.store.cpi.CredentialStoreService;
import org.apache.airavata.mft.secret.server.backend.SecretBackend;
import org.apache.airavata.mft.secret.service.*;
import org.apache.airavata.model.credential.store.SSHCredential;
+import org.springframework.context.annotation.PropertySource;
import java.util.Optional;
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
public class AiravataSecretBackend implements SecretBackend {
@org.springframework.beans.factory.annotation.Value("${credential.server.host}")
diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/SQLSecretBackend.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/SQLSecretBackend.java
index 513bbba..4a83712 100644
--- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/SQLSecretBackend.java
+++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/SQLSecretBackend.java
@@ -23,9 +23,14 @@ import org.apache.airavata.mft.secret.server.backend.sql.repository.SecretReposi
import org.apache.airavata.mft.secret.service.*;
import org.dozer.DozerBeanMapper;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.PropertySource;
import java.util.Optional;
+@PropertySource(value = {
+ "classpath:application.properties",
+ "file:${app.conf.dir}/application.properties"
+}, ignoreResourceNotFound = true)
public class SQLSecretBackend implements SecretBackend {
@Autowired
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 d05a19a..4a02c0f 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="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dapp.conf.dir=${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 59d28d5..1c2abaf 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="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
+JAVA_OPTS="-Dapp.conf.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlogging.config=file:${AIRAVATA_HOME}/conf/logback.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
diff --git a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPMetadataCollector.java b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPMetadataCollector.java
index baf0b65..5c5cff2 100644
--- a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPMetadataCollector.java
+++ b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPMetadataCollector.java
@@ -116,6 +116,13 @@ public class SCPMetadataCollector implements MetadataCollector {
}
}
+
+ public static void main(String args[]) {
+ ResourceServiceGrpc.ResourceServiceBlockingStub resourceClient = ResourceServiceClient.buildClient("149.165.156.124", 7002);
+ SCPResource scpResource = resourceClient.getSCPResource(SCPResourceGetRequest.newBuilder().setResourceId("STORAGE:/var/www/portals/gateway-user-data/django-seagrid/dimuthu/Default_Project/Clone_of_Clone_of_Clone_of_Clone_of_Clone_of_Clone_of_Clone_of_Clone_of_Clone_of_Gaussian16_on_Mar_6_2020_148_AM/Gaussian.com:seagrid:pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e").build());
+ System.out.println(scpResource);
+ }
+
private SSHClient getSSHClient(SCPResource scpResource, SCPSecret scpSecret) throws IOException {
SSHClient sshClient = new SSHClient();