You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2025/04/24 09:08:46 UTC
(airavata) 07/07: fix api server assembly after the dependency update.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit eec2402b5bdc1b22b57319ec3eefdf3f0c7b197d
Author: yasith <ya...@icloud.com>
AuthorDate: Thu Apr 24 03:23:32 2025 -0500
fix api server assembly after the dependency update.
---
.../profile-service-commons/pom.xml | 21 --
.../profile-service/profile-tenant-core/pom.xml | 1 -
.../profile-service/profile-user-core/pom.xml | 1 -
modules/commons/pom.xml | 28 +-
.../src/main/resources/airavata-server.properties | 299 ++++++++-------------
.../server/src/main/resources/logback.xml | 53 ++++
.../credential-store-service/pom.xml | 23 --
modules/distribution/pom.xml | 20 --
.../src/main/assembly/api-server-bin-assembly.xml | 29 +-
.../src/main/assembly/api-server-src-assembly.xml | 78 ------
modules/orchestrator/orchestrator-core/pom.xml | 15 --
modules/registry/registry-core/pom.xml | 16 --
.../registry/registry-tools/registry-tool/pom.xml | 16 --
.../org/apache/airavata/server/ServerMain.java | 9 +-
pom.xml | 22 +-
15 files changed, 200 insertions(+), 431 deletions(-)
diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml
index 9171f2593a..2b57061cbe 100644
--- a/airavata-services/profile-service/profile-service-commons/pom.xml
+++ b/airavata-services/profile-service/profile-service-commons/pom.xml
@@ -33,7 +33,6 @@
<description>Module to expose a profile-service-commons as a thrift service</description>
<properties>
- <derby.version>10.11.1.1</derby.version>
<surefire.version>2.18.1</surefire.version>
<skipTests>true</skipTests>
<mysql.connector.version>8.0.31</mysql.connector.version>
@@ -64,26 +63,6 @@
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
</dependencies>
<build>
diff --git a/airavata-services/profile-service/profile-tenant-core/pom.xml b/airavata-services/profile-service/profile-tenant-core/pom.xml
index baeb2f7c7c..ae1fc2f8a5 100644
--- a/airavata-services/profile-service/profile-tenant-core/pom.xml
+++ b/airavata-services/profile-service/profile-tenant-core/pom.xml
@@ -33,7 +33,6 @@
<name>Profile Gateway Core</name>
<properties>
- <derby.version>10.11.1.1</derby.version>
<surefire.version>2.18.1</surefire.version>
<skipTests>false</skipTests>
<mysql.connector.version>8.0.31</mysql.connector.version>
diff --git a/airavata-services/profile-service/profile-user-core/pom.xml b/airavata-services/profile-service/profile-user-core/pom.xml
index e9ad70d589..42c7f51353 100644
--- a/airavata-services/profile-service/profile-user-core/pom.xml
+++ b/airavata-services/profile-service/profile-user-core/pom.xml
@@ -33,7 +33,6 @@
<name>Profile User Core</name>
<properties>
- <derby.version>10.11.1.1</derby.version>
<surefire.version>2.18.1</surefire.version>
<skipTests>false</skipTests>
<mysql.connector.version>8.0.31</mysql.connector.version>
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 1616f0c472..ca72a5c386 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -64,22 +64,6 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
@@ -154,6 +138,18 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <scope>test</scope>
+ <version>${derby.version}</version>
+ </dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 681e698435..023e0bcd43 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -29,101 +29,89 @@
# API Server Registry Configuration
###########################################################################
-#for derby [AiravataJPARegistry]
-registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-registry.jdbc.url=jdbc:derby:experiment_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-#registry.jdbc.driver=org.mariadb.jdbc.Driver
-#registry.jdbc.url=jdbc:mariadb://localhost:3306/experiment_catalog
-registry.jdbc.user=airavata
-registry.jdbc.password=airavata
+registry.jdbc.driver=org.mariadb.jdbc.Driver
+registry.jdbc.url=jdbc:mariadb://localhost:13306/experiment_catalog
+registry.jdbc.user=root
+registry.jdbc.password=123456
#FIXME: Probably the following property should be removed.
start.derby.server.mode=false
validationQuery=SELECT 1 from CONFIGURATION
-cache.enable=true
-jpa.cache.size=5000
+cache.enable=false
+jpa.cache.size=-1
#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
enable.sharing=true
# Properties for default user mode
-default.registry.user=admin
-default.registry.password=admin
+default.registry.user=default-admin
+default.registry.password=ade4#21242ftfd
default.registry.password.hash.method=SHA
-default.registry.gateway=php_reference_gateway
-super.tenant.gatewayId=php_reference_gateway
+default.registry.gateway=default
+default.registry.oauth.client.id=pga
+default.registry.oauth.client.secret=GtRMiIQG5UJJdmmeM6iQS0BZR4Yj0gbt
+super.tenant.gatewayId=default
# Properties for cluster status monitoring
# cluster status monitoring job repeat time in seconds
-#cluster.status.monitoring.enable=false
+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:app_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-#appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-#appcatalog.jdbc.url=jdbc:mariadb://localhost:3306/app_catalog
-appcatalog.jdbc.user=airavata
-appcatalog.jdbc.password=airavata
+appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+appcatalog.jdbc.url=jdbc:mariadb://localhost:13306/app_catalog
+appcatalog.jdbc.user=root
+appcatalog.jdbc.password=123456
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:replica_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-#replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-#replicacatalog.jdbc.url=jdbc:mariadb://localhost:3306/replica_catalog
-replicacatalog.jdbc.user=airavata
-replicacatalog.jdbc.password=airavata
+replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
+replicacatalog.jdbc.url=jdbc:mariadb://localhost:13306/replica_catalog
+replicacatalog.jdbc.user=root
+replicacatalog.jdbc.password=123456
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:workflow_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-#workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-#workflowcatalog.jdbc.url=jdbc:mariadb://localhost:3306/workflow_catalog
-workflowcatalog.jdbc.user=airavata
-workflowcatalog.jdbc.password=airavata
+workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+workflowcatalog.jdbc.url=jdbc:mariadb://localhost:13306/workflow_catalog
+workflowcatalog.jdbc.user=root
+workflowcatalog.jdbc.password=123456
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:sharing_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-#sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-#sharingcatalog.jdbc.url=jdbc:mariadb://localhost:3306/sharing_catalog
-sharingcatalog.jdbc.user=airavata
-sharingcatalog.jdbc.password=airavata
+sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+sharingcatalog.jdbc.url=jdbc:mariadb://localhost:13306/sharing_catalog
+sharingcatalog.jdbc.user=root
+sharingcatalog.jdbc.password=123456
sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
###########################################################################
# Sharing Registry Server Configuration
###########################################################################
sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
-sharing.registry.server.host=localhost
+sharing.registry.server.host=0.0.0.0
sharing.registry.server.port=7878
-# tls enable is supported only in standalone sharing registry server mode
-#(nsg-cipres) usecase
sharing.tls.enabled=false
-
+
+###########################################################################
+# User Profile MongoDB Configuration
+###########################################################################
+userprofile.mongodb.host=localhost
+userprofile.mongodb.port=27017
+
+
###########################################################################
# Server module Configuration
###########################################################################
#credential store server should be started before API server
-servers=credentialstore,apiserver,orchestrator,gfac
+#This is obsolete property with new script files.
+#servers=credentialstore,apiserver,orchestrator
###########################################################################
@@ -131,23 +119,16 @@ servers=credentialstore,apiserver,orchestrator,gfac
###########################################################################
apiserver=org.apache.airavata.api.server.AiravataAPIServer
apiserver.name=apiserver-node0
-apiserver.host=localhost
+apiserver.host=0.0.0.0
apiserver.port=8930
apiserver.min.threads=50
-###########################################################################
-# API Server SSL Configurations
-###########################################################################
-apiserver.tls.enabled=false
-apiserver.keystore=/path/to/airavata.jks
-apiserver.keystore.password=airavata
-
###########################################################################
# Orchestrator Server Configurations
###########################################################################
orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
orchestrator.server.name=orchestrator-node0
-orchestrator.server.host=localhost
+orchestrator.server.host=0.0.0.0
orchestrator.server.port=8940
orchestrator.server.min.threads=50
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
@@ -156,27 +137,14 @@ threadpool.size=10
start.submitter=true
embedded.mode=true
enable.validation=true
-
-
-###########################################################################
-# GFac Server Configurations
-###########################################################################
-gfac=org.apache.airavata.gfac.server.GfacServer
-gfac.server.name=gfac-node0
-gfac.server.host=localhost
-gfac.server.port=8950
-gfac.thread.pool.size=50
host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
-# ssh session access timeout in minutes default is 30 minutes
-#ssh.session.cache.access.timeout=30
-
###########################################################################
# Registry Server Configurations
###########################################################################
regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
regserver.server.name=regserver-node0
-regserver.server.host=localhost
+regserver.server.host=0.0.0.0
regserver.server.port=8970
regserver.server.min.threads=50
@@ -187,18 +155,6 @@ regserver.server.min.threads=50
workflowserver=org.apache.airavata.api.server.WorkflowServer
enactment.thread.pool.size=10
-#to define custom workflow parser user following property
-#workflow.parser=org.apache.airavata.workflow.core.parser.AiravataWorkflowBuilder
-
-
-
-###########################################################################
-# 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
-# of the characters "a" (send mail when job is aborted), "b" (send mail when job begins),
-# and "e" (send mail when job terminates). The default is "a" if not specified.
-###########################################################################
-
job.notification.enable=true
#Provide comma separated email ids as a string if more than one
job.notification.emailids=
@@ -207,19 +163,17 @@ job.notification.flags=abe
###########################################################################
# Credential Store module Configuration
###########################################################################
-credential.store.keystore.url=../../../airavata_sym.jks
+credential.store.keystore.url=keystores/airavata_sym.jks
credential.store.keystore.alias=airavata
credential.store.keystore.password=airavata
-credential.store.jdbc.url=jdbc:derby:credential-store;create=true;user=airavata;password=airavata
-credential.store.jdbc.user=airavata
-credential.store.jdbc.password=airavata
-credential.store.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-#credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-#credential.store.jdbc.url=jdbc:mariadb://localhost:3306/credential_store
+credential.store.jdbc.url=jdbc:mariadb://localhost:13306/credential_store
+credential.store.jdbc.user=root
+credential.store.jdbc.password=123456
+credential.store.jdbc.driver=org.mariadb.jdbc.Driver
credential.store.server.host=localhost
credential.store.server.port=8960
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
@@ -229,94 +183,37 @@ email.password=xxx
email.ssl=true
email.from=airavata@apache.org
-# 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
-
-################# ---------- For ssh key pair sshKeyAuthentication ------------------- ################
-#ssh.public.key=/path to public key for ssh
-#ssh.private.key=/path to private key file for ssh
-#ssh.keypass=passphrase for the private key
-#ssh.username=username for ssh connection
-## If you set "yes" for ssh.strict.hostKey.checking, then you must provide known hosts file path
-#ssh.strict.hostKey.checking=yes/no
-#ssh.known.hosts.file=/path to known hosts file
-### Incase of password sshKeyAuthentication.
-#ssh.password=Password for ssh connection
-
-################ ---------- BES Properties ------------------- ###############
-#bes.ca.cert.path=<location>/certificates/cacert.pem
-#bes.ca.key.path=<location>/certificates/cakey.pem
-#bes.ca.key.pass=passphrase
-
-###########################################################################
-# Monitoring module Configuration
-###########################################################################
-
-#This will be the primary monitoring tool which runs in airavata, in future there will be multiple monitoring
-#mechanisms and one would be able to start a monitor
-monitors=org.apache.airavata.gfac.monitor.impl.pull.qstat.QstatMonitor,org.apache.airavata.gfac.monitor.impl.LocalJobMonitor
-
-#These properties will used to enable email base monitoring
-email.based.monitor.host=imap.gmail.com
-email.based.monitor.address=test@scigap.com
-email.based.monitor.password=changeme
-email.based.monitor.folder.name=INBOX
-# either imaps or pop3
-email.based.monitor.store.protocol=imaps
-#These property will be used to query the email server periodically. value in milliseconds(ms).
-email.based.monitoring.period=10000
-
-###########################################################################
-# AMQP Notification Configuration
-###########################################################################
-#for simple scenarios we can use the guest user
-#rabbitmq.broker.url=amqp://localhost:5672
-#for production scenarios, give url as amqp://userName:password@hostName:portNumber/virtualHost, create user, virtualhost
-# and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
-rabbitmq.broker.url=amqp://airavata:airavata@149.165.228.91:5672/messaging
+rabbitmq.broker.url=amqp://guest:guest@localhost: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
+experiment.launch..queue.name=experiment.launch.queue
###########################################################################
# Zookeeper Server Configuration
###########################################################################
-embedded.zk=true
+embedded.zk=false
zookeeper.server.connection=localhost:2181
zookeeper.timeout=30000
-###########################################################################
-# Aurora Scheduler Configuration
-###########################################################################
-aurora.scheduler.hosts=sgg-mesos-master-1:8081,sgg-mesos-master-2:8081,sgg-mesos-master-3:8081
-aurora.scheduler.timeoutms=1000
-aurora.executor.name=AuroraExecutor
-mesos.cluster.name=example
-aurora.executor.config.template.filename=executor-config-template.json
-
########################################################################
## API Security Configuration
########################################################################
-api.secured=false
-security.manager.class=org.apache.airavata.api.server.security.DefaultAiravataSecurityManager
+api.secured=true
+security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
### TLS related configuration ####
-TLS.enabled=false
+TLS.enabled=true
TLS.api.server.port=9930
TLS.client.timeout=10000
#### keystore configuration ####
-keystore.path=airavata.jks
+keystore.path=keystores/airavata.jks
keystore.password=airavata
#### trust store configuration ####
-# trust.store=client_truststore.jks
-# trust.store.password=airavata
-#### remote authorization server url ####
-remote.oauth.authorization.server=https://idp.scigap.org:9443/services/
-#### xacml based authorization policy ####
-authorization.policy=airavata-default-xacml-policy
+trust.store=keystores/client_truststore.jks
+trust.store.password=airavata
#### authorization cache related configuration ####
authz.cache.enabled=true
authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
@@ -331,55 +228,75 @@ enable.kafka.logging=false
###########################################################################
# Profile Service Configuration
###########################################################################
-profile.service.server.host=localhost
+profile.service.server.host=0.0.0.0
profile.service.server.port=8962
profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
-# derby properties
-profile.service.jdbc.url=jdbc:derby:profile_service;create=true;user=airavata;password=airavata
-profile.service.jdbc.driver=org.apache.derby.jdbc.ClientDriver
# MariaDB properties
-#profile.service.jdbc.url=jdbc:mariadb://localhost:3306/profile_service
-#profile.service.jdbc.driver=org.mariadb.jdbc.Driver
-profile.service.jdbc.user=airavata
-profile.service.jdbc.password=airavata
-# add validationquery only if db has been initialized during server startup,
-# and tables have been created. for now commenting out.
-#profile.service.validationQuery=SELECT 1
+profile.service.jdbc.url=jdbc:mariadb://localhost:13306/profile_service
+profile.service.jdbc.user=root
+profile.service.jdbc.password=123456
+profile.service.jdbc.driver=org.mariadb.jdbc.Driver
+profile.service.validationQuery=SELECT 1
###########################################################################
# Iam Admin services Configuration
###########################################################################
-iam.server.url=https://iam.scigap.org/auth
+iam.server.url=https://auth.cybershuttle.org
iam.server.super.admin.username=admin
-iam.server.super.admin.password=password
+iam.server.super.admin.password=AhHOj1sJG4i5Tkk8r@TjM
###########################################################################
# DB Event Manager Runner
###########################################################################
db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
+###########################################################################
+# Job Execution Engine related properties
+###########################################################################
+helix.cluster.name=AiravataCluster
+helix.controller.name=AiravataController
+helix.participant.name=AiravataParticipant
+pre.workflow.manager.name=AiravataPreWM
+post.workflow.manager.name=AiravataPostWM
+kafka.broker.url=airavata.host:9092
+job.monitor.broker.url=airavata.host:9092
+kafka.broker.consumer.group=MonitoringConsumer
+kafka.broker.topic=monitoring-data
+
+###########################################################################
+# Job Monitor related properties
+###########################################################################
+enable.realtime.monitor=False
+job.monitor.broker.publisher.id=AiravataMonitorPublisher
+job.monitor.broker.topic=monitoring-data
+email.based.monitor.host=imap.gmail.com
+email.based.monitor.store.protocol=imaps
+email.based.monitor.folder.name=INBOX
+email.expiration.minutes=60
+email.based.monitoring.period=10000
+
+email.based.monitor.address=monitoring.airavata@gmail.com
+email.based.monitor.password=airavata.lahiru@
+
###########################################################################
# ThriftClientPool Configuration
###########################################################################
-thrift.client.pool.abandoned.removal.enabled=false
+thrift.client.pool.abandoned.removal.enabled=true
+
+
+###########################################################################
+# WorkFlow Configuration
+###########################################################################
+pre.workflow.manager.loadbalance.clusters=false
+post.workflow.manager.loadbalance.clusters=false
+
###########################################################################
# Metascheduler And Compute Resource Monitoring Configuration
###########################################################################
-cluster.status.monitoring.enable=True
-compute.resource.selection.policy.class=org.apache.airavata.metascheduler.process.scheduling.engine.cr.selection.MultipleComputeResourcePolicy
-metascheduler.gateway=
-metascheduler.group.resource.profile=
-metascheduler.username=metascheacc
-cluster.scanning.interval=7800
-cluster.scanning.parallel.jobs=1
-metaschedluer.job.scanning.enable=True
-metascheduler.maximum.rescheduler.threshold = 5
-compute.resource.rescheduler.policy.class =org.apache.airavata.metascheduler.process.scheduling.engine.rescheduler.ExponentialBackOffReScheduler
-data.analyzer.scanning.interval=3600
-data.analyzer.scanning.parallel.jobs=1
-data.analyzer.enabled.gateways=
-data.analyzer.time.step.seconds=5
-data.analyzer.job.scanning.enable=False
-metascheduler.multiple.cr.enabling.factor=1
+metaschedluer.job.scanning.enable=false
+data.analyzer.job.scanning.enable=false
+api.server.monitoring.enabled=True
+api.server.monitoring.host=0.0.0.0
+api.server.monitoring.port=9097
diff --git a/modules/configuration/server/src/main/resources/logback.xml b/modules/configuration/server/src/main/resources/logback.xml
new file mode 100644
index 0000000000..e2cf4fb4ef
--- /dev/null
+++ b/modules/configuration/server/src/main/resources/logback.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ 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.
+
+-->
+<configuration>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d [%thread] %-5level %logger{30} %X - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>../logs/airavata.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>logs/%d{yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz</fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>20</maxHistory>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d [%thread] %-5level %logger{30} %X - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="ch.qos.logback" level="WARN"/>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+
+ <root level="INFO">
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index 585f2ffe72..3c02b217ba 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -54,35 +54,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 7dc54ff74f..9b3c4ede3f 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -34,26 +34,6 @@
<name>Airavata server distribution</name>
<packaging>pom</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
diff --git a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
index af0ea0d552..41075e685f 100644
--- a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
@@ -121,7 +121,7 @@
<include>airavata-server.properties</include>
<include>zoo.cfg</include>
<include>registry.properties</include>
- <include>log4j2.xml</include>
+ <include>logback.xml</include>
<include>host.xml</include>
<include>persistence.xml</include>
<include>provenance.sql</include>
@@ -155,24 +155,40 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>org.apache.derby:derbynet:jar</include>
- <include>org.apache.derby:derbyclient:jar</include>
+ <include>org.mariadb.jdbc:mariadb-java-client:jar</include>
</includes>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
+
<include>jakarta.activation:jakarta.activation-api:jar</include>
+ <include>org.apache.airavata:airavata-api-server:jar</include>
<include>org.apache.airavata:airavata-base-api:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
+ <include>org.apache.airavata:airavata-credential-store:jar</include>
+ <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
<include>org.apache.airavata:airavata-messaging-core:jar</include>
+ <include>org.apache.airavata:airavata-orchestrator-client:jar</include>
+ <include>org.apache.airavata:airavata-orchestrator-core:jar</include>
+ <include>org.apache.airavata:airavata-orchestrator-service:jar</include>
<include>org.apache.airavata:airavata-registry-core:jar</include>
<include>org.apache.airavata:airavata-registry-cpi:jar</include>
+ <include>org.apache.airavata:airavata-security:jar</include>
<include>org.apache.airavata:airavata-server-configuration:jar</include>
+ <include>org.apache.airavata:airavata-sharing-registry-server:jar</include>
+ <include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
+ <include>org.apache.airavata:airavata-standalone-server:jar</include>
+ <include>org.apache.airavata:db-event-manager:jar</include>
+ <include>org.apache.airavata:platform-monitoring:jar</include>
+ <include>org.apache.airavata:registry-api-service:jar</include>
+ <include>org.apache.airavata:registry-api-stubs:jar</include>
+ <include>io.prometheus:simpleclient:jar</include>
+ <include>io.prometheus:simpleclient_hotspot:jar</include>
+ <include>io.prometheus:simpleclient_httpserver:jar</include>
+ <include>io.prometheus:simpleclient_pushgateway:jar</include>
<include>com.rabbitmq:amqp-client:jar</include>
<include>org.bouncycastle:bcpkix-jdk18on:jar</include>
<include>commons-cli:commons-cli:jar</include>
@@ -192,6 +208,9 @@
<include>org.apache.kafka:kafka-clients:jar</include>
<include>org.apache.thrift:libthrift:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>ch.qos.logback:logback-classic:jar</include>
+ <include>ch.qos.logback:logback-core:jar</include>
</includes>
</dependencySet>
diff --git a/modules/distribution/src/main/assembly/api-server-src-assembly.xml b/modules/distribution/src/main/assembly/api-server-src-assembly.xml
deleted file mode 100644
index ba27b2f102..0000000000
--- a/modules/distribution/src/main/assembly/api-server-src-assembly.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<!--
-
-
- 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.
-
--->
-<assembly>
- <id>src</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${api.server.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- <include>DISCLAIMER</include>
- <include>INSTALL</include>
- </includes>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory></outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>pom.xml</include>
- <include>modules/**</include>
- <include>samples/**</include>
- </includes>
-
- <excludes>
- <!-- Exclusions from org.apache.resources:apache-source-release-assembly-descriptor.
- Note that they assume that all sources are located under an "src" directory. This
- is not the case for Axis2, which doesn't use the standard Maven 2 conventions.
- Thus we may still encounter some issues here. -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
- </excludes>
-
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml
index b977e3ccd2..8c84f9efce 100644
--- a/modules/orchestrator/orchestrator-core/pom.xml
+++ b/modules/orchestrator/orchestrator-core/pom.xml
@@ -56,21 +56,6 @@
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-model-utils</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index aa65010fb1..a8403b1199 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -54,22 +54,6 @@
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/modules/registry/registry-tools/registry-tool/pom.xml b/modules/registry/registry-tools/registry-tool/pom.xml
index a23eacbe60..e38127fca0 100644
--- a/modules/registry/registry-tools/registry-tool/pom.xml
+++ b/modules/registry/registry-tools/registry-tool/pom.xml
@@ -34,22 +34,6 @@
<name>registry-tool</name>
<dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 1de90eac72..465645e796 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -199,13 +199,8 @@ public class ServerMain {
for (String string : args) {
logger.info("Server Arguments: " + string);
}
- String serverNames;
- try {
- serverNames = ApplicationSettings.getSetting(SERVERS_KEY);
- startAllServers(serverNames);
- } catch (ApplicationSettingsException e1) {
- logger.error("Error finding servers property");
- }
+ String serverNames = ApplicationSettings.getSetting(SERVERS_KEY, "all");
+ startAllServers(serverNames);
while(!hasStopRequested()){
try {
Thread.sleep(2000);
diff --git a/pom.xml b/pom.xml
index 92ddb69f5c..bde4a45215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.version>0.21-SNAPSHOT</project.version>
<spring.boot.maven.plugin.version>3.2.4</spring.boot.maven.plugin.version>
- <derby.version>10.13.1.1</derby.version>
<org.slf4j.version>2.0.16</org.slf4j.version>
<log4j2.version>2.24.3</log4j2.version>
<log4j2.slf4j.impl>2.24.3</log4j2.slf4j.impl>
@@ -232,6 +231,7 @@
<httpclient.version>4.5.14</httpclient.version>
<httpclient5.version>5.4.3</httpclient5.version>
<maven-remote-resources-plugin.version>3.3.0</maven-remote-resources-plugin.version>
+ <derby.version>10.16.1.1</derby.version>
</properties>
<dependencies>
@@ -369,26 +369,6 @@
<artifactId>guava</artifactId>
<version>${google.guava.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>