This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch feat/single-jvm
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/feat/single-jvm by this push:
new dc763b9ce7 fix: update all ansible templates and inventories for
single server
dc763b9ce7 is described below
commit dc763b9ce71bdded2f8deff21fab540b0e31144c
Author: yasithdev <[email protected]>
AuthorDate: Thu Mar 26 02:46:11 2026 -0500
fix: update all ansible templates and inventories for single server
- airavata_services role: unified airavata.jdbc.* config, AiravataServer
class
- api-orch role: remove old server classes and per-catalog JDBC
- registry role: same cleanup
- pga role: profile_service_port → 8930
- dev/staging inventories: consolidated JDBC vars
- Remove stale per-service distribution scripts from modules
Zero remaining references to old server classes or per-catalog JDBC.
---
.../inventories/dev/group_vars/all/vars.yml | 29 +---
.../inventories/staging/group_vars/all/vars.yml | 29 +---
.../roles/airavata_services/defaults/main.yml | 10 +-
.../templates/airavata-server.properties.j2 | 90 +------------
dev-tools/ansible/roles/api-orch/defaults/main.yml | 2 +-
.../templates/airavata-server.properties.j2 | 120 +----------------
dev-tools/ansible/roles/pga/defaults/main.yml | 2 +-
.../templates/airavata-server.properties.j2 | 123 ++---------------
.../resources/distribution/bin/agent-service.sh | 26 ----
.../src/main/resources/distribution/bin/setenv.sh | 146 ---------------------
.../src/main/resources/distribution/conf/.gitkeep | 0
.../resources/distribution/bin/file-service.sh | 26 ----
.../src/main/resources/distribution/bin/setenv.sh | 146 ---------------------
.../src/main/resources/distribution/conf/.gitkeep | 0
.../resources/distribution/bin/research-service.sh | 26 ----
.../src/main/resources/distribution/bin/setenv.sh | 146 ---------------------
.../src/main/resources/distribution/conf/.gitkeep | 0
.../main/resources/distribution/bin/restproxy.sh | 26 ----
.../src/main/resources/distribution/bin/setenv.sh | 146 ---------------------
.../src/main/resources/distribution/conf/.gitkeep | 0
20 files changed, 31 insertions(+), 1062 deletions(-)
diff --git a/dev-tools/ansible/inventories/dev/group_vars/all/vars.yml
b/dev-tools/ansible/inventories/dev/group_vars/all/vars.yml
index 55a705b7a2..ce7dd0d8ed 100644
--- a/dev-tools/ansible/inventories/dev/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/dev/group_vars/all/vars.yml
@@ -22,11 +22,6 @@ user_home: "/home/{{ user }}"
# Service ports
api_server_port: 8930
api_server_tls_port: 9930
-profile_service_port: 8962
-registry_port: 8970
-registry_server_port: 8970
-sharing_registry_port: 7878
-cred_store_port: 8960
agent_service_port: 18880
research_service_port: 18899
file_server_port: 8050
@@ -43,23 +38,8 @@ credential_store: "{{ db_name }}"
profile_service: "{{ db_name }}"
research_catalog: "{{ db_name }}"
-# Database drivers
-registry_jdbc_driver: "org.mariadb.jdbc.Driver"
-appcatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-replicacatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-workflowcatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-sharingcatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-profile_service_jdbc_driver: "org.mariadb.jdbc.Driver"
-credential_store_jdbc_driver: "org.mariadb.jdbc.Driver"
-
-# Database users
-registry_jdbc_user: "{{ db_user | default('airavata') }}"
-appcatalog_jdbc_user: "{{ db_user | default('airavata') }}"
-replicacatalog_jdbc_user: "{{ db_user | default('airavata') }}"
-workflowcatalog_jdbc_user: "{{ db_user | default('airavata') }}"
-sharingcatalog_jdbc_user: "{{ db_user | default('airavata') }}"
-profile_service_jdbc_user: "{{ db_user | default('airavata') }}"
-credential_store_jdbc_user: "{{ db_user | default('airavata') }}"
+# Database driver (unified)
+airavata_jdbc_driver: "org.mariadb.jdbc.Driver"
# Paths
local_data_location: "/home/{{ deploy_user }}/temp-storage"
@@ -101,11 +81,6 @@ api_server_host: "{{ api_server_public_hostname }}"
api_secured: true
api_server_bind_host: "airavata.localhost"
-orchestrator_bind_host: "airavata.localhost"
-registry_bind_host: "airavata.localhost"
-sharing_registry_bind_host: "airavata.localhost"
-cred_store_server_bind_host: "airavata.localhost"
-profile_service_bind_host: "airavata.localhost"
# TLS Configuration
tls_enable: false
diff --git a/dev-tools/ansible/inventories/staging/group_vars/all/vars.yml
b/dev-tools/ansible/inventories/staging/group_vars/all/vars.yml
index 4583816fc3..1f7bf7f748 100644
--- a/dev-tools/ansible/inventories/staging/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/staging/group_vars/all/vars.yml
@@ -22,11 +22,6 @@ user_home: "/home/{{ user }}"
# Service ports
api_server_port: 8930
api_server_tls_port: 9930
-profile_service_port: 8962
-registry_port: 8970
-registry_server_port: 8970
-sharing_registry_port: 7878
-cred_store_port: 8960
agent_service_port: 18880
research_service_port: 18899
file_server_port: 8050
@@ -43,23 +38,8 @@ credential_store: "{{ db_name }}"
profile_service: "{{ db_name }}"
research_catalog: "{{ db_name }}"
-# Database drivers
-registry_jdbc_driver: "org.mariadb.jdbc.Driver"
-appcatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-replicacatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-workflowcatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-sharingcatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-profile_service_jdbc_driver: "org.mariadb.jdbc.Driver"
-credential_store_jdbc_driver: "org.mariadb.jdbc.Driver"
-
-# Database users
-registry_jdbc_user: "{{ db_user | default('airavata') }}"
-appcatalog_jdbc_user: "{{ db_user | default('airavata') }}"
-replicacatalog_jdbc_user: "{{ db_user | default('airavata') }}"
-workflowcatalog_jdbc_user: "{{ db_user | default('airavata') }}"
-sharingcatalog_jdbc_user: "{{ db_user | default('airavata') }}"
-profile_service_jdbc_user: "{{ db_user | default('airavata') }}"
-credential_store_jdbc_user: "{{ db_user | default('airavata') }}"
+# Database driver (unified)
+airavata_jdbc_driver: "org.mariadb.jdbc.Driver"
# Paths
local_data_location: "/home/{{ deploy_user }}/temp-storage"
@@ -105,11 +85,6 @@ api_server_host: "{{ api_server_public_hostname }}"
api_secured: true
api_server_bind_host: "airavata.localhost"
-orchestrator_bind_host: "airavata.localhost"
-registry_bind_host: "airavata.localhost"
-sharing_registry_bind_host: "airavata.localhost"
-cred_store_server_bind_host: "airavata.localhost"
-profile_service_bind_host: "airavata.localhost"
# TLS Configuration
tls_enable: false
diff --git a/dev-tools/ansible/roles/airavata_services/defaults/main.yml
b/dev-tools/ansible/roles/airavata_services/defaults/main.yml
index c15e48aa4e..d0fda3cbe0 100644
--- a/dev-tools/ansible/roles/airavata_services/defaults/main.yml
+++ b/dev-tools/ansible/roles/airavata_services/defaults/main.yml
@@ -74,14 +74,8 @@ default_registry_gateway: "default"
default_registry_oauth_client_id: "pga"
super_tenant_gatewayId: "default"
-# JDBC driver
-registry_jdbc_driver: "org.mariadb.jdbc.Driver"
-appcatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-replicacatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-workflowcatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-sharingcatalog_jdbc_driver: "org.mariadb.jdbc.Driver"
-profile_service_jdbc_driver: "org.mariadb.jdbc.Driver"
-credential_store_jdbc_driver: "org.mariadb.jdbc.Driver"
+# JDBC driver (unified)
+airavata_jdbc_driver: "org.mariadb.jdbc.Driver"
# Security configuration
security_manager_class:
"org.apache.airavata.service.security.KeyCloakSecurityManager"
diff --git
a/dev-tools/ansible/roles/airavata_services/templates/airavata-server.properties.j2
b/dev-tools/ansible/roles/airavata_services/templates/airavata-server.properties.j2
index 33dce0027a..bb879a7d6d 100644
---
a/dev-tools/ansible/roles/airavata_services/templates/airavata-server.properties.j2
+++
b/dev-tools/ansible/roles/airavata_services/templates/airavata-server.properties.j2
@@ -25,70 +25,19 @@
###########################################################################
###########################################################################
-# API Server Registry DB Configuration
+# Database Configuration
###########################################################################
-registry.jdbc.driver={{ registry_jdbc_driver }}
-registry.jdbc.url={{ registry_jdbc_url }}
-registry.jdbc.user={{ registry_jdbc_user }}
-registry.jdbc.password={{ registry_jdbc_password }}
-validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Application Catalog DB Configuration
-###########################################################################
-appcatalog.jdbc.driver={{ appcatalog_jdbc_driver }}
-appcatalog.jdbc.url={{ appcatalog_jdbc_url }}
-appcatalog.jdbc.user={{ appcatalog_jdbc_user }}
-appcatalog.jdbc.password={{ appcatalog_jdbc_password }}
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-##########################################################################
-# Replica Catalog DB Configuration
-###########################################################################
-replicacatalog.jdbc.driver={{ replicacatalog_jdbc_driver }}
-replicacatalog.jdbc.url={{ replicacatalog_jdbc_url }}
-replicacatalog.jdbc.user={{ replicacatalog_jdbc_user }}
-replicacatalog.jdbc.password={{ replicacatalog_jdbc_password }}
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Workflow Catalog DB Configuration
-###########################################################################
-workflowcatalog.jdbc.driver={{ workflowcatalog_jdbc_driver }}
-workflowcatalog.jdbc.url={{ workflowcatalog_jdbc_url }}
-workflowcatalog.jdbc.user={{ workflowcatalog_jdbc_user }}
-workflowcatalog.jdbc.password={{ workflowcatalog_jdbc_password }}
-workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Sharing Catalog DB Configuration
-###########################################################################
-sharingcatalog.jdbc.driver={{ sharingcatalog_jdbc_driver }}
-sharingcatalog.jdbc.url={{ sharingcatalog_jdbc_url }}
-sharingcatalog.jdbc.user={{ sharingcatalog_jdbc_user }}
-sharingcatalog.jdbc.password={{ sharingcatalog_jdbc_password }}
-sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
+airavata.jdbc.driver={{ airavata_jdbc_driver |
default('org.mariadb.jdbc.Driver') }}
+airavata.jdbc.url={{ airavata_jdbc_url }}
+airavata.jdbc.user={{ airavata_jdbc_user }}
+airavata.jdbc.password={{ airavata_jdbc_password }}
+airavata.jdbc.validationQuery=SELECT 1
###########################################################################
# Generic Server Configurations
###########################################################################
enable.sharing={{ enable_sharing }}
-###########################################################################
-# Sharing Registry Server Configuration
-###########################################################################
-sharing_server={{ sharing_server_class }}
-sharing.registry.server.host={{ sharing_registry_bind_host |
default(sharing_registry_server_host) }}
-sharing.registry.server.port={{ sharing_registry_port }}
-
-###########################################################################
-# Registry Server Configurations
-###########################################################################
-regserver={{ regserver_class }}
-regserver.server.host={{ registry_bind_host | default(regserver_server_host) }}
-regserver.server.port={{ registry_server_port }}
-regserver.server.min.threads={{ orchestrator_server_min_threads }}
-
default.registry.user={{ default_registry_user }}
default.registry.password={{ default_registry_password }}
default.registry.gateway={{ default_registry_gateway }}
@@ -99,21 +48,13 @@ super.tenant.gatewayId={{ super_tenant_gatewayId }}
###########################################################################
# API Server Configurations
###########################################################################
-apiserver.class={{ apiserver_class }}
+apiserver.class=org.apache.airavata.api.server.AiravataServer
apiserver.host={{ api_server_bind_host | default(api_server_host) }}
apiserver.port={{ api_server_port }}
api.server.monitoring.enabled={{ api_server_monitoring_enabled }}
api.server.monitoring.host={{ api_server_monitoring_host }}
api.server.monitoring.port={{ api_server_monitoring_port }}
-###########################################################################
-# Orchestrator Server Configurations
-###########################################################################
-orchestrator={{ orchestrator_class }}
-orchestrator.server.host={{ orchestrator_bind_host |
default(orchestrator_server_host) }}
-orchestrator.server.port={{ orchestrator_server_port }}
-orchestrator.server.min.threads={{ orchestrator_server_min_threads }}
-
job.validators={{ job_validators }}
enable.validation={{ enable_validation }}
host.scheduler={{ host_scheduler }}
@@ -132,14 +73,6 @@ job.status.publish.endpoint={{ job_status_publish_endpoint
}}
credential.store.keystore.url={{ credential_store_keystore_url }}
credential.store.keystore.alias={{ credential_store_keystore_alias }}
credential.store.keystore.password={{ credential_store_keystore_password }}
-credential.store.jdbc.url={{ credential_store_jdbc_url }}
-credential.store.jdbc.user={{ credential_store_jdbc_user }}
-credential.store.jdbc.password={{ credential_store_jdbc_password }}
-credential.store.jdbc.driver={{ credential_store_jdbc_driver }}
-credential.store.server.host={{ cred_store_server_bind_host |
default(cred_store_server_host) }}
-credential.store.server.port={{ cred_store_port }}
-credential.store.class={{ credential_store_class }}
-credential.store.jdbc.validationQuery={{ credential_store_validation_query }}
###########################################################################
# AMQP Notification Configuration
@@ -173,15 +106,6 @@ in.memory.cache.size={{ in_memory_cache_size }}
###########################################################################
# Profile Service Configuration
###########################################################################
-profile.service.server.host={{ profile_service_bind_host }}
-profile.service.server.port={{ profile_service_port }}
-profile_service.class={{ profile_service_class }}
-# MariaDB properties
-profile.service.jdbc.url={{ profile_service_jdbc_url }}
-profile.service.jdbc.user={{ profile_service_jdbc_user }}
-profile.service.jdbc.password={{ profile_service_jdbc_password }}
-profile.service.jdbc.driver={{ profile_service_jdbc_driver }}
-profile.service.validationQuery={{ profile_service_validation_query }}
###########################################################################
# Iam Admin services Configuration
diff --git a/dev-tools/ansible/roles/api-orch/defaults/main.yml
b/dev-tools/ansible/roles/api-orch/defaults/main.yml
index f0bbff800d..5b054fbbbc 100644
--- a/dev-tools/ansible/roles/api-orch/defaults/main.yml
+++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml
@@ -31,7 +31,7 @@ iam_server_super_admin_username: "admin"
#iam_server_super_admin_password: "changeme"
profile_service_host: "airavata.localhost"
-profile_service_port: 8962
+profile_service_port: 8930
mariadb_connector_jar_url:
"http://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar";
sharing_registry_tls_enabled: "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 c6aa47d39a..8b5fdb8d5c 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
@@ -26,21 +26,14 @@
###########################################################################
###########################################################################
-# API Server Registry Configuration
+# Database Configuration
###########################################################################
+airavata.jdbc.driver={{ airavata_jdbc_driver |
default('org.mariadb.jdbc.Driver') }}
+airavata.jdbc.url={{ airavata_jdbc_url }}
+airavata.jdbc.user={{ airavata_jdbc_user }}
+airavata.jdbc.password={{ airavata_jdbc_password }}
+airavata.jdbc.validationQuery=SELECT 1
-#for derby [AiravataJPARegistry]
-#registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#registry.jdbc.url=jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.url=jdbc:mariadb://{{ db_server }}:{{ db_server_port }}/{{
exp_catalog }}
-registry.jdbc.user={{ db_user }}
-registry.jdbc.password={{ db_password }}
-#FIXME: Probably the following property should be removed.
-start.derby.server.mode=false
-validationQuery=SELECT 1 from CONFIGURATION
-#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
enable.sharing={{enable_sharing}}
# Properties for default user mode
@@ -49,99 +42,17 @@ default.registry.password={{ default_registry_password }}
default.registry.gateway={{ default_gateway }}
super.tenant.gatewayId={{ default_gateway }}
-###########################################################################
-# Application Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#appcatalog.jdbc.url=jdbc:derby://localhost:1527/app_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ app_catalog }}
-appcatalog.jdbc.user={{ db_user }}
-appcatalog.jdbc.password={{ db_password }}
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-##########################################################################
-# Replica Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#replicacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#replicacatalog.jdbc.url=jdbc:derby://localhost:1527/replica_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ replica_catalog
}}
-replicacatalog.jdbc.user={{ db_user }}
-replicacatalog.jdbc.password={{ db_password }}
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Workflow Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#workflowcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#workflowcatalog.jdbc.url=jdbc:derby://localhost:1527/workflow_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-workflowcatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{
workflow_catalog }}
-workflowcatalog.jdbc.user={{ db_user }}
-workflowcatalog.jdbc.password={{ db_password }}
-workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Sharing Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#sharingcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#sharingcatalog.jdbc.url=jdbc:derby://localhost:1527/sharing_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-sharingcatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ sharing_catalog
}}
-sharingcatalog.jdbc.user={{ db_user }}
-sharingcatalog.jdbc.password={{ db_password }}
-sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Sharing Registry Server Configuration
-###########################################################################
-sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
-sharing.registry.server.host={{ sharing_registry_bind_host }}
-sharing.registry.server.port={{ sharing_registry_port }}
-
-###########################################################################
-# Server module Configuration
-###########################################################################
-#credential store server should be started before API server
-#This is obsolete property with new script files.
-#servers=credentialstore,apiserver,orchestrator
-
-
###########################################################################
# API Server Configurations
###########################################################################
-apiserver.class=org.apache.airavata.api.server.AiravataAPIServer
+apiserver.class=org.apache.airavata.api.server.AiravataServer
apiserver.host={{ api_server_bind_host }}
apiserver.port={{ api_server_port }}
-###########################################################################
-# Orchestrator Server Configurations
-###########################################################################
-orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
-orchestrator.server.host={{ orchestrator_bind_host }}
-orchestrator.server.port={{ orchestrator_port }}
-orchestrator.server.min.threads=50
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
enable.validation=true
host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
-###########################################################################
-# Registry Server Configurations
-###########################################################################
-regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
-regserver.server.host={{registry_bind_host}}
-regserver.server.port={{registry_port}}
-regserver.server.min.threads=50
-
###########################################################################
# Job Scheduler can send informative email messages to you about the status
of your job.
# Specify a string which consists of either the single character "n" (no
mail), or one or more
@@ -159,14 +70,6 @@ job.notification.emailids=
credential.store.keystore.url={{ keystores_location }}/{{
cred_keystore_src_path | basename }}
credential.store.keystore.alias={{ cred_keystore_alias }}
credential.store.keystore.password={{ cred_keystore_passwd }}
-credential.store.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{
credential_store }}
-credential.store.jdbc.user={{ db_user }}
-credential.store.jdbc.password={{ db_password }}
-credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-credential.store.server.host={{ cred_store_server_bind_host }}
-credential.store.server.port={{ cred_store_port }}
-credential.store.class=org.apache.airavata.credential.store.server.CredentialStoreServer
-credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
# 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
@@ -245,15 +148,6 @@ in.memory.cache.size=1000
###########################################################################
# Profile Service Configuration
###########################################################################
-profile.service.server.host={{ profile_service_bind_host }}
-profile.service.server.port={{ profile_service_port }}
-profile_service.class=org.apache.airavata.service.profile.server.ProfileServiceServer
-# MariaDB properties
-profile.service.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{
profile_service }}
-profile.service.jdbc.user={{ db_user }}
-profile.service.jdbc.password={{ db_password }}
-profile.service.jdbc.driver=org.mariadb.jdbc.Driver
-profile.service.validationQuery=SELECT 1
###########################################################################
# Iam Admin services Configuration
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml
b/dev-tools/ansible/roles/pga/defaults/main.yml
index 96d6ee082a..071c21c0b2 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -82,7 +82,7 @@ pga_git_branch: "master"
airavata_server: "{{ groups['api-orch'][0] }}"
airavata_port: "8930"
airavata_profile_service_server: "{{ airavata_server }}"
-airavata_profile_service_port: "8962"
+airavata_profile_service_port: "8930"
gateway_id: "{{ default_gateway }}"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}"
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 6a60bc21ce..490d1d6932 100644
--- a/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
@@ -26,128 +26,31 @@
###########################################################################
###########################################################################
-# API Server Registry Configuration
-###########################################################################
-
-#for derby [AiravataJPARegistry]
-#registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#registry.jdbc.url=jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata
-# MySql database configuration
-registry.jdbc.driver=com.mysql.jdbc.Driver
-registry.jdbc.url=jdbc:mysql://{{ db_server }}:{{ db_server_port }}/{{
exp_catalog }}
-registry.jdbc.user={{ db_user }}
-registry.jdbc.password={{ db_password }}
-#FIXME: Probably the following property should be removed.
-start.derby.server.mode=false
-validationQuery=SELECT 1 from CONFIGURATION
-#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
+# Database Configuration
+###########################################################################
+airavata.jdbc.driver={{ airavata_jdbc_driver |
default('org.mariadb.jdbc.Driver') }}
+airavata.jdbc.url={{ airavata_jdbc_url }}
+airavata.jdbc.user={{ airavata_jdbc_user }}
+airavata.jdbc.password={{ airavata_jdbc_password }}
+airavata.jdbc.validationQuery=SELECT 1
+
enable.sharing={{enable_sharing}}
# Properties for default user mode
default.registry.user=admin
default.registry.password=admin
-default.registry.password.hash.method=SHA
default.registry.gateway={{ default_gateway }}
super.tenant.gatewayId={{ default_gateway }}
-# Properties for cluster status monitoring
-# cluster status monitoring job repeat time in seconds
-cluster.status.monitoring.enable=false
-cluster.status.monitoring.repeat.time=18000
-
-
-###########################################################################
-# Application Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#appcatalog.jdbc.url=jdbc:derby://localhost:1527/app_catalog;create=true;user=airavata;password=airavata
-# MySql database configuration
-appcatalog.jdbc.driver=com.mysql.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ app_catalog }}
-appcatalog.jdbc.user={{ db_user }}
-appcatalog.jdbc.password={{ db_password }}
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-##########################################################################
-# Replica Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#replicacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#replicacatalog.jdbc.url=jdbc:derby://localhost:1527/replica_catalog;create=true;user=airavata;password=airavata
-# MySql database configuration
-replicacatalog.jdbc.driver=com.mysql.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ replica_catalog }}
-replicacatalog.jdbc.user={{ db_user }}
-replicacatalog.jdbc.password={{ db_password }}
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Workflow Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#workflowcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#workflowcatalog.jdbc.url=jdbc:derby://localhost:1527/workflow_catalog;create=true;user=airavata;password=airavata
-# MySql database configuration
-workflowcatalog.jdbc.driver=com.mysql.jdbc.Driver
-workflowcatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ replica_catalog
}}
-workflowcatalog.jdbc.user={{ db_user }}
-workflowcatalog.jdbc.password={{ db_password }}
-workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Sharing Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#sharingcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#sharingcatalog.jdbc.url=jdbc:derby://localhost:1527/sharing_catalog;create=true;user=airavata;password=airavata
-# MySql database configuration
-sharingcatalog.jdbc.driver=com.mysql.jdbc.Driver
-sharingcatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ sharing_catalog }}
-sharingcatalog.jdbc.user={{ db_user }}
-sharingcatalog.jdbc.password={{ db_password }}
-sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Server module Configuration
-###########################################################################
-#credential store server should be started before API server
-#This is obsolete property with new script files.
-#servers=credentialstore,apiserver,orchestrator
-
###########################################################################
# API Server Configurations
###########################################################################
-apiserver.class=org.apache.airavata.api.server.AiravataAPIServer
+apiserver.class=org.apache.airavata.api.server.AiravataServer
apiserver.host={{ api_server_host }}
apiserver.port={{ api_server_port }}
-###########################################################################
-# Orchestrator Server Configurations
-###########################################################################
-orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
-orchestrator.server.host={{ orchestrator_host }}
-orchestrator.server.port={{ orchestrator_port }}
-orchestrator.server.min.threads=50
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
enable.validation=true
-
-###########################################################################
-# Registry Server Configurations
-###########################################################################
-regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
-regserver.server.host={{registry_host}}
-regserver.server.port={{registry_port}}
-regserver.server.min.threads=50
-
-###########################################################################
-# GFac Server Configurations
-###########################################################################
-gfac=org.apache.airavata.gfac.server.GfacServer
-gfac.server.name={{ gfac_name }}
-gfac.server.host={{ gfac_host }}
-gfac.server.port={{ gfac_port }}
-gfac.thread.pool.size=50
host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
###########################################################################
@@ -167,14 +70,6 @@ job.notification.emailids=
credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore }}
credential.store.keystore.alias={{ cred_keystore_alias }}
credential.store.keystore.password={{ cred_keystore_passwd }}
-credential.store.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{
credential_store }}
-credential.store.jdbc.user={{ db_user }}
-credential.store.jdbc.password={{ db_password }}
-credential.store.jdbc.driver=com.mysql.jdbc.Driver
-credential.store.server.host={{ cred_store_server_host }}
-credential.store.server.port={{ cred_store_port }}
-credential.store.class=org.apache.airavata.credential.store.server.CredentialStoreServer
-credential.stroe.jdbc.validationQuery=SELECT 1 from CONFIGURATION
# 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
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
deleted file mode 100755
index 2fbddbbbb6..0000000000
---
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-. $(dirname $0)/setenv.sh
-
-SERVICE_NAME="agent-service"
-MAIN_CLASS="org.apache.airavata.agent.connection.service.AgentServiceApplication"
-JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf
-Dairavata.home=${AIRAVATA_HOME}
-Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml
-Dairavata.server.truststore.path=${AIRAVATA_HOME}/conf/airavata.p12
-Dspring.config.location=${AIRAVATA_HOME}/conf/"
-
-run_service "$SERVICE_NAME" "$MAIN_CLASS" "$JAVA_OPTS" "$@"
diff --git
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/setenv.sh
b/modules/agent-framework/agent-service/src/main/resources/distribution/bin/setenv.sh
deleted file mode 100755
index 9024de1d7b..0000000000
---
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/setenv.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Resolve symlinks to get the real script location
-PRG="$0"
-while [ -L "$PRG" ]; do
- PRG=$(readlink "$PRG")
-done
-PRGDIR=$(dirname "$PRG")
-
-# Set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=$(cd "$PRGDIR/.." && pwd)
-
-# Build CLASSPATH from all JAR files
-CLASSPATH=$(printf "%s:" "$AIRAVATA_HOME"/lib/*.jar)
-CLASSPATH=${CLASSPATH%:} # Remove trailing colon
-
-export AIRAVATA_HOME CLASSPATH
-
-# Common function to run Airavata services
-# Usage: run_service <service_name> <main_class> <java_opts>
-run_service() {
- local SERVICE_NAME="$1" MAIN_CLASS="$2" JAVA_OPTS="$3"
- # Export SERVICE_NAME as environment variable for log4j2 configuration
- export SERVICE_NAME
- local CWD="$PWD" PID_PATH_NAME="${AIRAVATA_HOME}/bin/pid-${SERVICE_NAME}"
- local DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/${SERVICE_NAME}.log"
- local LOG_FILE="$DEFAULT_LOG_FILE" DAEMON_MODE=false EXTRA_ARGS=""
-
- # Help text
- local HELP_TEXT="Usage: ${SERVICE_NAME}.sh
-
-command options:
- -d Run in daemon mode
- -xdebug Start ${SERVICE_NAME} under JPDA debugger
- -log <LOG_FILE> Where to redirect stdout/stderr (defaults to
$DEFAULT_LOG_FILE)
- -h Display this help and exit
-
-Daemon mode commands (use with -d):
- start Start server in daemon mode
- stop Stop server running in daemon mode
- restart Restart server in daemon mode"
-
- cd "${AIRAVATA_HOME}/bin"
-
- # Helper function to stop daemon process
- stop_daemon() {
- if [[ -f "$PID_PATH_NAME" ]]; then
- local PID=$(cat "$PID_PATH_NAME")
- echo "$SERVICE_NAME stopping..."
- pkill -P "$PID"
- kill "$PID"
-
- local retry=0
- while kill -0 "$PID" 2>/dev/null && ((retry++ < 20)); do
- echo "[PID: $PID] Waiting for process to stop..."
- sleep 1
- done
-
- if kill -0 "$PID" 2>/dev/null; then
- echo "[PID: $PID] Forcefully killing non-responsive process..."
- pkill -9 -P "$PID"
- kill -9 "$PID"
- fi
-
- echo "$SERVICE_NAME is now stopped."
- rm "$PID_PATH_NAME"
- return 0
- else
- echo "$SERVICE_NAME is not running."
- return 1
- fi
- }
-
- # Helper function to start daemon process
- start_daemon() {
- echo "Starting $SERVICE_NAME ..."
- if [[ ! -f "$PID_PATH_NAME" ]]; then
- nohup java $JAVA_OPTS -classpath "$CLASSPATH" "$MAIN_CLASS" "$@"
>"$LOG_FILE" 2>&1 &
- echo $! >"$PID_PATH_NAME"
- echo "$SERVICE_NAME now running: PID $(cat "$PID_PATH_NAME")"
- else
- echo "$SERVICE_NAME already running: PID $(cat "$PID_PATH_NAME")"
- fi
- }
-
- # Parse command arguments
- while (($# > 0)); do
- case "$1" in
- -d) DAEMON_MODE=true ;;
- -xdebug) JAVA_OPTS+=" -Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,server=y,address=*:8000" ;;
- -log)
- shift
- LOG_FILE="$1"
- [[ "$LOG_FILE" != /* ]] && LOG_FILE="${CWD}/${LOG_FILE}"
- ;;
- start | stop | restart)
- if [[ "$DAEMON_MODE" == true ]]; then
- case "$1" in
- start) start_daemon "$@" ;;
- stop) stop_daemon ;;
- restart)
- stop_daemon
- start_daemon "$@"
- ;;
- esac
- exit 0
- else
- EXTRA_ARGS+=" $1"
- fi
- ;;
- -h)
- echo "$HELP_TEXT"
- exit 0
- ;;
- *) EXTRA_ARGS+=" $1" ;;
- esac
- shift
- done
-
- # Validate daemon mode usage
- if [[ "$DAEMON_MODE" == true ]]; then
- echo "Error: Daemon mode (-d) requires one of: start, stop, restart"
- echo "Use -h for help"
- exit 1
- fi
-
- # Run in foreground mode
- java $JAVA_OPTS -classpath "$CLASSPATH" "$MAIN_CLASS" $EXTRA_ARGS
-}
diff --git
a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/.gitkeep
b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/modules/file-server/src/main/resources/distribution/bin/file-service.sh
b/modules/file-server/src/main/resources/distribution/bin/file-service.sh
deleted file mode 100644
index e380ac51db..0000000000
--- a/modules/file-server/src/main/resources/distribution/bin/file-service.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-. $(dirname $0)/setenv.sh
-
-SERVICE_NAME="file-service"
-MAIN_CLASS="org.apache.airavata.file.server.FileServerApplication"
-JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf
-Dairavata.home=${AIRAVATA_HOME}
-Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml
-Dspring.config.location=${AIRAVATA_HOME}/conf/"
-
-run_service "$SERVICE_NAME" "$MAIN_CLASS" "$JAVA_OPTS" "$@"
diff --git a/modules/file-server/src/main/resources/distribution/bin/setenv.sh
b/modules/file-server/src/main/resources/distribution/bin/setenv.sh
deleted file mode 100644
index 9024de1d7b..0000000000
--- a/modules/file-server/src/main/resources/distribution/bin/setenv.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Resolve symlinks to get the real script location
-PRG="$0"
-while [ -L "$PRG" ]; do
- PRG=$(readlink "$PRG")
-done
-PRGDIR=$(dirname "$PRG")
-
-# Set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=$(cd "$PRGDIR/.." && pwd)
-
-# Build CLASSPATH from all JAR files
-CLASSPATH=$(printf "%s:" "$AIRAVATA_HOME"/lib/*.jar)
-CLASSPATH=${CLASSPATH%:} # Remove trailing colon
-
-export AIRAVATA_HOME CLASSPATH
-
-# Common function to run Airavata services
-# Usage: run_service <service_name> <main_class> <java_opts>
-run_service() {
- local SERVICE_NAME="$1" MAIN_CLASS="$2" JAVA_OPTS="$3"
- # Export SERVICE_NAME as environment variable for log4j2 configuration
- export SERVICE_NAME
- local CWD="$PWD" PID_PATH_NAME="${AIRAVATA_HOME}/bin/pid-${SERVICE_NAME}"
- local DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/${SERVICE_NAME}.log"
- local LOG_FILE="$DEFAULT_LOG_FILE" DAEMON_MODE=false EXTRA_ARGS=""
-
- # Help text
- local HELP_TEXT="Usage: ${SERVICE_NAME}.sh
-
-command options:
- -d Run in daemon mode
- -xdebug Start ${SERVICE_NAME} under JPDA debugger
- -log <LOG_FILE> Where to redirect stdout/stderr (defaults to
$DEFAULT_LOG_FILE)
- -h Display this help and exit
-
-Daemon mode commands (use with -d):
- start Start server in daemon mode
- stop Stop server running in daemon mode
- restart Restart server in daemon mode"
-
- cd "${AIRAVATA_HOME}/bin"
-
- # Helper function to stop daemon process
- stop_daemon() {
- if [[ -f "$PID_PATH_NAME" ]]; then
- local PID=$(cat "$PID_PATH_NAME")
- echo "$SERVICE_NAME stopping..."
- pkill -P "$PID"
- kill "$PID"
-
- local retry=0
- while kill -0 "$PID" 2>/dev/null && ((retry++ < 20)); do
- echo "[PID: $PID] Waiting for process to stop..."
- sleep 1
- done
-
- if kill -0 "$PID" 2>/dev/null; then
- echo "[PID: $PID] Forcefully killing non-responsive process..."
- pkill -9 -P "$PID"
- kill -9 "$PID"
- fi
-
- echo "$SERVICE_NAME is now stopped."
- rm "$PID_PATH_NAME"
- return 0
- else
- echo "$SERVICE_NAME is not running."
- return 1
- fi
- }
-
- # Helper function to start daemon process
- start_daemon() {
- echo "Starting $SERVICE_NAME ..."
- if [[ ! -f "$PID_PATH_NAME" ]]; then
- nohup java $JAVA_OPTS -classpath "$CLASSPATH" "$MAIN_CLASS" "$@"
>"$LOG_FILE" 2>&1 &
- echo $! >"$PID_PATH_NAME"
- echo "$SERVICE_NAME now running: PID $(cat "$PID_PATH_NAME")"
- else
- echo "$SERVICE_NAME already running: PID $(cat "$PID_PATH_NAME")"
- fi
- }
-
- # Parse command arguments
- while (($# > 0)); do
- case "$1" in
- -d) DAEMON_MODE=true ;;
- -xdebug) JAVA_OPTS+=" -Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,server=y,address=*:8000" ;;
- -log)
- shift
- LOG_FILE="$1"
- [[ "$LOG_FILE" != /* ]] && LOG_FILE="${CWD}/${LOG_FILE}"
- ;;
- start | stop | restart)
- if [[ "$DAEMON_MODE" == true ]]; then
- case "$1" in
- start) start_daemon "$@" ;;
- stop) stop_daemon ;;
- restart)
- stop_daemon
- start_daemon "$@"
- ;;
- esac
- exit 0
- else
- EXTRA_ARGS+=" $1"
- fi
- ;;
- -h)
- echo "$HELP_TEXT"
- exit 0
- ;;
- *) EXTRA_ARGS+=" $1" ;;
- esac
- shift
- done
-
- # Validate daemon mode usage
- if [[ "$DAEMON_MODE" == true ]]; then
- echo "Error: Daemon mode (-d) requires one of: start, stop, restart"
- echo "Use -h for help"
- exit 1
- fi
-
- # Run in foreground mode
- java $JAVA_OPTS -classpath "$CLASSPATH" "$MAIN_CLASS" $EXTRA_ARGS
-}
diff --git a/modules/file-server/src/main/resources/distribution/conf/.gitkeep
b/modules/file-server/src/main/resources/distribution/conf/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/modules/research-framework/research-service/src/main/resources/distribution/bin/research-service.sh
b/modules/research-framework/research-service/src/main/resources/distribution/bin/research-service.sh
deleted file mode 100755
index 9e1a5b63ba..0000000000
---
a/modules/research-framework/research-service/src/main/resources/distribution/bin/research-service.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-. $(dirname $0)/setenv.sh
-
-SERVICE_NAME="research-service"
-MAIN_CLASS="org.apache.airavata.research.service.ResearchServiceApplication"
-JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf
-Dairavata.home=${AIRAVATA_HOME}
-Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml
-Dairavata.server.truststore.path=${AIRAVATA_HOME}/conf/airavata.p12
-Dspring.config.location=${AIRAVATA_HOME}/conf/"
-
-run_service "$SERVICE_NAME" "$MAIN_CLASS" "$JAVA_OPTS" "$@"
diff --git
a/modules/research-framework/research-service/src/main/resources/distribution/bin/setenv.sh
b/modules/research-framework/research-service/src/main/resources/distribution/bin/setenv.sh
deleted file mode 100755
index 9024de1d7b..0000000000
---
a/modules/research-framework/research-service/src/main/resources/distribution/bin/setenv.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Resolve symlinks to get the real script location
-PRG="$0"
-while [ -L "$PRG" ]; do
- PRG=$(readlink "$PRG")
-done
-PRGDIR=$(dirname "$PRG")
-
-# Set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=$(cd "$PRGDIR/.." && pwd)
-
-# Build CLASSPATH from all JAR files
-CLASSPATH=$(printf "%s:" "$AIRAVATA_HOME"/lib/*.jar)
-CLASSPATH=${CLASSPATH%:} # Remove trailing colon
-
-export AIRAVATA_HOME CLASSPATH
-
-# Common function to run Airavata services
-# Usage: run_service <service_name> <main_class> <java_opts>
-run_service() {
- local SERVICE_NAME="$1" MAIN_CLASS="$2" JAVA_OPTS="$3"
- # Export SERVICE_NAME as environment variable for log4j2 configuration
- export SERVICE_NAME
- local CWD="$PWD" PID_PATH_NAME="${AIRAVATA_HOME}/bin/pid-${SERVICE_NAME}"
- local DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/${SERVICE_NAME}.log"
- local LOG_FILE="$DEFAULT_LOG_FILE" DAEMON_MODE=false EXTRA_ARGS=""
-
- # Help text
- local HELP_TEXT="Usage: ${SERVICE_NAME}.sh
-
-command options:
- -d Run in daemon mode
- -xdebug Start ${SERVICE_NAME} under JPDA debugger
- -log <LOG_FILE> Where to redirect stdout/stderr (defaults to
$DEFAULT_LOG_FILE)
- -h Display this help and exit
-
-Daemon mode commands (use with -d):
- start Start server in daemon mode
- stop Stop server running in daemon mode
- restart Restart server in daemon mode"
-
- cd "${AIRAVATA_HOME}/bin"
-
- # Helper function to stop daemon process
- stop_daemon() {
- if [[ -f "$PID_PATH_NAME" ]]; then
- local PID=$(cat "$PID_PATH_NAME")
- echo "$SERVICE_NAME stopping..."
- pkill -P "$PID"
- kill "$PID"
-
- local retry=0
- while kill -0 "$PID" 2>/dev/null && ((retry++ < 20)); do
- echo "[PID: $PID] Waiting for process to stop..."
- sleep 1
- done
-
- if kill -0 "$PID" 2>/dev/null; then
- echo "[PID: $PID] Forcefully killing non-responsive process..."
- pkill -9 -P "$PID"
- kill -9 "$PID"
- fi
-
- echo "$SERVICE_NAME is now stopped."
- rm "$PID_PATH_NAME"
- return 0
- else
- echo "$SERVICE_NAME is not running."
- return 1
- fi
- }
-
- # Helper function to start daemon process
- start_daemon() {
- echo "Starting $SERVICE_NAME ..."
- if [[ ! -f "$PID_PATH_NAME" ]]; then
- nohup java $JAVA_OPTS -classpath "$CLASSPATH" "$MAIN_CLASS" "$@"
>"$LOG_FILE" 2>&1 &
- echo $! >"$PID_PATH_NAME"
- echo "$SERVICE_NAME now running: PID $(cat "$PID_PATH_NAME")"
- else
- echo "$SERVICE_NAME already running: PID $(cat "$PID_PATH_NAME")"
- fi
- }
-
- # Parse command arguments
- while (($# > 0)); do
- case "$1" in
- -d) DAEMON_MODE=true ;;
- -xdebug) JAVA_OPTS+=" -Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,server=y,address=*:8000" ;;
- -log)
- shift
- LOG_FILE="$1"
- [[ "$LOG_FILE" != /* ]] && LOG_FILE="${CWD}/${LOG_FILE}"
- ;;
- start | stop | restart)
- if [[ "$DAEMON_MODE" == true ]]; then
- case "$1" in
- start) start_daemon "$@" ;;
- stop) stop_daemon ;;
- restart)
- stop_daemon
- start_daemon "$@"
- ;;
- esac
- exit 0
- else
- EXTRA_ARGS+=" $1"
- fi
- ;;
- -h)
- echo "$HELP_TEXT"
- exit 0
- ;;
- *) EXTRA_ARGS+=" $1" ;;
- esac
- shift
- done
-
- # Validate daemon mode usage
- if [[ "$DAEMON_MODE" == true ]]; then
- echo "Error: Daemon mode (-d) requires one of: start, stop, restart"
- echo "Use -h for help"
- exit 1
- fi
-
- # Run in foreground mode
- java $JAVA_OPTS -classpath "$CLASSPATH" "$MAIN_CLASS" $EXTRA_ARGS
-}
diff --git
a/modules/research-framework/research-service/src/main/resources/distribution/conf/.gitkeep
b/modules/research-framework/research-service/src/main/resources/distribution/conf/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/modules/restproxy/src/main/resources/distribution/bin/restproxy.sh
b/modules/restproxy/src/main/resources/distribution/bin/restproxy.sh
deleted file mode 100644
index 708d53aac4..0000000000
--- a/modules/restproxy/src/main/resources/distribution/bin/restproxy.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-. $(dirname $0)/setenv.sh
-
-SERVICE_NAME="rest-proxy"
-MAIN_CLASS="org.apache.airavata.restproxy.RestProxyApplication"
-JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf
-Dairavata.home=${AIRAVATA_HOME}
-Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml
-Dspring.config.location=${AIRAVATA_HOME}/conf/"
-
-run_service "$SERVICE_NAME" "$MAIN_CLASS" "$JAVA_OPTS" "$@"
diff --git a/modules/restproxy/src/main/resources/distribution/bin/setenv.sh
b/modules/restproxy/src/main/resources/distribution/bin/setenv.sh
deleted file mode 100644
index 9024de1d7b..0000000000
--- a/modules/restproxy/src/main/resources/distribution/bin/setenv.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Resolve symlinks to get the real script location
-PRG="$0"
-while [ -L "$PRG" ]; do
- PRG=$(readlink "$PRG")
-done
-PRGDIR=$(dirname "$PRG")
-
-# Set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=$(cd "$PRGDIR/.." && pwd)
-
-# Build CLASSPATH from all JAR files
-CLASSPATH=$(printf "%s:" "$AIRAVATA_HOME"/lib/*.jar)
-CLASSPATH=${CLASSPATH%:} # Remove trailing colon
-
-export AIRAVATA_HOME CLASSPATH
-
-# Common function to run Airavata services
-# Usage: run_service <service_name> <main_class> <java_opts>
-run_service() {
- local SERVICE_NAME="$1" MAIN_CLASS="$2" JAVA_OPTS="$3"
- # Export SERVICE_NAME as environment variable for log4j2 configuration
- export SERVICE_NAME
- local CWD="$PWD" PID_PATH_NAME="${AIRAVATA_HOME}/bin/pid-${SERVICE_NAME}"
- local DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/${SERVICE_NAME}.log"
- local LOG_FILE="$DEFAULT_LOG_FILE" DAEMON_MODE=false EXTRA_ARGS=""
-
- # Help text
- local HELP_TEXT="Usage: ${SERVICE_NAME}.sh
-
-command options:
- -d Run in daemon mode
- -xdebug Start ${SERVICE_NAME} under JPDA debugger
- -log <LOG_FILE> Where to redirect stdout/stderr (defaults to
$DEFAULT_LOG_FILE)
- -h Display this help and exit
-
-Daemon mode commands (use with -d):
- start Start server in daemon mode
- stop Stop server running in daemon mode
- restart Restart server in daemon mode"
-
- cd "${AIRAVATA_HOME}/bin"
-
- # Helper function to stop daemon process
- stop_daemon() {
- if [[ -f "$PID_PATH_NAME" ]]; then
- local PID=$(cat "$PID_PATH_NAME")
- echo "$SERVICE_NAME stopping..."
- pkill -P "$PID"
- kill "$PID"
-
- local retry=0
- while kill -0 "$PID" 2>/dev/null && ((retry++ < 20)); do
- echo "[PID: $PID] Waiting for process to stop..."
- sleep 1
- done
-
- if kill -0 "$PID" 2>/dev/null; then
- echo "[PID: $PID] Forcefully killing non-responsive process..."
- pkill -9 -P "$PID"
- kill -9 "$PID"
- fi
-
- echo "$SERVICE_NAME is now stopped."
- rm "$PID_PATH_NAME"
- return 0
- else
- echo "$SERVICE_NAME is not running."
- return 1
- fi
- }
-
- # Helper function to start daemon process
- start_daemon() {
- echo "Starting $SERVICE_NAME ..."
- if [[ ! -f "$PID_PATH_NAME" ]]; then
- nohup java $JAVA_OPTS -classpath "$CLASSPATH" "$MAIN_CLASS" "$@"
>"$LOG_FILE" 2>&1 &
- echo $! >"$PID_PATH_NAME"
- echo "$SERVICE_NAME now running: PID $(cat "$PID_PATH_NAME")"
- else
- echo "$SERVICE_NAME already running: PID $(cat "$PID_PATH_NAME")"
- fi
- }
-
- # Parse command arguments
- while (($# > 0)); do
- case "$1" in
- -d) DAEMON_MODE=true ;;
- -xdebug) JAVA_OPTS+=" -Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,server=y,address=*:8000" ;;
- -log)
- shift
- LOG_FILE="$1"
- [[ "$LOG_FILE" != /* ]] && LOG_FILE="${CWD}/${LOG_FILE}"
- ;;
- start | stop | restart)
- if [[ "$DAEMON_MODE" == true ]]; then
- case "$1" in
- start) start_daemon "$@" ;;
- stop) stop_daemon ;;
- restart)
- stop_daemon
- start_daemon "$@"
- ;;
- esac
- exit 0
- else
- EXTRA_ARGS+=" $1"
- fi
- ;;
- -h)
- echo "$HELP_TEXT"
- exit 0
- ;;
- *) EXTRA_ARGS+=" $1" ;;
- esac
- shift
- done
-
- # Validate daemon mode usage
- if [[ "$DAEMON_MODE" == true ]]; then
- echo "Error: Daemon mode (-d) requires one of: start, stop, restart"
- echo "Use -h for help"
- exit 1
- fi
-
- # Run in foreground mode
- java $JAVA_OPTS -classpath "$CLASSPATH" "$MAIN_CLASS" $EXTRA_ARGS
-}
diff --git a/modules/restproxy/src/main/resources/distribution/conf/.gitkeep
b/modules/restproxy/src/main/resources/distribution/conf/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
