This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 430e9b448f cleanup few unused props and funcs
430e9b448f is described below
commit 430e9b448f27dbe0d052530e1eb591e8ae94676e
Author: yasithdev <[email protected]>
AuthorDate: Mon Jul 14 02:05:08 2025 -0500
cleanup few unused props and funcs
---
.devcontainer/docker-compose-alt.yml | 12 -----------
.gitignore | 2 +-
.../airavata/common/utils/ApplicationSettings.java | 24 ----------------------
.../notifier/impl/EmailNotifierConfiguration.java | 9 --------
.../src/main/resources/airavata-server.properties | 6 ------
.../templates/airavata-server.properties.j2 | 16 ---------------
.../parser-wm/airavata-server.properties.j2 | 2 --
.../participant/airavata-server.properties.j2 | 2 --
.../post-wm/airavata-server.properties.j2 | 2 --
.../templates/pre-wm/airavata-server.properties.j2 | 2 --
.../templates/airavata-server.properties.j2 | 10 ---------
.../src/main/assembly/restproxy-bin-assembly.xml | 2 +-
12 files changed, 2 insertions(+), 87 deletions(-)
diff --git a/.devcontainer/docker-compose-alt.yml
b/.devcontainer/docker-compose-alt.yml
index 553bdabb9e..a6397b9e8f 100644
--- a/.devcontainer/docker-compose-alt.yml
+++ b/.devcontainer/docker-compose-alt.yml
@@ -132,20 +132,12 @@ services:
- credential.store.server.port=8960
-
credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
- credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
- - email.server=smtp.googlemail.com
- - email.server.port=465
- - email.user=airavata
- - email.password=xxx
- - email.ssl=true
- - [email protected]
- rabbitmq.broker.url=amqp://guest:guest@rabbitmq:5672/develop
- rabbitmq.status.exchange.name=status_exchange
- rabbitmq.process.exchange.name=process_exchange
- rabbitmq.experiment.exchange.name=experiment_exchange
- durable.queue=false
- prefetch.count=200
- - process.launch.queue.name=process.launch.queue
- - experiment.launch..queue.name=experiment.launch.queue
- embedded.zk=false
- zookeeper.server.connection=zookeeper:2181
- zookeeper.timeout=30000
@@ -161,10 +153,6 @@ services:
- authz.cache.enabled=true
-
authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
- in.memory.cache.size=1000
- - isRunningOnAws=false
- - kafka.broker.list=kafka:9092
- - kafka.topic.prefix=local
- - enable.kafka.logging=false
- profile.service.server.host=0.0.0.0
- profile.service.server.port=8962
-
profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
diff --git a/.gitignore b/.gitignore
index 91267d90fb..347d0a1289 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,4 +59,4 @@ logs/
# Ignore generated sources
**/generated-sources/
/distribution
-/vault
+/vault*
diff --git
a/airavata-api/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
b/airavata-api/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
index d12ed29b59..57c55652fd 100644
---
a/airavata-api/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
+++
b/airavata-api/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
@@ -300,30 +300,6 @@ public class ApplicationSettings {
return getSetting("credential.store.server.port");
}
- public static String getCredentialStoreEmailServer() throws
ApplicationSettingsException {
- return getSetting("email.server");
- }
-
- public static String getCredentialStoreEmailServerPort() throws
ApplicationSettingsException {
- return getSetting("email.server.port");
- }
-
- public static String getCredentialStoreEmailUser() throws
ApplicationSettingsException {
- return getSetting("email.user");
- }
-
- public static String getCredentialStoreEmailPassword() throws
ApplicationSettingsException {
- return getSetting("email.password");
- }
-
- public static String getCredentialStoreEmailSSLConnect() throws
ApplicationSettingsException {
- return getSetting("email.ssl");
- }
-
- public static String getCredentialStoreEmailFromEmail() throws
ApplicationSettingsException {
- return getSetting("email.from");
- }
-
public static String getRegistryServerPort() throws
ApplicationSettingsException {
return getSetting("regserver.server.port");
}
diff --git
a/airavata-api/src/main/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifierConfiguration.java
b/airavata-api/src/main/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifierConfiguration.java
index 62e2dbbde2..49d58e4ae8 100644
---
a/airavata-api/src/main/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifierConfiguration.java
+++
b/airavata-api/src/main/java/org/apache/airavata/credential/store/notifier/impl/EmailNotifierConfiguration.java
@@ -74,13 +74,4 @@ public class EmailNotifierConfiguration {
return fromAddress;
}
- public static EmailNotifierConfiguration getEmailNotifierConfigurations()
throws ApplicationSettingsException {
- return new EmailNotifierConfiguration(
- ApplicationSettings.getCredentialStoreEmailServer(),
-
Integer.parseInt(ApplicationSettings.getCredentialStoreEmailServerPort()),
- ApplicationSettings.getCredentialStoreEmailUser(),
- ApplicationSettings.getCredentialStoreEmailPassword(),
-
Boolean.parseBoolean(ApplicationSettings.getCredentialStoreEmailSSLConnect()),
- ApplicationSettings.getCredentialStoreEmailFromEmail());
- }
}
diff --git a/airavata-api/src/main/resources/airavata-server.properties
b/airavata-api/src/main/resources/airavata-server.properties
index 10ad48660a..b37e0db8d4 100644
--- a/airavata-api/src/main/resources/airavata-server.properties
+++ b/airavata-api/src/main/resources/airavata-server.properties
@@ -63,12 +63,6 @@ email.based.monitor.password=123456
email.based.monitor.store.protocol=imaps
email.based.monitoring.period=10000
email.expiration.minutes=60
[email protected]
-email.password=123456
-email.server.port=465
-email.server=smtp.googlemail.com
-email.ssl=true
-email.user=airavata
embedded.mode=false
embedded.zk=false
diff --git
a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
index 1ba075d86b..a4af9ead4d 100644
--- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
@@ -197,14 +197,6 @@ credential.store.server.port={{ cred_store_port }}
credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-# these properties used by credential store email notifications
-email.server=smtp.googlemail.com
-email.server.port=465
-email.user=airavata
-email.password=xxx
-email.ssl=true
[email protected]
-
# SSH PKI key pair or ssh password can be used SSH based sshKeyAuthentication
is used.
# if user specify both password sshKeyAuthentication gets the higher preference
@@ -255,8 +247,6 @@ rabbitmq.process.exchange.name=process_exchange
rabbitmq.experiment.exchange.name=experiment_exchange
durable.queue=false
prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
###########################################################################
# Zookeeper Server Configuration
@@ -287,12 +277,6 @@ authz.cache.enabled=true
authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
in.memory.cache.size=1000
-# Kafka Logging related configuration
-isRunningOnAws=false
-kafka.broker.list=localhost:9092
-kafka.topic.prefix=local
-enable.kafka.logging=false
-
###########################################################################
# Profile Service Configuration
###########################################################################
diff --git
a/dev-tools/ansible/roles/helix_setup/templates/parser-wm/airavata-server.properties.j2
b/dev-tools/ansible/roles/helix_setup/templates/parser-wm/airavata-server.properties.j2
index 5f86f6b9fe..c097120d0d 100644
---
a/dev-tools/ansible/roles/helix_setup/templates/parser-wm/airavata-server.properties.j2
+++
b/dev-tools/ansible/roles/helix_setup/templates/parser-wm/airavata-server.properties.j2
@@ -41,8 +41,6 @@ rabbitmq.process.exchange.name=process_exchange
rabbitmq.experiment.exchange.name=experiment_exchange
durable.queue=false
prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
###########################################################################
# Zookeeper Server Configuration
diff --git
a/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2
b/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2
index 29d884bf9f..63fd7be85d 100644
---
a/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2
+++
b/dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2
@@ -62,8 +62,6 @@ rabbitmq.process.exchange.name=process_exchange
rabbitmq.experiment.exchange.name=experiment_exchange
durable.queue=false
prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
###########################################################################
# Zookeeper Server Configuration
diff --git
a/dev-tools/ansible/roles/helix_setup/templates/post-wm/airavata-server.properties.j2
b/dev-tools/ansible/roles/helix_setup/templates/post-wm/airavata-server.properties.j2
index b7fd434f95..06833e03e8 100644
---
a/dev-tools/ansible/roles/helix_setup/templates/post-wm/airavata-server.properties.j2
+++
b/dev-tools/ansible/roles/helix_setup/templates/post-wm/airavata-server.properties.j2
@@ -45,8 +45,6 @@ rabbitmq.process.exchange.name=process_exchange
rabbitmq.experiment.exchange.name=experiment_exchange
durable.queue=false
prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
###########################################################################
# Zookeeper Server Configuration
diff --git
a/dev-tools/ansible/roles/helix_setup/templates/pre-wm/airavata-server.properties.j2
b/dev-tools/ansible/roles/helix_setup/templates/pre-wm/airavata-server.properties.j2
index 610f0fb9cf..21400ae523 100644
---
a/dev-tools/ansible/roles/helix_setup/templates/pre-wm/airavata-server.properties.j2
+++
b/dev-tools/ansible/roles/helix_setup/templates/pre-wm/airavata-server.properties.j2
@@ -42,8 +42,6 @@ rabbitmq.process.exchange.name=process_exchange
rabbitmq.experiment.exchange.name=experiment_exchange
durable.queue=false
prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
###########################################################################
# Zookeeper Server Configuration
diff --git
a/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
b/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
index 1067f39fcb..7d78fcd6ba 100644
--- a/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
@@ -208,14 +208,6 @@ credential.store.server.port={{ cred_store_port }}
credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
credential.stroe.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-# these properties used by credential store email notifications
-email.server=smtp.googlemail.com
-email.server.port=465
-email.user=airavata
-email.password=xxx
-email.ssl=true
[email protected]
-
# SSH PKI key pair or ssh password can be used SSH based sshKeyAuthentication
is used.
# if user specify both password sshKeyAuthentication gets the higher preference
@@ -266,8 +258,6 @@ rabbitmq.process.exchange.name=process_exchange
rabbitmq.experiment.exchange.name=experiment_exchange
durable.queue=false
prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
###########################################################################
# Zookeeper Server Configuration
diff --git a/modules/restproxy/src/main/assembly/restproxy-bin-assembly.xml
b/modules/restproxy/src/main/assembly/restproxy-bin-assembly.xml
index d925f39ab5..de44ec314e 100644
--- a/modules/restproxy/src/main/assembly/restproxy-bin-assembly.xml
+++ b/modules/restproxy/src/main/assembly/restproxy-bin-assembly.xml
@@ -24,7 +24,7 @@
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0
http://maven.apache.org/xsd/assembly-2.2.0.xsd";>
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${file.service.dist.name}</baseDirectory>
+ <baseDirectory>${restproxy.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
</formats>
