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 1f970f41e1 refactor: rename AiravataUnifiedServer to AiravataServer
1f970f41e1 is described below
commit 1f970f41e14fec2aa1cd66bea77516e138f6718d
Author: yasithdev <[email protected]>
AuthorDate: Thu Mar 26 02:04:15 2026 -0500
refactor: rename AiravataUnifiedServer to AiravataServer
Drop 'Unified' terminology everywhere — class, log messages,
scripts, ansible, deployment configs. The server is simply
AiravataServer.
---
...avataUnifiedServer.java => AiravataServer.java} | 18 ++++++------
.../src/main/resources/airavata-server.properties | 4 +--
.../bin/{airavata.sh => airavata-server.sh} | 2 +-
.../inventories/dev/group_vars/all/vars.yml | 2 +-
.../inventories/staging/group_vars/all/vars.yml | 2 +-
.../roles/airavata_services/defaults/main.yml | 6 ++--
.../airavata_services/tasks/deploy_api_server.yml | 4 +--
.../airavata_services/tasks/start_services.yml | 6 ++--
.../airavata_services/tasks/stop_services.yml | 16 +++++------
.../deployment-scripts/airavata-server.properties | 6 ++--
dev-tools/deployment-scripts/docker-startup.sh | 32 +++++++++++-----------
dev-tools/deployment-scripts/services_down.sh | 8 +++---
dev-tools/deployment-scripts/services_up.sh | 8 +++---
scripts/start.sh | 4 +--
14 files changed, 59 insertions(+), 59 deletions(-)
diff --git
a/airavata-api/src/main/java/org/apache/airavata/api/server/AiravataUnifiedServer.java
b/airavata-api/src/main/java/org/apache/airavata/api/server/AiravataServer.java
similarity index 95%
rename from
airavata-api/src/main/java/org/apache/airavata/api/server/AiravataUnifiedServer.java
rename to
airavata-api/src/main/java/org/apache/airavata/api/server/AiravataServer.java
index 0faf762641..e0106d7ccb 100644
---
a/airavata-api/src/main/java/org/apache/airavata/api/server/AiravataUnifiedServer.java
+++
b/airavata-api/src/main/java/org/apache/airavata/api/server/AiravataServer.java
@@ -82,10 +82,10 @@ import org.slf4j.LoggerFactory;
*
* <p>All services share the same port (default 8930, from {@code
apiserver.port}).
*/
-public class AiravataUnifiedServer implements IServer {
+public class AiravataServer implements IServer {
- private static final Logger logger =
LoggerFactory.getLogger(AiravataUnifiedServer.class);
- private static final String SERVER_NAME = "Airavata Unified Server";
+ private static final Logger logger =
LoggerFactory.getLogger(AiravataServer.class);
+ private static final String SERVER_NAME = "Airavata Server";
private static final String SERVER_VERSION = "1.0";
private ServerStatus status;
@@ -99,7 +99,7 @@ public class AiravataUnifiedServer implements IServer {
new CredentialStoreDBInitConfig(),
new UserProfileCatalogDBInitConfig());
- public AiravataUnifiedServer() {
+ public AiravataServer() {
setStatus(ServerStatus.STOPPED);
}
@@ -188,7 +188,7 @@ public class AiravataUnifiedServer implements IServer {
new Thread(() -> {
server.serve();
setStatus(ServerStatus.STOPPED);
- logger.info("Airavata Unified Server stopped.");
+ logger.info("Airavata Server stopped.");
})
.start();
@@ -202,7 +202,7 @@ public class AiravataUnifiedServer implements IServer {
}
if (server.isServing()) {
setStatus(ServerStatus.STARTED);
- logger.info("Airavata Unified Server started on
port {}", serverPort);
+ logger.info("Airavata Server started on port {}",
serverPort);
logger.info("Registered services: Airavata,
RegistryService, SharingRegistry, "
+ "CredentialStore, UserProfile,
TenantProfile, IamAdminServices, GroupManager");
}
@@ -210,7 +210,7 @@ public class AiravataUnifiedServer implements IServer {
.start();
} catch (TTransportException | ApplicationSettingsException e) {
- logger.error("Failed to start Airavata Unified Server", e);
+ logger.error("Failed to start Airavata Server", e);
setStatus(ServerStatus.FAILED);
throw new
AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
}
@@ -255,9 +255,9 @@ public class AiravataUnifiedServer implements IServer {
public static void main(String[] args) {
try {
- new AiravataUnifiedServer().start();
+ new AiravataServer().start();
} catch (Exception e) {
- logger.error("Error starting Airavata Unified Server", e);
+ logger.error("Error starting Airavata Server", e);
}
}
}
diff --git a/airavata-api/src/main/resources/airavata-server.properties
b/airavata-api/src/main/resources/airavata-server.properties
index 685a329151..e5e30f3f49 100644
--- a/airavata-api/src/main/resources/airavata-server.properties
+++ b/airavata-api/src/main/resources/airavata-server.properties
@@ -24,9 +24,9 @@ api.server.monitoring.host=localhost
api.server.monitoring.port=9097
apiserver.host=0.0.0.0
apiserver.port=8930
-apiserver.class=org.apache.airavata.api.server.AiravataUnifiedServer
+apiserver.class=org.apache.airavata.api.server.AiravataServer
-# Unified Database Configuration
+# Database Configuration
airavata.jdbc.driver=org.mariadb.jdbc.Driver
airavata.jdbc.url=jdbc:mariadb://localhost:13306/airavata
airavata.jdbc.user=airavata
diff --git a/airavata-api/src/main/resources/distribution/bin/airavata.sh
b/airavata-api/src/main/resources/distribution/bin/airavata-server.sh
similarity index 55%
rename from airavata-api/src/main/resources/distribution/bin/airavata.sh
rename to airavata-api/src/main/resources/distribution/bin/airavata-server.sh
index 9121bf92cd..15c08deb97 100644
--- a/airavata-api/src/main/resources/distribution/bin/airavata.sh
+++ b/airavata-api/src/main/resources/distribution/bin/airavata-server.sh
@@ -2,4 +2,4 @@
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "$SCRIPT_DIR/setenv.sh"
-run_service "airavata" "org.apache.airavata.api.server.AiravataUnifiedServer"
"$@"
+run_service "airavata" "org.apache.airavata.api.server.AiravataServer" "$@"
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 5066843111..55a705b7a2 100644
--- a/dev-tools/ansible/inventories/dev/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/dev/group_vars/all/vars.yml
@@ -32,7 +32,7 @@ research_service_port: 18899
file_server_port: 8050
restproxy_port: 8082
-# Database name (single unified database)
+# Database name (single database)
db_name: "airavata"
app_catalog: "{{ db_name }}"
exp_catalog: "{{ db_name }}"
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 7814946c34..4583816fc3 100644
--- a/dev-tools/ansible/inventories/staging/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/staging/group_vars/all/vars.yml
@@ -32,7 +32,7 @@ research_service_port: 18899
file_server_port: 8050
restproxy_port: 8082
-# Database name (single unified database)
+# Database name (single database)
db_name: "airavata"
app_catalog: "{{ db_name }}"
exp_catalog: "{{ db_name }}"
diff --git a/dev-tools/ansible/roles/airavata_services/defaults/main.yml
b/dev-tools/ansible/roles/airavata_services/defaults/main.yml
index 08fb811237..c15e48aa4e 100644
--- a/dev-tools/ansible/roles/airavata_services/defaults/main.yml
+++ b/dev-tools/ansible/roles/airavata_services/defaults/main.yml
@@ -62,10 +62,10 @@ participant_monitoring_host: "airavata.localhost"
pre_workflow_manager_monitoring_host: "airavata.localhost"
post_workflow_manager_monitoring_host: "airavata.localhost"
-# All services run on unified server (no separate server hosts needed)
+# All services run on Airavata server (no separate server hosts needed)
-# Unified Server (replaces separate service configurations)
-unified_server_class: "org.apache.airavata.api.server.AiravataUnifiedServer"
+# Airavata Server (replaces separate service configurations)
+airavata_server_class: "org.apache.airavata.api.server.AiravataServer"
enable_sharing: true
# Default registry user
diff --git
a/dev-tools/ansible/roles/airavata_services/tasks/deploy_api_server.yml
b/dev-tools/ansible/roles/airavata_services/tasks/deploy_api_server.yml
index 24096c3ca0..1e23ccff7b 100644
--- a/dev-tools/ansible/roles/airavata_services/tasks/deploy_api_server.yml
+++ b/dev-tools/ansible/roles/airavata_services/tasks/deploy_api_server.yml
@@ -118,12 +118,12 @@
- deploy
- api-server
-- name: Set executable permissions on Unified Server script
+- name: Set executable permissions on Airavata Server script
file:
path: "{{ api_server_dir }}/bin/{{ item }}"
mode: "0755"
loop:
- - unified-server.sh
+ - airavata-server.sh
tags:
- deploy
- api-server
diff --git a/dev-tools/ansible/roles/airavata_services/tasks/start_services.yml
b/dev-tools/ansible/roles/airavata_services/tasks/start_services.yml
index 97ce3fa294..3420e5928e 100644
--- a/dev-tools/ansible/roles/airavata_services/tasks/start_services.yml
+++ b/dev-tools/ansible/roles/airavata_services/tasks/start_services.yml
@@ -18,15 +18,15 @@
# under the License.
#
-- name: Start Airavata Unified Server
- shell: '{{ api_server_dir }}/bin/unified-server.sh -d start'
+- name: Start Airavata Airavata Server
+ shell: '{{ api_server_dir }}/bin/airavata-server.sh -d start'
args:
chdir: '{{ api_server_dir }}'
tags:
- start
- api-server
-- name: Wait for Airavata Unified Server to be ready
+- name: Wait for Airavata Airavata Server to be ready
wait_for:
port: '{{ api_server_port }}'
host: '{{ api_server_host }}'
diff --git a/dev-tools/ansible/roles/airavata_services/tasks/stop_services.yml
b/dev-tools/ansible/roles/airavata_services/tasks/stop_services.yml
index 791481ca26..46a050a3d0 100644
--- a/dev-tools/ansible/roles/airavata_services/tasks/stop_services.yml
+++ b/dev-tools/ansible/roles/airavata_services/tasks/stop_services.yml
@@ -19,16 +19,16 @@
#
---
-- name: Check if Unified Server binary exists
+- name: Check if Airavata Server binary exists
stat:
- path: "{{ api_server_dir }}/bin/unified-server.sh"
- register: unified_server_exists
+ path: "{{ api_server_dir }}/bin/airavata-server.sh"
+ register: airavata_server_exists
tags:
- stop
-- name: Stop Airavata Unified Server if exists
- shell: "{{ api_server_dir }}/bin/unified-server.sh -d stop"
- when: unified_server_exists.stat.exists
+- name: Stop Airavata Airavata Server if exists
+ shell: "{{ api_server_dir }}/bin/airavata-server.sh -d stop"
+ when: airavata_server_exists.stat.exists
tags:
- stop
ignore_errors: yes
@@ -99,7 +99,7 @@
set_fact:
airavata_ports:
- port: "{{ api_server_port }}"
- service: "Unified Server"
+ service: "Airavata Server"
- port: "{{ participant_monitoring_port }}"
service: "Participant Monitoring"
- port: "{{ api_server_monitoring_port }}"
@@ -198,7 +198,7 @@
- name: Define Airavata service log directories
set_fact:
airavata_log_dirs:
- - { service: "Unified Server", path: "{{ api_server_dir }}/logs" }
+ - { service: "Airavata Server", path: "{{ api_server_dir }}/logs" }
when: archive_logs_on_stop | bool
- name: Check log directories
diff --git a/dev-tools/deployment-scripts/airavata-server.properties
b/dev-tools/deployment-scripts/airavata-server.properties
index 7b1370d4a8..98ad14b890 100644
--- a/dev-tools/deployment-scripts/airavata-server.properties
+++ b/dev-tools/deployment-scripts/airavata-server.properties
@@ -23,7 +23,7 @@
############################
############################
-# Unified Database Configuration
+# Database Configuration
############################
airavata.jdbc.driver=org.mariadb.jdbc.Driver
airavata.jdbc.url=jdbc:mariadb://mysql:3306/airavata
@@ -199,9 +199,9 @@ enable.application.catalog=true
application.deployment.directory=/opt/airavata/applications
############################
-# Unified Server Configuration
+# Airavata Server Configuration
############################
-# All Thrift services are multiplexed on the unified server port (8930)
+# All Thrift services are multiplexed on the Airavata server port (8930)
# No separate per-service host/port configurations needed
enable.orchestrator=true
enable.gfac=true
diff --git a/dev-tools/deployment-scripts/docker-startup.sh
b/dev-tools/deployment-scripts/docker-startup.sh
index 71d2f9b65a..ddeb851a4e 100644
--- a/dev-tools/deployment-scripts/docker-startup.sh
+++ b/dev-tools/deployment-scripts/docker-startup.sh
@@ -5,7 +5,7 @@ set -e
# Set Airavata configuration directory
export AIRAVATA_CONFIG_DIR=/opt/airavata/vault
-echo "🚀 Starting Apache Airavata Unified Server..."
+echo "🚀 Starting Apache Airavata Server..."
echo "📋 Single JVM server with all Thrift services multiplexed on port 8930"
echo "📁 Properties file location:
/opt/airavata/vault/airavata-server.properties"
echo "📁 Configuration directory: $AIRAVATA_CONFIG_DIR"
@@ -66,14 +66,14 @@ start_service() {
}
# ================================
-# Start the Unified Server
+# Start the Airavata Server
# ================================
-log "🔧 Starting Airavata Unified Server..."
+log "🔧 Starting Airavata Server..."
cd ${AIRAVATA_HOME}
-# Start unified server - single JVM with all services multiplexed on port 8930
-start_service "Airavata Unified" "./bin/unified-server.sh"
"${AIRAVATA_HOME}/logs/unified-server.log"
+# Start Airavata server - single JVM with all services multiplexed on port 8930
+start_service "Airavata Server" "./bin/airavata-server.sh"
"${AIRAVATA_HOME}/logs/airavata-server.log"
# ================================
# Start the Agent Service (Optional)
@@ -114,14 +114,14 @@ fi
# ================================
# Monitor logs and keep container running
# ================================
-log "🎉 Airavata Unified Server started successfully!"
+log "🎉 Airavata Server started successfully!"
log "📊 Starting log monitoring..."
# Wait a moment for server to initialize
sleep 5
# Stream server logs to docker logs and keep container running
-echo "🚀 Airavata Unified Server is running on port 8930!"
+echo "🚀 Airavata Server is running on port 8930!"
echo "📋 Server status:"
echo " - Single JVM with all Thrift services multiplexed"
echo " - Services: Airavata, RegistryService, SharingRegistry,
CredentialStore"
@@ -157,15 +157,15 @@ monitor_log() {
}
# Wait a moment for log file to be created
-echo "📊 Waiting for unified server log file to be created..."
+echo "📊 Waiting for Airavata server log file to be created..."
sleep 5
-# Start monitoring unified server logs
-echo "📊 Starting log monitoring for unified server..."
+# Start monitoring Airavata server logs
+echo "📊 Starting log monitoring for Airavata server..."
cd ${AIRAVATA_HOME}
-# Monitor unified server logs
-monitor_log "${AIRAVATA_HOME}/logs/unified-server.log" "Unified-Server"
+# Monitor Airavata server logs
+monitor_log "${AIRAVATA_HOME}/logs/airavata-server.log" "Airavata-Server"
echo "📊 Log monitoring started!"
echo "🔍 Use 'docker logs -f airavata-monolithic' to view server logs"
@@ -173,11 +173,11 @@ echo "🔍 Use 'docker logs -f airavata-monolithic' to view
server logs"
# Keep container running and show periodic status
while true; do
sleep 300 # Check every 5 minutes
- echo "[Status] $(date): Container active, monitoring unified server logs"
+ echo "[Status] $(date): Container active, monitoring Airavata server logs"
- # Check if unified server process is still running
- if ! pgrep -f "AiravataUnifiedServer" > /dev/null; then
- echo "[WARNING] Unified server process not found"
+ # Check if Airavata server process is still running
+ if ! pgrep -f "AiravataServer" > /dev/null; then
+ echo "[WARNING] Airavata server process not found"
fi
# Show number of running tail processes
diff --git a/dev-tools/deployment-scripts/services_down.sh
b/dev-tools/deployment-scripts/services_down.sh
index e933bf3561..d00fbf8123 100644
--- a/dev-tools/deployment-scripts/services_down.sh
+++ b/dev-tools/deployment-scripts/services_down.sh
@@ -5,11 +5,11 @@ log() {
}
# ================================
-# Shutdown the Unified Server
+# Shutdown the Airavata Server
# ================================
-log "Stopping the Airavata Unified Server..."
-./apache-airavata-api-server-0.21-SNAPSHOT/bin/unified-server.sh -d stop
-log "Unified Server stopped."
+log "Stopping the Airavata Server..."
+./apache-airavata-api-server-0.21-SNAPSHOT/bin/airavata-server.sh -d stop
+log "Airavata Server stopped."
# ================================
# Shutdown the Agent Service
diff --git a/dev-tools/deployment-scripts/services_up.sh
b/dev-tools/deployment-scripts/services_up.sh
index de35716973..f1e950e97e 100644
--- a/dev-tools/deployment-scripts/services_up.sh
+++ b/dev-tools/deployment-scripts/services_up.sh
@@ -6,11 +6,11 @@ log() {
}
# ================================
-# Start the Unified Server
+# Start the Airavata Server
# ================================
-log "Starting the Airavata Unified Server..."
-./apache-airavata-api-server-0.21-SNAPSHOT/bin/unified-server.sh -d start
-log "Unified Server started."
+log "Starting the Airavata Server..."
+./apache-airavata-api-server-0.21-SNAPSHOT/bin/airavata-server.sh -d start
+log "Airavata Server started."
# ================================
# Start the Agent Service
diff --git a/scripts/start.sh b/scripts/start.sh
index c1f719d704..8f1fc421f8 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -15,5 +15,5 @@ fi
# Build classpath
CP=$(cat
airavata-api/target/cp.txt):airavata-api/target/airavata-api-0.21-SNAPSHOT.jar
-echo "Starting Airavata Unified Server..."
-java -cp "$CP" org.apache.airavata.api.server.AiravataUnifiedServer "$@"
+echo "Starting Airavata Server..."
+java -cp "$CP" org.apache.airavata.api.server.AiravataServer "$@"
