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/07/09 08:18:06 UTC
(airavata) branch dev-env-fix updated (ef1dd2ee3c -> 1477d396d2)
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a change to branch dev-env-fix
in repository https://gitbox.apache.org/repos/asf/airavata.git
omit ef1dd2ee3c devops improvements
new 1477d396d2 devops improvements
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ef1dd2ee3c)
\
N -- N -- N refs/heads/dev-env-fix (1477d396d2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(airavata) 01/01: devops improvements
Posted by ya...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch dev-env-fix
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 1477d396d2d539684809bce74408cdfa45d72666
Author: yasithdev <ya...@icloud.com>
AuthorDate: Wed Jul 9 03:14:27 2025 -0500
devops improvements
[dist] merge assembly XML/content into airavata-api
[api-server] remove redundant dbinit schemas
[api-server] move all templates into templates/
[api-server] move all db scripts into database_scripts/
[devcontainer] start creating full dev environ inside .devcontainer
---
.devcontainer/Dockerfile | 27 +-
.../database_scripts/init/00-accounts.sql | 3 +
.../database_scripts/init/01-databases.sql | 8 +
.../init/06-cloud-execution-support-migration.sql | 2 +
.devcontainer/devcontainer.json | 2 +-
.devcontainer/docker-compose.yml | 136 +++-
.devcontainer/keycloak/keycloak.conf | 15 +-
.devcontainer/keycloak/realm-default.json | 14 +-
.devcontainer/pga/Dockerfile | 36 -
.devcontainer/portals/Dockerfile | 33 +
.devcontainer/{pga => portals}/pga-default.conf | 6 +-
.devcontainer/portals/pga_config.php | 324 +++++++++
.devcontainer/proxy/proxy.conf | 76 +++
.dockerignore | 5 +
.gitignore | 2 +-
.run/APIServerStarter.run.xml | 17 +
.run/AgentServiceApplication.run.xml | 15 +
.run/FileServerApplication.run.xml | 9 +
.run/JobEngineStarter.run.xml | 15 +
.run/JobMonitorStarter.run.xml | 15 +
.run/ResearchServiceApplication.run.xml | 9 +
airavata-api/pom.xml | 101 ++-
.../src/main/assembly/api-server-bin-assembly.xml | 12 +-
.../src/main/assembly/api-server-src-assembly.xml | 0
.../src/main/docker/api-server/Dockerfile | 2 +-
.../src/main/docker/api-server/wait-for-it.sh | 0
.../src/main/docker/controller/Dockerfile | 0
.../src/main/docker/controller/wait-for-it.sh | 0
.../src/main/docker/docker-compose.yml | 2 +-
.../src/main/docker/email-monitor/Dockerfile | 0
.../src/main/docker/email-monitor/wait-for-it.sh | 0
.../src/main/docker/participant/Dockerfile | 0
.../src/main/docker/participant/wait-for-it.sh | 0
.../src/main/docker/post-wm/Dockerfile | 0
.../src/main/docker/post-wm/wait-for-it.sh | 0
.../src/main/docker/pre-wm/Dockerfile | 0
.../src/main/docker/pre-wm/wait-for-it.sh | 0
.../org/apache/airavata/common/utils/JPAUtils.java | 7 +-
.../impl/task/submission/config/JobFactory.java | 16 +-
.../src/main/resources/airavata-client.properties | 249 -------
.../src/main/resources/airavata-server.properties | 113 ++--
.../src/main/resources/appcatalog-derby.sql | 742 ---------------------
.../src/main/resources/credstore-derby.sql | 27 -
.../airavataworkflowcatalog-derby.sql | 0
.../{ => database_scripts}/appcatalog-mysql.sql | 0
.../{ => database_scripts}/credstore-mysql.sql | 0
.../{ => database_scripts}/expcatalog-mysql.sql | 0
.../replicacatalog-mysql.sql | 0
.../sharing-registry-mysql.sql | 0
.../user-profile-catalog-mysql.sql | 0
.../workflowcatalog-mysql.sql | 0
.../main/resources/distribution/bin/controller.sh | 0
.../resources/distribution/bin/email-monitor.sh | 0
.../resources/distribution/bin/orchestrator.sh | 8 -
.../main/resources/distribution/bin/parser-wm.sh | 0
.../main/resources/distribution/bin/participant.sh | 0
.../src/main/resources/distribution/bin/post-wm.sh | 0
.../src/main/resources/distribution/bin/pre-wm.sh | 0
.../resources/distribution/bin/realtime-monitor.sh | 0
.../src/main/resources/distribution/bin/setenv.sh | 0
.../resources/distribution/bin/sharing-registry.sh | 0
.../src/main/resources/distribution/conf/.gitkeep | 0
.../src/main/resources/enableLegacyTLS.properties | 23 -
.../src/main/resources/expcatalog-derby.sql | 445 ------------
airavata-api/src/main/resources/gsissh.properties | 26 -
airavata-api/src/main/resources/log4j2.xml | 13 -
.../src/main/resources/replicacatalog-derby.sql | 85 ---
.../src/main/resources/sharing-registry-derby.sql | 150 -----
.../{ => templates}/CLOUD_Groovy.template | 0
.../resources/{ => templates}/FORK_Groovy.template | 0
.../{ => templates}/HTCONDOR_Groovy.template | 0
.../resources/{ => templates}/LSF_Groovy.template | 0
.../resources/{ => templates}/PBS_Groovy.template | 0
.../{ => templates}/SLURM_Groovy.template | 0
.../resources/{ => templates}/UGE_Groovy.template | 0
.../main/resources/user-profile-catalog-derby.sql | 163 -----
.../src/main/resources/workflowcatalog-derby.sql | 128 ----
.../airavata_experiments/plan.py | 10 +-
.../airavata_jupyter_magic/__init__.py | 2 +-
.../airavata_jupyter_magic/device_auth.py | 2 +-
.../roles/api-orch/templates/apiorch.service.j2 | 2 +-
.../service/config/ClusterApplicationConfig.java | 11 +-
.../service/handlers/AgentManagementHandler.java | 6 +-
.../service/services/AiravataService.java | 2 +-
.../src/main/resources/application.yml | 20 +-
.../src/main/resources/distribution/conf/.gitkeep | 0
.../resources/distribution/conf/application.yml | 58 --
.../main/resources/distribution/conf/log4j2.xml | 52 --
.../resources/distribution/conf/truststore.jks | Bin 1654 -> 0 bytes
.../agent-service/src/main/resources/log4j2.xml | 15 +-
.../src/main/resources/truststore.jks | Bin 1654 -> 0 bytes
modules/agent-framework/airavata-agent/Makefile | 2 +-
modules/agent-framework/airavata-agent/agent.sh | 8 +-
modules/distribution/pom.xml | 143 ----
.../resources/distribution/bin/airavata-server.bat | 55 --
.../src/main/resources/distribution/bin/setenv.bat | 33 -
.../distribution/conf/airavata-server.properties | 249 -------
.../resources/distribution/conf/email-config.yaml | 56 --
.../main/resources/distribution/conf/log4j2.xml | 52 --
.../src/main/resources/application.properties | 7 +-
.../src/main/resources/distribution/conf/.gitkeep | 0
.../distribution/conf/application.properties | 12 -
.../resources/{distribution/conf => }/log4j2.xml | 13 -
modules/ide-integration/pom.xml | 6 -
.../src/main/resources/airavata-server.properties | 249 -------
.../src/main/resources/email-config.yaml | 56 --
.../ide-integration/src/main/resources/log4j2.xml | 54 --
.../compose/custom_templates/login.html | 6 +-
.../research-hub/compose/jupyterhub_config.py | 10 +-
.../src/main/compose/dbinit/01-init-db.sql | 2 +-
.../airavata/research/service/AiravataService.java | 2 +-
.../research/service/config/OpenApiConfig.java | 5 +-
.../src/main/resources/application.yml | 12 +-
.../src/main/resources/distribution/conf/.gitkeep | 0
.../resources/distribution/conf/application.yml | 69 --
.../main/resources/distribution/conf/log4j2.xml | 52 --
.../research-service/src/main/resources/log4j2.xml | 15 +-
pom.xml | 11 +-
118 files changed, 910 insertions(+), 3530 deletions(-)
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 2e254d3142..d92db60e0b 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:22.04 as deps
ARG TARGETARCH
@@ -24,7 +24,7 @@ RUN wget https://go.dev/dl/go1.23.0.linux-amd64.tar.gz \
&& tar -C /usr/local -xzf go1.23.0.linux-amd64.tar.gz \
&& rm go1.23.0.linux-amd64.tar.gz
-# Install Thrift 0.23
+# Install Thrift 0.22
RUN wget https://dlcdn.apache.org/thrift/0.22.0/thrift-0.22.0.tar.gz \
&& tar -xzf thrift-0.22.0.tar.gz \
&& cd thrift-0.22.0 \
@@ -45,3 +45,26 @@ ENV MAVEN_HOME=/opt/maven
ENV GOROOT=/usr/local/go
ENV GOPATH=/home/developer/go
ENV PATH=$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin:$GOROOT/bin:$GOPATH/bin
+
+EXPOSE 7878 8000 17000 8050 8930 9930 8960 8962 8970 18800 19900 18889 19908
+
+FROM deps AS compiler
+
+COPY --chown=developer:developer .. /home/developer/workspace
+WORKDIR /home/developer/workspace
+RUN mvn clean install -DskipTests
+
+
+FROM eclipse-temurin:17-jdk AS runner
+WORKDIR /app
+
+COPY --from=compiler /home/developer/workspace/distribution/*.tar.gz ./
+
+COPY ../dev-tools/deployment-scripts/*.sh ./
+COPY ../vault ./vault
+
+RUN chmod +x ./distribution_update.sh ./services_up.sh
+
+EXPOSE 7878 8000 17000 8050 8930 9930 8960 8962 8970 18800 19900 18889 19908
+
+CMD ["sh", "-c", "./distribution_update.sh && ./services_up.sh && sleep infinity"]
diff --git a/.devcontainer/database_scripts/init/00-accounts.sql b/.devcontainer/database_scripts/init/00-accounts.sql
new file mode 100644
index 0000000000..0d57e5e080
--- /dev/null
+++ b/.devcontainer/database_scripts/init/00-accounts.sql
@@ -0,0 +1,3 @@
+CREATE USER IF NOT EXISTS 'airavata'@'%' IDENTIFIED BY '123456';
+GRANT ALL PRIVILEGES ON *.* TO 'airavata'@'%';
+FLUSH PRIVILEGES;
\ No newline at end of file
diff --git a/.devcontainer/database_scripts/init/01-databases.sql b/.devcontainer/database_scripts/init/01-databases.sql
index 4ac2531a80..0f253c8430 100644
--- a/.devcontainer/database_scripts/init/01-databases.sql
+++ b/.devcontainer/database_scripts/init/01-databases.sql
@@ -3519,6 +3519,14 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `workflow_catalog` /*!40100 DEFAULT CHA
USE `workflow_catalog`;
+--
+-- Current Database: `research_catalog`
+--
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `research_catalog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+
+USE `research_catalog`;
+
--
-- Current Database: `app_catalog`
--
diff --git a/.devcontainer/database_scripts/init/06-cloud-execution-support-migration.sql b/.devcontainer/database_scripts/init/06-cloud-execution-support-migration.sql
index 4338d2b0a7..81718b8f96 100644
--- a/.devcontainer/database_scripts/init/06-cloud-execution-support-migration.sql
+++ b/.devcontainer/database_scripts/init/06-cloud-execution-support-migration.sql
@@ -1,3 +1,5 @@
+USE app_catalog;
+
-- Add RESOURCE_TYPE column to base table
ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE`
ADD COLUMN `RESOURCE_TYPE` VARCHAR(255) NOT NULL DEFAULT 'SLURM';
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 05d77d7d5d..ce760a6334 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
"dockerComposeFile": "docker-compose.yml",
"service": "devcontainer",
"features": {},
- "workspaceFolder": "/workspace",
+ "workspaceFolder": "/home/developer/workspace",
"forwardPorts": [],
"customizations": {
"vscode": {
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 1219394032..53e010e0fa 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -13,32 +13,114 @@ volumes:
services:
devcontainer:
- build: .
+ profiles:
+ - development
+ build:
+ dockerfile: Dockerfile
+ target: deps
volumes:
- - ..:/workspace:cached
+ - ..:/home/developer/workspace:cached
+ - $HOME/.m2:/home/developer/.m2
+ - $HOME/.ssh:/home/developer/.ssh
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.10
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+ ports:
+ - "7878:7878" # sharing registry service
+ - "8000:8000" # tunnel service
+ - "17000:17000" # tunnel service (ingress)
+ - "8050:8050" # file service
+ - "8930:8930" # api service
+ - "9930:9930" # api service (TLS) !!!
+ - "8960:8960" # cred store service
+ - "8962:8962" # profile service
+ - "8970:8970" # registry service
+ - "18800:18800" # agent service (http)
+ - "19900:19900" # agent service (gRPC)
+ - "18889:18889" # research service (http)
+ - "19908:19908" # research service (gRPC)
command: sleep infinity
+
+ microservices:
+ profiles:
+ - staging
+ build:
+ dockerfile: Dockerfile
+ target: runner
+ volumes:
+ - ../vault:/app/vault
networks:
airavata-network:
ipv4_address: 192.168.100.10
extra_hosts:
- "airavata.host:192.168.100.1"
+ ports:
+ - "7878:7878" # sharing registry service
+ - "8000:8000" # tunnel service
+ - "17000:17000" # tunnel service (ingress)
+ - "8050:8050" # file service
+ - "8930:8930" # api service
+ - "9930:9930" # api service (TLS) !!!
+ - "8960:8960" # cred store service
+ - "8962:8962" # profile service
+ - "8970:8970" # registry service
+ - "18800:18800" # agent service (http)
+ - "19900:19900" # agent service (gRPC)
+ - "18889:18889" # research service (http)
+ - "19908:19908" # research service (gRPC)
+ depends_on:
+ - db
+ - kafka
+ - keycloak
+ - rabbitmq
+ - sshd
+
+ portals:
+ build: portals
+ volumes:
+ - /tmp:/tmp
+ - ./portals/pga_config.php:/var/www/html/default/config/pga_config.php
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.18
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
+ proxy:
+ image: nginx/nginx-ingress
+ ports:
+ - "8443:8443" # https keycloak
+ - "5173:5173" # https research portal
+ - "8008:8008" # https php portal
+ - "8009:8009" # https django portal
+ environment:
+ RESEARCH_PORTAL_ADDR: "portals:5173"
+ PHP_PORTAL_ADDR: "portals:8008"
+ DJANGO_PORTAL_ADDR: "portals:8009"
+ KEYCLOAK_ADDR: "keycloak:18080"
+ volumes:
+ - ../vault:/vault # requires /vault/server.crt and /vault/server.key for ssl termination
+ - ./proxy/proxy.conf:/etc/nginx/conf.d/proxy.conf:ro
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.18
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
keycloak:
- image: keycloak/keycloak:24.0
+ image: keycloak/keycloak:25.0
restart: always
environment:
KEYCLOAK_ADMIN: admin
KEYCLOAK_ADMIN_PASSWORD: admin
ports:
- - "18080:8080"
- - "8443:8443"
+ - "18080:18080"
volumes:
- ./keycloak/realm-default.json:/opt/keycloak/data/import/realm-default.json
- ./keycloak/keycloak.conf:/opt/keycloak/conf/keycloak.conf
- - ../keystores/airavata.jks:/opt/keycloak/conf/keystores/airavata.jks
- command: ["start-dev", "--import-realm"]
- depends_on:
- - db
+ command: [ "start", "--import-realm" ]
networks:
airavata-network:
ipv4_address: 192.168.100.11
@@ -78,8 +160,6 @@ services:
ports:
- "5672:5672"
- "15672:15672"
- depends_on:
- - db
networks:
airavata-network:
ipv4_address: 192.168.100.13
@@ -91,7 +171,7 @@ services:
restart: always
hostname: zk
ports:
- - "12181:2181"
+ - "2181:2181"
networks:
airavata-network:
ipv4_address: 192.168.100.14
@@ -115,8 +195,26 @@ services:
extra_hosts:
- "airavata.host:192.168.100.1"
+ kafka-rest:
+ image: confluentinc/cp-kafka-rest:latest
+ restart: always
+ depends_on:
+ - kafka
+ ports:
+ - "8082:8082"
+ environment:
+ KAFKA_REST_HOST_NAME: 192.168.100.19
+ KAFKA_REST_LISTENERS: http://0.0.0.0:8082
+ KAFKA_REST_BOOTSTRAP_SERVERS: PLAINTEXT://kafka:9092
+ KAFKA_REST_ZOOKEEPER_CONNECT: zookeeper:2181
+ networks:
+ airavata-network:
+ ipv4_address: 192.168.100.19
+ extra_hosts:
+ - "airavata.host:192.168.100.1"
+
sshd:
- image: dimuthuupe/sshd:1.0
+ image: panubo/sshd
restart: always
volumes:
- /tmp:/tmp
@@ -140,15 +238,3 @@ services:
ipv4_address: 192.168.100.17
extra_hosts:
- "airavata.host:192.168.100.1"
-
- pga:
- build: pga
- volumes:
- - /tmp:/tmp
- ports:
- - "8000:80"
- networks:
- airavata-network:
- ipv4_address: 192.168.100.18
- extra_hosts:
- - "airavata.host:192.168.100.1"
diff --git a/.devcontainer/keycloak/keycloak.conf b/.devcontainer/keycloak/keycloak.conf
index 93ecbb9206..547675c4d3 100644
--- a/.devcontainer/keycloak/keycloak.conf
+++ b/.devcontainer/keycloak/keycloak.conf
@@ -1,20 +1,9 @@
-# Keycloak Configuration File
db=dev-mem
-
-# HTTP/HTTPS settings
http-enabled=true
-http-port=8080
-https-port=8443
-https-key-store-file=${kc.home.dir}/conf/keystores/airavata.jks
-https-key-store-password=airavata
-
-# Hostname configuration
+http-port=18080
+https-port=0
hostname-strict=false
hostname-strict-https=false
-
-# Health and metrics
health-enabled=true
metrics-enabled=true
-
-# Logging
log-level=INFO
diff --git a/.devcontainer/keycloak/realm-default.json b/.devcontainer/keycloak/realm-default.json
index 3741b867a4..2bc90a0766 100644
--- a/.devcontainer/keycloak/realm-default.json
+++ b/.devcontainer/keycloak/realm-default.json
@@ -957,7 +957,7 @@
"alwaysDisplayInConsole" : false,
"clientAuthenticatorType" : "client-secret",
"secret" : "DxeMtfiWU1qkDEmaGHf13RDahCujzhy1",
- "redirectUris" : [ "", "/*", "https://hub.cybershuttle.org/hub/oauth_callback" ],
+ "redirectUris" : [ "", "/*", "http://airavata.host:20000/hub/oauth_callback" ],
"webOrigins" : [ "/*" ],
"notBefore" : 0,
"bearerOnly" : false,
@@ -1052,7 +1052,7 @@
"description" : "",
"rootUrl" : "",
"adminUrl" : "",
- "baseUrl" : "https://cybershuttle.org/",
+ "baseUrl" : "http://airavata.host:8009/",
"surrogateAuthRequired" : false,
"enabled" : true,
"alwaysDisplayInConsole" : false,
@@ -1102,8 +1102,8 @@
"alwaysDisplayInConsole" : false,
"clientAuthenticatorType" : "client-secret",
"secret" : "m36BXQIxX3j3VILadeHMK5IvbOeRlCCc",
- "redirectUris" : [ "https://cybershuttle.org/callback-url", "http://localhost/callback-url", "http://airavata.host:8008/callback-url", "https://cybershuttle.org/", "https://cybershuttle.org/auth/callback*" ],
- "webOrigins" : [ "https://cybershuttle.org", "*" ],
+ "redirectUris" : [ "http://airavata.host:8008/callback*", "https://airavata.host:8009/auth/callback*" ],
+ "webOrigins" : [ "*" ],
"notBefore" : 0,
"bearerOnly" : false,
"consentRequired" : false,
@@ -1119,8 +1119,8 @@
"oidc.ciba.grant.enabled" : "false",
"client.secret.creation.time" : "1741724922",
"backchannel.logout.session.required" : "true",
- "frontchannel.logout.url" : "https://cybershuttle.org/",
- "post.logout.redirect.uris" : "+##https://cybershuttle.org/",
+ "frontchannel.logout.url" : "http://airavata.host:8009/",
+ "post.logout.redirect.uris" : "+##http://airavata.host:8009/",
"display.on.consent.screen" : "false",
"oauth2.device.authorization.grant.enabled" : "true",
"backchannel.logout.revoke.offline.tokens" : "false"
@@ -1922,7 +1922,7 @@
"forwardParameters" : "kc_idp_hint",
"authorizationUrl" : "https://cilogon.org/authorize",
"disableUserInfo" : "false",
- "logoutUrl" : "https://cybershuttle.org/",
+ "logoutUrl" : "http://airavata.host:8009/",
"sendIdTokenOnLogout" : "true",
"passMaxAge" : "false"
}
diff --git a/.devcontainer/pga/Dockerfile b/.devcontainer/pga/Dockerfile
deleted file mode 100644
index e40ac6a74a..0000000000
--- a/.devcontainer/pga/Dockerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-FROM php:8.1-apache
-
-# Install required PHP extensions and tools from apt
-RUN apt-get update && apt-get install -y wget git unzip && rm -rf /var/lib/apt/lists/*
-
-# Install Composer (official way)
-RUN wget https://getcomposer.org/installer -O composer-setup.php && \
- php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \
- rm composer-setup.php
-
-# Set up your application (example)
-RUN mkdir -p /var/www/portals/default
-
-RUN wget -q https://github.com/apache/airavata-portals/archive/refs/heads/main.tar.gz -O /tmp/portals.tar.gz && \
- tar -xzf /tmp/portals.tar.gz --strip-components=2 -C /var/www/portals/default airavata-portals-main/airavata-php-gateway && \
- rm /tmp/portals.tar.gz
-
-COPY pga-default.conf /etc/apache2/sites-available/000-default.conf
-
-# Enable Apache modules
-RUN a2enmod rewrite
-
-RUN mkdir -p /var/www/portals/default/storage/views && \
- mkdir -p /var/www/portals/default/storage/sessions && \
- mkdir -p /var/www/portals/default/bootstrap/cache
-
-# Set proper permissions for Laravel
-RUN chmod -R 775 /var/www/portals/default/storage/views && \
- chmod -R 775 /var/www/portals/default/storage/sessions && \
- chmod -R 775 /var/www/portals/default/bootstrap/cache
-
-WORKDIR /var/www/portals/default
-RUN composer install
-
-EXPOSE 80
-EXPOSE 443
diff --git a/.devcontainer/portals/Dockerfile b/.devcontainer/portals/Dockerfile
new file mode 100644
index 0000000000..94a9de0b06
--- /dev/null
+++ b/.devcontainer/portals/Dockerfile
@@ -0,0 +1,33 @@
+FROM php:8.1-apache
+
+# TODO put all 3 portals -- research portal (:5173), php gateway (:8008), and django portal (:8009)
+# TODO handle ssl termination before requests hit this container
+
+ARG PORTALS_REPO_URL=https://github.com/apache/airavata-portals/archive/refs/heads/main.tar.gz
+
+# set hostname
+RUN echo "ServerName airavata.host" >> /etc/apache2/apache2.conf
+
+# install deps
+RUN apt-get update && apt-get install -y wget git unzip && rm -rf /var/lib/apt/lists/*
+RUN wget -qO- https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# setup site config
+COPY pga-default.conf /etc/apache2/sites-available/000-default.conf
+
+RUN a2enmod rewrite && a2ensite 000-default.conf && apache2ctl configtest
+
+USER www-data:www-data
+
+WORKDIR /var/www/html/default
+
+# ensure config directory exists for mounting
+RUN mkdir -p config storage/views storage/sessions bootstrap/cache
+
+RUN wget -qO- $PORTALS_REPO_URL | tar xz --strip-components=2 -C . airavata-portals-main/airavata-php-gateway
+
+COPY pga_config.php /var/www/html/default/config/pga_config.php
+
+RUN composer install --no-dev --optimize-autoloader
+
+EXPOSE 5173 8008 8009
diff --git a/.devcontainer/pga/pga-default.conf b/.devcontainer/portals/pga-default.conf
similarity index 53%
rename from .devcontainer/pga/pga-default.conf
rename to .devcontainer/portals/pga-default.conf
index dec81542d8..e3b250eac4 100644
--- a/.devcontainer/pga/pga-default.conf
+++ b/.devcontainer/portals/pga-default.conf
@@ -1,7 +1,7 @@
-<VirtualHost *:80>
+<VirtualHost *:8008>
- DocumentRoot /var/www/portals/default/public
- <Directory "/var/www/portals/default/public">
+ DocumentRoot /var/www/html/default/public
+ <Directory "/var/www/html/default/public">
AllowOverride All
</Directory>
ErrorLog /var/log/apache2/default.error.log
diff --git a/.devcontainer/portals/pga_config.php b/.devcontainer/portals/pga_config.php
new file mode 100644
index 0000000000..80fb112cec
--- /dev/null
+++ b/.devcontainer/portals/pga_config.php
@@ -0,0 +1,324 @@
+<?php
+return array(
+ /**
+ * *****************************************************************
+ * WSO2 Identity Server Related Configurations
+ * *****************************************************************
+ */
+
+ 'wsis' => [
+
+ /**
+ * Admin Role Name
+ */
+ 'admin-role-name' => 'Internal/everyone',
+
+ /**
+ * Read only Admin Role Name
+ */
+ 'read-only-admin-role-name' => 'Internal/everyone',
+
+ /**
+ * Gateway user role
+ */
+ 'user-role-name' => 'Internal/everyone',
+
+ /**
+ * Initial user role. This is the initial user role assigned to a new
+ * user. Set this to one of the three roles above to automatically
+ * grant new users that role, or set to some other role ('user-pending')
+ * to require admin approval before users have access.
+ */
+ 'initial-role-name' => 'user-pending',
+
+ /**
+ * Tenant Domain
+ */
+ 'tenant-domain' => 'default',
+
+ /**
+ * Tenant admin's username
+ */
+ 'admin-username' => 'default-admin',
+
+ /**
+ * Tenant admin's password
+ */
+ 'admin-password' => 'ade4#21242ftfd',
+
+ /**
+ * OAuth client key
+ */
+ 'oauth-client-key' => 'pga',
+
+ /**
+ * OAuth client secret
+ */
+ 'oauth-client-secret' => 'upCMVu2RZcAXUqpr9V7phAbz6hhF9cbl',
+
+ /**
+ * Authentication options
+ */
+ 'auth-options' => [
+ // Example of password based login
+ [
+ 'oauth-grant-type' => 'password',
+ 'name' => 'Airavata PHP Gateway',
+ ],
+ // Example of external identity provider login
+ [
+ 'oauth-grant-type' => 'authorization_code',
+ 'name' => 'CILogon',
+ // Optional
+ // Note: kc_idp_hint is used to skip Keycloak login screen and redirect immediately to this identity provider
+ // http://www.keycloak.org/docs/2.5/server_admin/topics/identity-broker/suggested.html
+ 'oauth-authorize-url-extra-params' => 'kc_idp_hint=oidc',
+ // Optional
+ 'logo' => '/assets/path_to_image.png'
+ ],
+ ],
+
+ /**
+ * OAuth Grant Type (password or authorization_code)
+ */
+ 'oauth-grant-type' => 'authorization_code',
+
+ /**
+ * OAuth call back url (only if the grant type is authorization_code)
+ */
+ 'oauth-callback-url' => 'http://localhost:8000/callback-url',
+
+ /**
+ * For OIDC servers that support the discovery protocol.
+ */
+ 'openid-connect-discovery-url' => 'http://airavata.host:18080/realms/default/.well-known/openid-configuration',
+
+ /**
+ * Identity server url
+ */
+ 'service-url' => 'http://airavata.host:18080',
+
+ /**
+ * Enable HTTPS server verification
+ */
+ 'verify-peer' => false,
+
+ /**
+ * Path to the server certificate file
+ */
+ 'cafile-path' => app_path() . '/resources/security/incommon_rsa_server_ca.pem',
+ ],
+
+
+ /**
+ * *****************************************************************
+ * Airavata Client Configurations
+ * *****************************************************************
+ */
+ 'airavata' => [
+
+ /**
+ * Airavata API server location. Use tls:// as the protocol to
+ * connect TLS enabled Airavata
+ */
+ 'airavata-server' => 'airavata.host',
+
+ /**
+ * Airavata API server port
+ */
+ 'airavata-port' => '8930',
+
+ /**
+ * Airavata Profile Service server location. Use tls:// as the protocol to
+ * connect over TLS
+ */
+ 'airavata-profile-service-server' => 'airavata.host',
+
+ /**
+ * Airavata Profile Service port
+ */
+ 'airavata-profile-service-port' => '8962',
+
+ /**
+ * Airavata API server thrift communication timeout
+ */
+ 'airavata-timeout' => '1000000',
+
+ /**
+ * PGA Gateway ID
+ */
+ 'gateway-id' => 'default',
+
+ /**
+ * absolute path of the data dir
+ */
+ 'experiment-data-absolute-path' => '/var/www/experimentData',
+
+ /**
+ * Advanced experiments options
+ */
+ 'advanced-experiment-options' => '',
+
+ /**
+ * Default queue name
+ */
+ 'queue-name' => 'long',
+
+ /**
+ * Default node count
+ */
+ 'node-count' => '1',
+
+ /**
+ * Default total core count
+ */
+ 'total-cpu-count' => '16',
+
+ /**
+ * Default wall time limit
+ */
+ 'wall-time-limit' => '30',
+
+ /**
+ * Max node count
+ */
+ 'max-node-count' => '4',
+
+ /**
+ * Max total core count
+ */
+ 'max-total-cpu-count' => '96',
+
+ /**
+ * Max wall time limit
+ */
+ 'max-wall-time-limit' => '120',
+
+ /**
+ * Enable app-catalog cache
+ */
+ 'enable-app-catalog-cache' => true,
+
+ /**
+ * Life time of app catalog data cache in minutes
+ */
+ 'app-catalog-cache-duration' => 5,
+
+ /**
+ * Gateway data store resource id
+ */
+ 'gateway-data-store-resource-id' => '',
+
+ /**
+ * Data Sharing enabled
+ */
+ 'data-sharing-enabled' => false,
+
+ /**
+ * Group Resource Profile ID to use when submitting experiments
+ */
+ 'group-resource-profile-id' => '',
+ ],
+
+ /**
+ * *****************************************************************
+ * Portal Related Configurations
+ * *****************************************************************
+ */
+ 'portal' => [
+ /**
+ * Whether this portal is the SciGaP admin portal
+ */
+ 'super-admin-portal' => true,
+
+ /**
+ * Set the name of theme in use here
+ */
+ 'theme' => 'base',
+
+ /**
+ * Portal title
+ */
+ 'portal-title' => 'Airavata PHP Gateway',
+
+ /**
+ * Email address of the portal admin. Portal admin well get email notifications for events
+ * such as new user creation
+ */
+ 'admin-emails' => ['xxx@xxx.com','yyy@yyy.com'],
+
+ /**
+ * Email account that the portal should login to send emails
+ */
+ 'portal-email-username' => 'xyz@abc.com',
+
+ /**
+ * Password for the portal's email account
+ */
+ 'portal-email-password' => 'xxxxxxxxxxx',
+
+ /**
+ * SMTP server on which the portal should connect
+ */
+ 'portal-smtp-server-host' => 'smtp.gmail.com',
+
+ /**
+ * SMTP server port on which the portal should connect
+ */
+ 'portal-smtp-server-port' => '587',
+
+ /**
+ * Email verification code valid time interval in minutes
+ */
+ 'email-verify-code-valid-time' => 360,
+
+ /**
+ * Set this to true if theme has set links to login
+ */
+ 'theme-based-login-links-configured' => false,
+
+ /**
+ * Set the URL of the new Django portal for re-routing
+ */
+ 'airavata-django-url' => "http://airavata.host:8009/",
+
+ /**
+ * Set to true to enable reroute to the new Django portal
+ */
+ 'reroute-to-django' => true,
+
+ /**
+ * Set JIRA Issue Collector scripts here.
+ */
+ 'jira-help' =>
+ [
+ /**
+ * Report Issue Script issued for your app by Atlassian JIRA
+ */
+ 'report-issue-script' => '',
+ /**
+ * Collector id at the end of the above script
+ */
+ 'report-issue-collector-id' => '',
+ /**
+ * Create Report Script issued for your app by Atlassian JIRA
+ */
+ 'request-feature-script' => '',
+ /**
+ * Collector id at the end of the above script
+ */
+ 'request-feature-collector-id' => ''
+ ],
+
+ /**
+ * Set Google Analytics Id here. ID format that generates from
+ * creating tracker object should be
+ *
+ * UA-XXXXX-Y
+ *
+ * for it to be working correctly. Currently it is only set for
+ * sending pageviews.
+ */
+ 'google-analytics-id' => ''
+ ]
+);
diff --git a/.devcontainer/proxy/proxy.conf b/.devcontainer/proxy/proxy.conf
new file mode 100644
index 0000000000..f9f9e41c1f
--- /dev/null
+++ b/.devcontainer/proxy/proxy.conf
@@ -0,0 +1,76 @@
+# proxy.conf
+
+upstream research { server portals:5173; }
+upstream php { server portals:8008; }
+upstream django { server portals:8009; }
+upstream kc { server keycloak:18080; }
+
+# Research portal
+server {
+ listen 5173 ssl http2;
+ server_name airavata.host;
+
+ ssl_certificate /vault/server.crt;
+ ssl_certificate_key /vault/server.key;
+ ssl_protocols TLSv1.2 TLSv1.3;
+ ssl_prefer_server_ciphers on;
+
+ location / {
+ proxy_pass http://research;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto https;
+ }
+}
+
+# PHP portal
+server {
+ listen 8008 ssl http2;
+ server_name airavata.host;
+
+ ssl_certificate /vault/server.crt;
+ ssl_certificate_key /vault/server.key;
+
+ location / {
+ proxy_pass http://php;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto https;
+ }
+}
+
+# Django portal
+server {
+ listen 8009 ssl http2;
+ server_name airavata.host;
+
+ ssl_certificate /vault/server.crt;
+ ssl_certificate_key /vault/server.key;
+
+ location / {
+ proxy_pass http://django;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto https;
+ }
+}
+
+# Keycloak
+server {
+ listen 8443 ssl http2;
+ server_name airavata.host;
+
+ ssl_certificate /vault/server.crt;
+ ssl_certificate_key /vault/server.key;
+
+ location / {
+ proxy_pass http://kc;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto https;
+ }
+}
\ No newline at end of file
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..43fb6a53e7
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+.devcontainer
+.github
+.idea
+.run
+.vscode
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 91d9f1ed6a..91267d90fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,7 @@ airavata-local-agent/build.sh
modules/research-framework/compose
-logs
+logs/
# Ignore Maven build output
**/target/
diff --git a/.run/APIServerStarter.run.xml b/.run/APIServerStarter.run.xml
new file mode 100644
index 0000000000..9a9386e6f2
--- /dev/null
+++ b/.run/APIServerStarter.run.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="APIServerStarter" type="Application" factoryName="Application" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="org.apache.airavata.ide.integration.APIServerStarter" />
+ <module name="ide-integration" />
+ <option name="PROGRAM_PARAMETERS" value="-Dopenjpa.DynamicEnhancementAgent=true" />
+ <option name="VM_PARAMETERS" value="-javaagent:$MAVEN_REPOSITORY$/org/apache/openjpa/openjpa/4.1.1/openjpa-4.1.1.jar" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="org.apache.airavata.ide.integration.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/AgentServiceApplication.run.xml b/.run/AgentServiceApplication.run.xml
new file mode 100644
index 0000000000..c220f66317
--- /dev/null
+++ b/.run/AgentServiceApplication.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="AgentServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+ <module name="agent-service" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.airavata.agent.connection.service.AgentServiceApplication" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="org.apache.airavata.agent.connection.service.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/FileServerApplication.run.xml b/.run/FileServerApplication.run.xml
new file mode 100644
index 0000000000..dd32867970
--- /dev/null
+++ b/.run/FileServerApplication.run.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="FileServerApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <module name="file-server" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.airavata.file.server.FileServerApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/JobEngineStarter.run.xml b/.run/JobEngineStarter.run.xml
new file mode 100644
index 0000000000..48b9bc7169
--- /dev/null
+++ b/.run/JobEngineStarter.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="JobEngineStarter" type="Application" factoryName="Application" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="org.apache.airavata.ide.integration.JobEngineStarter" />
+ <module name="ide-integration" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="org.apache.airavata.ide.integration.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/JobMonitorStarter.run.xml b/.run/JobMonitorStarter.run.xml
new file mode 100644
index 0000000000..5e3644082b
--- /dev/null
+++ b/.run/JobMonitorStarter.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="JobMonitorStarter" type="Application" factoryName="Application" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="org.apache.airavata.ide.integration.JobMonitorStarter" />
+ <module name="ide-integration" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="org.apache.airavata.ide.integration.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/ResearchServiceApplication.run.xml b/.run/ResearchServiceApplication.run.xml
new file mode 100644
index 0000000000..dbec147802
--- /dev/null
+++ b/.run/ResearchServiceApplication.run.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="ResearchServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <module name="research-service" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.apache.airavata.research.service.ResearchServiceApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml
index 3a8f4e5149..90e67d0c34 100644
--- a/airavata-api/pom.xml
+++ b/airavata-api/pom.xml
@@ -113,8 +113,8 @@ under the License.
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -323,6 +323,29 @@ under the License.
<groupId>software.amazon.awssdk</groupId>
<artifactId>retries</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
@@ -578,6 +601,73 @@ under the License.
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>api-server-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${api.server.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/api-server-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-api-server-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.api.server.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${docker.api.server.image.src.root}</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${session.executionRootDirectory}/distribution</directory>
+ <includes>
+ <include>${api.server.dist.name}.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.46.0</version>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>airavata/api-server</name>
+ <build>
+ <dockerFile>${docker.api.server.build.directory}/Dockerfile</dockerFile>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+
</plugins>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
@@ -595,4 +685,11 @@ under the License.
</testResource>
</testResources>
</build>
+
+ <properties>
+ <docker.api.server.build.directory>${project.build.directory}/api_server_docker_img_build</docker.api.server.build.directory>
+ <docker.api.server.image.src.root>src/main/docker/api-server</docker.api.server.image.src.root>
+ <api.server.dist.name>apache-airavata-api-server-${project.version}</api.server.dist.name>
+ </properties>
+
</project>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml b/airavata-api/src/main/assembly/api-server-bin-assembly.xml
similarity index 91%
rename from modules/distribution/src/main/assembly/api-server-bin-assembly.xml
rename to airavata-api/src/main/assembly/api-server-bin-assembly.xml
index 89f361dd71..a4ba2f2ae6 100644
--- a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
+++ b/airavata-api/src/main/assembly/api-server-bin-assembly.xml
@@ -32,7 +32,7 @@
<!-- ********************** copy metadata files ********************** -->
<fileSet>
- <directory>../..</directory>
+ <directory>..</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>INSTALL</include>
@@ -46,7 +46,7 @@
<!-- ********************** copy keystore files ********************** -->
<fileSet>
- <directory>../../keystores</directory>
+ <directory>../keystores</directory>
<outputDirectory>conf/keystores</outputDirectory>
<includes>
<include>*.jks</include>
@@ -55,19 +55,19 @@
<!-- ********************** copy config files ********************** -->
<fileSet>
- <directory>../../airavata-api/src/main/resources</directory>
+ <directory>src/main/resources</directory>
<outputDirectory>conf</outputDirectory>
<includes>
<include>META-INF/persistence.xml</include>
+ <include>templates/*.template</include>
<include>*.properties</include>
<include>*.xml</include>
- <include>*.template</include>
</includes>
</fileSet>
<!-- ********************** copy database scripts ********************** -->
<fileSet>
- <directory>../../airavata-api/src/main/resources</directory>
+ <directory>src/main/resources/database_scripts</directory>
<outputDirectory>database_scripts</outputDirectory>
<includes>
<include>*.sql</include>
@@ -107,7 +107,7 @@
<dependencySets>
<dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
+ <useProjectArtifact>true</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<useTransitiveDependencies>true</useTransitiveDependencies>
</dependencySet>
diff --git a/modules/distribution/src/main/assembly/api-server-src-assembly.xml b/airavata-api/src/main/assembly/api-server-src-assembly.xml
similarity index 100%
rename from modules/distribution/src/main/assembly/api-server-src-assembly.xml
rename to airavata-api/src/main/assembly/api-server-src-assembly.xml
diff --git a/modules/distribution/src/main/docker/api-server/Dockerfile b/airavata-api/src/main/docker/api-server/Dockerfile
similarity index 98%
rename from modules/distribution/src/main/docker/api-server/Dockerfile
rename to airavata-api/src/main/docker/api-server/Dockerfile
index 5ac62051a0..845e1501be 100644
--- a/modules/distribution/src/main/docker/api-server/Dockerfile
+++ b/airavata-api/src/main/docker/api-server/Dockerfile
@@ -39,7 +39,7 @@ ENV PATH="${JAVA_HOME}/bin:${PATH}"
ENV AIRAVATA_HOME=/opt/apache-airavata
# Expose the default API server port
-EXPOSE 8960 9930 7878 8962 8970
+EXPOSE 8960 8930 7878 8962 8970
# Set the entrypoint to use the shell script
ENTRYPOINT ["/opt/apache-airavata/bin/airavata-server-start.sh"]
diff --git a/modules/distribution/src/main/docker/api-server/wait-for-it.sh b/airavata-api/src/main/docker/api-server/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/api-server/wait-for-it.sh
rename to airavata-api/src/main/docker/api-server/wait-for-it.sh
diff --git a/modules/distribution/src/main/docker/controller/Dockerfile b/airavata-api/src/main/docker/controller/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/controller/Dockerfile
rename to airavata-api/src/main/docker/controller/Dockerfile
diff --git a/modules/distribution/src/main/docker/controller/wait-for-it.sh b/airavata-api/src/main/docker/controller/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/controller/wait-for-it.sh
rename to airavata-api/src/main/docker/controller/wait-for-it.sh
diff --git a/modules/distribution/src/main/docker/docker-compose.yml b/airavata-api/src/main/docker/docker-compose.yml
similarity index 99%
rename from modules/distribution/src/main/docker/docker-compose.yml
rename to airavata-api/src/main/docker/docker-compose.yml
index 0d0db348ab..f4a1666527 100644
--- a/modules/distribution/src/main/docker/docker-compose.yml
+++ b/airavata-api/src/main/docker/docker-compose.yml
@@ -42,7 +42,7 @@ services:
links:
- "keycloak:airavata.host"
ports:
- - "9930:9930"
+ - "8930:8930"
- "7878:7878"
- "8962:8962"
- "8960:8960"
diff --git a/modules/distribution/src/main/docker/email-monitor/Dockerfile b/airavata-api/src/main/docker/email-monitor/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/email-monitor/Dockerfile
rename to airavata-api/src/main/docker/email-monitor/Dockerfile
diff --git a/modules/distribution/src/main/docker/email-monitor/wait-for-it.sh b/airavata-api/src/main/docker/email-monitor/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/email-monitor/wait-for-it.sh
rename to airavata-api/src/main/docker/email-monitor/wait-for-it.sh
diff --git a/modules/distribution/src/main/docker/participant/Dockerfile b/airavata-api/src/main/docker/participant/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/participant/Dockerfile
rename to airavata-api/src/main/docker/participant/Dockerfile
diff --git a/modules/distribution/src/main/docker/participant/wait-for-it.sh b/airavata-api/src/main/docker/participant/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/participant/wait-for-it.sh
rename to airavata-api/src/main/docker/participant/wait-for-it.sh
diff --git a/modules/distribution/src/main/docker/post-wm/Dockerfile b/airavata-api/src/main/docker/post-wm/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/post-wm/Dockerfile
rename to airavata-api/src/main/docker/post-wm/Dockerfile
diff --git a/modules/distribution/src/main/docker/post-wm/wait-for-it.sh b/airavata-api/src/main/docker/post-wm/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/post-wm/wait-for-it.sh
rename to airavata-api/src/main/docker/post-wm/wait-for-it.sh
diff --git a/modules/distribution/src/main/docker/pre-wm/Dockerfile b/airavata-api/src/main/docker/pre-wm/Dockerfile
similarity index 100%
rename from modules/distribution/src/main/docker/pre-wm/Dockerfile
rename to airavata-api/src/main/docker/pre-wm/Dockerfile
diff --git a/modules/distribution/src/main/docker/pre-wm/wait-for-it.sh b/airavata-api/src/main/docker/pre-wm/wait-for-it.sh
similarity index 100%
rename from modules/distribution/src/main/docker/pre-wm/wait-for-it.sh
rename to airavata-api/src/main/docker/pre-wm/wait-for-it.sh
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/utils/JPAUtils.java b/airavata-api/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
index ad6d47f840..415c360840 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
@@ -38,8 +38,11 @@ public class JPAUtils {
static {
Map<String, String> properties = new HashMap<String, String>();
properties.put("openjpa.ConnectionDriverName", "org.apache.commons.dbcp2.BasicDataSource");
- properties.put("openjpa.DynamicEnhancementAgent", "false");
- properties.put("openjpa.RuntimeUnenhancedClasses", "unsupported");
+ properties.put(
+ "openjpa.DynamicEnhancementAgent", System.getProperty("openjpa.DynamicEnhancementAgent", "false"));
+ properties.put(
+ "openjpa.RuntimeUnenhancedClasses",
+ System.getProperty("openjpa.RuntimeUnenhancedClasses", "unsupported"));
properties.put("openjpa.RemoteCommitProvider", "sjvm");
properties.put("openjpa.Log", "DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
// use the following to enable logging of all SQL statements
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/submission/config/JobFactory.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/submission/config/JobFactory.java
index 202ed7bc0d..3eed223f16 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/submission/config/JobFactory.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/submission/config/JobFactory.java
@@ -34,19 +34,19 @@ public class JobFactory {
public static String getTemplateFileName(ResourceJobManagerType resourceJobManagerType) {
switch (resourceJobManagerType) {
case FORK:
- return "FORK_Groovy.template";
+ return "templates/FORK_Groovy.template";
case PBS:
- return "PBS_Groovy.template";
+ return "templates/PBS_Groovy.template";
case SLURM:
- return "SLURM_Groovy.template";
+ return "templates/SLURM_Groovy.template";
case UGE:
- return "UGE_Groovy.template";
+ return "templates/UGE_Groovy.template";
case LSF:
- return "LSF_Groovy.template";
+ return "templates/LSF_Groovy.template";
case CLOUD:
- return "CLOUD_Groovy.template";
+ return "templates/CLOUD_Groovy.template";
case HTCONDOR:
- return "HTCONDOR_Groovy.template";
+ return "templates/HTCONDOR_Groovy.template";
default:
return null;
}
@@ -119,7 +119,7 @@ public class JobFactory {
throw new Exception("Resource job manager can not be null");
}
- String templateFileName = getTemplateFileName(resourceJobManager.getResourceJobManagerType());
+ String templateFileName = "templates/" + getTemplateFileName(resourceJobManager.getResourceJobManagerType());
switch (resourceJobManager.getResourceJobManagerType()) {
case PBS:
return new PBSJobConfiguration(
diff --git a/airavata-api/src/main/resources/airavata-client.properties b/airavata-api/src/main/resources/airavata-client.properties
deleted file mode 100644
index 4bdb489b1f..0000000000
--- a/airavata-api/src/main/resources/airavata-client.properties
+++ /dev/null
@@ -1,249 +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.
-#
-
-api.secured=true
-api.server.monitoring.enabled=True
-api.server.monitoring.host=localhost
-api.server.monitoring.port=9097
-apiserver.host=localhost
-apiserver.min.threads=50
-apiserver.name=apiserver-node0
-apiserver.port=8930
-apiserver=org.apache.airavata.api.server.AiravataAPIServer
-
-appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.password=CHANGE_ME
-appcatalog.jdbc.url=jdbc:mariadb://localhost:13306/app_catalog
-appcatalog.jdbc.user=root
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-authz.cache.enabled=true
-authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
-
-cache.enable=false
-
-cluster.status.monitoring.enable=false
-cluster.status.monitoring.repeat.time=18000
-
-credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-credential.store.jdbc.password=CHANGE_ME
-credential.store.jdbc.url=jdbc:mariadb://localhost:13306/credential_store
-credential.store.jdbc.user=root
-credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-credential.store.keystore.alias=airavata
-credential.store.keystore.password=airavata
-credential.store.keystore.url=keystores/airavata.jks
-credential.store.server.host=localhost
-credential.store.server.port=8960
-credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
-
-data.analyzer.job.scanning.enable=false
-data.parser.delete.container=True
-
-db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
-
-default.registry.gateway=default
-default.registry.oauth.client.id=pga
-default.registry.oauth.client.secret=GtRMiIQG5UJJdmmeM6iQS0BZR4Yj0gbt
-default.registry.password.hash.method=SHA
-default.registry.password=CHANGE_ME
-default.registry.user=default-admin
-
-durable.queue=false
-
-email.based.monitor.address=monitoring.airavata@gmail.com
-email.based.monitor.folder.name=INBOX
-email.based.monitor.host=imap.gmail.com
-email.based.monitor.password=CHANGE_ME
-email.based.monitor.store.protocol=imaps
-email.based.monitoring.period=10000
-email.expiration.minutes=60
-email.from=airavata@apache.org
-email.password=CHANGE_ME
-email.server.port=465
-email.server=smtp.googlemail.com
-email.ssl=true
-email.user=airavata
-
-embedded.mode=false
-embedded.zk=false
-
-enable.kafka.logging=false
-enable.realtime.monitor=False
-enable.sharing=true
-enable.streaming.transfer=False
-enable.validation=true
-
-enactment.thread.pool.size=10
-
-experiment.launch.queue.name=experiment.launch.queue
-
-helix.cluster.name=AiravataCluster
-helix.controller.name=AiravataController
-helix.participant.name=AiravataParticipant
-
-host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
-
-iam.server.super.admin.password=CHANGE_ME
-iam.server.super.admin.username=admin
-iam.server.url=https://auth.dev.cybershuttle.org
-
-in.memory.cache.size=1000
-isRunningOnAws=false
-
-job.monitor.broker.publisher.id=AiravataMonitorPublisher
-job.monitor.email.publisher.id=EmailBasedProducer
-job.monitor.realtime.publisher.id=RealtimeProducer
-
-job.monitor.broker.topic=monitoring-data
-job.monitor.broker.url=localhost:9092
-job.notification.emailids=
-job.notification.enable=true
-job.notification.flags=abe
-job.status.publish.endpoint=http://localhost:8082/topics/helix-airavata-mq
-job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
-
-jpa.cache.size=-1
-
-kafka.broker.consumer.group=MonitoringConsumer
-kafka.broker.list=localhost:9092
-kafka.broker.topic=monitoring-data
-
-kafka.broker.url=localhost:9092
-kafka.parser.broker.consumer.group=CHANGE_ME
-kafka.parser.topic=CHANGE_ME
-kafka.parsing.broker.url=CHANGE_ME
-kafka.topic.prefix=local
-
-keystore.password=airavata
-keystore.path=keystores/airavata.jks
-
-local.data.location=/home/exouser/temp-storage
-
-metaschedluer.job.scanning.enable=false
-
-orchestrator.server.host=localhost
-orchestrator.server.min.threads=50
-orchestrator.server.name=orchestrator-node0
-orchestrator.server.port=8940
-orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
-
-parser.storage.resource.id=CHANGE_ME
-
-participant.monitoring.enabled=true
-participant.monitoring.host=localhost
-participant.monitoring.port=9096
-
-post.workflow.manager.loadbalance.clusters=false
-post.workflow.manager.monitoring.enabled=true
-post.workflow.manager.monitoring.host=localhost
-post.workflow.manager.monitoring.port=9094
-post.workflow.manager.name=AiravataPostWM
-
-pre.workflow.manager.loadbalance.clusters=false
-pre.workflow.manager.monitoring.enabled=true
-pre.workflow.manager.monitoring.host=localhost
-pre.workflow.manager.monitoring.port=9093
-pre.workflow.manager.name=AiravataPreWM
-
-prefetch.count=200
-
-process.launch.queue.name=process.launch.queue
-
-profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
-profile.service.jdbc.driver=org.mariadb.jdbc.Driver
-profile.service.jdbc.password=CHANGE_ME
-profile.service.jdbc.url=jdbc:mariadb://localhost:13306/profile_service
-profile.service.jdbc.user=root
-profile.service.server.host=localhost
-profile.service.server.port=8962
-profile.service.validationQuery=SELECT 1
-
-rabbitmq.broker.url=amqp://guest:guest@localhost:5672/develop
-rabbitmq.experiment.exchange.name=experiment_exchange
-rabbitmq.process.exchange.name=process_exchange
-rabbitmq.status.exchange.name=status_exchange
-
-realtime.monitor.broker.consumer.group=monitor
-realtime.monitor.broker.topic=helix-airavata-mq
-realtime.monitor.broker.url=localhost:9092
-
-registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.password=CHANGE_ME
-registry.jdbc.url=jdbc:mariadb://localhost:13306/experiment_catalog
-registry.jdbc.user=root
-
-regserver.server.host=localhost
-regserver.server.min.threads=50
-regserver.server.name=regserver-node0
-regserver.server.port=8970
-regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
-
-replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.password=CHANGE_ME
-replicacatalog.jdbc.url=jdbc:mariadb://localhost:13306/replica_catalog
-replicacatalog.jdbc.user=root
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
-
-sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
-sharing.registry.server.host=localhost
-sharing.registry.server.port=7878
-sharing.tls.enabled=false
-sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-sharingcatalog.jdbc.password=CHANGE_ME
-sharingcatalog.jdbc.url=jdbc:mariadb://localhost:13306/sharing_catalog
-sharingcatalog.jdbc.user=root
-sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-start.submitter=true
-submitter.interval=10000
-
-super.tenant.gatewayId=default
-
-threadpool.size=10
-
-thrift.client.pool.abandoned.removal.enabled=true
-thrift.client.pool.abandoned.removal.logged=false
-
-TLS.api.server.port=9930
-TLS.client.timeout=10000
-TLS.enabled=true
-
-trust.store.password=airavata
-trust.store=keystores/airavata.jks
-
-usage.reporting.endpoint=https://xsede-xdcdb-api.xsede.org/gateway/v2/job_attributes
-usage.reporting.key=CHANGE_ME
-userprofile.mongodb.host=localhost
-userprofile.mongodb.port=27017
-
-validationQuery=SELECT 1 from CONFIGURATION
-
-workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-workflowcatalog.jdbc.password=CHANGE_ME
-workflowcatalog.jdbc.url=jdbc:mariadb://localhost:13306/workflow_catalog
-workflowcatalog.jdbc.user=root
-workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
-workflowserver=org.apache.airavata.api.server.WorkflowServer
-
-zookeeper.server.connection=localhost:2181
-zookeeper.timeout=30000
diff --git a/airavata-api/src/main/resources/airavata-server.properties b/airavata-api/src/main/resources/airavata-server.properties
index 4bdb489b1f..51842da8f0 100644
--- a/airavata-api/src/main/resources/airavata-server.properties
+++ b/airavata-api/src/main/resources/airavata-server.properties
@@ -20,18 +20,17 @@
api.secured=true
api.server.monitoring.enabled=True
-api.server.monitoring.host=localhost
+api.server.monitoring.host=0.0.0.0
api.server.monitoring.port=9097
-apiserver.host=localhost
-apiserver.min.threads=50
+apiserver.host=0.0.0.0
apiserver.name=apiserver-node0
apiserver.port=8930
apiserver=org.apache.airavata.api.server.AiravataAPIServer
appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.password=CHANGE_ME
-appcatalog.jdbc.url=jdbc:mariadb://localhost:13306/app_catalog
-appcatalog.jdbc.user=root
+appcatalog.jdbc.password=123456
+appcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/app_catalog
+appcatalog.jdbc.user=airavata
appcatalog.validationQuery=SELECT 1 from CONFIGURATION
authz.cache.enabled=true
@@ -43,14 +42,14 @@ cluster.status.monitoring.enable=false
cluster.status.monitoring.repeat.time=18000
credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-credential.store.jdbc.password=CHANGE_ME
-credential.store.jdbc.url=jdbc:mariadb://localhost:13306/credential_store
-credential.store.jdbc.user=root
+credential.store.jdbc.password=123456
+credential.store.jdbc.url=jdbc:mariadb://airavata.host:13306/credential_store
+credential.store.jdbc.user=airavata
credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
credential.store.keystore.alias=airavata
credential.store.keystore.password=airavata
credential.store.keystore.url=keystores/airavata.jks
-credential.store.server.host=localhost
+credential.store.server.host=0.0.0.0
credential.store.server.port=8960
credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
@@ -61,9 +60,8 @@ db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
default.registry.gateway=default
default.registry.oauth.client.id=pga
-default.registry.oauth.client.secret=GtRMiIQG5UJJdmmeM6iQS0BZR4Yj0gbt
-default.registry.password.hash.method=SHA
-default.registry.password=CHANGE_ME
+default.registry.oauth.client.secret=upCMVu2RZcAXUqpr9V7phAbz6hhF9cbl
+default.registry.password=ade4#21242ftfd
default.registry.user=default-admin
durable.queue=false
@@ -71,12 +69,12 @@ durable.queue=false
email.based.monitor.address=monitoring.airavata@gmail.com
email.based.monitor.folder.name=INBOX
email.based.monitor.host=imap.gmail.com
-email.based.monitor.password=CHANGE_ME
+email.based.monitor.password=123456
email.based.monitor.store.protocol=imaps
email.based.monitoring.period=10000
email.expiration.minutes=60
email.from=airavata@apache.org
-email.password=CHANGE_ME
+email.password=123456
email.server.port=465
email.server=smtp.googlemail.com
email.ssl=true
@@ -85,7 +83,6 @@ email.user=airavata
embedded.mode=false
embedded.zk=false
-enable.kafka.logging=false
enable.realtime.monitor=False
enable.sharing=true
enable.streaming.transfer=False
@@ -101,9 +98,9 @@ helix.participant.name=AiravataParticipant
host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
-iam.server.super.admin.password=CHANGE_ME
+iam.server.super.admin.password=admin
iam.server.super.admin.username=admin
-iam.server.url=https://auth.dev.cybershuttle.org
+iam.server.url=http://airavata.host:18080
in.memory.cache.size=1000
isRunningOnAws=false
@@ -113,33 +110,29 @@ job.monitor.email.publisher.id=EmailBasedProducer
job.monitor.realtime.publisher.id=RealtimeProducer
job.monitor.broker.topic=monitoring-data
-job.monitor.broker.url=localhost:9092
+job.monitor.broker.url=airavata.host:9092
job.notification.emailids=
job.notification.enable=true
job.notification.flags=abe
-job.status.publish.endpoint=http://localhost:8082/topics/helix-airavata-mq
+job.status.publish.endpoint=http://airavata.host:8082/topics/helix-airavata-mq
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
-jpa.cache.size=-1
-
+kafka.broker.url=airavata.host:9092
kafka.broker.consumer.group=MonitoringConsumer
-kafka.broker.list=localhost:9092
kafka.broker.topic=monitoring-data
-kafka.broker.url=localhost:9092
-kafka.parser.broker.consumer.group=CHANGE_ME
-kafka.parser.topic=CHANGE_ME
-kafka.parsing.broker.url=CHANGE_ME
-kafka.topic.prefix=local
+kafka.parsing.broker.url=airavata.host:9092
+kafka.parser.broker.consumer.group=ParsingConsumer
+kafka.parser.topic=parsing-data
keystore.password=airavata
keystore.path=keystores/airavata.jks
-local.data.location=/home/exouser/temp-storage
+local.data.location=/tmp
metaschedluer.job.scanning.enable=false
-orchestrator.server.host=localhost
+orchestrator.server.host=airavata.host
orchestrator.server.min.threads=50
orchestrator.server.name=orchestrator-node0
orchestrator.server.port=8940
@@ -148,18 +141,18 @@ orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
parser.storage.resource.id=CHANGE_ME
participant.monitoring.enabled=true
-participant.monitoring.host=localhost
+participant.monitoring.host=airavata.host
participant.monitoring.port=9096
post.workflow.manager.loadbalance.clusters=false
post.workflow.manager.monitoring.enabled=true
-post.workflow.manager.monitoring.host=localhost
+post.workflow.manager.monitoring.host=airavata.host
post.workflow.manager.monitoring.port=9094
post.workflow.manager.name=AiravataPostWM
pre.workflow.manager.loadbalance.clusters=false
pre.workflow.manager.monitoring.enabled=true
-pre.workflow.manager.monitoring.host=localhost
+pre.workflow.manager.monitoring.host=airavata.host
pre.workflow.manager.monitoring.port=9093
pre.workflow.manager.name=AiravataPreWM
@@ -169,49 +162,49 @@ process.launch.queue.name=process.launch.queue
profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
profile.service.jdbc.driver=org.mariadb.jdbc.Driver
-profile.service.jdbc.password=CHANGE_ME
-profile.service.jdbc.url=jdbc:mariadb://localhost:13306/profile_service
-profile.service.jdbc.user=root
-profile.service.server.host=localhost
+profile.service.jdbc.password=123456
+profile.service.jdbc.url=jdbc:mariadb://airavata.host:13306/profile_service
+profile.service.jdbc.user=airavata
+profile.service.server.host=airavata.host
profile.service.server.port=8962
profile.service.validationQuery=SELECT 1
-rabbitmq.broker.url=amqp://guest:guest@localhost:5672/develop
+rabbitmq.broker.url=amqp://guest:guest@airavata.host:5672/develop
rabbitmq.experiment.exchange.name=experiment_exchange
rabbitmq.process.exchange.name=process_exchange
rabbitmq.status.exchange.name=status_exchange
realtime.monitor.broker.consumer.group=monitor
realtime.monitor.broker.topic=helix-airavata-mq
-realtime.monitor.broker.url=localhost:9092
+realtime.monitor.broker.url=airavata.host:9092
registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.password=CHANGE_ME
-registry.jdbc.url=jdbc:mariadb://localhost:13306/experiment_catalog
-registry.jdbc.user=root
+registry.jdbc.password=123456
+registry.jdbc.url=jdbc:mariadb://airavata.host:13306/experiment_catalog
+registry.jdbc.user=airavata
-regserver.server.host=localhost
+regserver.server.host=0.0.0.0
regserver.server.min.threads=50
regserver.server.name=regserver-node0
regserver.server.port=8970
regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.password=CHANGE_ME
-replicacatalog.jdbc.url=jdbc:mariadb://localhost:13306/replica_catalog
-replicacatalog.jdbc.user=root
+replicacatalog.jdbc.password=123456
+replicacatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/replica_catalog
+replicacatalog.jdbc.user=airavata
replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
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
sharing.tls.enabled=false
sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-sharingcatalog.jdbc.password=CHANGE_ME
-sharingcatalog.jdbc.url=jdbc:mariadb://localhost:13306/sharing_catalog
-sharingcatalog.jdbc.user=root
+sharingcatalog.jdbc.password=123456
+sharingcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/sharing_catalog
+sharingcatalog.jdbc.user=airavata
sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
start.submitter=true
@@ -231,19 +224,23 @@ TLS.enabled=true
trust.store.password=airavata
trust.store=keystores/airavata.jks
-usage.reporting.endpoint=https://xsede-xdcdb-api.xsede.org/gateway/v2/job_attributes
-usage.reporting.key=CHANGE_ME
-userprofile.mongodb.host=localhost
userprofile.mongodb.port=27017
validationQuery=SELECT 1 from CONFIGURATION
workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-workflowcatalog.jdbc.password=CHANGE_ME
-workflowcatalog.jdbc.url=jdbc:mariadb://localhost:13306/workflow_catalog
-workflowcatalog.jdbc.user=root
+workflowcatalog.jdbc.password=123456
+workflowcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/workflow_catalog
+workflowcatalog.jdbc.user=airavata
workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
-workflowserver=org.apache.airavata.api.server.WorkflowServer
-zookeeper.server.connection=localhost:2181
+zookeeper.server.connection=airavata.host:2181
zookeeper.timeout=30000
+
+###########################################################################
+# Specifies system level configurations as a key/value pairs.
+###########################################################################
+
+StrictHostKeyChecking=no
+
+airavata.config.dir=.
\ No newline at end of file
diff --git a/airavata-api/src/main/resources/appcatalog-derby.sql b/airavata-api/src/main/resources/appcatalog-derby.sql
deleted file mode 100644
index bc3be54f2e..0000000000
--- a/airavata-api/src/main/resources/appcatalog-derby.sql
+++ /dev/null
@@ -1,742 +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.
- *
- */
-
-CREATE TABLE COMPUTE_RESOURCE
-(
- RESOURCE_ID VARCHAR (255) NOT NULL,
- HOST_NAME VARCHAR (255) NOT NULL,
- RESOURCE_DESCRIPTION VARCHAR (255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- MAX_MEMORY_NODE INTEGER,
- CPUS_PER_NODE INTEGER,
- DEFAULT_NODE_COUNT INTEGER,
- DEFAULT_CPU_COUNT INTEGER,
- DEFAULT_WALLTIME INTEGER,
- ENABLED SMALLINT,
- GATEWAY_USAGE_REPORTING SMALLINT,
- GATEWAY_USAGE_MODULE_LOAD_CMD VARCHAR(500),
- GATEWAY_USAGE_EXECUTABLE VARCHAR(255),
- PRIMARY KEY (RESOURCE_ID)
-);
-
-CREATE TABLE HOST_ALIAS
-(
- RESOURCE_ID VARCHAR(255) NOT NULL,
- ALIAS VARCHAR(255),
- PRIMARY KEY(RESOURCE_ID,ALIAS),
- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE HOST_IPADDRESS
-(
- RESOURCE_ID VARCHAR(255) NOT NULL,
- IP_ADDRESS VARCHAR(255),
- PRIMARY KEY(RESOURCE_ID,IP_ADDRESS),
- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GSISSH_SUBMISSION
-(
- SUBMISSION_ID VARCHAR(255),
- RESOURCE_JOB_MANAGER VARCHAR(255),
- SSH_PORT INTEGER,
- INSTALLED_PATH VARCHAR(255),
- MONITOR_MODE VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE GSISSH_EXPORT
-(
- SUBMISSION_ID VARCHAR(255) NOT NULL,
- EXPORT VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID, EXPORT),
- FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GSISSH_PREJOBCOMMAND
-(
- SUBMISSION_ID VARCHAR(255) NOT NULL,
- COMMAND VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID, COMMAND),
- FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GSISSH_POSTJOBCOMMAND
-(
- SUBMISSION_ID VARCHAR(255) NOT NULL,
- COMMAND VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID, COMMAND),
- FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GLOBUS_SUBMISSION
-(
- SUBMISSION_ID VARCHAR(255),
- RESOURCE_JOB_MANAGER VARCHAR(255),
- SECURITY_PROTOCAL VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE UNICORE_SUBMISSION
-(
- SUBMISSION_ID VARCHAR(255),
- SECURITY_PROTOCAL VARCHAR(255),
- UNICORE_ENDPOINT_URL VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE UNICORE_DATAMOVEMENT
-(
- DATAMOVEMENT_ID VARCHAR(255),
- SECURITY_PROTOCAL VARCHAR(255),
- UNICORE_ENDPOINT_URL VARCHAR(255),
- PRIMARY KEY(DATAMOVEMENT_ID)
-);
-
-
-CREATE TABLE GLOBUS_GK_ENDPOINT
-(
- SUBMISSION_ID VARCHAR(255) NOT NULL,
- ENDPOINT VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID, ENDPOINT),
- FOREIGN KEY (SUBMISSION_ID) REFERENCES GLOBUS_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE RESOURCE_JOB_MANAGER
-(
- RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
- PUSH_MONITORING_ENDPOINT VARCHAR (255),
- JOB_MANAGER_BIN_PATH VARCHAR (255),
- RESOURCE_JOB_MANAGER_TYPE VARCHAR (255) NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (RESOURCE_JOB_MANAGER_ID)
-);
-
-
-
-CREATE TABLE SSH_JOB_SUBMISSION
-(
- RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
- JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
- ALTERNATIVE_SSH_HOSTNAME VARCHAR (255),
- SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
- SSH_PORT INTEGER,
- MONITOR_MODE VARCHAR (255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
- FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
-);
-
-CREATE TABLE SCP_DATA_MOVEMENT
-(
- QUEUE_DESCRIPTION VARCHAR (255),
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
- ALTERNATIVE_SCP_HOSTNAME VARCHAR (255),
- SSH_PORT INTEGER,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE GRIDFTP_DATA_MOVEMENT
-(
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE GRIDFTP_ENDPOINT
-(
- ENDPOINT VARCHAR (255) NOT NULL,
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID,ENDPOINT),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- FOREIGN KEY (DATA_MOVEMENT_INTERFACE_ID) REFERENCES GRIDFTP_DATA_MOVEMENT(DATA_MOVEMENT_INTERFACE_ID) ON DELETE CASCADE
-);
-
---CREATE TABLE JOB_SUBMISSION_PROTOCOL
---(
--- RESOURCE_ID VARCHAR(255),
--- SUBMISSION_ID VARCHAR(255),
--- JOB_TYPE VARCHAR(255),
--- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
--- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
--- PRIMARY KEY(RESOURCE_ID,SUBMISSION_ID,JOB_TYPE),
--- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
---);
---
---CREATE TABLE DATA_MOVEMENT_PROTOCOL
---(
--- RESOURCE_ID VARCHAR(255),
--- DATA_MOVE_ID VARCHAR(255),
--- DATA_MOVE_TYPE VARCHAR(255),
--- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
--- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
--- PRIMARY KEY(RESOURCE_ID,DATA_MOVE_ID,DATA_MOVE_TYPE),
--- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
---);
-
-CREATE TABLE APPLICATION_MODULE
-(
- MODULE_ID VARCHAR(255),
- MODULE_NAME VARCHAR(255),
- MODULE_VERSION VARCHAR(255),
- MODULE_DESC VARCHAR(500),
- GATEWAY_ID VARCHAR (255) NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
- PRIMARY KEY(MODULE_ID)
-);
-
-CREATE TABLE APPLICATION_DEPLOYMENT
-(
- DEPLOYMENT_ID VARCHAR(255),
- APP_MODULE_ID VARCHAR(255) NOT NULL,
- COMPUTE_HOSTID VARCHAR(255) NOT NULL,
- EXECUTABLE_PATH VARCHAR(255),
- PARALLELISM VARCHAR(255),
- APPLICATION_DESC VARCHAR(255),
- ENV_MODULE_LOAD_CMD VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
- GATEWAY_ID VARCHAR(255) NOT NULL,
- DEFAULT_QUEUE_NAME VARCHAR(255),
- DEFAULT_NODE_COUNT INTEGER,
- DEFAULT_CPU_COUNT INTEGER,
- DEFAULT_WALLTIME INTEGER,
- EDITABLE_BY_USER SMALLINT,
- PRIMARY KEY(DEPLOYMENT_ID),
- FOREIGN KEY (COMPUTE_HOSTID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
- FOREIGN KEY (APP_MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE MODULE_LOAD_CMD
-(
- CMD VARCHAR (255) NOT NULL,
- APP_DEPLOYMENT_ID VARCHAR (255) NOT NULL,
- COMMAND_ORDER INTEGER,
- PRIMARY KEY (APP_DEPLOYMENT_ID,CMD),
- FOREIGN KEY (APP_DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PREJOB_COMMAND
-(
- APPDEPLOYMENT_ID VARCHAR(255) NOT NULL,
- COMMAND VARCHAR(255),
- COMMAND_ORDER INTEGER,
- PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND),
- FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE POSTJOB_COMMAND
-(
- APPDEPLOYMENT_ID VARCHAR(255) NOT NULL,
- COMMAND VARCHAR(255),
- COMMAND_ORDER INTEGER,
- PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND),
- FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LIBRARY_PREPAND_PATH
-(
- DEPLOYMENT_ID VARCHAR(255) NOT NULL,
- NAME VARCHAR(255),
- VALUE VARCHAR(255),
- PRIMARY KEY(DEPLOYMENT_ID, NAME),
- FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LIBRARY_APEND_PATH
-(
- DEPLOYMENT_ID VARCHAR(255) NOT NULL,
- NAME VARCHAR(255),
- VALUE VARCHAR(255),
- PRIMARY KEY(DEPLOYMENT_ID, NAME),
- FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APP_ENVIRONMENT
-(
- DEPLOYMENT_ID VARCHAR(255) NOT NULL,
- NAME VARCHAR(255),
- VALUE VARCHAR(255),
- ENV_ORDER INTEGER,
- PRIMARY KEY(DEPLOYMENT_ID, NAME),
- FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_INTERFACE
-(
- INTERFACE_ID VARCHAR(255),
- APPLICATION_NAME VARCHAR(255),
- APPLICATION_DESCRIPTION VARCHAR(500),
- GATEWAY_ID VARCHAR(255) NOT NULL,
- ARCHIVE_WORKING_DIRECTORY SMALLINT,
- HAS_OPTIONAL_FILE_INPUTS SMALLINT,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
- PRIMARY KEY(INTERFACE_ID)
-);
-
-CREATE TABLE APP_MODULE_MAPPING
-(
- INTERFACE_ID VARCHAR(255) NOT NULL,
- MODULE_ID VARCHAR(255) NOT NULL,
- PRIMARY KEY(INTERFACE_ID, MODULE_ID),
- FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE,
- FOREIGN KEY (MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_INPUT
-(
- INTERFACE_ID VARCHAR(255) NOT NULL,
- INPUT_KEY VARCHAR(255),
- INPUT_VALUE VARCHAR(255),
- DATA_TYPE VARCHAR(255),
- METADATA VARCHAR(4096),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC CLOB,
- INPUT_ORDER INTEGER,
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_COMMANDLINE SMALLINT,
- DATA_STAGED SMALLINT,
- IS_READ_ONLY SMALLINT,
- OVERRIDE_FILENAME VARCHAR(255),
- PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
- FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_OUTPUT
-(
- INTERFACE_ID VARCHAR(255) NOT NULL,
- OUTPUT_KEY VARCHAR(255),
- OUTPUT_VALUE VARCHAR(255),
- DATA_TYPE VARCHAR(255),
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_COMMANDLINE SMALLINT,
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
- SEARCH_QUERY VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- OUTPUT_STREAMING SMALLINT,
- METADATA VARCHAR(4096),
- PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),
- FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GATEWAY_PROFILE
-(
- GATEWAY_ID VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- CS_TOKEN VARCHAR (255),
- IDENTITY_SERVER_TENANT VARCHAR (255),
- IDENTITY_SERVER_PWD_CRED_TOKEN VARCHAR (255),
- PRIMARY KEY(GATEWAY_ID)
-);
-
-CREATE TABLE COMPUTE_RESOURCE_PREFERENCE
-(
- GATEWAY_ID VARCHAR(255) NOT NULL,
- RESOURCE_ID VARCHAR(255) NOT NULL,
- OVERRIDE_BY_AIRAVATA SMALLINT,
- PREFERED_JOB_SUB_PROTOCOL VARCHAR(255),
- PREFERED_DATA_MOVE_PROTOCOL VARCHAR(255),
- PREFERED_BATCH_QUEUE VARCHAR(255),
- SCRATCH_LOCATION VARCHAR(255),
- ALLOCATION_PROJECT_NUMBER VARCHAR(255),
- LOGIN_USERNAME VARCHAR(255),
- RESOURCE_CS_TOKEN VARCHAR(255),
- USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
- QUALITY_OF_SERVICE VARCHAR(255),
- RESERVATION VARCHAR (255),
- RESERVATION_START_TIME timestamp,
- RESERVATION_END_TIME timestamp,
- SSH_ACCOUNT_PROVISIONER VARCHAR(255),
- SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO VARCHAR(1000),
- PRIMARY KEY(GATEWAY_ID,RESOURCE_ID),
- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE SSH_ACCOUNT_PROVISIONER_CONFIG
-(
- GATEWAY_ID VARCHAR(255) NOT NULL,
- RESOURCE_ID VARCHAR(255) NOT NULL,
- CONFIG_NAME VARCHAR(255) NOT NULL,
- CONFIG_VALUE VARCHAR(255),
- PRIMARY KEY (GATEWAY_ID, RESOURCE_ID, CONFIG_NAME),
- FOREIGN KEY (GATEWAY_ID, RESOURCE_ID) REFERENCES COMPUTE_RESOURCE_PREFERENCE (GATEWAY_ID, RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE BATCH_QUEUE
-(
- COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
- MAX_RUNTIME INTEGER,
- MAX_JOB_IN_QUEUE INTEGER,
- QUEUE_DESCRIPTION VARCHAR(255),
- QUEUE_NAME VARCHAR(255) NOT NULL,
- MAX_PROCESSORS INTEGER,
- MAX_NODES INTEGER,
- MAX_MEMORY INTEGER,
- CPU_PER_NODE INTEGER,
- DEFAULT_NODE_COUNT INTEGER,
- DEFAULT_CPU_COUNT INTEGER,
- DEFAULT_WALLTIME INTEGER,
- QUEUE_SPECIFIC_MACROS VARCHAR(255),
- IS_DEFAULT_QUEUE SMALLINT,
- PRIMARY KEY (COMPUTE_RESOURCE_ID,QUEUE_NAME),
- FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE COMPUTE_RESOURCE_FILE_SYSTEM
-(
- COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
- PATH VARCHAR (255),
- FILE_SYSTEM VARCHAR (255) NOT NULL,
- PRIMARY KEY (COMPUTE_RESOURCE_ID,FILE_SYSTEM),
- FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
- );
-
-CREATE TABLE JOB_SUBMISSION_INTERFACE
-(
- JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
- COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
- JOB_SUBMISSION_PROTOCOL VARCHAR (255) NOT NULL,
- PRIORITY_ORDER INTEGER,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (COMPUTE_RESOURCE_ID,JOB_SUBMISSION_INTERFACE_ID),
- FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE DATA_MOVEMENT_INTERFACE
-(
- COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
- DATA_MOVEMENT_PROTOCOL VARCHAR (255) NOT NULL,
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- PRIORITY_ORDER INTEGER,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (COMPUTE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID),
- FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE STORAGE_RESOURCE
-(
- STORAGE_RESOURCE_ID VARCHAR (255) NOT NULL,
- HOST_NAME VARCHAR (255) NOT NULL,
- DESCRIPTION VARCHAR (255),
- ENABLED SMALLINT ,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (STORAGE_RESOURCE_ID)
-);
-
-CREATE TABLE STORAGE_INTERFACE
-(
- STORAGE_RESOURCE_ID VARCHAR (255) NOT NULL,
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- DATA_MOVEMENT_PROTOCOL VARCHAR (255) NOT NULL,
- PRIORITY_ORDER INTEGER,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (STORAGE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID),
- FOREIGN KEY (STORAGE_RESOURCE_ID) REFERENCES STORAGE_RESOURCE(STORAGE_RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE JOB_MANAGER_COMMAND
-(
- RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
- COMMAND_TYPE VARCHAR (255) NOT NULL,
- COMMAND VARCHAR (255),
- PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE),
- FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PARALLELISM_COMMAND
-(
- RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
- COMMAND_TYPE VARCHAR (255) NOT NULL,
- COMMAND VARCHAR (255),
- PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE),
- FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LOCAL_SUBMISSION
-(
- RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
- JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
- SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
- FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
-);
-
-CREATE TABLE LOCAL_DATA_MOVEMENT
-(
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE STORAGE_PREFERENCE
-(
- GATEWAY_ID VARCHAR(255) NOT NULL,
- STORAGE_RESOURCE_ID VARCHAR(255) NOT NULL,
- LOGIN_USERNAME VARCHAR(255),
- FS_ROOT_LOCATION VARCHAR(255),
- RESOURCE_CS_TOKEN VARCHAR(255),
- PRIMARY KEY(GATEWAY_ID,STORAGE_RESOURCE_ID),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE USER_RESOURCE_PROFILE (
- USER_ID varchar(255) NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT NULL,
- CS_TOKEN varchar(255) DEFAULT NULL,
- GATEWAY_ID varchar(255) DEFAULT NULL,
- IDENTITY_SERVER_PWD_CRED_TOKEN varchar(255) DEFAULT NULL,
- IDENTITY_SERVER_TENANT varchar(255) DEFAULT NULL,
- UPDATE_TIME TIMESTAMP DEFAULT NULL,
- PRIMARY KEY (USER_ID,GATEWAY_ID)
-);
-
-CREATE TABLE USER_STORAGE_PREFERENCE (
- STORAGE_RESOURCE_ID varchar(255) NOT NULL,
- USER_ID varchar(255) NOT NULL,
- RESOURCE_CS_TOKEN varchar(255) DEFAULT NULL,
- FS_ROOT_LOCATION varchar(255) DEFAULT NULL,
- GATEWAY_ID varchar(255) DEFAULT NULL,
- LOGIN_USERNAME varchar(255) DEFAULT NULL,
- PRIMARY KEY (STORAGE_RESOURCE_ID,USER_ID,GATEWAY_ID)
-);
-
-CREATE TABLE USER_COMPUTE_RESOURCE_PREFERENCE (
- RESOURCE_ID varchar(255) NOT NULL,
- USER_ID varchar(255) NOT NULL,
- PREFERED_BATCH_QUEUE varchar(255) DEFAULT NULL,
- RESOURCE_CS_TOKEN varchar(255) DEFAULT NULL,
- GATEWAY_ID varchar(255) DEFAULT NULL,
- LOGIN_USERNAME varchar(255) DEFAULT NULL,
- ALLOCATION_PROJECT_NUMBER varchar(255) DEFAULT NULL,
- QUALITY_OF_SERVICE varchar(255) DEFAULT NULL,
- RESERVATION varchar(255) DEFAULT NULL,
- RESERVATION_END_TIME TIMESTAMP DEFAULT NULL,
- RESERVATION_START_TIME TIMESTAMP DEFAULT NULL,
- SCRATCH_LOCATION varchar(255) DEFAULT NULL,
- VALIDATED SMALLINT NOT NULL DEFAULT 0,
- PRIMARY KEY (RESOURCE_ID,USER_ID,GATEWAY_ID)
-);
-
-CREATE TABLE GROUP_RESOURCE_PROFILE (
- GATEWAY_ID varchar(255) NOT NULL,
- GROUP_RESOURCE_PROFILE_ID varchar(255) NOT NULL,
- GROUP_RESOURCE_PROFILE_NAME varchar(255) DEFAULT NULL,
- CREATION_TIME BIGINT NOT NULL,
- UPDATE_TIME BIGINT NOT NULL,
- DEFAULT_CREDENTIAL_STORE_TOKEN varchar(255) DEFAULT NULL,
- PRIMARY KEY (GROUP_RESOURCE_PROFILE_ID),
- UNIQUE (GATEWAY_ID, GROUP_RESOURCE_PROFILE_NAME)
-);
-
-CREATE TABLE BATCH_QUEUE_RESOURCE_POLICY (
- RESOURCE_POLICY_ID varchar(255) NOT NULL,
- COMPUTE_RESOURCE_ID varchar(255) NOT NULL,
- GROUP_RESOURCE_PROFILE_ID varchar(255) NOT NULL,
- QUEUE_NAME varchar(255) NOT NULL,
- MAX_ALLOWED_NODES INTEGER,
- MAX_ALLOWED_CORES INTEGER,
- MAX_ALLOWED_WALLTIME INTEGER,
- PRIMARY KEY (RESOURCE_POLICY_ID),
- FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
- FOREIGN KEY (GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_RESOURCE_PROFILE(GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE COMPUTE_RESOURCE_POLICY (
- RESOURCE_POLICY_ID varchar(255) NOT NULL,
- COMPUTE_RESOURCE_ID varchar(255) NOT NULL,
- GROUP_RESOURCE_PROFILE_ID varchar(255) NOT NULL,
- PRIMARY KEY (RESOURCE_POLICY_ID),
- FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
- FOREIGN KEY (GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_RESOURCE_PROFILE(GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE COMPUTE_RESOURCE_POLICY_QUEUES (
- RESOURCE_POLICY_ID varchar(255) NOT NULL,
- QUEUE_NAME varchar(255) NOT NULL,
- PRIMARY KEY (RESOURCE_POLICY_ID, QUEUE_NAME),
- FOREIGN KEY (RESOURCE_POLICY_ID) REFERENCES COMPUTE_RESOURCE_POLICY(RESOURCE_POLICY_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GROUP_COMPUTE_RESOURCE_PREFERENCE
-(
- RESOURCE_ID VARCHAR(255) NOT NULL,
- GROUP_RESOURCE_PROFILE_ID varchar(255) NOT NULL,
- OVERRIDE_BY_AIRAVATA SMALLINT,
- PREFERED_JOB_SUB_PROTOCOL VARCHAR(255),
- PREFERED_DATA_MOVE_PROTOCOL VARCHAR(255),
- PREFERED_BATCH_QUEUE VARCHAR(255),
- SCRATCH_LOCATION VARCHAR(255),
- ALLOCATION_PROJECT_NUMBER VARCHAR(255),
- LOGIN_USERNAME VARCHAR(255),
- RESOURCE_CS_TOKEN VARCHAR(255),
- USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
- QUALITY_OF_SERVICE VARCHAR(255),
- SSH_ACCOUNT_PROVISIONER VARCHAR(255),
- SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO VARCHAR(1000),
- PRIMARY KEY(RESOURCE_ID,GROUP_RESOURCE_PROFILE_ID),
- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
- FOREIGN KEY (GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_RESOURCE_PROFILE(GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE COMPUTE_RESOURCE_RESERVATION -- ComputeResourceReservationEntity
- (RESERVATION_ID VARCHAR(255) NOT NULL, END_TIME TIMESTAMP NOT NULL, RESERVATION_NAME VARCHAR(255) NOT NULL, START_TIME TIMESTAMP NOT NULL, RESOURCE_ID VARCHAR(255) NOT NULL, GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL, PRIMARY KEY (RESERVATION_ID));
-CREATE TABLE COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID VARCHAR(255), QUEUE_NAME VARCHAR(255) NOT NULL);
-CREATE INDEX I_CMPTN_Q_RESERVATION_ID ON COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID);
-ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD FOREIGN KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;
-
-CREATE TABLE GRP_SSH_ACC_PROV_CONFIG
-(
- RESOURCE_ID VARCHAR(255) NOT NULL,
- GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL,
- CONFIG_NAME VARCHAR(255) NOT NULL,
- CONFIG_VALUE VARCHAR(255),
- PRIMARY KEY (RESOURCE_ID, CONFIG_NAME, GROUP_RESOURCE_PROFILE_ID),
- FOREIGN KEY (RESOURCE_ID,GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID,GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PARSING_TEMPLATE
-(
- PARSING_TEMPLATE_ID VARCHAR(255) NOT NULL,
- APP_INTERFACE_ID VARCHAR(255) NOT NULL,
- GATEWAY_ID VARCHAR(255) NOT NULL,
- PRIMARY KEY (PARSING_TEMPLATE_ID)
-);
-
-CREATE TABLE PARSER
-(
- PARSER_ID VARCHAR(255) NOT NULL,
- IMAGE_NAME VARCHAR(255) NOT NULL,
- OUTPUT_DIR_PATH VARCHAR(255) NOT NULL,
- INPUT_DIR_PATH VARCHAR(255) NOT NULL,
- EXECUTION_COMMAND VARCHAR(255) NOT NULL,
- GATEWAY_ID VARCHAR(255) NOT NULL,
- PRIMARY KEY (PARSER_ID)
-);
-
-CREATE TABLE PARSER_OUTPUT
-(
- PARSER_OUTPUT_ID VARCHAR(255) NOT NULL,
- PARSER_OUTPUT_NAME VARCHAR(255) NOT NULL,
- PARSER_OUTPUT_REQUIRED SMALLINT NOT NULL,
- PARSER_ID VARCHAR(255) NOT NULL,
- OUTPUT_TYPE VARCHAR(255) NOT NULL,
- PRIMARY KEY (PARSER_OUTPUT_ID),
- FOREIGN KEY (PARSER_ID) REFERENCES PARSER (PARSER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PARSER_INPUT
-(
- PARSER_INPUT_ID VARCHAR(255) NOT NULL,
- PARSER_INPUT_NAME VARCHAR(255) NOT NULL,
- PARSER_INPUT_REQUIRED SMALLINT NOT NULL,
- PARSER_ID VARCHAR(255) NOT NULL,
- INPUT_TYPE VARCHAR(255) NOT NULL,
- PRIMARY KEY (PARSER_INPUT_ID),
- FOREIGN KEY (PARSER_ID) REFERENCES PARSER (PARSER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PARSING_TEMPLATE_INPUT
-(
- PARSING_TEMPLATE_INPUT_ID VARCHAR(255) NOT NULL,
- TARGET_PARSER_INPUT_ID VARCHAR(255) NOT NULL,
- APPLICATION_OUTPUT_NAME VARCHAR(255),
- VALUE VARCHAR(255),
- PARSING_TEMPLATE_ID VARCHAR(255) NOT NULL,
- PRIMARY KEY (PARSING_TEMPLATE_INPUT_ID),
- FOREIGN KEY (TARGET_PARSER_INPUT_ID) REFERENCES PARSER_INPUT (PARSER_INPUT_ID) ON DELETE CASCADE,
- FOREIGN KEY (PARSING_TEMPLATE_ID) REFERENCES PARSING_TEMPLATE (PARSING_TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PARSER_CONNECTOR
-(
- PARSER_CONNECTOR_ID VARCHAR(255) NOT NULL,
- PARENT_PARSER_ID VARCHAR(255) NOT NULL,
- CHILD_PARSER_ID VARCHAR(255) NOT NULL,
- PARSING_TEMPLATE_ID VARCHAR(255) NOT NULL,
- PRIMARY KEY (PARSER_CONNECTOR_ID),
- FOREIGN KEY (PARENT_PARSER_ID) REFERENCES PARSER (PARSER_ID) ON DELETE CASCADE,
- FOREIGN KEY (CHILD_PARSER_ID) REFERENCES PARSER (PARSER_ID) ON DELETE CASCADE,
- FOREIGN KEY (PARSING_TEMPLATE_ID) REFERENCES PARSING_TEMPLATE (PARSING_TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PARSER_CONNECTOR_INPUT
-(
- PARSER_CONNECTOR_INPUT_ID VARCHAR(255) NOT NULL,
- PARSER_INPUT_ID VARCHAR(255) NOT NULL,
- PARSER_OUTPUT_ID VARCHAR(255),
- VALUE VARCHAR(255),
- PARSER_CONNECTOR_ID VARCHAR(255) NOT NULL,
- PRIMARY KEY (PARSER_CONNECTOR_INPUT_ID),
- FOREIGN KEY (PARSER_INPUT_ID) REFERENCES PARSER_INPUT (PARSER_INPUT_ID) ON DELETE CASCADE,
- FOREIGN KEY (PARSER_OUTPUT_ID) REFERENCES PARSER_OUTPUT (PARSER_OUTPUT_ID) ON DELETE CASCADE,
- FOREIGN KEY (PARSER_CONNECTOR_ID) REFERENCES PARSER_CONNECTOR (PARSER_CONNECTOR_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GATEWAY_GROUPS
-(
- GATEWAY_ID VARCHAR(255) NOT NULL,
- ADMINS_GROUP_ID VARCHAR(255),
- READ_ONLY_ADMINS_GROUP_ID VARCHAR(255),
- DEFAULT_GATEWAY_USERS_GROUP_ID VARCHAR(255),
- PRIMARY KEY(GATEWAY_ID)
-);
-
-CREATE TABLE CLOUD_JOB_SUBMISSION (
- JOB_SUBMISSION_INTERFACE_ID varchar(255) NOT NULL,
- EXECUTABLE_TYPE VARCHAR(255) DEFAULT NULL,
- NODE_ID VARCHAR(255) DEFAULT NULL,
- PROVIDER_NAME VARCHAR(255) DEFAULT NULL,
- SECURITY_PROTOCOL VARCHAR(255) DEFAULT NULL,
- USER_ACCOUNT_NAME VARCHAR(255) DEFAULT NULL,
- PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID)
-);
-
-CREATE TABLE CONFIGURATION
-(
- CONFIG_KEY VARCHAR(255),
- CONFIG_VAL VARCHAR(255),
- PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.16');
-
-
-
diff --git a/airavata-api/src/main/resources/credstore-derby.sql b/airavata-api/src/main/resources/credstore-derby.sql
deleted file mode 100644
index 7ccc001f88..0000000000
--- a/airavata-api/src/main/resources/credstore-derby.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-CREATE TABLE COMMUNITY_USER (
- GATEWAY_ID VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- TOKEN_ID VARCHAR(256) NOT NULL,
- COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
- PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)
-);
-
-CREATE TABLE CREDENTIALS (
- GATEWAY_ID VARCHAR(256) NOT NULL,
- TOKEN_ID VARCHAR(256) NOT NULL,
- CREDENTIAL BLOB NOT NULL,
- PORTAL_USER_ID VARCHAR(256) NOT NULL,
- TIME_PERSISTED TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- DESCRIPTION VARCHAR(500),
- CREDENTIAL_OWNER_TYPE VARCHAR(10) DEFAULT 'GATEWAY' NOT NULL,
- PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
-);
-
-CREATE TABLE CONFIGURATION (
- CONFIG_KEY VARCHAR(255),
- CONFIG_VAL VARCHAR(255),
- PRIMARY KEY (CONFIG_KEY, CONFIG_VAL)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES ('credential_store_version', '0.16');
-
diff --git a/airavata-api/src/main/resources/airavataworkflowcatalog-derby.sql b/airavata-api/src/main/resources/database_scripts/airavataworkflowcatalog-derby.sql
similarity index 100%
rename from airavata-api/src/main/resources/airavataworkflowcatalog-derby.sql
rename to airavata-api/src/main/resources/database_scripts/airavataworkflowcatalog-derby.sql
diff --git a/airavata-api/src/main/resources/appcatalog-mysql.sql b/airavata-api/src/main/resources/database_scripts/appcatalog-mysql.sql
similarity index 100%
rename from airavata-api/src/main/resources/appcatalog-mysql.sql
rename to airavata-api/src/main/resources/database_scripts/appcatalog-mysql.sql
diff --git a/airavata-api/src/main/resources/credstore-mysql.sql b/airavata-api/src/main/resources/database_scripts/credstore-mysql.sql
similarity index 100%
rename from airavata-api/src/main/resources/credstore-mysql.sql
rename to airavata-api/src/main/resources/database_scripts/credstore-mysql.sql
diff --git a/airavata-api/src/main/resources/expcatalog-mysql.sql b/airavata-api/src/main/resources/database_scripts/expcatalog-mysql.sql
similarity index 100%
rename from airavata-api/src/main/resources/expcatalog-mysql.sql
rename to airavata-api/src/main/resources/database_scripts/expcatalog-mysql.sql
diff --git a/airavata-api/src/main/resources/replicacatalog-mysql.sql b/airavata-api/src/main/resources/database_scripts/replicacatalog-mysql.sql
similarity index 100%
rename from airavata-api/src/main/resources/replicacatalog-mysql.sql
rename to airavata-api/src/main/resources/database_scripts/replicacatalog-mysql.sql
diff --git a/airavata-api/src/main/resources/sharing-registry-mysql.sql b/airavata-api/src/main/resources/database_scripts/sharing-registry-mysql.sql
similarity index 100%
rename from airavata-api/src/main/resources/sharing-registry-mysql.sql
rename to airavata-api/src/main/resources/database_scripts/sharing-registry-mysql.sql
diff --git a/airavata-api/src/main/resources/user-profile-catalog-mysql.sql b/airavata-api/src/main/resources/database_scripts/user-profile-catalog-mysql.sql
similarity index 100%
rename from airavata-api/src/main/resources/user-profile-catalog-mysql.sql
rename to airavata-api/src/main/resources/database_scripts/user-profile-catalog-mysql.sql
diff --git a/airavata-api/src/main/resources/workflowcatalog-mysql.sql b/airavata-api/src/main/resources/database_scripts/workflowcatalog-mysql.sql
similarity index 100%
rename from airavata-api/src/main/resources/workflowcatalog-mysql.sql
rename to airavata-api/src/main/resources/database_scripts/workflowcatalog-mysql.sql
diff --git a/modules/distribution/src/main/resources/distribution/bin/controller.sh b/airavata-api/src/main/resources/distribution/bin/controller.sh
similarity index 100%
rename from modules/distribution/src/main/resources/distribution/bin/controller.sh
rename to airavata-api/src/main/resources/distribution/bin/controller.sh
diff --git a/modules/distribution/src/main/resources/distribution/bin/email-monitor.sh b/airavata-api/src/main/resources/distribution/bin/email-monitor.sh
similarity index 100%
rename from modules/distribution/src/main/resources/distribution/bin/email-monitor.sh
rename to airavata-api/src/main/resources/distribution/bin/email-monitor.sh
diff --git a/modules/distribution/src/main/resources/distribution/bin/orchestrator.sh b/airavata-api/src/main/resources/distribution/bin/orchestrator.sh
similarity index 84%
rename from modules/distribution/src/main/resources/distribution/bin/orchestrator.sh
rename to airavata-api/src/main/resources/distribution/bin/orchestrator.sh
index cdf615f51b..5e457ac5bc 100755
--- a/modules/distribution/src/main/resources/distribution/bin/orchestrator.sh
+++ b/airavata-api/src/main/resources/distribution/bin/orchestrator.sh
@@ -27,14 +27,6 @@ SERVERS=""
ARGS=()
while [[ $# -gt 0 ]]; do
case $1 in
- -security)
- JAVA_OPTS+=" -Djava.security.manager -Djava.security.policy=${AIRAVATA_HOME}/conf/axis2.policy -Daxis2.home=${AIRAVATA_HOME}"
- shift
- ;;
- -enableLegacyTLS)
- JAVA_OPTS+=" -Djava.security.policy=${AIRAVATA_HOME}/bin/enableLegacyTLS.security -Djava.security.disableSystemPropertiesFile=true"
- shift
- ;;
apiserver | gfac | orchestrator | credentialstore | regserver)
if [ -z "$SERVERS" ]; then SERVERS="$1"; else SERVERS="$SERVERS,$1"; fi
shift
diff --git a/modules/distribution/src/main/resources/distribution/bin/parser-wm.sh b/airavata-api/src/main/resources/distribution/bin/parser-wm.sh
similarity index 100%
rename from modules/distribution/src/main/resources/distribution/bin/parser-wm.sh
rename to airavata-api/src/main/resources/distribution/bin/parser-wm.sh
diff --git a/modules/distribution/src/main/resources/distribution/bin/participant.sh b/airavata-api/src/main/resources/distribution/bin/participant.sh
similarity index 100%
rename from modules/distribution/src/main/resources/distribution/bin/participant.sh
rename to airavata-api/src/main/resources/distribution/bin/participant.sh
diff --git a/modules/distribution/src/main/resources/distribution/bin/post-wm.sh b/airavata-api/src/main/resources/distribution/bin/post-wm.sh
similarity index 100%
rename from modules/distribution/src/main/resources/distribution/bin/post-wm.sh
rename to airavata-api/src/main/resources/distribution/bin/post-wm.sh
diff --git a/modules/distribution/src/main/resources/distribution/bin/pre-wm.sh b/airavata-api/src/main/resources/distribution/bin/pre-wm.sh
similarity index 100%
rename from modules/distribution/src/main/resources/distribution/bin/pre-wm.sh
rename to airavata-api/src/main/resources/distribution/bin/pre-wm.sh
diff --git a/modules/distribution/src/main/resources/distribution/bin/realtime-monitor.sh b/airavata-api/src/main/resources/distribution/bin/realtime-monitor.sh
similarity index 100%
rename from modules/distribution/src/main/resources/distribution/bin/realtime-monitor.sh
rename to airavata-api/src/main/resources/distribution/bin/realtime-monitor.sh
diff --git a/modules/distribution/src/main/resources/distribution/bin/setenv.sh b/airavata-api/src/main/resources/distribution/bin/setenv.sh
similarity index 100%
rename from modules/distribution/src/main/resources/distribution/bin/setenv.sh
rename to airavata-api/src/main/resources/distribution/bin/setenv.sh
diff --git a/modules/distribution/src/main/resources/distribution/bin/sharing-registry.sh b/airavata-api/src/main/resources/distribution/bin/sharing-registry.sh
similarity index 100%
rename from modules/distribution/src/main/resources/distribution/bin/sharing-registry.sh
rename to airavata-api/src/main/resources/distribution/bin/sharing-registry.sh
diff --git a/airavata-api/src/main/resources/distribution/conf/.gitkeep b/airavata-api/src/main/resources/distribution/conf/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/airavata-api/src/main/resources/enableLegacyTLS.properties b/airavata-api/src/main/resources/enableLegacyTLS.properties
deleted file mode 100644
index b11f9d560e..0000000000
--- a/airavata-api/src/main/resources/enableLegacyTLS.properties
+++ /dev/null
@@ -1,23 +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.
-#
-
-# Remove TLSv1 and TLSv1.1 from disabledAlgorithms
-jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, \
- DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, \
- include jdk.disabled.namedCurves
diff --git a/airavata-api/src/main/resources/expcatalog-derby.sql b/airavata-api/src/main/resources/expcatalog-derby.sql
deleted file mode 100644
index 914a81b3a8..0000000000
--- a/airavata-api/src/main/resources/expcatalog-derby.sql
+++ /dev/null
@@ -1,445 +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.
- *
- */
-
-CREATE TABLE GATEWAY
-(
- GATEWAY_ID VARCHAR(255),
- GATEWAY_NAME VARCHAR(255),
- DOMAIN VARCHAR(255),
- EMAIL_ADDRESS VARCHAR(255),
- GATEWAY_ACRONYM varchar(255),
- GATEWAY_ADMIN_EMAIL varchar(255),
- GATEWAY_ADMIN_FIRST_NAME varchar(255),
- GATEWAY_APPROVAL_STATUS varchar(255),
- GATEWAY_PUBLIC_ABSTRACT varchar(255),
- GATEWAY_URL varchar(255),
- GATEWAY_ADMIN_LAST_NAME varchar(255),
- IDENTITY_SERVER_PASSWORD_TOKEN varchar(255),
- IDENTITY_SERVER_USERNAME varchar(255),
- GATEWAY_REVIEW_PROPOSAL_DESCRIPTION varchar(255),
- DECLINED_REASON varchar(255),
- OAUTH_CLIENT_SECRET varchar(255),
- OAUTH_CLIENT_ID varchar(255),
- REQUEST_CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- REQUESTER_USERNAME VARCHAR(255),
- PRIMARY KEY (GATEWAY_ID)
-);
-
-CREATE TABLE NOTIFICATION
-(
- NOTIFICATION_ID VARCHAR(255) NOT NULL,
- GATEWAY_ID VARCHAR(255),
- TITLE VARCHAR(255),
- PRIORITY VARCHAR(255),
- NOTIFICATION_MESSAGE VARCHAR(4096) NOT NULL,
- PUBLISHED_DATE TIMESTAMP,
- EXPIRATION_DATE TIMESTAMP,
- CREATION_DATE TIMESTAMP,
- PRIMARY KEY (NOTIFICATION_ID)
-);
-
-CREATE TABLE USERS
-(
- AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
- USER_NAME VARCHAR(255),
- PASSWORD VARCHAR(255),
- GATEWAY_ID VARCHAR(255) NOT NULL,
- PRIMARY KEY (GATEWAY_ID, USER_NAME),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE,
- UNIQUE (AIRAVATA_INTERNAL_USER_ID)
-);
-
-CREATE TABLE GATEWAY_WORKER
-(
- GATEWAY_ID VARCHAR(255) NOT NULL,
- USER_NAME VARCHAR(255),
- PRIMARY KEY (GATEWAY_ID, USER_NAME),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PROJECT
-(
- GATEWAY_ID VARCHAR(255) NOT NULL,
- USER_NAME VARCHAR(255),
- PROJECT_NAME VARCHAR(255),
- PROJECT_ID VARCHAR(255),
- DESCRIPTION VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (PROJECT_ID),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PROJECT_USER
-(
- PROJECT_ID VARCHAR(255) NOT NULL,
- USER_NAME VARCHAR(255) NOT NULL,
- PRIMARY KEY (PROJECT_ID,USER_NAME),
- FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE EXPERIMENT (
- EXPERIMENT_ID varchar(255),
- PROJECT_ID varchar(255) NOT NULL,
- GATEWAY_ID varchar(255),
- EXPERIMENT_TYPE varchar(255),
- USER_NAME varchar(255),
- EXPERIMENT_NAME varchar(255),
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- DESCRIPTION varchar(255),
- EXECUTION_ID varchar(255),
- GATEWAY_EXECUTION_ID varchar(255),
- GATEWAY_INSTANCE_ID varchar(255),
- ENABLE_EMAIL_NOTIFICATION SMALLINT,
- EMAIL_ADDRESSES CLOB,
- PRIMARY KEY (EXPERIMENT_ID),
- FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE
-);
-
-
-CREATE TABLE EXPERIMENT_INPUT
-(
- EXPERIMENT_ID varchar(255) NOT NULL,
- INPUT_NAME varchar(255),
- INPUT_VALUE CLOB,
- DATA_TYPE varchar(255),
- APPLICATION_ARGUMENT varchar(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESCRIPTION CLOB,
- METADATA varchar(4096),
- INPUT_ORDER INT,
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_ADDED_TO_CMD SMALLINT,
- DATA_STAGED SMALLINT,
- STORAGE_RESOURCE_ID varchar(255),
- IS_READ_ONLY SMALLINT,
- OVERRIDE_FILENAME VARCHAR(255),
- PRIMARY KEY(EXPERIMENT_ID,INPUT_NAME),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE EXPERIMENT_OUTPUT
-(
- EXPERIMENT_ID varchar(255) NOT NULL,
- OUTPUT_NAME varchar(255),
- OUTPUT_VALUE CLOB,
- DATA_TYPE varchar(255),
- APPLICATION_ARGUMENT varchar(255),
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_ADDED_TO_CMD SMALLINT,
- DATA_MOVEMENT SMALLINT,
- LOCATION varchar(255),
- SEARCH_QUERY varchar(255),
- OUTPUT_STREAMING SMALLINT,
- STORAGE_RESOURCE_ID varchar(255),
- METADATA varchar(4096),
- PRIMARY KEY(EXPERIMENT_ID,OUTPUT_NAME),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
-
-
-CREATE TABLE EXPERIMENT_STATUS (
- STATUS_ID varchar(255),
- EXPERIMENT_ID varchar(255) NOT NULL,
- STATE varchar(255),
- TIME_OF_STATE_CHANGE TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- REASON CLOB,
- PRIMARY KEY (STATUS_ID, EXPERIMENT_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
-
-
-CREATE TABLE EXPERIMENT_ERROR (
- ERROR_ID varchar(255),
- EXPERIMENT_ID varchar(255) NOT NULL,
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- ACTUAL_ERROR_MESSAGE CLOB,
- USER_FRIENDLY_MESSAGE CLOB,
- TRANSIENT_OR_PERSISTENT SMALLINT,
- ROOT_CAUSE_ERROR_ID_LIST CLOB,
- PRIMARY KEY (ERROR_ID, EXPERIMENT_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE USER_CONFIGURATION_DATA (
- EXPERIMENT_ID varchar(255) NOT NULL,
- AIRAVATA_AUTO_SCHEDULE SMALLINT,
- OVERRIDE_MANUAL_SCHEDULED_PARAMS SMALLINT,
- SHARE_EXPERIMENT_PUBLICALLY SMALLINT,
- THROTTLE_RESOURCES SMALLINT,
- USER_DN varchar(255),
- GENERATE_CERT SMALLINT,
- RESOURCE_HOST_ID varchar(255),
- TOTAL_CPU_COUNT INT,
- NODE_COUNT INT,
- NUMBER_OF_THREADS INT,
- QUEUE_NAME varchar(255),
- WALL_TIME_LIMIT INT,
- TOTAL_PHYSICAL_MEMORY INT,
- STATIC_WORKING_DIR varchar(255),
- OVERRIDE_LOGIN_USER_NAME varchar(255),
- OVERRIDE_SCRATCH_LOCATION varchar(255),
- OVERRIDE_ALLOCATION_PROJECT_NUMBER varchar(255),
- STORAGE_RESOURCE_ID varchar(255),
- EXPERIMENT_DATA_DIR VARCHAR (512),
- GROUP_RESOURCE_PROFILE_ID VARCHAR(255) DEFAULT NULL,
- IS_USE_USER_CR_PREF SMALLINT,
- PRIMARY KEY (EXPERIMENT_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE COMPUTE_RESOURCE_SCHEDULING (
- EXPERIMENT_ID varchar(255) NOT NULL,
- RESOURCE_HOST_ID varchar(255) NOT NULL,
- TOTAL_CPU_COUNT INT,
- NODE_COUNT INT,
- NUMBER_OF_THREADS INT,
- QUEUE_NAME varchar(255) NOT NULL,
- WALL_TIME_LIMIT INT,
- TOTAL_PHYSICAL_MEMORY INT,
- PARALLEL_GROUP_COUNT INT,
- STATIC_WORKING_DIR varchar(255),
- OVERRIDE_LOGIN_USER_NAME varchar(255),
- OVERRIDE_SCRATCH_LOCATION varchar(255),
- OVERRIDE_ALLOCATION_PROJECT_NUMBER varchar(255),
- PRIMARY KEY (EXPERIMENT_ID,RESOURCE_HOST_ID,QUEUE_NAME),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
-
-
-CREATE VIEW LATEST_EXPERIMENT_STATUS AS
- select ES1.EXPERIMENT_ID AS EXPERIMENT_ID, ES1.STATE AS STATE, ES1.TIME_OF_STATE_CHANGE AS TIME_OF_STATE_CHANGE
- from EXPERIMENT_STATUS ES1 LEFT JOIN EXPERIMENT_STATUS ES2 ON (ES1.EXPERIMENT_ID = ES2.EXPERIMENT_ID
- AND ES1.TIME_OF_STATE_CHANGE < ES2.TIME_OF_STATE_CHANGE) WHERE ES2.TIME_OF_STATE_CHANGE is NULL;
-
-CREATE VIEW EXPERIMENT_SUMMARY AS
- select E.EXPERIMENT_ID AS EXPERIMENT_ID, E.PROJECT_ID AS PROJECT_ID, E.GATEWAY_ID AS GATEWAY_ID,
- E.USER_NAME AS USER_NAME, E.EXECUTION_ID AS EXECUTION_ID, E.EXPERIMENT_NAME AS EXPERIMENT_NAME,
- E.CREATION_TIME AS CREATION_TIME, E.DESCRIPTION AS DESCRIPTION, ES.STATE AS STATE, UD.RESOURCE_HOST_ID
- AS RESOURCE_HOST_ID, ES.TIME_OF_STATE_CHANGE AS TIME_OF_STATE_CHANGE
- from ((EXPERIMENT E left join LATEST_EXPERIMENT_STATUS ES on((E.EXPERIMENT_ID = ES.EXPERIMENT_ID)))
- left join USER_CONFIGURATION_DATA UD on((E.EXPERIMENT_ID = UD.EXPERIMENT_ID))) where true;
-
-CREATE TABLE PROCESS (
- PROCESS_ID varchar(255),
- EXPERIMENT_ID varchar(255) NOT NULL,
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- LAST_UPDATE_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- PROCESS_DETAIL CLOB,
- APPLICATION_INTERFACE_ID varchar(255),
- TASK_DAG CLOB,
- APPLICATION_DEPLOYMENT_ID varchar(255),
- COMPUTE_RESOURCE_ID varchar(255),
- GATEWAY_EXECUTION_ID varchar(255),
- ENABLE_EMAIL_NOTIFICATION SMALLINT,
- EMAIL_ADDRESSES CLOB,
- STORAGE_RESOURCE_ID varchar(255),
- USER_DN varchar(255),
- GENERATE_CERT SMALLINT,
- EXPERIMENT_DATA_DIR VARCHAR (512),
- USERNAME VARCHAR (255),
- GROUP_RESOURCE_PROFILE_ID VARCHAR (255) DEFAULT NULL,
- USE_USER_CR_PREF SMALLINT,
- PRIMARY KEY (PROCESS_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PROCESS_INPUT
-(
- PROCESS_ID varchar(255) NOT NULL,
- INPUT_NAME varchar(255),
- INPUT_VALUE CLOB,
- DATA_TYPE varchar(255),
- APPLICATION_ARGUMENT varchar(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESCRIPTION CLOB,
- METADATA varchar(4096),
- INPUT_ORDER INT,
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_ADDED_TO_CMD SMALLINT,
- DATA_STAGED SMALLINT,
- STORAGE_RESOURCE_ID varchar(255),
- IS_READ_ONLY SMALLINT,
- OVERRIDE_FILENAME VARCHAR(255),
- PRIMARY KEY(PROCESS_ID,INPUT_NAME),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PROCESS_OUTPUT
-(
- PROCESS_ID varchar(255) NOT NULL,
- OUTPUT_NAME varchar(255),
- OUTPUT_VALUE CLOB,
- DATA_TYPE varchar(255),
- APPLICATION_ARGUMENT varchar(255),
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_ADDED_TO_CMD SMALLINT,
- DATA_MOVEMENT SMALLINT,
- LOCATION varchar(255),
- SEARCH_QUERY varchar(255),
- OUTPUT_STREAMING SMALLINT,
- STORAGE_RESOURCE_ID varchar(255),
- METADATA varchar(4096),
- PRIMARY KEY(PROCESS_ID,OUTPUT_NAME),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
-
-
-CREATE TABLE PROCESS_STATUS (
- STATUS_ID varchar(255),
- PROCESS_ID varchar(255) NOT NULL,
- STATE varchar(255),
- TIME_OF_STATE_CHANGE TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- REASON CLOB,
- PRIMARY KEY (STATUS_ID, PROCESS_ID),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
-
-
-CREATE TABLE PROCESS_ERROR (
- ERROR_ID varchar(255),
- PROCESS_ID varchar(255) NOT NULL,
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- ACTUAL_ERROR_MESSAGE CLOB,
- USER_FRIENDLY_MESSAGE CLOB,
- TRANSIENT_OR_PERSISTENT SMALLINT,
- ROOT_CAUSE_ERROR_ID_LIST CLOB,
- PRIMARY KEY (ERROR_ID, PROCESS_ID),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PROCESS_RESOURCE_SCHEDULE (
- PROCESS_ID varchar(255) NOT NULL,
- RESOURCE_HOST_ID varchar(255),
- TOTAL_CPU_COUNT INT,
- NODE_COUNT INT,
- NUMBER_OF_THREADS INT,
- QUEUE_NAME varchar(255),
- WALL_TIME_LIMIT INT,
- TOTAL_PHYSICAL_MEMORY INT,
- STATIC_WORKING_DIR varchar(255),
- OVERRIDE_ALLOCATION_PROJECT_NUMBER varchar(255),
- OVERRIDE_LOGIN_USER_NAME varchar(255),
- OVERRIDE_SCRATCH_LOCATION varchar(255),
- PRIMARY KEY (PROCESS_ID),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE TASK (
- TASK_ID varchar(255),
- TASK_TYPE varchar(255),
- PARENT_PROCESS_ID varchar(255),
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- LAST_UPDATE_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- TASK_DETAIL CLOB,
- SUB_TASK_MODEL BLOB,
- MAX_RETRY INT NOT NULL DEFAULT 3,
- CURRENT_RETRY INT NOT NULL DEFAULT 0,
- PRIMARY KEY (TASK_ID),
- FOREIGN KEY (PARENT_PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE TASK_STATUS (
- STATUS_ID varchar(255),
- TASK_ID varchar(255) NOT NULL,
- STATE varchar(255),
- TIME_OF_STATE_CHANGE TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- REASON CLOB,
- PRIMARY KEY (STATUS_ID, TASK_ID),
- FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
-);
-
-
-CREATE TABLE TASK_ERROR (
- ERROR_ID varchar(255),
- TASK_ID varchar(255) NOT NULL,
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- ACTUAL_ERROR_MESSAGE CLOB,
- USER_FRIENDLY_MESSAGE CLOB,
- TRANSIENT_OR_PERSISTENT SMALLINT,
- ROOT_CAUSE_ERROR_ID_LIST CLOB,
- PRIMARY KEY (ERROR_ID, TASK_ID),
- FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE JOB (
- JOB_ID varchar(255),
- TASK_ID varchar(255) NOT NULL,
- PROCESS_ID varchar(255),
- JOB_DESCRIPTION CLOB NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- COMPUTE_RESOURCE_CONSUMED varchar(255),
- JOB_NAME varchar(255),
- WORKING_DIR varchar(255),
- STD_OUT CLOB,
- STD_ERR CLOB,
- EXIT_CODE INT,
- PRIMARY KEY (JOB_ID, TASK_ID),
- FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE JOB_STATUS (
- STATUS_ID varchar(255),
- JOB_ID varchar(255) NOT NULL,
- TASK_ID varchar(255) NOT NULL,
- STATE varchar(255),
- TIME_OF_STATE_CHANGE TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- REASON CLOB,
- PRIMARY KEY (STATUS_ID, JOB_ID, TASK_ID),
- FOREIGN KEY (JOB_ID, TASK_ID) REFERENCES JOB(JOB_ID, TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE QUEUE_STATUS(
- HOST_NAME VARCHAR(255) NOT NULL,
- QUEUE_NAME VARCHAR(255) NOT NULL,
- CREATED_TIME BIGINT NOT NULL,
- QUEUE_UP SMALLINT,
- RUNNING_JOBS INT,
- QUEUED_JOBS INT,
- PRIMARY KEY (HOST_NAME, QUEUE_NAME, CREATED_TIME)
-);
-
-CREATE TABLE CONFIGURATION
-(
- CONFIG_KEY VARCHAR(255),
- CONFIG_VAL VARCHAR(255),
- EXPIRE_DATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- CATEGORY_ID VARCHAR (255),
- PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.16', CURRENT_TIMESTAMP ,'SYSTEM');
-
-CREATE TABLE PROCESS_WORKFLOW
-(
- PROCESS_ID varchar(255) NOT NULL,
- WORKFLOW_ID varchar(255) NOT NULL,
- TYPE varchar(255) DEFAULT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (PROCESS_ID, WORKFLOW_ID),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GATEWAY_USAGE_REPORTING_COMMAND (
- GATEWAY_ID VARCHAR(255) NOT NULL,
- COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
- COMMAND LONG VARCHAR NOT NULL,
- PRIMARY KEY (GATEWAY_ID, COMPUTE_RESOURCE_ID)
-)
diff --git a/airavata-api/src/main/resources/gsissh.properties b/airavata-api/src/main/resources/gsissh.properties
deleted file mode 100644
index 3fdf76df98..0000000000
--- a/airavata-api/src/main/resources/gsissh.properties
+++ /dev/null
@@ -1,26 +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.
-#
-
-###########################################################################
-# Specifies system level configurations as a key/value pairs.
-###########################################################################
-
-StrictHostKeyChecking=no
-ssh.session.timeout=360000
diff --git a/airavata-api/src/main/resources/log4j2.xml b/airavata-api/src/main/resources/log4j2.xml
index 2af1a20101..8fb27b1b68 100644
--- a/airavata-api/src/main/resources/log4j2.xml
+++ b/airavata-api/src/main/resources/log4j2.xml
@@ -25,18 +25,6 @@
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n" />
</Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata-api.log"
- filePattern="../logs/airavata-api-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
</Appenders>
<Loggers>
<logger name="ch.qos.logback" level="WARN" />
@@ -46,7 +34,6 @@
<logger name="org.hibernate" level="ERROR" />
<Root level="INFO">
<AppenderRef ref="Console" />
- <AppenderRef ref="RollingFileAppender" />
</Root>
</Loggers>
</Configuration>
\ No newline at end of file
diff --git a/airavata-api/src/main/resources/replicacatalog-derby.sql b/airavata-api/src/main/resources/replicacatalog-derby.sql
deleted file mode 100644
index d215179ad9..0000000000
--- a/airavata-api/src/main/resources/replicacatalog-derby.sql
+++ /dev/null
@@ -1,85 +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.
- *
- */
-
-CREATE TABLE DATA_PRODUCT
-(
- PRODUCT_URI VARCHAR (255),
- GATEWAY_ID VARCHAR (255),
- PRODUCT_NAME VARCHAR (255),
- PRODUCT_DESCRIPTION VARCHAR (255),
- OWNER_NAME VARCHAR (255),
- PARENT_PRODUCT_URI VARCHAR (255),
- PRODUCT_SIZE INTEGER ,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- LAST_MODIFIED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRODUCT_TYPE VARCHAR(10),
- PRIMARY KEY (PRODUCT_URI)
- -- in Derby can't create self-reference FOREIGN KEY in CREATE TABLE
- -- statement so this gets added via the following ALTER TABLE statement
- -- FOREIGN KEY (PARENT_PRODUCT_URI) REFERENCES DATA_PRODUCT (PRODUCT_URI) ON DELETE CASCADE
-);
-
-ALTER TABLE DATA_PRODUCT ADD FOREIGN KEY (PARENT_PRODUCT_URI) REFERENCES DATA_PRODUCT (PRODUCT_URI) ON DELETE CASCADE;
-
-CREATE TABLE DATA_REPLICA_LOCATION
-(
- REPLICA_ID VARCHAR (255),
- PRODUCT_URI VARCHAR (255) NOT NULL,
- REPLICA_NAME VARCHAR (255),
- REPLICA_DESCRIPTION VARCHAR (255),
- STORAGE_RESOURCE_ID VARCHAR (255),
- FILE_PATH VARCHAR (1024),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- LAST_MODIFIED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- VALID_UNTIL_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- REPLICA_LOCATION_CATEGORY VARCHAR(26),
- REPLICA_PERSISTENT_TYPE VARCHAR(10),
- PRIMARY KEY (REPLICA_ID),
- FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
-);
-
-CREATE TABLE DATA_PRODUCT_METADATA
-(
- PRODUCT_URI VARCHAR(255) NOT NULL,
- METADATA_KEY VARCHAR(255),
- METADATA_VALUE VARCHAR(255),
- PRIMARY KEY(PRODUCT_URI, METADATA_KEY),
- FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
-);
-
-CREATE TABLE DATA_REPLICA_METADATA
-(
- REPLICA_ID VARCHAR(255) NOT NULL,
- METADATA_KEY VARCHAR(255),
- METADATA_VALUE VARCHAR(255),
- PRIMARY KEY(REPLICA_ID, METADATA_KEY),
- FOREIGN KEY (REPLICA_ID) REFERENCES DATA_REPLICA_LOCATION(REPLICA_ID) ON DELETE CASCADE
-);
-
-
-CREATE TABLE CONFIGURATION
-(
- CONFIG_KEY VARCHAR(255),
- CONFIG_VAL VARCHAR(255),
- PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('data_catalog_version', '0.16');
diff --git a/airavata-api/src/main/resources/sharing-registry-derby.sql b/airavata-api/src/main/resources/sharing-registry-derby.sql
deleted file mode 100644
index 6fe96a104b..0000000000
--- a/airavata-api/src/main/resources/sharing-registry-derby.sql
+++ /dev/null
@@ -1,150 +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.
- *
-*/
-
-CREATE TABLE DOMAIN (
- DOMAIN_ID VARCHAR(255) NOT NULL,
- NAME VARCHAR(255) NOT NULL,
- DESCRIPTION VARCHAR(255),
- CREATED_TIME BIGINT NOT NULL,
- UPDATED_TIME BIGINT NOT NULL,
- INITIAL_USER_GROUP_ID VARCHAR(255),
- PRIMARY KEY (DOMAIN_ID)
-);
-
-CREATE TABLE SHARING_USER (
- USER_ID VARCHAR(255) NOT NULL,
- DOMAIN_ID VARCHAR(255) NOT NULL,
- USER_NAME VARCHAR(255) NOT NULL,
- FIRST_NAME VARCHAR (255),
- LAST_NAME VARCHAR (255),
- EMAIL VARCHAR (255),
- ICON BLOB,
- CREATED_TIME BIGINT NOT NULL,
- UPDATED_TIME BIGINT NOT NULL,
- PRIMARY KEY (USER_ID, DOMAIN_ID),
- FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
-
-CREATE TABLE GROUP_ADMIN (
- ADMIN_ID VARCHAR(255) NOT NULL,
- GROUP_ID VARCHAR(255) NOT NULL,
- DOMAIN_ID VARCHAR(255) NOT NULL,
- PRIMARY KEY (ADMIN_ID, GROUP_ID, DOMAIN_ID),
- FOREIGN KEY (ADMIN_ID, DOMAIN_ID) REFERENCES SHARING_USER(USER_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
-
-CREATE TABLE USER_GROUP (
- GROUP_ID VARCHAR(255) NOT NULL,
- DOMAIN_ID VARCHAR(255) NOT NULL,
- NAME VARCHAR(255) NOT NULL,
- DESCRIPTION VARCHAR(255),
- OWNER_ID VARCHAR(255) NOT NULL,
- GROUP_TYPE VARCHAR(255) NOT NULL,
- GROUP_CARDINALITY VARCHAR(255) NOT NULL,
- CREATED_TIME BIGINT NOT NULL,
- UPDATED_TIME BIGINT NOT NULL,
- PRIMARY KEY (GROUP_ID, DOMAIN_ID),
- FOREIGN KEY (OWNER_ID, DOMAIN_ID) REFERENCES SHARING_USER(USER_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
-
-
-CREATE TABLE GROUP_MEMBERSHIP (
- PARENT_ID VARCHAR(255) NOT NULL,
- CHILD_ID VARCHAR(255) NOT NULL,
- DOMAIN_ID VARCHAR(255) NOT NULL,
- CHILD_TYPE VARCHAR(255) NOT NULL,
- CREATED_TIME BIGINT NOT NULL,
- UPDATED_TIME BIGINT NOT NULL,
- PRIMARY KEY (PARENT_ID, CHILD_ID, DOMAIN_ID),
- FOREIGN KEY (PARENT_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
- FOREIGN KEY (CHILD_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
-
-CREATE TABLE ENTITY_TYPE (
- ENTITY_TYPE_ID VARCHAR(255) NOT NULL,
- DOMAIN_ID VARCHAR(255) NOT NULL,
- NAME VARCHAR(255) NOT NULL,
- DESCRIPTION VARCHAR(255),
- CREATED_TIME BIGINT NOT NULL,
- UPDATED_TIME BIGINT NOT NULL,
- PRIMARY KEY (ENTITY_TYPE_ID, DOMAIN_ID),
- FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
-
-CREATE TABLE PERMISSION_TYPE (
- PERMISSION_TYPE_ID VARCHAR(255) NOT NULL,
- DOMAIN_ID VARCHAR(255) NOT NULL,
- NAME VARCHAR(255) NOT NULL,
- DESCRIPTION VARCHAR(255),
- CREATED_TIME BIGINT NOT NULL,
- UPDATED_TIME BIGINT NOT NULL,
- PRIMARY KEY (PERMISSION_TYPE_ID, DOMAIN_ID),
- FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
-
-CREATE TABLE ENTITY (
- ENTITY_ID VARCHAR(255) NOT NULL,
- DOMAIN_ID VARCHAR(255) NOT NULL,
- ENTITY_TYPE_ID VARCHAR(255) NOT NULL,
- OWNER_ID VARCHAR(255) NOT NULL,
- PARENT_ENTITY_ID VARCHAR(255),
- NAME VARCHAR(255) NOT NULL,
- DESCRIPTION VARCHAR(255),
- BINARY_DATA BLOB,
- FULL_TEXT VARCHAR(255),
- SHARED_COUNT BIGINT DEFAULT 0,
- ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
- CREATED_TIME BIGINT NOT NULL,
- UPDATED_TIME BIGINT NOT NULL,
- PRIMARY KEY (ENTITY_ID, DOMAIN_ID),
- FOREIGN KEY (ENTITY_TYPE_ID, DOMAIN_ID) REFERENCES ENTITY_TYPE(ENTITY_TYPE_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
- FOREIGN KEY (OWNER_ID, DOMAIN_ID) REFERENCES SHARING_USER(USER_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
- FOREIGN KEY (PARENT_ENTITY_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
-
--- ALTER TABLE ENTITY ADD FULLTEXT FULL_TEXT_INDEX(FULL_TEXT);
-
-CREATE TABLE SHARING (
- PERMISSION_TYPE_ID VARCHAR(255) NOT NULL,
- ENTITY_ID VARCHAR(255) NOT NULL,
- DOMAIN_ID VARCHAR (255) NOT NULL,
- GROUP_ID VARCHAR(255) NOT NULL,
- SHARING_TYPE VARCHAR(255) NOT NULL,
- INHERITED_PARENT_ID VARCHAR(255),
- CREATED_TIME BIGINT NOT NULL,
- UPDATED_TIME BIGINT NOT NULL,
- PRIMARY KEY (PERMISSION_TYPE_ID, ENTITY_ID, GROUP_ID, DOMAIN_ID, INHERITED_PARENT_ID),
- FOREIGN KEY (PERMISSION_TYPE_ID, DOMAIN_ID) REFERENCES PERMISSION_TYPE(PERMISSION_TYPE_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
- FOREIGN KEY (ENTITY_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
- FOREIGN KEY (INHERITED_PARENT_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
- FOREIGN KEY (GROUP_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-);
-
-CREATE TABLE CONFIGURATION
-(
- CONFIG_KEY VARCHAR(255) NOT NULL,
- CONFIG_VALUE VARCHAR(255) NOT NULL,
- PRIMARY KEY(CONFIG_KEY, CONFIG_VALUE)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VALUE) VALUES('sharing_reg_version', '0.17');
-
-ALTER TABLE DOMAIN ADD FOREIGN KEY (INITIAL_USER_GROUP_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION;
diff --git a/airavata-api/src/main/resources/CLOUD_Groovy.template b/airavata-api/src/main/resources/templates/CLOUD_Groovy.template
similarity index 100%
rename from airavata-api/src/main/resources/CLOUD_Groovy.template
rename to airavata-api/src/main/resources/templates/CLOUD_Groovy.template
diff --git a/airavata-api/src/main/resources/FORK_Groovy.template b/airavata-api/src/main/resources/templates/FORK_Groovy.template
similarity index 100%
rename from airavata-api/src/main/resources/FORK_Groovy.template
rename to airavata-api/src/main/resources/templates/FORK_Groovy.template
diff --git a/airavata-api/src/main/resources/HTCONDOR_Groovy.template b/airavata-api/src/main/resources/templates/HTCONDOR_Groovy.template
similarity index 100%
rename from airavata-api/src/main/resources/HTCONDOR_Groovy.template
rename to airavata-api/src/main/resources/templates/HTCONDOR_Groovy.template
diff --git a/airavata-api/src/main/resources/LSF_Groovy.template b/airavata-api/src/main/resources/templates/LSF_Groovy.template
similarity index 100%
rename from airavata-api/src/main/resources/LSF_Groovy.template
rename to airavata-api/src/main/resources/templates/LSF_Groovy.template
diff --git a/airavata-api/src/main/resources/PBS_Groovy.template b/airavata-api/src/main/resources/templates/PBS_Groovy.template
similarity index 100%
rename from airavata-api/src/main/resources/PBS_Groovy.template
rename to airavata-api/src/main/resources/templates/PBS_Groovy.template
diff --git a/airavata-api/src/main/resources/SLURM_Groovy.template b/airavata-api/src/main/resources/templates/SLURM_Groovy.template
similarity index 100%
rename from airavata-api/src/main/resources/SLURM_Groovy.template
rename to airavata-api/src/main/resources/templates/SLURM_Groovy.template
diff --git a/airavata-api/src/main/resources/UGE_Groovy.template b/airavata-api/src/main/resources/templates/UGE_Groovy.template
similarity index 100%
rename from airavata-api/src/main/resources/UGE_Groovy.template
rename to airavata-api/src/main/resources/templates/UGE_Groovy.template
diff --git a/airavata-api/src/main/resources/user-profile-catalog-derby.sql b/airavata-api/src/main/resources/user-profile-catalog-derby.sql
deleted file mode 100644
index 9ac9155f89..0000000000
--- a/airavata-api/src/main/resources/user-profile-catalog-derby.sql
+++ /dev/null
@@ -1,163 +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.
- *
- */
-
-CREATE TABLE IF NOT EXISTS GATEWAY (
- AIRAVATA_INTERNAL_GATEWAY_ID varchar(255) NOT NULL,
- DECLINED_REASON varchar(255) DEFAULT NULL,
- GATEWAY_DOMAIN varchar(255) DEFAULT NULL,
- EMAIL_ADDRESS varchar(255) DEFAULT NULL,
- GATEWAY_ACRONYM varchar(255) DEFAULT NULL,
- GATEWAY_ADMIN_EMAIL varchar(255) DEFAULT NULL,
- GATEWAY_ADMIN_FIRST_NAME varchar(255) DEFAULT NULL,
- GATEWAY_ADMIN_LAST_NAME varchar(255) DEFAULT NULL,
- GATEWAY_APPROVAL_STATUS varchar(255) DEFAULT NULL,
- GATEWAY_ID varchar(255) DEFAULT NULL,
- GATEWAY_NAME varchar(255) DEFAULT NULL,
- GATEWAY_PUBLIC_ABSTRACT varchar(255) DEFAULT NULL,
- GATEWAY_URL varchar(255) DEFAULT NULL,
- IDENTITY_SERVER_PASSWORD_TOKEN varchar(255) DEFAULT NULL,
- IDENTITY_SERVER_USERNAME varchar(255) DEFAULT NULL,
- OAUTH_CLIENT_ID varchar(255) DEFAULT NULL,
- OAUTH_CLIENT_SECRET varchar(255) DEFAULT NULL,
- REQUEST_CREATION_TIME bigint(20) DEFAULT NULL,
- REQUESTER_USERNAME varchar(255) DEFAULT NULL,
- GATEWAY_REVIEW_PROPOSAL_DESCRIPTION varchar(255) DEFAULT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_GATEWAY_ID)
-);
-
-CREATE TABLE USER_PROFILE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
- USER_ID VARCHAR (255) NOT NULL,
- GATEWAY_ID VARCHAR (255) NOT NULL,
- USER_MODEL_VERSION VARCHAR (255),
- FIRST_NAME VARCHAR (255),
- LAST_NAME VARCHAR (255),
- MIDDLE_NAME VARCHAR (255),
- NAME_PREFIX VARCHAR (255),
- NAME_SUFFIX VARCHAR (255),
- ORCID_ID VARCHAR (255),
- COUNTRY VARCHAR (255),
- HOME_ORGANIZATION VARCHAR (255),
- ORIGINATION_AFFILIATION VARCHAR (255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- LAST_ACCESS_TIME TIMESTAMP,
- VALID_UNTIL TIMESTAMP,
- STATE VARCHAR (255),
- COMMENTS CLOB,
- GPG_KEY CLOB,
- TIME_ZONE VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID)
-);
-
-CREATE TABLE USER_PROFILE_EMAIL (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
- EMAIL VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, EMAIL),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE USER_PROFILE_PHONE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
- PHONE VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, PHONE ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE USER_PROFILE_NATIONALITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
- NATIONALITY VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, NATIONALITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE USER_PROFILE_LABELED_URI (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
- LABELED_URI VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, LABELED_URI ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE NSF_DEMOGRAPHIC (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
- GENDER VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE NSF_DEMOGRAPHIC_ETHNICITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
- ETHNICITY VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, ETHNICITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE NSF_DEMOGRAPHIC_RACE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
- RACE VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, RACE ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE NSF_DEMOGRAPHIC_DISABILITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
- DISABILITY VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, DISABILITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE CUSTOMIZED_DASHBOARD (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
- ENABLED_EXPERIMENT_ID VARCHAR (255),
- ENABLED_NAME VARCHAR (255),
- ENABLED_DESCRIPTION VARCHAR (255),
- ENABLED_PROJECT VARCHAR (255),
- ENABLED_OWNER VARCHAR (255),
- ENABLED_APPLICATION VARCHAR (255),
- ENABLED_COMPUTE_RESOURCE VARCHAR (255),
- ENABLED_JOB_NAME VARCHAR (255),
- ENABLED_JOB_ID VARCHAR (255),
- ENABLED_JOB_STATUS VARCHAR (255),
- ENABLED_JOB_CREATION_TIME VARCHAR (255),
- ENABLED_NOTIFICATIONS_TO VARCHAR (255),
- ENABLED_WORKING_DIR VARCHAR (255),
- ENABLED_JOB_DESCRIPTION VARCHAR (255),
- ENABLED_CREATION_TIME VARCHAR (255),
- ENABLED_LAST_MODIFIED_TIME VARCHAR (255),
- ENABLED_WALL_TIME VARCHAR (255),
- ENABLED_CPU_COUNT VARCHAR (255),
- ENABLED_NODE_COUNT VARCHAR (255),
- ENABLED_QUEUE VARCHAR (255),
- ENABLED_INPUTS VARCHAR (255),
- ENABLED_OUTPUTS VARCHAR (255),
- ENABLED_STORAGE_DIR VARCHAR (255),
- ENABLED_ERRORS VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE CONFIGURATION
-(
- CONFIG_KEY VARCHAR(255) NOT NULL,
- CONFIG_VAL VARCHAR(255) NOT NULL,
- PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('user_profile_catalog_version', '0.17');
diff --git a/airavata-api/src/main/resources/workflowcatalog-derby.sql b/airavata-api/src/main/resources/workflowcatalog-derby.sql
deleted file mode 100644
index beff4ca8b6..0000000000
--- a/airavata-api/src/main/resources/workflowcatalog-derby.sql
+++ /dev/null
@@ -1,128 +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.
- *
- */
-
-CREATE TABLE WORKFLOW
-(
- TEMPLATE_ID VARCHAR (255) NOT NULL,
- WORKFLOW_NAME VARCHAR (255) NOT NULL,
- CREATED_USER VARCHAR (255),
- GATEWAY_ID VARCHAR (255),
- GRAPH CLOB,
- IMAGE BLOB,
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME timestamp DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (TEMPLATE_ID)
-);
-
-CREATE TABLE WORKFLOW_INPUT
-(
- TEMPLATE_ID VARCHAR(255) NOT NULL,
- INPUT_KEY VARCHAR(255),
- INPUT_VALUE CLOB,
- DATA_TYPE VARCHAR(255),
- METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
- INPUT_ORDER INTEGER,
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_COMMANDLINE SMALLINT,
- DATA_STAGED SMALLINT,
- PRIMARY KEY(TEMPLATE_ID,INPUT_KEY),
- FOREIGN KEY (TEMPLATE_ID) REFERENCES WORKFLOW(TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE WORKFLOW_OUTPUT
-(
- TEMPLATE_ID VARCHAR(255) NOT NULL,
- OUTPUT_KEY VARCHAR(255),
- OUTPUT_VALUE VARCHAR(255),
- DATA_TYPE VARCHAR(255),
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_COMMANDLINE SMALLINT,
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
- SEARCH_QUERY VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- OUTPUT_STREAMING SMALLINT,
- PRIMARY KEY(TEMPLATE_ID,OUTPUT_KEY),
- FOREIGN KEY (TEMPLATE_ID) REFERENCES WORKFLOW(TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE COMPONENT_STATUS
-(
- STATUS_ID VARCHAR (255) NOT NULL,
- TEMPLATE_ID VARCHAR (255) NOT NULL,
- STATE VARCHAR(255),
- REASON VARCHAR(255),
- UPDATE_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (STATUS_ID),
- FOREIGN KEY (TEMPLATE_ID) REFERENCES WORKFLOW(TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE WORKFLOW_STATUS
-(
- STATUS_ID VARCHAR (255) NOT NULL,
- TEMPLATE_ID VARCHAR (255) NOT NULL,
- STATE VARCHAR(255),
- REASON VARCHAR(255),
- UPDATE_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (STATUS_ID, TEMPLATE_ID),
- FOREIGN KEY (TEMPLATE_ID) REFERENCES WORKFLOW(TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE EDGE
-(
- EDGE_ID VARCHAR (255) NOT NULL,
- TEMPLATE_ID VARCHAR (255) NOT NULL,
- NAME VARCHAR (255),
- COMPONENT_STATUS_ID VARCHAR(255),
- DESCRIPTION VARCHAR(500),
- CREATED_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (EDGE_ID, TEMPLATE_ID),
- FOREIGN KEY (TEMPLATE_ID) REFERENCES WORKFLOW(TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PORT
-(
- PORT_ID VARCHAR (255) NOT NULL,
- TEMPLATE_ID VARCHAR (255) NOT NULL,
- NAME VARCHAR (255),
- COMPONENT_STATUS_ID VARCHAR(255),
- DESCRIPTION VARCHAR(500),
- CREATED_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (PORT_ID, TEMPLATE_ID),
- FOREIGN KEY (TEMPLATE_ID) REFERENCES WORKFLOW(TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE NODE
-(
- NODE_ID VARCHAR (255) NOT NULL,
- TEMPLATE_ID VARCHAR (255) NOT NULL,
- NAME VARCHAR (255),
- APPLICATION_ID VARCHAR (255),
- APPLICATION_NAME VARCHAR (255),
- COMPONENT_STATUS_ID VARCHAR(255),
- DESCRIPTION VARCHAR(500),
- CREATED_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (NODE_ID, TEMPLATE_ID),
- FOREIGN KEY (TEMPLATE_ID) REFERENCES WORKFLOW(TEMPLATE_ID) ON DELETE CASCADE
-);
\ No newline at end of file
diff --git a/dev-tools/airavata-python-sdk/airavata_experiments/plan.py b/dev-tools/airavata-python-sdk/airavata_experiments/plan.py
index d9bad69ad3..1912888267 100644
--- a/dev-tools/airavata-python-sdk/airavata_experiments/plan.py
+++ b/dev-tools/airavata-python-sdk/airavata_experiments/plan.py
@@ -29,6 +29,8 @@ import uuid
from .airavata import AiravataOperator
from .auth import context
+api_host: str = "https://api.gateway.cybershuttle.org"
+
class Plan(pydantic.BaseModel):
id: str | None = pydantic.Field(default=None)
@@ -139,10 +141,10 @@ class Plan(pydantic.BaseModel):
import requests
if self.id is None:
self.id = str(uuid.uuid4())
- response = requests.post("https://api.gateway.cybershuttle.org/api/v1/plan", headers=headers, json=self.model_dump())
+ response = requests.post(f"{api_host}/api/v1/plan", headers=headers, json=self.model_dump())
print(f"Plan saved: {self.id}")
else:
- response = requests.put(f"https://api.gateway.cybershuttle.org/api/v1/plan/{self.id}", headers=headers, json=self.model_dump())
+ response = requests.put(f"{api_host}/api/v1/plan/{self.id}", headers=headers, json=self.model_dump())
print(f"Plan updated: {self.id}")
if response.status_code == 200:
@@ -169,7 +171,7 @@ def load(id: str | None) -> Plan:
'X-Claims': json.dumps(az.claimsMap)
}
import requests
- response = requests.get(f"https://api.gateway.cybershuttle.org/api/v1/plan/{id}", headers=headers)
+ response = requests.get(f"{api_host}/api/v1/plan/{id}", headers=headers)
if response.status_code == 200:
body = response.json()
@@ -189,7 +191,7 @@ def query() -> list[Plan]:
'X-Claims': json.dumps(az.claimsMap)
}
import requests
- response = requests.get(f"https://api.gateway.cybershuttle.org/api/v1/plan/user", headers=headers)
+ response = requests.get(f"{api_host}/api/v1/plan/user", headers=headers)
if response.status_code == 200:
items: list = response.json()
diff --git a/dev-tools/airavata-python-sdk/airavata_jupyter_magic/__init__.py b/dev-tools/airavata-python-sdk/airavata_jupyter_magic/__init__.py
index 42aa241bd4..3913bc06f7 100644
--- a/dev-tools/airavata-python-sdk/airavata_jupyter_magic/__init__.py
+++ b/dev-tools/airavata-python-sdk/airavata_jupyter_magic/__init__.py
@@ -1533,7 +1533,7 @@ ipython = get_ipython()
if ipython is None:
raise RuntimeError("airavata_jupyter_magic requires an ipython session")
assert ipython is not None
-api_host = "api.dev.cybershuttle.org"
+api_host = "api.gateway.cybershuttle.org"
api_base_url = f"https://{api_host}"
file_server_url = f"http://{api_host}:8050"
MSG_NOT_INITIALIZED = r"Runtime not found. Please run %request_runtime name=<name> cluster=<cluster> cpu=<cpu> memory=<memory mb> queue=<queue> walltime=<walltime minutes> group=<group> to request one."
diff --git a/dev-tools/airavata-python-sdk/airavata_jupyter_magic/device_auth.py b/dev-tools/airavata-python-sdk/airavata_jupyter_magic/device_auth.py
index b81e1815f8..c073f93c0b 100644
--- a/dev-tools/airavata-python-sdk/airavata_jupyter_magic/device_auth.py
+++ b/dev-tools/airavata-python-sdk/airavata_jupyter_magic/device_auth.py
@@ -10,7 +10,7 @@ class DeviceFlowAuthenticator:
def __init__(self):
self.client_id = "cybershuttle-agent"
self.realm = "default"
- self.auth_server_url = "https://auth.dev.cybershuttle.org"
+ self.auth_server_url = "https://auth.cybershuttle.org"
if not self.client_id or not self.realm or not self.auth_server_url:
raise ValueError("Missing required environment variables for client ID, realm, or auth server URL")
diff --git a/dev-tools/ansible/roles/api-orch/templates/apiorch.service.j2 b/dev-tools/ansible/roles/api-orch/templates/apiorch.service.j2
index a77a1018ef..2b5ef7d491 100644
--- a/dev-tools/ansible/roles/api-orch/templates/apiorch.service.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/apiorch.service.j2
@@ -29,7 +29,7 @@ Wants=rabbitmq-server.service zookeeper.service mysql.service
[Service]
Type=forking
-ExecStart={{ api_orch_dir }}/{{ airavata_dist }}/bin/airavata-server-start.sh -d api-orch -log "{{ api_orch_log_dir }}/output.log" -enableLegacyTLS
+ExecStart={{ api_orch_dir }}/{{ airavata_dist }}/bin/airavata-server-start.sh -d api-orch -log "{{ api_orch_log_dir }}/output.log"
ExecStop={{ api_orch_dir }}/{{ airavata_dist }}/bin/airavata-server-stop.sh
Restart=always
TimeoutSec=60
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/config/ClusterApplicationConfig.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/config/ClusterApplicationConfig.java
index 2384f719c8..52e77b2f69 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/config/ClusterApplicationConfig.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/config/ClusterApplicationConfig.java
@@ -19,7 +19,6 @@
*/
package org.apache.airavata.agent.connection.service.config;
-import java.util.Map;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -27,17 +26,13 @@ import org.springframework.stereotype.Component;
@ConfigurationProperties(prefix = "airavata.cluster")
public class ClusterApplicationConfig {
- private Map<String, String> applicationInterfaceId;
+ private String applicationInterfaceId;
- public Map<String, String> getApplicationInterfaceId() {
+ public String getApplicationInterfaceId() {
return applicationInterfaceId;
}
- public void setApplicationInterfaceId(Map<String, String> applicationInterfaceId) {
+ public void setApplicationInterfaceId(String applicationInterfaceId) {
this.applicationInterfaceId = applicationInterfaceId;
}
-
- public String getApplicationInterfaceIdByCluster(String clusterName) {
- return applicationInterfaceId.get(clusterName);
- }
}
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java
index 1ec72c095a..2d697d00ac 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java
@@ -119,8 +119,7 @@ public class AgentManagementHandler {
AgentLaunchRequest sortedLaunchRequest = launchRequests.get(0);
for (AgentLaunchRequest req : launchRequests) {
- String appInterfaceId =
- clusterApplicationConfig.getApplicationInterfaceIdByCluster(req.getApplicationInterfaceName());
+ String appInterfaceId = clusterApplicationConfig.getApplicationInterfaceId();
ExperimentStatistics experimentStatistics = airavataService
.airavata()
.getExperimentStatistics(
@@ -215,8 +214,7 @@ public class AgentManagementHandler {
AuthzToken authzToken = UserContext.authzToken();
String userName = UserContext.username();
String gatewayId = UserContext.gatewayId();
- String appInterfaceId =
- clusterApplicationConfig.getApplicationInterfaceIdByCluster(req.getApplicationInterfaceName());
+ String appInterfaceId = clusterApplicationConfig.getApplicationInterfaceId();
ExperimentModel experimentModel = new ExperimentModel();
experimentModel.setExperimentName(experimentName);
experimentModel.setProjectId(projectId);
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
index faad300f0a..cff471ada6 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
@@ -46,7 +46,7 @@ public class AiravataService {
private static final Logger LOGGER = LoggerFactory.getLogger(AiravataService.class);
private static final int TIMEOUT = 100000;
- @Value("${airavata.server.url:scigap02.sciencegateways.iu.edu}")
+ @Value("${airavata.server.url:airavata.host}")
private String serverUrl;
@Value("${airavata.server.port:9930}")
diff --git a/modules/agent-framework/agent-service/src/main/resources/application.yml b/modules/agent-framework/agent-service/src/main/resources/application.yml
index 5a971cc7bc..f48201003d 100644
--- a/modules/agent-framework/agent-service/src/main/resources/application.yml
+++ b/modules/agent-framework/agent-service/src/main/resources/application.yml
@@ -30,7 +30,7 @@ spring:
max-request-size: 200MB
datasource:
url: "jdbc:mariadb://airavata.host:13306/app_catalog"
- username: "root"
+ username: "airavata"
password: "123456"
driver-class-name: org.mariadb.jdbc.Driver
hikari:
@@ -43,18 +43,16 @@ spring:
airavata:
server:
- url: scigap02.sciencegateways.iu.edu
+ url: airavata.host
port: 9930
truststore:
- path: CHANGE_ME
- storageResourceId: gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6
- storagePath: /var/www/portals/gateway-user-data
+ path: keystores/airavata.jks
+ storageResourceId: airavata.host_77116e91-f042-4d3a-ab9c-3e7b4ebcd5bd
+ storagePath: /tmp
cluster:
- applicationInterfaceId:
- expanse: AiravataAgent_f4313e4d-20c2-4bf6-bff1-8aa0f0b0c1d6
- jetstream: UPDATE
+ applicationInterfaceId: AiravataAgent_f4313e4d-20c2-4bf6-bff1-8aa0f0b0c1d6
tunnel:
- serverHost: tunnel-server
+ serverHost: airavata.host
serverPort: 17000
- serverToken: servertoken
- serverApiUrl: http://tunnel-server:8000
+ serverToken: airavata
+ serverApiUrl: http://airavata.host:8000
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
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
deleted file mode 100644
index 30ebe99cf7..0000000000
--- a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/application.yml
+++ /dev/null
@@ -1,58 +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.
-#
-
-grpc:
- server:
- port: 19900
-
-server:
- port: 18880
- address: 0.0.0.0
-
-spring:
- servlet:
- multipart:
- max-file-size: 200MB
- max-request-size: 200MB
- datasource:
- url: "jdbc:mariadb://airavata.host:13306/app_catalog"
- username: "root"
- password: "123456"
- driver-class-name: org.mariadb.jdbc.Driver
- hikari:
- pool-name: AppCatalogPool
- leak-detection-threshold: 20000
- jpa:
- hibernate:
- ddl-auto: create
- open-in-view: false
-
-airavata:
- server:
- url: scigap02.sciencegateways.iu.edu
- port: 9930
- truststore:
- path: /Users/lahiruj/Projects/airavata/lahiruj/modules/agent-framework/agent-service/src/main/resources/airavata.jks
- storageResourceId: gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6
- cluster:
- applicationInterfaceId:
- expanse: AiravataAgent_f4313e4d-20c2-4bf6-bff1-8aa0f0b0c1d6
- jetstream: AiravataAgent_f4313e4d-20c2-4bf6-bff1-xcver3343
- tunnel:
- serverHost: tunnel-server
- serverPort: 17000
- serverToken: servertoken
- serverApiUrl: http://tunnel-server:8000
\ No newline at end of file
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/log4j2.xml b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/log4j2.xml
deleted file mode 100644
index 5ab1800e7d..0000000000
--- a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/log4j2.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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 status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n" />
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/agent-service.log"
- filePattern="../logs/agent-service-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <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">
- <AppenderRef ref="Console" />
- <AppenderRef ref="RollingFileAppender" />
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/truststore.jks b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/truststore.jks
deleted file mode 100644
index 7006e55ba6..0000000000
Binary files a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/truststore.jks and /dev/null differ
diff --git a/modules/agent-framework/agent-service/src/main/resources/log4j2.xml b/modules/agent-framework/agent-service/src/main/resources/log4j2.xml
index d2857a4545..8fb27b1b68 100644
--- a/modules/agent-framework/agent-service/src/main/resources/log4j2.xml
+++ b/modules/agent-framework/agent-service/src/main/resources/log4j2.xml
@@ -25,18 +25,6 @@
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n" />
</Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/agent-service.log"
- filePattern="../logs/agent-service-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
</Appenders>
<Loggers>
<logger name="ch.qos.logback" level="WARN" />
@@ -46,7 +34,6 @@
<logger name="org.hibernate" level="ERROR" />
<Root level="INFO">
<AppenderRef ref="Console" />
- <AppenderRef ref="RollingFileAppender" />
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
diff --git a/modules/agent-framework/agent-service/src/main/resources/truststore.jks b/modules/agent-framework/agent-service/src/main/resources/truststore.jks
deleted file mode 100644
index 7006e55ba6..0000000000
Binary files a/modules/agent-framework/agent-service/src/main/resources/truststore.jks and /dev/null differ
diff --git a/modules/agent-framework/airavata-agent/Makefile b/modules/agent-framework/airavata-agent/Makefile
index cd483be4db..567088f296 100644
--- a/modules/agent-framework/airavata-agent/Makefile
+++ b/modules/agent-framework/airavata-agent/Makefile
@@ -16,7 +16,7 @@
# under the License.
IMAGE_NAME=cybershuttle/remote-agent-base
-AGENT_SVC_URL=api.gateway.cybershuttle.org:19900
+AGENT_SVC_URL=airavata.host:19900
AGENT_ID=test
build-multiarch:
diff --git a/modules/agent-framework/airavata-agent/agent.sh b/modules/agent-framework/airavata-agent/agent.sh
index eaa0896d2a..23b7a10c86 100755
--- a/modules/agent-framework/airavata-agent/agent.sh
+++ b/modules/agent-framework/airavata-agent/agent.sh
@@ -37,7 +37,6 @@
CS_HOME=$HOME/cybershuttle
AGENT=""
SERVER=""
-CONTAINER=""
LIBRARIES=""
ENVIRON=""
PIP=""
@@ -47,12 +46,11 @@ MOUNTS=()
ln -s $CS_HOME/application $PWD/application
# parse command line args
-PARSED_OPTIONS=$(getopt -o '' --long server:,agent:,container:,libraries:,pip:,mounts:,environ: -n "$0" -- "$@")
+PARSED_OPTIONS=$(getopt -o '' --long server:,agent:,libraries:,pip:,mounts:,environ: -n "$0" -- "$@")
if [ $? -ne 0 ]; then
echo "Usage: $0 \
--server SERVER \
--agent AGENT \
- --container CONTAINER \
--libraries LIBRARIES \
--pip PIP \
--mounts MOUNTS \
@@ -64,7 +62,6 @@ while true; do
case "$1" in
--server) SERVER="$2"; shift 2 ;;
--agent) AGENT="$2"; shift 2 ;;
- --container) CONTAINER="$2"; shift 2 ;;
--libraries) LIBRARIES="$2"; shift 2 ;;
--pip) PIP="$2"; shift 2 ;;
--mounts)
@@ -85,7 +82,6 @@ done
echo "CS_HOME=$CS_HOME"
echo "AGENT=$AGENT"
echo "SERVER=$SERVER"
-echo "CONTAINER=$CONTAINER"
echo "LIBRARIES=$LIBRARIES"
echo "PIP=$PIP"
echo "MOUNTS=${MOUNTS[@]}"
@@ -107,7 +103,7 @@ find $CS_HOME/workspace -mindepth 1 -maxdepth 1 -type d -ctime +3 | xargs -n1 -I
# fetch binaries
wget -q https://github.com/cyber-shuttle/binaries/releases/download/1.0.1/airavata-agent-linux-amd64 -O airavata-agent
wget -q https://github.com/cyber-shuttle/binaries/releases/download/1.0.1/kernel.py -O kernel.py
-wget -q https://github.com/mamba-org/micromamba-releases/releases/download/2.1.1-0/micromamba-linux-64 -O micromamba
+wget -q https://github.com/mamba-org/micromamba-releases/releases/download/2.3.0-1/micromamba-linux-64 -O micromamba
chmod +x airavata-agent micromamba
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
deleted file mode 100644
index 02b19f17a6..0000000000
--- a/modules/distribution/pom.xml
+++ /dev/null
@@ -1,143 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata</artifactId>
- <version>0.21-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>apache-airavata-distribution</artifactId>
- <name>Airavata Distribution</name>
- <packaging>pom</packaging>
- <url>https://airavata.apache.org/</url>
-
- <dependencies>
- <!-- Core Airavata API - this will transitively include most dependencies -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- Additional dependencies that may be needed for specific components -->
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>api-server-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${api.server.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/api-server-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-api-server-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.api.server.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.api.server.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${session.executionRootDirectory}/distribution</directory>
- <includes>
- <include>${api.server.dist.name}.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.46.0</version>
- <configuration>
- <verbose>true</verbose>
- <images>
- <image>
- <name>airavata/api-server</name>
- <build>
- <dockerFile>${docker.api.server.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- </images>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <docker.api.server.build.directory>${project.build.directory}/api_server_docker_img_build</docker.api.server.build.directory>
- <docker.api.server.image.src.root>src/main/docker/api-server</docker.api.server.image.src.root>
- <api.server.dist.name>apache-airavata-api-server-${project.version}</api.server.dist.name>
- </properties>
-
-</project>
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/distribution/bin/airavata-server.bat b/modules/distribution/src/main/resources/distribution/bin/airavata-server.bat
deleted file mode 100644
index be2c584973..0000000000
--- a/modules/distribution/src/main/resources/distribution/bin/airavata-server.bat
+++ /dev/null
@@ -1,55 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one
-rem or more contributor license agreements. See the NOTICE file
-rem distributed with this work for additional information
-rem regarding copyright ownership. The ASF licenses this file
-rem to you under the Apache License, Version 2.0 (the
-rem "License"); you may not use this file except in compliance
-rem with the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing,
-rem software distributed under the License is distributed on an
-rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem KIND, either express or implied. See the License for the
-rem specific language governing permissions and limitations
-rem under the License.
-
-setlocal EnableDelayedExpansion
-
-call "%~dp0"setenv.bat
-
-:loop
-if ""%1""==""-xdebug"" goto xdebug
-if ""%1""==""-security"" goto security
-if ""%1""=="""" goto run
-goto help
-
-:xdebug
-set JAVA_OPTS= %JAVA_OPTS% -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000
-shift
-goto loop
-
-:security
-set JAVA_OPTS=%JAVA_OPTS% -Djava.security.manager -Djava.security.policy=%AIRAVATA_HOME%\conf\axis2.policy -Daxis2.home=%AIRAVATA_HOME%
-shift
-goto loop
-
-:help
-echo Usage: %0 [-options]
-echo.
-echo where options include:
-echo -xdebug Start Airavata Server under JPDA debugger
-echo -security Enable Java 2 security
-echo -h Help
-goto end
-
-:run
-cd "%AIRAVATA_HOME%\bin"
-set LOGO_FILE="logo.txt"
-if exist "%LOGO_FILE%" type "%LOGO_FILE%"
-
-java %JAVA_OPTS% -classpath "%AIRAVATA_CLASSPATH%" org.apache.airavata.server.ServerMain %*
-
-:end
diff --git a/modules/distribution/src/main/resources/distribution/bin/setenv.bat b/modules/distribution/src/main/resources/distribution/bin/setenv.bat
deleted file mode 100644
index 5f1fda12a4..0000000000
--- a/modules/distribution/src/main/resources/distribution/bin/setenv.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-rem Licensed to the Apache Software Foundation (ASF) under one
-rem or more contributor license agreements. See the NOTICE file
-rem distributed with this work for additional information
-rem regarding copyright ownership. The ASF licenses this file
-rem to you under the Apache License, Version 2.0 (the
-rem "License"); you may not use this file except in compliance
-rem with the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing,
-rem software distributed under the License is distributed on an
-rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem KIND, either express or implied. See the License for the
-rem specific language governing permissions and limitations
-rem under the License.
-
-@echo off
-
-:initialize
-if "%AIRAVATA_HOME%"=="" set AIRAVATA_HOME=%~sdp0..
-SET curDrive=%cd:~0,1%
-SET airavataDrive=%AIRAVATA_HOME:~0,1%
-if not "%curDrive%" == "%airavataDrive%" %airavataDrive%:
-goto updateClasspath
-
-rem ----- update classpath -----------------------------------------------------
-:updateClasspath
-cd %AIRAVATA_HOME%
-set AIRAVATA_CLASSPATH=
-FOR %%C in ("%AIRAVATA_HOME%\lib\*.jar") DO set AIRAVATA_CLASSPATH=!AIRAVATA_CLASSPATH!;..\lib\%%~nC%%~xC
-
-:end
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/distribution/conf/airavata-server.properties b/modules/distribution/src/main/resources/distribution/conf/airavata-server.properties
deleted file mode 100644
index 4bdb489b1f..0000000000
--- a/modules/distribution/src/main/resources/distribution/conf/airavata-server.properties
+++ /dev/null
@@ -1,249 +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.
-#
-
-api.secured=true
-api.server.monitoring.enabled=True
-api.server.monitoring.host=localhost
-api.server.monitoring.port=9097
-apiserver.host=localhost
-apiserver.min.threads=50
-apiserver.name=apiserver-node0
-apiserver.port=8930
-apiserver=org.apache.airavata.api.server.AiravataAPIServer
-
-appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.password=CHANGE_ME
-appcatalog.jdbc.url=jdbc:mariadb://localhost:13306/app_catalog
-appcatalog.jdbc.user=root
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-authz.cache.enabled=true
-authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
-
-cache.enable=false
-
-cluster.status.monitoring.enable=false
-cluster.status.monitoring.repeat.time=18000
-
-credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-credential.store.jdbc.password=CHANGE_ME
-credential.store.jdbc.url=jdbc:mariadb://localhost:13306/credential_store
-credential.store.jdbc.user=root
-credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-credential.store.keystore.alias=airavata
-credential.store.keystore.password=airavata
-credential.store.keystore.url=keystores/airavata.jks
-credential.store.server.host=localhost
-credential.store.server.port=8960
-credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
-
-data.analyzer.job.scanning.enable=false
-data.parser.delete.container=True
-
-db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
-
-default.registry.gateway=default
-default.registry.oauth.client.id=pga
-default.registry.oauth.client.secret=GtRMiIQG5UJJdmmeM6iQS0BZR4Yj0gbt
-default.registry.password.hash.method=SHA
-default.registry.password=CHANGE_ME
-default.registry.user=default-admin
-
-durable.queue=false
-
-email.based.monitor.address=monitoring.airavata@gmail.com
-email.based.monitor.folder.name=INBOX
-email.based.monitor.host=imap.gmail.com
-email.based.monitor.password=CHANGE_ME
-email.based.monitor.store.protocol=imaps
-email.based.monitoring.period=10000
-email.expiration.minutes=60
-email.from=airavata@apache.org
-email.password=CHANGE_ME
-email.server.port=465
-email.server=smtp.googlemail.com
-email.ssl=true
-email.user=airavata
-
-embedded.mode=false
-embedded.zk=false
-
-enable.kafka.logging=false
-enable.realtime.monitor=False
-enable.sharing=true
-enable.streaming.transfer=False
-enable.validation=true
-
-enactment.thread.pool.size=10
-
-experiment.launch.queue.name=experiment.launch.queue
-
-helix.cluster.name=AiravataCluster
-helix.controller.name=AiravataController
-helix.participant.name=AiravataParticipant
-
-host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
-
-iam.server.super.admin.password=CHANGE_ME
-iam.server.super.admin.username=admin
-iam.server.url=https://auth.dev.cybershuttle.org
-
-in.memory.cache.size=1000
-isRunningOnAws=false
-
-job.monitor.broker.publisher.id=AiravataMonitorPublisher
-job.monitor.email.publisher.id=EmailBasedProducer
-job.monitor.realtime.publisher.id=RealtimeProducer
-
-job.monitor.broker.topic=monitoring-data
-job.monitor.broker.url=localhost:9092
-job.notification.emailids=
-job.notification.enable=true
-job.notification.flags=abe
-job.status.publish.endpoint=http://localhost:8082/topics/helix-airavata-mq
-job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
-
-jpa.cache.size=-1
-
-kafka.broker.consumer.group=MonitoringConsumer
-kafka.broker.list=localhost:9092
-kafka.broker.topic=monitoring-data
-
-kafka.broker.url=localhost:9092
-kafka.parser.broker.consumer.group=CHANGE_ME
-kafka.parser.topic=CHANGE_ME
-kafka.parsing.broker.url=CHANGE_ME
-kafka.topic.prefix=local
-
-keystore.password=airavata
-keystore.path=keystores/airavata.jks
-
-local.data.location=/home/exouser/temp-storage
-
-metaschedluer.job.scanning.enable=false
-
-orchestrator.server.host=localhost
-orchestrator.server.min.threads=50
-orchestrator.server.name=orchestrator-node0
-orchestrator.server.port=8940
-orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
-
-parser.storage.resource.id=CHANGE_ME
-
-participant.monitoring.enabled=true
-participant.monitoring.host=localhost
-participant.monitoring.port=9096
-
-post.workflow.manager.loadbalance.clusters=false
-post.workflow.manager.monitoring.enabled=true
-post.workflow.manager.monitoring.host=localhost
-post.workflow.manager.monitoring.port=9094
-post.workflow.manager.name=AiravataPostWM
-
-pre.workflow.manager.loadbalance.clusters=false
-pre.workflow.manager.monitoring.enabled=true
-pre.workflow.manager.monitoring.host=localhost
-pre.workflow.manager.monitoring.port=9093
-pre.workflow.manager.name=AiravataPreWM
-
-prefetch.count=200
-
-process.launch.queue.name=process.launch.queue
-
-profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
-profile.service.jdbc.driver=org.mariadb.jdbc.Driver
-profile.service.jdbc.password=CHANGE_ME
-profile.service.jdbc.url=jdbc:mariadb://localhost:13306/profile_service
-profile.service.jdbc.user=root
-profile.service.server.host=localhost
-profile.service.server.port=8962
-profile.service.validationQuery=SELECT 1
-
-rabbitmq.broker.url=amqp://guest:guest@localhost:5672/develop
-rabbitmq.experiment.exchange.name=experiment_exchange
-rabbitmq.process.exchange.name=process_exchange
-rabbitmq.status.exchange.name=status_exchange
-
-realtime.monitor.broker.consumer.group=monitor
-realtime.monitor.broker.topic=helix-airavata-mq
-realtime.monitor.broker.url=localhost:9092
-
-registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.password=CHANGE_ME
-registry.jdbc.url=jdbc:mariadb://localhost:13306/experiment_catalog
-registry.jdbc.user=root
-
-regserver.server.host=localhost
-regserver.server.min.threads=50
-regserver.server.name=regserver-node0
-regserver.server.port=8970
-regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
-
-replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.password=CHANGE_ME
-replicacatalog.jdbc.url=jdbc:mariadb://localhost:13306/replica_catalog
-replicacatalog.jdbc.user=root
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
-
-sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
-sharing.registry.server.host=localhost
-sharing.registry.server.port=7878
-sharing.tls.enabled=false
-sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-sharingcatalog.jdbc.password=CHANGE_ME
-sharingcatalog.jdbc.url=jdbc:mariadb://localhost:13306/sharing_catalog
-sharingcatalog.jdbc.user=root
-sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-start.submitter=true
-submitter.interval=10000
-
-super.tenant.gatewayId=default
-
-threadpool.size=10
-
-thrift.client.pool.abandoned.removal.enabled=true
-thrift.client.pool.abandoned.removal.logged=false
-
-TLS.api.server.port=9930
-TLS.client.timeout=10000
-TLS.enabled=true
-
-trust.store.password=airavata
-trust.store=keystores/airavata.jks
-
-usage.reporting.endpoint=https://xsede-xdcdb-api.xsede.org/gateway/v2/job_attributes
-usage.reporting.key=CHANGE_ME
-userprofile.mongodb.host=localhost
-userprofile.mongodb.port=27017
-
-validationQuery=SELECT 1 from CONFIGURATION
-
-workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-workflowcatalog.jdbc.password=CHANGE_ME
-workflowcatalog.jdbc.url=jdbc:mariadb://localhost:13306/workflow_catalog
-workflowcatalog.jdbc.user=root
-workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
-workflowserver=org.apache.airavata.api.server.WorkflowServer
-
-zookeeper.server.connection=localhost:2181
-zookeeper.timeout=30000
diff --git a/modules/distribution/src/main/resources/distribution/conf/email-config.yaml b/modules/distribution/src/main/resources/distribution/conf/email-config.yaml
deleted file mode 100644
index 3a80bf83fd..0000000000
--- a/modules/distribution/src/main/resources/distribution/conf/email-config.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-config:
- resources:
- - jobManagerType: PBS
- emailParser: org.apache.airavata.monitor.email.parser.PBSEmailParser
- resourceEmailAddresses:
- - pbsconsult@sdsc.edu # gordon
- - adm@trident.bigred2.uits.iu.edu # Bigred2
- - root <ad...@trident.bigred2.uits.iu.edu> # Bigred2
- - root <ad...@scyld.localdomain> # alamo
- - root <ad...@m1.mason.indiana.edu> #mason
- - smic3 <sm...@mail.hpc.lsu.edu> # philip.hpc.lsu
- - adm@jetstream-cloud.org
- - root <ad...@alamo.uthscsa.edu> #alamo
- - adm@s1.carbonate.uits.iu.edu
-
- - jobManagerType: SLURM
- emailParser: org.apache.airavata.monitor.email.parser.SLURMEmailParser
- resourceEmailAddresses:
- - SDSC Admin <sl...@comet-fe3.sdsc.edu> # comet
- - slurm@batch1.stampede.tacc.utexas.edu # stampede
- - slurm@helix-slurm-headnode.novalocal
- - slurm@comet-fe4.sdsc.edu
- - Slurm <sl...@psc.edu> # bridges
- - Slurm Daemon <sl...@odin.oscer.ou.edu> # OU Schooner
- - slurm@lnet28.stampede.tacc.utexas.edu # stampede2
- - Slurm service account <sl...@chpc.utah.edu> # Utah Ember
- - SLURM workload manager <sl...@jetstream.chemcompute.org> # JS Mark Cluster
- - root@master.ls5.tacc.utexas.edu
- - batch-jsc@fz-juelich.de # Jureca Email
- - Slurm <sl...@br003.pvt.bridges.psc.edu>
- - slurm@jetstream-cloud.org
- - slurm@slurm-example.novalocal
- - slurm@tutorial-headnode.novalocal # Jetstream Ultrascan static cluster with 10 nodes
- - slurm@batch1.stampede2.tacc.utexas.edu #Stampede2
- - slurm@sra-master.jetstreamlocal #Searching SRA
- - Slurm Admin <sl...@hpclogin01.rs.gsu.edu> #GSU cluster
- - slurm@head.cluster #USD cluster
- - slurm@js-169-158.jetstream-cloud.org
- - slurm@joker.nmsu.edu
-
- - jobManagerType: UGE
- emailParser: org.apache.airavata.monitor.email.parser.UGEEmailParser
- resourceEmailAddresses:
- - ls4.tacc.utexas.edu # contain Lonestar
- - root <ro...@local> # USD HPC Cluster
- - root <li...@siu.edu> # SIU Little Dog
- - sge@bigdog.research.siu.edu # SIU Big Dog
- - root <ro...@legacy.usd.edu> # USD HPC Cluster
-
- - jobManagerType: HTCONDOR
- emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
- resourceEmailAddresses:
- - condor@js-169-152.jetstream-cloud.org
- - Owner of HTCondor Daemons <co...@condor.scigap.org> #EHT Condor Access point
- - Owner of HTCondor Daemons <co...@login04.osgconnect.net>
- - slurm@br003.ib.bridges2.psc.edu # AutoDock_Vina
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/distribution/conf/log4j2.xml b/modules/distribution/src/main/resources/distribution/conf/log4j2.xml
deleted file mode 100644
index 2af1a20101..0000000000
--- a/modules/distribution/src/main/resources/distribution/conf/log4j2.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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 status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n" />
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata-api.log"
- filePattern="../logs/airavata-api-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <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">
- <AppenderRef ref="Console" />
- <AppenderRef ref="RollingFileAppender" />
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/file-server/src/main/resources/application.properties b/modules/file-server/src/main/resources/application.properties
index 3d5477b4dd..d6dc1ad2c7 100644
--- a/modules/file-server/src/main/resources/application.properties
+++ b/modules/file-server/src/main/resources/application.properties
@@ -1,12 +1,9 @@
spring.servlet.multipart.max-file-size=10MB
-# max request size
spring.servlet.multipart.max-request-size=10MB
-# files storage location (stores all files uploaded via REST API)
-storage.location=./uploads
-regserver.server.host=localhost
+regserver.server.host=airavata.host
regserver.server.port=8970
-credential.store.server.host=localhost
+credential.store.server.host=airavata.host
credential.store.server.port=8960
server.port=8050
diff --git a/modules/file-server/src/main/resources/distribution/conf/.gitkeep b/modules/file-server/src/main/resources/distribution/conf/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/file-server/src/main/resources/distribution/conf/application.properties b/modules/file-server/src/main/resources/distribution/conf/application.properties
deleted file mode 100644
index 3d5477b4dd..0000000000
--- a/modules/file-server/src/main/resources/distribution/conf/application.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-spring.servlet.multipart.max-file-size=10MB
-# max request size
-spring.servlet.multipart.max-request-size=10MB
-# files storage location (stores all files uploaded via REST API)
-storage.location=./uploads
-
-regserver.server.host=localhost
-regserver.server.port=8970
-credential.store.server.host=localhost
-credential.store.server.port=8960
-
-server.port=8050
diff --git a/modules/file-server/src/main/resources/distribution/conf/log4j2.xml b/modules/file-server/src/main/resources/log4j2.xml
similarity index 72%
rename from modules/file-server/src/main/resources/distribution/conf/log4j2.xml
rename to modules/file-server/src/main/resources/log4j2.xml
index 29b7e7258e..8fb27b1b68 100644
--- a/modules/file-server/src/main/resources/distribution/conf/log4j2.xml
+++ b/modules/file-server/src/main/resources/log4j2.xml
@@ -25,18 +25,6 @@
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n" />
</Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/file-server.log"
- filePattern="../logs/file-server-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
</Appenders>
<Loggers>
<logger name="ch.qos.logback" level="WARN" />
@@ -46,7 +34,6 @@
<logger name="org.hibernate" level="ERROR" />
<Root level="INFO">
<AppenderRef ref="Console" />
- <AppenderRef ref="RollingFileAppender" />
</Root>
</Loggers>
</Configuration>
\ No newline at end of file
diff --git a/modules/ide-integration/pom.xml b/modules/ide-integration/pom.xml
index 70bad679c9..67857b0257 100644
--- a/modules/ide-integration/pom.xml
+++ b/modules/ide-integration/pom.xml
@@ -43,12 +43,6 @@ under the License.
<build>
<resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>pga/**</exclude>
- </excludes>
- </resource>
<resource>
<directory>../../keystores</directory>
<targetPath>keystores</targetPath>
diff --git a/modules/ide-integration/src/main/resources/airavata-server.properties b/modules/ide-integration/src/main/resources/airavata-server.properties
deleted file mode 100644
index 4bdb489b1f..0000000000
--- a/modules/ide-integration/src/main/resources/airavata-server.properties
+++ /dev/null
@@ -1,249 +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.
-#
-
-api.secured=true
-api.server.monitoring.enabled=True
-api.server.monitoring.host=localhost
-api.server.monitoring.port=9097
-apiserver.host=localhost
-apiserver.min.threads=50
-apiserver.name=apiserver-node0
-apiserver.port=8930
-apiserver=org.apache.airavata.api.server.AiravataAPIServer
-
-appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.password=CHANGE_ME
-appcatalog.jdbc.url=jdbc:mariadb://localhost:13306/app_catalog
-appcatalog.jdbc.user=root
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-authz.cache.enabled=true
-authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
-
-cache.enable=false
-
-cluster.status.monitoring.enable=false
-cluster.status.monitoring.repeat.time=18000
-
-credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-credential.store.jdbc.password=CHANGE_ME
-credential.store.jdbc.url=jdbc:mariadb://localhost:13306/credential_store
-credential.store.jdbc.user=root
-credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-credential.store.keystore.alias=airavata
-credential.store.keystore.password=airavata
-credential.store.keystore.url=keystores/airavata.jks
-credential.store.server.host=localhost
-credential.store.server.port=8960
-credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
-
-data.analyzer.job.scanning.enable=false
-data.parser.delete.container=True
-
-db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
-
-default.registry.gateway=default
-default.registry.oauth.client.id=pga
-default.registry.oauth.client.secret=GtRMiIQG5UJJdmmeM6iQS0BZR4Yj0gbt
-default.registry.password.hash.method=SHA
-default.registry.password=CHANGE_ME
-default.registry.user=default-admin
-
-durable.queue=false
-
-email.based.monitor.address=monitoring.airavata@gmail.com
-email.based.monitor.folder.name=INBOX
-email.based.monitor.host=imap.gmail.com
-email.based.monitor.password=CHANGE_ME
-email.based.monitor.store.protocol=imaps
-email.based.monitoring.period=10000
-email.expiration.minutes=60
-email.from=airavata@apache.org
-email.password=CHANGE_ME
-email.server.port=465
-email.server=smtp.googlemail.com
-email.ssl=true
-email.user=airavata
-
-embedded.mode=false
-embedded.zk=false
-
-enable.kafka.logging=false
-enable.realtime.monitor=False
-enable.sharing=true
-enable.streaming.transfer=False
-enable.validation=true
-
-enactment.thread.pool.size=10
-
-experiment.launch.queue.name=experiment.launch.queue
-
-helix.cluster.name=AiravataCluster
-helix.controller.name=AiravataController
-helix.participant.name=AiravataParticipant
-
-host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
-
-iam.server.super.admin.password=CHANGE_ME
-iam.server.super.admin.username=admin
-iam.server.url=https://auth.dev.cybershuttle.org
-
-in.memory.cache.size=1000
-isRunningOnAws=false
-
-job.monitor.broker.publisher.id=AiravataMonitorPublisher
-job.monitor.email.publisher.id=EmailBasedProducer
-job.monitor.realtime.publisher.id=RealtimeProducer
-
-job.monitor.broker.topic=monitoring-data
-job.monitor.broker.url=localhost:9092
-job.notification.emailids=
-job.notification.enable=true
-job.notification.flags=abe
-job.status.publish.endpoint=http://localhost:8082/topics/helix-airavata-mq
-job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
-
-jpa.cache.size=-1
-
-kafka.broker.consumer.group=MonitoringConsumer
-kafka.broker.list=localhost:9092
-kafka.broker.topic=monitoring-data
-
-kafka.broker.url=localhost:9092
-kafka.parser.broker.consumer.group=CHANGE_ME
-kafka.parser.topic=CHANGE_ME
-kafka.parsing.broker.url=CHANGE_ME
-kafka.topic.prefix=local
-
-keystore.password=airavata
-keystore.path=keystores/airavata.jks
-
-local.data.location=/home/exouser/temp-storage
-
-metaschedluer.job.scanning.enable=false
-
-orchestrator.server.host=localhost
-orchestrator.server.min.threads=50
-orchestrator.server.name=orchestrator-node0
-orchestrator.server.port=8940
-orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
-
-parser.storage.resource.id=CHANGE_ME
-
-participant.monitoring.enabled=true
-participant.monitoring.host=localhost
-participant.monitoring.port=9096
-
-post.workflow.manager.loadbalance.clusters=false
-post.workflow.manager.monitoring.enabled=true
-post.workflow.manager.monitoring.host=localhost
-post.workflow.manager.monitoring.port=9094
-post.workflow.manager.name=AiravataPostWM
-
-pre.workflow.manager.loadbalance.clusters=false
-pre.workflow.manager.monitoring.enabled=true
-pre.workflow.manager.monitoring.host=localhost
-pre.workflow.manager.monitoring.port=9093
-pre.workflow.manager.name=AiravataPreWM
-
-prefetch.count=200
-
-process.launch.queue.name=process.launch.queue
-
-profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
-profile.service.jdbc.driver=org.mariadb.jdbc.Driver
-profile.service.jdbc.password=CHANGE_ME
-profile.service.jdbc.url=jdbc:mariadb://localhost:13306/profile_service
-profile.service.jdbc.user=root
-profile.service.server.host=localhost
-profile.service.server.port=8962
-profile.service.validationQuery=SELECT 1
-
-rabbitmq.broker.url=amqp://guest:guest@localhost:5672/develop
-rabbitmq.experiment.exchange.name=experiment_exchange
-rabbitmq.process.exchange.name=process_exchange
-rabbitmq.status.exchange.name=status_exchange
-
-realtime.monitor.broker.consumer.group=monitor
-realtime.monitor.broker.topic=helix-airavata-mq
-realtime.monitor.broker.url=localhost:9092
-
-registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.password=CHANGE_ME
-registry.jdbc.url=jdbc:mariadb://localhost:13306/experiment_catalog
-registry.jdbc.user=root
-
-regserver.server.host=localhost
-regserver.server.min.threads=50
-regserver.server.name=regserver-node0
-regserver.server.port=8970
-regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
-
-replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.password=CHANGE_ME
-replicacatalog.jdbc.url=jdbc:mariadb://localhost:13306/replica_catalog
-replicacatalog.jdbc.user=root
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
-
-sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
-sharing.registry.server.host=localhost
-sharing.registry.server.port=7878
-sharing.tls.enabled=false
-sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-sharingcatalog.jdbc.password=CHANGE_ME
-sharingcatalog.jdbc.url=jdbc:mariadb://localhost:13306/sharing_catalog
-sharingcatalog.jdbc.user=root
-sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-start.submitter=true
-submitter.interval=10000
-
-super.tenant.gatewayId=default
-
-threadpool.size=10
-
-thrift.client.pool.abandoned.removal.enabled=true
-thrift.client.pool.abandoned.removal.logged=false
-
-TLS.api.server.port=9930
-TLS.client.timeout=10000
-TLS.enabled=true
-
-trust.store.password=airavata
-trust.store=keystores/airavata.jks
-
-usage.reporting.endpoint=https://xsede-xdcdb-api.xsede.org/gateway/v2/job_attributes
-usage.reporting.key=CHANGE_ME
-userprofile.mongodb.host=localhost
-userprofile.mongodb.port=27017
-
-validationQuery=SELECT 1 from CONFIGURATION
-
-workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-workflowcatalog.jdbc.password=CHANGE_ME
-workflowcatalog.jdbc.url=jdbc:mariadb://localhost:13306/workflow_catalog
-workflowcatalog.jdbc.user=root
-workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
-workflowserver=org.apache.airavata.api.server.WorkflowServer
-
-zookeeper.server.connection=localhost:2181
-zookeeper.timeout=30000
diff --git a/modules/ide-integration/src/main/resources/email-config.yaml b/modules/ide-integration/src/main/resources/email-config.yaml
deleted file mode 100644
index 1854320ff1..0000000000
--- a/modules/ide-integration/src/main/resources/email-config.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-config:
- resources:
- - jobManagerType: PBS
- emailParser: org.apache.airavata.monitor.email.parser.PBSEmailParser
- resourceEmailAddresses:
- - pbsconsult@sdsc.edu # gordon
- - adm@trident.bigred2.uits.iu.edu # Bigred2
- - root <ad...@trident.bigred2.uits.iu.edu> # Bigred2
- - root <ad...@scyld.localdomain> # alamo
- - root <ad...@m1.mason.indiana.edu> #mason
- - smic3 <sm...@mail.hpc.lsu.edu> # philip.hpc.lsu
- - adm@jetstream-cloud.org
- - root <ad...@alamo.uthscsa.edu> #alamo
-
- - jobManagerType: SLURM
- emailParser: org.apache.airavata.monitor.email.parser.SLURMEmailParser
- resourceEmailAddresses:
- - SDSC Admin <sl...@comet-fe3.sdsc.edu> # comet
- - slurm@batch1.stampede.tacc.utexas.edu # stampede
- - slurm@helix-slurm-headnode.novalocal
- - slurm@comet-fe4.sdsc.edu
- - Slurm <sl...@psc.edu> # bridges
- - Slurm Daemon <sl...@odin.oscer.ou.edu> # OU Schooner
- - slurm@lnet28.stampede.tacc.utexas.edu # stampede2
- - Slurm service account <sl...@chpc.utah.edu> # Utah Ember
- - SLURM workload manager <sl...@jetstream.chemcompute.org> # JS Mark Cluster
- - root@master.ls5.tacc.utexas.edu
- - batch-jsc@fz-juelich.de # Jureca Email
- - Slurm <sl...@br003.pvt.bridges.psc.edu>
- - slurm@jetstream-cloud.org
- - slurm@slurm-example.novalocal
- - slurm@tutorial-headnode.novalocal # Jetstream Ultrascan static cluster with 10 nodes
- - slurm@batch1.stampede2.tacc.utexas.edu #Stampede2
- - slurm@sra-master.jetstreamlocal #Searching SRA
- - Slurm Admin <sl...@hpclogin01.rs.gsu.edu> #GSU cluster
- - slurm@head.cluster #USD cluster
- - slurm@js-169-158.jetstream-cloud.org
- - slurm@joker.nmsu.edu
- - root@ls5.tacc.utexas.edu
-
- - jobManagerType: UGE
- emailParser: org.apache.airavata.monitor.email.parser.UGEEmailParser
- resourceEmailAddresses:
- - ls4.tacc.utexas.edu # contain Lonestar
- - root <ro...@local> # USD HPC Cluster
- - root <li...@siu.edu> # SIU Little Dog
- - sge@bigdog.research.siu.edu # SIU Big Dog
- - root <ro...@legacy.usd.edu> # USD HPC Cluster
-
- - jobManagerType: HTCONDOR
- emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
- resourceEmailAddresses:
- - condor@js-169-152.jetstream-cloud.org
- - Owner of HTCondor Daemons <co...@condor.scigap.org> #EHT Condor Access point
- - Owner of HTCondor Daemons <co...@login04.osgconnect.net>
- - slurm@br003.ib.bridges2.psc.edu # AutoDock_Vina
\ No newline at end of file
diff --git a/modules/ide-integration/src/main/resources/log4j2.xml b/modules/ide-integration/src/main/resources/log4j2.xml
deleted file mode 100644
index f817dc3655..0000000000
--- a/modules/ide-integration/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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 status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n" />
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/ide-integration.log"
- filePattern="../logs/ide-integration-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <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" />
- <logger name="org.apache.openjpa" level="DEBUG" />
- <logger name="org.apache.openjpa.enhance" level="DEBUG" />
- <Root level="INFO">
- <AppenderRef ref="Console" />
- <AppenderRef ref="RollingFileAppender" />
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/research-framework/research-hub/compose/custom_templates/login.html b/modules/research-framework/research-hub/compose/custom_templates/login.html
index faf6fcfa52..d7834044c8 100644
--- a/modules/research-framework/research-hub/compose/custom_templates/login.html
+++ b/modules/research-framework/research-hub/compose/custom_templates/login.html
@@ -3,8 +3,8 @@
<head>
<meta charset="utf-8">
<title>CyberShuttle Hub Login</title>
- <link rel="icon" href="https://dev.cybershuttle.org/static/images/airavata-logo.png">
- <link rel="stylesheet" href="{{ static_url("css/style.min.css") }}">
+ <link rel="icon" href="{{ static_url('images/airavata-logo.png') }}">
+ <link rel="stylesheet" href="{{ static_url('css/style.min.css') }}">
<style>
body {
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
@@ -44,7 +44,7 @@
</head>
<body>
<div class="container">
- <img src="https://dev.cybershuttle.org/static/images/airavata-logo.png" alt="CyberShuttle Logo"/>
+ <img src="https://airavata.host:8009/static/images/airavata-logo.png" alt="CyberShuttle Logo"/>
<h1>Welcome to Dev CyberShuttle Hub</h1>
<a class="btn-login" href="{{ authenticator_login_url }}">Login with OAuth 2.0</a>
</div>
diff --git a/modules/research-framework/research-hub/compose/jupyterhub_config.py b/modules/research-framework/research-hub/compose/jupyterhub_config.py
index 32371a20ba..1d3af91a29 100644
--- a/modules/research-framework/research-hub/compose/jupyterhub_config.py
+++ b/modules/research-framework/research-hub/compose/jupyterhub_config.py
@@ -8,10 +8,10 @@ from oauthenticator.generic import GenericOAuthenticator
c.JupyterHub.authenticator_class = GenericOAuthenticator
c.GenericOAuthenticator.client_id = os.getenv('OAUTH_CLIENT_ID')
c.GenericOAuthenticator.client_secret = os.getenv('OAUTH_CLIENT_SECRET')
-c.GenericOAuthenticator.oauth_callback_url = 'https://hub.dev.cybershuttle.org/hub/oauth_callback'
-c.GenericOAuthenticator.authorize_url = 'https://auth.dev.cybershuttle.org/realms/default/protocol/openid-connect/auth'
-c.GenericOAuthenticator.token_url = 'https://auth.dev.cybershuttle.org/realms/default/protocol/openid-connect/token'
-c.GenericOAuthenticator.userdata_url = 'https://auth.dev.cybershuttle.org/realms/default/protocol/openid-connect/userinfo'
+c.GenericOAuthenticator.oauth_callback_url = 'https://airavata.host:20000/hub/oauth_callback'
+c.GenericOAuthenticator.authorize_url = 'http://airavata.host:18080/realms/default/protocol/openid-connect/auth'
+c.GenericOAuthenticator.token_url = 'http://airavata.host:18080/realms/default/protocol/openid-connect/token'
+c.GenericOAuthenticator.userdata_url = 'http://airavata.host:18080/realms/default/protocol/openid-connect/userinfo'
c.GenericOAuthenticator.scope = ['openid', 'profile', 'email']
c.GenericOAuthenticator.username_claim = 'email'
@@ -107,7 +107,7 @@ c.JupyterHub.hub_connect_ip = 'jupyterhub'
c.JupyterHub.shutdown_on_logout = True
# External URL
-c.JupyterHub.external_url = 'https://hub.cybershuttle.org'
+c.JupyterHub.external_url = 'http://airavata.host:20000'
# Logging
c.JupyterHub.log_level = 'DEBUG'
diff --git a/modules/research-framework/research-service/src/main/compose/dbinit/01-init-db.sql b/modules/research-framework/research-service/src/main/compose/dbinit/01-init-db.sql
index 14c0516610..712c36ca7a 100644
--- a/modules/research-framework/research-service/src/main/compose/dbinit/01-init-db.sql
+++ b/modules/research-framework/research-service/src/main/compose/dbinit/01-init-db.sql
@@ -3,6 +3,6 @@ CREATE DATABASE IF NOT EXISTS research_catalog;
CREATE USER IF NOT EXISTS 'airavata'@'%' IDENTIFIED BY '123456';
ALTER USER 'airavata'@'%' IDENTIFIED BY '123456';
-GRANT ALL PRIVILEGES ON research_catalog.* TO 'airavata'@'%';
+GRANT ALL PRIVILEGES ON *.* TO 'airavata'@'%';
FLUSH PRIVILEGES;
\ No newline at end of file
diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/AiravataService.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/AiravataService.java
index 8f3dede56f..8e81ad6b2f 100644
--- a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/AiravataService.java
+++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/AiravataService.java
@@ -36,7 +36,7 @@ public class AiravataService {
private static final Logger LOGGER = LoggerFactory.getLogger(AiravataService.class);
- @Value("${airavata.user-profile.server.url:api.dev.cybershuttle.org}")
+ @Value("${airavata.user-profile.server.url:airavata.host}")
private String profileServerUrl;
@Value("${airavata.user-profile.server.port:8962}")
diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/config/OpenApiConfig.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/config/OpenApiConfig.java
index ee3fff4a43..db49d784c5 100644
--- a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/config/OpenApiConfig.java
+++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/config/OpenApiConfig.java
@@ -62,9 +62,8 @@ public class OpenApiConfig {
.flows(new OAuthFlows()
.authorizationCode(new OAuthFlow()
.authorizationUrl(
- "https://auth.dev.cybershuttle.org/realms/default/protocol/openid-connect/auth")
- .tokenUrl(
- "https://auth.dev.cybershuttle.org/realms/default/protocol/openid-connect/token")
+ openIdConfigURL + "/protocol/openid-connect/auth")
+ .tokenUrl(openIdConfigURL + "/protocol/openid-connect/token")
.scopes(new Scopes()
.addString("openid", "openid")
.addString("email", "email"))))));
diff --git a/modules/research-framework/research-service/src/main/resources/application.yml b/modules/research-framework/research-service/src/main/resources/application.yml
index 6fb5898643..0652644a64 100644
--- a/modules/research-framework/research-service/src/main/resources/application.yml
+++ b/modules/research-framework/research-service/src/main/resources/application.yml
@@ -24,18 +24,18 @@ server:
airavata:
research-hub:
- url: https://hub.dev.cybershuttle.org
+ url: http://airavata.host:20000
dev-user: "airavata@apache.org"
adminApiKey: "JUPYTER_ADMIN_API_KEY"
limit: 10
research-portal:
- url: https://catalog.dev.cybershuttle.org
- dev-url: http://localhost:5173
+ url: http://airavata.host:5173
+ dev-url: http://airavata.host:5173
openid:
- url: "https://auth.dev.cybershuttle.org/realms/default/.well-known/openid-configuration"
+ url: "http://airavata.host:18080/realms/default"
user-profile:
server:
- url: api.dev.cybershuttle.org
+ url: airavata.host
port: 8962
spring:
@@ -44,7 +44,7 @@ spring:
max-file-size: 200MB
max-request-size: 200MB
datasource:
- url: "jdbc:mariadb://localhost:13306/research_catalog"
+ url: "jdbc:mariadb://airavata.host:13306/research_catalog"
username: "airavata"
password: "123456"
driver-class-name: org.mariadb.jdbc.Driver
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
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/research-framework/research-service/src/main/resources/distribution/conf/application.yml b/modules/research-framework/research-service/src/main/resources/distribution/conf/application.yml
deleted file mode 100644
index 7722780e0e..0000000000
--- a/modules/research-framework/research-service/src/main/resources/distribution/conf/application.yml
+++ /dev/null
@@ -1,69 +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.
-#
-
-grpc:
- server:
- port: 19908
-
-server:
- port: 18889
- address: 0.0.0.0
-
-airavata:
- research-hub:
- url: https://hub.dev.cybershuttle.org
- dev-user: "airavata@apache.org"
- adminApiKey: "JUPYTER_ADMIN_API_KEY"
- limit: 10
- research-portal:
- url: https://catalog.dev.cybershuttle.org
- openid:
- url: "https://auth.dev.cybershuttle.org/realms/default/.well-known/openid-configuration"
- user-profile:
- server:
- url: api.dev.cybershuttle.org
- port: 8962
-
-spring:
- servlet:
- multipart:
- max-file-size: 200MB
- max-request-size: 200MB
- datasource:
- url: "jdbc:mariadb://localhost:13306/research_catalog"
- username: "airavata"
- password: "123456"
- driver-class-name: org.mariadb.jdbc.Driver
- hikari:
- pool-name: ResearchCatalogPool
- leak-detection-threshold: 20000
- jpa:
- hibernate:
- ddl-auto: none
- open-in-view: false
-
-springdoc:
- api-docs:
- enabled: true
- swagger-ui:
- path: /swagger-ui.html
- operationsSorter: alpha
- tagsSorter: alpha
- doc-expansion: none
- oauth:
- use-pkce-with-authorization-code-grant: true
- client-id: data-catalog-portal
-
diff --git a/modules/research-framework/research-service/src/main/resources/distribution/conf/log4j2.xml b/modules/research-framework/research-service/src/main/resources/distribution/conf/log4j2.xml
deleted file mode 100644
index 593b7cba6e..0000000000
--- a/modules/research-framework/research-service/src/main/resources/distribution/conf/log4j2.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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 status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n" />
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/research-service.log"
- filePattern="../logs/research-service-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <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">
- <AppenderRef ref="Console" />
- <AppenderRef ref="RollingFileAppender" />
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/research-framework/research-service/src/main/resources/log4j2.xml b/modules/research-framework/research-service/src/main/resources/log4j2.xml
index 52fc013bf0..8fb27b1b68 100644
--- a/modules/research-framework/research-service/src/main/resources/log4j2.xml
+++ b/modules/research-framework/research-service/src/main/resources/log4j2.xml
@@ -25,18 +25,6 @@
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n" />
</Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/research-service.log"
- filePattern="../logs/research-service-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
</Appenders>
<Loggers>
<logger name="ch.qos.logback" level="WARN" />
@@ -46,7 +34,6 @@
<logger name="org.hibernate" level="ERROR" />
<Root level="INFO">
<AppenderRef ref="Console" />
- <AppenderRef ref="RollingFileAppender" />
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c220c8b3e8..9279487ee4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,6 @@ under the License.
<module>modules/research-framework/research-service</module>
<module>modules/registry-db-migrator</module>
<module>modules/registry-jpa-generator</module>
- <module>modules/distribution</module>
<module>modules/ide-integration</module>
</modules>
@@ -240,7 +239,7 @@ under the License.
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>1.0.0</version>
+ <version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.helix</groupId>
@@ -375,9 +374,9 @@ under the License.
<!-- Other Libraries -->
<dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
- <version>5.4.0</version>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
+ <version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@@ -654,7 +653,7 @@ under the License.
<configuration>
<java>
<palantirJavaFormat>
- <version>2.68.0</version>
+ <version>2.70.0</version>
</palantirJavaFormat>
<licenseHeader>
<file>apache-license-header-java.txt</file>