(airavata) branch feat/single-jvm updated: feat: register Orchestrator service, fix setup script

[yasith]

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 48928917e0 feat: register Orchestrator service, fix setup script
48928917e0 is described below

commit 48928917e076d588fc607a85b0641ab359f95019
Author: yasithdev <yasit...@icloud.com>
AuthorDate: Thu Mar 26 01:46:45 2026 -0500

    feat: register Orchestrator service, fix setup script
    
    - Add OrchestratorService to TMultiplexedProcessor (optional,
      graceful failure if ZooKeeper not available)
    - Fix setup.sh to use mvn instead of ./mvnw
    - 9 services now registered on port 8930
    
    Note: module services (agent-service, file-server, research-service)
    are separate Spring Boot apps that run independently.
---
 .../apache/airavata/api/server/AiravataUnifiedServer.java   | 13 +++++++++++++
 scripts/setup.sh                                            |  4 ++--
 2 files changed, 15 insertions(+), 2 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/AiravataUnifiedServer.java
index e4d8eea2b8..0faf762641 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/AiravataUnifiedServer.java
@@ -31,6 +31,8 @@ import org.apache.airavata.common.utils.DBInitializer;
 import org.apache.airavata.common.utils.IServer;
 import org.apache.airavata.common.utils.ServerSettings;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
+import org.apache.airavata.orchestrator.cpi.OrchestratorService;
+import org.apache.airavata.orchestrator.server.OrchestratorServerHandler;
 import 
org.apache.airavata.credential.store.server.CredentialStoreServerHandler;
 import org.apache.airavata.model.error.AiravataErrorType;
 import org.apache.airavata.model.error.AiravataSystemException;
@@ -159,6 +161,17 @@ public class AiravataUnifiedServer implements IServer {
                     group_manager_cpiConstants.GROUP_MANAGER_CPI_NAME,
                     new GroupManagerService.Processor<>(new 
GroupManagerServiceHandler()));
 
+            // Orchestrator service
+            try {
+                OrchestratorServerHandler orchestratorHandler = new 
OrchestratorServerHandler();
+                multiplexedProcessor.registerProcessor(
+                        "Orchestrator", new 
OrchestratorService.Processor<>(orchestratorHandler));
+                logger.info("Orchestrator service registered");
+            } catch (Exception e) {
+                logger.warn("Orchestrator service failed to initialize 
(ZooKeeper/Helix may not be available): {}",
+                        e.getMessage());
+            }
+
             // --- Transport and server ---
             TServerTransport serverTransport;
             if (serverHost == null) {
diff --git a/scripts/setup.sh b/scripts/setup.sh
index acc24b711d..bac77e9b4d 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -44,11 +44,11 @@ fi
 # 3. Build
 echo "Building Airavata..."
 cd "$ROOT_DIR/airavata-api"
-./mvnw package -DskipTests -q 2>&1 | tail -1
+mvn package -DskipTests -q 2>&1 | tail -1
 echo "  Build complete"
 
 # 4. Build classpath
-./mvnw dependency:build-classpath -q -Dmdep.outputFile=target/cp.txt 
2>/dev/null
+mvn dependency:build-classpath -q -Dmdep.outputFile=target/cp.txt 2>/dev/null
 
 echo ""
 echo "=== Setup Complete ==="